getBible/joomla-component
6
3
Fork 0
Code Issues Pull Requests Wiki Activity

Update on v3.0.5 (beta for next version)

Browse Source 
Here's an update on the current version, which includes changes towards the next release still in beta.
This commit is contained in:
Robot 2024-03-07 18:21:19 +02:00
parent 22c228239b
commit 59e7b843a5
Signed by: Robot
GPG Key ID: 14DECD44E7E1BB95
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -18,7 +18,7 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is
+ *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
+ *Name*: [Get Bible](https://getbible.net) + *Name*: [Get Bible](https://getbible.net)
+ *First Build*: 3rd December, 2015 + *First Build*: 3rd December, 2015
+ *Last Build*: 4th March, 2024 + *Last Build*: 7th March, 2024
+ *Version*: 3.0.5 + *Version*: 3.0.5
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html

2
admin/README.txt
View File

@ -18,7 +18,7 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is
+ *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
+ *Name*: [Get Bible](https://getbible.net) + *Name*: [Get Bible](https://getbible.net)
+ *First Build*: 3rd December, 2015 + *First Build*: 3rd December, 2015
+ *Last Build*: 4th March, 2024 + *Last Build*: 7th March, 2024
+ *Version*: 3.0.5 + *Version*: 3.0.5
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html

2
admin/controllers/translations.php
View File

@ -79,7 +79,7 @@ class GetbibleControllerTranslations extends AdminController
{ {
// Redirect to the list screen with error. // Redirect to the list screen with error.
$message = Text::_('COM_GETBIBLE_YOU_DO_NOT_HAVE_PERMISSION_TO_UPDATE_THE_BOOK_NAMES_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP'); $message = Text::_('COM_GETBIBLE_YOU_DO_NOT_HAVE_PERMISSION_TO_UPDATE_THE_BOOK_NAMES_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP');
$this->setRedirect(JRoute::_('index.php?option=com_getbible&view=translations', false), $message, 'error'); $this->setRedirect(\JRoute::_('index.php?option=com_getbible&view=translations', false), $message, 'error');
return; return;
} }
// Redirect to the list screen with error. // Redirect to the list screen with error.

2
admin/sql/install.mysql.utf8.sql
View File

@ -284,7 +284,7 @@ CREATE TABLE IF NOT EXISTS `#__getbible_tag` (
`id` INT(11) NOT NULL AUTO_INCREMENT, `id` INT(11) NOT NULL AUTO_INCREMENT,
`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
`access` TINYINT(1) NOT NULL DEFAULT 0, `access` TINYINT(1) NOT NULL DEFAULT 0,
`description` TEXT NOT NULL, `description` TEXT NULL,
`guid` VARCHAR(36) NOT NULL DEFAULT '', `guid` VARCHAR(36) NOT NULL DEFAULT '',
`linker` VARCHAR(36) NOT NULL DEFAULT '', `linker` VARCHAR(36) NOT NULL DEFAULT '',
`name` VARCHAR(255) NOT NULL DEFAULT '', `name` VARCHAR(255) NOT NULL DEFAULT '',

4
getbible.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="3.10" method="upgrade"> <extension type="component" version="3.10" method="upgrade">
<name>COM_GETBIBLE</name> <name>COM_GETBIBLE</name>
<creationDate>4th March, 2024</creationDate> <creationDate>7th March, 2024</creationDate>
<author>Llewellyn van der Merwe</author> <author>Llewellyn van der Merwe</author>
<authorEmail>joomla@vdm.io</authorEmail> <authorEmail>joomla@vdm.io</authorEmail>
<authorUrl>https://getbible.net</authorUrl> <authorUrl>https://getbible.net</authorUrl>
@ -116,6 +116,6 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is
</administration> </administration>
<updateservers> <updateservers>
<server type="extension" enabled="1" element="com_getbible" name="Get Bible">https://git.vdm.dev/getBible/joomla-component/raw/branch/3.10/update_server.xml</server> <server type="extension" enabled="1" element="com_getbible" name="Get Bible">https://git.vdm.dev/getBible/joomla-component/raw/branch/3.x/update_server.xml</server>
</updateservers> </updateservers>
</extension> </extension>

10
libraries/jcb_powers/VDM.Joomla/src/Utilities/Component/Helper.php
View File

@ -79,12 +79,12 @@ abstract class Helper
/** /**
* Set the component option * Set the component option
* *
* @param string $option The option * @param string|null $option The option
* *
* @return void * @return void
* @since 3.2.0 * @since 3.2.0
*/ */
public static function setOption(string $option): void public static function setOption(?string $option): void
{ {
self::$option = $option; self::$option = $option;
} }
@ -97,7 +97,7 @@ abstract class Helper
* @return string|null A component option * @return string|null A component option
* @since 3.0.11 * @since 3.0.11
*/ */
public static function getOption(string $default = 'empty'): ?string public static function getOption(?string $default = 'empty'): ?string
{ {
if (empty(self::$option)) if (empty(self::$option))
{ {
@ -160,7 +160,7 @@ abstract class Helper
* *
* @since 3.0.11 * @since 3.0.11
*/ */
public static function get(string $option = null, string $default = null): ?string public static function get(?string $option = null, ?string $default = null): ?string
{ {
// check that we have an option // check that we have an option
// and get the code name from it // and get the code name from it
@ -260,7 +260,7 @@ abstract class Helper
* *
* @since 3.0.11 * @since 3.0.11
*/ */
public static function methodExists(string $method, string $option = null): bool public static function methodExists(string $method, ?string $option = null): bool
{ {
// get the helper class // get the helper class
return ($helper = self::get($option, null)) !== null && return ($helper = self::get($option, null)) !== null &&

2
script.php
View File

@ -609,7 +609,7 @@ class Com_GetbibleInstallerScript
$revert_rule = "ALTER TABLE `#__assets` CHANGE `rules` `rules` varchar(5120) NOT NULL COMMENT 'JSON encoded access control.';"; $revert_rule = "ALTER TABLE `#__assets` CHANGE `rules` `rules` varchar(5120) NOT NULL COMMENT 'JSON encoded access control.';";
$db->setQuery($revert_rule); $db->setQuery($revert_rule);
$db->execute(); $db->execute();
$app->enqueueMessage(Text::_('Reverted the <b>#__assets</b> table rules column back to its default size of varchar(5120)')); $app->enqueueMessage(Text::_('COM_COMPONENTBUILDER_REVERTED_THE_B_ASSETSB_TABLE_RULES_COLUMN_BACK_TO_ITS_DEFAULT_SIZE_OF_VARCHARFIVE_THOUSAND_ONE_HUNDRED_AND_TWENTY'));
} }
else else
{ {

6
site/models/openai.php
View File

@ -118,7 +118,7 @@ class GetbibleModelOpenai extends ItemModel
$app = Factory::getApplication(); $app = Factory::getApplication();
// If no data is found redirect to default page and show warning. // If no data is found redirect to default page and show warning.
$app->enqueueMessage('The Open AI feature has not been activated. Please contact the system administrator of this website to resolve this.', 'error'); $app->enqueueMessage('The Open AI feature has not been activated. Please contact the system administrator of this website to resolve this.', 'error');
$app->redirect(JRoute::_('index.php?option=com_getbible&view=app')); $app->redirect(\JRoute::_('index.php?option=com_getbible&view=app'));
return false; return false;
} }
// validate that we have a valid prompt and we have a book, chapter and verse // validate that we have a valid prompt and we have a book, chapter and verse
@ -127,7 +127,7 @@ class GetbibleModelOpenai extends ItemModel
$app = Factory::getApplication(); $app = Factory::getApplication();
// If no data is found redirect to default page and show warning. // If no data is found redirect to default page and show warning.
$app->enqueueMessage('There has been an error!', 'error'); $app->enqueueMessage('There has been an error!', 'error');
$app->redirect(JRoute::_('index.php?option=com_getbible&view=app')); $app->redirect(\JRoute::_('index.php?option=com_getbible&view=app'));
return false; return false;
} }
// validate that we have the correct translation // validate that we have the correct translation
@ -136,7 +136,7 @@ class GetbibleModelOpenai extends ItemModel
$app = Factory::getApplication(); $app = Factory::getApplication();
// If no data is found redirect to default page and show warning. // If no data is found redirect to default page and show warning.
$app->enqueueMessage('There has been an error: mismatch!', 'error'); $app->enqueueMessage('There has been an error: mismatch!', 'error');
$app->redirect(JRoute::_('index.php?option=com_getbible&view=app')); $app->redirect(\JRoute::_('index.php?option=com_getbible&view=app'));
return false; return false;
} }

4
site/views/app/tmpl/default_getbiblebooks.php
View File

@ -28,11 +28,11 @@ use Joomla\CMS\Layout\LayoutHelper;
<div> <div>
<div class="uk-card"> <div class="uk-card">
<?php if ($book->nr !== $this->chapter->book_nr): ?> <?php if ($book->nr !== $this->chapter->book_nr): ?>
<a class="uk-button uk-button-default" href="<?php echo JRoute::_('index.php?option=com_getbible&view=app&t=' . $book->abbreviation . '&ref=' . $book->name . '&c=1&tab=chapters'); ?>"> <a class="uk-button uk-button-default" href="<?php echo \JRoute::_('index.php?option=com_getbible&view=app&t=' . $book->abbreviation . '&ref=' . $book->name . '&c=1&tab=chapters'); ?>">
<?php echo $book->name; ?> <?php echo $book->name; ?>
</a> </a>
<?php else: ?> <?php else: ?>
<a class="uk-button uk-button-default uk-active" href="<?php echo JRoute::_('index.php?option=com_getbible&view=app&t=' . $book->abbreviation . '&ref=' . $book->name . '&c=' . $this->chapter->chapter); ?>"> <a class="uk-button uk-button-default uk-active" href="<?php echo \JRoute::_('index.php?option=com_getbible&view=app&t=' . $book->abbreviation . '&ref=' . $book->name . '&c=' . $this->chapter->chapter); ?>">
<?php echo $book->name; ?> <?php echo $book->name; ?>
</a> </a>
<?php endif; ?> <?php endif; ?>

4
site/views/app/tmpl/default_getbiblechapters.php
View File

@ -28,11 +28,11 @@ use Joomla\CMS\Layout\LayoutHelper;
<div> <div>
<div class="uk-card"> <div class="uk-card">
<?php if ($chapter->chapter !== $this->chapter->chapter): ?> <?php if ($chapter->chapter !== $this->chapter->chapter): ?>
<a class="uk-button uk-button-default" href="<?php echo JRoute::_('index.php?option=com_getbible&view=app&t=' . $chapter->abbreviation . '&ref=' . $chapter->book_name . '&c=' . $chapter->chapter); ?>"> <a class="uk-button uk-button-default" href="<?php echo \JRoute::_('index.php?option=com_getbible&view=app&t=' . $chapter->abbreviation . '&ref=' . $chapter->book_name . '&c=' . $chapter->chapter); ?>">
<?php echo $chapter->chapter; ?> <?php echo $chapter->chapter; ?>
</a> </a>
<?php else: ?> <?php else: ?>
<a class="uk-button uk-button-default uk-active" href="<?php echo JRoute::_('index.php?option=com_getbible&view=app&t=' . $chapter->abbreviation . '&ref=' . $chapter->book_name . '&c=' . $chapter->chapter); ?>"> <a class="uk-button uk-button-default uk-active" href="<?php echo \JRoute::_('index.php?option=com_getbible&view=app&t=' . $chapter->abbreviation . '&ref=' . $chapter->book_name . '&c=' . $chapter->chapter); ?>">
<?php echo $chapter->chapter; ?> <?php echo $chapter->chapter; ?>
</a> </a>
<?php endif; ?> <?php endif; ?>

6
site/views/app/tmpl/default_getbibletranslations.php
View File

@ -24,7 +24,7 @@ use Joomla\CMS\Layout\LayoutHelper;
?> ?>
<?php if (!empty($this->defaultTranslation)): ?> <?php if (!empty($this->defaultTranslation)): ?>
<a class="uk-button uk-button-default uk-button-small uk-width-1-1" href="<?php echo JRoute::_('index.php?option=com_getbible&view=app&t=' . $this->defaultTranslation->abbreviation . '&b=' . $this->chapter->book_nr . '&c=' . $this->chapter->chapter); ?>"> <a class="uk-button uk-button-default uk-button-small uk-width-1-1" href="<?php echo \JRoute::_('index.php?option=com_getbible&view=app&t=' . $this->defaultTranslation->abbreviation . '&b=' . $this->chapter->book_nr . '&c=' . $this->chapter->chapter); ?>">
<?php echo $this->defaultTranslation->translation; ?> (<?php echo $this->defaultTranslation->abbreviation; ?>) <?php echo $this->defaultTranslation->translation; ?> (<?php echo $this->defaultTranslation->abbreviation; ?>)
</a> </a>
<?php endif; ?> <?php endif; ?>
@ -39,11 +39,11 @@ use Joomla\CMS\Layout\LayoutHelper;
<div class="uk-accordion-content"> <div class="uk-accordion-content">
<?php foreach ($translations as $translation): ?> <?php foreach ($translations as $translation): ?>
<?php if ($translation->abbreviation !== $this->chapter->abbreviation): ?> <?php if ($translation->abbreviation !== $this->chapter->abbreviation): ?>
<a class="uk-button uk-button-default uk-button-small uk-width-1-1 uk-margin-small-bottom" href="<?php echo JRoute::_('index.php?option=com_getbible&view=app&t=' . $translation->abbreviation . '&b=' . $this->chapter->book_nr . '&c=' . $this->chapter->chapter); ?>"> <a class="uk-button uk-button-default uk-button-small uk-width-1-1 uk-margin-small-bottom" href="<?php echo \JRoute::_('index.php?option=com_getbible&view=app&t=' . $translation->abbreviation . '&b=' . $this->chapter->book_nr . '&c=' . $this->chapter->chapter); ?>">
<?php echo $translation->translation; ?> (<?php echo $translation->abbreviation; ?>) <?php echo $translation->translation; ?> (<?php echo $translation->abbreviation; ?>)
</a> </a>
<?php else: ?> <?php else: ?>
<a class="uk-button uk-button-default uk-button-small uk-active uk-width-1-1 uk-margin-small-bottom" href="<?php echo JRoute::_('index.php?option=com_getbible&view=app&t=' . $translation->abbreviation . '&b=' . $this->chapter->book_nr . '&c=' . $this->chapter->chapter); ?>"> <a class="uk-button uk-button-default uk-button-small uk-active uk-width-1-1 uk-margin-small-bottom" href="<?php echo \JRoute::_('index.php?option=com_getbible&view=app&t=' . $translation->abbreviation . '&b=' . $this->chapter->book_nr . '&c=' . $this->chapter->chapter); ?>">
<?php echo $translation->translation; ?> (<?php echo $translation->abbreviation; ?>) <?php echo $translation->translation; ?> (<?php echo $translation->abbreviation; ?>)
</a> </a>
<?php endif; ?> <?php endif; ?>