Stable release of v3.0.2

More namespace updates.

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v3.0.2
+
+- More namespace updates.
+
 # v3.0.1
 
 - Fix missing use statement in app model.

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**,

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**,

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)
 						{

admin/sql/updates/mysql/3.0.1.sql

@@ -0,0 +1 @@
+

getbible.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.10" method="upgrade">
 	<name>COM_GETBIBLE</name>
-	<creationDate>26th January, 2024</creationDate>
+	<creationDate>29th January, 2024</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://getbible.net</authorUrl>
 	<copyright>Copyright (C) 2015. All Rights Reserved</copyright>
 	<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
-	<version>3.0.1</version>
+	<version>3.0.2</version>
 	<description><![CDATA[
-		<h1>Get Bible (v.3.0.1)</h1>
+		<h1>Get Bible (v.3.0.2)</h1>
 		<div style="clear: both;"></div>
 		<p>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.
 

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)
 				),

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
 	 *

script.php

@@ -1546,7 +1546,7 @@ class Com_GetbibleInstallerScript
 			echo '<div style="background-color: #fff;" class="alert alert-info"><a target="_blank" href="https://getbible.net" title="Get Bible">
 				<img src="components/com_getbible/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 3.0.1 Was Successful! Let us know if anything is not working as expected.</h3></div>';
+				<h3>Upgrade to Version 3.0.2 Was Successful! Let us know if anything is not working as expected.</h3></div>';
 
 			// Set db if not set already.
 			if (!isset($db))

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)
 						{

site/router.php

@@ -462,9 +462,7 @@ class GetbibleRouter extends JComponentRouterBase
 		{
 			if ($hasVerses)
 			{
-				echo '<pre>';
-				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))

site/views/app/tmpl/default_getbibleapp.php

@@ -45,7 +45,7 @@ var triggerGetBibleReload = false;
 						<?php echo $this->loadTemplate('getbibleappbottommenu'); ?>
 					<?php endif; ?>
 				</div>
-				<?php if ($this->params->get('show_hash_validation') == 1 || $this->params->get('show_getbible_link') == 1 || $this->params->get('show_api_link') == 1): ?>
+				<?php if ($this->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): ?>
 					<div class="uk-margin">
 						<?php echo $this->loadTemplate('getbibleappfooter'); ?>
 					</div>
@@ -59,7 +59,7 @@ var triggerGetBibleReload = false;
 <?php echo $this->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 : '';
 }
 <?php if ($this->params->get('activate_sharing') == 1 || $this->params->get('activate_tags') == 1 || $this->params->get('activate_notes') == 1): ?>

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.

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.

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.

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.

update_server.xml

@@ -575,4 +575,22 @@
 		<maintainerurl>https://getbible.net</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
+	<update>
+		<name>Get Bible</name>
+		<description>The Bible for Joomla</description>
+		<element>pkg_getbible</element>
+		<type>package</type>
+		<client>site</client>
+		<version>3.0.2</version>
+		<infourl title="Get Bible!">https://getbible.net</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v3.0.2.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>https://getbible.net</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
 </updates>