Release of v4.0.15-alpha4

Improve the PHP environment setup validation. Add option to pass shared session via tag share.

CHANGELOG.md

@@ -1,37 +1,76 @@
-# v5.0.7
+# v4.0.15-alpha4
+
+- Improve the PHP environment setup validation
+- Add option to pass shared session via tag share
+
+# v4.0.15-alpha
+
+- Refactored the API classes
+- Add table schema checker
+- Fix install issue with missing method removeFolder
+- Fix display error with correct component namespace update form JCB
+- Fix update error of undefined folder method (exists)
+
+# v4.0.13
+
+- Add back to Bible button to Open AI page.
+
+# v4.0.12
+
+- Add PHP check on installation.
+- Add Database check on installation.
+
+# v4.0.11
+
+- Moved all library classes away from default Namespace and Folder path to avoid collusion on outdated classes.
+
+# v4.0.10
+
+- Update getBible loader to version 3.1.0
+
+# v4.0.9
+
+- Correct the url encoding to json_encode for none Latin languages.
+- Fix type cast validation on search page.
+
+# v4.0.8
+
+- Restore router functions.
+
+# v4.0.7
 
 - Fix missing token variable in ajax call 
 
-# v5.0.6
+# v4.0.6
 
 - Fix an Ajax input typo. 
 
-# v5.0.5
+# v4.0.5
 
 - Add option to target MySQL 8+ with the search regex.
 
-# v5.0.4
+# v4.0.4
 
 - Fix the spl_autoload_register function to load all the needed namespace. That was remove in the last update (sorry).
 
-# v5.0.3
+# v4.0.3
 
 - Fix canDelete to correctly use published.
 - Add default 1 to version field to make sure the versioning feature works as expected.
 
-# v5.0.2
+# v4.0.2
 
 - Fix Daily Light Deprecated code.
 - Fix Daily Scripture Deprecated code.
 
-# v5.0.1
+# v4.0.1
 
-- First stable back-end and front-end release towards Joomla 4 and 5
+- First stable back-end and front-end release towards Joomla 4
 
-# v5.0.0
+# v4.0.0
 
-- Moved to Joomla 4 and 5
+- Moved to Joomla 4
 
-# v3.0.5
+# v3.1.1
 
-- Fix missing token variable in ajax call 
+- Add back to Bible button to Open AI page.

GetbibleInstallerPowerloader.php

@@ -0,0 +1,64 @@
+<?php
+/*----------------------------------------------------------------------------------|  io.vdm.dev  |----/
+			Vast Development Method
+/-------------------------------------------------------------------------------------------------------/
+
+    @package    getBible.net
+
+    @created    3rd December, 2015
+    @author     Llewellyn van der Merwe <https://getbible.net>
+    @git        Get Bible <https://git.vdm.dev/getBible>
+    @github     Get Bible <https://github.com/getBible>
+    @support    Get Bible <https://git.vdm.dev/getBible/support>
+    @copyright  Copyright (C) 2015. All Rights Reserved
+    @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+
+/------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+// register additional namespace
+spl_autoload_register(function ($class) {
+	// project-specific base directories and namespace prefix
+	$search = [
+		'libraries/vendor_getbible/TrueChristianBible.Joomla.Openai' => 'TrueChristianBible\\Joomla\\Openai',
+		'libraries/vendor_getbible/TrueChristianBible.Joomla.Gitea' => 'TrueChristianBible\\Joomla\\Gitea',
+		'libraries/vendor_getbible/TrueChristianBible.Joomla' => 'TrueChristianBible\\Joomla'
+	];
+	// Start the search and load if found
+	$found = false;
+	$found_base_dir = "";
+	$found_len = 0;
+	foreach ($search as $base_dir => $prefix)
+	{
+		// does the class use the namespace prefix?
+		$len = strlen($prefix);
+		if (strncmp($prefix, $class, $len) === 0)
+		{
+			// we have a match so load the values
+			$found = true;
+			$found_base_dir = $base_dir;
+			$found_len = $len;
+			// done here
+			break;
+		}
+	}
+	// check if we found a match
+	if (!$found)
+	{
+		// not found so move to the next registered autoloader
+		return;
+	}
+	// get the relative class name
+	$relative_class = substr($class, $found_len);
+	// replace the namespace prefix with the base directory, replace namespace
+	// separators with directory separators in the relative class name, append
+	// with .php
+	$file = __DIR__ . '/' . $found_base_dir . '/src' . str_replace('\\', '/', $relative_class) . '.php';
+	// if the file exists, require it
+	if (file_exists($file))
+	{
+		require $file;
+	}
+});

GetbibleInstallerScript.php

@@ -20,12 +20,13 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Installer\InstallerAdapter;
 use Joomla\CMS\Installer\InstallerScriptInterface;
-use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Version;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\Filesystem\Folder;
 use Joomla\Database\DatabaseInterface;
+use TrueChristianBible\Joomla\GetBible\PHPConfigurationChecker;
+use TrueChristianBible\Joomla\GetBible\Table\SchemaChecker;
 
 // No direct access to this file
 defined('_JEXEC') or die;
@@ -40,10 +41,9 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	/**
 	 * The CMS Application.
 	 *
-	 * @var   CMSApplication
 	 * @since 4.4.2
 	 */
-	protected CMSApplication $app;
+	protected $app;
 
 	/**
 	 * The database class.
@@ -55,7 +55,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	/**
 	 * The version number of the extension.
 	 *
-	 * @var   string
+	 * @var    string
 	 * @since  3.6
 	 */
 	protected $release;
@@ -63,7 +63,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	/**
 	 * The table the parameters are stored in.
 	 *
-	 * @var   string
+	 * @var    string
 	 * @since  3.6
 	 */
 	protected $paramTable;
@@ -71,7 +71,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	/**
 	 * The extension name. This should be set in the installer script.
 	 *
-	 * @var   string
+	 * @var    string
 	 * @since  3.6
 	 */
 	protected $extension;
@@ -79,7 +79,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	/**
 	 * A list of files to be deleted
 	 *
-	 * @var   array
+	 * @var    array
 	 * @since  3.6
 	 */
 	protected $deleteFiles = [];
@@ -87,7 +87,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	/**
 	 * A list of folders to be deleted
 	 *
-	 * @var   array
+	 * @var    array
 	 * @since  3.6
 	 */
 	protected $deleteFolders = [];
@@ -95,7 +95,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	/**
 	 * A list of CLI script files to be copied to the cli directory
 	 *
-	 * @var   array
+	 * @var    array
 	 * @since  3.6
 	 */
 	protected $cliScriptFiles = [];
@@ -103,7 +103,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	/**
 	 * Minimum PHP version required to install the extension
 	 *
-	 * @var   string
+	 * @var    string
 	 * @since  3.6
 	 */
 	protected $minimumPhp;
@@ -111,7 +111,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	/**
 	 * Minimum Joomla! version required to install the extension
 	 *
-	 * @var   string
+	 * @var    string
 	 * @since  3.6
 	 */
 	protected $minimumJoomla;
@@ -165,7 +165,6 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   InstallerAdapter  $adapter  The adapter calling this method
 	 *
 	 * @return  boolean  True on success
-	 *
 	 * @since   4.2.0
 	 */
 	public function install(InstallerAdapter $adapter): bool {return true;}
@@ -187,7 +186,6 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   InstallerAdapter   $adapter  The adapter calling this method
 	 *
 	 * @return  boolean  True on success
-	 *
 	 * @since   4.2.0
 	 */
 	public function uninstall(InstallerAdapter $adapter): bool
@@ -274,7 +272,6 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   InstallerAdapter  $adapter  The adapter calling this method
 	 *
 	 * @return  boolean  True on success
-	 *
 	 * @since   4.2.0
 	 */
 	public function preflight(string $type, InstallerAdapter $adapter): bool
@@ -302,11 +299,37 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 		// do any updates needed
 		if ($type === 'update')
 		{
+
+			// Check that the PHP configurations are sufficient 
+			if ($this->classExists(PHPConfigurationChecker::class))
+			{
+				(new PHPConfigurationChecker())->run();
+			}
+
+			// all things to clear out
+			$removeFolders = [];
+			$removeFolders[] = JPATH_LIBRARIES . '/jcb_powers/VDM.Joomla.GetBible';
+			$removeFolders[] = JPATH_LIBRARIES . '/vendor_getbible/TrueChristianChurch.Joomla';
+			$removeFolders[] = JPATH_LIBRARIES . '/vendor_getbible/TrueChristianChurch.Joomla.GetBible';
+			$removeFolders[] = JPATH_LIBRARIES . '/vendor_getbible/TrueChristianChurch.Joomla.Gitea';
+			$removeFolders[] = JPATH_LIBRARIES . '/vendor_getbible/TrueChristianChurch.Joomla.Openai';
+			$removeFolders[] = JPATH_LIBRARIES . '/vendor_getbible/TrueChristianBible.Joomla/src/GetBible';
+
+			foreach ($removeFolders as $folder)
+			{
+				$this->removeFolder($folder);
+			}
 		}
 
 		// do any install needed
 		if ($type === 'install')
 		{
+
+			// Check that the PHP configurations are sufficient 
+			if ($this->classExists(PHPConfigurationChecker::class))
+			{
+				(new PHPConfigurationChecker())->run();
+			}
 		}
 
 		return true;
@@ -319,7 +342,6 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   InstallerAdapter  $adapter  The adapter calling this method
 	 *
 	 * @return  boolean  True on success
-	 *
 	 * @since   4.2.0
 	 */
 	public function postflight(string $type, InstallerAdapter $adapter): bool
@@ -338,7 +360,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 				// typeAlias
 				'com_getbible.note',
 				// table
-				'{"special": {"dbtable": "#__getbible_note","key": "id","type": "NoteTable","prefix": "TrueChristianChurch\Component\Getbible\Administrator\Table"}}',
+				'{"special": {"dbtable": "#__getbible_note","key": "id","type": "NoteTable","prefix": "TrueChristianBible\Component\GetBible\Administrator\Table"}}',
 				// rules
 				'',
 				// fieldMappings
@@ -355,7 +377,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 				// typeAlias
 				'com_getbible.tagged_verse',
 				// table
-				'{"special": {"dbtable": "#__getbible_tagged_verse","key": "id","type": "Tagged_verseTable","prefix": "TrueChristianChurch\Component\Getbible\Administrator\Table"}}',
+				'{"special": {"dbtable": "#__getbible_tagged_verse","key": "id","type": "Tagged_verseTable","prefix": "TrueChristianBible\Component\GetBible\Administrator\Table"}}',
 				// rules
 				'',
 				// fieldMappings
@@ -372,7 +394,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 				// typeAlias
 				'com_getbible.prompt',
 				// table
-				'{"special": {"dbtable": "#__getbible_prompt","key": "id","type": "PromptTable","prefix": "TrueChristianChurch\Component\Getbible\Administrator\Table"}}',
+				'{"special": {"dbtable": "#__getbible_prompt","key": "id","type": "PromptTable","prefix": "TrueChristianBible\Component\GetBible\Administrator\Table"}}',
 				// rules
 				'',
 				// fieldMappings
@@ -389,7 +411,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 				// typeAlias
 				'com_getbible.open_ai_response',
 				// table
-				'{"special": {"dbtable": "#__getbible_open_ai_response","key": "id","type": "Open_ai_responseTable","prefix": "TrueChristianChurch\Component\Getbible\Administrator\Table"}}',
+				'{"special": {"dbtable": "#__getbible_open_ai_response","key": "id","type": "Open_ai_responseTable","prefix": "TrueChristianBible\Component\GetBible\Administrator\Table"}}',
 				// rules
 				'',
 				// fieldMappings
@@ -406,7 +428,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 				// typeAlias
 				'com_getbible.open_ai_message',
 				// table
-				'{"special": {"dbtable": "#__getbible_open_ai_message","key": "id","type": "Open_ai_messageTable","prefix": "TrueChristianChurch\Component\Getbible\Administrator\Table"}}',
+				'{"special": {"dbtable": "#__getbible_open_ai_message","key": "id","type": "Open_ai_messageTable","prefix": "TrueChristianBible\Component\GetBible\Administrator\Table"}}',
 				// rules
 				'',
 				// fieldMappings
@@ -423,7 +445,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 				// typeAlias
 				'com_getbible.tag',
 				// table
-				'{"special": {"dbtable": "#__getbible_tag","key": "id","type": "TagTable","prefix": "TrueChristianChurch\Component\Getbible\Administrator\Table"}}',
+				'{"special": {"dbtable": "#__getbible_tag","key": "id","type": "TagTable","prefix": "TrueChristianBible\Component\GetBible\Administrator\Table"}}',
 				// rules
 				'',
 				// fieldMappings
@@ -443,6 +465,13 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 			);
 
 
+
+			// Check that the database is up-to date
+			if ($this->classExists(SchemaChecker::class))
+			{
+				(new SchemaChecker())->run();
+			}
+
 			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></div>';
@@ -654,7 +683,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 				// typeAlias
 				'com_getbible.note',
 				// table
-				'{"special": {"dbtable": "#__getbible_note","key": "id","type": "NoteTable","prefix": "TrueChristianChurch\Component\Getbible\Administrator\Table"}}',
+				'{"special": {"dbtable": "#__getbible_note","key": "id","type": "NoteTable","prefix": "TrueChristianBible\Component\GetBible\Administrator\Table"}}',
 				// rules
 				'',
 				// fieldMappings
@@ -671,7 +700,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 				// typeAlias
 				'com_getbible.tagged_verse',
 				// table
-				'{"special": {"dbtable": "#__getbible_tagged_verse","key": "id","type": "Tagged_verseTable","prefix": "TrueChristianChurch\Component\Getbible\Administrator\Table"}}',
+				'{"special": {"dbtable": "#__getbible_tagged_verse","key": "id","type": "Tagged_verseTable","prefix": "TrueChristianBible\Component\GetBible\Administrator\Table"}}',
 				// rules
 				'',
 				// fieldMappings
@@ -688,7 +717,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 				// typeAlias
 				'com_getbible.prompt',
 				// table
-				'{"special": {"dbtable": "#__getbible_prompt","key": "id","type": "PromptTable","prefix": "TrueChristianChurch\Component\Getbible\Administrator\Table"}}',
+				'{"special": {"dbtable": "#__getbible_prompt","key": "id","type": "PromptTable","prefix": "TrueChristianBible\Component\GetBible\Administrator\Table"}}',
 				// rules
 				'',
 				// fieldMappings
@@ -705,7 +734,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 				// typeAlias
 				'com_getbible.open_ai_response',
 				// table
-				'{"special": {"dbtable": "#__getbible_open_ai_response","key": "id","type": "Open_ai_responseTable","prefix": "TrueChristianChurch\Component\Getbible\Administrator\Table"}}',
+				'{"special": {"dbtable": "#__getbible_open_ai_response","key": "id","type": "Open_ai_responseTable","prefix": "TrueChristianBible\Component\GetBible\Administrator\Table"}}',
 				// rules
 				'',
 				// fieldMappings
@@ -722,7 +751,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 				// typeAlias
 				'com_getbible.open_ai_message',
 				// table
-				'{"special": {"dbtable": "#__getbible_open_ai_message","key": "id","type": "Open_ai_messageTable","prefix": "TrueChristianChurch\Component\Getbible\Administrator\Table"}}',
+				'{"special": {"dbtable": "#__getbible_open_ai_message","key": "id","type": "Open_ai_messageTable","prefix": "TrueChristianBible\Component\GetBible\Administrator\Table"}}',
 				// rules
 				'',
 				// fieldMappings
@@ -739,7 +768,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 				// typeAlias
 				'com_getbible.tag',
 				// table
-				'{"special": {"dbtable": "#__getbible_tag","key": "id","type": "TagTable","prefix": "TrueChristianChurch\Component\Getbible\Administrator\Table"}}',
+				'{"special": {"dbtable": "#__getbible_tag","key": "id","type": "TagTable","prefix": "TrueChristianBible\Component\GetBible\Administrator\Table"}}',
 				// rules
 				'',
 				// fieldMappings
@@ -752,10 +781,17 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 
 
 
+
+			// Check that the database is up-to date
+			if ($this->classExists(SchemaChecker::class))
+			{
+				(new SchemaChecker())->run();
+			}
+
 			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 5.0.7 Was Successful! Let us know if anything is not working as expected.</h3></div>';
+				<h3>Upgrade to Version 4.0.15-alpha4 Was Successful! Let us know if anything is not working as expected.</h3></div>';
 
 			// Add/Update component in the action logs extensions table.
 			$this->setActionLogsExtensions();
@@ -962,11 +998,84 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 		return true;
 	}
 
+	/**
+	 * Remove folders with files (with ignore options)
+	 *
+	 * @param   string	    $dir	 The path to the folder to remove.
+	 * @param   array|null  $ignore  The folders and files to ignore and not remove.
+	 *
+	 * @return  bool   True if all specified files/folders are removed, false otherwise.
+	 * @since   3.2.2
+	 */
+	protected function removeFolder(string $dir, ?array $ignore = null): bool
+	{
+		if (!is_dir($dir))
+		{
+			return false;
+		}
+
+		$it = new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS);
+		$it = new \RecursiveIteratorIterator($it, \RecursiveIteratorIterator::CHILD_FIRST);
+
+		// Remove trailing slash
+		$dir = rtrim($dir, '/');
+
+		foreach ($it as $file)
+		{
+			$filePath = $file->getPathname();
+			$relativePath = str_replace($dir . '/', '', $filePath);
+
+			if ($ignore !== null && in_array($relativePath, $ignore, true))
+			{
+				continue;
+			}
+
+			if ($file->isDir())
+			{
+				Folder::delete($filePath);
+			}
+			else
+			{
+				File::delete($filePath);
+			}
+		}
+
+		// Delete the root folder if there are no ignored files/folders left
+		if ($ignore === null || $this->isDirEmpty($dir, $ignore))
+		{
+			return Folder::delete($dir);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a directory is empty considering ignored files/folders.
+	 *
+	 * @param   string  $dir	 The path to the folder to check.
+	 * @param   array   $ignore  The folders and files to ignore.
+	 *
+	 * @return  bool    True if the directory is empty or contains only ignored items, false otherwise.
+     * @since   3.2.1
+	 */
+	protected function isDirEmpty(string $dir, array $ignore): bool
+	{
+		$it = new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS);
+		foreach ($it as $file)
+		{
+			$relativePath = str_replace($dir . '/', '', $file->getPathname());
+			if (!in_array($relativePath, $ignore, true))
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
 	/**
 	 * Remove the files and folders in the given array from
 	 *
 	 * @return  void
-	 *
 	 * @since   3.6
 	 */
 	protected function removeFiles()
@@ -998,7 +1107,6 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * Moves the CLI scripts into the CLI folder in the CMS
 	 *
 	 * @return  void
-	 *
 	 * @since   3.6
 	 */
 	protected function moveCliFiles()
@@ -1029,7 +1137,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   string   $contentHistoryOptions
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setContentType(
 		string $typeTitle,
@@ -1091,7 +1199,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   string   $textPrefix
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setActionLogConfig(
 		string $typeTitle,
@@ -1144,7 +1252,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * Set action logs extensions integration
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setActionLogsExtensions(): void
 	{
@@ -1185,7 +1293,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   string   $rules   The component rules
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setAssetsRules(string $rules): void
 	{
@@ -1223,7 +1331,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   string   $params   The component rules
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setExtensionsParams(string $params): void
 	{
@@ -1266,7 +1374,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   string  $dataType          This datatype we will change the rules column to if it to small.
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function setDatabaseAssetsRulesFix(int $accessWorseCase, string $dataType): void
 	{
@@ -1301,7 +1409,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   bool     $fields    The switch to also remove related field data
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeViewData(string $context, bool $fields = false): void
 	{
@@ -1324,7 +1432,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeContentTypes(string $context): void
 	{
@@ -1381,7 +1489,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeFields(string $context): void
 	{
@@ -1443,7 +1551,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   array    $ids       The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeFieldsValues(string $context, array $ids): void
 	{
@@ -1474,7 +1582,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeFieldsGroups(string $context): void
 	{
@@ -1529,7 +1637,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeViewHistory(string $context): void
 	{
@@ -1561,7 +1669,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   array   $ids   The type ids
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeUcmBase(array $ids): void
 	{
@@ -1594,7 +1702,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeUcmContent(string $context): void
 	{
@@ -1626,7 +1734,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeContentItemTagMap(string $context): void
 	{
@@ -1661,7 +1769,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * @param   string   $context   The view context
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeActionLogConfig(string $context): void
 	{
@@ -1691,7 +1799,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * Remove Asset Table Integrated
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeAssetData(): void
 	{
@@ -1719,7 +1827,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * Remove action logs extensions integrated
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeActionLogsExtensions(): void
 	{
@@ -1749,7 +1857,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 	 * Remove remove database fix (if possible)
 	 *
 	 * @return void
-	 * @since 4.4.2
+	 * @since  4.4.2
 	 */
 	protected function removeDatabaseAssetsRulesFix(): void
 	{
@@ -1780,6 +1888,44 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
 		}
 	}
 
+	/**
+	 * Ensures that a class in the namespace is available.
+	 * If the class is not already loaded, it attempts to load it via the specified autoloader.
+	 *
+	 * @param string  $className   The fully qualified name of the class to check.
+	 *
+	 * @return bool True if the class exists or was successfully loaded, false otherwise.
+	 * @since  4.0.1
+	 */
+	protected function classExists(string $className): bool
+	{
+		if (class_exists($className, true))
+		{
+			return true;
+		}
+
+		// Autoloaders to check
+		$autoloaders = [
+			__DIR__ . '/GetbibleInstallerPowerloader.php',
+			JPATH_ADMINISTRATOR . '/components/com_getbible/src/Helper/PowerloaderHelper.php'
+		];
+
+		foreach ($autoloaders as $autoloader)
+		{
+			if (file_exists($autoloader))
+			{
+				require_once $autoloader;
+
+				if (class_exists($className, true))
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	 * Method to move folders into place.
 	 *

README.md

@@ -1,4 +1,4 @@
-# Get Bible (5.0.7)
+# Get Bible (4.0.15-alpha4)
 
  ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/5.0/admin/assets/images/vdm-component.jpg "GetBible")
 
@@ -18,38 +18,38 @@ 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*: 29th July, 2024
-+ *Version*: 5.0.7
++ *Version*: 4.0.15-alpha4
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 ## Build Time
 
-**579 Hours** or **72 Eight Hour Days** (actual time the author saved -
+**664 Hours** or **83 Eight Hour Days** (actual time the author saved -
 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**
++ *Line count*: **237927**
-+ *File count*: **1725**
++ *File count*: **1921**
-+ *Folder count*: **189**
++ *Folder count*: **180**
 
-**382 Hours** or **48 Eight Hour Days** (the actual time the author spent)
+**438 Hours** or **55 Eight Hour Days** (the actual time the author spent)
 
 > (with the following break down:
-> **debugging @145hours** = codingtime / 4;
+> **debugging @166hours** = codingtime / 4;
-> **planning @83hours** = codingtime / 7;
+> **planning @95hours** = codingtime / 7;
-> **mapping @58hours** = codingtime / 10;
+> **mapping @66hours** = codingtime / 10;
-> **office @97hours** = codingtime / 6;)
+> **office @111hours** = codingtime / 6;)
 
-**961 Hours** or **120 Eight Hour Days**
+**1102 Hours** or **138 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**,
 > with the normal everyday realities at the office, that includes the component planning, mapping & debugging.)
 
-Project duration: **24 weeks** or **5 months**
+Project duration: **27.6 weeks** or **5.8 months**
 
 > This **component** was build with a Joomla [Automated Component Builder](https://www.joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)

admin/README.txt

@@ -1,4 +1,4 @@
-# Get Bible (5.0.7)
+# Get Bible (4.0.15-alpha4)
 
  ![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/5.0/admin/assets/images/vdm-component.jpg "GetBible")
 
@@ -18,38 +18,38 @@ 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*: 29th July, 2024
-+ *Version*: 5.0.7
++ *Version*: 4.0.15-alpha4
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 ## Build Time
 
-**579 Hours** or **72 Eight Hour Days** (actual time the author saved -
+**664 Hours** or **83 Eight Hour Days** (actual time the author saved -
 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**
++ *Line count*: **237927**
-+ *File count*: **1725**
++ *File count*: **1921**
-+ *Folder count*: **189**
++ *Folder count*: **180**
 
-**382 Hours** or **48 Eight Hour Days** (the actual time the author spent)
+**438 Hours** or **55 Eight Hour Days** (the actual time the author spent)
 
 > (with the following break down:
-> **debugging @145hours** = codingtime / 4;
+> **debugging @166hours** = codingtime / 4;
-> **planning @83hours** = codingtime / 7;
+> **planning @95hours** = codingtime / 7;
-> **mapping @58hours** = codingtime / 10;
+> **mapping @66hours** = codingtime / 10;
-> **office @97hours** = codingtime / 6;)
+> **office @111hours** = codingtime / 6;)
 
-**961 Hours** or **120 Eight Hour Days**
+**1102 Hours** or **138 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**,
 > with the normal everyday realities at the office, that includes the component planning, mapping & debugging.)
 
-Project duration: **24 weeks** or **5 months**
+Project duration: **27.6 weeks** or **5.8 months**
 
 > This **component** was build with a Joomla [Automated Component Builder](https://www.joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)

admin/config.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
 	<fieldset
-		addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+		addruleprefix="TrueChristianBible\Component\Getbible\Administrator\Rule"
-		addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+		addfieldprefix="TrueChristianBible\Component\Getbible\Administrator\Field"
 		name="global_config"
 		label="COM_GETBIBLE_CONFIG_GLOBAL_LABEL"
 		description="COM_GETBIBLE_CONFIG_GLOBAL_DESC">

admin/forms/book.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<config>
 		<inlinehelp button="show"/>

admin/forms/chapter.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<config>
 		<inlinehelp button="show"/>

admin/forms/filter_books.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<fields name="filter">
 		<field

admin/forms/filter_chapters.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<fields name="filter">
 		<field

admin/forms/filter_linkers.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<fields name="filter">
 		<field

admin/forms/filter_notes.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<fields name="filter">
 		<field

admin/forms/filter_open_ai_messages.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<fields name="filter">
 		<field

admin/forms/filter_open_ai_responses.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<fields name="filter">
 		<field

admin/forms/filter_passwords.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<fields name="filter">
 		<field

admin/forms/filter_prompts.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<fields name="filter">
 		<field

admin/forms/filter_tagged_verses.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<fields name="filter">
 		<field

admin/forms/filter_tags.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<fields name="filter">
 		<field

admin/forms/filter_translations.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<fields name="filter">
 		<field

admin/forms/filter_verses.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<fields name="filter">
 		<field

admin/forms/linker.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<config>
 		<inlinehelp button="show"/>

admin/forms/note.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<config>
 		<inlinehelp button="show"/>

admin/forms/open_ai_message.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<config>
 		<inlinehelp button="show"/>

admin/forms/open_ai_response.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<config>
 		<inlinehelp button="show"/>

admin/forms/password.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<config>
 		<inlinehelp button="show"/>

admin/forms/prompt.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<config>
 		<inlinehelp button="show"/>

admin/forms/tag.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<config>
 		<inlinehelp button="show"/>

admin/forms/tagged_verse.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<config>
 		<inlinehelp button="show"/>

admin/forms/translation.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<config>
 		<inlinehelp button="show"/>

admin/forms/verse.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addruleprefix="TrueChristianChurch\Component\Getbible\Administrator\Rule"
+	addruleprefix="TrueChristianBible\Component\GetBible\Administrator\Rule"
-	addfieldprefix="TrueChristianChurch\Component\Getbible\Administrator\Field"
+	addfieldprefix="TrueChristianBible\Component\GetBible\Administrator\Field"
 >
 	<config>
 		<inlinehelp button="show"/>

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"
@@ -1211,6 +1210,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"
@@ -1685,7 +1685,7 @@ COM_GETBIBLE_THE_TAG_WAS_SUCCESSFULLY_REACTIVATED="The tag was successfully reac
 COM_GETBIBLE_THE_TAG_WAS_SUCCESSFULLY_REMOVED_FROM_THE_VERSE="The tag was successfully removed from the verse."
 COM_GETBIBLE_THE_TAG_WAS_SUCCESSFULLY_UPDATED="The tag was successfully updated."
 COM_GETBIBLE_THE_VERSE_WAS_SUCCESSFULLY_TAGGED="The verse was successfully tagged."
-COM_GETBIBLE_THE_WIKI_CAN_ONLY_BE_LOADED_WHEN_YOUR_JCB_SYSTEM_HAS_INTERNET_CONNECTION="The wiki can only be loaded when your JCB system has internet connection."
+COM_GETBIBLE_THE_WIKI_CAN_ONLY_BE_LOADED_WHEN_YOUR_GETBIBLE_SYSTEM_HAS_INTERNET_CONNECTION="The wiki can only be loaded when your getBible system has internet connection."
 COM_GETBIBLE_THE_WIKI_IS_LOADING="The wiki is loading"
 COM_GETBIBLE_THIS_IS_A_GLOBAL_TAG_SET_BY_US_AT_BSB_FOR_YOUR_CONVENIENCE_WE_HOLD_THE_PRIVILEGE_TO_MODIFY_THESE_TAGS_IF_YOU_BELIEVE_ITS_SET_IN_ERROR_KINDLY_INFORM_US="This is a global tag, set by us at <b>%s</b> for your convenience. We hold the privilege to modify these tags. If you believe it's set in error, kindly inform us."
 COM_GETBIBLE_THIS_TAG_COULD_NOT_BE_REMOVED="This tag could not be removed."

admin/layouts/linker/notes_fullwidth.php

@@ -18,9 +18,9 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
-use VDM\Joomla\Utilities\StringHelper;
+use TrueChristianBible\Joomla\Utilities\StringHelper;
-use VDM\Joomla\Utilities\ArrayHelper;
+use TrueChristianBible\Joomla\Utilities\ArrayHelper;
 
 // No direct access to this file
 defined('_JEXEC') or die;

admin/layouts/linker/passwords_fullwidth.php

@@ -18,9 +18,9 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
-use VDM\Joomla\Utilities\StringHelper;
+use TrueChristianBible\Joomla\Utilities\StringHelper;
-use VDM\Joomla\Utilities\ArrayHelper;
+use TrueChristianBible\Joomla\Utilities\ArrayHelper;
 
 // No direct access to this file
 defined('_JEXEC') or die;

admin/layouts/linker/tags_fullwidth.php

@@ -18,9 +18,9 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
-use VDM\Joomla\Utilities\StringHelper;
+use TrueChristianBible\Joomla\Utilities\StringHelper;
-use VDM\Joomla\Utilities\ArrayHelper;
+use TrueChristianBible\Joomla\Utilities\ArrayHelper;
 
 // No direct access to this file
 defined('_JEXEC') or die;

admin/layouts/open_ai_response/message_fullwidth.php

@@ -18,9 +18,9 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
-use VDM\Joomla\Utilities\StringHelper;
+use TrueChristianBible\Joomla\Utilities\StringHelper;
-use VDM\Joomla\Utilities\ArrayHelper;
+use TrueChristianBible\Joomla\Utilities\ArrayHelper;
 
 // No direct access to this file
 defined('_JEXEC') or die;

admin/layouts/prompt/open_ai_left.php

@@ -21,8 +21,8 @@ use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Layout\LayoutHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
-use VDM\Joomla\Utilities\Component\Helper;
+use TrueChristianBible\Joomla\Utilities\Component\Helper;
 
 // No direct access to this file
 defined('JPATH_BASE') or die;

admin/layouts/prompt/open_ai_right.php

@@ -21,8 +21,8 @@ use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Layout\LayoutHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
-use VDM\Joomla\Utilities\Component\Helper;
+use TrueChristianBible\Joomla\Utilities\Component\Helper;
 
 // No direct access to this file
 defined('JPATH_BASE') or die;

admin/layouts/trashhelper.php

@@ -21,7 +21,7 @@ use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Layout\LayoutHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 defined('JPATH_BASE') or die;

admin/services/provider.php

@@ -15,53 +15,12 @@
 
 /------------------------------------------------------------------------------------------------------*/
 
-
+// The power autoloader for this project (JPATH_ADMINISTRATOR) area.
-
+$power_autoloader = JPATH_ADMINISTRATOR . '/components/com_getbible/src/Helper/PowerloaderHelper.php';
-// register additional namespace
+if (file_exists($power_autoloader))
-\spl_autoload_register(function ($class) {
+{
-	// project-specific base directories and namespace prefix
+	require_once $power_autoloader;
-	$search = [
+}
-		'libraries/jcb_powers/VDM.Joomla.GetBible' => 'VDM\\Joomla\\GetBible',
-		'libraries/jcb_powers/VDM.Joomla.Openai' => 'VDM\\Joomla\\Openai',
-		'libraries/jcb_powers/VDM.Joomla.Gitea' => 'VDM\\Joomla\\Gitea',
-		'libraries/jcb_powers/VDM.Joomla' => 'VDM\\Joomla'
-	];
-	// Start the search and load if found
-	$found = false;
-	$found_base_dir = "";
-	$found_len = 0;
-	foreach ($search as $base_dir => $prefix)
-	{
-		// does the class use the namespace prefix?
-		$len = strlen($prefix);
-		if (strncmp($prefix, $class, $len) === 0)
-		{
-			// we have a match so load the values
-			$found = true;
-			$found_base_dir = $base_dir;
-			$found_len = $len;
-			// done here
-			break;
-		}
-	}
-	// check if we found a match
-	if (!$found)
-	{
-		// not found so move to the next registered autoloader
-		return;
-	}
-	// get the relative class name
-	$relative_class = substr($class, $found_len);
-	// replace the namespace prefix with the base directory, replace namespace
-	// separators with directory separators in the relative class name, append
-	// with .php
-	$file = JPATH_ROOT . '/' . $found_base_dir . '/src' . str_replace('\\', '/', $relative_class) . '.php';
-	// if the file exists, require it
-	if (file_exists($file))
-	{
-		require $file;
-	}
-});
 
 // (soon) use Joomla\CMS\Association\AssociationExtensionInterface;
 use Joomla\CMS\Categories\CategoryFactoryInterface;
@@ -74,8 +33,8 @@ use Joomla\CMS\Extension\Service\Provider\MVCFactory;
 use Joomla\CMS\Extension\Service\Provider\RouterFactory;
 use Joomla\CMS\HTML\Registry;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
-use TrueChristianChurch\Component\Getbible\Administrator\Extension\GetbibleComponent;
+use TrueChristianBible\Component\GetBible\Administrator\Extension\GetbibleComponent;
-// (soon) use TrueChristianChurch\Component\Getbible\Administrator\Helper\AssociationsHelper;
+// (soon) use TrueChristianBible\Component\GetBible\Administrator\Helper\AssociationsHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 
@@ -83,7 +42,7 @@ use Joomla\DI\ServiceProviderInterface;
 \defined('_JEXEC') or die;
 
 /**
- * The TrueChristianChurch Getbible service provider.
+ * The TrueChristianBible Getbible service provider.
  *
  * @since  4.0.0
  */
@@ -102,10 +61,10 @@ return new class () implements ServiceProviderInterface
 	{
 		// (soon) $container->set(AssociationExtensionInterface::class, new AssociationsHelper());
 
-		$container->registerServiceProvider(new CategoryFactory('\\TrueChristianChurch\\Component\\Getbible'));
+		$container->registerServiceProvider(new CategoryFactory('\\TrueChristianBible\\Component\\GetBible'));
-		$container->registerServiceProvider(new MVCFactory('\\TrueChristianChurch\\Component\\Getbible'));
+		$container->registerServiceProvider(new MVCFactory('\\TrueChristianBible\\Component\\GetBible'));
-		$container->registerServiceProvider(new ComponentDispatcherFactory('\\TrueChristianChurch\\Component\\Getbible'));
+		$container->registerServiceProvider(new ComponentDispatcherFactory('\\TrueChristianBible\\Component\\GetBible'));
-		$container->registerServiceProvider(new RouterFactory('\\TrueChristianChurch\\Component\\Getbible'));
+		$container->registerServiceProvider(new RouterFactory('\\TrueChristianBible\\Component\\GetBible'));
 
 		$container->set(
 			ComponentInterface::class,

admin/sql/install.mysql.utf8.sql

@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `#__getbible_linker` (
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
 	`public_notes` TINYINT(1) NOT NULL DEFAULT 0,
 	`public_tagged_verses` TINYINT(1) NOT NULL DEFAULT 0,
-	`params` text NULL,
+	`params` TEXT NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@@ -42,7 +42,7 @@ CREATE TABLE IF NOT EXISTS `#__getbible_note` (
 	`linker` VARCHAR(36) NOT NULL DEFAULT '',
 	`note` TEXT NOT NULL,
 	`verse` INT(7) NOT NULL DEFAULT 0,
-	`params` text NULL,
+	`params` TEXT NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@@ -77,7 +77,7 @@ CREATE TABLE IF NOT EXISTS `#__getbible_tagged_verse` (
 	`linker` VARCHAR(36) NOT NULL DEFAULT '',
 	`tag` VARCHAR(36) NOT NULL DEFAULT '',
 	`verse` INT(7) NOT NULL DEFAULT 0,
-	`params` text NULL,
+	`params` TEXT NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@@ -106,7 +106,7 @@ CREATE TABLE IF NOT EXISTS `#__getbible_tagged_verse` (
 CREATE TABLE IF NOT EXISTS `#__getbible_prompt` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`abbreviation` VARCHAR(100) NOT NULL DEFAULT '',
+	`abbreviation` VARCHAR(100) NOT NULL,
 	`ai_org_token_override` TINYINT(1) NOT NULL DEFAULT 0,
 	`cache_behaviour` TINYINT(1) NOT NULL DEFAULT 0,
 	`cache_capacity` INT(11) NOT NULL DEFAULT 0,
@@ -131,7 +131,7 @@ CREATE TABLE IF NOT EXISTS `#__getbible_prompt` (
 	`token_override` TINYINT(1) NOT NULL DEFAULT 0,
 	`top_p` FLOAT(11) NOT NULL DEFAULT 0,
 	`top_p_override` TINYINT(1) NOT NULL DEFAULT 0,
-	`params` text NULL,
+	`params` TEXT NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@@ -160,30 +160,30 @@ CREATE TABLE IF NOT EXISTS `#__getbible_prompt` (
 CREATE TABLE IF NOT EXISTS `#__getbible_open_ai_response` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`abbreviation` VARCHAR(100) NOT NULL DEFAULT '',
+	`abbreviation` VARCHAR(100) NOT NULL,
 	`book` INT(11) NOT NULL DEFAULT 0,
 	`chapter` INT(11) NOT NULL DEFAULT 0,
 	`completion_tokens` INT(11) NOT NULL DEFAULT 0,
 	`frequency_penalty` FLOAT(11) NOT NULL DEFAULT 0,
-	`language` VARCHAR(255) NOT NULL DEFAULT '',
+	`language` VARCHAR(255) NOT NULL,
-	`lcsh` VARCHAR(255) NOT NULL DEFAULT '',
+	`lcsh` VARCHAR(255) NOT NULL,
 	`max_tokens` INT(11) NOT NULL DEFAULT 0,
 	`model` VARCHAR(50) NOT NULL DEFAULT '',
 	`n` INT(7) NOT NULL DEFAULT 0,
 	`presence_penalty` FLOAT(11) NOT NULL DEFAULT 0,
-	`prompt` VARCHAR(36) NOT NULL DEFAULT '',
+	`prompt` VARCHAR(36) NOT NULL,
 	`prompt_tokens` INT(11) NOT NULL DEFAULT 0,
-	`response_created` VARCHAR(255) NOT NULL DEFAULT '',
+	`response_created` VARCHAR(255) NOT NULL,
-	`response_id` VARCHAR(255) NOT NULL DEFAULT '',
+	`response_id` VARCHAR(255) NOT NULL,
-	`response_model` VARCHAR(255) NOT NULL DEFAULT '',
+	`response_model` VARCHAR(255) NOT NULL,
-	`response_object` VARCHAR(255) NOT NULL DEFAULT '',
+	`response_object` VARCHAR(255) NOT NULL,
 	`selected_word` TEXT NOT NULL,
 	`temperature` FLOAT(11) NOT NULL DEFAULT 0,
 	`top_p` FLOAT(11) NOT NULL DEFAULT 0,
 	`total_tokens` INT(11) NOT NULL DEFAULT 0,
-	`verse` VARCHAR(255) NOT NULL DEFAULT '',
+	`verse` VARCHAR(255) NOT NULL,
-	`word` VARCHAR(255) NOT NULL DEFAULT '',
+	`word` VARCHAR(255) NOT NULL,
-	`params` text NULL,
+	`params` TEXT NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@@ -226,10 +226,10 @@ CREATE TABLE IF NOT EXISTS `#__getbible_open_ai_message` (
 	`index` INT(11) NOT NULL DEFAULT 0,
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
 	`open_ai_response` VARCHAR(255) NOT NULL DEFAULT '',
-	`prompt` VARCHAR(36) NOT NULL DEFAULT '',
+	`prompt` VARCHAR(36) NOT NULL,
 	`role` VARCHAR(255) NOT NULL DEFAULT '',
 	`source` TINYINT(1) NOT NULL DEFAULT 0,
-	`params` text NULL,
+	`params` TEXT NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@@ -260,7 +260,7 @@ CREATE TABLE IF NOT EXISTS `#__getbible_password` (
 	`linker` VARCHAR(36) NOT NULL DEFAULT '',
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
 	`password` VARCHAR(100) NOT NULL DEFAULT '',
-	`params` text NULL,
+	`params` TEXT NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@@ -287,11 +287,11 @@ 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 '',
-	`params` text NULL,
+	`params` TEXT NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@@ -333,7 +333,7 @@ CREATE TABLE IF NOT EXISTS `#__getbible_translation` (
 	`language` VARCHAR(100) NOT NULL DEFAULT '',
 	`sha` VARCHAR(64) NOT NULL DEFAULT '',
 	`translation` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NULL,
+	`params` TEXT NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@@ -361,7 +361,7 @@ CREATE TABLE IF NOT EXISTS `#__getbible_book` (
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
 	`nr` INT(7) NOT NULL DEFAULT 0,
 	`sha` VARCHAR(64) NOT NULL DEFAULT '',
-	`params` text NULL,
+	`params` TEXT NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@@ -392,7 +392,7 @@ CREATE TABLE IF NOT EXISTS `#__getbible_chapter` (
 	`chapter` INT(7) NOT NULL DEFAULT 0,
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
 	`sha` VARCHAR(64) NOT NULL DEFAULT '',
-	`params` text NULL,
+	`params` TEXT NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@@ -425,7 +425,7 @@ CREATE TABLE IF NOT EXISTS `#__getbible_verse` (
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
 	`text` TEXT NOT NULL,
 	`verse` INT(7) NOT NULL DEFAULT 0,
-	`params` text NULL,
+	`params` TEXT NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,

admin/sql/updates/mysql/4.0.2.sql

@@ -0,0 +1 @@
+

admin/sql/updates/mysql/4.0.3.sql

@@ -0,0 +1 @@
+

admin/sql/updates/mysql/4.0.4.sql

@@ -0,0 +1 @@
+

admin/sql/updates/mysql/4.0.5.sql

@@ -0,0 +1 @@
+

admin/sql/updates/mysql/4.0.6.sql

@@ -0,0 +1 @@
+

admin/sql/updates/mysql/4.0.7.sql

@@ -0,0 +1 @@
+

admin/sql/updates/mysql/4.0.8.sql

@@ -0,0 +1 @@
+

admin/sql/updates/mysql/4.0.9.sql

@@ -0,0 +1 @@
+

admin/src/Controller/AjaxController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Application\CMSApplication;

admin/src/Controller/BookController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -29,7 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -335,7 +335,7 @@ class BookController extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   BaseDatabaseModel  $model     The data model object.
 	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void

admin/src/Controller/BooksController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -22,9 +22,9 @@ use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use TrueChristianBible\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\GetBible\Factory as GetBibleFactory;
+use TrueChristianBible\Joomla\GetBible\Factory as GetBibleFactory;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Controller/ChapterController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -29,7 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -335,7 +335,7 @@ class ChapterController extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   BaseDatabaseModel  $model     The data model object.
 	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void

admin/src/Controller/ChaptersController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -22,7 +22,7 @@ use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Controller/DisplayController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\Utilities\ArrayHelper;

admin/src/Controller/GetbibleController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -22,7 +22,7 @@ use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Controller/LinkerController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -29,7 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -335,7 +335,7 @@ class LinkerController extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   BaseDatabaseModel  $model     The data model object.
 	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void

admin/src/Controller/LinkersController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -22,7 +22,7 @@ use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Controller/NoteController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -29,7 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -335,7 +335,7 @@ class NoteController extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   BaseDatabaseModel  $model     The data model object.
 	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void

admin/src/Controller/NotesController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -22,7 +22,7 @@ use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Controller/Open_ai_messageController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -29,7 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -335,7 +335,7 @@ class Open_ai_messageController extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   BaseDatabaseModel  $model     The data model object.
 	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void

admin/src/Controller/Open_ai_messagesController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -22,7 +22,7 @@ use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Controller/Open_ai_responseController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -29,7 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -335,7 +335,7 @@ class Open_ai_responseController extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   BaseDatabaseModel  $model     The data model object.
 	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void

admin/src/Controller/Open_ai_responsesController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -22,7 +22,7 @@ use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Controller/PasswordController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -29,7 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -335,7 +335,7 @@ class PasswordController extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   BaseDatabaseModel  $model     The data model object.
 	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void

admin/src/Controller/PasswordsController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -22,7 +22,7 @@ use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Controller/PromptController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -29,7 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -335,7 +335,7 @@ class PromptController extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   BaseDatabaseModel  $model     The data model object.
 	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void

admin/src/Controller/PromptsController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -22,7 +22,7 @@ use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Controller/TagController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -29,7 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -335,7 +335,7 @@ class TagController extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   BaseDatabaseModel  $model     The data model object.
 	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void

admin/src/Controller/Tagged_verseController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -29,7 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -335,7 +335,7 @@ class Tagged_verseController extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   BaseDatabaseModel  $model     The data model object.
 	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void

admin/src/Controller/Tagged_versesController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -22,7 +22,7 @@ use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Controller/TagsController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -22,7 +22,7 @@ use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Controller/TranslationController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -29,7 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -335,7 +335,7 @@ class TranslationController extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   BaseDatabaseModel  $model     The data model object.
 	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void

admin/src/Controller/TranslationsController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -22,9 +22,9 @@ use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
-use VDM\Joomla\GetBible\Factory as GetBibleFactory;
+use TrueChristianBible\Joomla\GetBible\Factory as GetBibleFactory;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use TrueChristianBible\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -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(Route::_('index.php?option=com_getbible&view=translations', false), $message, 'error');
 			return;
 		}
 		// Redirect to the list screen with error.

admin/src/Controller/VerseController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -29,7 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -335,7 +335,7 @@ class VerseController extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   BaseDatabaseModel  $model     The data model object.
 	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void

admin/src/Controller/VersesController.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Controller;
+namespace TrueChristianBible\Component\GetBible\Administrator\Controller;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -22,7 +22,7 @@ use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Extension/GetbibleComponent.php

@@ -14,7 +14,7 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Extension;
+namespace TrueChristianBible\Component\GetBible\Administrator\Extension;
 
 use Joomla\CMS\Association\AssociationServiceInterface;
 use Joomla\CMS\Association\AssociationServiceTrait;
@@ -32,7 +32,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\Tag\TagServiceInterface;
 use Joomla\CMS\Tag\TagServiceTrait;
 use Joomla\CMS\User\UserFactoryInterface;
-// (soon) use TrueChristianChurch\Component\Getbible\Administrator\Service\HTML\AdministratorService;
+// (soon) use TrueChristianBible\Component\GetBible\Administrator\Service\HTML\AdministratorService;
 use Psr\Container\ContainerInterface;
 
 // No direct access to this file

admin/src/Field/BooksfilternameField.php

@@ -14,14 +14,14 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Field;
+namespace TrueChristianBible\Component\GetBible\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Field/BooksfilternrField.php

@@ -14,14 +14,14 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Field;
+namespace TrueChristianBible\Component\GetBible\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Field/ChaptersfilterbooknrField.php

@@ -14,14 +14,14 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Field;
+namespace TrueChristianBible\Component\GetBible\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Field/ChaptersfilterchapterField.php

@@ -14,14 +14,14 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Field;
+namespace TrueChristianBible\Component\GetBible\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Field/LinkersField.php

@@ -14,14 +14,14 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Field;
+namespace TrueChristianBible\Component\GetBible\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -102,7 +102,7 @@ class LinkersField extends ListField
 			if ($user->authorise('linker.edit', 'com_getbible') && $app->isClient('administrator')) // TODO for now only in admin area.
 			{
 				// build edit button
-				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small hasTooltip" title="'.Text::sprintf('COM_GETBIBLE_EDIT_S', $button_label).'" style="display: none; border-radius: 0px 4px 4px 0px;" href="#" >
+				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small btn-outline-success button-select hasTooltip" title="'.Text::sprintf('COM_GETBIBLE_EDIT_S', $button_label).'" style="display: none; border-radius: 0px 4px 4px 0px;" href="#" >
 					<span class="icon-edit"></span></a>';
 				// build script
 				$script[] = "

admin/src/Field/LinkersfilternameField.php

@@ -14,14 +14,14 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Field;
+namespace TrueChristianBible\Component\GetBible\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Field/LinkersfilterpublicnotesField.php

@@ -14,14 +14,14 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Field;
+namespace TrueChristianBible\Component\GetBible\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Field/LinkersfilterpublictaggedversesField.php

@@ -14,14 +14,14 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Field;
+namespace TrueChristianBible\Component\GetBible\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Field/NotesfilteraccessField.php

@@ -14,14 +14,14 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Field;
+namespace TrueChristianBible\Component\GetBible\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Field/NotesfilterbooknrField.php

@@ -14,14 +14,14 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Field;
+namespace TrueChristianBible\Component\GetBible\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Field/NotesfilterchapterField.php

@@ -14,14 +14,14 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Field;
+namespace TrueChristianBible\Component\GetBible\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Field/NotesfilterverseField.php

@@ -14,14 +14,14 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Field;
+namespace TrueChristianBible\Component\GetBible\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Field/OpenaimessagesfilterroleField.php

@@ -14,14 +14,14 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Field;
+namespace TrueChristianBible\Component\GetBible\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Field/OpenaimessagesfiltersourceField.php

@@ -14,14 +14,14 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Field;
+namespace TrueChristianBible\Component\GetBible\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Field/OpenairesponsesField.php

@@ -14,14 +14,14 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Field;
+namespace TrueChristianBible\Component\GetBible\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Field/OpenairesponsesfilterresponseidField.php

@@ -14,14 +14,14 @@
     @license    GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 /------------------------------------------------------------------------------------------------------*/
-namespace TrueChristianChurch\Component\Getbible\Administrator\Field;
+namespace TrueChristianBible\Component\GetBible\Administrator\Field;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
-use TrueChristianChurch\Component\Getbible\Administrator\Helper\GetbibleHelper;
+use TrueChristianBible\Component\GetBible\Administrator\Helper\GetbibleHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;