diff --git a/CHANGELOG.md b/CHANGELOG.md index d002be3..defad3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v4.0.13 + +- Add back to Bible button to Open AI page. + # v4.0.12 - Add PHP check on installation. @@ -54,7 +58,6 @@ - Moved to Joomla 4 -# v3.0.9 +# v3.1.1 -- Add PHP check on installation. -- Add Database check on installation. \ No newline at end of file +- Add back to Bible button to Open AI page. \ No newline at end of file diff --git a/GetbibleInstallerScript.php b/GetbibleInstallerScript.php index aa2bd21..31629bb 100644 --- a/GetbibleInstallerScript.php +++ b/GetbibleInstallerScript.php @@ -795,7 +795,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface echo '
-

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

'; +

Upgrade to Version 4.0.13 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 1483ae5..f05394f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Get Bible (4.0.12) +# Get Bible (4.0.13) ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/5.0/admin/assets/images/vdm-component.jpg "GetBible") @@ -18,8 +18,8 @@ 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*: 27th April, 2024 -+ *Version*: 4.0.12 ++ *Last Build*: 29th April, 2024 ++ *Version*: 4.0.13 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -31,8 +31,8 @@ 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*: **210790** -+ *File count*: **1716** ++ *Line count*: **210835** ++ *File count*: **1717** + *Folder count*: **174** **388 Hours** or **48 Eight Hour Days** (the actual time the author spent) diff --git a/admin/README.txt b/admin/README.txt index 1483ae5..f05394f 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -1,4 +1,4 @@ -# Get Bible (4.0.12) +# Get Bible (4.0.13) ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/5.0/admin/assets/images/vdm-component.jpg "GetBible") @@ -18,8 +18,8 @@ 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*: 27th April, 2024 -+ *Version*: 4.0.12 ++ *Last Build*: 29th April, 2024 ++ *Version*: 4.0.13 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -31,8 +31,8 @@ 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*: **210790** -+ *File count*: **1716** ++ *Line count*: **210835** ++ *File count*: **1717** + *Folder count*: **174** **388 Hours** or **48 Eight Hour Days** (the actual time the author spent) diff --git a/admin/sql/updates/mysql/3.0.9.sql b/admin/sql/updates/mysql/3.1.1.sql similarity index 100% rename from admin/sql/updates/mysql/3.0.9.sql rename to admin/sql/updates/mysql/3.1.1.sql diff --git a/admin/sql/updates/mysql/4.0.12.sql b/admin/sql/updates/mysql/4.0.12.sql new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/admin/sql/updates/mysql/4.0.12.sql @@ -0,0 +1 @@ + diff --git a/getbible.xml b/getbible.xml index 735f7e1..414c979 100644 --- a/getbible.xml +++ b/getbible.xml @@ -1,15 +1,15 @@ COM_GETBIBLE - 27th April, 2024 + 29th April, 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 - 4.0.12 + 4.0.13 Get Bible (v.4.0.12) +

Get Bible (v.4.0.13)

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/site/language/en-GB/en-GB.com_getbible.ini b/site/language/en-GB/en-GB.com_getbible.ini index 947cb4a..3c9d0b4 100644 --- a/site/language/en-GB/en-GB.com_getbible.ini +++ b/site/language/en-GB/en-GB.com_getbible.ini @@ -206,6 +206,7 @@ COM_GETBIBLE_THE_NAME_COULD_NOT_BE_UPDATED="The name could not be updated." COM_GETBIBLE_THE_NAME_HAS_BEEN_UPDATED="The name has been updated." COM_GETBIBLE_THE_NOTE_WAS_SUCCESSFULLY_CREATED="The note was successfully created." COM_GETBIBLE_THE_NOTE_WAS_SUCCESSFULLY_UPDATED="The note was successfully updated." +COM_GETBIBLE_THE_OPEN_AI_FEATURE_HAS_NOT_BEEN_ACTIVATED_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR_OF_THIS_WEBSITE_TO_RESOLVE_THIS="The Open AI feature has not been activated. Please contact the system administrator of this website to resolve this." COM_GETBIBLE_THE_PERSISTENT_SESSION_KEY_ALLOWS_VIEWING_WHILE_EDITING_IS_ONLY_POSSIBLE_WHEN_THE_CORRECT_FAVOURITE_VERSE_IS_PROVIDED="The persistent session key allows viewing, while editing is only possible when the correct favourite verse is provided." COM_GETBIBLE_THE_SCRIPTURE_WAS_COPIED_TO_YOUR_CLIPBOARD="The scripture was copied to your clipboard!" COM_GETBIBLE_THE_SEARCH_FEATURE_HAS_NOT_BEEN_ACTIVATED_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR_OF_THIS_WEBSITE_TO_RESOLVE_THIS="The search feature has not been activated. Please contact the system administrator of this website to resolve this." diff --git a/site/src/Model/AjaxModel.php b/site/src/Model/AjaxModel.php index 993bc12..bda0874 100644 --- a/site/src/Model/AjaxModel.php +++ b/site/src/Model/AjaxModel.php @@ -524,11 +524,15 @@ class AjaxModel extends ListModel { if ($abbreviation === 'all' || $abbreviation === $translation) { - // set the return UR - $return = urlencode(base64_encode((string) Route::_('index.php?option=com_getbible&view=app&t=' . $translation . '&Itemid=' . $this->app_params->get('app_menu', 0) . '&book=' . $book . '&chapter=' . $chapter))); + // set the return URL + $return = ''; + if ($book > 0 && $chapter > 0) + { + $return = '&bibleurl=' . urlencode(base64_encode(trim(Uri::base(), '/') . Route::_('index.php?option=com_getbible&view=app&t=' . $translation . '&Itemid=' . $this->app_params->get('app_menu', 0) . '&book=' . $book . '&chapter=' . $chapter))); + } // we return the AI url - return ['url' => trim(trim(Uri::base(), '/') . Route::_('index.php?option=com_getbible&view=openai&t=' . $translation . '&Itemid=' . $this->app_params->get('app_menu', 0) . '&bibleurl=' . $return . '&guid=' . $guid . '&book=' . $book . '&chapter=' . $chapter . '&verse=' . $verse . '&words=' . $words))]; + return ['url' => trim(trim(Uri::base(), '/') . Route::_('index.php?option=com_getbible&view=openai&t=' . $translation . '&Itemid=' . $this->app_params->get('app_menu', 0) . $return . '&guid=' . $guid . '&book=' . $book . '&chapter=' . $chapter . '&verse=' . $verse . '&words=' . $words))]; } return ['error' => 'There was an error please try again.']; diff --git a/site/src/View/Openai/HtmlView.php b/site/src/View/Openai/HtmlView.php index d12401d..b074c4a 100644 --- a/site/src/View/Openai/HtmlView.php +++ b/site/src/View/Openai/HtmlView.php @@ -30,6 +30,7 @@ use TrueChristianChurch\Component\Getbible\Site\Helper\HeaderCheck; use TrueChristianChurch\Component\Getbible\Site\Helper\GetbibleHelper; use TrueChristianChurch\Component\Getbible\Site\Helper\RouteHelper; use Joomla\CMS\Session\Session; +use Joomla\CMS\Router\Router; use Joomla\CMS\Router\Route; use Joomla\CMS\Uri\Uri; use Joomla\CMS\Helper\ModuleHelper; @@ -70,8 +71,18 @@ class HtmlView extends BaseHtmlView // remove from page (in case debug mode is on) $this->params->set('openai_token', null); $this->params->set('gitea_token', null); - // set meta - $this->setMetaData(); + // set the input object + $this->input = $this->app->input; + // is the area active + if ($this->params->get('enable_open_ai') == 1) + { + // set the page direction globally + $this->getDocument()->setDirection($this->translation->direction); + // set the global language declaration + // $this->getDocument()->setLanguage($this->translation->joomla); (soon ;) + // set meta + $this->setMetaData(); + } // Set the toolbar $this->addToolBar(); diff --git a/site/tmpl/openai/default.php b/site/tmpl/openai/default.php index 62d5c0c..313a835 100644 --- a/site/tmpl/openai/default.php +++ b/site/tmpl/openai/default.php @@ -27,17 +27,23 @@ defined('_JEXEC') or die; ?> -item): ?> - loadTemplate('getbibleai'); ?> - item) > 1) : ?> - loadTemplate('getbibleaifilter'); ?> +params->get('enable_open_ai') == 1): ?> + item): ?> + loadTemplate('getbibleai'); ?> + item) > 1) : ?> + loadTemplate('getbibleaifilter'); ?> + + +

+

+

+
+ + params->get('debug') == 1): ?> + loadTemplate('getbibleaidebug'); ?> -
-

-

+
+

- -params->get('debug') == 1): ?> - loadTemplate('getbibleaidebug'); ?> diff --git a/site/tmpl/openai/default_getbibleai.php b/site/tmpl/openai/default_getbibleai.php index 43677fc..e81f225 100644 --- a/site/tmpl/openai/default_getbibleai.php +++ b/site/tmpl/openai/default_getbibleai.php @@ -27,6 +27,7 @@ defined('_JEXEC') or die;
+

params->get('show_top_menu') == 1): ?> diff --git a/update_server.xml b/update_server.xml index 39d6e63..2e3bea0 100644 --- a/update_server.xml +++ b/update_server.xml @@ -5,10 +5,10 @@ pkg_getbible package site - 3.0.9 + 3.1.1 https://getbible.net - https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v3.0.9.zip + https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v3.1.1.zip stable @@ -251,4 +251,22 @@ https://getbible.net + + Get Bible + The Bible for Joomla + pkg_getbible + package + site + 4.0.13 + https://getbible.net + + https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v4.0.13.zip + + + stable + + Llewellyn van der Merwe + https://getbible.net + + \ No newline at end of file