From 59e7b843a5eaa156e182c4b3fab734b5da6de6bc Mon Sep 17 00:00:00 2001 From: aB0t Date: Thu, 7 Mar 2024 18:21:19 +0200 Subject: [PATCH] Update on v3.0.5 (beta for next version) Here's an update on the current version, which includes changes towards the next release still in beta. --- README.md | 2 +- admin/README.txt | 2 +- admin/controllers/translations.php | 2 +- admin/sql/install.mysql.utf8.sql | 2 +- getbible.xml | 4 ++-- .../VDM.Joomla/src/Utilities/Component/Helper.php | 10 +++++----- script.php | 2 +- site/models/openai.php | 6 +++--- site/views/app/tmpl/default_getbiblebooks.php | 4 ++-- site/views/app/tmpl/default_getbiblechapters.php | 4 ++-- site/views/app/tmpl/default_getbibletranslations.php | 6 +++--- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 2a52ef0..eddc65a 100644 --- a/README.md +++ b/README.md @@ -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) + *Name*: [Get Bible](https://getbible.net) + *First Build*: 3rd December, 2015 -+ *Last Build*: 4th March, 2024 ++ *Last Build*: 7th March, 2024 + *Version*: 3.0.5 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/README.txt b/admin/README.txt index 2a52ef0..eddc65a 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -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) + *Name*: [Get Bible](https://getbible.net) + *First Build*: 3rd December, 2015 -+ *Last Build*: 4th March, 2024 ++ *Last Build*: 7th March, 2024 + *Version*: 3.0.5 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/controllers/translations.php b/admin/controllers/translations.php index 5f8b446..48d2f05 100644 --- a/admin/controllers/translations.php +++ b/admin/controllers/translations.php @@ -79,7 +79,7 @@ class GetbibleControllerTranslations extends AdminController { // 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'); - $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; } // Redirect to the list screen with error. diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index a1b6359..079efce 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -284,7 +284,7 @@ CREATE TABLE IF NOT EXISTS `#__getbible_tag` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `access` TINYINT(1) NOT NULL DEFAULT 0, - `description` TEXT NOT NULL, + `description` TEXT NULL, `guid` VARCHAR(36) NOT NULL DEFAULT '', `linker` VARCHAR(36) NOT NULL DEFAULT '', `name` VARCHAR(255) NOT NULL DEFAULT '', diff --git a/getbible.xml b/getbible.xml index 35cba35..e2dca6a 100644 --- a/getbible.xml +++ b/getbible.xml @@ -1,7 +1,7 @@ COM_GETBIBLE - 4th March, 2024 + 7th March, 2024 Llewellyn van der Merwe joomla@vdm.io https://getbible.net @@ -116,6 +116,6 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is - https://git.vdm.dev/getBible/joomla-component/raw/branch/3.10/update_server.xml + https://git.vdm.dev/getBible/joomla-component/raw/branch/3.x/update_server.xml \ No newline at end of file diff --git a/libraries/jcb_powers/VDM.Joomla/src/Utilities/Component/Helper.php b/libraries/jcb_powers/VDM.Joomla/src/Utilities/Component/Helper.php index b2ae824..5660a49 100644 --- a/libraries/jcb_powers/VDM.Joomla/src/Utilities/Component/Helper.php +++ b/libraries/jcb_powers/VDM.Joomla/src/Utilities/Component/Helper.php @@ -79,12 +79,12 @@ abstract class Helper /** * Set the component option * - * @param string $option The option + * @param string|null $option The option * * @return void * @since 3.2.0 */ - public static function setOption(string $option): void + public static function setOption(?string $option): void { self::$option = $option; } @@ -97,7 +97,7 @@ abstract class Helper * @return string|null A component option * @since 3.0.11 */ - public static function getOption(string $default = 'empty'): ?string + public static function getOption(?string $default = 'empty'): ?string { if (empty(self::$option)) { @@ -160,7 +160,7 @@ abstract class Helper * * @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 // and get the code name from it @@ -260,7 +260,7 @@ abstract class Helper * * @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 return ($helper = self::get($option, null)) !== null && diff --git a/script.php b/script.php index 4070e90..0fe8748 100644 --- a/script.php +++ b/script.php @@ -609,7 +609,7 @@ class Com_GetbibleInstallerScript $revert_rule = "ALTER TABLE `#__assets` CHANGE `rules` `rules` varchar(5120) NOT NULL COMMENT 'JSON encoded access control.';"; $db->setQuery($revert_rule); $db->execute(); - $app->enqueueMessage(Text::_('Reverted the #__assets 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 { diff --git a/site/models/openai.php b/site/models/openai.php index f4b45fe..521d8d6 100644 --- a/site/models/openai.php +++ b/site/models/openai.php @@ -118,7 +118,7 @@ class GetbibleModelOpenai extends ItemModel $app = Factory::getApplication(); // 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->redirect(JRoute::_('index.php?option=com_getbible&view=app')); + $app->redirect(\JRoute::_('index.php?option=com_getbible&view=app')); return false; } // 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(); // If no data is found redirect to default page and show warning. $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; } // validate that we have the correct translation @@ -136,7 +136,7 @@ class GetbibleModelOpenai extends ItemModel $app = Factory::getApplication(); // If no data is found redirect to default page and show warning. $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; } diff --git a/site/views/app/tmpl/default_getbiblebooks.php b/site/views/app/tmpl/default_getbiblebooks.php index c34c47e..6e51a98 100644 --- a/site/views/app/tmpl/default_getbiblebooks.php +++ b/site/views/app/tmpl/default_getbiblebooks.php @@ -28,11 +28,11 @@ use Joomla\CMS\Layout\LayoutHelper;
nr !== $this->chapter->book_nr): ?> - + name; ?> - + name; ?> diff --git a/site/views/app/tmpl/default_getbiblechapters.php b/site/views/app/tmpl/default_getbiblechapters.php index 5255742..92360e3 100644 --- a/site/views/app/tmpl/default_getbiblechapters.php +++ b/site/views/app/tmpl/default_getbiblechapters.php @@ -28,11 +28,11 @@ use Joomla\CMS\Layout\LayoutHelper;
chapter !== $this->chapter->chapter): ?> - + chapter; ?> - + chapter; ?> diff --git a/site/views/app/tmpl/default_getbibletranslations.php b/site/views/app/tmpl/default_getbibletranslations.php index ef9972c..8a6f43d 100644 --- a/site/views/app/tmpl/default_getbibletranslations.php +++ b/site/views/app/tmpl/default_getbibletranslations.php @@ -24,7 +24,7 @@ use Joomla\CMS\Layout\LayoutHelper; ?> defaultTranslation)): ?> - + defaultTranslation->translation; ?> (defaultTranslation->abbreviation; ?>) @@ -39,11 +39,11 @@ use Joomla\CMS\Layout\LayoutHelper;
abbreviation !== $this->chapter->abbreviation): ?> - + translation; ?> (abbreviation; ?>) - + translation; ?> (abbreviation; ?>)