diff --git a/CHANGELOG.md b/CHANGELOG.md index ff1dae2..4eff3eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v2.0.24 + +- Adds getBible Loader Plugin + # v2.0.23 - Refactored all core helper functions to make use of New classes diff --git a/README.md b/README.md index 31e7472..8acc2d2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Get Bible (2.0.23) +# Get Bible (2.0.24) ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/master/admin/assets/images/vdm-component.jpg "GetBible") @@ -18,38 +18,38 @@ 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*: 7th September, 2023 -+ *Version*: 2.0.23 ++ *Last Build*: 9th November, 2023 ++ *Version*: 2.0.24 + *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 -**556 Hours** or **70 Eight Hour Days** (actual time the author saved - +**560 Hours** or **70 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*: **199088** -+ *File count*: **1723** -+ *Folder count*: **163** ++ *Line count*: **200643** ++ *File count*: **1736** ++ *Folder count*: **167** -**366 Hours** or **45 Eight Hour Days** (the actual time the author spent) +**369 Hours** or **46 Eight Hour Days** (the actual time the author spent) > (with the following break down: -> **debugging @139hours** = codingtime / 4; -> **planning @79hours** = codingtime / 7; +> **debugging @140hours** = codingtime / 4; +> **planning @80hours** = codingtime / 7; > **mapping @56hours** = codingtime / 10; > **office @93hours** = codingtime / 6;) -**922 Hours** or **115 Eight Hour Days** +**929 Hours** or **116 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**, > with the normal everyday realities at the office, that includes the component planning, mapping & debugging.) -Project duration: **23 weeks** or **4.8 months** +Project duration: **23.2 weeks** or **4.8 months** > This **component** was build with a Joomla [Automated Component Builder](https://www.joomlacomponentbuilder.com). > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io) diff --git a/admin/README.txt b/admin/README.txt index 31e7472..8acc2d2 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -1,4 +1,4 @@ -# Get Bible (2.0.23) +# Get Bible (2.0.24) ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/master/admin/assets/images/vdm-component.jpg "GetBible") @@ -18,38 +18,38 @@ 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*: 7th September, 2023 -+ *Version*: 2.0.23 ++ *Last Build*: 9th November, 2023 ++ *Version*: 2.0.24 + *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 -**556 Hours** or **70 Eight Hour Days** (actual time the author saved - +**560 Hours** or **70 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*: **199088** -+ *File count*: **1723** -+ *Folder count*: **163** ++ *Line count*: **200643** ++ *File count*: **1736** ++ *Folder count*: **167** -**366 Hours** or **45 Eight Hour Days** (the actual time the author spent) +**369 Hours** or **46 Eight Hour Days** (the actual time the author spent) > (with the following break down: -> **debugging @139hours** = codingtime / 4; -> **planning @79hours** = codingtime / 7; +> **debugging @140hours** = codingtime / 4; +> **planning @80hours** = codingtime / 7; > **mapping @56hours** = codingtime / 10; > **office @93hours** = codingtime / 6;) -**922 Hours** or **115 Eight Hour Days** +**929 Hours** or **116 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**, > with the normal everyday realities at the office, that includes the component planning, mapping & debugging.) -Project duration: **23 weeks** or **4.8 months** +Project duration: **23.2 weeks** or **4.8 months** > This **component** was build with a Joomla [Automated Component Builder](https://www.joomlacomponentbuilder.com). > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io) diff --git a/admin/controllers/books.php b/admin/controllers/books.php index d6e10d9..b04e748 100644 --- a/admin/controllers/books.php +++ b/admin/controllers/books.php @@ -159,4 +159,4 @@ class GetbibleControllerBooks extends AdminController $this->setRedirect(JRoute::_('index.php?option=com_getbible&view=books', false), $message, 'error'); return; } -} +} \ No newline at end of file diff --git a/admin/controllers/chapters.php b/admin/controllers/chapters.php index a157982..92c8c0e 100644 --- a/admin/controllers/chapters.php +++ b/admin/controllers/chapters.php @@ -49,4 +49,4 @@ class GetbibleControllerChapters extends AdminController { return parent::getModel($name, $prefix, $config); } -} +} \ No newline at end of file diff --git a/admin/controllers/linkers.php b/admin/controllers/linkers.php index 65da3fe..7e371ae 100644 --- a/admin/controllers/linkers.php +++ b/admin/controllers/linkers.php @@ -49,4 +49,4 @@ class GetbibleControllerLinkers extends AdminController { return parent::getModel($name, $prefix, $config); } -} +} \ No newline at end of file diff --git a/admin/controllers/notes.php b/admin/controllers/notes.php index 952ab27..66e535e 100644 --- a/admin/controllers/notes.php +++ b/admin/controllers/notes.php @@ -49,4 +49,4 @@ class GetbibleControllerNotes extends AdminController { return parent::getModel($name, $prefix, $config); } -} +} \ No newline at end of file diff --git a/admin/controllers/open_ai_messages.php b/admin/controllers/open_ai_messages.php index d1a88c2..5a00145 100644 --- a/admin/controllers/open_ai_messages.php +++ b/admin/controllers/open_ai_messages.php @@ -49,4 +49,4 @@ class GetbibleControllerOpen_ai_messages extends AdminController { return parent::getModel($name, $prefix, $config); } -} +} \ No newline at end of file diff --git a/admin/controllers/open_ai_responses.php b/admin/controllers/open_ai_responses.php index f7856fd..998b78d 100644 --- a/admin/controllers/open_ai_responses.php +++ b/admin/controllers/open_ai_responses.php @@ -49,4 +49,4 @@ class GetbibleControllerOpen_ai_responses extends AdminController { return parent::getModel($name, $prefix, $config); } -} +} \ No newline at end of file diff --git a/admin/controllers/passwords.php b/admin/controllers/passwords.php index 4a008ef..f2b08f9 100644 --- a/admin/controllers/passwords.php +++ b/admin/controllers/passwords.php @@ -49,4 +49,4 @@ class GetbibleControllerPasswords extends AdminController { return parent::getModel($name, $prefix, $config); } -} +} \ No newline at end of file diff --git a/admin/controllers/prompts.php b/admin/controllers/prompts.php index d144152..38bc0f0 100644 --- a/admin/controllers/prompts.php +++ b/admin/controllers/prompts.php @@ -49,4 +49,4 @@ class GetbibleControllerPrompts extends AdminController { return parent::getModel($name, $prefix, $config); } -} +} \ No newline at end of file diff --git a/admin/controllers/tagged_verses.php b/admin/controllers/tagged_verses.php index 3ef684f..30713a1 100644 --- a/admin/controllers/tagged_verses.php +++ b/admin/controllers/tagged_verses.php @@ -49,4 +49,4 @@ class GetbibleControllerTagged_verses extends AdminController { return parent::getModel($name, $prefix, $config); } -} +} \ No newline at end of file diff --git a/admin/controllers/tags.php b/admin/controllers/tags.php index 360a32e..a07ced8 100644 --- a/admin/controllers/tags.php +++ b/admin/controllers/tags.php @@ -49,4 +49,4 @@ class GetbibleControllerTags extends AdminController { return parent::getModel($name, $prefix, $config); } -} +} \ No newline at end of file diff --git a/admin/controllers/translations.php b/admin/controllers/translations.php index aa8089c..ab6151f 100644 --- a/admin/controllers/translations.php +++ b/admin/controllers/translations.php @@ -137,4 +137,4 @@ class GetbibleControllerTranslations extends AdminController $this->setRedirect(JRoute::_('index.php?option=com_getbible&view=translations', false), $message, 'error'); return; } -} +} \ No newline at end of file diff --git a/admin/controllers/verses.php b/admin/controllers/verses.php index 754606f..e422a44 100644 --- a/admin/controllers/verses.php +++ b/admin/controllers/verses.php @@ -49,4 +49,4 @@ class GetbibleControllerVerses extends AdminController { return parent::getModel($name, $prefix, $config); } -} +} \ No newline at end of file diff --git a/admin/getbible.php b/admin/getbible.php index 435b779..9d98ca8 100644 --- a/admin/getbible.php +++ b/admin/getbible.php @@ -73,9 +73,8 @@ if (!JFactory::getUser()->authorise('core.manage', 'com_getbible')) }; // Add CSS file for all pages -$document = JFactory::getDocument(); -$document->addStyleSheet('components/com_getbible/assets/css/admin.css'); -$document->addScript('components/com_getbible/assets/js/admin.js'); +JHtml::_('stylesheet', 'components/com_getbible/assets/css/admin.css', ['version' => 'auto']); +JHtml::_('script', 'components/com_getbible/assets/js/admin.js', ['version' => 'auto']); // require helper files JLoader::register('GetbibleHelper', __DIR__ . '/helpers/getbible.php'); diff --git a/admin/helpers/getbible.php b/admin/helpers/getbible.php index 53f6f82..da66c81 100644 --- a/admin/helpers/getbible.php +++ b/admin/helpers/getbible.php @@ -75,7 +75,7 @@ use VDM\Joomla\Utilities\ObjectHelper; use VDM\Joomla\Utilities\GetHelper; use VDM\Joomla\Utilities\JsonHelper; use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper; -use VDM\Joomla\Componentbuilder\Utilities\FormHelper; +use VDM\Joomla\Utilities\FormHelper; /** * Getbible component helper. diff --git a/admin/language/en-GB/en-GB.com_getbible.ini b/admin/language/en-GB/en-GB.com_getbible.ini index 1bcdfcc..103d547 100644 --- a/admin/language/en-GB/en-GB.com_getbible.ini +++ b/admin/language/en-GB/en-GB.com_getbible.ini @@ -16,7 +16,7 @@ COM_GETBIBLE_BOOKS_ACCESS_DESC="Allows the users in this group to access access COM_GETBIBLE_BOOKS_BATCH_OPTIONS="Batch process the selected Books" COM_GETBIBLE_BOOKS_BATCH_TIP="All changes will be applied to all selected Books" COM_GETBIBLE_BOOKS_BATCH_USE="Books Batch Use" -COM_GETBIBLE_BOOKS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch books" +COM_GETBIBLE_BOOKS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch books" COM_GETBIBLE_BOOKS_CREATE="Books Create" COM_GETBIBLE_BOOKS_CREATE_DESC="Allows the users in this group to create create books" COM_GETBIBLE_BOOKS_DASHBOARD_LIST="Books Dashboard List" @@ -103,7 +103,7 @@ COM_GETBIBLE_CHAPTERS_ACCESS_DESC="Allows the users in this group to access acce COM_GETBIBLE_CHAPTERS_BATCH_OPTIONS="Batch process the selected Chapters" COM_GETBIBLE_CHAPTERS_BATCH_TIP="All changes will be applied to all selected Chapters" COM_GETBIBLE_CHAPTERS_BATCH_USE="Chapters Batch Use" -COM_GETBIBLE_CHAPTERS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch chapters" +COM_GETBIBLE_CHAPTERS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch chapters" COM_GETBIBLE_CHAPTERS_CREATE="Chapters Create" COM_GETBIBLE_CHAPTERS_CREATE_DESC="Allows the users in this group to create create chapters" COM_GETBIBLE_CHAPTERS_DASHBOARD_LIST="Chapters Dashboard List" @@ -631,7 +631,7 @@ COM_GETBIBLE_LINKERS_ACCESS_DESC="Allows the users in this group to access acces COM_GETBIBLE_LINKERS_BATCH_OPTIONS="Batch process the selected Linkers" COM_GETBIBLE_LINKERS_BATCH_TIP="All changes will be applied to all selected Linkers" COM_GETBIBLE_LINKERS_BATCH_USE="Linkers Batch Use" -COM_GETBIBLE_LINKERS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch linkers" +COM_GETBIBLE_LINKERS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch linkers" COM_GETBIBLE_LINKERS_CREATE="Linkers Create" COM_GETBIBLE_LINKERS_CREATE_DESC="Allows the users in this group to create create linkers" COM_GETBIBLE_LINKERS_DASHBOARD_LIST="Linkers Dashboard List" @@ -720,7 +720,7 @@ COM_GETBIBLE_NOTES_ACCESS_DESC="Allows the users in this group to access access COM_GETBIBLE_NOTES_BATCH_OPTIONS="Batch process the selected Notes" COM_GETBIBLE_NOTES_BATCH_TIP="All changes will be applied to all selected Notes" COM_GETBIBLE_NOTES_BATCH_USE="Notes Batch Use" -COM_GETBIBLE_NOTES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch notes" +COM_GETBIBLE_NOTES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch notes" COM_GETBIBLE_NOTES_CREATE="Notes Create" COM_GETBIBLE_NOTES_CREATE_DESC="Allows the users in this group to create create notes" COM_GETBIBLE_NOTES_DASHBOARD_LIST="Notes Dashboard List" @@ -752,7 +752,7 @@ COM_GETBIBLE_NOTES_EDIT_STATE_DESC="Allows the users in this group to update the COM_GETBIBLE_NOTES_EDIT_VERSE="Notes Edit Verse" COM_GETBIBLE_NOTES_EDIT_VERSE_DESC="Allows the users in this group to edit verse of note" COM_GETBIBLE_NOTES_EDIT_VERSION="Notes Edit Version" -COM_GETBIBLE_NOTES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version notes" +COM_GETBIBLE_NOTES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version notes" COM_GETBIBLE_NOTES_N_ITEMS_ARCHIVED="%s Notes archived." COM_GETBIBLE_NOTES_N_ITEMS_ARCHIVED_1="%s Note archived." COM_GETBIBLE_NOTES_N_ITEMS_CHECKED_IN_0="No Note successfully checked in." @@ -825,7 +825,7 @@ COM_GETBIBLE_OPEN_AI_MESSAGES_ACCESS_DESC="Allows the users in this group to acc COM_GETBIBLE_OPEN_AI_MESSAGES_BATCH_OPTIONS="Batch process the selected Open AI Messages" COM_GETBIBLE_OPEN_AI_MESSAGES_BATCH_TIP="All changes will be applied to all selected Open AI Messages" COM_GETBIBLE_OPEN_AI_MESSAGES_BATCH_USE="Open Ai Messages Batch Use" -COM_GETBIBLE_OPEN_AI_MESSAGES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch open ai messages" +COM_GETBIBLE_OPEN_AI_MESSAGES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch open ai messages" COM_GETBIBLE_OPEN_AI_MESSAGES_CREATE="Open Ai Messages Create" COM_GETBIBLE_OPEN_AI_MESSAGES_CREATE_DESC="Allows the users in this group to create create open ai messages" COM_GETBIBLE_OPEN_AI_MESSAGES_DELETE="Open Ai Messages Delete" @@ -855,7 +855,7 @@ COM_GETBIBLE_OPEN_AI_MESSAGES_EDIT_SOURCE_DESC="Allows the users in this group t COM_GETBIBLE_OPEN_AI_MESSAGES_EDIT_STATE="Open Ai Messages Edit State" COM_GETBIBLE_OPEN_AI_MESSAGES_EDIT_STATE_DESC="Allows the users in this group to update the state of the open ai message" COM_GETBIBLE_OPEN_AI_MESSAGES_EDIT_VERSION="Open Ai Messages Edit Version" -COM_GETBIBLE_OPEN_AI_MESSAGES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version open ai messages" +COM_GETBIBLE_OPEN_AI_MESSAGES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version open ai messages" COM_GETBIBLE_OPEN_AI_MESSAGES_N_ITEMS_ARCHIVED="%s Open AI Messages archived." COM_GETBIBLE_OPEN_AI_MESSAGES_N_ITEMS_ARCHIVED_1="%s Open AI Message archived." COM_GETBIBLE_OPEN_AI_MESSAGES_N_ITEMS_CHECKED_IN_0="No Open AI Message successfully checked in." @@ -921,7 +921,7 @@ COM_GETBIBLE_OPEN_AI_RESPONSES_ACCESS_DESC="Allows the users in this group to ac COM_GETBIBLE_OPEN_AI_RESPONSES_BATCH_OPTIONS="Batch process the selected Open AI Responses" COM_GETBIBLE_OPEN_AI_RESPONSES_BATCH_TIP="All changes will be applied to all selected Open AI Responses" COM_GETBIBLE_OPEN_AI_RESPONSES_BATCH_USE="Open Ai Responses Batch Use" -COM_GETBIBLE_OPEN_AI_RESPONSES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch open ai responses" +COM_GETBIBLE_OPEN_AI_RESPONSES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch open ai responses" COM_GETBIBLE_OPEN_AI_RESPONSES_CREATE="Open Ai Responses Create" COM_GETBIBLE_OPEN_AI_RESPONSES_CREATE_DESC="Allows the users in this group to create create open ai responses" COM_GETBIBLE_OPEN_AI_RESPONSES_DASHBOARD_LIST="Open Ai Responses Dashboard List" @@ -983,7 +983,7 @@ COM_GETBIBLE_OPEN_AI_RESPONSES_EDIT_TOTAL_TOKENS_DESC="Allows the users in this COM_GETBIBLE_OPEN_AI_RESPONSES_EDIT_VERSE="Open Ai Responses Edit Verse" COM_GETBIBLE_OPEN_AI_RESPONSES_EDIT_VERSE_DESC="Allows the users in this group to edit verse of open ai response" COM_GETBIBLE_OPEN_AI_RESPONSES_EDIT_VERSION="Open Ai Responses Edit Version" -COM_GETBIBLE_OPEN_AI_RESPONSES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version open ai responses" +COM_GETBIBLE_OPEN_AI_RESPONSES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version open ai responses" COM_GETBIBLE_OPEN_AI_RESPONSES_EDIT_WORD="Open Ai Responses Edit Word" COM_GETBIBLE_OPEN_AI_RESPONSES_EDIT_WORD_DESC="Allows the users in this group to edit word of open ai response" COM_GETBIBLE_OPEN_AI_RESPONSES_N_ITEMS_ARCHIVED="%s Open AI Responses archived." @@ -1106,7 +1106,7 @@ COM_GETBIBLE_PASSWORDS_ACCESS_PASSWORD_DESC="Allows the users in this group to a COM_GETBIBLE_PASSWORDS_BATCH_OPTIONS="Batch process the selected Passwords" COM_GETBIBLE_PASSWORDS_BATCH_TIP="All changes will be applied to all selected Passwords" COM_GETBIBLE_PASSWORDS_BATCH_USE="Passwords Batch Use" -COM_GETBIBLE_PASSWORDS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch passwords" +COM_GETBIBLE_PASSWORDS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch passwords" COM_GETBIBLE_PASSWORDS_CREATE="Passwords Create" COM_GETBIBLE_PASSWORDS_CREATE_DESC="Allows the users in this group to create create passwords" COM_GETBIBLE_PASSWORDS_DELETE="Passwords Delete" @@ -1192,7 +1192,7 @@ COM_GETBIBLE_PROMPTS_ACCESS_TEMPERATURE_OVERRIDE_DESC="Allows the users in this COM_GETBIBLE_PROMPTS_BATCH_OPTIONS="Batch process the selected Prompts" COM_GETBIBLE_PROMPTS_BATCH_TIP="All changes will be applied to all selected Prompts" COM_GETBIBLE_PROMPTS_BATCH_USE="Prompts Batch Use" -COM_GETBIBLE_PROMPTS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch prompts" +COM_GETBIBLE_PROMPTS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch prompts" COM_GETBIBLE_PROMPTS_CREATE="Prompts Create" COM_GETBIBLE_PROMPTS_CREATE_DESC="Allows the users in this group to create create prompts" COM_GETBIBLE_PROMPTS_DASHBOARD_LIST="Prompts Dashboard List" @@ -1256,7 +1256,7 @@ COM_GETBIBLE_PROMPTS_EDIT_TOP_P_DESC="Allows the users in this group to edit top COM_GETBIBLE_PROMPTS_EDIT_TOP_P_OVERRIDE="Prompts Edit Top P Override" COM_GETBIBLE_PROMPTS_EDIT_TOP_P_OVERRIDE_DESC="Allows the users in this group to edit top p override of prompt" COM_GETBIBLE_PROMPTS_EDIT_VERSION="Prompts Edit Version" -COM_GETBIBLE_PROMPTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version prompts" +COM_GETBIBLE_PROMPTS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version prompts" COM_GETBIBLE_PROMPTS_N_ITEMS_ARCHIVED="%s Prompts archived." COM_GETBIBLE_PROMPTS_N_ITEMS_ARCHIVED_1="%s Prompt archived." COM_GETBIBLE_PROMPTS_N_ITEMS_CHECKED_IN_0="No Prompt successfully checked in." @@ -1439,7 +1439,7 @@ COM_GETBIBLE_TAGGED_VERSES_ACCESS_DESC="Allows the users in this group to access COM_GETBIBLE_TAGGED_VERSES_BATCH_OPTIONS="Batch process the selected Tagged Verses" COM_GETBIBLE_TAGGED_VERSES_BATCH_TIP="All changes will be applied to all selected Tagged Verses" COM_GETBIBLE_TAGGED_VERSES_BATCH_USE="Tagged Verses Batch Use" -COM_GETBIBLE_TAGGED_VERSES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch tagged verses" +COM_GETBIBLE_TAGGED_VERSES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch tagged verses" COM_GETBIBLE_TAGGED_VERSES_CREATE="Tagged Verses Create" COM_GETBIBLE_TAGGED_VERSES_CREATE_DESC="Allows the users in this group to create create tagged verses" COM_GETBIBLE_TAGGED_VERSES_DASHBOARD_LIST="Tagged Verses Dashboard List" @@ -1473,7 +1473,7 @@ COM_GETBIBLE_TAGGED_VERSES_EDIT_TAG_DESC="Allows the users in this group to edit COM_GETBIBLE_TAGGED_VERSES_EDIT_VERSE="Tagged Verses Edit Verse" COM_GETBIBLE_TAGGED_VERSES_EDIT_VERSE_DESC="Allows the users in this group to edit verse of tagged verse" COM_GETBIBLE_TAGGED_VERSES_EDIT_VERSION="Tagged Verses Edit Version" -COM_GETBIBLE_TAGGED_VERSES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version tagged verses" +COM_GETBIBLE_TAGGED_VERSES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version tagged verses" COM_GETBIBLE_TAGGED_VERSES_N_ITEMS_ARCHIVED="%s Tagged Verses archived." COM_GETBIBLE_TAGGED_VERSES_N_ITEMS_ARCHIVED_1="%s Tagged Verse archived." COM_GETBIBLE_TAGGED_VERSES_N_ITEMS_CHECKED_IN_0="No Tagged Verse successfully checked in." @@ -1540,7 +1540,7 @@ COM_GETBIBLE_TAGS_ACCESS_DESC="Allows the users in this group to access access t COM_GETBIBLE_TAGS_BATCH_OPTIONS="Batch process the selected Tags" COM_GETBIBLE_TAGS_BATCH_TIP="All changes will be applied to all selected Tags" COM_GETBIBLE_TAGS_BATCH_USE="Tags Batch Use" -COM_GETBIBLE_TAGS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch tags" +COM_GETBIBLE_TAGS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch tags" COM_GETBIBLE_TAGS_CREATE="Tags Create" COM_GETBIBLE_TAGS_CREATE_DESC="Allows the users in this group to create create tags" COM_GETBIBLE_TAGS_DASHBOARD_LIST="Tags Dashboard List" @@ -1568,7 +1568,7 @@ COM_GETBIBLE_TAGS_EDIT_OWN_DESC="Allows the users in this group to edit edit own COM_GETBIBLE_TAGS_EDIT_STATE="Tags Edit State" COM_GETBIBLE_TAGS_EDIT_STATE_DESC="Allows the users in this group to update the state of the tag" COM_GETBIBLE_TAGS_EDIT_VERSION="Tags Edit Version" -COM_GETBIBLE_TAGS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version tags" +COM_GETBIBLE_TAGS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version tags" COM_GETBIBLE_TAGS_N_ITEMS_ARCHIVED="%s Tags archived." COM_GETBIBLE_TAGS_N_ITEMS_ARCHIVED_1="%s Tag archived." COM_GETBIBLE_TAGS_N_ITEMS_CHECKED_IN_0="No Tag successfully checked in." @@ -1658,7 +1658,7 @@ COM_GETBIBLE_TRANSLATIONS_ACCESS_DESC="Allows the users in this group to access COM_GETBIBLE_TRANSLATIONS_BATCH_OPTIONS="Batch process the selected Translations" COM_GETBIBLE_TRANSLATIONS_BATCH_TIP="All changes will be applied to all selected Translations" COM_GETBIBLE_TRANSLATIONS_BATCH_USE="Translations Batch Use" -COM_GETBIBLE_TRANSLATIONS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch translations" +COM_GETBIBLE_TRANSLATIONS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch translations" COM_GETBIBLE_TRANSLATIONS_CREATE="Translations Create" COM_GETBIBLE_TRANSLATIONS_CREATE_DESC="Allows the users in this group to create create translations" COM_GETBIBLE_TRANSLATIONS_DASHBOARD_LIST="Translations Dashboard List" @@ -1847,7 +1847,7 @@ COM_GETBIBLE_VERSES_ACCESS_DESC="Allows the users in this group to access access COM_GETBIBLE_VERSES_BATCH_OPTIONS="Batch process the selected Verses" COM_GETBIBLE_VERSES_BATCH_TIP="All changes will be applied to all selected Verses" COM_GETBIBLE_VERSES_BATCH_USE="Verses Batch Use" -COM_GETBIBLE_VERSES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch verses" +COM_GETBIBLE_VERSES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch verses" COM_GETBIBLE_VERSES_CREATE="Verses Create" COM_GETBIBLE_VERSES_CREATE_DESC="Allows the users in this group to create create verses" COM_GETBIBLE_VERSES_DASHBOARD_LIST="Verses Dashboard List" diff --git a/admin/language/en-GB/en-GB.com_getbible.sys.ini b/admin/language/en-GB/en-GB.com_getbible.sys.ini index d739617..ea6b599 100644 --- a/admin/language/en-GB/en-GB.com_getbible.sys.ini +++ b/admin/language/en-GB/en-GB.com_getbible.sys.ini @@ -2,7 +2,7 @@ COM_GETBIBLE="Get Bible" COM_GETBIBLE_BOOKS_ACCESS="Books Access" COM_GETBIBLE_BOOKS_ACCESS_DESC="Allows the users in this group to access access books" COM_GETBIBLE_BOOKS_BATCH_USE="Books Batch Use" -COM_GETBIBLE_BOOKS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch books" +COM_GETBIBLE_BOOKS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch books" COM_GETBIBLE_BOOKS_CREATE="Books Create" COM_GETBIBLE_BOOKS_CREATE_DESC="Allows the users in this group to create create books" COM_GETBIBLE_BOOKS_DASHBOARD_LIST="Books Dashboard List" @@ -36,7 +36,7 @@ COM_GETBIBLE_BOOK_UPDATE_CHAPTERS_NAMES_BUTTON_ACCESS_DESC="Allows the users in COM_GETBIBLE_CHAPTERS_ACCESS="Chapters Access" COM_GETBIBLE_CHAPTERS_ACCESS_DESC="Allows the users in this group to access access chapters" COM_GETBIBLE_CHAPTERS_BATCH_USE="Chapters Batch Use" -COM_GETBIBLE_CHAPTERS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch chapters" +COM_GETBIBLE_CHAPTERS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch chapters" COM_GETBIBLE_CHAPTERS_CREATE="Chapters Create" COM_GETBIBLE_CHAPTERS_CREATE_DESC="Allows the users in this group to create create chapters" COM_GETBIBLE_CHAPTERS_DASHBOARD_LIST="Chapters Dashboard List" @@ -75,7 +75,7 @@ COM_GETBIBLE_EDIT_VERSIONS_DESC="Allows users in this group to edit versions." COM_GETBIBLE_LINKERS_ACCESS="Linkers Access" COM_GETBIBLE_LINKERS_ACCESS_DESC="Allows the users in this group to access access linkers" COM_GETBIBLE_LINKERS_BATCH_USE="Linkers Batch Use" -COM_GETBIBLE_LINKERS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch linkers" +COM_GETBIBLE_LINKERS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch linkers" COM_GETBIBLE_LINKERS_CREATE="Linkers Create" COM_GETBIBLE_LINKERS_CREATE_DESC="Allows the users in this group to create create linkers" COM_GETBIBLE_LINKERS_DASHBOARD_LIST="Linkers Dashboard List" @@ -122,7 +122,7 @@ COM_GETBIBLE_MENU_VERSES="Verses" COM_GETBIBLE_NOTES_ACCESS="Notes Access" COM_GETBIBLE_NOTES_ACCESS_DESC="Allows the users in this group to access access notes" COM_GETBIBLE_NOTES_BATCH_USE="Notes Batch Use" -COM_GETBIBLE_NOTES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch notes" +COM_GETBIBLE_NOTES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch notes" COM_GETBIBLE_NOTES_CREATE="Notes Create" COM_GETBIBLE_NOTES_CREATE_DESC="Allows the users in this group to create create notes" COM_GETBIBLE_NOTES_DASHBOARD_LIST="Notes Dashboard List" @@ -154,13 +154,13 @@ COM_GETBIBLE_NOTES_EDIT_STATE_DESC="Allows the users in this group to update the COM_GETBIBLE_NOTES_EDIT_VERSE="Notes Edit Verse" COM_GETBIBLE_NOTES_EDIT_VERSE_DESC="Allows the users in this group to edit verse of note" COM_GETBIBLE_NOTES_EDIT_VERSION="Notes Edit Version" -COM_GETBIBLE_NOTES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version notes" +COM_GETBIBLE_NOTES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version notes" COM_GETBIBLE_NOTES_SUBMENU="Notes Submenu" COM_GETBIBLE_NOTES_SUBMENU_DESC="Allows the users in this group to submenu of note" COM_GETBIBLE_OPEN_AI_MESSAGES_ACCESS="Open Ai Messages Access" COM_GETBIBLE_OPEN_AI_MESSAGES_ACCESS_DESC="Allows the users in this group to access access open ai messages" COM_GETBIBLE_OPEN_AI_MESSAGES_BATCH_USE="Open Ai Messages Batch Use" -COM_GETBIBLE_OPEN_AI_MESSAGES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch open ai messages" +COM_GETBIBLE_OPEN_AI_MESSAGES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch open ai messages" COM_GETBIBLE_OPEN_AI_MESSAGES_CREATE="Open Ai Messages Create" COM_GETBIBLE_OPEN_AI_MESSAGES_CREATE_DESC="Allows the users in this group to create create open ai messages" COM_GETBIBLE_OPEN_AI_MESSAGES_DELETE="Open Ai Messages Delete" @@ -190,11 +190,11 @@ COM_GETBIBLE_OPEN_AI_MESSAGES_EDIT_SOURCE_DESC="Allows the users in this group t COM_GETBIBLE_OPEN_AI_MESSAGES_EDIT_STATE="Open Ai Messages Edit State" COM_GETBIBLE_OPEN_AI_MESSAGES_EDIT_STATE_DESC="Allows the users in this group to update the state of the open ai message" COM_GETBIBLE_OPEN_AI_MESSAGES_EDIT_VERSION="Open Ai Messages Edit Version" -COM_GETBIBLE_OPEN_AI_MESSAGES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version open ai messages" +COM_GETBIBLE_OPEN_AI_MESSAGES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version open ai messages" COM_GETBIBLE_OPEN_AI_RESPONSES_ACCESS="Open Ai Responses Access" COM_GETBIBLE_OPEN_AI_RESPONSES_ACCESS_DESC="Allows the users in this group to access access open ai responses" COM_GETBIBLE_OPEN_AI_RESPONSES_BATCH_USE="Open Ai Responses Batch Use" -COM_GETBIBLE_OPEN_AI_RESPONSES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch open ai responses" +COM_GETBIBLE_OPEN_AI_RESPONSES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch open ai responses" COM_GETBIBLE_OPEN_AI_RESPONSES_CREATE="Open Ai Responses Create" COM_GETBIBLE_OPEN_AI_RESPONSES_CREATE_DESC="Allows the users in this group to create create open ai responses" COM_GETBIBLE_OPEN_AI_RESPONSES_DASHBOARD_LIST="Open Ai Responses Dashboard List" @@ -256,7 +256,7 @@ COM_GETBIBLE_OPEN_AI_RESPONSES_EDIT_TOTAL_TOKENS_DESC="Allows the users in this COM_GETBIBLE_OPEN_AI_RESPONSES_EDIT_VERSE="Open Ai Responses Edit Verse" COM_GETBIBLE_OPEN_AI_RESPONSES_EDIT_VERSE_DESC="Allows the users in this group to edit verse of open ai response" COM_GETBIBLE_OPEN_AI_RESPONSES_EDIT_VERSION="Open Ai Responses Edit Version" -COM_GETBIBLE_OPEN_AI_RESPONSES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version open ai responses" +COM_GETBIBLE_OPEN_AI_RESPONSES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version open ai responses" COM_GETBIBLE_OPEN_AI_RESPONSES_EDIT_WORD="Open Ai Responses Edit Word" COM_GETBIBLE_OPEN_AI_RESPONSES_EDIT_WORD_DESC="Allows the users in this group to edit word of open ai response" COM_GETBIBLE_OPEN_AI_RESPONSES_SUBMENU="Open Ai Responses Submenu" @@ -266,7 +266,7 @@ COM_GETBIBLE_PASSWORDS_ACCESS_DESC="Allows the users in this group to access acc COM_GETBIBLE_PASSWORDS_ACCESS_PASSWORD="Passwords Access Password" COM_GETBIBLE_PASSWORDS_ACCESS_PASSWORD_DESC="Allows the users in this group to access password of password" COM_GETBIBLE_PASSWORDS_BATCH_USE="Passwords Batch Use" -COM_GETBIBLE_PASSWORDS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch passwords" +COM_GETBIBLE_PASSWORDS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch passwords" COM_GETBIBLE_PASSWORDS_CREATE="Passwords Create" COM_GETBIBLE_PASSWORDS_CREATE_DESC="Allows the users in this group to create create passwords" COM_GETBIBLE_PASSWORDS_DELETE="Passwords Delete" @@ -296,7 +296,7 @@ COM_GETBIBLE_PROMPTS_ACCESS_DESC="Allows the users in this group to access acces COM_GETBIBLE_PROMPTS_ACCESS_TEMPERATURE_OVERRIDE="Prompts Access Temperature Override" COM_GETBIBLE_PROMPTS_ACCESS_TEMPERATURE_OVERRIDE_DESC="Allows the users in this group to access temperature override of prompt" COM_GETBIBLE_PROMPTS_BATCH_USE="Prompts Batch Use" -COM_GETBIBLE_PROMPTS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch prompts" +COM_GETBIBLE_PROMPTS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch prompts" COM_GETBIBLE_PROMPTS_CREATE="Prompts Create" COM_GETBIBLE_PROMPTS_CREATE_DESC="Allows the users in this group to create create prompts" COM_GETBIBLE_PROMPTS_DASHBOARD_LIST="Prompts Dashboard List" @@ -360,13 +360,13 @@ COM_GETBIBLE_PROMPTS_EDIT_TOP_P_DESC="Allows the users in this group to edit top COM_GETBIBLE_PROMPTS_EDIT_TOP_P_OVERRIDE="Prompts Edit Top P Override" COM_GETBIBLE_PROMPTS_EDIT_TOP_P_OVERRIDE_DESC="Allows the users in this group to edit top p override of prompt" COM_GETBIBLE_PROMPTS_EDIT_VERSION="Prompts Edit Version" -COM_GETBIBLE_PROMPTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version prompts" +COM_GETBIBLE_PROMPTS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version prompts" COM_GETBIBLE_PROMPTS_SUBMENU="Prompts Submenu" COM_GETBIBLE_PROMPTS_SUBMENU_DESC="Allows the users in this group to submenu of prompt" COM_GETBIBLE_TAGGED_VERSES_ACCESS="Tagged Verses Access" COM_GETBIBLE_TAGGED_VERSES_ACCESS_DESC="Allows the users in this group to access access tagged verses" COM_GETBIBLE_TAGGED_VERSES_BATCH_USE="Tagged Verses Batch Use" -COM_GETBIBLE_TAGGED_VERSES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch tagged verses" +COM_GETBIBLE_TAGGED_VERSES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch tagged verses" COM_GETBIBLE_TAGGED_VERSES_CREATE="Tagged Verses Create" COM_GETBIBLE_TAGGED_VERSES_CREATE_DESC="Allows the users in this group to create create tagged verses" COM_GETBIBLE_TAGGED_VERSES_DASHBOARD_LIST="Tagged Verses Dashboard List" @@ -400,13 +400,13 @@ COM_GETBIBLE_TAGGED_VERSES_EDIT_TAG_DESC="Allows the users in this group to edit COM_GETBIBLE_TAGGED_VERSES_EDIT_VERSE="Tagged Verses Edit Verse" COM_GETBIBLE_TAGGED_VERSES_EDIT_VERSE_DESC="Allows the users in this group to edit verse of tagged verse" COM_GETBIBLE_TAGGED_VERSES_EDIT_VERSION="Tagged Verses Edit Version" -COM_GETBIBLE_TAGGED_VERSES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version tagged verses" +COM_GETBIBLE_TAGGED_VERSES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version tagged verses" COM_GETBIBLE_TAGGED_VERSES_SUBMENU="Tagged Verses Submenu" COM_GETBIBLE_TAGGED_VERSES_SUBMENU_DESC="Allows the users in this group to submenu of tagged verse" COM_GETBIBLE_TAGS_ACCESS="Tags Access" COM_GETBIBLE_TAGS_ACCESS_DESC="Allows the users in this group to access access tags" COM_GETBIBLE_TAGS_BATCH_USE="Tags Batch Use" -COM_GETBIBLE_TAGS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch tags" +COM_GETBIBLE_TAGS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch tags" COM_GETBIBLE_TAGS_CREATE="Tags Create" COM_GETBIBLE_TAGS_CREATE_DESC="Allows the users in this group to create create tags" COM_GETBIBLE_TAGS_DASHBOARD_LIST="Tags Dashboard List" @@ -434,13 +434,13 @@ COM_GETBIBLE_TAGS_EDIT_OWN_DESC="Allows the users in this group to edit edit own COM_GETBIBLE_TAGS_EDIT_STATE="Tags Edit State" COM_GETBIBLE_TAGS_EDIT_STATE_DESC="Allows the users in this group to update the state of the tag" COM_GETBIBLE_TAGS_EDIT_VERSION="Tags Edit Version" -COM_GETBIBLE_TAGS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version tags" +COM_GETBIBLE_TAGS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version tags" COM_GETBIBLE_TAGS_SUBMENU="Tags Submenu" COM_GETBIBLE_TAGS_SUBMENU_DESC="Allows the users in this group to submenu of tag" COM_GETBIBLE_TRANSLATIONS_ACCESS="Translations Access" COM_GETBIBLE_TRANSLATIONS_ACCESS_DESC="Allows the users in this group to access access translations" COM_GETBIBLE_TRANSLATIONS_BATCH_USE="Translations Batch Use" -COM_GETBIBLE_TRANSLATIONS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch translations" +COM_GETBIBLE_TRANSLATIONS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch translations" COM_GETBIBLE_TRANSLATIONS_CREATE="Translations Create" COM_GETBIBLE_TRANSLATIONS_CREATE_DESC="Allows the users in this group to create create translations" COM_GETBIBLE_TRANSLATIONS_DASHBOARD_LIST="Translations Dashboard List" @@ -502,7 +502,7 @@ COM_GETBIBLE_USE_BATCH_DESC="Allows users in this group to use batch copy/update COM_GETBIBLE_VERSES_ACCESS="Verses Access" COM_GETBIBLE_VERSES_ACCESS_DESC="Allows the users in this group to access access verses" COM_GETBIBLE_VERSES_BATCH_USE="Verses Batch Use" -COM_GETBIBLE_VERSES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch verses" +COM_GETBIBLE_VERSES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch verses" COM_GETBIBLE_VERSES_CREATE="Verses Create" COM_GETBIBLE_VERSES_CREATE_DESC="Allows the users in this group to create create verses" COM_GETBIBLE_VERSES_DASHBOARD_LIST="Verses Dashboard List" diff --git a/admin/models/getbible.php b/admin/models/getbible.php index a676612..49b49d8 100644 --- a/admin/models/getbible.php +++ b/admin/models/getbible.php @@ -38,7 +38,7 @@ class GetbibleModelGetbible extends ListModel 'main' => array('png.linkers', 'png.notes', 'png.tagged_verses', 'png.prompts', 'png.open_ai_responses', 'png.tags', 'png.translations', 'png.books', 'png.chapters', 'png.verses') ); // view access array - $viewAccess = array( + $viewAccess = [ 'linker.create' => 'linker.create', 'linkers.access' => 'linker.access', 'linker.access' => 'linker.access', @@ -94,7 +94,8 @@ class GetbibleModelGetbible extends ListModel 'verses.access' => 'verse.access', 'verse.access' => 'verse.access', 'verses.submenu' => 'verse.submenu', - 'verses.dashboard_list' => 'verse.dashboard_list'); + 'verses.dashboard_list' => 'verse.dashboard_list', + ]; // loop over the $views foreach($viewGroups as $group => $views) { diff --git a/admin/sql/updates/mysql/2.0.23.sql b/admin/sql/updates/mysql/2.0.23.sql new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/admin/sql/updates/mysql/2.0.23.sql @@ -0,0 +1 @@ + diff --git a/getbible.xml b/getbible.xml index 8400ac2..9aec097 100644 --- a/getbible.xml +++ b/getbible.xml @@ -1,15 +1,15 @@ COM_GETBIBLE - 7th September, 2023 + 9th November, 2023 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 - 2.0.23 + 2.0.24 Get Bible (v.2.0.23) +

Get Bible (v.2.0.24)

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.Gitea/src/Abstraction/Api.php b/libraries/jcb_powers/VDM.Joomla.Gitea/src/Abstraction/Api.php index 912af82..ecd5787 100644 --- a/libraries/jcb_powers/VDM.Joomla.Gitea/src/Abstraction/Api.php +++ b/libraries/jcb_powers/VDM.Joomla.Gitea/src/Abstraction/Api.php @@ -48,6 +48,22 @@ abstract class Api */ protected Response $response; + /** + * The Url string + * + * @var string|null + * @since 3.2.0 + */ + protected ?string $url = null; + + /** + * The token string + * + * @var string|null + * @since 3.2.0 + */ + protected ?string $token = null; + /** * Constructor. * @@ -67,14 +83,31 @@ abstract class Api /** * Load/Reload API. * - * @param string|null $url The url. - * @param token|null $token The token. + * @param string|null $url The url. + * @param token|null $token The token. + * @param bool $backup The backup swapping switch. * * @return void * @since 3.2.0 **/ - public function load_(?string $url = null, ?string $token = null) + public function load_(?string $url = null, ?string $token = null, bool $backup = true): void { + // we keep the old values + // so we can reset after our call + // for the rest of the container + if ($backup) + { + if ($url !== null) + { + $this->url = $this->uri->getUrl(); + } + + if ($token !== null) + { + $this->token = $this->http->getToken(); + } + } + if ($url !== null) { $this->uri->setUrl($url); @@ -85,6 +118,37 @@ abstract class Api $this->http->setToken($token); } } - + + /** + * Reset to previous toke, url it set + * + * @return void + * @since 3.2.0 + **/ + public function reset_(): void + { + if ($this->url !== null) + { + $this->uri->setUrl($this->url); + $this->url = null; + } + + if ($this->token !== null) + { + $this->http->setToken($this->token); + $this->token = null; + } + } + + /** + * Get the API url + * + * @return string + * @since 3.2.0 + **/ + public function api() + { + return $this->uri->api(); + } } diff --git a/libraries/jcb_powers/VDM.Joomla.Gitea/src/Repository/Contents.php b/libraries/jcb_powers/VDM.Joomla.Gitea/src/Repository/Contents.php index 982403c..3f2476b 100644 --- a/libraries/jcb_powers/VDM.Joomla.Gitea/src/Repository/Contents.php +++ b/libraries/jcb_powers/VDM.Joomla.Gitea/src/Repository/Contents.php @@ -205,16 +205,19 @@ class Contents extends Api // Build the request path. $path = "/repos/{$owner}/{$repo}/contents"; + // Get the URI with the specified path. + $uri = $this->uri->get($path); + // Add the 'ref' parameter if it's provided. if ($ref !== null) { - $this->uri->setVar('ref', $ref); + $uri->setVar('ref', $ref); } // Send the get request. return $this->response->get( $this->http->get( - $this->uri->get($path) + $uri ) ); } @@ -227,8 +230,8 @@ class Contents extends Api * @param string $filepath The file path. * @param string $content The file content. * @param string $message The commit message. - * @param string $branch The branch name. Defaults to the repository's default branch. * @param string $sha The blob SHA of the file. + * @param string $branch The branch name. Defaults to the repository's default branch. * @param string|null $authorName The author name. Defaults to the authenticated user. * @param string|null $authorEmail The author email. Defaults to the authenticated user. * @param string|null $committerName The committer name. Defaults to the authenticated user. @@ -248,8 +251,8 @@ class Contents extends Api string $filepath, string $content, string $message, - string $branch = 'master', string $sha, + string $branch = 'master', ?string $authorName = null, ?string $authorEmail = null, ?string $committerName = null, @@ -503,7 +506,6 @@ class Contents extends Api $this->uri->get($path) ) ); - } - + } } diff --git a/libraries/jcb_powers/VDM.Joomla.Gitea/src/Service/Admin.php b/libraries/jcb_powers/VDM.Joomla.Gitea/src/Service/Admin.php index be64aa1..e6fc518 100644 --- a/libraries/jcb_powers/VDM.Joomla.Gitea/src/Service/Admin.php +++ b/libraries/jcb_powers/VDM.Joomla.Gitea/src/Service/Admin.php @@ -179,7 +179,6 @@ class Admin implements ServiceProviderInterface $container->get('Gitea.Dynamic.Uri'), $container->get('Gitea.Utilities.Response') ); - } - + } } diff --git a/libraries/jcb_powers/VDM.Joomla.Gitea/src/Service/Jcb.php b/libraries/jcb_powers/VDM.Joomla.Gitea/src/Service/Jcb.php index 5e6a7a8..7835275 100644 --- a/libraries/jcb_powers/VDM.Joomla.Gitea/src/Service/Jcb.php +++ b/libraries/jcb_powers/VDM.Joomla.Gitea/src/Service/Jcb.php @@ -58,7 +58,7 @@ class Jcb implements ServiceProviderInterface $gitea_url = Helper::getParams('com_componentbuilder')->get('custom_gitea_url'); // only load this if we have a custom URL set - if ($add_gitea_url == 2 && is_string($gitea_url) && strpos($gitea_url, 'http') !== false) + if ($add_gitea_url == 2 && !empty($gitea_url) && strpos($gitea_url, 'http') !== false) { return new Uri($gitea_url); } @@ -76,9 +76,19 @@ class Jcb implements ServiceProviderInterface */ public function getHttp(Container $container): Http { - return new Http( - Helper::getParams('com_componentbuilder')->get('gitea_token') - ); + $add_gitea_url = Helper::getParams('com_componentbuilder')->get('add_custom_gitea_url', 1); + if ($add_gitea_url == 2) + { + return new Http( + Helper::getParams('com_componentbuilder')->get('custom_gitea_token') + ); + } + else + { + return new Http( + Helper::getParams('com_componentbuilder')->get('gitea_token') + ); + } } } diff --git a/libraries/jcb_powers/VDM.Joomla.Gitea/src/Service/Utilities.php b/libraries/jcb_powers/VDM.Joomla.Gitea/src/Service/Utilities.php index 09112d2..06427b6 100644 --- a/libraries/jcb_powers/VDM.Joomla.Gitea/src/Service/Utilities.php +++ b/libraries/jcb_powers/VDM.Joomla.Gitea/src/Service/Utilities.php @@ -66,7 +66,6 @@ class Utilities implements ServiceProviderInterface public function getResponse(Container $container): Response { return new Response(); - } - + } } diff --git a/libraries/jcb_powers/VDM.Joomla.Gitea/src/Utilities/Http.php b/libraries/jcb_powers/VDM.Joomla.Gitea/src/Utilities/Http.php index 7f0b817..6c5b3c6 100644 --- a/libraries/jcb_powers/VDM.Joomla.Gitea/src/Utilities/Http.php +++ b/libraries/jcb_powers/VDM.Joomla.Gitea/src/Utilities/Http.php @@ -23,6 +23,14 @@ use Joomla\Registry\Registry; */ final class Http extends JoomlaHttp { + /** + * The token + * + * @var string + * @since 3.2.0 + */ + protected string $_token_; // to avoid collusions (but allow swapping) + /** * Constructor. * @@ -45,6 +53,7 @@ final class Http extends JoomlaHttp if (is_string($token)) { $config['headers']['Authorization'] = 'token ' . $token; + $this->_token_ = $token; } $options = new Registry($config); @@ -60,7 +69,7 @@ final class Http extends JoomlaHttp * * @since 3.2.0 **/ - public function setToken(string $token) + public function setToken(string $token): void { // get the current headers $headers = (array) $this->getOption('headers', [ @@ -70,9 +79,20 @@ final class Http extends JoomlaHttp // add the token $headers['Authorization'] = 'token ' . $token; + $this->_token_ = $token; $this->setOption('headers', $headers); } - + + /** + * Get the Token. + * + * @return string|null + * @since 3.2.0 + **/ + public function getToken(): ?string + { + return $this->_token_ ?? null; + } } diff --git a/libraries/jcb_powers/VDM.Joomla.Gitea/src/Utilities/Uri.php b/libraries/jcb_powers/VDM.Joomla.Gitea/src/Utilities/Uri.php index d31ac8e..daa3add 100644 --- a/libraries/jcb_powers/VDM.Joomla.Gitea/src/Utilities/Uri.php +++ b/libraries/jcb_powers/VDM.Joomla.Gitea/src/Utilities/Uri.php @@ -107,7 +107,18 @@ final class Uri **/ public function setUrl(string $url) { - return $this->url = $url; + $this->url = $url; + } + + /** + * Get the URL of the API + * + * @return string|null + * @since 3.2.0 + **/ + public function getUrl(): ?string + { + return $this->url ?? null; } /** @@ -120,7 +131,7 @@ final class Uri **/ private function setEndpoint(string $endpoint) { - return $this->endpoint = $endpoint; + $this->endpoint = $endpoint; } /** @@ -133,8 +144,7 @@ final class Uri **/ private function setVersion($version) { - return $this->version = $version; - } - + $this->version = $version; + } } diff --git a/libraries/jcb_powers/VDM.Joomla/src/Database/Load.php b/libraries/jcb_powers/VDM.Joomla/src/Database/Load.php index 5d88778..620f99c 100644 --- a/libraries/jcb_powers/VDM.Joomla/src/Database/Load.php +++ b/libraries/jcb_powers/VDM.Joomla/src/Database/Load.php @@ -385,25 +385,48 @@ final class Load extends Database implements LoadInterface { if (isset($value['value']) && isset($value['operator'])) { - if (ArrayHelper::check($value['value'])) + // check if value needs to be quoted + $quote = $value['quote'] ?? true; + if (!$quote) { - // add the where by array - $query->where($this->db->quoteName($key) . ' ' . - $value['operator'] . ' (' . - implode(',', - array_map( - fn($val) => $this->quote($val), - $value['value'] - ) - ) - . ')' - ); + if (ArrayHelper::check($value['value'])) + { + // add the where by array + $query->where($this->db->quoteName($key) . ' ' . + $value['operator'] . ' (' . + implode(',', $value['value']) + . ')' + ); + } + else + { + // add the where + $query->where($this->db->quoteName($key) . ' ' . + $value['operator'] . ' ' . $value['value']); + } } else { - // add the where - $query->where($this->db->quoteName($key) . ' ' . - $value['operator'] . ' ' . $this->quote($value['value'])); + if (ArrayHelper::check($value['value'])) + { + // add the where by array + $query->where($this->db->quoteName($key) . ' ' . + $value['operator'] . ' (' . + implode(',', + array_map( + fn($val) => $this->quote($val), + $value['value'] + ) + ) + . ')' + ); + } + else + { + // add the where + $query->where($this->db->quoteName($key) . ' ' . + $value['operator'] . ' ' . $this->quote($value['value'])); + } } } else diff --git a/libraries/jcb_powers/VDM.Joomla/src/Utilities/FormHelper.php b/libraries/jcb_powers/VDM.Joomla/src/Utilities/FormHelper.php new file mode 100644 index 0000000..a2f48fd --- /dev/null +++ b/libraries/jcb_powers/VDM.Joomla/src/Utilities/FormHelper.php @@ -0,0 +1,187 @@ + + * @git Joomla Component Builder + * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved. + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +namespace VDM\Joomla\Utilities; + + +use Joomla\CMS\Form\FormHelper as JoomlaFormHelper; +use Joomla\CMS\Form\FormField; + + +/** + * Form Helper + * + * @since 3.2.0 + */ +abstract class FormHelper +{ + /** + * get the field xml + * + * @param array $attributes The array of attributes + * @param array $options The options to apply to the XML element + * + * @return \SimpleXMLElement|null + * @since 3.2.0 + */ + public static function xml(array $attributes, ?array $options = null): ?\SimpleXMLElement + { + // make sure we have attributes and a type value + if (ArrayHelper::check($attributes)) + { + // start field xml + $XML = new \SimpleXMLElement(''); + + // load the attributes + self::attributes($XML, $attributes); + + // check if we have options + if (ArrayHelper::check($options)) + { + // load the options + self::options($XML, $options); + } + + // return the field xml + return $XML; + } + + return null; + } + + /** + * xmlAppend + * + * @param \SimpleXMLElement $xml The XML element reference in which to inject a comment + * @param mixed $node A SimpleXMLElement node to append to the XML element reference, + * or a stdClass object containing a comment attribute to be injected + * before the XML node and a fieldXML attribute containing a SimpleXMLElement + * + * @return void + * @since 3.2.0 + */ + public static function append(\SimpleXMLElement &$xml, $node) + { + if (!$node) + { + // element was not returned + return; + } + switch (get_class($node)) + { + 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; + } + } + + /** + * xmlComment + * + * @param \SimpleXMLElement $xml The XML element reference in which to inject a comment + * @param string $comment The comment to inject + * + * @return void + * @since 3.2.0 + */ + public static function comment(\SimpleXMLElement &$xml, string $comment) + { + $domXML = \dom_import_simplexml($xml); + $domComment = new \DOMComment($comment); + $nodeTarget = $domXML->ownerDocument->importNode($domComment, true); + $domXML->appendChild($nodeTarget); + $xml = \simplexml_import_dom($domXML); + } + + /** + * xmlAddAttributes + * + * @param \SimpleXMLElement $xml The XML element reference in which to inject a comment + * @param array $attributes The attributes to apply to the XML element + * + * @return void + * @since 3.2.0 + */ + public static function attributes(\SimpleXMLElement &$xml, array $attributes = []) + { + foreach ($attributes as $key => $value) + { + $xml->addAttribute($key, $value); + } + } + + /** + * xmlAddOptions + * + * @param \SimpleXMLElement $xml The XML element reference in which to inject a comment + * @param array $options The options to apply to the XML element + * + * @return void + * @since 3.2.0 + */ + public static function options(\SimpleXMLElement &$xml, array $options = []) + { + foreach ($options as $key => $value) + { + $addOption = $xml->addChild('option'); + $addOption->addAttribute('value', $key); + $addOption[] = $value; + } + } + + /** + * get the field object + * + * @param array $attributes The array of attributes + * @param string $default The default of the field + * @param array $options The options to apply to the XML element + * + * @return FormField|null + * @since 3.2.0 + */ + public static function field(array $attributes, string $default = '', ?array $options = null): ?FormField + { + // make sure we have attributes and a type value + if (ArrayHelper::check($attributes) && isset($attributes['type'])) + { + // get field type + if (($field = JoomlaFormHelper::loadFieldType($attributes['type'], true)) === false) + { + return null; + } + + // get field xml + $XML = self::xml($attributes, $options); + + // setup the field + $field->setup($XML, $default); + + // return the field object + return $field; + } + + return null; + } +} + diff --git a/libraries/jcb_powers/VDM.Joomla/src/Utilities/index.html b/libraries/jcb_powers/VDM.Joomla/src/Utilities/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/libraries/jcb_powers/VDM.Joomla/src/Utilities/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/script.php b/script.php index ac89ab0..3314e50 100644 --- a/script.php +++ b/script.php @@ -1539,7 +1539,7 @@ class com_getbibleInstallerScript echo ' -

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

'; +

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

'; // Set db if not set already. if (!isset($db)) diff --git a/site/getbible.php b/site/getbible.php index 4568b2b..34d9783 100644 --- a/site/getbible.php +++ b/site/getbible.php @@ -67,9 +67,8 @@ spl_autoload_register(function ($class) { // Set the component css/js -$document = JFactory::getDocument(); -$document->addStyleSheet('components/com_getbible/assets/css/site.css'); -$document->addScript('components/com_getbible/assets/js/site.js'); +JHtml::_('stylesheet', 'components/com_getbible/assets/css/site.css', ['version' => 'auto']); +JHtml::_('script', 'components/com_getbible/assets/js/site.js', ['version' => 'auto']); // Require helper files JLoader::register('GetbibleHelper', __DIR__ . '/helpers/getbible.php'); diff --git a/site/helpers/getbible.php b/site/helpers/getbible.php index 5e41127..6d5a74e 100644 --- a/site/helpers/getbible.php +++ b/site/helpers/getbible.php @@ -73,7 +73,7 @@ use VDM\Joomla\GetBible\Factory; use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper; use VDM\Joomla\Utilities\JsonHelper; use VDM\Joomla\Utilities\ObjectHelper; -use VDM\Joomla\Componentbuilder\Utilities\FormHelper; +use VDM\Joomla\Utilities\FormHelper; use VDM\Joomla\Utilities\GetHelper; use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper; diff --git a/site/models/app.php b/site/models/app.php index 8ab0b64..55ce95c 100644 --- a/site/models/app.php +++ b/site/models/app.php @@ -985,7 +985,7 @@ class GetbibleModelApp extends ItemModel JPluginHelper::importPlugin('content'); $this->_dispatcher = JFactory::getApplication(); // Check if we can decode distribution_history - if (GetbibleHelper::checkJson($data->distribution_history)) + if (isset($data->distribution_history) && GetbibleHelper::checkJson($data->distribution_history)) { // Decode distribution_history $data->distribution_history = json_decode($data->distribution_history, true); diff --git a/site/models/openai.php b/site/models/openai.php index dad676e..443132f 100644 --- a/site/models/openai.php +++ b/site/models/openai.php @@ -264,7 +264,7 @@ class GetbibleModelOpenai extends ItemModel JPluginHelper::importPlugin('content'); $this->_dispatcher = JFactory::getApplication(); // Check if we can decode distribution_history - if (GetbibleHelper::checkJson($data->distribution_history)) + if (isset($data->distribution_history) && GetbibleHelper::checkJson($data->distribution_history)) { // Decode distribution_history $data->distribution_history = json_decode($data->distribution_history, true); diff --git a/site/models/search.php b/site/models/search.php index e7c72c2..e73ee6b 100644 --- a/site/models/search.php +++ b/site/models/search.php @@ -338,7 +338,7 @@ class GetbibleModelSearch extends ListModel JPluginHelper::importPlugin('content'); $this->_dispatcher = JFactory::getApplication(); // Check if we can decode distribution_history - if (GetbibleHelper::checkJson($data->distribution_history)) + if (isset($data->distribution_history) && GetbibleHelper::checkJson($data->distribution_history)) { // Decode distribution_history $data->distribution_history = json_decode($data->distribution_history, true); diff --git a/site/models/tag.php b/site/models/tag.php index 3ba2d3a..4239a7b 100644 --- a/site/models/tag.php +++ b/site/models/tag.php @@ -250,7 +250,7 @@ class GetbibleModelTag extends ListModel JPluginHelper::importPlugin('content'); $this->_dispatcher = JFactory::getApplication(); // Check if we can decode distribution_history - if (GetbibleHelper::checkJson($data->distribution_history)) + if (isset($data->distribution_history) && GetbibleHelper::checkJson($data->distribution_history)) { // Decode distribution_history $data->distribution_history = json_decode($data->distribution_history, true); diff --git a/update_server.xml b/update_server.xml index 11e8dd6..209b005 100644 --- a/update_server.xml +++ b/update_server.xml @@ -395,4 +395,22 @@ https://getbible.net + + Get Bible + The Bible for Joomla + pkg_getbible + package + site + 2.0.24 + https://getbible.net + + https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v2.0.24.zip + + + stable + + Llewellyn van der Merwe + https://getbible.net + + \ No newline at end of file