.gitea/ISSUE_TEMPLATE/a-bug.yml

@@ -22,60 +22,17 @@ body:
       value: |
         # Environment Details                
   - type: dropdown
-    id: joomla_version
+    id: system
     attributes:
-      label: Which Joomla version are you using?
+      label: Which Joomla version were you using?
       multiple: true
       options:
-        - Latest
         - Joomla 5
         - Joomla 4
         - Joomla 3
         - Other
     validations:
       required: true
-  - type: dropdown
-    id: sermon_distributor_version
-    attributes:
-      label: Which Joomla Sermon Distributor version are you using?
-      multiple: true
-      options:
-        - Latest
-        - v5.0
-        - v3.0
-        - v2.1
-        - v2.0
-        - Other
-    validations:
-      required: true
-  - type: dropdown
-    id: php_version
-    attributes:
-      label: Which PHP version are you using?
-      multiple: true
-      options:
-        - Latest
-        - PHP 8.3
-        - PHP 8.2
-        - PHP 8.1
-        - PHP 8.0
-        - PHP 7.4
-        - Other
-    validations:
-      required: true
-  - type: dropdown
-    id: apache_version
-    attributes:
-      label: Which Apache version are you using?
-      multiple: true
-      options:
-        - Latest
-        - Apache 2.4
-        - Apache 2.2
-        - Apache 2.0
-        - Other
-    validations:
-      required: true
   - type: dropdown
     id: area
     attributes:

.gitea/ISSUE_TEMPLATE/g-security.yml

@@ -21,12 +21,11 @@ body:
       value: |
         # Affected Systems        
   - type: dropdown
-    id: joomla_version
+    id: system
     attributes:
       label: Which Joomla version could potentially be affected?
       multiple: true
       options:
-        - Latest
         - Joomla 5
         - Joomla 4
         - Joomla 3
@@ -34,21 +33,6 @@ body:
         - Other
     validations:
       required: true
-  - type: dropdown
-    id: sermon_distributor_version
-    attributes:
-      label: Which Joomla Sermon Distributor version could potentially be affected?
-      multiple: true
-      options:
-        - Latest
-        - v5.0
-        - v3.0
-        - v2.1
-        - v2.0
-        - All
-        - Other
-    validations:
-      required: true
   - type: textarea
     id: non-sensitive-details
     attributes:
@@ -61,4 +45,4 @@ body:
     id: comments
     attributes:
       label: Additional Comments
-      description: Feel free to include any further comments or pertinent details that might assist us.
+      description: Feel free to include any further comments or pertinent details that might assist us.

.gitea/ISSUE_TEMPLATE/h-test.yml

@@ -22,60 +22,17 @@ body:
       value: |
         # Affected Components and Context        
   - type: dropdown
-    id: joomla_version
+    id: system
     attributes:
       label: Which Joomla version is this testing issue related to?
       multiple: true
       options:
-        - Latest
         - Joomla 5
         - Joomla 4
         - Joomla 3
         - Other
     validations:
       required: true
-  - type: dropdown
-    id: sermon_distributor_version
-    attributes:
-      label: Which Joomla Sermon Distributor version is this testing issue related to?
-      multiple: true
-      options:
-        - Latest
-        - v5.0
-        - v3.0
-        - v2.1
-        - v2.0
-        - Other
-    validations:
-      required: true
-  - type: dropdown
-    id: php_version
-    attributes:
-      label: Which PHP version is this testing issue related to?
-      multiple: true
-      options:
-        - Latest
-        - PHP 8.3
-        - PHP 8.2
-        - PHP 8.1
-        - PHP 8.0
-        - PHP 7.4
-        - Other
-    validations:
-      required: true
-  - type: dropdown
-    id: apache_version
-    attributes:
-      label: Which Apache version is this testing issue related to?
-      multiple: true
-      options:
-        - Latest
-        - Apache 2.4
-        - Apache 2.2
-        - Apache 2.0
-        - Other
-    validations:
-      required: true
   - type: dropdown
     id: area
     attributes:

.octojpack

@@ -9,7 +9,7 @@
     "name": "PKG_SERMONDISTRIBUTOR",
     "code_name": "sermondistributor",
     "package_name": "pkg_sermondistributor",
-    "min_joomla_version": "5.0",
+    "min_joomla_version": "4.3",
     "max_joomla_version": "5.1",
     "copyright": "Copyright (C) 2015 Llewellyn van der Merwe. All rights reserved.",
     "copyright_year": "2015",
@@ -20,12 +20,12 @@
     "author_url": "https://io.vdm.dev/",
     "description": "The Sermon Distributor.",
     "version_id": "com_sermondistributor",
-    "update_servers": "https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/5.x/sermondistributor_update_server.xml"
+    "update_servers": "https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/5.0/sermondistributor_update_server.xml"
   },
   "repository": {
     "owner": "christian",
     "repo": "pkg-sermondistributor",
-    "branch": "5.x"
+    "branch": "5.0"
   },
   "files": [
     {
@@ -33,7 +33,7 @@
       "repo": "Joomla-Sermon-Distributor",
       "id": "com_sermondistributor",
       "type": "component",
-      "mode": "5.x"
+      "mode": "5.0"
     },
     {
       "owner": "getBible",

CHANGELOG.md

@@ -1,16 +1,11 @@
-# v5.0.0-beta2
+# v5.0.0-beta1
 
-- First release of Sermon Distributor towards Joomla 5
-- Add PHP check to install/update class
-- Add Database check and fix to install/update class
+- First release of [[[Component]]] towards Joomla 5
 
-# v4.0.0-beta2
+# v3.0.3
 
-- First release of Sermon Distributor towards Joomla 4
-- Add PHP check to install/update class
-- Add Database check and fix to install/update class
+- Removed the not_required field from the sermon model. #36
 
-# v3.0.5
+# v3.0.2
 
-- Add PHP check to install/update class
-- Add Database check and fix to install/update class
+- Add the HTML class to the site default layout.

README.md

@@ -24,38 +24,38 @@ The best way to see all your options is to install this component on you Joomla
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Sermon Distributor](https://www.vdm.io/)
 + *First Build*: 22nd October, 2015
-+ *Last Build*: 3rd May, 2024
++ *Last Build*: 2nd March, 2024
 + *Version*: 5.0.x
 + *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 :hourglass:
 
-**263 Hours** or **33 Eight Hour Days** (actual time the author saved -
+**245 Hours** or **31 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*: **94142**
-+ *File count*: **602**
-+ *Folder count*: **124**
++ *Line count*: **87679**
++ *File count*: **575**
++ *Folder count*: **120**
 
-**173 Hours** or **22 Eight Hour Days** (the actual time the author spent)
+**161 Hours** or **20 Eight Hour Days** (the actual time the author spent)
 
 > (with the following break down:
-> **debugging @66hours** = codingtime / 4;
-> **planning @38hours** = codingtime / 7;
-> **mapping @26hours** = codingtime / 10;
-> **office @44hours** = codingtime / 6;)
+> **debugging @61hours** = codingtime / 4;
+> **planning @35hours** = codingtime / 7;
+> **mapping @24hours** = codingtime / 10;
+> **office @41hours** = codingtime / 6;)
 
-**436 Hours** or **55 Eight Hour Days**
+**406 Hours** or **51 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: **11 weeks** or **2.3 months**
+Project duration: **10.2 weeks** or **2.1 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)

SermondistributorInstallerScript.php

@@ -33,7 +33,6 @@ use Joomla\CMS\Version;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\Filesystem\Folder;
 use Joomla\Database\DatabaseInterface;
-use TrueChristianChurch\Joomla\SermonDistributor\Table\Schema;
 
 // No direct access to this file
 defined('_JEXEC') or die;
@@ -301,17 +300,11 @@ class Com_SermondistributorInstallerScript implements InstallerScriptInterface
 		// do any updates needed
 		if ($type === 'update')
 		{
-
-			// Check that the required configuration are set for PHP
-			$this->phpConfigurationCheck($this->app);
 		}
 
 		// do any install needed
 		if ($type === 'install')
 		{
-
-			// Check that the required configuration are set for PHP
-			$this->phpConfigurationCheck($this->app);
 		}
 
 		return true;
@@ -487,10 +480,6 @@ class Com_SermondistributorInstallerScript implements InstallerScriptInterface
 			);
 
 
-
-			// Check that the database is up-to date
-			$this->databaseSchemaCheck($this->app);
-
 			echo '<div style="background-color: #fff;" class="alert alert-info"><a target="_blank" href="https://www.vdm.io/" title="Sermon Distributor">
 				<img src="components/com_sermondistributor/assets/images/vdm-component.jpg"/>
 				</a></div>';
@@ -754,14 +743,10 @@ class Com_SermondistributorInstallerScript implements InstallerScriptInterface
 
 
 
-
-			// Check that the database is up-to date
-			$this->databaseSchemaCheck($this->app);
-
 			echo '<div style="background-color: #fff;" class="alert alert-info"><a target="_blank" href="https://www.vdm.io/" title="Sermon Distributor">
 				<img src="components/com_sermondistributor/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 5.0.0-beta2 Was Successful! Let us know if anything is not working as expected.</h3></div>';
+				<h3>Upgrade to Version 5.0.0-beta1 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();
@@ -1706,174 +1691,6 @@ class Com_SermondistributorInstallerScript implements InstallerScriptInterface
 		}
 	}
 
-	/**
-	 * Define the required limits with specific messages for success and warning scenarios
-	 *
-	 * @var array
-	 * @since 3.0.5
-	 */
-	protected array $requiredPHPConfigs = [
-		'upload_max_filesize' => [
-			'value'   => '64M',
-			'success' => 'The upload_max_filesize is appropriately set to handle large files, which is essential for uploading substantial components and media.',
-			'warning' => 'The current upload_max_filesize may not support large file uploads effectively, potentially causing failures during component installation.'
-		],
-		'post_max_size' => [
-			'value'   => '128M',
-			'success' => 'The post_max_size setting is sufficient to manage large data submissions, ensuring smooth data processing within forms and uploads.',
-			'warning' => 'An insufficient post_max_size can lead to truncated data submissions, affecting form functionality and data integrity.'
-		],
-		'max_execution_time' => [
-			'value'   => 60,
-			'success' => 'Max execution time is set high enough to execute complex operations without premature termination, which is crucial for lengthy operations.',
-			'warning' => 'A low max execution time could lead to script timeouts, especially during intensive operations, which might interrupt execution and cause failures during the compiling of a large extension.'
-		],
-		'max_input_vars' => [
-			'value'   => 5000,
-			'success' => 'The max_input_vars setting supports a high number of input variables, facilitating complex forms and detailed component configurations.',
-			'warning' => 'Too few max_input_vars may result in lost data during processing complex forms, which can lead to incomplete configurations and operational issues.'
-		],
-		'max_input_time' => [
-			'value'   => 60,
-			'success' => 'Max input time is adequate for processing inputs efficiently during high-load operations, ensuring no premature timeouts.',
-			'warning' => 'An insufficient max input time could result in incomplete data processing during input-heavy operations, potentially leading to errors and data loss.'
-		],
-		'memory_limit' => [
-			'value'   => '256M',
-			'success' => 'The memory limit is set high to accommodate extensive operations and data processing, which enhances overall performance and stability.',
-			'warning' => 'A low memory limit can lead to frequent crashes and performance issues, particularly when processing large amounts of data or complex calculations.'
-		]
-	];
-
-	/**
-	 * Helper function to convert PHP INI memory values to bytes
-	 *
-	 * @param  string  $value     The value to convert
-	 *
-	 * @return int   The bytes value
-	 * @since 3.0.5
-	 */
-	protected function convertToBytes(string $value): int
-	{
-		$value = trim($value);
-		$lastChar = strtolower($value[strlen($value) - 1]);
-		$numValue = substr($value, 0, -1);
-
-		switch ($lastChar)
-		{
-			case 'g':
-				return $numValue * 1024 * 1024 * 1024;
-			case 'm':
-				return $numValue * 1024 * 1024;
-			case 'k':
-				return $numValue * 1024;
-			default:
-				return (int) $value;
-		}
-	}
-
-	/**
-	 * Check that the required configurations are set for PHP
-	 *
-	 * @param  $app  The application
-	 *
-	 * @return void
-	 * @since 3.0.5
-	 */
-	protected function phpConfigurationCheck($app): void
-	{
-		$showHelp = false;
-
-		// Check each configuration and provide detailed feedback
-		foreach ($this->requiredPHPConfigs as $configName => $configDetails)
-		{
-			$currentValue = ini_get($configName);
-			if ($currentValue === false)
-			{
-				$app->enqueueMessage("Error: Unable to retrieve current setting for '{$configName}'.", 'error');
-				continue;
-			}
-
-			$isMemoryValue = strpbrk($configDetails['value'], 'KMG') !== false;
-			$requiredValueBytes = $isMemoryValue ? $this->convertToBytes($configDetails['value']) : (int) $configDetails['value'];
-			$currentValueBytes = $isMemoryValue ? $this->convertToBytes($currentValue) : (int) $currentValue;
-			$conditionMet = $currentValueBytes >= $requiredValueBytes;
-
-			$messageType = $conditionMet ? 'message' : 'warning';
-			$messageText = $conditionMet ? 
-				"Success: {$configName} is set to {$currentValue}. " . $configDetails['success'] :
-				"Warning: {$configName} configuration should be at least {$configDetails['value']} but is currently {$currentValue}. " . $configDetails['warning'];
-			$showHelp = ($showHelp || $messageType === 'warning') ? true : false;
-			$app->enqueueMessage($messageText, $messageType);
-		}
-
-		if ($showHelp)
-		{
-			$app->enqueueMessage('To optimize your Sermon Distributor environment, specific PHP settings must be enhanced.<br>These settings are crucial for ensuring the successful installation and stable functionality of the extension.<br>We\'ve identified that certain configurations currently do not meet the recommended standards.<br>To adjust these settings and prevent potential issues, please consult our detailed guide available at <a href="https://git.vdm.dev/christian/Joomla-Sermon-Distributor/wiki/PHP-Settings" target="_blank">Sermon Distributor PHP Settings Wiki</a>.
-', 'notice');
-		}
-	}
-
-	/**
-	 * Make sure that the sermondistributor database schema is up to date.
-	 *
-	 * @return void
-	 * @since 3.0.5
-	 */
-	protected function databaseSchemaCheck($app): void
-	{
-		// try to load the schema class
-		try
-		{
-			// make sure the class is loaded
-			$this->ensureClassExists(
-				Schema::class
-			);
-
-			// instantiate the schema class and check/update the database
-			$messages = (new Schema())->update();
-		}
-		catch (\Exception $e)
-		{
-			$app->enqueueMessage($e->getMessage(), 'warning');
-			return;
-		}
-
-		foreach ($messages as $message)
-		{
-			$app->enqueueMessage($message, 'message');
-		}
-	}
-
-	/**
-	 * Ensures that a class in the namespace is available.
-	 * If the class is not already loaded, it attempts to load it via the power autoloader.
-	 *
-	 * @param mixed    $nameClass    The name::class we are looking for.
-	 *
-	 * @return void
-	 * @since 3.0.5
-	 * @throws \Exception If the class could not be loaded.
-	 */
-	protected function ensureClassExists($nameClass): void
-	{
-		if (!class_exists($nameClass, true))
-		{
-			// The power autoloader for this project admin area.
-			$power_autoloader = JPATH_ADMINISTRATOR . '/components/com_sermondistributor/src/Helper/PowerloaderHelper.php';
-			if (file_exists($power_autoloader))
-			{
-				require_once $power_autoloader;
-			}
-
-			// Check again if the class now exists after requiring it
-			if (!class_exists($nameClass, true))
-			{
-				throw new \Exception("We failed to find/load the $nameClass");
-			}
-		}
-	}
-
 	/**
 	 * Method to move folders into place.
 	 *

admin/README.txt

@@ -24,38 +24,38 @@ The best way to see all your options is to install this component on you Joomla
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Sermon Distributor](https://www.vdm.io/)
 + *First Build*: 22nd October, 2015
-+ *Last Build*: 3rd May, 2024
++ *Last Build*: 2nd March, 2024
 + *Version*: 5.0.x
 + *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 :hourglass:
 
-**263 Hours** or **33 Eight Hour Days** (actual time the author saved -
+**245 Hours** or **31 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*: **94142**
-+ *File count*: **602**
-+ *Folder count*: **124**
++ *Line count*: **87679**
++ *File count*: **575**
++ *Folder count*: **120**
 
-**173 Hours** or **22 Eight Hour Days** (the actual time the author spent)
+**161 Hours** or **20 Eight Hour Days** (the actual time the author spent)
 
 > (with the following break down:
-> **debugging @66hours** = codingtime / 4;
-> **planning @38hours** = codingtime / 7;
-> **mapping @26hours** = codingtime / 10;
-> **office @44hours** = codingtime / 6;)
+> **debugging @61hours** = codingtime / 4;
+> **planning @35hours** = codingtime / 7;
+> **mapping @24hours** = codingtime / 10;
+> **office @41hours** = codingtime / 6;)
 
-**436 Hours** or **55 Eight Hour Days**
+**406 Hours** or **51 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: **11 weeks** or **2.3 months**
+Project duration: **10.2 weeks** or **2.1 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/forms/help_document.xml

@@ -174,7 +174,6 @@
 			label="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ADMIN_VIEW_LABEL"
 			description="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ADMIN_VIEW_DESCRIPTION"
 			class="list_class"
-			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default=""
 			required="true"
@@ -187,7 +186,6 @@
 			label="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_SITE_VIEW_LABEL"
 			description="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_SITE_VIEW_DESCRIPTION"
 			class="list_class"
-			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			button="false"
@@ -223,7 +221,6 @@
 			name="article"
 			label="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ARTICLE_LABEL"
 			class="list_class"
-			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			required="true"

admin/layouts/preacher/sermons_fullwidth.php

@@ -26,8 +26,8 @@ use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 // No direct access to this file
 defined('_JEXEC') or die;

admin/layouts/series/sermons_fullwidth.php

@@ -26,8 +26,8 @@ use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 // No direct access to this file
 defined('_JEXEC') or die;

admin/layouts/sermon/stastics_fullwidth.php

@@ -26,8 +26,8 @@ use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 // No direct access to this file
 defined('_JEXEC') or die;

admin/services/provider.php

@@ -22,12 +22,51 @@
 
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
-// The power autoloader for this project (JPATH_ADMINISTRATOR) area.
-$power_autoloader = JPATH_ADMINISTRATOR . '/components/com_sermondistributor/src/Helper/PowerloaderHelper.php';
-if (file_exists($power_autoloader))
-{
-	require_once $power_autoloader;
-}
+
+
+// register additional namespace
+\spl_autoload_register(function ($class) {
+	// project-specific base directories and namespace prefix
+	$search = [
+		'libraries/jcb_powers/VDM.Joomla.FOF' => 'VDM\\Joomla\\FOF',
+		'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;

admin/sql/install.mysql.utf8.sql

@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_preacher` (
 	`icon` CHAR(64) NOT NULL DEFAULT '',
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
 	`website` 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,
@@ -55,7 +55,7 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_sermon` (
 	`source` TINYINT(1) NOT NULL DEFAULT 0,
 	`tags` CHAR(11) NOT NULL DEFAULT 0,
 	`url` 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,
@@ -93,7 +93,7 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_series` (
 	`icon` CHAR(64) NOT NULL DEFAULT '',
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
 	`scripture` 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,
@@ -126,7 +126,7 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_statistic` (
 	`preacher` INT(11) NOT NULL DEFAULT 0,
 	`series` INT(11) NOT NULL DEFAULT 0,
 	`sermon` INT(11) 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,
@@ -168,7 +168,7 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_external_source` (
 	`sharedurl` TEXT NOT NULL,
 	`update_method` TINYINT NOT NULL DEFAULT 0,
 	`update_timer` INT(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,
@@ -201,7 +201,7 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_local_listing` (
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
 	`size` INT(50) NOT NULL DEFAULT 0,
 	`url` TEXT 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,
@@ -236,7 +236,7 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_help_document` (
 	`title` CHAR(64) NOT NULL DEFAULT '',
 	`type` TINYINT(1) NOT NULL DEFAULT 0,
 	`url` 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,

admin/sql/updates/mysql/5.0.01.sql

@@ -0,0 +1 @@
+

admin/src/Controller/External_sourcesController.php

@@ -30,8 +30,8 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Controller/Help_documentsController.php

@@ -30,8 +30,8 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Controller/Local_listingsController.php

@@ -30,8 +30,8 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Controller/PreachersController.php

@@ -30,8 +30,8 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Controller/Series_listController.php

@@ -30,8 +30,8 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Controller/SermonsController.php

@@ -30,8 +30,8 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Controller/StatisticsController.php

@@ -30,8 +30,8 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Field/AdminviewfolderlistField.php

@@ -29,7 +29,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Field/ArticlesField.php

@@ -55,24 +55,23 @@ class ArticlesField extends ListField
 	 */
 	protected function getOptions()
 	{
-		$db = Factory::getDBO();
-$query = $db->getQuery(true);
-$query->select($db->quoteName(array('a.id','a.title','a.alias'),array('id','article_title','alias')));
-$query->from($db->quoteName('#__content', 'a'));
-$query->where($db->quoteName('a.state') . ' = 1');
-$query->order('a.title ASC');
-$db->setQuery((string)$query);
-$items = $db->loadObjectList();
-$options = array();
-if ($items)
-{
-	$options[] = Html::_('select.option', '', 'Select an Article');
-	foreach($items as $item)
-	{
-		$options[] = Html::_('select.option', $item->id, $item->article_title . ' (' . $item->alias . ')');
-	}
-}
-
-return $options;
+		$db = Factory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.id','a.title','a.alias'),array('id','article_title','alias')));
+		$query->from($db->quoteName('#__content', 'a'));
+		$query->where($db->quoteName('a.state') . ' = 1');
+		$query->order('a.title ASC');
+		$db->setQuery((string)$query);
+		$items = $db->loadObjectList();
+		$options = array();
+		if ($items)
+		{
+			$options[] = Html::_('select.option', '', 'Select an Article');
+			foreach($items as $item)
+			{
+				$options[] = Html::_('select.option', $item->id, $item->article_title . ' (' . $item->alias . ')');
+			}
+		}
+		return $options;
 	}
 }

admin/src/Field/ExternalsourceField.php

@@ -109,7 +109,7 @@ class ExternalsourceField extends ListField
 			if ($user->authorise('external_source.edit', 'com_sermondistributor') && $app->isClient('administrator')) // TODO for now only in admin area.
 			{
 				// build edit button
-				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small btn-outline-success button-select hasTooltip" title="'.Text::sprintf('COM_SERMONDISTRIBUTOR_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 hasTooltip" title="'.Text::sprintf('COM_SERMONDISTRIBUTOR_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/PreachersField.php

@@ -109,7 +109,7 @@ class PreachersField extends ListField
 			if ($user->authorise('preacher.edit', 'com_sermondistributor') && $app->isClient('administrator')) // TODO for now only in admin area.
 			{
 				// build edit button
-				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small btn-outline-success button-select hasTooltip" title="'.Text::sprintf('COM_SERMONDISTRIBUTOR_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 hasTooltip" title="'.Text::sprintf('COM_SERMONDISTRIBUTOR_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/SeriesField.php

@@ -109,7 +109,7 @@ class SeriesField extends ListField
 			if ($user->authorise('series.edit', 'com_sermondistributor') && $app->isClient('administrator')) // TODO for now only in admin area.
 			{
 				// build edit button
-				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small btn-outline-success button-select hasTooltip" title="'.Text::sprintf('COM_SERMONDISTRIBUTOR_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 hasTooltip" title="'.Text::sprintf('COM_SERMONDISTRIBUTOR_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/SermonField.php

@@ -109,7 +109,7 @@ class SermonField extends ListField
 			if ($user->authorise('sermon.edit', 'com_sermondistributor') && $app->isClient('administrator')) // TODO for now only in admin area.
 			{
 				// build edit button
-				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small btn-outline-success button-select hasTooltip" title="'.Text::sprintf('COM_SERMONDISTRIBUTOR_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 hasTooltip" title="'.Text::sprintf('COM_SERMONDISTRIBUTOR_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/SiteviewfolderlistField.php

@@ -29,7 +29,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Helper/PowerloaderHelper.php

@@ -1,70 +0,0 @@
-<?php
-/*-------------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
- ____                                                  ____                 __               __               __
-/\  _`\                                               /\  _`\   __         /\ \__         __/\ \             /\ \__
-\ \,\L\_\     __   _ __    ___ ___     ___     ___    \ \ \/\ \/\_\    ____\ \ ,_\  _ __ /\_\ \ \____  __  __\ \ ,_\   ___   _ __
- \/_\__ \   /'__`\/\`'__\/' __` __`\  / __`\ /' _ `\   \ \ \ \ \/\ \  /',__\\ \ \/ /\`'__\/\ \ \ '__`\/\ \/\ \\ \ \/  / __`\/\`'__\
-   /\ \L\ \/\  __/\ \ \/ /\ \/\ \/\ \/\ \L\ \/\ \/\ \   \ \ \_\ \ \ \/\__, `\\ \ \_\ \ \/ \ \ \ \ \L\ \ \ \_\ \\ \ \_/\ \L\ \ \ \/
-   \ `\____\ \____\\ \_\ \ \_\ \_\ \_\ \____/\ \_\ \_\   \ \____/\ \_\/\____/ \ \__\\ \_\  \ \_\ \_,__/\ \____/ \ \__\ \____/\ \_\
-    \/_____/\/____/ \/_/  \/_/\/_/\/_/\/___/  \/_/\/_/    \/___/  \/_/\/___/   \/__/ \/_/   \/_/\/___/  \/___/   \/__/\/___/  \/_/
-
-/------------------------------------------------------------------------------------------------------------------------------------/
-
-	@version		5.0.x
-	@created		22nd October, 2015
-	@package		Sermon Distributor
-	@subpackage		PowerloaderHelper.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/>	
-	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
-
-	A sermon distributor that links to Dropbox. 
-
-/----------------------------------------------------------------------------------------------------------------------------------*/
-
-// 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_sermondistributor/TrueChristianChurch.Joomla.FOF' => 'TrueChristianChurch\\Joomla\\FOF',
-		'libraries/vendor_sermondistributor/TrueChristianChurch.Joomla' => 'TrueChristianChurch\\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;
-	}
-});

admin/src/Helper/SermondistributorHelper.php

@@ -23,12 +23,51 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 namespace TrueChristianChurch\Component\Sermondistributor\Administrator\Helper;
 
-// The power autoloader for this project (JPATH_ADMINISTRATOR) area.
-$power_autoloader = JPATH_ADMINISTRATOR . '/components/com_sermondistributor/src/Helper/PowerloaderHelper.php';
-if (file_exists($power_autoloader))
-{
-	require_once $power_autoloader;
-}
+
+
+// register additional namespace
+\spl_autoload_register(function ($class) {
+	// project-specific base directories and namespace prefix
+	$search = [
+		'libraries/jcb_powers/VDM.Joomla.FOF' => 'VDM\\Joomla\\FOF',
+		'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;
+	}
+});
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -51,15 +90,15 @@ use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 use Joomla\CMS\Filesystem\Folder;
-use TrueChristianChurch\Joomla\FOF\Encrypt\AES;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\FileHelper;
-use TrueChristianChurch\Joomla\Utilities\JsonHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
-use TrueChristianChurch\Joomla\Utilities\MimeHelper;
-use TrueChristianChurch\Joomla\Utilities\GetHelper;
-use TrueChristianChurch\Joomla\Utilities\FormHelper;
+use VDM\Joomla\FOF\Encrypt\AES;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\FileHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\MimeHelper;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\FormHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Model/AjaxModel.php

@@ -40,12 +40,12 @@ use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Registry\Registry;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\FileHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
-use TrueChristianChurch\Joomla\Utilities\JsonHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
-use TrueChristianChurch\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\FileHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -282,11 +282,11 @@ class AjaxModel extends ListModel
 			$result['error'] = '<span style="color: red;">' . Text::sprintf('COM_SERMONDISTRIBUTOR_NO_CRONJOB_PATH_FOUND_FOR_S', $type) . '</span>';
 			if ($this->hasCurl())
 			{
-				$path = '*/15 * * * * curl -s "' .Uri::root() . 'index.php?option=com_sermondistributor&task=api.externalUpdate" >/dev/null 2>&1';
+				$path = '*/15 * * * * curl -s "' .JURI::root() . 'index.php?option=com_sermondistributor&task=api.externalUpdate" >/dev/null 2>&1';
 			}
 			else
 			{
-				$path = '*/15 * * * * wget "' .Uri::root() . 'index.php?option=com_sermondistributor&task=api.externalUpdate" >/dev/null 2>&1';
+				$path = '*/15 * * * * wget "' .JURI::root() . 'index.php?option=com_sermondistributor&task=api.externalUpdate" >/dev/null 2>&1';
 			}
 			$result['path'] =  '<code>' . $path . '</code>';
 		}

admin/src/Model/External_sourceModel.php

@@ -42,10 +42,10 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
 use Joomla\CMS\Helper\TagsHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
-use TrueChristianChurch\Joomla\Utilities\FileHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\FOF\Encrypt\AES;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\FileHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\FOF\Encrypt\AES;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Model/External_sourcesModel.php

@@ -36,10 +36,10 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
 use Joomla\CMS\Helper\TagsHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
-use TrueChristianChurch\Joomla\FOF\Encrypt\AES;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\FOF\Encrypt\AES;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Model/Help_documentModel.php

@@ -42,8 +42,8 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
 use Joomla\CMS\Helper\TagsHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Model/Help_documentsModel.php

@@ -36,10 +36,10 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
 use Joomla\CMS\Helper\TagsHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
-use TrueChristianChurch\Joomla\Utilities\JsonHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Model/ImportModel.php

@@ -35,7 +35,7 @@ use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Model/Local_listingModel.php

@@ -42,9 +42,9 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
 use Joomla\CMS\Helper\TagsHelper;
-use TrueChristianChurch\Joomla\FOF\Encrypt\AES;
-use TrueChristianChurch\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\FOF\Encrypt\AES;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Model/Local_listingsModel.php

@@ -36,10 +36,10 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
 use Joomla\CMS\Helper\TagsHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
-use TrueChristianChurch\Joomla\FOF\Encrypt\AES;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\FOF\Encrypt\AES;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Model/Manual_updaterModel.php

@@ -35,9 +35,9 @@ use Joomla\CMS\User\User;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\FOF\Encrypt\AES;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\FOF\Encrypt\AES;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Model/PreacherModel.php

@@ -42,9 +42,9 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
 use Joomla\CMS\Helper\TagsHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Model/PreachersModel.php

@@ -36,9 +36,9 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
 use Joomla\CMS\Helper\TagsHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Model/SeriesModel.php

@@ -42,9 +42,9 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
 use Joomla\CMS\Helper\TagsHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Model/Series_listModel.php

@@ -36,9 +36,9 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
 use Joomla\CMS\Helper\TagsHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Model/SermonModel.php

@@ -42,9 +42,9 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
 use Joomla\CMS\Helper\TagsHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Model/SermondistributorModel.php

@@ -38,8 +38,8 @@ use Joomla\CMS\User\User;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -51,27 +51,6 @@ use TrueChristianChurch\Joomla\Utilities\StringHelper;
  */
 class SermondistributorModel extends ListModel
 {
-	/**
-	 * The styles array.
-	 *
-	 * @var    array
-	 * @since  4.3
-	 */
-	protected array $styles = [
-		'administrator/components/com_sermondistributor/assets/css/admin.css',
-		'administrator/components/com_sermondistributor/assets/css/dashboard.css'
- 	];
-
-	/**
-	 * The scripts array.
-	 *
-	 * @var    array
-	 * @since  4.3
-	 */
-	protected array $scripts = [
-		'administrator/components/com_sermondistributor/assets/js/admin.js'
- 	];
-
 	public function getIcons()
 	{
 		// load user for access menus
@@ -313,50 +292,6 @@ class SermondistributorModel extends ListModel
 		return $icons;
 	}
 
-	/**
-	 * Method to get the styles that have to be included on the view
-	 *
-	 * @return  array    styles files
-	 * @since   4.3
-	 */
-	public function getStyles(): array
-	{
-		return $this->styles;
-	}
-
-	/**
-	 * Method to set the styles that have to be included on the view
-	 *
-	 * @return  void
-	 * @since   4.3
-	 */
-	public function setStyles(string $path): void
-	{
-		$this->styles[] = $path;
-	}
-
-	/**
-	 * Method to get the script that have to be included on the view
-	 *
-	 * @return  array    script files
-	 * @since   4.3
-	 */
-	public function getScripts(): array
-	{
-		return $this->scripts;
-	}
-
-	/**
-	 * Method to set the script that have to be included on the view
-	 *
-	 * @return  void
-	 * @since   4.3
-	 */
-	public function setScript(string $path): void
-	{
-		$this->scripts[] = $path;
-	}
-
 
 	public function getWiki()
 	{

admin/src/Model/SermonsModel.php

@@ -36,9 +36,9 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
 use Joomla\CMS\Helper\TagsHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Model/StatisticModel.php

@@ -42,8 +42,8 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
 use Joomla\CMS\Helper\TagsHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/Model/StatisticsModel.php

@@ -36,9 +36,9 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
 use Joomla\CMS\Helper\TagsHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\ObjectHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/View/External_source/HtmlView.php

@@ -37,7 +37,7 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -61,7 +61,6 @@ class HtmlView extends BaseHtmlView
 	{
 		// set params
 		$this->params = ComponentHelper::getParams('com_sermondistributor');
-		$this->useCoreUI = true;
 		// Assign the variables
 		$this->form = $this->get('Form');
 		$this->item = $this->get('Item');
@@ -236,8 +235,6 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function _prepareDocument(): void
 	{
-		// Load jQuery
-		Html::_('jquery.framework');
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NEW' : 'COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_EDIT'));
 		// add styles

admin/src/View/External_sources/HtmlView.php

@@ -37,8 +37,8 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -177,8 +177,6 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function _prepareDocument(): void
 	{
-		// Load jQuery
-		Html::_('jquery.framework');
 		$this->getDocument()->setTitle(Text::_('COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES'));
 		// add styles
 		foreach ($this->styles as $style)

admin/src/View/Help_document/HtmlView.php

@@ -37,7 +37,7 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -61,7 +61,6 @@ class HtmlView extends BaseHtmlView
 	{
 		// set params
 		$this->params = ComponentHelper::getParams('com_sermondistributor');
-		$this->useCoreUI = true;
 		// Assign the variables
 		$this->form = $this->get('Form');
 		$this->item = $this->get('Item');
@@ -226,8 +225,6 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function _prepareDocument(): void
 	{
-		// Load jQuery
-		Html::_('jquery.framework');
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_NEW' : 'COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_EDIT'));
 		// add styles

admin/src/View/Help_documents/HtmlView.php

@@ -37,8 +37,8 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -177,8 +177,6 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function _prepareDocument(): void
 	{
-		// Load jQuery
-		Html::_('jquery.framework');
 		$this->getDocument()->setTitle(Text::_('COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS'));
 		// add styles
 		foreach ($this->styles as $style)

admin/src/View/Import/HtmlView.php

@@ -28,7 +28,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/View/Local_listing/HtmlView.php

@@ -37,7 +37,7 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -61,7 +61,6 @@ class HtmlView extends BaseHtmlView
 	{
 		// set params
 		$this->params = ComponentHelper::getParams('com_sermondistributor');
-		$this->useCoreUI = true;
 		// Assign the variables
 		$this->form = $this->get('Form');
 		$this->item = $this->get('Item');
@@ -226,8 +225,6 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function _prepareDocument(): void
 	{
-		// Load jQuery
-		Html::_('jquery.framework');
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_SERMONDISTRIBUTOR_LOCAL_LISTING_NEW' : 'COM_SERMONDISTRIBUTOR_LOCAL_LISTING_EDIT'));
 		// add styles

admin/src/View/Local_listings/HtmlView.php

@@ -37,8 +37,8 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -177,8 +177,6 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function _prepareDocument(): void
 	{
-		// Load jQuery
-		Html::_('jquery.framework');
 		$this->getDocument()->setTitle(Text::_('COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS'));
 		// add styles
 		foreach ($this->styles as $style)

admin/src/View/Manual_updater/HtmlView.php

@@ -34,7 +34,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\HeaderCheck;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;

admin/src/View/Preacher/HtmlView.php

@@ -37,7 +37,7 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -61,7 +61,6 @@ class HtmlView extends BaseHtmlView
 	{
 		// set params
 		$this->params = ComponentHelper::getParams('com_sermondistributor');
-		$this->useCoreUI = true;
 		// Assign the variables
 		$this->form = $this->get('Form');
 		$this->item = $this->get('Item');
@@ -229,8 +228,6 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function _prepareDocument(): void
 	{
-		// Load jQuery
-		Html::_('jquery.framework');
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_SERMONDISTRIBUTOR_PREACHER_NEW' : 'COM_SERMONDISTRIBUTOR_PREACHER_EDIT'));
 		// add styles

admin/src/View/Preachers/HtmlView.php

@@ -37,8 +37,8 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -177,8 +177,6 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function _prepareDocument(): void
 	{
-		// Load jQuery
-		Html::_('jquery.framework');
 		$this->getDocument()->setTitle(Text::_('COM_SERMONDISTRIBUTOR_PREACHERS'));
 		// add styles
 		foreach ($this->styles as $style)

admin/src/View/Series/HtmlView.php

@@ -37,7 +37,7 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -61,7 +61,6 @@ class HtmlView extends BaseHtmlView
 	{
 		// set params
 		$this->params = ComponentHelper::getParams('com_sermondistributor');
-		$this->useCoreUI = true;
 		// Assign the variables
 		$this->form = $this->get('Form');
 		$this->item = $this->get('Item');
@@ -229,8 +228,6 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function _prepareDocument(): void
 	{
-		// Load jQuery
-		Html::_('jquery.framework');
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_SERMONDISTRIBUTOR_SERIES_NEW' : 'COM_SERMONDISTRIBUTOR_SERIES_EDIT'));
 		// add styles

admin/src/View/Series_list/HtmlView.php

@@ -37,8 +37,8 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -177,8 +177,6 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function _prepareDocument(): void
 	{
-		// Load jQuery
-		Html::_('jquery.framework');
 		$this->getDocument()->setTitle(Text::_('COM_SERMONDISTRIBUTOR_SERIES_LIST'));
 		// add styles
 		foreach ($this->styles as $style)

admin/src/View/Sermon/HtmlView.php

@@ -37,7 +37,7 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -61,7 +61,6 @@ class HtmlView extends BaseHtmlView
 	{
 		// set params
 		$this->params = ComponentHelper::getParams('com_sermondistributor');
-		$this->useCoreUI = true;
 		// Assign the variables
 		$this->form = $this->get('Form');
 		$this->item = $this->get('Item');
@@ -229,8 +228,6 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function _prepareDocument(): void
 	{
-		// Load jQuery
-		Html::_('jquery.framework');
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_SERMONDISTRIBUTOR_SERMON_NEW' : 'COM_SERMONDISTRIBUTOR_SERMON_EDIT'));
 		// add styles

admin/src/View/Sermondistributor/HtmlView.php

@@ -30,7 +30,7 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -50,8 +50,6 @@ class HtmlView extends BaseHtmlView
 	{
 		// Assign data to the view
 		$this->icons          = $this->get('Icons');
-		$this->styles         = $this->get('Styles');
-		$this->scripts        = $this->get('Scripts');
 		$this->contributors   = SermondistributorHelper::getContributors();
 
 		// get the manifest details of the component
@@ -110,17 +108,11 @@ class HtmlView extends BaseHtmlView
 	{
 		// set page title
 		$this->getDocument()->setTitle(Text::_('COM_SERMONDISTRIBUTOR_DASHBOARD'));
+
 		// add manifest to page JavaScript
 		$this->getDocument()->addScriptDeclaration("var manifest = JSON.parse('" . json_encode($this->manifest) . "');", "text/javascript");
-		// add styles
-		foreach ($this->styles as $style)
-		{
-			Html::_('stylesheet', $style, ['version' => 'auto']);
-		}
-		// add scripts
-		foreach ($this->scripts as $script)
-		{
-			Html::_('script', $script, ['version' => 'auto']);
-		}
+
+		// add dashboard style sheets
+		Html::_('stylesheet', "administrator/components/com_sermondistributor/assets/css/dashboard.css", ['version' => 'auto']);
 	}
 }

admin/src/View/Sermons/HtmlView.php

@@ -37,8 +37,8 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -177,8 +177,6 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function _prepareDocument(): void
 	{
-		// Load jQuery
-		Html::_('jquery.framework');
 		$this->getDocument()->setTitle(Text::_('COM_SERMONDISTRIBUTOR_SERMONS'));
 		// add styles
 		foreach ($this->styles as $style)

admin/src/View/Statistic/HtmlView.php

@@ -37,7 +37,7 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -61,7 +61,6 @@ class HtmlView extends BaseHtmlView
 	{
 		// set params
 		$this->params = ComponentHelper::getParams('com_sermondistributor');
-		$this->useCoreUI = true;
 		// Assign the variables
 		$this->form = $this->get('Form');
 		$this->item = $this->get('Item');
@@ -226,8 +225,6 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function _prepareDocument(): void
 	{
-		// Load jQuery
-		Html::_('jquery.framework');
 		$isNew = ($this->item->id < 1);
 		$this->getDocument()->setTitle(Text::_($isNew ? 'COM_SERMONDISTRIBUTOR_STATISTIC_NEW' : 'COM_SERMONDISTRIBUTOR_STATISTIC_EDIT'));
 		// add styles

admin/src/View/Statistics/HtmlView.php

@@ -37,8 +37,8 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Document\Document;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -177,8 +177,6 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function _prepareDocument(): void
 	{
-		// Load jQuery
-		Html::_('jquery.framework');
 		$this->getDocument()->setTitle(Text::_('COM_SERMONDISTRIBUTOR_STATISTICS'));
 		// add styles
 		foreach ($this->styles as $style)

admin/tmpl/import/default.php

@@ -25,8 +25,8 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\HTML\HTMLHelper as Html;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 // No direct access to this file
 defined('_JEXEC') or die;

admin/tmpl/manual_updater/default.php

@@ -28,9 +28,8 @@ use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper;
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
-use Joomla\CMS\Session\Session;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->getDocument()->getWebAssetManager();
@@ -131,7 +130,7 @@ jQuery(document).ready(function($) {
 </div>
 <script>
 // token 
-var token = '<?php echo Session::getFormToken(); ?>';
+var token = '<?php echo JSession::getFormToken(); ?>';
 // nice little dot trick :)
 jQuery(document).ready( function($) {
   var x=0;

admin/tmpl/sermondistributor/default_vdm.php

@@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 use Joomla\CMS\Language\Text;
-use TrueChristianChurch\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 // No direct access to this file
 defined('_JEXEC') or die;

libraries/jcb_powers/VDM.Joomla.FOF/src/Encrypt/AES.php

@@ -13,13 +13,13 @@
  *                  - Use phpseclib/phpseclib version 3 Instead.
  *                  - Checkout the JCB Crypt Suite. <https://git.vdm.dev/joomla/phpseclib>
  */
-namespace TrueChristianChurch\Joomla\FOF\Encrypt;
+namespace VDM\Joomla\FOF\Encrypt;
 
 
-use TrueChristianChurch\Joomla\FOF\Encrypt\AES\AesInterface;
-use TrueChristianChurch\Joomla\FOF\Encrypt\AES\Mcrypt;
-use TrueChristianChurch\Joomla\FOF\Encrypt\AES\Openssl;
-use TrueChristianChurch\Joomla\FOF\Utils\Phpfunc;
+use VDM\Joomla\FOF\Encrypt\AES\AesInterface;
+use VDM\Joomla\FOF\Encrypt\AES\Mcrypt;
+use VDM\Joomla\FOF\Encrypt\AES\Openssl;
+use VDM\Joomla\FOF\Utils\Phpfunc;
 
 
 /**

libraries/jcb_powers/VDM.Joomla.FOF/src/Encrypt/AES/Abstraction.php

@@ -13,7 +13,7 @@
  *                  - Use phpseclib/phpseclib version 3 Instead.
  *                  - Checkout the JCB Crypt Suite. <https://git.vdm.dev/joomla/phpseclib>
  */
-namespace TrueChristianChurch\Joomla\FOF\Encrypt\AES;
+namespace VDM\Joomla\FOF\Encrypt\AES;
 
 
 /**

libraries/jcb_powers/VDM.Joomla.FOF/src/Encrypt/AES/AesInterface.php

@@ -13,10 +13,10 @@
  *                  - Use phpseclib/phpseclib version 3 Instead.
  *                  - Checkout the JCB Crypt Suite. <https://git.vdm.dev/joomla/phpseclib>
  */
-namespace TrueChristianChurch\Joomla\FOF\Encrypt\AES;
+namespace VDM\Joomla\FOF\Encrypt\AES;
 
 
-use TrueChristianChurch\Joomla\FOF\Utils\Phpfunc;
+use VDM\Joomla\FOF\Utils\Phpfunc;
 
 
 /**

libraries/jcb_powers/VDM.Joomla.FOF/src/Encrypt/AES/Mcrypt.php

@@ -13,13 +13,13 @@
  *                  - Use phpseclib/phpseclib version 3 Instead.
  *                  - Checkout the JCB Crypt Suite. <https://git.vdm.dev/joomla/phpseclib>
  */
-namespace TrueChristianChurch\Joomla\FOF\Encrypt\AES;
+namespace VDM\Joomla\FOF\Encrypt\AES;
 
 
-use TrueChristianChurch\Joomla\FOF\Encrypt\Randval;
-use TrueChristianChurch\Joomla\FOF\Utils\Phpfunc;
-use TrueChristianChurch\Joomla\FOF\Encrypt\AES\AesInterface;
-use TrueChristianChurch\Joomla\FOF\Encrypt\AES\Abstraction;
+use VDM\Joomla\FOF\Encrypt\Randval;
+use VDM\Joomla\FOF\Utils\Phpfunc;
+use VDM\Joomla\FOF\Encrypt\AES\AesInterface;
+use VDM\Joomla\FOF\Encrypt\AES\Abstraction;
 
 
 /**

libraries/jcb_powers/VDM.Joomla.FOF/src/Encrypt/AES/Openssl.php

@@ -13,13 +13,13 @@
  *                  - Use phpseclib/phpseclib version 3 Instead.
  *                  - Checkout the JCB Crypt Suite. <https://git.vdm.dev/joomla/phpseclib>
  */
-namespace TrueChristianChurch\Joomla\FOF\Encrypt\AES;
+namespace VDM\Joomla\FOF\Encrypt\AES;
 
 
-use TrueChristianChurch\Joomla\FOF\Encrypt\Randval;
-use TrueChristianChurch\Joomla\FOF\Utils\Phpfunc;
-use TrueChristianChurch\Joomla\FOF\Encrypt\AES\AesInterface;
-use TrueChristianChurch\Joomla\FOF\Encrypt\AES\Abstraction;
+use VDM\Joomla\FOF\Encrypt\Randval;
+use VDM\Joomla\FOF\Utils\Phpfunc;
+use VDM\Joomla\FOF\Encrypt\AES\AesInterface;
+use VDM\Joomla\FOF\Encrypt\AES\Abstraction;
 
 
 /**

libraries/jcb_powers/VDM.Joomla.FOF/src/Encrypt/Randval.php

@@ -13,10 +13,10 @@
  *                  - Use phpseclib/phpseclib version 3 Instead.
  *                  - Checkout the JCB Crypt Suite. <https://git.vdm.dev/joomla/phpseclib>
  */
-namespace TrueChristianChurch\Joomla\FOF\Encrypt;
+namespace VDM\Joomla\FOF\Encrypt;
 
 
-use TrueChristianChurch\Joomla\FOF\Encrypt\Randvalinterface;
+use VDM\Joomla\FOF\Encrypt\Randvalinterface;
 
 
 /**

libraries/jcb_powers/VDM.Joomla.FOF/src/Encrypt/Randvalinterface.php

@@ -13,7 +13,7 @@
  *                  - Use phpseclib/phpseclib version 3 Instead.
  *                  - Checkout the JCB Crypt Suite. <https://git.vdm.dev/joomla/phpseclib>
  */
-namespace TrueChristianChurch\Joomla\FOF\Encrypt;
+namespace VDM\Joomla\FOF\Encrypt;
 
 
 /**

libraries/jcb_powers/VDM.Joomla.FOF/src/Utils/Phpfunc.php

@@ -7,7 +7,7 @@
  * @note	      This file has been modified by the Joomla! Project (and VDM) and no longer reflects the original work of its author.
  * @depreciation  This was ported for the sake of those who have stuff encrypted with the FOF encryption suite.
  */
-namespace TrueChristianChurch\Joomla\FOF\Utils;
+namespace VDM\Joomla\FOF\Utils;
 
 
 /**

libraries/jcb_powers/VDM.Joomla/src/Utilities/ArrayHelper.php

@@ -9,7 +9,7 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace TrueChristianChurch\Joomla\Utilities;
+namespace VDM\Joomla\Utilities;
 
 
 /**

libraries/jcb_powers/VDM.Joomla/src/Utilities/Component/Helper.php

@@ -9,14 +9,14 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace TrueChristianChurch\Joomla\Utilities\Component;
+namespace VDM\Joomla\Utilities\Component;
 
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\Input\Input;
 use Joomla\Registry\Registry;
-use TrueChristianChurch\Joomla\Utilities\String\NamespaceHelper;
+use VDM\Joomla\Utilities\String\NamespaceHelper;
 
 
 /**
@@ -79,12 +79,12 @@ abstract class Helper
 	/**
 	 * Set the component option
 	 *
-	 * @param   string|null     $option  The option
+	 * @param   string     $option  The option
 	 *
 	 * @return  void
 	 * @since   3.2.0
 	 */
-	public static function setOption(?string $option): void
+	public static function setOption(string $option): void
 	{
 		self::$option = $option;
 	}
@@ -97,7 +97,7 @@ abstract class Helper
 	 * @return  string|null      A component option
 	 * @since   3.0.11
 	 */
-	public static function getOption(?string $default = 'empty'): ?string
+	public static function getOption(string $default = 'empty'): ?string
 	{
 		if (empty(self::$option))
 		{
@@ -160,7 +160,7 @@ abstract class Helper
 	 *
 	 * @since   3.0.11
 	 */
-	public static function get(?string $option = null, ?string $default = null): ?string
+	public static function get(string $option = null, string $default = null): ?string
 	{
 		// check that we have an option
 		// and get the code name from it
@@ -260,7 +260,7 @@ abstract class Helper
 	 *
 	 * @since   3.0.11
 	 */
-	public static function methodExists(string $method, ?string $option = null): bool
+	public static function methodExists(string $method, string $option = null): bool
 	{
 		// get the helper class
 		return ($helper = self::get($option, null)) !== null &&

libraries/jcb_powers/VDM.Joomla/src/Utilities/FileHelper.php

@@ -9,7 +9,7 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace TrueChristianChurch\Joomla\Utilities;
+namespace VDM\Joomla\Utilities;
 
 
 use Joomla\CMS\Uri\Uri;
@@ -19,7 +19,7 @@ use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\Archive\Archive;
-use TrueChristianChurch\Joomla\Utilities\Component\Helper;
+use VDM\Joomla\Utilities\Component\Helper;
 
 
 /**

libraries/jcb_powers/VDM.Joomla/src/Utilities/FormHelper.php

@@ -9,7 +9,7 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace TrueChristianChurch\Joomla\Utilities;
+namespace VDM\Joomla\Utilities;
 
 
 use Joomla\CMS\Form\FormHelper as JoomlaFormHelper;
@@ -75,24 +75,24 @@ abstract class FormHelper
 			// element was not returned
 			return;
 		}
-
-		if ($node instanceof \stdClass)
+		switch (get_class($node))
 		{
-			if (property_exists($node, 'comment'))
-			{
-				self::comment($xml, $node->comment);
-			}
-			if (property_exists($node, 'fieldXML'))
-			{
-				self::append($xml, $node->fieldXML);
-			}
-		}
-		elseif ($node instanceof \SimpleXMLElement)
-		{
-			$domXML = \dom_import_simplexml($xml);
-			$domNode = \dom_import_simplexml($node);
-			$domXML->appendChild($domXML->ownerDocument->importNode($domNode, true));
-			$xml = \simplexml_import_dom($domXML);
+			case 'stdClass':
+				if (property_exists($node, 'comment'))
+				{
+					self::comment($xml, $node->comment);
+				}
+				if (property_exists($node, 'fieldXML'))
+				{
+					self::append($xml, $node->fieldXML);
+				}
+				break;
+			case 'SimpleXMLElement':
+				$domXML = \dom_import_simplexml($xml);
+				$domNode = \dom_import_simplexml($node);
+				$domXML->appendChild($domXML->ownerDocument->importNode($domNode, true));
+				$xml = \simplexml_import_dom($domXML);
+				break;
 		}
 	}
 
@@ -127,7 +127,7 @@ abstract class FormHelper
 	{
 		foreach ($attributes as $key => $value)
 		{
-			$xml->addAttribute($key, $value ?? '');
+			$xml->addAttribute($key, $value);
 		}
 	}
 
@@ -145,7 +145,7 @@ abstract class FormHelper
 		foreach ($options as $key => $value)
 		{
 			$addOption = $xml->addChild('option');
-			$addOption->addAttribute('value', $key ?? '');
+			$addOption->addAttribute('value', $key);
 			$addOption[] = $value;
 		}
 	}

libraries/jcb_powers/VDM.Joomla/src/Utilities/GetHelper.php

@@ -9,11 +9,11 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace TrueChristianChurch\Joomla\Utilities;
+namespace VDM\Joomla\Utilities;
 
 
 use Joomla\CMS\Factory;
-use TrueChristianChurch\Joomla\Utilities\Component\Helper;
+use VDM\Joomla\Utilities\Component\Helper;
 
 
 /**

libraries/jcb_powers/VDM.Joomla/src/Utilities/JsonHelper.php

@@ -9,7 +9,7 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace TrueChristianChurch\Joomla\Utilities;
+namespace VDM\Joomla\Utilities;
 
 
 /**

libraries/jcb_powers/VDM.Joomla/src/Utilities/MimeHelper.php

@@ -9,7 +9,7 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace TrueChristianChurch\Joomla\Utilities;
+namespace VDM\Joomla\Utilities;
 
 
 /**

libraries/jcb_powers/VDM.Joomla/src/Utilities/ObjectHelper.php

@@ -9,7 +9,7 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace TrueChristianChurch\Joomla\Utilities;
+namespace VDM\Joomla\Utilities;
 
 
 /**

libraries/jcb_powers/VDM.Joomla/src/Utilities/String/NamespaceHelper.php

@@ -9,10 +9,10 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace TrueChristianChurch\Joomla\Utilities\String;
+namespace VDM\Joomla\Utilities\String;
 
 
-use TrueChristianChurch\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**

libraries/jcb_powers/VDM.Joomla/src/Utilities/StringHelper.php

@@ -9,12 +9,12 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace TrueChristianChurch\Joomla\Utilities;
+namespace VDM\Joomla\Utilities;
 
 
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Language\Language;
-use TrueChristianChurch\Joomla\Utilities\Component\Helper;
+use VDM\Joomla\Utilities\Component\Helper;
 
 
 /**