From cf73a3c71cbcf22c061c891f8e7042eb94482060 Mon Sep 17 00:00:00 2001 From: aB0t Date: Fri, 8 Mar 2024 10:07:33 +0200 Subject: [PATCH] Stable release of v4.0.9 Correct the url encoding to json_encode for none Latin languages. Fix type cast validation on search page. --- CHANGELOG.md | 10 +++++++-- GetbibleInstallerScript.php | 2 +- README.md | 10 ++++----- admin/README.txt | 10 ++++----- .../updates/mysql/{3.0.5.sql => 3.0.6.sql} | 0 admin/sql/updates/mysql/4.0.8.sql | 1 + getbible.xml | 6 ++--- site/src/View/Search/HtmlView.php | 10 +++++---- site/tmpl/app/default_getbibleapp.php | 8 +++---- update_server.xml | 22 +++++++++++++++++-- 10 files changed, 53 insertions(+), 26 deletions(-) rename admin/sql/updates/mysql/{3.0.5.sql => 3.0.6.sql} (100%) create mode 100644 admin/sql/updates/mysql/4.0.8.sql diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e1922e..7157c94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# v4.0.9 + +- Correct the url encoding to json_encode for none Latin languages. +- Fix type cast validation on search page. + # v4.0.8 - Restore router functions. @@ -36,6 +41,7 @@ - Moved to Joomla 4 -# v3.0.5 +# v3.0.6 -- Fix missing token variable in ajax call \ No newline at end of file +- Correct the url encoding to json_encode for none Latin languages. +- Fix type cast validation on search page. \ No newline at end of file diff --git a/GetbibleInstallerScript.php b/GetbibleInstallerScript.php index bf7b217..0f64a7c 100644 --- a/GetbibleInstallerScript.php +++ b/GetbibleInstallerScript.php @@ -755,7 +755,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface echo '
-

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

'; +

Upgrade to Version 4.0.9 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 6ba8ff7..8de98d8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Get Bible (4.0.8) +# Get Bible (4.0.9) ![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*: 7th March, 2024 -+ *Version*: 4.0.8 ++ *Last Build*: 8th March, 2024 ++ *Version*: 4.0.9 + *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*: **205303** -+ *File count*: **1695** ++ *Line count*: **205330** ++ *File count*: **1696** + *Folder count*: **174** **378 Hours** or **47 Eight Hour Days** (the actual time the author spent) diff --git a/admin/README.txt b/admin/README.txt index 6ba8ff7..8de98d8 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -1,4 +1,4 @@ -# Get Bible (4.0.8) +# Get Bible (4.0.9) ![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*: 7th March, 2024 -+ *Version*: 4.0.8 ++ *Last Build*: 8th March, 2024 ++ *Version*: 4.0.9 + *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*: **205303** -+ *File count*: **1695** ++ *Line count*: **205330** ++ *File count*: **1696** + *Folder count*: **174** **378 Hours** or **47 Eight Hour Days** (the actual time the author spent) diff --git a/admin/sql/updates/mysql/3.0.5.sql b/admin/sql/updates/mysql/3.0.6.sql similarity index 100% rename from admin/sql/updates/mysql/3.0.5.sql rename to admin/sql/updates/mysql/3.0.6.sql diff --git a/admin/sql/updates/mysql/4.0.8.sql b/admin/sql/updates/mysql/4.0.8.sql new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/admin/sql/updates/mysql/4.0.8.sql @@ -0,0 +1 @@ + diff --git a/getbible.xml b/getbible.xml index 91d8f5e..8dc4912 100644 --- a/getbible.xml +++ b/getbible.xml @@ -1,15 +1,15 @@ COM_GETBIBLE - 7th March, 2024 + 8th 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 - 4.0.8 + 4.0.9 Get Bible (v.4.0.8) +

Get Bible (v.4.0.9)

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/src/View/Search/HtmlView.php b/site/src/View/Search/HtmlView.php index 8bf46e1..eb01f46 100644 --- a/site/src/View/Search/HtmlView.php +++ b/site/src/View/Search/HtmlView.php @@ -306,12 +306,13 @@ class HtmlView extends BaseHtmlView */ public function getReturnUrlBook(): int { - if (empty($this->url_return_query)) + if (empty($this->url_return_query) || !is_array($this->url_return_query)) { $this->setReturnUrl(); } - return (int) $this->url_return_query['book'] ?? 0; + $book = $this->url_return_query['book'] ?? 0; + return (int) $book; } /** @@ -322,12 +323,13 @@ class HtmlView extends BaseHtmlView */ public function getReturnUrlChapter(): int { - if (empty($this->url_return_query)) + if (empty($this->url_return_query) || !is_array($this->url_return_query)) { $this->setReturnUrl(); } - return (int) $this->url_return_query['chapter'] ?? 0; + $chapter = $this->url_return_query['chapter'] ?? 0; + return (int) $chapter; } /** diff --git a/site/tmpl/app/default_getbibleapp.php b/site/tmpl/app/default_getbibleapp.php index 1f158eb..b06bb32 100644 --- a/site/tmpl/app/default_getbibleapp.php +++ b/site/tmpl/app/default_getbibleapp.php @@ -25,11 +25,11 @@ defined('_JEXEC') or die; ?>

diff --git a/update_server.xml b/update_server.xml index 41ba780..f92ce7d 100644 --- a/update_server.xml +++ b/update_server.xml @@ -5,10 +5,10 @@ pkg_getbible package site - 3.0.5 + 3.0.6 https://getbible.net - https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v3.0.5.zip + https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v3.0.6.zip stable @@ -179,4 +179,22 @@ https://getbible.net + + Get Bible + The Bible for Joomla + pkg_getbible + package + site + 4.0.9 + https://getbible.net + + https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v4.0.9.zip + + + stable + + Llewellyn van der Merwe + https://getbible.net + + \ No newline at end of file