From b61c1b2190ced5a568dd24c26f43005285b9dfa0 Mon Sep 17 00:00:00 2001 From: aB0t Date: Wed, 20 Mar 2024 10:40:24 +0200 Subject: [PATCH] Release of v5.0.10 Update getBible loader to version 3.1.0. --- CHANGELOG.md | 14 ++++--- GetbibleInstallerScript.php | 2 +- README.md | 16 ++++---- admin/README.txt | 16 ++++---- admin/language/en-GB/en-GB.com_getbible.ini | 2 +- .../updates/mysql/{3.0.6.sql => 3.0.7.sql} | 0 .../updates/mysql/{4.0.9.sql => 4.0.10.sql} | 0 admin/sql/updates/mysql/5.0.9.sql | 1 + admin/src/Model/AjaxModel.php | 6 +-- admin/src/View/Book/HtmlView.php | 3 ++ admin/src/View/Books/HtmlView.php | 2 + admin/src/View/Chapter/HtmlView.php | 3 ++ admin/src/View/Chapters/HtmlView.php | 2 + admin/src/View/Linker/HtmlView.php | 3 ++ admin/src/View/Linkers/HtmlView.php | 2 + admin/src/View/Note/HtmlView.php | 3 ++ admin/src/View/Notes/HtmlView.php | 2 + admin/src/View/Open_ai_message/HtmlView.php | 3 ++ admin/src/View/Open_ai_messages/HtmlView.php | 2 + admin/src/View/Open_ai_response/HtmlView.php | 3 ++ admin/src/View/Open_ai_responses/HtmlView.php | 2 + admin/src/View/Password/HtmlView.php | 3 ++ admin/src/View/Passwords/HtmlView.php | 2 + admin/src/View/Prompt/HtmlView.php | 3 ++ admin/src/View/Prompts/HtmlView.php | 2 + admin/src/View/Tag/HtmlView.php | 3 ++ admin/src/View/Tagged_verse/HtmlView.php | 3 ++ admin/src/View/Tagged_verses/HtmlView.php | 2 + admin/src/View/Tags/HtmlView.php | 2 + admin/src/View/Translation/HtmlView.php | 3 ++ admin/src/View/Translations/HtmlView.php | 2 + admin/src/View/Verse/HtmlView.php | 3 ++ admin/src/View/Verses/HtmlView.php | 2 + getbible.xml | 6 +-- .../VDM.Joomla/src/Utilities/FormHelper.php | 38 +++++++++---------- site/layouts/table.php | 3 +- site/src/View/App/HtmlView.php | 2 +- site/src/View/Search/HtmlView.php | 2 +- update_server.xml | 26 +++++++++++-- 39 files changed, 138 insertions(+), 56 deletions(-) rename admin/sql/updates/mysql/{3.0.6.sql => 3.0.7.sql} (100%) rename admin/sql/updates/mysql/{4.0.9.sql => 4.0.10.sql} (100%) create mode 100644 admin/sql/updates/mysql/5.0.9.sql diff --git a/CHANGELOG.md b/CHANGELOG.md index 331e6c0..b42c7e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v5.0.10 + +- Update getBible loader to version 3.1.0 + # v5.0.9 - Correct the url encoding to json_encode for none Latin languages. @@ -41,12 +45,10 @@ - Moved to Joomla 4 and 5 -# v4.0.9 +# v4.0.10 -- Correct the url encoding to json_encode for none Latin languages. -- Fix type cast validation on search page. +- Update getBible loader to version 3.1.0 -# v3.0.6 +# v3.0.7 -- Correct the url encoding to json_encode for none Latin languages. -- Fix type cast validation on search page. \ No newline at end of file +- Update getBible loader to version 3.1.0 \ No newline at end of file diff --git a/GetbibleInstallerScript.php b/GetbibleInstallerScript.php index 33fcbc0..10e3f68 100644 --- a/GetbibleInstallerScript.php +++ b/GetbibleInstallerScript.php @@ -755,7 +755,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface echo '
-

Upgrade to Version 5.0.9 Was Successful! Let us know if anything is not working as expected.

'; +

Upgrade to Version 5.0.10 Was Successful! Let us know if anything is not working as expected.

'; // Add/Update component in the action logs extensions table. $this->setActionLogsExtensions(); diff --git a/README.md b/README.md index 5436230..984bf13 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Get Bible (5.0.9) +# Get Bible (5.0.10) ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/5.0/admin/assets/images/vdm-component.jpg "GetBible") @@ -18,24 +18,24 @@ 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*: 8th March, 2024 -+ *Version*: 5.0.9 ++ *Last Build*: 20th March, 2024 ++ *Version*: 5.0.10 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html ## Build Time -**579 Hours** or **72 Eight Hour Days** (actual time the author saved - +**580 Hours** or **73 Eight Hour Days** (actual time the author saved - due to [Automated Component Builder](https://www.joomlacomponentbuilder.com)) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > never making one mistake or taking any coffee break.) -+ *Line count*: **207605** -+ *File count*: **1728** ++ *Line count*: **207673** ++ *File count*: **1729** + *Folder count*: **189** -**382 Hours** or **48 Eight Hour Days** (the actual time the author spent) +**382 Hours** or **47 Eight Hour Days** (the actual time the author spent) > (with the following break down: > **debugging @145hours** = codingtime / 4; @@ -43,7 +43,7 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com)) > **mapping @58hours** = codingtime / 10; > **office @97hours** = codingtime / 6;) -**961 Hours** or **120 Eight Hour Days** +**962 Hours** or **120 Eight Hour Days** (a total of the realistic time frame for this project) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, diff --git a/admin/README.txt b/admin/README.txt index 5436230..984bf13 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -1,4 +1,4 @@ -# Get Bible (5.0.9) +# Get Bible (5.0.10) ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/5.0/admin/assets/images/vdm-component.jpg "GetBible") @@ -18,24 +18,24 @@ 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*: 8th March, 2024 -+ *Version*: 5.0.9 ++ *Last Build*: 20th March, 2024 ++ *Version*: 5.0.10 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html ## Build Time -**579 Hours** or **72 Eight Hour Days** (actual time the author saved - +**580 Hours** or **73 Eight Hour Days** (actual time the author saved - due to [Automated Component Builder](https://www.joomlacomponentbuilder.com)) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > never making one mistake or taking any coffee break.) -+ *Line count*: **207605** -+ *File count*: **1728** ++ *Line count*: **207673** ++ *File count*: **1729** + *Folder count*: **189** -**382 Hours** or **48 Eight Hour Days** (the actual time the author spent) +**382 Hours** or **47 Eight Hour Days** (the actual time the author spent) > (with the following break down: > **debugging @145hours** = codingtime / 4; @@ -43,7 +43,7 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com)) > **mapping @58hours** = codingtime / 10; > **office @97hours** = codingtime / 6;) -**961 Hours** or **120 Eight Hour Days** +**962 Hours** or **120 Eight Hour Days** (a total of the realistic time frame for this project) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, diff --git a/admin/language/en-GB/en-GB.com_getbible.ini b/admin/language/en-GB/en-GB.com_getbible.ini index 2545706..76f12df 100644 --- a/admin/language/en-GB/en-GB.com_getbible.ini +++ b/admin/language/en-GB/en-GB.com_getbible.ini @@ -8,7 +8,6 @@ COM_GETBIBLE_ARCHIVED="Archived" COM_GETBIBLE_ARE_YOU_SURE_YOU_WANT_TO_DELETE_CONFIRMING_WILL_PERMANENTLY_DELETE_THE_SELECTED_ITEMS="Are you sure you want to delete? Confirming will permanently delete the selected item(s)!" COM_GETBIBLE_AUTHOR="Author" COM_GETBIBLE_BACK="Back" -COM_GETBIBLE_BETA_RELEASE="Beta Release" COM_GETBIBLE_BOOK="Book" COM_GETBIBLE_BOOKS="Books" COM_GETBIBLE_BOOKS_ACCESS="Books Access" @@ -1211,6 +1210,7 @@ COM_GETBIBLE_PASSWORD_TO_SHORT_USE_A_LONGER_PASSWORD="Password to short, use a l COM_GETBIBLE_PASSWORD_VERSION_DESC="A count of the number of times this Password has been revised." COM_GETBIBLE_PASSWORD_VERSION_LABEL="Version" COM_GETBIBLE_PLEASE_CHECK_AGAIN_LATER="Please check again later" +COM_GETBIBLE_PRE_RELEASE="Pre Release" COM_GETBIBLE_PROMPT="Prompt" COM_GETBIBLE_PROMPTS="Prompts" COM_GETBIBLE_PROMPTS_ACCESS="Prompts Access" diff --git a/admin/sql/updates/mysql/3.0.6.sql b/admin/sql/updates/mysql/3.0.7.sql similarity index 100% rename from admin/sql/updates/mysql/3.0.6.sql rename to admin/sql/updates/mysql/3.0.7.sql diff --git a/admin/sql/updates/mysql/4.0.9.sql b/admin/sql/updates/mysql/4.0.10.sql similarity index 100% rename from admin/sql/updates/mysql/4.0.9.sql rename to admin/sql/updates/mysql/4.0.10.sql diff --git a/admin/sql/updates/mysql/5.0.9.sql b/admin/sql/updates/mysql/5.0.9.sql new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/admin/sql/updates/mysql/5.0.9.sql @@ -0,0 +1 @@ + diff --git a/admin/src/Model/AjaxModel.php b/admin/src/Model/AjaxModel.php index 8fb8b87..c181856 100644 --- a/admin/src/Model/AjaxModel.php +++ b/admin/src/Model/AjaxModel.php @@ -168,7 +168,7 @@ class AjaxModel extends ListModel // now check if this version is out dated if ($current_version === $local_version) { - return ['notice' => '' . Text::_('COM_GETBIBLE_UP_TO_DATE') . '']; + return ['notice' => ' ' . Text::_('COM_GETBIBLE_UP_TO_DATE') . '']; } else { @@ -179,14 +179,14 @@ class AjaxModel extends ListModel ($local_array[0] == $current_array[0] && $local_array[1] > $current_array[1]) || ($local_array[0] == $current_array[0] && $local_array[1] == $current_array[1] && $local_array[2] > $current_array[2])) { - return ['notice' => '' . Text::_('COM_GETBIBLE_BETA_RELEASE') . '']; + return ['notice' => ' ' . Text::_('COM_GETBIBLE_PRE_RELEASE') . '']; } else { // download link of the latest version $download = "https://git.vdm.dev/api/v1/repos/getBible/joomla-component/archive/" . $tags[0]->name . ".zip"; - return ['notice' => '' . Text::_('COM_GETBIBLE_OUT_OF_DATE') . '!  ' . Text::_('COM_GETBIBLE_OUT_OF_DATE') . '! ' . Text::_('COM_GETBIBLE_DOWNLOAD_UPDATE') . '!']; } } diff --git a/admin/src/View/Book/HtmlView.php b/admin/src/View/Book/HtmlView.php index 2e37c36..19507e7 100644 --- a/admin/src/View/Book/HtmlView.php +++ b/admin/src/View/Book/HtmlView.php @@ -54,6 +54,7 @@ class HtmlView extends BaseHtmlView { // set params $this->params = ComponentHelper::getParams('com_getbible'); + $this->useCoreUI = true; // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -144,6 +145,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $isNew = ($this->item->id < 1); $this->getDocument()->setTitle(Text::_($isNew ? 'COM_GETBIBLE_BOOK_NEW' : 'COM_GETBIBLE_BOOK_EDIT')); // add styles diff --git a/admin/src/View/Books/HtmlView.php b/admin/src/View/Books/HtmlView.php index f3053e2..676a87a 100644 --- a/admin/src/View/Books/HtmlView.php +++ b/admin/src/View/Books/HtmlView.php @@ -180,6 +180,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $this->getDocument()->setTitle(Text::_('COM_GETBIBLE_BOOKS')); // add styles foreach ($this->styles as $style) diff --git a/admin/src/View/Chapter/HtmlView.php b/admin/src/View/Chapter/HtmlView.php index 586ef95..36bcfe8 100644 --- a/admin/src/View/Chapter/HtmlView.php +++ b/admin/src/View/Chapter/HtmlView.php @@ -54,6 +54,7 @@ class HtmlView extends BaseHtmlView { // set params $this->params = ComponentHelper::getParams('com_getbible'); + $this->useCoreUI = true; // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -144,6 +145,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $isNew = ($this->item->id < 1); $this->getDocument()->setTitle(Text::_($isNew ? 'COM_GETBIBLE_CHAPTER_NEW' : 'COM_GETBIBLE_CHAPTER_EDIT')); // add styles diff --git a/admin/src/View/Chapters/HtmlView.php b/admin/src/View/Chapters/HtmlView.php index 692c621..9df55e7 100644 --- a/admin/src/View/Chapters/HtmlView.php +++ b/admin/src/View/Chapters/HtmlView.php @@ -170,6 +170,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $this->getDocument()->setTitle(Text::_('COM_GETBIBLE_CHAPTERS')); // add styles foreach ($this->styles as $style) diff --git a/admin/src/View/Linker/HtmlView.php b/admin/src/View/Linker/HtmlView.php index 10f09e7..4d92f2c 100644 --- a/admin/src/View/Linker/HtmlView.php +++ b/admin/src/View/Linker/HtmlView.php @@ -54,6 +54,7 @@ class HtmlView extends BaseHtmlView { // set params $this->params = ComponentHelper::getParams('com_getbible'); + $this->useCoreUI = true; // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -222,6 +223,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $isNew = ($this->item->id < 1); $this->getDocument()->setTitle(Text::_($isNew ? 'COM_GETBIBLE_LINKER_NEW' : 'COM_GETBIBLE_LINKER_EDIT')); // add styles diff --git a/admin/src/View/Linkers/HtmlView.php b/admin/src/View/Linkers/HtmlView.php index e32d1a7..a4f4596 100644 --- a/admin/src/View/Linkers/HtmlView.php +++ b/admin/src/View/Linkers/HtmlView.php @@ -170,6 +170,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $this->getDocument()->setTitle(Text::_('COM_GETBIBLE_LINKERS')); // add styles foreach ($this->styles as $style) diff --git a/admin/src/View/Note/HtmlView.php b/admin/src/View/Note/HtmlView.php index d0ccaf3..cee299a 100644 --- a/admin/src/View/Note/HtmlView.php +++ b/admin/src/View/Note/HtmlView.php @@ -54,6 +54,7 @@ class HtmlView extends BaseHtmlView { // set params $this->params = ComponentHelper::getParams('com_getbible'); + $this->useCoreUI = true; // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -218,6 +219,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $isNew = ($this->item->id < 1); $this->getDocument()->setTitle(Text::_($isNew ? 'COM_GETBIBLE_NOTE_NEW' : 'COM_GETBIBLE_NOTE_EDIT')); // add styles diff --git a/admin/src/View/Notes/HtmlView.php b/admin/src/View/Notes/HtmlView.php index e2f08dc..4582f88 100644 --- a/admin/src/View/Notes/HtmlView.php +++ b/admin/src/View/Notes/HtmlView.php @@ -170,6 +170,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $this->getDocument()->setTitle(Text::_('COM_GETBIBLE_NOTES')); // add styles foreach ($this->styles as $style) diff --git a/admin/src/View/Open_ai_message/HtmlView.php b/admin/src/View/Open_ai_message/HtmlView.php index dc1d3ee..8cd33fa 100644 --- a/admin/src/View/Open_ai_message/HtmlView.php +++ b/admin/src/View/Open_ai_message/HtmlView.php @@ -54,6 +54,7 @@ class HtmlView extends BaseHtmlView { // set params $this->params = ComponentHelper::getParams('com_getbible'); + $this->useCoreUI = true; // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -218,6 +219,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $isNew = ($this->item->id < 1); $this->getDocument()->setTitle(Text::_($isNew ? 'COM_GETBIBLE_OPEN_AI_MESSAGE_NEW' : 'COM_GETBIBLE_OPEN_AI_MESSAGE_EDIT')); // add styles diff --git a/admin/src/View/Open_ai_messages/HtmlView.php b/admin/src/View/Open_ai_messages/HtmlView.php index 9ae32b5..1fb9766 100644 --- a/admin/src/View/Open_ai_messages/HtmlView.php +++ b/admin/src/View/Open_ai_messages/HtmlView.php @@ -170,6 +170,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $this->getDocument()->setTitle(Text::_('COM_GETBIBLE_OPEN_AI_MESSAGES')); // add styles foreach ($this->styles as $style) diff --git a/admin/src/View/Open_ai_response/HtmlView.php b/admin/src/View/Open_ai_response/HtmlView.php index e713396..462719d 100644 --- a/admin/src/View/Open_ai_response/HtmlView.php +++ b/admin/src/View/Open_ai_response/HtmlView.php @@ -54,6 +54,7 @@ class HtmlView extends BaseHtmlView { // set params $this->params = ComponentHelper::getParams('com_getbible'); + $this->useCoreUI = true; // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -221,6 +222,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $isNew = ($this->item->id < 1); $this->getDocument()->setTitle(Text::_($isNew ? 'COM_GETBIBLE_OPEN_AI_RESPONSE_NEW' : 'COM_GETBIBLE_OPEN_AI_RESPONSE_EDIT')); // add styles diff --git a/admin/src/View/Open_ai_responses/HtmlView.php b/admin/src/View/Open_ai_responses/HtmlView.php index 28f13ec..b1c089d 100644 --- a/admin/src/View/Open_ai_responses/HtmlView.php +++ b/admin/src/View/Open_ai_responses/HtmlView.php @@ -170,6 +170,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $this->getDocument()->setTitle(Text::_('COM_GETBIBLE_OPEN_AI_RESPONSES')); // add styles foreach ($this->styles as $style) diff --git a/admin/src/View/Password/HtmlView.php b/admin/src/View/Password/HtmlView.php index 4f6a837..9b5d0d5 100644 --- a/admin/src/View/Password/HtmlView.php +++ b/admin/src/View/Password/HtmlView.php @@ -54,6 +54,7 @@ class HtmlView extends BaseHtmlView { // set params $this->params = ComponentHelper::getParams('com_getbible'); + $this->useCoreUI = true; // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -213,6 +214,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $isNew = ($this->item->id < 1); $this->getDocument()->setTitle(Text::_($isNew ? 'COM_GETBIBLE_PASSWORD_NEW' : 'COM_GETBIBLE_PASSWORD_EDIT')); // add styles diff --git a/admin/src/View/Passwords/HtmlView.php b/admin/src/View/Passwords/HtmlView.php index 9eb9d3f..3de170b 100644 --- a/admin/src/View/Passwords/HtmlView.php +++ b/admin/src/View/Passwords/HtmlView.php @@ -170,6 +170,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $this->getDocument()->setTitle(Text::_('COM_GETBIBLE_PASSWORDS')); // add styles foreach ($this->styles as $style) diff --git a/admin/src/View/Prompt/HtmlView.php b/admin/src/View/Prompt/HtmlView.php index 0867faa..ef463d3 100644 --- a/admin/src/View/Prompt/HtmlView.php +++ b/admin/src/View/Prompt/HtmlView.php @@ -54,6 +54,7 @@ class HtmlView extends BaseHtmlView { // set params $this->params = ComponentHelper::getParams('com_getbible'); + $this->useCoreUI = true; // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -218,6 +219,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $isNew = ($this->item->id < 1); $this->getDocument()->setTitle(Text::_($isNew ? 'COM_GETBIBLE_PROMPT_NEW' : 'COM_GETBIBLE_PROMPT_EDIT')); // add styles diff --git a/admin/src/View/Prompts/HtmlView.php b/admin/src/View/Prompts/HtmlView.php index e89068c..2cd452e 100644 --- a/admin/src/View/Prompts/HtmlView.php +++ b/admin/src/View/Prompts/HtmlView.php @@ -170,6 +170,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $this->getDocument()->setTitle(Text::_('COM_GETBIBLE_PROMPTS')); // add styles foreach ($this->styles as $style) diff --git a/admin/src/View/Tag/HtmlView.php b/admin/src/View/Tag/HtmlView.php index 910ec7c..4ab03f8 100644 --- a/admin/src/View/Tag/HtmlView.php +++ b/admin/src/View/Tag/HtmlView.php @@ -54,6 +54,7 @@ class HtmlView extends BaseHtmlView { // set params $this->params = ComponentHelper::getParams('com_getbible'); + $this->useCoreUI = true; // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -218,6 +219,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $isNew = ($this->item->id < 1); $this->getDocument()->setTitle(Text::_($isNew ? 'COM_GETBIBLE_TAG_NEW' : 'COM_GETBIBLE_TAG_EDIT')); // add styles diff --git a/admin/src/View/Tagged_verse/HtmlView.php b/admin/src/View/Tagged_verse/HtmlView.php index df905f6..46b7545 100644 --- a/admin/src/View/Tagged_verse/HtmlView.php +++ b/admin/src/View/Tagged_verse/HtmlView.php @@ -54,6 +54,7 @@ class HtmlView extends BaseHtmlView { // set params $this->params = ComponentHelper::getParams('com_getbible'); + $this->useCoreUI = true; // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -218,6 +219,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $isNew = ($this->item->id < 1); $this->getDocument()->setTitle(Text::_($isNew ? 'COM_GETBIBLE_TAGGED_VERSE_NEW' : 'COM_GETBIBLE_TAGGED_VERSE_EDIT')); // add styles diff --git a/admin/src/View/Tagged_verses/HtmlView.php b/admin/src/View/Tagged_verses/HtmlView.php index 87ffb59..d6e18d6 100644 --- a/admin/src/View/Tagged_verses/HtmlView.php +++ b/admin/src/View/Tagged_verses/HtmlView.php @@ -170,6 +170,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $this->getDocument()->setTitle(Text::_('COM_GETBIBLE_TAGGED_VERSES')); // add styles foreach ($this->styles as $style) diff --git a/admin/src/View/Tags/HtmlView.php b/admin/src/View/Tags/HtmlView.php index 527d3d8..915081a 100644 --- a/admin/src/View/Tags/HtmlView.php +++ b/admin/src/View/Tags/HtmlView.php @@ -170,6 +170,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $this->getDocument()->setTitle(Text::_('COM_GETBIBLE_TAGS')); // add styles foreach ($this->styles as $style) diff --git a/admin/src/View/Translation/HtmlView.php b/admin/src/View/Translation/HtmlView.php index c95eb5b..2196072 100644 --- a/admin/src/View/Translation/HtmlView.php +++ b/admin/src/View/Translation/HtmlView.php @@ -54,6 +54,7 @@ class HtmlView extends BaseHtmlView { // set params $this->params = ComponentHelper::getParams('com_getbible'); + $this->useCoreUI = true; // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -144,6 +145,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $isNew = ($this->item->id < 1); $this->getDocument()->setTitle(Text::_($isNew ? 'COM_GETBIBLE_TRANSLATION_NEW' : 'COM_GETBIBLE_TRANSLATION_EDIT')); // add styles diff --git a/admin/src/View/Translations/HtmlView.php b/admin/src/View/Translations/HtmlView.php index 6f600ae..4eb0b81 100644 --- a/admin/src/View/Translations/HtmlView.php +++ b/admin/src/View/Translations/HtmlView.php @@ -180,6 +180,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $this->getDocument()->setTitle(Text::_('COM_GETBIBLE_TRANSLATIONS')); // add styles foreach ($this->styles as $style) diff --git a/admin/src/View/Verse/HtmlView.php b/admin/src/View/Verse/HtmlView.php index 0f9942b..4cfc97d 100644 --- a/admin/src/View/Verse/HtmlView.php +++ b/admin/src/View/Verse/HtmlView.php @@ -54,6 +54,7 @@ class HtmlView extends BaseHtmlView { // set params $this->params = ComponentHelper::getParams('com_getbible'); + $this->useCoreUI = true; // Assign the variables $this->form = $this->get('Form'); $this->item = $this->get('Item'); @@ -144,6 +145,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $isNew = ($this->item->id < 1); $this->getDocument()->setTitle(Text::_($isNew ? 'COM_GETBIBLE_VERSE_NEW' : 'COM_GETBIBLE_VERSE_EDIT')); // add styles diff --git a/admin/src/View/Verses/HtmlView.php b/admin/src/View/Verses/HtmlView.php index c8db80c..1fa6a9d 100644 --- a/admin/src/View/Verses/HtmlView.php +++ b/admin/src/View/Verses/HtmlView.php @@ -170,6 +170,8 @@ class HtmlView extends BaseHtmlView */ protected function _prepareDocument(): void { + // Load jQuery + Html::_('jquery.framework'); $this->getDocument()->setTitle(Text::_('COM_GETBIBLE_VERSES')); // add styles foreach ($this->styles as $style) diff --git a/getbible.xml b/getbible.xml index 742e09b..9ba79a7 100644 --- a/getbible.xml +++ b/getbible.xml @@ -1,15 +1,15 @@ COM_GETBIBLE - 8th March, 2024 + 20th March, 2024 Llewellyn van der Merwe joomla@vdm.io https://getbible.net Copyright (C) 2015. All Rights Reserved GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - 5.0.9 + 5.0.10 Get Bible (v.5.0.9) +

Get Bible (v.5.0.10)

Welcome to the next level of scripture engagement - The Bible for Joomla! Our purpose is to bring the Word of God to every person, in their native language, entirely free. This isn't just a typical extension; it's a groundbreaking tool developed to span language divides and deliver a rich, customizable Bible study experience to users worldwide. diff --git a/libraries/jcb_powers/VDM.Joomla/src/Utilities/FormHelper.php b/libraries/jcb_powers/VDM.Joomla/src/Utilities/FormHelper.php index a2f48fd..b21d71c 100644 --- a/libraries/jcb_powers/VDM.Joomla/src/Utilities/FormHelper.php +++ b/libraries/jcb_powers/VDM.Joomla/src/Utilities/FormHelper.php @@ -75,24 +75,24 @@ abstract class FormHelper // element was not returned return; } - switch (get_class($node)) + + if ($node instanceof \stdClass) { - case 'stdClass': - if (property_exists($node, 'comment')) - { - self::comment($xml, $node->comment); - } - if (property_exists($node, 'fieldXML')) - { - self::append($xml, $node->fieldXML); - } - break; - case 'SimpleXMLElement': - $domXML = \dom_import_simplexml($xml); - $domNode = \dom_import_simplexml($node); - $domXML->appendChild($domXML->ownerDocument->importNode($domNode, true)); - $xml = \simplexml_import_dom($domXML); - break; + if (property_exists($node, 'comment')) + { + self::comment($xml, $node->comment); + } + if (property_exists($node, 'fieldXML')) + { + self::append($xml, $node->fieldXML); + } + } + elseif ($node instanceof \SimpleXMLElement) + { + $domXML = \dom_import_simplexml($xml); + $domNode = \dom_import_simplexml($node); + $domXML->appendChild($domXML->ownerDocument->importNode($domNode, true)); + $xml = \simplexml_import_dom($domXML); } } @@ -127,7 +127,7 @@ abstract class FormHelper { foreach ($attributes as $key => $value) { - $xml->addAttribute($key, $value); + $xml->addAttribute($key, $value ?? ''); } } @@ -145,7 +145,7 @@ abstract class FormHelper foreach ($options as $key => $value) { $addOption = $xml->addChild('option'); - $addOption->addAttribute('value', $key); + $addOption->addAttribute('value', $key ?? ''); $addOption[] = $value; } } diff --git a/site/layouts/table.php b/site/layouts/table.php index a291dec..e787594 100644 --- a/site/layouts/table.php +++ b/site/layouts/table.php @@ -30,11 +30,12 @@ defined('JPATH_BASE') or die; $table_id = (isset($displayData['id'])) ? $displayData['id'] : StringHelper::random(7); $name = (isset($displayData['name'])) ? $displayData['name'] : false; $table_class = (isset($displayData['table_class'])) ? $displayData['table_class'] : 'uk-table'; +$table_container_class = (isset($displayData['table_container_class'])) ? $displayData['table_container_class'] : 'uk-overflow-auto'; $headers = (isset($displayData['headers'])) ? $displayData['headers'] : [Text::_('COM_GETBIBLE_NO'), Text::_('COM_GETBIBLE_HEADERS'), Text::_('COM_GETBIBLE_FOUND')]; $items = (isset($displayData['items'])) ? $displayData['items'] : 6; ?> -

+
diff --git a/site/src/View/App/HtmlView.php b/site/src/View/App/HtmlView.php index f40b12c..b4990e2 100644 --- a/site/src/View/App/HtmlView.php +++ b/site/src/View/App/HtmlView.php @@ -980,7 +980,7 @@ class HtmlView extends BaseHtmlView Html::_('script', $script, ['version' => 'auto']); } // Set the Custom JS script to view - $this->document->addScriptDeclaration(" + $this->getDocument()->addScriptDeclaration(" const UrlAjax = '$url_ajax'; const getShareHisWordUrl = (linker, translation, book, chapter) => { // build share His Word url diff --git a/site/src/View/Search/HtmlView.php b/site/src/View/Search/HtmlView.php index eb01f46..427adca 100644 --- a/site/src/View/Search/HtmlView.php +++ b/site/src/View/Search/HtmlView.php @@ -820,7 +820,7 @@ class HtmlView extends BaseHtmlView Html::_('script', $script, ['version' => 'auto']); } // Set the Custom JS script to view - $this->document->addScriptDeclaration(" + $this->getDocument()->addScriptDeclaration(" const urlSearch = '$url_search'; const urlAjax = '$url_ajax'; const getAppURL = (book, chapter, verse, translation = 'kjv') => { diff --git a/update_server.xml b/update_server.xml index a6d7e65..d64b9be 100644 --- a/update_server.xml +++ b/update_server.xml @@ -5,10 +5,10 @@ pkg_getbiblepackagesite - 3.0.6 + 3.0.7https://getbible.net - https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v3.0.6.zip + https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v3.0.7.zip stable @@ -23,10 +23,10 @@ pkg_getbible package site - 4.0.9 + 4.0.10 https://getbible.net - https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v4.0.9.zip + https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v4.0.10.zip stable @@ -215,4 +215,22 @@ https://getbible.net + + Get Bible + The Bible for Joomla + pkg_getbible + package + site + 5.0.10 + https://getbible.net + + https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v5.0.10.zip + + + stable + + Llewellyn van der Merwe + https://getbible.net + + \ No newline at end of file