Release of v3.0.7

Update getBible loader to version 3.1.0.

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v3.0.7
+
+- Update getBible loader to version 3.1.0
+
 # v3.0.6
 
 - Correct the url encoding to json_encode for none Latin languages.

README.md

@@ -1,4 +1,4 @@
-# Get Bible (3.0.6)
+# Get Bible (3.0.7)
 
  ![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*: 8th March, 2024
++ *Last Build*: 20th March, 2024
-+ *Version*: 3.0.6
++ *Version*: 3.0.7
 + *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*: **201789**
++ *Line count*: **201801**
-+ *File count*: **1718**
++ *File count*: **1719**
 + *Folder count*: **150**
 
 **372 Hours** or **47 Eight Hour Days** (the actual time the author spent)

admin/README.txt

@@ -1,4 +1,4 @@
-# Get Bible (3.0.6)
+# Get Bible (3.0.7)
 
  ![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*: 8th March, 2024
++ *Last Build*: 20th March, 2024
-+ *Version*: 3.0.6
++ *Version*: 3.0.7
 + *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*: **201789**
++ *Line count*: **201801**
-+ *File count*: **1718**
++ *File count*: **1719**
 + *Folder count*: **150**
 
 **372 Hours** or **47 Eight Hour Days** (the actual time the author spent)

admin/language/en-GB/en-GB.com_getbible.ini

@@ -8,7 +8,6 @@ COM_GETBIBLE_ARCHIVED="Archived"
 COM_GETBIBLE_ARE_YOU_SURE_YOU_WANT_TO_DELETE_CONFIRMING_WILL_PERMANENTLY_DELETE_THE_SELECTED_ITEMS="Are you sure you want to delete? Confirming will permanently delete the selected item(s)!"
 COM_GETBIBLE_AUTHOR="Author"
 COM_GETBIBLE_BACK="Back"
-COM_GETBIBLE_BETA_RELEASE="Beta Release"
 COM_GETBIBLE_BOOK="Book"
 COM_GETBIBLE_BOOKS="Books"
 COM_GETBIBLE_BOOKS_ACCESS="Books Access"
@@ -1190,6 +1189,7 @@ COM_GETBIBLE_PASSWORD_TO_SHORT_USE_A_LONGER_PASSWORD="Password to short, use a l
 COM_GETBIBLE_PASSWORD_VERSION_DESC="A count of the number of times this Password has been revised."
 COM_GETBIBLE_PASSWORD_VERSION_LABEL="Version"
 COM_GETBIBLE_PLEASE_CHECK_AGAIN_LATER="Please check again later"
+COM_GETBIBLE_PRE_RELEASE="Pre Release"
 COM_GETBIBLE_PROMPT="Prompt"
 COM_GETBIBLE_PROMPTS="Prompts"
 COM_GETBIBLE_PROMPTS_ACCESS="Prompts Access"

admin/models/ajax.php

@@ -132,7 +132,7 @@ class GetbibleModelAjax extends ListModel
 			// now check if this version is out dated
 			if ($current_version === $local_version)
 			{
-				return ['notice' => '<small><span style="color:green;"><span class="icon-shield"></span>' . Text::_('COM_GETBIBLE_UP_TO_DATE') . '</span></small>'];
+				return ['notice' => '<small><span style="color:green;"><span class="icon-shield"></span>&nbsp;' . Text::_('COM_GETBIBLE_UP_TO_DATE') . '</span></small>'];
 			}
 			else
 			{
@@ -143,14 +143,14 @@ class GetbibleModelAjax extends ListModel
 					($local_array[0] == $current_array[0] && $local_array[1] > $current_array[1]) || 
 					($local_array[0] == $current_array[0] && $local_array[1] == $current_array[1] && $local_array[2] > $current_array[2]))
 				{
-					return ['notice' => '<small><span style="color:#F7B033;"><span class="icon-wrench"></span>' . Text::_('COM_GETBIBLE_BETA_RELEASE') . '</span></small>'];
+					return ['notice' => '<small><span style="color:#F7B033;"><span class="icon-wrench"></span>&nbsp;' . Text::_('COM_GETBIBLE_PRE_RELEASE') . '</span></small>'];
 				}
 				else
 				{
 					// download link of the latest version
 					$download = "https://git.vdm.dev/api/v1/repos/getBible/joomla-component/archive/" . $tags[0]->name . ".zip";
 
-					return ['notice' => '<small><span style="color:red;"><span class="icon-warning-circle"></span>' . Text::_('COM_GETBIBLE_OUT_OF_DATE') . '!</span> <a style="color:green;"  href="' .
+					return ['notice' => '<small><span style="color:red;"><span class="icon-warning-circle"></span>&nbsp;' . Text::_('COM_GETBIBLE_OUT_OF_DATE') . '!</span> <a style="color:green;"  href="' .
 						$download . '" title="' . Text::_('COM_GETBIBLE_YOU_CAN_DIRECTLY_DOWNLOAD_THE_LATEST_UPDATE_OR_USE_THE_JOOMLA_UPDATE_AREA') . '">' . Text::_('COM_GETBIBLE_DOWNLOAD_UPDATE') . '!</a></small>'];
 				}
 			}

admin/sql/updates/mysql/3.0.6.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>8th March, 2024</creationDate>
+	<creationDate>20th March, 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.6</version>
+	<version>3.0.7</version>
 	<description><![CDATA[
-		<h1>Get Bible (v.3.0.6)</h1>
+		<h1>Get Bible (v.3.0.7)</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/src/Utilities/FormHelper.php

@@ -75,9 +75,9 @@ abstract class FormHelper
 			// element was not returned
 			return;
 		}
-		switch (get_class($node))
+
+		if ($node instanceof \stdClass)
 		{
-			case 'stdClass':
 			if (property_exists($node, 'comment'))
 			{
 				self::comment($xml, $node->comment);
@@ -86,13 +86,13 @@ abstract class FormHelper
 			{
 				self::append($xml, $node->fieldXML);
 			}
-				break;
+		}
-			case 'SimpleXMLElement':
+		elseif ($node instanceof \SimpleXMLElement)
+		{
 			$domXML = \dom_import_simplexml($xml);
 			$domNode = \dom_import_simplexml($node);
 			$domXML->appendChild($domXML->ownerDocument->importNode($domNode, true));
 			$xml = \simplexml_import_dom($domXML);
-				break;
 		}
 	}
 
@@ -127,7 +127,7 @@ abstract class FormHelper
 	{
 		foreach ($attributes as $key => $value)
 		{
-			$xml->addAttribute($key, $value);
+			$xml->addAttribute($key, $value ?? '');
 		}
 	}
 
@@ -145,7 +145,7 @@ abstract class FormHelper
 		foreach ($options as $key => $value)
 		{
 			$addOption = $xml->addChild('option');
-			$addOption->addAttribute('value', $key);
+			$addOption->addAttribute('value', $key ?? '');
 			$addOption[] = $value;
 		}
 	}

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.6 Was Successful! Let us know if anything is not working as expected.</h3></div>';
+				<h3>Upgrade to Version 3.0.7 Was Successful! Let us know if anything is not working as expected.</h3></div>';
 
 			// Set db if not set already.
 			if (!isset($db))

site/layouts/table.php

@@ -27,11 +27,12 @@ use VDM\Joomla\Utilities\StringHelper;
 $table_id = (isset($displayData['id'])) ? $displayData['id'] : StringHelper::random(7);
 $name = (isset($displayData['name'])) ? $displayData['name'] : false;
 $table_class = (isset($displayData['table_class'])) ? $displayData['table_class'] : 'uk-table';
+$table_container_class = (isset($displayData['table_container_class'])) ? $displayData['table_container_class'] : 'uk-overflow-auto';
 $headers = (isset($displayData['headers'])) ? $displayData['headers'] : [Text::_('COM_GETBIBLE_NO'), Text::_('COM_GETBIBLE_HEADERS'), Text::_('COM_GETBIBLE_FOUND')];
 $items = (isset($displayData['items'])) ? $displayData['items'] : 6;
 
 ?>
-<div class="uk-overflow-auto">
+<div class="<?php echo $$table_container_class; ?>">
 	<table id="<?php echo $table_id; ?>" class="<?php echo $table_class; ?>">
 		<thead>
 			<?php if (is_array($headers)): ?>

site/views/app/view.html.php

@@ -954,7 +954,7 @@ class GetbibleViewApp extends HtmlView
 			}
 		");
 		// Set the Custom JS script to view
-		$this->document->addScriptDeclaration("
+		$this->getDocument()->addScriptDeclaration("
 			const UrlAjax = '$url_ajax';
 			const getShareHisWordUrl = (linker, translation, book, chapter) => {
 				// build share His Word url

site/views/search/view.html.php

@@ -794,7 +794,7 @@ class GetbibleViewSearch extends HtmlView
 			}
 		");
 		// Set the Custom JS script to view
-		$this->document->addScriptDeclaration("
+		$this->getDocument()->addScriptDeclaration("
 			const urlSearch = '$url_search';
 			const urlAjax = '$url_ajax';
 			const getAppURL = (book, chapter, verse, translation = 'kjv') => {

update_server.xml

@@ -665,4 +665,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.7</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.7.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>