diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fe2b63..f177d71 100644 --- a/CHANGELOG.md +++ b/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. diff --git a/README.md b/README.md index 8a646de..88fc0d7 100644 --- a/README.md +++ b/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 -+ *Version*: 3.0.6 ++ *Last Build*: 20th March, 2024 ++ *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** -+ *File count*: **1718** ++ *Line count*: **201801** ++ *File count*: **1719** + *Folder count*: **150** **372 Hours** or **47 Eight Hour Days** (the actual time the author spent) diff --git a/admin/README.txt b/admin/README.txt index 8a646de..88fc0d7 100644 --- a/admin/README.txt +++ b/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 -+ *Version*: 3.0.6 ++ *Last Build*: 20th March, 2024 ++ *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** -+ *File count*: **1718** ++ *Line count*: **201801** ++ *File count*: **1719** + *Folder count*: **150** **372 Hours** or **47 Eight Hour Days** (the actual time the author spent) diff --git a/admin/language/en-GB/en-GB.com_getbible.ini b/admin/language/en-GB/en-GB.com_getbible.ini index 2611f0f..67489b5 100644 --- a/admin/language/en-GB/en-GB.com_getbible.ini +++ b/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" diff --git a/admin/models/ajax.php b/admin/models/ajax.php index d9d11e9..4fdf795 100644 --- a/admin/models/ajax.php +++ b/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' => '' . Text::_('COM_GETBIBLE_UP_TO_DATE') . '']; + return ['notice' => ' ' . Text::_('COM_GETBIBLE_UP_TO_DATE') . '']; } 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' => '' . Text::_('COM_GETBIBLE_BETA_RELEASE') . '']; + return ['notice' => ' ' . Text::_('COM_GETBIBLE_PRE_RELEASE') . '']; } 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' => '' . Text::_('COM_GETBIBLE_OUT_OF_DATE') . '!  ' . Text::_('COM_GETBIBLE_OUT_OF_DATE') . '! ' . Text::_('COM_GETBIBLE_DOWNLOAD_UPDATE') . '!']; } } diff --git a/admin/sql/updates/mysql/3.0.6.sql b/admin/sql/updates/mysql/3.0.6.sql new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/admin/sql/updates/mysql/3.0.6.sql @@ -0,0 +1 @@ + diff --git a/getbible.xml b/getbible.xml index 281945a..1a10c23 100644 --- a/getbible.xml +++ b/getbible.xml @@ -1,15 +1,15 @@ COM_GETBIBLE - 8th March, 2024 + 20th 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 - 3.0.6 + 3.0.7 Get Bible (v.3.0.6) +

Get Bible (v.3.0.7)

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/src/Utilities/FormHelper.php b/libraries/jcb_powers/VDM.Joomla/src/Utilities/FormHelper.php index a2f48fd..b21d71c 100644 --- a/libraries/jcb_powers/VDM.Joomla/src/Utilities/FormHelper.php +++ b/libraries/jcb_powers/VDM.Joomla/src/Utilities/FormHelper.php @@ -75,24 +75,24 @@ 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); - } - if (property_exists($node, 'fieldXML')) - { - self::append($xml, $node->fieldXML); - } - break; - case 'SimpleXMLElement': - $domXML = \dom_import_simplexml($xml); - $domNode = \dom_import_simplexml($node); - $domXML->appendChild($domXML->ownerDocument->importNode($domNode, true)); - $xml = \simplexml_import_dom($domXML); - break; + if (property_exists($node, 'comment')) + { + self::comment($xml, $node->comment); + } + if (property_exists($node, 'fieldXML')) + { + self::append($xml, $node->fieldXML); + } + } + 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); } } @@ -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; } } diff --git a/script.php b/script.php index fcbb6ee..90d771d 100644 --- a/script.php +++ b/script.php @@ -1546,7 +1546,7 @@ class Com_GetbibleInstallerScript echo '

-

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

'; +

Upgrade to Version 3.0.7 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/layouts/table.php b/site/layouts/table.php index a29db07..baff627 100644 --- a/site/layouts/table.php +++ b/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; ?> -
+
diff --git a/site/views/app/view.html.php b/site/views/app/view.html.php index 9ce8eba..d5f4871 100644 --- a/site/views/app/view.html.php +++ b/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 diff --git a/site/views/search/view.html.php b/site/views/search/view.html.php index 8f4842c..191cf93 100644 --- a/site/views/search/view.html.php +++ b/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') => { diff --git a/update_server.xml b/update_server.xml index 0d6ae4a..8f2d2f3 100644 --- a/update_server.xml +++ b/update_server.xml @@ -665,4 +665,22 @@ https://getbible.net + + Get Bible + The Bible for Joomla + pkg_getbible + package + site + 3.0.7 + https://getbible.net + + https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v3.0.7.zip + + + stable + + Llewellyn van der Merwe + https://getbible.net + + \ No newline at end of file