diff --git a/CHANGELOG.md b/CHANGELOG.md index dc4d722..45b6cda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v3.0.2 + +- More namespace updates. + # v3.0.1 - Fix missing use statement in app model. diff --git a/README.md b/README.md index 5ef1c45..eb087d6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Get Bible (3.0.1) +# Get Bible (3.0.2) ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/master/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*: 26th January, 2024 -+ *Version*: 3.0.1 ++ *Last Build*: 29th January, 2024 ++ *Version*: 3.0.2 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -31,11 +31,11 @@ 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*: **203716** -+ *File count*: **1744** ++ *Line count*: **203786** ++ *File count*: **1745** + *Folder count*: **165** -**374 Hours** or **47 Eight Hour Days** (the actual time the author spent) +**375 Hours** or **47 Eight Hour Days** (the actual time the author spent) > (with the following break down: > **debugging @142hours** = codingtime / 4; @@ -43,7 +43,7 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com)) > **mapping @57hours** = codingtime / 10; > **office @95hours** = codingtime / 6;) -**943 Hours** or **118 Eight Hour Days** +**944 Hours** or **118 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 5ef1c45..eb087d6 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -1,4 +1,4 @@ -# Get Bible (3.0.1) +# Get Bible (3.0.2) ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/master/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*: 26th January, 2024 -+ *Version*: 3.0.1 ++ *Last Build*: 29th January, 2024 ++ *Version*: 3.0.2 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -31,11 +31,11 @@ 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*: **203716** -+ *File count*: **1744** ++ *Line count*: **203786** ++ *File count*: **1745** + *Folder count*: **165** -**374 Hours** or **47 Eight Hour Days** (the actual time the author spent) +**375 Hours** or **47 Eight Hour Days** (the actual time the author spent) > (with the following break down: > **debugging @142hours** = codingtime / 4; @@ -43,7 +43,7 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com)) > **mapping @57hours** = codingtime / 10; > **office @95hours** = codingtime / 6;) -**943 Hours** or **118 Eight Hour Days** +**944 Hours** or **118 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/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 14dad94..b817ecd 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -96,7 +96,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -145,7 +145,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -194,7 +194,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -243,7 +243,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { diff --git a/admin/sql/updates/mysql/3.0.1.sql b/admin/sql/updates/mysql/3.0.1.sql new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/admin/sql/updates/mysql/3.0.1.sql @@ -0,0 +1 @@ + diff --git a/getbible.xml b/getbible.xml index 1b9b873..249a140 100644 --- a/getbible.xml +++ b/getbible.xml @@ -1,15 +1,15 @@ COM_GETBIBLE - 26th January, 2024 + 29th January, 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 - 3.0.1 + 3.0.2 Get Bible (v.3.0.1) +

Get Bible (v.3.0.2)

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.GetBible/src/Database/Load.php b/libraries/jcb_powers/VDM.Joomla.GetBible/src/Database/Load.php index 86ba1ee..772305a 100644 --- a/libraries/jcb_powers/VDM.Joomla.GetBible/src/Database/Load.php +++ b/libraries/jcb_powers/VDM.Joomla.GetBible/src/Database/Load.php @@ -89,7 +89,7 @@ final class Load { return $this->model->value( $this->load->value( - ["a.${field}" => $field], + ["a.{$field}" => $field], ['a' => $table], $this->prefix($keys) ), diff --git a/libraries/jcb_powers/VDM.Joomla/src/Utilities/Component/Helper.php b/libraries/jcb_powers/VDM.Joomla/src/Utilities/Component/Helper.php index 06db66a..b2ae824 100644 --- a/libraries/jcb_powers/VDM.Joomla/src/Utilities/Component/Helper.php +++ b/libraries/jcb_powers/VDM.Joomla/src/Utilities/Component/Helper.php @@ -77,7 +77,20 @@ abstract class Helper } /** - * Gets the component option + * Set the component option + * + * @param string $option The option + * + * @return void + * @since 3.2.0 + */ + public static function setOption(string $option): void + { + self::$option = $option; + } + + /** + * Get the component option * * @param string|null $default The default return value if none is found * diff --git a/script.php b/script.php index 8c9f8cf..e47c657 100644 --- a/script.php +++ b/script.php @@ -1546,7 +1546,7 @@ class Com_GetbibleInstallerScript echo '

-

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

'; +

Upgrade to Version 3.0.2 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/controllers/ajax.json.php b/site/controllers/ajax.json.php index e5dd7bc..e4821d0 100644 --- a/site/controllers/ajax.json.php +++ b/site/controllers/ajax.json.php @@ -114,7 +114,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -164,7 +164,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -213,7 +213,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -265,7 +265,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -317,7 +317,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -366,7 +366,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -417,7 +417,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -466,7 +466,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -515,7 +515,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -564,7 +564,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -613,7 +613,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -665,7 +665,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -718,7 +718,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -767,7 +767,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -817,7 +817,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -868,7 +868,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -917,7 +917,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -974,7 +974,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { @@ -1028,7 +1028,7 @@ class GetbibleControllerAjax extends BaseController echo "(".json_encode($result).");"; } } - catch(Exception $e) + catch(\Exception $e) { if($callback) { diff --git a/site/router.php b/site/router.php index 8530620..c2bc412 100644 --- a/site/router.php +++ b/site/router.php @@ -462,9 +462,7 @@ class GetbibleRouter extends JComponentRouterBase { if ($hasVerses) { - echo '
';
-				var_dump('We have an API call, will return it from local DB. Soon!');
-				var_dump($vars);
+				header("Location: https://query.getbible.net/v2/{$vars['t']}/{$vars['ref']}");
 				exit;
 			}
 			elseif (!empty($bookNumber) && !empty($chapterNumber))
diff --git a/site/views/app/tmpl/default_getbibleapp.php b/site/views/app/tmpl/default_getbibleapp.php
index 71cc891..e369649 100644
--- a/site/views/app/tmpl/default_getbibleapp.php
+++ b/site/views/app/tmpl/default_getbibleapp.php
@@ -45,7 +45,7 @@ var triggerGetBibleReload = false;
 						loadTemplate('getbibleappbottommenu'); ?>
 					
 				
-				params->get('show_hash_validation') == 1 || $this->params->get('show_getbible_link') == 1 || $this->params->get('show_api_link') == 1): ?>
+				params->get('show_hash_validation') == 1 || $this->params->get('show_getbible_link') == 1 || $this->params->get('show_api_link') == 1 || $this->params->get('show_getbible_logo') == 1): ?>
 					
loadTemplate('getbibleappfooter'); ?>
@@ -59,7 +59,7 @@ var triggerGetBibleReload = false; loadTemplate('getbiblelinkermanager'); ?> // function to access verses by number const getActiveVerseText = (verseNumber) => { - const verseObj = getbible_verses.find(verse => verse.verse === verseNumber.toString()); + const verseObj = getbible_verses.find(verse => verse.verse.toString() === verseNumber.toString()); return verseObj ? verseObj.text : ''; } params->get('activate_sharing') == 1 || $this->params->get('activate_tags') == 1 || $this->params->get('activate_notes') == 1): ?> diff --git a/site/views/app/view.html.php b/site/views/app/view.html.php index 9988849..9ce8eba 100644 --- a/site/views/app/view.html.php +++ b/site/views/app/view.html.php @@ -132,7 +132,7 @@ class GetbibleViewApp extends HtmlView // Set the toolbar $this->addToolBar(); - // set the document + // Set the html view document stuff $this->_prepareDocument(); // Check for errors. diff --git a/site/views/openai/view.html.php b/site/views/openai/view.html.php index 20d26ad..50faa9a 100644 --- a/site/views/openai/view.html.php +++ b/site/views/openai/view.html.php @@ -60,7 +60,7 @@ class GetbibleViewOpenai extends HtmlView // Set the toolbar $this->addToolBar(); - // set the document + // Set the html view document stuff $this->_prepareDocument(); // Check for errors. diff --git a/site/views/search/view.html.php b/site/views/search/view.html.php index 94ba48c..7dd5c32 100644 --- a/site/views/search/view.html.php +++ b/site/views/search/view.html.php @@ -80,7 +80,7 @@ class GetbibleViewSearch extends HtmlView // Set the toolbar $this->addToolBar(); - // set the document + // Set the html view document stuff $this->_prepareDocument(); // Check for errors. diff --git a/site/views/tag/view.html.php b/site/views/tag/view.html.php index 709821c..e4140fd 100644 --- a/site/views/tag/view.html.php +++ b/site/views/tag/view.html.php @@ -97,7 +97,7 @@ class GetbibleViewTag extends HtmlView // Set the toolbar $this->addToolBar(); - // set the document + // Set the html view document stuff $this->_prepareDocument(); // Check for errors. diff --git a/update_server.xml b/update_server.xml index 8cd2fcc..b891c45 100644 --- a/update_server.xml +++ b/update_server.xml @@ -575,4 +575,22 @@ https://getbible.net + + Get Bible + The Bible for Joomla + pkg_getbible + package + site + 3.0.2 + https://getbible.net + + https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v3.0.2.zip + + + stable + + Llewellyn van der Merwe + https://getbible.net + + \ No newline at end of file