Update on v5.0.7 (beta for next version)
Here's an update on the current version, which includes changes towards the next release still in beta.
This commit is contained in:
parent
db9339b641
commit
02ec6142d7
|
@ -32,6 +32,10 @@
|
|||
|
||||
- Moved to Joomla 4 and 5
|
||||
|
||||
# v4.0.7
|
||||
|
||||
- Fix missing token variable in ajax call
|
||||
|
||||
# v3.0.5
|
||||
|
||||
- Fix missing token variable in ajax call
|
|
@ -18,7 +18,7 @@ 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*: 4th March, 2024
|
||||
+ *Last Build*: 7th March, 2024
|
||||
+ *Version*: 5.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*: **207531**
|
||||
+ *File count*: **1725**
|
||||
+ *Line count*: **207554**
|
||||
+ *File count*: **1726**
|
||||
+ *Folder count*: **189**
|
||||
|
||||
**382 Hours** or **48 Eight Hour Days** (the actual time the author spent)
|
||||
|
|
|
@ -18,7 +18,7 @@ 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*: 4th March, 2024
|
||||
+ *Last Build*: 7th March, 2024
|
||||
+ *Version*: 5.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*: **207531**
|
||||
+ *File count*: **1725**
|
||||
+ *Line count*: **207554**
|
||||
+ *File count*: **1726**
|
||||
+ *Folder count*: **189**
|
||||
|
||||
**382 Hours** or **48 Eight Hour Days** (the actual time the author spent)
|
||||
|
|
|
@ -287,7 +287,7 @@ CREATE TABLE IF NOT EXISTS `#__getbible_tag` (
|
|||
`id` INT(11) NOT NULL AUTO_INCREMENT,
|
||||
`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
|
||||
`access` TINYINT(1) NOT NULL DEFAULT 0,
|
||||
`description` TEXT NOT NULL,
|
||||
`description` TEXT NULL,
|
||||
`guid` VARCHAR(36) NOT NULL DEFAULT '',
|
||||
`linker` VARCHAR(36) NOT NULL DEFAULT '',
|
||||
`name` VARCHAR(255) NOT NULL DEFAULT '',
|
||||
|
|
1
admin/sql/updates/mysql/4.0.7.sql
Normal file
1
admin/sql/updates/mysql/4.0.7.sql
Normal file
|
@ -0,0 +1 @@
|
|||
|
|
@ -83,7 +83,7 @@ class TranslationsController extends AdminController
|
|||
{
|
||||
// Redirect to the list screen with error.
|
||||
$message = Text::_('COM_GETBIBLE_YOU_DO_NOT_HAVE_PERMISSION_TO_UPDATE_THE_BOOK_NAMES_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP');
|
||||
$this->setRedirect(JRoute::_('index.php?option=com_getbible&view=translations', false), $message, 'error');
|
||||
$this->setRedirect(\JRoute::_('index.php?option=com_getbible&view=translations', false), $message, 'error');
|
||||
return;
|
||||
}
|
||||
// Redirect to the list screen with error.
|
||||
|
|
|
@ -155,9 +155,9 @@ class LinkersField extends ListField
|
|||
protected function getOptions()
|
||||
{
|
||||
// Get the user object.
|
||||
$user = Factory::getApplication()->getIdentity();
|
||||
$user = JFactory::getUser();
|
||||
// Get the databse object.
|
||||
$db = Factory::getDBO();
|
||||
$db = JFactory::getDBO();
|
||||
$query = $db->getQuery(true);
|
||||
$query->select($db->quoteName(array('a.guid','a.name'),array('guid','linker_name')));
|
||||
$query->from($db->quoteName('#__getbible_linker', 'a'));
|
||||
|
@ -180,11 +180,11 @@ class LinkersField extends ListField
|
|||
{
|
||||
if ($this->multiple === false)
|
||||
{
|
||||
$options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
$options[] = JHtml::_('select.option', '', JText::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
}
|
||||
foreach($items as $item)
|
||||
{
|
||||
$options[] = Html::_('select.option', $item->guid, $item->linker_name . ' (' . substr($item->guid, 0, 8) . ')');
|
||||
$options[] = JHtml::_('select.option', $item->guid, $item->linker_name . ' (' . substr($item->guid, 0, 8) . ')');
|
||||
}
|
||||
}
|
||||
return $options;
|
||||
|
|
|
@ -49,9 +49,9 @@ class OpenairesponsesField extends ListField
|
|||
protected function getOptions()
|
||||
{
|
||||
// Get the user object.
|
||||
$user = Factory::getApplication()->getIdentity();
|
||||
$user = JFactory::getUser();
|
||||
// Get the databse object.
|
||||
$db = Factory::getDBO();
|
||||
$db = JFactory::getDBO();
|
||||
$query = $db->getQuery(true);
|
||||
$query->select($db->quoteName(array('a.response_id','a.response_id'),array('response_id','open_ai_response_response_id')));
|
||||
$query->from($db->quoteName('#__getbible_open_ai_response', 'a'));
|
||||
|
@ -73,11 +73,11 @@ class OpenairesponsesField extends ListField
|
|||
{
|
||||
if ($this->multiple === false)
|
||||
{
|
||||
$options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
$options[] = JHtml::_('select.option', '', JText::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
}
|
||||
foreach($items as $item)
|
||||
{
|
||||
$options[] = Html::_('select.option', $item->response_id, $item->open_ai_response_response_id);
|
||||
$options[] = JHtml::_('select.option', $item->response_id, $item->open_ai_response_response_id);
|
||||
}
|
||||
}
|
||||
return $options;
|
||||
|
|
|
@ -49,9 +49,9 @@ class PromptsField extends ListField
|
|||
protected function getOptions()
|
||||
{
|
||||
// Get the user object.
|
||||
$user = Factory::getApplication()->getIdentity();
|
||||
$user = JFactory::getUser();
|
||||
// Get the databse object.
|
||||
$db = Factory::getDBO();
|
||||
$db = JFactory::getDBO();
|
||||
$query = $db->getQuery(true);
|
||||
$query->select($db->quoteName(array('a.guid','a.name'),array('guid','prompt_name')));
|
||||
$query->from($db->quoteName('#__getbible_prompt', 'a'));
|
||||
|
@ -73,11 +73,11 @@ class PromptsField extends ListField
|
|||
{
|
||||
if ($this->multiple === false)
|
||||
{
|
||||
$options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
$options[] = JHtml::_('select.option', '', JText::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
}
|
||||
foreach($items as $item)
|
||||
{
|
||||
$options[] = Html::_('select.option', $item->guid, $item->prompt_name . ' (' . $item->guid . ')');
|
||||
$options[] = JHtml::_('select.option', $item->guid, $item->prompt_name . ' (' . $item->guid . ')');
|
||||
}
|
||||
}
|
||||
return $options;
|
||||
|
|
|
@ -155,9 +155,9 @@ class TagersField extends ListField
|
|||
protected function getOptions()
|
||||
{
|
||||
// Get the user object.
|
||||
$user = Factory::getApplication()->getIdentity();
|
||||
$user = JFactory::getUser();
|
||||
// Get the databse object.
|
||||
$db = Factory::getDBO();
|
||||
$db = JFactory::getDBO();
|
||||
$query = $db->getQuery(true);
|
||||
$query->select($db->quoteName(array('a.guid','a.name'),array('guid','tag_name')));
|
||||
$query->from($db->quoteName('#__getbible_tag', 'a'));
|
||||
|
@ -180,11 +180,11 @@ class TagersField extends ListField
|
|||
{
|
||||
if ($this->multiple === false)
|
||||
{
|
||||
$options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
$options[] = JHtml::_('select.option', '', JText::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
}
|
||||
foreach($items as $item)
|
||||
{
|
||||
$options[] = Html::_('select.option', $item->guid, $item->tag_name . ' (' . substr($item->guid, 0, 8) . ')');
|
||||
$options[] = JHtml::_('select.option', $item->guid, $item->tag_name . ' (' . substr($item->guid, 0, 8) . ')');
|
||||
}
|
||||
}
|
||||
return $options;
|
||||
|
|
|
@ -49,9 +49,9 @@ class TargettranslationsField extends ListField
|
|||
protected function getOptions()
|
||||
{
|
||||
// Get the user object.
|
||||
$user = Factory::getApplication()->getIdentity();
|
||||
$user = JFactory::getUser();
|
||||
// Get the databse object.
|
||||
$db = Factory::getDBO();
|
||||
$db = JFactory::getDBO();
|
||||
$query = $db->getQuery(true);
|
||||
$query->select($db->quoteName(array('a.abbreviation','a.translation'),array('abbreviation','abbreviation_translation')));
|
||||
$query->from($db->quoteName('#__getbible_translation', 'a'));
|
||||
|
@ -74,12 +74,12 @@ class TargettranslationsField extends ListField
|
|||
{
|
||||
if ($this->multiple === false)
|
||||
{
|
||||
$options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
$options[] = JHtml::_('select.option', '', JText::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
}
|
||||
$options[] = Html::_('select.option', 'all', Text::_('COM_GETBIBLE_ALL_TRANSLATIONS'));
|
||||
$options[] = JHtml::_('select.option', 'all', JText::_('COM_GETBIBLE_ALL_TRANSLATIONS'));
|
||||
foreach($items as $item)
|
||||
{
|
||||
$options[] = Html::_('select.option', $item->abbreviation, $item->abbreviation_translation.' (' .$item->abbreviation.')');
|
||||
$options[] = JHtml::_('select.option', $item->abbreviation, $item->abbreviation_translation.' (' .$item->abbreviation.')');
|
||||
}
|
||||
}
|
||||
return $options;
|
||||
|
|
|
@ -49,9 +49,9 @@ class TranslationsField extends ListField
|
|||
protected function getOptions()
|
||||
{
|
||||
// Get the user object.
|
||||
$user = Factory::getApplication()->getIdentity();
|
||||
$user = JFactory::getUser();
|
||||
// Get the databse object.
|
||||
$db = Factory::getDBO();
|
||||
$db = JFactory::getDBO();
|
||||
$query = $db->getQuery(true);
|
||||
$query->select($db->quoteName(array('a.abbreviation','a.translation'),array('abbreviation','abbreviation_translation')));
|
||||
$query->from($db->quoteName('#__getbible_translation', 'a'));
|
||||
|
@ -74,11 +74,11 @@ class TranslationsField extends ListField
|
|||
{
|
||||
if ($this->multiple === false)
|
||||
{
|
||||
$options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
$options[] = JHtml::_('select.option', '', JText::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
}
|
||||
foreach($items as $item)
|
||||
{
|
||||
$options[] = Html::_('select.option', $item->abbreviation, $item->abbreviation_translation.' (' .$item->abbreviation.')');
|
||||
$options[] = JHtml::_('select.option', $item->abbreviation, $item->abbreviation_translation.' (' .$item->abbreviation.')');
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -88,9 +88,9 @@ class TranslationsField extends ListField
|
|||
$options = [];
|
||||
if ($this->multiple === false)
|
||||
{
|
||||
$options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
$options[] = JHtml::_('select.option', '', JText::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
}
|
||||
$options[] = Html::_('select.option', 'kjv', 'King James Version (kjv)'); // this is the default at all times.
|
||||
$options[] = JHtml::_('select.option', 'kjv', 'King James Version (kjv)'); // this is the default at all times.
|
||||
}
|
||||
|
||||
return $options;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<extension type="component" version="4.0" method="upgrade">
|
||||
<extension type="component" version="5.0" method="upgrade">
|
||||
<name>COM_GETBIBLE</name>
|
||||
<creationDate>4th March, 2024</creationDate>
|
||||
<creationDate>7th March, 2024</creationDate>
|
||||
<author>Llewellyn van der Merwe</author>
|
||||
<authorEmail>joomla@vdm.io</authorEmail>
|
||||
<authorUrl>https://getbible.net</authorUrl>
|
||||
|
@ -111,6 +111,6 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is
|
|||
|
||||
</administration>
|
||||
<updateservers>
|
||||
<server type="extension" enabled="1" element="com_getbible" name="Get Bible">https://git.vdm.dev/getBible/joomla-component/raw/branch/5.0/update_server.xml</server>
|
||||
<server type="extension" enabled="1" element="com_getbible" name="Get Bible">https://git.vdm.dev/getBible/joomla-component/raw/branch/5.x/update_server.xml</server>
|
||||
</updateservers>
|
||||
</extension>
|
|
@ -79,12 +79,12 @@ abstract class Helper
|
|||
/**
|
||||
* Set the component option
|
||||
*
|
||||
* @param string $option The option
|
||||
* @param string|null $option The option
|
||||
*
|
||||
* @return void
|
||||
* @since 3.2.0
|
||||
*/
|
||||
public static function setOption(string $option): void
|
||||
public static function setOption(?string $option): void
|
||||
{
|
||||
self::$option = $option;
|
||||
}
|
||||
|
@ -97,7 +97,7 @@ abstract class Helper
|
|||
* @return string|null A component option
|
||||
* @since 3.0.11
|
||||
*/
|
||||
public static function getOption(string $default = 'empty'): ?string
|
||||
public static function getOption(?string $default = 'empty'): ?string
|
||||
{
|
||||
if (empty(self::$option))
|
||||
{
|
||||
|
@ -160,7 +160,7 @@ abstract class Helper
|
|||
*
|
||||
* @since 3.0.11
|
||||
*/
|
||||
public static function get(string $option = null, string $default = null): ?string
|
||||
public static function get(?string $option = null, ?string $default = null): ?string
|
||||
{
|
||||
// check that we have an option
|
||||
// and get the code name from it
|
||||
|
@ -260,7 +260,7 @@ abstract class Helper
|
|||
*
|
||||
* @since 3.0.11
|
||||
*/
|
||||
public static function methodExists(string $method, string $option = null): bool
|
||||
public static function methodExists(string $method, ?string $option = null): bool
|
||||
{
|
||||
// get the helper class
|
||||
return ($helper = self::get($option, null)) !== null &&
|
||||
|
|
|
@ -155,9 +155,9 @@ class LinkersField extends ListField
|
|||
protected function getOptions()
|
||||
{
|
||||
// Get the user object.
|
||||
$user = Factory::getApplication()->getIdentity();
|
||||
$user = JFactory::getUser();
|
||||
// Get the databse object.
|
||||
$db = Factory::getDBO();
|
||||
$db = JFactory::getDBO();
|
||||
$query = $db->getQuery(true);
|
||||
$query->select($db->quoteName(array('a.guid','a.name'),array('guid','linker_name')));
|
||||
$query->from($db->quoteName('#__getbible_linker', 'a'));
|
||||
|
@ -180,11 +180,11 @@ class LinkersField extends ListField
|
|||
{
|
||||
if ($this->multiple === false)
|
||||
{
|
||||
$options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
$options[] = JHtml::_('select.option', '', JText::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
}
|
||||
foreach($items as $item)
|
||||
{
|
||||
$options[] = Html::_('select.option', $item->guid, $item->linker_name . ' (' . substr($item->guid, 0, 8) . ')');
|
||||
$options[] = JHtml::_('select.option', $item->guid, $item->linker_name . ' (' . substr($item->guid, 0, 8) . ')');
|
||||
}
|
||||
}
|
||||
return $options;
|
||||
|
|
|
@ -49,9 +49,9 @@ class OpenairesponsesField extends ListField
|
|||
protected function getOptions()
|
||||
{
|
||||
// Get the user object.
|
||||
$user = Factory::getApplication()->getIdentity();
|
||||
$user = JFactory::getUser();
|
||||
// Get the databse object.
|
||||
$db = Factory::getDBO();
|
||||
$db = JFactory::getDBO();
|
||||
$query = $db->getQuery(true);
|
||||
$query->select($db->quoteName(array('a.response_id','a.response_id'),array('response_id','open_ai_response_response_id')));
|
||||
$query->from($db->quoteName('#__getbible_open_ai_response', 'a'));
|
||||
|
@ -73,11 +73,11 @@ class OpenairesponsesField extends ListField
|
|||
{
|
||||
if ($this->multiple === false)
|
||||
{
|
||||
$options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
$options[] = JHtml::_('select.option', '', JText::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
}
|
||||
foreach($items as $item)
|
||||
{
|
||||
$options[] = Html::_('select.option', $item->response_id, $item->open_ai_response_response_id);
|
||||
$options[] = JHtml::_('select.option', $item->response_id, $item->open_ai_response_response_id);
|
||||
}
|
||||
}
|
||||
return $options;
|
||||
|
|
|
@ -49,9 +49,9 @@ class PromptsField extends ListField
|
|||
protected function getOptions()
|
||||
{
|
||||
// Get the user object.
|
||||
$user = Factory::getApplication()->getIdentity();
|
||||
$user = JFactory::getUser();
|
||||
// Get the databse object.
|
||||
$db = Factory::getDBO();
|
||||
$db = JFactory::getDBO();
|
||||
$query = $db->getQuery(true);
|
||||
$query->select($db->quoteName(array('a.guid','a.name'),array('guid','prompt_name')));
|
||||
$query->from($db->quoteName('#__getbible_prompt', 'a'));
|
||||
|
@ -73,11 +73,11 @@ class PromptsField extends ListField
|
|||
{
|
||||
if ($this->multiple === false)
|
||||
{
|
||||
$options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
$options[] = JHtml::_('select.option', '', JText::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
}
|
||||
foreach($items as $item)
|
||||
{
|
||||
$options[] = Html::_('select.option', $item->guid, $item->prompt_name . ' (' . $item->guid . ')');
|
||||
$options[] = JHtml::_('select.option', $item->guid, $item->prompt_name . ' (' . $item->guid . ')');
|
||||
}
|
||||
}
|
||||
return $options;
|
||||
|
|
|
@ -155,9 +155,9 @@ class TagersField extends ListField
|
|||
protected function getOptions()
|
||||
{
|
||||
// Get the user object.
|
||||
$user = Factory::getApplication()->getIdentity();
|
||||
$user = JFactory::getUser();
|
||||
// Get the databse object.
|
||||
$db = Factory::getDBO();
|
||||
$db = JFactory::getDBO();
|
||||
$query = $db->getQuery(true);
|
||||
$query->select($db->quoteName(array('a.guid','a.name'),array('guid','tag_name')));
|
||||
$query->from($db->quoteName('#__getbible_tag', 'a'));
|
||||
|
@ -180,11 +180,11 @@ class TagersField extends ListField
|
|||
{
|
||||
if ($this->multiple === false)
|
||||
{
|
||||
$options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
$options[] = JHtml::_('select.option', '', JText::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
}
|
||||
foreach($items as $item)
|
||||
{
|
||||
$options[] = Html::_('select.option', $item->guid, $item->tag_name . ' (' . substr($item->guid, 0, 8) . ')');
|
||||
$options[] = JHtml::_('select.option', $item->guid, $item->tag_name . ' (' . substr($item->guid, 0, 8) . ')');
|
||||
}
|
||||
}
|
||||
return $options;
|
||||
|
|
|
@ -49,9 +49,9 @@ class TargettranslationsField extends ListField
|
|||
protected function getOptions()
|
||||
{
|
||||
// Get the user object.
|
||||
$user = Factory::getApplication()->getIdentity();
|
||||
$user = JFactory::getUser();
|
||||
// Get the databse object.
|
||||
$db = Factory::getDBO();
|
||||
$db = JFactory::getDBO();
|
||||
$query = $db->getQuery(true);
|
||||
$query->select($db->quoteName(array('a.abbreviation','a.translation'),array('abbreviation','abbreviation_translation')));
|
||||
$query->from($db->quoteName('#__getbible_translation', 'a'));
|
||||
|
@ -74,12 +74,12 @@ class TargettranslationsField extends ListField
|
|||
{
|
||||
if ($this->multiple === false)
|
||||
{
|
||||
$options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
$options[] = JHtml::_('select.option', '', JText::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
}
|
||||
$options[] = Html::_('select.option', 'all', Text::_('COM_GETBIBLE_ALL_TRANSLATIONS'));
|
||||
$options[] = JHtml::_('select.option', 'all', JText::_('COM_GETBIBLE_ALL_TRANSLATIONS'));
|
||||
foreach($items as $item)
|
||||
{
|
||||
$options[] = Html::_('select.option', $item->abbreviation, $item->abbreviation_translation.' (' .$item->abbreviation.')');
|
||||
$options[] = JHtml::_('select.option', $item->abbreviation, $item->abbreviation_translation.' (' .$item->abbreviation.')');
|
||||
}
|
||||
}
|
||||
return $options;
|
||||
|
|
|
@ -49,9 +49,9 @@ class TranslationsField extends ListField
|
|||
protected function getOptions()
|
||||
{
|
||||
// Get the user object.
|
||||
$user = Factory::getApplication()->getIdentity();
|
||||
$user = JFactory::getUser();
|
||||
// Get the databse object.
|
||||
$db = Factory::getDBO();
|
||||
$db = JFactory::getDBO();
|
||||
$query = $db->getQuery(true);
|
||||
$query->select($db->quoteName(array('a.abbreviation','a.translation'),array('abbreviation','abbreviation_translation')));
|
||||
$query->from($db->quoteName('#__getbible_translation', 'a'));
|
||||
|
@ -74,11 +74,11 @@ class TranslationsField extends ListField
|
|||
{
|
||||
if ($this->multiple === false)
|
||||
{
|
||||
$options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
$options[] = JHtml::_('select.option', '', JText::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
}
|
||||
foreach($items as $item)
|
||||
{
|
||||
$options[] = Html::_('select.option', $item->abbreviation, $item->abbreviation_translation.' (' .$item->abbreviation.')');
|
||||
$options[] = JHtml::_('select.option', $item->abbreviation, $item->abbreviation_translation.' (' .$item->abbreviation.')');
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -88,9 +88,9 @@ class TranslationsField extends ListField
|
|||
$options = [];
|
||||
if ($this->multiple === false)
|
||||
{
|
||||
$options[] = Html::_('select.option', '', Text::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
$options[] = JHtml::_('select.option', '', JText::_('COM_GETBIBLE_SELECT_AN_OPTION'));
|
||||
}
|
||||
$options[] = Html::_('select.option', 'kjv', 'King James Version (kjv)'); // this is the default at all times.
|
||||
$options[] = JHtml::_('select.option', 'kjv', 'King James Version (kjv)'); // this is the default at all times.
|
||||
}
|
||||
|
||||
return $options;
|
||||
|
|
|
@ -220,7 +220,7 @@ class OpenaiModel extends ItemModel
|
|||
$app = Factory::getApplication();
|
||||
// If no data is found redirect to default page and show warning.
|
||||
$app->enqueueMessage('The Open AI feature has not been activated. Please contact the system administrator of this website to resolve this.', 'error');
|
||||
$app->redirect(JRoute::_('index.php?option=com_getbible&view=app'));
|
||||
$app->redirect(\JRoute::_('index.php?option=com_getbible&view=app'));
|
||||
return false;
|
||||
}
|
||||
// validate that we have a valid prompt and we have a book, chapter and verse
|
||||
|
@ -229,7 +229,7 @@ class OpenaiModel extends ItemModel
|
|||
$app = Factory::getApplication();
|
||||
// If no data is found redirect to default page and show warning.
|
||||
$app->enqueueMessage('There has been an error!', 'error');
|
||||
$app->redirect(JRoute::_('index.php?option=com_getbible&view=app'));
|
||||
$app->redirect(\JRoute::_('index.php?option=com_getbible&view=app'));
|
||||
return false;
|
||||
}
|
||||
// validate that we have the correct translation
|
||||
|
@ -238,7 +238,7 @@ class OpenaiModel extends ItemModel
|
|||
$app = Factory::getApplication();
|
||||
// If no data is found redirect to default page and show warning.
|
||||
$app->enqueueMessage('There has been an error: mismatch!', 'error');
|
||||
$app->redirect(JRoute::_('index.php?option=com_getbible&view=app'));
|
||||
$app->redirect(\JRoute::_('index.php?option=com_getbible&view=app'));
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -28,11 +28,11 @@ defined('_JEXEC') or die;
|
|||
<div>
|
||||
<div class="uk-card">
|
||||
<?php if ($book->nr !== $this->chapter->book_nr): ?>
|
||||
<a class="uk-button uk-button-default" href="<?php echo JRoute::_('index.php?option=com_getbible&view=app&t=' . $book->abbreviation . '&ref=' . $book->name . '&c=1&tab=chapters'); ?>">
|
||||
<a class="uk-button uk-button-default" href="<?php echo \JRoute::_('index.php?option=com_getbible&view=app&t=' . $book->abbreviation . '&ref=' . $book->name . '&c=1&tab=chapters'); ?>">
|
||||
<?php echo $book->name; ?>
|
||||
</a>
|
||||
<?php else: ?>
|
||||
<a class="uk-button uk-button-default uk-active" href="<?php echo JRoute::_('index.php?option=com_getbible&view=app&t=' . $book->abbreviation . '&ref=' . $book->name . '&c=' . $this->chapter->chapter); ?>">
|
||||
<a class="uk-button uk-button-default uk-active" href="<?php echo \JRoute::_('index.php?option=com_getbible&view=app&t=' . $book->abbreviation . '&ref=' . $book->name . '&c=' . $this->chapter->chapter); ?>">
|
||||
<?php echo $book->name; ?>
|
||||
</a>
|
||||
<?php endif; ?>
|
||||
|
|
|
@ -28,11 +28,11 @@ defined('_JEXEC') or die;
|
|||
<div>
|
||||
<div class="uk-card">
|
||||
<?php if ($chapter->chapter !== $this->chapter->chapter): ?>
|
||||
<a class="uk-button uk-button-default" href="<?php echo JRoute::_('index.php?option=com_getbible&view=app&t=' . $chapter->abbreviation . '&ref=' . $chapter->book_name . '&c=' . $chapter->chapter); ?>">
|
||||
<a class="uk-button uk-button-default" href="<?php echo \JRoute::_('index.php?option=com_getbible&view=app&t=' . $chapter->abbreviation . '&ref=' . $chapter->book_name . '&c=' . $chapter->chapter); ?>">
|
||||
<?php echo $chapter->chapter; ?>
|
||||
</a>
|
||||
<?php else: ?>
|
||||
<a class="uk-button uk-button-default uk-active" href="<?php echo JRoute::_('index.php?option=com_getbible&view=app&t=' . $chapter->abbreviation . '&ref=' . $chapter->book_name . '&c=' . $chapter->chapter); ?>">
|
||||
<a class="uk-button uk-button-default uk-active" href="<?php echo \JRoute::_('index.php?option=com_getbible&view=app&t=' . $chapter->abbreviation . '&ref=' . $chapter->book_name . '&c=' . $chapter->chapter); ?>">
|
||||
<?php echo $chapter->chapter; ?>
|
||||
</a>
|
||||
<?php endif; ?>
|
||||
|
|
|
@ -24,7 +24,7 @@ defined('_JEXEC') or die;
|
|||
|
||||
?>
|
||||
<?php if (!empty($this->defaultTranslation)): ?>
|
||||
<a class="uk-button uk-button-default uk-button-small uk-width-1-1" href="<?php echo JRoute::_('index.php?option=com_getbible&view=app&t=' . $this->defaultTranslation->abbreviation . '&b=' . $this->chapter->book_nr . '&c=' . $this->chapter->chapter); ?>">
|
||||
<a class="uk-button uk-button-default uk-button-small uk-width-1-1" href="<?php echo \JRoute::_('index.php?option=com_getbible&view=app&t=' . $this->defaultTranslation->abbreviation . '&b=' . $this->chapter->book_nr . '&c=' . $this->chapter->chapter); ?>">
|
||||
<?php echo $this->defaultTranslation->translation; ?> (<?php echo $this->defaultTranslation->abbreviation; ?>)
|
||||
</a>
|
||||
<?php endif; ?>
|
||||
|
@ -39,11 +39,11 @@ defined('_JEXEC') or die;
|
|||
<div class="uk-accordion-content">
|
||||
<?php foreach ($translations as $translation): ?>
|
||||
<?php if ($translation->abbreviation !== $this->chapter->abbreviation): ?>
|
||||
<a class="uk-button uk-button-default uk-button-small uk-width-1-1 uk-margin-small-bottom" href="<?php echo JRoute::_('index.php?option=com_getbible&view=app&t=' . $translation->abbreviation . '&b=' . $this->chapter->book_nr . '&c=' . $this->chapter->chapter); ?>">
|
||||
<a class="uk-button uk-button-default uk-button-small uk-width-1-1 uk-margin-small-bottom" href="<?php echo \JRoute::_('index.php?option=com_getbible&view=app&t=' . $translation->abbreviation . '&b=' . $this->chapter->book_nr . '&c=' . $this->chapter->chapter); ?>">
|
||||
<?php echo $translation->translation; ?> (<?php echo $translation->abbreviation; ?>)
|
||||
</a>
|
||||
<?php else: ?>
|
||||
<a class="uk-button uk-button-default uk-button-small uk-active uk-width-1-1 uk-margin-small-bottom" href="<?php echo JRoute::_('index.php?option=com_getbible&view=app&t=' . $translation->abbreviation . '&b=' . $this->chapter->book_nr . '&c=' . $this->chapter->chapter); ?>">
|
||||
<a class="uk-button uk-button-default uk-button-small uk-active uk-width-1-1 uk-margin-small-bottom" href="<?php echo \JRoute::_('index.php?option=com_getbible&view=app&t=' . $translation->abbreviation . '&b=' . $this->chapter->book_nr . '&c=' . $this->chapter->chapter); ?>">
|
||||
<?php echo $translation->translation; ?> (<?php echo $translation->abbreviation; ?>)
|
||||
</a>
|
||||
<?php endif; ?>
|
||||
|
|
|
@ -17,6 +17,24 @@
|
|||
<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>4.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/v4.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="4\.[01234]"/>
|
||||
</update>
|
||||
<update>
|
||||
<name>Get Bible</name>
|
||||
<description>The Bible for Joomla</description>
|
||||
|
@ -33,7 +51,7 @@
|
|||
</tags>
|
||||
<maintainer>Llewellyn van der Merwe</maintainer>
|
||||
<maintainerurl>https://getbible.net</maintainerurl>
|
||||
<targetplatform name="joomla" version="4\.[01234]|5\.0"/>
|
||||
<targetplatform name="joomla" version="5\.[01]"/>
|
||||
</update>
|
||||
<update>
|
||||
<name>Get Bible</name>
|
||||
|
@ -51,7 +69,7 @@
|
|||
</tags>
|
||||
<maintainer>Llewellyn van der Merwe</maintainer>
|
||||
<maintainerurl>https://getbible.net</maintainerurl>
|
||||
<targetplatform name="joomla" version="4\.[01234]|5\.0"/>
|
||||
<targetplatform name="joomla" version="5\.[01]"/>
|
||||
</update>
|
||||
<update>
|
||||
<name>Get Bible</name>
|
||||
|
@ -69,7 +87,7 @@
|
|||
</tags>
|
||||
<maintainer>Llewellyn van der Merwe</maintainer>
|
||||
<maintainerurl>https://getbible.net</maintainerurl>
|
||||
<targetplatform name="joomla" version="4\.[01234]|5\.0"/>
|
||||
<targetplatform name="joomla" version="5\.[01]"/>
|
||||
</update>
|
||||
<update>
|
||||
<name>Get Bible</name>
|
||||
|
@ -87,7 +105,7 @@
|
|||
</tags>
|
||||
<maintainer>Llewellyn van der Merwe</maintainer>
|
||||
<maintainerurl>https://getbible.net</maintainerurl>
|
||||
<targetplatform name="joomla" version="4\.[01234]|5\.0"/>
|
||||
<targetplatform name="joomla" version="5\.[01]"/>
|
||||
</update>
|
||||
<update>
|
||||
<name>Get Bible</name>
|
||||
|
@ -105,7 +123,7 @@
|
|||
</tags>
|
||||
<maintainer>Llewellyn van der Merwe</maintainer>
|
||||
<maintainerurl>https://getbible.net</maintainerurl>
|
||||
<targetplatform name="joomla" version="4\.[01234]|5\.0"/>
|
||||
<targetplatform name="joomla" version="5\.[01]"/>
|
||||
</update>
|
||||
<update>
|
||||
<name>Get Bible</name>
|
||||
|
@ -123,7 +141,7 @@
|
|||
</tags>
|
||||
<maintainer>Llewellyn van der Merwe</maintainer>
|
||||
<maintainerurl>https://getbible.net</maintainerurl>
|
||||
<targetplatform name="joomla" version="4\.[01234]|5\.0"/>
|
||||
<targetplatform name="joomla" version="5\.[01]"/>
|
||||
</update>
|
||||
<update>
|
||||
<name>Get Bible</name>
|
||||
|
@ -141,7 +159,7 @@
|
|||
</tags>
|
||||
<maintainer>Llewellyn van der Merwe</maintainer>
|
||||
<maintainerurl>https://getbible.net</maintainerurl>
|
||||
<targetplatform name="joomla" version="4\.[01234]|5\.0"/>
|
||||
<targetplatform name="joomla" version="5\.[01]"/>
|
||||
</update>
|
||||
<update>
|
||||
<name>Get Bible</name>
|
||||
|
@ -159,6 +177,6 @@
|
|||
</tags>
|
||||
<maintainer>Llewellyn van der Merwe</maintainer>
|
||||
<maintainerurl>https://getbible.net</maintainerurl>
|
||||
<targetplatform name="joomla" version="4\.[01234]|5\.0"/>
|
||||
<targetplatform name="joomla" version="5\.[01]"/>
|
||||
</update>
|
||||
</updates>
|
Loading…
Reference in New Issue
Block a user