Upgraded to JCB 3.1.24

.octojpack

@@ -0,0 +1,69 @@
+{
+  "global": {
+    "packager": "Vast Development Method",
+    "packager_url": "https://dev.vdm.io/",
+    "url": "git.vdm.dev",
+    "api": "https://git.vdm.dev/api/v1"
+  },
+  "package": {
+    "name": "PKG_SERMONDISTRIBUTOR",
+    "code_name": "sermondistributor",
+    "package_name": "pkg_sermondistributor",
+    "min_joomla_version": "3.8",
+    "max_joomla_version": "3.10",
+    "copyright": "Copyright (C) 2015 Llewellyn van der Merwe. All rights reserved.",
+    "copyright_year": "2015",
+    "license": "GNU General Public License version 2; see LICENSE",
+    "license_file": "LICENSE",
+    "author": "Llewellyn van der Merwe",
+    "author_email": "joomla@vdm.io",
+    "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/master/sermondistributor_update_server.xml"
+  },
+  "repository": {
+    "owner": "christian",
+    "repo": "pkg-sermondistributor"
+  },
+  "files": [
+    {
+      "owner": "christian",
+      "repo": "Joomla-Sermon-Distributor",
+      "id": "com_sermondistributor",
+      "type": "component",
+      "mode": "master"
+    },
+    {
+      "owner": "christian",
+      "repo": "mod_dailylight",
+      "id": "mod_dailylight",
+      "type": "module",
+      "client": "site",
+      "mode": "master"
+    },
+    {
+      "owner": "christian",
+      "repo": "mod_dailyscripture",
+      "id": "mod_dailyscripture",
+      "type": "module",
+      "client": "site",
+      "mode": "master"
+    }
+  ],
+  "languages": [
+    {
+      "tag": "en-GB",
+      "ini": "sys.ini",
+      "key": "PKG_SERMONDISTRIBUTOR",
+      "value": "Sermon Distributor Package"
+    },
+    {
+      "tag": "en-GB",
+      "ini": "ini",
+      "key": "PKG_SERMONDISTRIBUTOR",
+      "value": "Sermon Distributor Package"
+    }
+  ]
+}
+

CHANGELOG.md

@@ -0,0 +1,3 @@
+# v2.1.1
+
+- Moved over to a Joomla Package

README.md

@@ -1,10 +1,10 @@
 # Sermon Distributor (2.1.x)
 
- ![Sermon Distributor image](https://raw.githubusercontent.com/Llewellynvdm/Joomla-Sermon-Distributor/master/admin/assets/images/vdm-component.jpg "The Sermon Distributor")
+ ![Sermon Distributor image](https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/master/admin/assets/images/vdm-component.jpg "The Sermon Distributor")
 
 Distributor is a highly advanced sermon distributor that runs on the [Joomla 3.x](http://www.joomla.org) framework. You can link a shared folder from Dropbox to the component and use Dropbox as your file host, not to mention the advanced auto builder that gives you the ability to simply load sermons to your website by only adding them to Dropbox.
 
-The best way to see all your options is to install this component on you Joomla website and test all features yourself. Here is a [direct download link](https://github.com/SermonDistributor/Joomla-3-Component/archive/master.zip)
+The best way to see all your options is to install this component on you Joomla website and test all features yourself. Here is a [direct download link](https://git.vdm.dev/christian/Joomla-Sermon-Distributor/archive/master.zip)
 
  **If you like our component please rate it on the [Joomla Index](http://extensions.joomla.org/extensions/extension/living/religion/sermon-distributor)**
 
@@ -24,74 +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*: 27th May, 2022
++ *Last Build*: 29th May, 2023
 + *Version*: 2.1.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:
 
-**206 Hours** or **26 Eight Hour Days** (actual time the author saved -
+**210 Hours** or **26 Eight Hour Days** (actual time the author saved -
-due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder))
+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*: **74036**
++ *Line count*: **75271**
-+ *File count*: **472**
++ *File count*: **486**
-+ *Folder count*: **99**
++ *Folder count*: **105**
 
-**137 Hours** or **17 Eight Hour Days** (the actual time the author spent)
+**138 Hours** or **18 Eight Hour Days** (the actual time the author spent)
 
 > (with the following break down:
 > **debugging @52hours** = codingtime / 4;
-> **planning @29hours** = codingtime / 7;
+> **planning @30hours** = codingtime / 7;
 > **mapping @21hours** = codingtime / 10;
-> **office @34hours** = codingtime / 6;)
+> **office @35hours** = codingtime / 6;)
 
-**343 Hours** or **43 Eight Hour Days**
+**348 Hours** or **44 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: **8.6 weeks** or **1.8 months**
+Project duration: **8.8 weeks** or **1.8 months**
 
-> This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
+> This **component** was build with a Joomla [Automated Component Builder](https://www.joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
-
-
-## Contributors
-This project exists thanks to all the people who contribute to the [Joomla Component Builder Project](https://github.com/vdm-io/Joomla-Component-Builder).
-
-[![Contributors](https://opencollective.com/Joomla-Component-Builder/contributors.svg?width=890&button=false)](https://github.com/vdm-io/Joomla-Component-Builder/graphs/contributors)
-
-### Backers
-Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/Joomla-Component-Builder#backer)]
-
-[![Our Backers on opencollective](https://opencollective.com/Joomla-Component-Builder/backers.svg?width=890)](https://opencollective.com/Joomla-Component-Builder#backers)
-
-### Sponsors
-Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/Joomla-Component-Builder#sponsor)]
-
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/0/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/0/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/1/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/1/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/2/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/2/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/3/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/3/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/4/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/4/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/5/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/5/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/6/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/6/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/7/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/7/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/8/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/8/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/9/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/9/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/10/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/10/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/11/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/11/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/12/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/12/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/13/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/13/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/14/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/14/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/15/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/15/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/16/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/16/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/17/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/17/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/18/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/18/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/19/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/19/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/20/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/20/website)

admin/README.txt

@@ -1,10 +1,10 @@
 # Sermon Distributor (2.1.x)
 
- ![Sermon Distributor image](https://raw.githubusercontent.com/Llewellynvdm/Joomla-Sermon-Distributor/master/admin/assets/images/vdm-component.jpg "The Sermon Distributor")
+ ![Sermon Distributor image](https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/master/admin/assets/images/vdm-component.jpg "The Sermon Distributor")
 
 Distributor is a highly advanced sermon distributor that runs on the [Joomla 3.x](http://www.joomla.org) framework. You can link a shared folder from Dropbox to the component and use Dropbox as your file host, not to mention the advanced auto builder that gives you the ability to simply load sermons to your website by only adding them to Dropbox.
 
-The best way to see all your options is to install this component on you Joomla website and test all features yourself. Here is a [direct download link](https://github.com/SermonDistributor/Joomla-3-Component/archive/master.zip)
+The best way to see all your options is to install this component on you Joomla website and test all features yourself. Here is a [direct download link](https://git.vdm.dev/christian/Joomla-Sermon-Distributor/archive/master.zip)
 
  **If you like our component please rate it on the [Joomla Index](http://extensions.joomla.org/extensions/extension/living/religion/sermon-distributor)**
 
@@ -24,74 +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*: 27th May, 2022
++ *Last Build*: 29th May, 2023
 + *Version*: 2.1.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:
 
-**206 Hours** or **26 Eight Hour Days** (actual time the author saved -
+**210 Hours** or **26 Eight Hour Days** (actual time the author saved -
-due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder))
+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*: **74036**
++ *Line count*: **75271**
-+ *File count*: **472**
++ *File count*: **486**
-+ *Folder count*: **99**
++ *Folder count*: **105**
 
-**137 Hours** or **17 Eight Hour Days** (the actual time the author spent)
+**138 Hours** or **18 Eight Hour Days** (the actual time the author spent)
 
 > (with the following break down:
 > **debugging @52hours** = codingtime / 4;
-> **planning @29hours** = codingtime / 7;
+> **planning @30hours** = codingtime / 7;
 > **mapping @21hours** = codingtime / 10;
-> **office @34hours** = codingtime / 6;)
+> **office @35hours** = codingtime / 6;)
 
-**343 Hours** or **43 Eight Hour Days**
+**348 Hours** or **44 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: **8.6 weeks** or **1.8 months**
+Project duration: **8.8 weeks** or **1.8 months**
 
-> This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
+> This **component** was build with a Joomla [Automated Component Builder](https://www.joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
-
-
-## Contributors
-This project exists thanks to all the people who contribute to the [Joomla Component Builder Project](https://github.com/vdm-io/Joomla-Component-Builder).
-
-[![Contributors](https://opencollective.com/Joomla-Component-Builder/contributors.svg?width=890&button=false)](https://github.com/vdm-io/Joomla-Component-Builder/graphs/contributors)
-
-### Backers
-Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/Joomla-Component-Builder#backer)]
-
-[![Our Backers on opencollective](https://opencollective.com/Joomla-Component-Builder/backers.svg?width=890)](https://opencollective.com/Joomla-Component-Builder#backers)
-
-### Sponsors
-Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/Joomla-Component-Builder#sponsor)]
-
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/0/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/0/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/1/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/1/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/2/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/2/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/3/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/3/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/4/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/4/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/5/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/5/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/6/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/6/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/7/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/7/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/8/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/8/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/9/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/9/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/10/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/10/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/11/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/11/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/12/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/12/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/13/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/13/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/14/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/14/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/15/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/15/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/16/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/16/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/17/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/17/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/18/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/18/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/19/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/19/website)
-[![Sponsor](https://opencollective.com/Joomla-Component-Builder/sponsor/20/avatar.svg)](https://opencollective.com/Joomla-Component-Builder/sponsor/20/website)

admin/helpers/sermondistributor.php

@@ -25,6 +25,7 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Language\Language;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
@@ -32,7 +33,6 @@ use Joomla\Utilities\ArrayHelper;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
-use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Filesystem\Folder;
 
 /**
@@ -95,8 +95,10 @@ abstract class SermondistributorHelper
 	protected static $updateErrors = array();
 
 	/**
-	* 	prepare base64 string for url
+	 * prepare base64 string for url
-	**/
+	 *
+	 * @deprecate Use urlencode();
+	 */
 	public static function base64_urlencode($string, $encode = false)
 	{
 		if ($encode)
@@ -107,8 +109,10 @@ abstract class SermondistributorHelper
 	}
 
 	/**
-	* 	prepare base64 string form url
+	 * prepare base64 string form url
-	**/
+	 *
+	 * @deprecate
+	 */
 	public static function base64_urldecode($string, $decode = false)
 	{
 		$string = str_replace(array('-', '_'), array('+', '/'), $string);

admin/models/external_source.php

@@ -111,7 +111,7 @@ class SermondistributorModelExternal_source extends AdminModel
 
 	public function clearLocalListing($id) 
 	{
-		// clear local listing
+		// clear local listings
 		if ($id > 0)
 		{
 			$db = JFactory::getDbo();
@@ -183,6 +183,7 @@ class SermondistributorModelExternal_source extends AdminModel
 		return array('error' => JText::_('COM_SERMONDISTRIBUTOR_NO_ID_FOUND_CAN_NOT_RESET_THE_UPDATE_STATUS'));
 	}
 
+    
 	/**
 	 * Method to get a single record.
 	 *

admin/models/forms/help_document.xml

@@ -229,7 +229,6 @@
 			label="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_URL_LABEL"
 			size="60"
 			maxlength="150"
-			default=""
 			description="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_URL_DESCRIPTION"
 			class="text_area"
 			required="true"

admin/models/forms/preacher.xml

@@ -120,6 +120,8 @@
 			maxlength="150"
 			description="COM_SERMONDISTRIBUTOR_PREACHER_NAME_DESCRIPTION"
 			class="text_area"
+			readonly="false"
+			disabled="false"
 			required="true"
 			filter="STRING"
 			message="COM_SERMONDISTRIBUTOR_PREACHER_NAME_MESSAGE"

admin/models/forms/series.xml

@@ -120,6 +120,8 @@
 			maxlength="150"
 			description="COM_SERMONDISTRIBUTOR_SERIES_NAME_DESCRIPTION"
 			class="text_area"
+			readonly="false"
+			disabled="false"
 			required="true"
 			filter="STRING"
 			message="COM_SERMONDISTRIBUTOR_SERIES_NAME_MESSAGE"

admin/models/forms/sermon.xml

@@ -120,6 +120,8 @@
 			maxlength="150"
 			description="COM_SERMONDISTRIBUTOR_SERMON_NAME_DESCRIPTION"
 			class="text_area"
+			readonly="false"
+			disabled="false"
 			required="true"
 			filter="STRING"
 			message="COM_SERMONDISTRIBUTOR_SERMON_NAME_MESSAGE"

admin/models/import.php

@@ -31,7 +31,7 @@ use Joomla\CMS\Filesystem\Folder;
 use Joomla\Utilities\ArrayHelper;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 
-/**
+/***
  * Sermondistributor Import Base Database Model
  */
 class SermondistributorModelImport extends BaseDatabaseModel

admin/sql/updates/mysql/2.1.0.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `#__sermondistributor_external_source` ENGINE = InnoDB;
+
+ALTER TABLE `#__sermondistributor_external_source` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

admin/views/preachers/tmpl/default_body.php

@@ -84,7 +84,7 @@ $edit = "index.php?option=com_sermondistributor&view=preachers&task=preacher.edi
 		</td>
 		<td class="hidden-phone">
 			<div>
-			<?php echo $this->escape($item->description); ?>
+			<?php echo $this->escape($item->description); ?><br />
 			<?php echo $this->escape($item->email); ?>
 			</div>
 		</td>

admin/views/sermondistributor/tmpl/default_vdm.php

@@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access');
 ?>
 <img alt="<?php echo JText::_('COM_SERMONDISTRIBUTOR'); ?>" src="components/com_sermondistributor/assets/images/vdm-component.jpg">
 <ul class="list-striped">
-	<li><b><?php echo JText::_('COM_SERMONDISTRIBUTOR_VERSION'); ?>:</b> <?php echo $this->manifest->version; ?>&nbsp;&nbsp;<span class="update-notice"></span></li>
+	<li><b><?php echo JText::_('COM_SERMONDISTRIBUTOR_VERSION'); ?>:</b> <?php echo $this->manifest->version; ?>&nbsp;&nbsp;<span class="update-notice" id="component-update-notice"></span></li>
 	<li><b><?php echo JText::_('COM_SERMONDISTRIBUTOR_DATE'); ?>:</b> <?php echo $this->manifest->creationDate; ?></li>
 	<li><b><?php echo JText::_('COM_SERMONDISTRIBUTOR_AUTHOR'); ?>:</b> <a href="mailto:<?php echo $this->manifest->authorEmail; ?>"><?php echo $this->manifest->author; ?></a></li>
 	<li><b><?php echo JText::_('COM_SERMONDISTRIBUTOR_WEBSITE'); ?>:</b> <a href="<?php echo $this->manifest->authorUrl; ?>" target="_blank"><?php echo $this->manifest->authorUrl; ?></a></li>

script.php

@@ -1840,7 +1840,7 @@ class com_sermondistributorInstallerScript
 			echo '<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 2.1.0 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.1.1 Was Successful! Let us know if anything is not working as expected.</h3>';
 
 			// Set db if not set already.
 			if (!isset($db))

sermondistributor.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="4" method="upgrade">
 	<name>COM_SERMONDISTRIBUTOR</name>
-	<creationDate>27th May, 2022</creationDate>
+	<creationDate>29th May, 2023</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://www.vdm.io/</authorUrl>
 	<copyright>Copyright (C) 2015. All Rights Reserved</copyright>
 	<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
-	<version>2.1.0</version>
+	<version>2.1.1</version>
 	<description><![CDATA[
-		<h1>Sermon Distributor (v.2.1.0)</h1>
+		<h1>Sermon Distributor (v.2.1.1)</h1>
 		<div style="clear: both;"></div>
 		<p>Distributor is a highly advanced sermon distributor that runs on the [Joomla 3.x](http://www.joomla.org) framework. You can link a shared folder from Dropbox to the component and use Dropbox as your file host, not to mention the advanced auto builder that gives you the ability to simply load sermons to your website by only adding them to Dropbox.</p>
 		<p>Created by <a href="https://www.vdm.io/" target="_blank">Llewellyn van der Merwe</a><br /><small>Development started 22nd October, 2015</small></p>
@@ -102,6 +102,6 @@
 
 	</administration>
 	<updateservers>
-		<server type="extension" enabled="1" element="com_sermondistributor" name="Sermon Distributor">https://raw.githubusercontent.com/Llewellynvdm/Joomla-Sermon-Distributor/master/sermondistributor_update_server.xml</server>
+		<server type="extension" enabled="1" element="com_sermondistributor" name="Sermon Distributor">https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/master/sermondistributor_update_server.xml</server>
 	</updateservers>
 </extension>

sermondistributor_update_server.xml

@@ -67,4 +67,22 @@
 		<maintainerurl>https://www.vdm.io/</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
+	<update>
+		<name>Sermon Distributor</name>
+		<description>A sermon distributor that links to Dropbox.</description>
+		<element>pkg_sermondistributor</element>
+		<type>package</type>
+		<client>site</client>
+		<version>2.1.1</version>
+		<infourl title="Sermon Distributor!">https://www.vdm.io/</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/christian/pkg-sermondistributor/archive/v2.1.1.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>https://www.vdm.io/</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
 </updates>

site/helpers/sermondistributor.php

@@ -25,11 +25,11 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Language\Language;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Filesystem\Folder;
 
 /**
@@ -92,8 +92,10 @@ abstract class SermondistributorHelper
 	protected static $updateErrors = array();
 
 	/**
-	* 	prepare base64 string for url
+	 * prepare base64 string for url
-	**/
+	 *
+	 * @deprecate Use urlencode();
+	 */
 	public static function base64_urlencode($string, $encode = false)
 	{
 		if ($encode)
@@ -104,8 +106,10 @@ abstract class SermondistributorHelper
 	}
 
 	/**
-	* 	prepare base64 string form url
+	 * prepare base64 string form url
-	**/
+	 *
+	 * @deprecate
+	 */
 	public static function base64_urldecode($string, $decode = false)
 	{
 		$string = str_replace(array('-', '_'), array('+', '/'), $string);

site/views/categories/tmpl/default.php

@@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access');
 
 
 // Set the heading of the page
-$heading = ($this->params->get('page_heading')) ? $this->params->get('page_heading'):(isset($this->menu->title)) ? $this->menu->title:'';
+$heading = ($this->params->get('page_heading')) ? $this->params->get('page_heading') : ((isset($this->menu->title)) ? $this->menu->title : '');
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_sermondistributor'); ?>" method="post" name="adminForm" id="adminForm">
 <?php if ($this->params->get('show_page_heading')): ?>

site/views/preachers/tmpl/default.php

@@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access');
 
 
 // Set the heading of the page
-$heading = ($this->params->get('page_heading')) ? $this->params->get('page_heading'):(isset($this->menu->title)) ? $this->menu->title:'';
+$heading = ($this->params->get('page_heading')) ? $this->params->get('page_heading') : ((isset($this->menu->title)) ? $this->menu->title : '');
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_sermondistributor'); ?>" method="post" name="adminForm" id="adminForm">
 <?php if ($this->params->get('show_page_heading')): ?>

site/views/serieslist/tmpl/default.php

@@ -28,7 +28,7 @@ defined('_JEXEC') or die('Restricted access');
 
 
 // Set the heading of the page
-$heading = ($this->params->get('page_heading')) ? $this->params->get('page_heading'):(isset($this->menu->title)) ? $this->menu->title:'';
+$heading = ($this->params->get('page_heading')) ? $this->params->get('page_heading') : ((isset($this->menu->title)) ? $this->menu->title : '');
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_sermondistributor'); ?>" method="post" name="adminForm" id="adminForm">
 <?php if ($this->params->get('show_page_heading')): ?>