Stable release of v3.0.3

Removed the not_required field from the sermon model. #36.
Stable release of v3.0.2
2024-02-11 19:24:51 +02:00 · 2024-02-10 13:39:52 +02:00 · 2024-02-10 11:13:31 +02:00
386 changed files with 12376 additions and 9452 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,20 @@
+# v3.0.3
+
+- Removed the not_required field from the sermon model. #36
+
+# v3.0.2
+
+- Add the HTML class to the site default layout.
+
+# v3.0.1
+
+- Fix missing ComponentHelper class in localfiles field type.
+
+# v3.0.0
+
+- Moved all classes to 'use' classes away from JText format.
+- Build with new JCB 3.1.31 beta
+
 # v2.1.1

 - Moved over to a Joomla Package
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# Sermon Distributor (2.1.x)
+# Sermon Distributor (3.0.x)

 ![Sermon Distributor image](https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/master/admin/assets/images/vdm-component.jpg "The Sermon Distributor")

@ -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*: 29th May, 2023
-+ *Version*: 2.1.x
+ *Last Build*: 11th February, 2024
+ *Version*: 3.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:

-**210 Hours** or **26 Eight Hour Days** (actual time the author saved -
+**243 Hours** or **30 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*: **75271**
-+ *File count*: **486**
-+ *Folder count*: **105**
+ *Line count*: **87039**
+ *File count*: **595**
+ *Folder count*: **113**

-**138 Hours** or **18 Eight Hour Days** (the actual time the author spent)
+**160 Hours** or **20 Eight Hour Days** (the actual time the author spent)

 > (with the following break down:
-> **debugging @52hours** = codingtime / 4;
-> **planning @30hours** = codingtime / 7;
-> **mapping @21hours** = codingtime / 10;
-> **office @35hours** = codingtime / 6;)
+> **debugging @61hours** = codingtime / 4;
+> **planning @35hours** = codingtime / 7;
+> **mapping @24hours** = codingtime / 10;
+> **office @40hours** = codingtime / 6;)

-**348 Hours** or **44 Eight Hour Days**
+**403 Hours** or **50 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.8 weeks** or **1.8 months**
+Project duration: **10 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:llewellyn@joomlacomponentbuilder.com)
--- a/admin/README.txt
+++ b/admin/README.txt
@ -1,4 +1,4 @@
-# Sermon Distributor (2.1.x)
+# Sermon Distributor (3.0.x)

 ![Sermon Distributor image](https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/master/admin/assets/images/vdm-component.jpg "The Sermon Distributor")

@ -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*: 29th May, 2023
-+ *Version*: 2.1.x
+ *Last Build*: 11th February, 2024
+ *Version*: 3.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:

-**210 Hours** or **26 Eight Hour Days** (actual time the author saved -
+**243 Hours** or **30 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*: **75271**
-+ *File count*: **486**
-+ *Folder count*: **105**
+ *Line count*: **87039**
+ *File count*: **595**
+ *Folder count*: **113**

-**138 Hours** or **18 Eight Hour Days** (the actual time the author spent)
+**160 Hours** or **20 Eight Hour Days** (the actual time the author spent)

 > (with the following break down:
-> **debugging @52hours** = codingtime / 4;
-> **planning @30hours** = codingtime / 7;
-> **mapping @21hours** = codingtime / 10;
-> **office @35hours** = codingtime / 6;)
+> **debugging @61hours** = codingtime / 4;
+> **planning @35hours** = codingtime / 7;
+> **mapping @24hours** = codingtime / 10;
+> **office @40hours** = codingtime / 6;)

-**348 Hours** or **44 Eight Hour Days**
+**403 Hours** or **50 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.8 weeks** or **1.8 months**
+Project duration: **10 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:llewellyn@joomlacomponentbuilder.com)
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		admin.css
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		dashboard.css
@ -24,153 +24,153 @@
 /* CSS Document */

 .dashboard-container {
-    margin-left: 10px;
-    margin-top: 10px;
-    width: 100%;
+	margin-left: 10px;
+	margin-top: 10px;
+	width: 100%;
 }
 .dashboard-container [class*="span"] {
-    display: block;
-    float: none;
-    margin-left: 0;
-    width: auto;
+	display: block;
+	float: none;
+	margin-left: 0;
+	width: auto;
 }
 .dashboard-container:before, .dashboard-container:after {
-    content: "";
-    display: table;
+	content: "";
+	display: table;
 }
 .dashboard-container:after {
-    clear: both;
+	clear: both;
 }
 .dashboard-container [class*="span"] {
-    box-sizing: border-box;
-    display: block;
-    float: left;
-    min-height: 145px;
-    min-width: 96px;
-    width: 100%;
+	box-sizing: border-box;
+	display: block;
+	float: left;
+	min-height: 145px;
+	min-width: 96px;
+	width: 100%;
 }
 .dashboard-container [class*="span"]:first-child {
-    margin-left: 0;
+	margin-left: 0;
 }
 .dashboard-wraper {
-    background: none repeat scroll 0 0 hsl(0, 0%, 93%);
-    border-radius: 5px;
-    float: left;
-    margin: 1%;
-    padding: 3px;
-    width: 17%;
-    min-height: 194px;
-    min-width: 96px;
+	background: none repeat scroll 0 0 hsl(0, 0%, 93%);
+	border-radius: 5px;
+	float: left;
+	margin: 1%;
+	padding: 3px;
+	width: 17%;
+	min-height: 194px;
+	min-width: 96px;
 }
 .dashboard-content a {
-    background: linear-gradient(to bottom, hsl(0, 0%, 100%) 0%, hsl(0, 0%, 96%) 47%, hsl(0, 0%, 93%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
-    border: 1px solid hsl(0, 0%, 85%);
-    border-radius: 4px;
-    box-shadow: 0 0 3px hsla(0, 0%, 0%, 0.1) inset;
-    color: hsl(0, 0%, 20%);
-    display: block;
-    min-height: 89px;
-    padding: 10px;
-    text-align: center;
-    text-decoration: none;
+	background: linear-gradient(to bottom, hsl(0, 0%, 100%) 0%, hsl(0, 0%, 96%) 47%, hsl(0, 0%, 93%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
+	border: 1px solid hsl(0, 0%, 85%);
+	border-radius: 4px;
+	box-shadow: 0 0 3px hsla(0, 0%, 0%, 0.1) inset;
+	color: hsl(0, 0%, 20%);
+	display: block;
+	min-height: 89px;
+	padding: 10px;
+	text-align: center;
+	text-decoration: none;
 }
 .dashboard-content a:hover {
-    background: linear-gradient(to bottom, hsl(0, 0%, 90%) 0%, hsl(0, 0%, 100%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
-    color: hsl(200, 100%, 30%);
-    text-decoration: none;
+	background: linear-gradient(to bottom, hsl(0, 0%, 90%) 0%, hsl(0, 0%, 100%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
+	color: hsl(200, 100%, 30%);
+	text-decoration: none;
 }
 .dashboard-title {
-    display: block;
-    padding-top: 5px;
+	display: block;
+	padding-top: 5px;
 }
 .dashboard-info {
-    background: linear-gradient(to bottom, hsl(0, 0%, 100%) 0%, hsl(0, 0%, 96%) 47%, hsl(0, 0%, 93%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
-    border: 1px solid hsl(0, 0%, 85%);
-    border-radius: 4px;
-    box-shadow: 0 0 3px hsla(0, 0%, 0%, 0.1) inset;
-    color: hsl(0, 0%, 20%);
-    display: block;
-    font-size: 12px;
-    padding: 10px;
-    text-align: center;
+	background: linear-gradient(to bottom, hsl(0, 0%, 100%) 0%, hsl(0, 0%, 96%) 47%, hsl(0, 0%, 93%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
+	border: 1px solid hsl(0, 0%, 85%);
+	border-radius: 4px;
+	box-shadow: 0 0 3px hsla(0, 0%, 0%, 0.1) inset;
+	color: hsl(0, 0%, 20%);
+	display: block;
+	font-size: 12px;
+	padding: 10px;
+	text-align: center;
 }
 .dashboard-info span {
-    display: block;
-    text-align: center;
+	display: block;
+	text-align: center;
 }
 .dashboard-info img {
-    margin: 0 auto;
+	margin: 0 auto;
 }
 .dashboard-table {
-    border-top: 1px solid hsl(0, 0%, 87%);
-    margin-top: 5px;
-    width: 100%;
+	border-top: 1px solid hsl(0, 0%, 87%);
+	margin-top: 5px;
+	width: 100%;
 }
 .dashboard-info h5 {
-    font-size: 11px;
-    font-weight: bold;
+	font-size: 11px;
+	font-weight: bold;
 }
 .dashboard-block {
-    background: linear-gradient(to bottom, hsl(0, 0%, 95%) 0%, hsl(0, 0%, 86%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
-    border: 1px solid hsl(0, 0%, 76%);
-    border-radius: 3px;
-    box-shadow: 0 1px 0 hsl(0, 0%, 98%) inset;
-    margin-bottom: 20px;
+	background: linear-gradient(to bottom, hsl(0, 0%, 95%) 0%, hsl(0, 0%, 86%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
+	border: 1px solid hsl(0, 0%, 76%);
+	border-radius: 3px;
+	box-shadow: 0 1px 0 hsl(0, 0%, 98%) inset;
+	margin-bottom: 20px;
 }
 .dashboard-block .dashboard-block-head {
-    background: linear-gradient(to bottom, hsl(0, 0%, 95%) 0%, hsl(0, 0%, 86%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
-    border-bottom: 1px solid hsl(0, 0%, 76%);
-    border-radius: 3px 3px 0 0;
-    box-shadow: 0 1px 0 hsl(0, 0%, 98%) inset, 0 0 3px hsl(0, 0%, 87%);
-    height: 40px;
-    position: relative;
+	background: linear-gradient(to bottom, hsl(0, 0%, 95%) 0%, hsl(0, 0%, 86%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
+	border-bottom: 1px solid hsl(0, 0%, 76%);
+	border-radius: 3px 3px 0 0;
+	box-shadow: 0 1px 0 hsl(0, 0%, 98%) inset, 0 0 3px hsl(0, 0%, 87%);
+	height: 40px;
+	position: relative;
 }
 .dashboard-block .dashboard-block-head h5 {
-    font-size: 12px;
-    margin: 0;
-    padding-left: 10px;
-    padding-top: 11px;
-    text-transform: uppercase;
+	font-size: 12px;
+	margin: 0;
+	padding-left: 10px;
+	padding-top: 11px;
+	text-transform: uppercase;
 }
 .dashboard-block .dashboard-block-content {
-    background: none repeat scroll 0 0 hsl(0, 0%, 93%);
-    border-radius: 0 0 3px 3px;
+	background: none repeat scroll 0 0 hsl(0, 0%, 93%);
+	border-radius: 0 0 3px 3px;
 }
 .dashboard-block .dashboard-block-box {
-    background: none repeat scroll 0 0 hsl(0, 0%, 100%);
-    border-top: 1px solid hsl(0, 0%, 82%);
-    box-shadow: 0 0 5px hsl(0, 0%, 87%) inset;
+	background: none repeat scroll 0 0 hsl(0, 0%, 100%);
+	border-top: 1px solid hsl(0, 0%, 82%);
+	box-shadow: 0 0 5px hsl(0, 0%, 87%) inset;
 }
 .dashboard-block .dashboard-block-content .dashboard-block-box {
-    margin-top: 0 !important;
+	margin-top: 0 !important;
 }
 .dashboard-block .dashboard-block-content .dashboard-block-box .dashboard-block-table {
-    margin-bottom: 0 !important;
+	margin-bottom: 0 !important;
 }
 .dashboard-block-table {
-    background-color: hsla(0, 0%, 0%, 0);
-    border-collapse: collapse;
-    border-spacing: 0;
-    margin-bottom: 20px;
-    max-width: 100%;
-    width: 100%;
+	background-color: hsla(0, 0%, 0%, 0);
+	border-collapse: collapse;
+	border-spacing: 0;
+	margin-bottom: 20px;
+	max-width: 100%;
+	width: 100%;
 }
 .dashboard-block-table th, .dashboard-block-table td {
-    border-top: 1px solid hsl(0, 0%, 87%);
-    line-height: 20px;
-    padding: 5px;
-    text-align: left;
-    vertical-align: middle;
+	border-top: 1px solid hsl(0, 0%, 87%);
+	line-height: 20px;
+	padding: 5px;
+	text-align: left;
+	vertical-align: middle;
 }
 .dashboard-badge {
-    background-color: hsl(0, 0%, 60%);
-    border-radius: 9px;
-    color: hsl(0, 0%, 100%);
-    font-size: 11.844px;
-    font-weight: bold;
-    line-height: 14px;
-    padding: 1px 9px 2px;
-    text-shadow: 0 -1px 0 hsla(0, 0%, 0%, 0.25);
-    vertical-align: baseline;
-    white-space: nowrap;
+	background-color: hsl(0, 0%, 60%);
+	border-radius: 9px;
+	color: hsl(0, 0%, 100%);
+	font-size: 11.844px;
+	font-weight: bold;
+	line-height: 14px;
+	padding: 1px 9px 2px;
+	text-shadow: 0 -1px 0 hsla(0, 0%, 0%, 0.25);
+	vertical-align: baseline;
+	white-space: nowrap;
 }
--- a/admin/assets/css/external_source.css
+++ b/admin/assets/css/external_source.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		external_source.css
--- a/admin/assets/css/external_sources.css
+++ b/admin/assets/css/external_sources.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		external_sources.css
--- a/admin/assets/css/help_document.css
+++ b/admin/assets/css/help_document.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		help_document.css
--- a/admin/assets/css/help_documents.css
+++ b/admin/assets/css/help_documents.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		help_documents.css
--- a/admin/assets/css/local_listing.css
+++ b/admin/assets/css/local_listing.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		local_listing.css
--- a/admin/assets/css/local_listings.css
+++ b/admin/assets/css/local_listings.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		local_listings.css
--- a/admin/assets/css/manual_updater.css
+++ b/admin/assets/css/manual_updater.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		manual_updater.css
--- a/admin/assets/css/preacher.css
+++ b/admin/assets/css/preacher.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		preacher.css
--- a/admin/assets/css/preachers.css
+++ b/admin/assets/css/preachers.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		preachers.css
--- a/admin/assets/css/series.css
+++ b/admin/assets/css/series.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		series.css
--- a/admin/assets/css/series_list.css
+++ b/admin/assets/css/series_list.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		series_list.css
--- a/admin/assets/css/sermon.css
+++ b/admin/assets/css/sermon.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		sermon.css
--- a/admin/assets/css/sermons.css
+++ b/admin/assets/css/sermons.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		sermons.css
--- a/admin/assets/css/statistic.css
+++ b/admin/assets/css/statistic.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		statistic.css
--- a/admin/assets/css/statistics.css
+++ b/admin/assets/css/statistics.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		statistics.css
--- a/admin/assets/images/import.gif
+++ b/admin/assets/images/import.gif
--- a/admin/assets/js/admin.js
+++ b/admin/assets/js/admin.js
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		admin.js
--- a/admin/config.xml
+++ b/admin/config.xml
@ -301,6 +301,18 @@
 		name="uikit_config"
 		label="COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_LABEL"
 		description="COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_DESC">
+		<field name="add_jquery_framework"
+			type="radio"
+			label="COM_SERMONDISTRIBUTOR_CONFIG_JQUERY_LOAD_LABEL"
+			description="COM_SERMONDISTRIBUTOR_CONFIG_JQUERY_LOAD_DESC"
+			class="btn-group btn-group-yesno"
+			default="">
+			<!-- Option Set. -->
+			<option value="0">
+				COM_SERMONDISTRIBUTOR_CONFIG_JQUERY_REMOVE</option>"
+			<option value="1">
+				COM_SERMONDISTRIBUTOR_CONFIG_JQUERY_LOAD</option>"
+		</field>
 		<field name="uikit_version"
 			type="radio"
 			label="COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_VERSION_LABEL"
--- a/admin/controller.php
+++ b/admin/controller.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		controller.php
@ -27,6 +27,10 @@ defined('_JEXEC') or die('Restricted access');

 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;

 /**
 * General Controller of Sermondistributor component
@ -42,7 +46,7 @@ class SermondistributorController extends BaseController
 	 *
 	 * @since   3.0
 	 */
-	public function __construct($config = array())
+	public function __construct($config = [])
 	{
 		// set the default view
 		$config['default_view'] = 'sermondistributor';
@ -58,38 +62,38 @@ class SermondistributorController extends BaseController
 	function display($cachable = false, $urlparams = false)
 	{
 		// set default view if not set
-		$view   = $this->input->getCmd('view', 'sermondistributor');
-		$data	= $this->getViewRelation($view);
-		$layout	= $this->input->get('layout', null, 'WORD');
-		$id    	= $this->input->getInt('id');
+		$view      = $this->input->getCmd('view', 'sermondistributor');
+		$data      = $this->getViewRelation($view);
+		$layout    = $this->input->get('layout', null, 'WORD');
+		$id        = $this->input->getInt('id');

 		// Check for edit form.
-		if(SermondistributorHelper::checkArray($data))
+		if(UtilitiesArrayHelper::check($data))
 		{
 			if ($data['edit'] && $layout == 'edit' && !$this->checkEditId('com_sermondistributor.edit.'.$data['view'], $id))
 			{
 				// Somehow the person just went to the form - we don't allow that.
-				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+				$this->setError(Text::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
 				$this->setMessage($this->getError(), 'error');
 				// check if item was opend from other then its own list view
-				$ref 	= $this->input->getCmd('ref', 0);
-				$refid 	= $this->input->getInt('refid', 0);
+				$ref     = $this->input->getCmd('ref', 0);
+				$refid   = $this->input->getInt('refid', 0);
 				// set redirect
-				if ($refid > 0 && SermondistributorHelper::checkString($ref))
+				if ($refid > 0 && StringHelper::check($ref))
 				{
 					// redirect to item of ref
-					$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view='.(string)$ref.'&layout=edit&id='.(int)$refid, false));
+					$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view='.(string)$ref.'&layout=edit&id='.(int)$refid, false));
 				}
-				elseif (SermondistributorHelper::checkString($ref))
+				elseif (StringHelper::check($ref))
 				{

 					// redirect to ref
-					$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view='.(string)$ref, false));
+					$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view='.(string)$ref, false));
 				}
 				else
 				{
 					// normal redirect back to the list view
-					$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view='.$data['views'], false));
+					$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view='.$data['views'], false));
 				}

 				return false;
@ -102,7 +106,7 @@ class SermondistributorController extends BaseController
 	protected function getViewRelation($view)
 	{
 		// check the we have a value
-		if (SermondistributorHelper::checkString($view))
+		if (StringHelper::check($view))
 		{
 			// the view relationships
 			$views = array(
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		ajax.json.php
@ -25,7 +25,9 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;

 /**
@ -37,9 +39,9 @@ class SermondistributorControllerAjax extends BaseController
 	{
 		parent::__construct($config);
 		// make sure all json stuff are set
-		JFactory::getDocument()->setMimeEncoding( 'application/json' );
+		Factory::getDocument()->setMimeEncoding( 'application/json' );
 		// get the application
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 		$app->setHeader('Content-Disposition','attachment;filename="getajax.json"');
 		$app->setHeader('Access-Control-Allow-Origin', '*');
 		// load the tasks 
@ -54,16 +56,16 @@ class SermondistributorControllerAjax extends BaseController
 	public function ajax()
 	{
 		// get the user for later use
-		$user 		= JFactory::getUser();
+		$user         = Factory::getUser();
 		// get the input values
-		$jinput 	= JFactory::getApplication()->input;
+		$jinput       = Factory::getApplication()->input;
 		// check if we should return raw
-		$returnRaw	= $jinput->get('raw', false, 'BOOLEAN');
+		$returnRaw    = $jinput->get('raw', false, 'BOOLEAN');
 		// return to a callback function
-		$callback	= $jinput->get('callback', null, 'CMD');
+		$callback     = $jinput->get('callback', null, 'CMD');
 		// Check Token!
-		$token 		= JSession::getFormToken();
-		$call_token	= $jinput->get('token', 0, 'ALNUM');
+		$token        = Session::getFormToken();
+		$call_token   = $jinput->get('token', 0, 'ALNUM');
 		if($jinput->get($token, 0, 'ALNUM') || $token === $call_token)
 		{
 			// get the task
@ -76,7 +78,15 @@ class SermondistributorControllerAjax extends BaseController
 						$noticeValue = $jinput->get('notice', NULL, 'STRING');
 						if($noticeValue && $user->id != 0)
 						{
-							$result = $this->getModel('ajax')->isNew($noticeValue);
+							$ajaxModule = $this->getModel('ajax');
+							if ($ajaxModule)
+							{
+								$result = $ajaxModule->isNew($noticeValue);
+							}
+							else
+							{
+								$result = false;
+							}
 						}
 						else
 						{
@ -95,7 +105,7 @@ class SermondistributorControllerAjax extends BaseController
 							echo "(".json_encode($result).");";
 						}
 					}
-					catch(Exception $e)
+					catch(\Exception $e)
 					{
 						if($callback)
 						{
@ -117,7 +127,15 @@ class SermondistributorControllerAjax extends BaseController
 						$noticeValue = $jinput->get('notice', NULL, 'STRING');
 						if($noticeValue && $user->id != 0)
 						{
-							$result = $this->getModel('ajax')->isRead($noticeValue);
+							$ajaxModule = $this->getModel('ajax');
+							if ($ajaxModule)
+							{
+								$result = $ajaxModule->isRead($noticeValue);
+							}
+							else
+							{
+								$result = false;
+							}
 						}
 						else
 						{
@ -136,7 +154,7 @@ class SermondistributorControllerAjax extends BaseController
 							echo "(".json_encode($result).");";
 						}
 					}
-					catch(Exception $e)
+					catch(\Exception $e)
 					{
 						if($callback)
 						{
@ -159,7 +177,15 @@ class SermondistributorControllerAjax extends BaseController
 						$ojectValue = $jinput->get('oject', NULL, 'STRING');
 						if($idNameValue && $user->id != 0 && $ojectValue)
 						{
-							$result = $this->getModel('ajax')->getBuildTable($idNameValue, $ojectValue);
+							$ajaxModule = $this->getModel('ajax');
+							if ($ajaxModule)
+							{
+								$result = $ajaxModule->getBuildTable($idNameValue, $ojectValue);
+							}
+							else
+							{
+								$result = false;
+							}
 						}
 						else
 						{
@ -178,7 +204,7 @@ class SermondistributorControllerAjax extends BaseController
 							echo "(".json_encode($result).");";
 						}
 					}
-					catch(Exception $e)
+					catch(\Exception $e)
 					{
 						if($callback)
 						{
@ -200,7 +226,15 @@ class SermondistributorControllerAjax extends BaseController
 						$idValue = $jinput->get('id', NULL, 'INT');
 						if($idValue && $user->id != 0)
 						{
-							$result = $this->getModel('ajax')->getSourceStatus($idValue);
+							$ajaxModule = $this->getModel('ajax');
+							if ($ajaxModule)
+							{
+								$result = $ajaxModule->getSourceStatus($idValue);
+							}
+							else
+							{
+								$result = false;
+							}
 						}
 						else
 						{
@ -219,7 +253,7 @@ class SermondistributorControllerAjax extends BaseController
 							echo "(".json_encode($result).");";
 						}
 					}
-					catch(Exception $e)
+					catch(\Exception $e)
 					{
 						if($callback)
 						{
@ -241,7 +275,15 @@ class SermondistributorControllerAjax extends BaseController
 						$getTypeValue = $jinput->get('getType', NULL, 'WORD');
 						if($getTypeValue && $user->id != 0)
 						{
-							$result = $this->getModel('ajax')->getCronPath($getTypeValue);
+							$ajaxModule = $this->getModel('ajax');
+							if ($ajaxModule)
+							{
+								$result = $ajaxModule->getCronPath($getTypeValue);
+							}
+							else
+							{
+								$result = false;
+							}
 						}
 						else
 						{
@ -260,7 +302,7 @@ class SermondistributorControllerAjax extends BaseController
 							echo "(".json_encode($result).");";
 						}
 					}
-					catch(Exception $e)
+					catch(\Exception $e)
 					{
 						if($callback)
 						{
@ -285,7 +327,15 @@ class SermondistributorControllerAjax extends BaseController
 						$sleutelValue = $jinput->get('sleutel', NULL, 'CMD');
 						if($idValue && $user->id != 0 && $targetValue && $typeValue && $sleutelValue)
 						{
-							$result = $this->getModel('ajax')->updateLocalListingExternal($idValue, $targetValue, $typeValue, $sleutelValue);
+							$ajaxModule = $this->getModel('ajax');
+							if ($ajaxModule)
+							{
+								$result = $ajaxModule->updateLocalListingExternal($idValue, $targetValue, $typeValue, $sleutelValue);
+							}
+							else
+							{
+								$result = false;
+							}
 						}
 						else
 						{
@ -304,7 +354,7 @@ class SermondistributorControllerAjax extends BaseController
 							echo "(".json_encode($result).");";
 						}
 					}
-					catch(Exception $e)
+					catch(\Exception $e)
 					{
 						if($callback)
 						{
--- a/admin/controllers/external_source.php
+++ b/admin/controllers/external_source.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		external_source.php
@ -25,8 +25,14 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Uri\Uri;

 /**
 * External_source Form Controller
@ -49,7 +55,7 @@ class SermondistributorControllerExternal_source extends FormController
 	 *
 	 * @since   1.6
 	 */
-	public function __construct($config = array())
+	public function __construct($config = [])
 	{
 		$this->view_list = 'External_sources'; // safeguard for setting the return view listing to the main view.
 		parent::__construct($config);
@ -58,26 +64,26 @@ class SermondistributorControllerExternal_source extends FormController
 	public function clearLocalListing() 
 	{
 		// Check for request forgeries.
-		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
 		// get the data
 		$originalData = $this->input->post->get('jform', array(), 'array');
 		if (isset($originalData['id']) && $originalData['id'] > 0)
 		{			
 			// get the needed
-			$app   	= JFactory::getApplication();
-			$lang  	= JFactory::getLanguage();
+			$app   	= Factory::getApplication();
+			$lang  	= Factory::getLanguage();
 			$model 	= $this->getModel();
-			$user 	= JFactory::getUser();
+			$user 	= Factory::getUser();
 			$context = "$this->option.edit.$this->context";
 			if (!$user->authorise('external_source.clear_local_listing', 'com_sermondistributor'))
 			{
 				// force production is not permitted
-				$app->enqueueMessage(JText::_('COM_SERMONDISTRIBUTOR_YOU_DO_NOT_HAVE_PERMISSION_TO_CLEAR_LOCAL_LISTING'), 'error');
+				$app->enqueueMessage(Text::_('COM_SERMONDISTRIBUTOR_YOU_DO_NOT_HAVE_PERMISSION_TO_CLEAR_LOCAL_LISTING'), 'error');
 				// Save the data in the session.
 				$app->setUserState($context . '.data', $originalData);
 				// Redirect back to the edit screen.
 				$this->setRedirect(
-					JRoute::_(
+					Route::_(
 						'index.php?option=' . $this->option . '&view=' . $this->view_item
 						. $this->getRedirectToItemAppend($originalData['id'], 'id'), false
 					)
@ -89,12 +95,12 @@ class SermondistributorControllerExternal_source extends FormController
 			if (!$cleared)
 			{
 				// force production is not permitted
-				$app->enqueueMessage(JText::_('COM_SERMONDISTRIBUTOR_LOCAL_LISTING_WAS_NOT_CLEARED'), 'error');
+				$app->enqueueMessage(Text::_('COM_SERMONDISTRIBUTOR_LOCAL_LISTING_WAS_NOT_CLEARED'), 'error');
 				// Save the data in the session.
 				$app->setUserState($context . '.data', $originalData);
 				// Redirect back to the edit screen.
 				$this->setRedirect(
-					JRoute::_(
+					Route::_(
 						'index.php?option=' . $this->option . '&view=' . $this->view_item
 						. $this->getRedirectToItemAppend($originalData['id'], 'id'), false
 					)
@ -102,23 +108,23 @@ class SermondistributorControllerExternal_source extends FormController
 				return false;
 			}
 			// force production is not permitted
-			$app->enqueueMessage(JText::_('COM_SERMONDISTRIBUTOR_LOCAL_LISTING_WAS_CLEARED_SUCCESSFULLY'), 'success');
+			$app->enqueueMessage(Text::_('COM_SERMONDISTRIBUTOR_LOCAL_LISTING_WAS_CLEARED_SUCCESSFULLY'), 'success');
 			// Save the data in the session.
 			$app->setUserState($context . '.data', $originalData);
 			// Redirect back to the edit screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . '&view=' . $this->view_item
 					. $this->getRedirectToItemAppend($originalData['id'], 'id'), false
 				)
 			);
 			return true;
 		}
-		$this->setError(JText::_('COM_SERMONDISTRIBUTOR_CLEARING_LOCAL_LISTING_CAN_NOT_BE_DONE'));
+		$this->setError(Text::_('COM_SERMONDISTRIBUTOR_CLEARING_LOCAL_LISTING_CAN_NOT_BE_DONE'));
 		$this->setMessage($this->getError(), 'error');
 		// Redirect back to the list screen.
 		$this->setRedirect(
-			JRoute::_(
+			Route::_(
 				'index.php?option=' . $this->option . '&view=' . $this->view_list
 				. $this->getRedirectToListAppend(), false
 			)
@ -129,26 +135,26 @@ class SermondistributorControllerExternal_source extends FormController
 	public function resetUpdateStatus() 
 	{
 		// Check for request forgeries.
-		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
 		// get the data
 		$originalData = $this->input->post->get('jform', array(), 'array');
 		if (isset($originalData['id']) && $originalData['id'] > 0)
 		{			
 			// get the needed
-			$app   	= JFactory::getApplication();
-			$lang  	= JFactory::getLanguage();
+			$app   	= Factory::getApplication();
+			$lang  	= Factory::getLanguage();
 			$model 	= $this->getModel();
-			$user 	= JFactory::getUser();
+			$user 	= Factory::getUser();
 			$context = "$this->option.edit.$this->context";
 			if (!$user->authorise('external_source.reset_update_status', 'com_sermondistributor'))
 			{
 				// force production is not permitted
-				$app->enqueueMessage(JText::_('COM_SERMONDISTRIBUTOR_YOU_DO_NOT_HAVE_PERMISSION_TO_RESET_UPDATE_STATUS'), 'error');
+				$app->enqueueMessage(Text::_('COM_SERMONDISTRIBUTOR_YOU_DO_NOT_HAVE_PERMISSION_TO_RESET_UPDATE_STATUS'), 'error');
 				// Save the data in the session.
 				$app->setUserState($context . '.data', $originalData);
 				// Redirect back to the edit screen.
 				$this->setRedirect(
-					JRoute::_(
+					Route::_(
 						'index.php?option=' . $this->option . '&view=' . $this->view_item
 						. $this->getRedirectToItemAppend($originalData['id'], 'id'), false
 					)
@ -165,7 +171,7 @@ class SermondistributorControllerExternal_source extends FormController
 				$app->setUserState($context . '.data', $originalData);
 				// Redirect back to the edit screen.
 				$this->setRedirect(
-					JRoute::_(
+					Route::_(
 						'index.php?option=' . $this->option . '&view=' . $this->view_item
 						. $this->getRedirectToItemAppend($originalData['id'], 'id'), false
 					)
@ -173,23 +179,23 @@ class SermondistributorControllerExternal_source extends FormController
 				return false;
 			}
 			// reset update status success
-			$app->enqueueMessage(JText::_('COM_SERMONDISTRIBUTOR_RESETTING_THE_UPDATE_STATUS_WAS_SUCCESSFUL'), 'success');
+			$app->enqueueMessage(Text::_('COM_SERMONDISTRIBUTOR_RESETTING_THE_UPDATE_STATUS_WAS_SUCCESSFUL'), 'success');
 			// Save the data in the session.
 			$app->setUserState($context . '.data', $originalData);
 			// Redirect back to the edit screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . '&view=' . $this->view_item
 					. $this->getRedirectToItemAppend($originalData['id'], 'id'), false
 				)
 			);
 			return true;
 		}
-		$this->setError(JText::_('COM_SERMONDISTRIBUTOR_RESET_UPDATE_STATUS_CAN_NOT_BE_DONE'));
+		$this->setError(Text::_('COM_SERMONDISTRIBUTOR_RESET_UPDATE_STATUS_CAN_NOT_BE_DONE'));
 		$this->setMessage($this->getError(), 'error');
 		// Redirect back to the list screen.
 		$this->setRedirect(
-			JRoute::_(
+			Route::_(
 				'index.php?option=' . $this->option . '&view=' . $this->view_list
 				. $this->getRedirectToListAppend(), false
 			)
@ -197,7 +203,7 @@ class SermondistributorControllerExternal_source extends FormController
 		return false;
 	}

-        /**
+	/**
 	 * Method override to check if you can add a new record.
 	 *
 	 * @param   array  $data  An array of input data.
@ -206,10 +212,10 @@ class SermondistributorControllerExternal_source extends FormController
 	 *
 	 * @since   1.6
 	 */
-	protected function allowAdd($data = array())
+	protected function allowAdd($data = [])
 	{
 		// Get user object.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		// Access check.
 		$access = $user->authorise('external_source.access', 'com_sermondistributor');
 		if (!$access)
@ -217,7 +223,7 @@ class SermondistributorControllerExternal_source extends FormController
 			return false;
 		}

-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('external_source.create', $this->option);
 	}

@ -231,16 +237,16 @@ class SermondistributorControllerExternal_source extends FormController
 	 *
 	 * @since   1.6
 	 */
-	protected function allowEdit($data = array(), $key = 'id')
+	protected function allowEdit($data = [], $key = 'id')
 	{
 		// get user object.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		// get record id.
 		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;


 		// Access check.
-		$access = ($user->authorise('external_source.access', 'com_sermondistributor.external_source.' . (int) $recordId) &&  $user->authorise('external_source.access', 'com_sermondistributor'));
+		$access = ($user->authorise('external_source.access', 'com_sermondistributor.external_source.' . (int) $recordId) && $user->authorise('external_source.access', 'com_sermondistributor'));
 		if (!$access)
 		{
 			return false;
@ -305,12 +311,12 @@ class SermondistributorControllerExternal_source extends FormController

 		// set the referral options
 		if ($refid && $ref)
-                {
-			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
+		{
+			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append = '&ref='. (string)$ref . $append;
+			$append = '&ref='. (string) $ref . $append;
 		}

 		return $append;
@ -327,13 +333,13 @@ class SermondistributorControllerExternal_source extends FormController
 	 */
 	public function batch($model = null)
 	{
-		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));

 		// Set the model
-		$model = $this->getModel('External_source', '', array());
+		$model = $this->getModel('External_source', '', []);

 		// Preset the redirect
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=external_sources' . $this->getRedirectToListAppend(), false));
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=external_sources' . $this->getRedirectToListAppend(), false));

 		return parent::batch($model);
 	}
@ -358,13 +364,13 @@ class SermondistributorControllerExternal_source extends FormController

 		$cancel = parent::cancel($key);

-		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
+		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
 		{
 			$redirect = base64_decode($return);

 			// Redirect to the return value.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					$redirect, false
 				)
 			);
@ -375,7 +381,7 @@ class SermondistributorControllerExternal_source extends FormController

 			// Redirect to the item screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -386,7 +392,7 @@ class SermondistributorControllerExternal_source extends FormController

 			// Redirect to the list screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -412,7 +418,7 @@ class SermondistributorControllerExternal_source extends FormController

 		// Check if there is a return value
 		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));

 		if ($this->ref || $this->refid || $canReturn)
 		{
@ -430,29 +436,29 @@ class SermondistributorControllerExternal_source extends FormController

 			// Redirect to the return value.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					$redirect, false
 				)
 			);
 		}
 		elseif ($this->refid && $this->ref)
 		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;

 			// Redirect to the item screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
 		elseif ($this->ref)
 		{
-			$redirect = '&view=' . (string)$this->ref;
+			$redirect = '&view=' . (string) $this->ref;

 			// Redirect to the list screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -464,16 +470,15 @@ class SermondistributorControllerExternal_source extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   JModel  &$model     The data model object.
-	 * @param   array   $validData  The validated data.
+	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
 		return;
 	}
-
 }
--- a/admin/controllers/external_sources.php
+++ b/admin/controllers/external_sources.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		external_sources.php
@ -25,8 +25,14 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;

 /**
 * External_sources Admin Controller
@ -60,13 +66,13 @@ class SermondistributorControllerExternal_sources extends AdminController
 	public function exportData()
 	{
 		// Check for request forgeries
-		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		// check if export is allowed for this user.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		if ($user->authorise('external_source.export', 'com_sermondistributor') && $user->authorise('core.export', 'com_sermondistributor'))
 		{
 			// Get the input
-			$input = JFactory::getApplication()->input;
+			$input = Factory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
 			$pks = ArrayHelper::toInteger($pks);
@ -74,16 +80,16 @@ class SermondistributorControllerExternal_sources extends AdminController
 			$model = $this->getModel('External_sources');
 			// get the data to export
 			$data = $model->getExportData($pks);
-			if (SermondistributorHelper::checkArray($data))
+			if (UtilitiesArrayHelper::check($data))
 			{
 				// now set the data to the spreadsheet
-				$date = JFactory::getDate();
+				$date = Factory::getDate();
 				SermondistributorHelper::xls($data,'External_sources_'.$date->format('jS_F_Y'),'External sources exported ('.$date->format('jS F, Y').')','external sources');
 			}
 		}
 		// Redirect to the list screen with error.
-		$message = JText::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED');
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=external_sources', false), $message, 'error');
+		$message = Text::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED');
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=external_sources', false), $message, 'error');
 		return;
 	}

@ -91,32 +97,32 @@ class SermondistributorControllerExternal_sources extends AdminController
 	public function importData()
 	{
 		// Check for request forgeries
-		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		// check if import is allowed for this user.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		if ($user->authorise('external_source.import', 'com_sermondistributor') && $user->authorise('core.import', 'com_sermondistributor'))
 		{
 			// Get the import model
 			$model = $this->getModel('External_sources');
 			// get the headers to import
 			$headers = $model->getExImPortHeaders();
-			if (SermondistributorHelper::checkObject($headers))
+			if (ObjectHelper::check($headers))
 			{
 				// Load headers to session.
-				$session = JFactory::getSession();
+				$session = Factory::getSession();
 				$headers = json_encode($headers);
 				$session->set('external_source_VDM_IMPORTHEADERS', $headers);
 				$session->set('backto_VDM_IMPORT', 'external_sources');
 				$session->set('dataType_VDM_IMPORTINTO', 'external_source');
 				// Redirect to import view.
-				$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_EXTERNAL_SOURCES');
-				$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=import', false), $message);
+				$message = Text::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_EXTERNAL_SOURCES');
+				$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=import', false), $message);
 				return;
 			}
 		}
 		// Redirect to the list screen with error.
-		$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=external_sources', false), $message, 'error');
+		$message = Text::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=external_sources', false), $message, 'error');
 		return;
 	}
-}
+}
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		help.php
@ -25,7 +25,10 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;

 /**
@ -42,12 +45,12 @@ class SermondistributorControllerHelp extends BaseController

 	public function help()
 	{
-		$user 		= JFactory::getUser();
-		$jinput 	= JFactory::getApplication()->input;
+		$user       = Factory::getUser();
+		$jinput     = Factory::getApplication()->input;
 		// Check Token!
-		$token 		= JSession::getFormToken();
-		$call_token	= $jinput->get('token', 0, 'ALNUM');
-		if($user->id != 0 && $token == $call_token)
+		$token         = Session::getFormToken();
+		$call_token    = $jinput->get('token', 0, 'ALNUM');
+		if($user->id != 0 && ($jinput->get($token, 0, 'ALNUM') || $token === $call_token))
 		{
 			$task = $this->getTask();
 			switch($task){
@ -75,7 +78,7 @@ class SermondistributorControllerHelp extends BaseController
 				break;
 			}
 		}
- 		else
+		 else
 		{
 			// stop execution gracefully
 			jexit();
@ -84,8 +87,8 @@ class SermondistributorControllerHelp extends BaseController

 	protected function getHelpDocumentText($id)
 	{
-		$db		= JFactory::getDbo();
-		$query	= $db->getQuery(true);
+		$db       = Factory::getDbo();
+		$query    = $db->getQuery(true);
 		$query->select(array('a.title','a.content'));
 		$query->from('#__sermondistributor_help_document AS a');
 		$query->where('a.id = '.(int) $id);
@ -94,21 +97,21 @@ class SermondistributorControllerHelp extends BaseController
 		$db->execute();
 		if($db->getNumRows())
 		{
-			$text = array();
+			$text = [];
 			$document = $db->loadObject();
 			// fix image issue
-			$images['src="images'] = 'src="'.JURI::root().'images';
-			$images["src='images"] = "src='".JURI::root()."images";
-			$images['src="/images'] = 'src="'.JURI::root().'images';
-			$images["src='/images"] = "src='".JURI::root()."images";
+			$images['src="images'] = 'src="'.Uri::root().'images';
+			$images["src='images"] = "src='".Uri::root()."images";
+			$images['src="/images'] = 'src="'.Uri::root().'images';
+			$images["src='/images"] = "src='".Uri::root()."images";
 			// set document template
 			$text[] = "<!doctype html>";
 			$text[] = '<html>';
 			$text[] = "<head>";
 			$text[] = '<meta charset="utf-8">';
 			$text[] = "<title>".$document->title."</title>";
-			$text[] = '<link type="text/css" href="'.JURI::root().'media/com_sermondistributor/uikit/css/uikit.gradient.min.css" rel="stylesheet"></link>';
-			$text[] = '<script type="text/javascript" src="'.JURI::root().'media/com_sermondistributor/uikit/js/uikit.min.js"></script>';
+			$text[] = '<link type="text/css" href="'.Uri::root().'media/com_sermondistributor/uikit/css/uikit.gradient.min.css" rel="stylesheet"></link>';
+			$text[] = '<script type="text/javascript" src="'.Uri::root().'media/com_sermondistributor/uikit/js/uikit.min.js"></script>';
 			$text[] = "</head>";
 			$text[] = '<body><br />';
 			$text[] = '<div class="uk-container uk-container-center uk-grid-collapse">';
--- a/admin/controllers/help_document.php
+++ b/admin/controllers/help_document.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		help_document.php
@ -25,8 +25,14 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Uri\Uri;

 /**
 * Help_document Form Controller
@ -49,13 +55,13 @@ class SermondistributorControllerHelp_document extends FormController
 	 *
 	 * @since   1.6
 	 */
-	public function __construct($config = array())
+	public function __construct($config = [])
 	{
 		$this->view_list = 'Help_documents'; // safeguard for setting the return view listing to the main view.
 		parent::__construct($config);
 	}

-        /**
+	/**
 	 * Method override to check if you can add a new record.
 	 *
 	 * @param   array  $data  An array of input data.
@ -64,10 +70,10 @@ class SermondistributorControllerHelp_document extends FormController
 	 *
 	 * @since   1.6
 	 */
-	protected function allowAdd($data = array())
+	protected function allowAdd($data = [])
 	{
 		// Get user object.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		// Access check.
 		$access = $user->authorise('help_document.access', 'com_sermondistributor');
 		if (!$access)
@ -75,7 +81,7 @@ class SermondistributorControllerHelp_document extends FormController
 			return false;
 		}

-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('help_document.create', $this->option);
 	}

@ -89,16 +95,16 @@ class SermondistributorControllerHelp_document extends FormController
 	 *
 	 * @since   1.6
 	 */
-	protected function allowEdit($data = array(), $key = 'id')
+	protected function allowEdit($data = [], $key = 'id')
 	{
 		// get user object.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		// get record id.
 		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;


 		// Access check.
-		$access = ($user->authorise('help_document.access', 'com_sermondistributor.help_document.' . (int) $recordId) &&  $user->authorise('help_document.access', 'com_sermondistributor'));
+		$access = ($user->authorise('help_document.access', 'com_sermondistributor.help_document.' . (int) $recordId) && $user->authorise('help_document.access', 'com_sermondistributor'));
 		if (!$access)
 		{
 			return false;
@ -163,12 +169,12 @@ class SermondistributorControllerHelp_document extends FormController

 		// set the referral options
 		if ($refid && $ref)
-                {
-			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
+		{
+			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append = '&ref='. (string)$ref . $append;
+			$append = '&ref='. (string) $ref . $append;
 		}

 		return $append;
@ -185,13 +191,13 @@ class SermondistributorControllerHelp_document extends FormController
 	 */
 	public function batch($model = null)
 	{
-		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));

 		// Set the model
-		$model = $this->getModel('Help_document', '', array());
+		$model = $this->getModel('Help_document', '', []);

 		// Preset the redirect
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=help_documents' . $this->getRedirectToListAppend(), false));
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=help_documents' . $this->getRedirectToListAppend(), false));

 		return parent::batch($model);
 	}
@ -216,13 +222,13 @@ class SermondistributorControllerHelp_document extends FormController

 		$cancel = parent::cancel($key);

-		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
+		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
 		{
 			$redirect = base64_decode($return);

 			// Redirect to the return value.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					$redirect, false
 				)
 			);
@ -233,7 +239,7 @@ class SermondistributorControllerHelp_document extends FormController

 			// Redirect to the item screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -244,7 +250,7 @@ class SermondistributorControllerHelp_document extends FormController

 			// Redirect to the list screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -270,7 +276,7 @@ class SermondistributorControllerHelp_document extends FormController

 		// Check if there is a return value
 		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));

 		if ($this->ref || $this->refid || $canReturn)
 		{
@ -288,29 +294,29 @@ class SermondistributorControllerHelp_document extends FormController

 			// Redirect to the return value.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					$redirect, false
 				)
 			);
 		}
 		elseif ($this->refid && $this->ref)
 		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;

 			// Redirect to the item screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
 		elseif ($this->ref)
 		{
-			$redirect = '&view=' . (string)$this->ref;
+			$redirect = '&view=' . (string) $this->ref;

 			// Redirect to the list screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -322,16 +328,15 @@ class SermondistributorControllerHelp_document extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   JModel  &$model     The data model object.
-	 * @param   array   $validData  The validated data.
+	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
 		return;
 	}
-
 }
--- a/admin/controllers/help_documents.php
+++ b/admin/controllers/help_documents.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		help_documents.php
@ -25,8 +25,14 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;

 /**
 * Help_documents Admin Controller
@ -60,13 +66,13 @@ class SermondistributorControllerHelp_documents extends AdminController
 	public function exportData()
 	{
 		// Check for request forgeries
-		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		// check if export is allowed for this user.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		if ($user->authorise('help_document.export', 'com_sermondistributor') && $user->authorise('core.export', 'com_sermondistributor'))
 		{
 			// Get the input
-			$input = JFactory::getApplication()->input;
+			$input = Factory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
 			$pks = ArrayHelper::toInteger($pks);
@ -74,16 +80,16 @@ class SermondistributorControllerHelp_documents extends AdminController
 			$model = $this->getModel('Help_documents');
 			// get the data to export
 			$data = $model->getExportData($pks);
-			if (SermondistributorHelper::checkArray($data))
+			if (UtilitiesArrayHelper::check($data))
 			{
 				// now set the data to the spreadsheet
-				$date = JFactory::getDate();
+				$date = Factory::getDate();
 				SermondistributorHelper::xls($data,'Help_documents_'.$date->format('jS_F_Y'),'Help documents exported ('.$date->format('jS F, Y').')','help documents');
 			}
 		}
 		// Redirect to the list screen with error.
-		$message = JText::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED');
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=help_documents', false), $message, 'error');
+		$message = Text::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED');
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=help_documents', false), $message, 'error');
 		return;
 	}

@ -91,32 +97,32 @@ class SermondistributorControllerHelp_documents extends AdminController
 	public function importData()
 	{
 		// Check for request forgeries
-		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		// check if import is allowed for this user.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		if ($user->authorise('help_document.import', 'com_sermondistributor') && $user->authorise('core.import', 'com_sermondistributor'))
 		{
 			// Get the import model
 			$model = $this->getModel('Help_documents');
 			// get the headers to import
 			$headers = $model->getExImPortHeaders();
-			if (SermondistributorHelper::checkObject($headers))
+			if (ObjectHelper::check($headers))
 			{
 				// Load headers to session.
-				$session = JFactory::getSession();
+				$session = Factory::getSession();
 				$headers = json_encode($headers);
 				$session->set('help_document_VDM_IMPORTHEADERS', $headers);
 				$session->set('backto_VDM_IMPORT', 'help_documents');
 				$session->set('dataType_VDM_IMPORTINTO', 'help_document');
 				// Redirect to import view.
-				$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_HELP_DOCUMENTS');
-				$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=import', false), $message);
+				$message = Text::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_HELP_DOCUMENTS');
+				$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=import', false), $message);
 				return;
 			}
 		}
 		// Redirect to the list screen with error.
-		$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=help_documents', false), $message, 'error');
+		$message = Text::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=help_documents', false), $message, 'error');
 		return;
 	}
-}
+}
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		import.php
@ -25,7 +25,11 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;

 /**
@ -41,21 +45,21 @@ class SermondistributorControllerImport extends BaseController
 	public function import()
 	{
 		// Check for request forgeries
-		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));

 		$model = $this->getModel('import');
 		if ($model->import())
 		{
-			$cache = JFactory::getCache('mod_menu');
+			$cache = Factory::getCache('mod_menu');
 			$cache->clean();
 			// TODO: Reset the users acl here as well to kill off any missing bits
 		}

-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 		$redirect_url = $app->getUserState('com_sermondistributor.redirect_url');
 		if (empty($redirect_url))
 		{
-			$redirect_url = JRoute::_('index.php?option=com_sermondistributor&view=import', false);
+			$redirect_url = Route::_('index.php?option=com_sermondistributor&view=import', false);
 		}
 		else
 		{
--- a/admin/controllers/local_listing.php
+++ b/admin/controllers/local_listing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		local_listing.php
@ -25,8 +25,14 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Uri\Uri;

 /**
 * Local_listing Form Controller
@ -49,13 +55,13 @@ class SermondistributorControllerLocal_listing extends FormController
 	 *
 	 * @since   1.6
 	 */
-	public function __construct($config = array())
+	public function __construct($config = [])
 	{
 		$this->view_list = 'Local_listings'; // safeguard for setting the return view listing to the main view.
 		parent::__construct($config);
 	}

-        /**
+	/**
 	 * Method override to check if you can add a new record.
 	 *
 	 * @param   array  $data  An array of input data.
@ -64,10 +70,10 @@ class SermondistributorControllerLocal_listing extends FormController
 	 *
 	 * @since   1.6
 	 */
-	protected function allowAdd($data = array())
+	protected function allowAdd($data = [])
 	{
 		// Get user object.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		// Access check.
 		$access = $user->authorise('local_listing.access', 'com_sermondistributor');
 		if (!$access)
@ -75,7 +81,7 @@ class SermondistributorControllerLocal_listing extends FormController
 			return false;
 		}

-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('local_listing.create', $this->option);
 	}

@ -89,16 +95,16 @@ class SermondistributorControllerLocal_listing extends FormController
 	 *
 	 * @since   1.6
 	 */
-	protected function allowEdit($data = array(), $key = 'id')
+	protected function allowEdit($data = [], $key = 'id')
 	{
 		// get user object.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		// get record id.
 		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;


 		// Access check.
-		$access = ($user->authorise('local_listing.access', 'com_sermondistributor.local_listing.' . (int) $recordId) &&  $user->authorise('local_listing.access', 'com_sermondistributor'));
+		$access = ($user->authorise('local_listing.access', 'com_sermondistributor.local_listing.' . (int) $recordId) && $user->authorise('local_listing.access', 'com_sermondistributor'));
 		if (!$access)
 		{
 			return false;
@ -163,12 +169,12 @@ class SermondistributorControllerLocal_listing extends FormController

 		// set the referral options
 		if ($refid && $ref)
-                {
-			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
+		{
+			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append = '&ref='. (string)$ref . $append;
+			$append = '&ref='. (string) $ref . $append;
 		}

 		return $append;
@ -185,13 +191,13 @@ class SermondistributorControllerLocal_listing extends FormController
 	 */
 	public function batch($model = null)
 	{
-		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));

 		// Set the model
-		$model = $this->getModel('Local_listing', '', array());
+		$model = $this->getModel('Local_listing', '', []);

 		// Preset the redirect
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=local_listings' . $this->getRedirectToListAppend(), false));
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=local_listings' . $this->getRedirectToListAppend(), false));

 		return parent::batch($model);
 	}
@ -216,13 +222,13 @@ class SermondistributorControllerLocal_listing extends FormController

 		$cancel = parent::cancel($key);

-		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
+		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
 		{
 			$redirect = base64_decode($return);

 			// Redirect to the return value.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					$redirect, false
 				)
 			);
@ -233,7 +239,7 @@ class SermondistributorControllerLocal_listing extends FormController

 			// Redirect to the item screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -244,7 +250,7 @@ class SermondistributorControllerLocal_listing extends FormController

 			// Redirect to the list screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -270,7 +276,7 @@ class SermondistributorControllerLocal_listing extends FormController

 		// Check if there is a return value
 		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));

 		if ($this->ref || $this->refid || $canReturn)
 		{
@ -288,29 +294,29 @@ class SermondistributorControllerLocal_listing extends FormController

 			// Redirect to the return value.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					$redirect, false
 				)
 			);
 		}
 		elseif ($this->refid && $this->ref)
 		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;

 			// Redirect to the item screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
 		elseif ($this->ref)
 		{
-			$redirect = '&view=' . (string)$this->ref;
+			$redirect = '&view=' . (string) $this->ref;

 			// Redirect to the list screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -322,16 +328,15 @@ class SermondistributorControllerLocal_listing extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   JModel  &$model     The data model object.
-	 * @param   array   $validData  The validated data.
+	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
 		return;
 	}
-
 }
--- a/admin/controllers/local_listings.php
+++ b/admin/controllers/local_listings.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		local_listings.php
@ -25,8 +25,14 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;

 /**
 * Local_listings Admin Controller
@ -60,13 +66,13 @@ class SermondistributorControllerLocal_listings extends AdminController
 	public function exportData()
 	{
 		// Check for request forgeries
-		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		// check if export is allowed for this user.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		if ($user->authorise('local_listing.export', 'com_sermondistributor') && $user->authorise('core.export', 'com_sermondistributor'))
 		{
 			// Get the input
-			$input = JFactory::getApplication()->input;
+			$input = Factory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
 			$pks = ArrayHelper::toInteger($pks);
@ -74,16 +80,16 @@ class SermondistributorControllerLocal_listings extends AdminController
 			$model = $this->getModel('Local_listings');
 			// get the data to export
 			$data = $model->getExportData($pks);
-			if (SermondistributorHelper::checkArray($data))
+			if (UtilitiesArrayHelper::check($data))
 			{
 				// now set the data to the spreadsheet
-				$date = JFactory::getDate();
+				$date = Factory::getDate();
 				SermondistributorHelper::xls($data,'Local_listings_'.$date->format('jS_F_Y'),'Local listings exported ('.$date->format('jS F, Y').')','local listings');
 			}
 		}
 		// Redirect to the list screen with error.
-		$message = JText::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED');
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=local_listings', false), $message, 'error');
+		$message = Text::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED');
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=local_listings', false), $message, 'error');
 		return;
 	}

@ -91,32 +97,32 @@ class SermondistributorControllerLocal_listings extends AdminController
 	public function importData()
 	{
 		// Check for request forgeries
-		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		// check if import is allowed for this user.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		if ($user->authorise('local_listing.import', 'com_sermondistributor') && $user->authorise('core.import', 'com_sermondistributor'))
 		{
 			// Get the import model
 			$model = $this->getModel('Local_listings');
 			// get the headers to import
 			$headers = $model->getExImPortHeaders();
-			if (SermondistributorHelper::checkObject($headers))
+			if (ObjectHelper::check($headers))
 			{
 				// Load headers to session.
-				$session = JFactory::getSession();
+				$session = Factory::getSession();
 				$headers = json_encode($headers);
 				$session->set('local_listing_VDM_IMPORTHEADERS', $headers);
 				$session->set('backto_VDM_IMPORT', 'local_listings');
 				$session->set('dataType_VDM_IMPORTINTO', 'local_listing');
 				// Redirect to import view.
-				$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_LOCAL_LISTINGS');
-				$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=import', false), $message);
+				$message = Text::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_LOCAL_LISTINGS');
+				$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=import', false), $message);
 				return;
 			}
 		}
 		// Redirect to the list screen with error.
-		$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=local_listings', false), $message, 'error');
+		$message = Text::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=local_listings', false), $message, 'error');
 		return;
 	}
-}
+}
--- a/admin/controllers/manual_updater.php
+++ b/admin/controllers/manual_updater.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		manual_updater.php
@ -25,8 +25,12 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;

 /**
 * Manual_updater Admin Controller
@ -43,9 +47,9 @@ class SermondistributorControllerManual_updater extends AdminController

 	/**
 	 * Proxy for getModel.
-	 * @since	2.5
+	 * @since    2.5
 	 */
-	public function getModel($name = 'Manual_updater', $prefix = 'SermondistributorModel', $config = array())
+	public function getModel($name = 'Manual_updater', $prefix = 'SermondistributorModel', $config = [])
 	{
 		$model = parent::getModel($name, $prefix, array('ignore_request' => true));

@ -54,14 +58,14 @@ class SermondistributorControllerManual_updater extends AdminController

 	public function dashboard()
 	{
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor', false));
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor', false));
 		return;
 	}

-        public function gotoExternalSources()
+	public function gotoExternalSources()
 	{
-		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=external_sources', false));
+		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=external_sources', false));
 		return;
 	}
 }
--- a/admin/controllers/preacher.php
+++ b/admin/controllers/preacher.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		preacher.php
@ -25,8 +25,14 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Uri\Uri;

 /**
 * Preacher Form Controller
@ -49,13 +55,13 @@ class SermondistributorControllerPreacher extends FormController
 	 *
 	 * @since   1.6
 	 */
-	public function __construct($config = array())
+	public function __construct($config = [])
 	{
 		$this->view_list = 'Preachers'; // safeguard for setting the return view listing to the main view.
 		parent::__construct($config);
 	}

-        /**
+	/**
 	 * Method override to check if you can add a new record.
 	 *
 	 * @param   array  $data  An array of input data.
@ -64,10 +70,10 @@ class SermondistributorControllerPreacher extends FormController
 	 *
 	 * @since   1.6
 	 */
-	protected function allowAdd($data = array())
+	protected function allowAdd($data = [])
 	{
 		// Get user object.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		// Access check.
 		$access = $user->authorise('preacher.access', 'com_sermondistributor');
 		if (!$access)
@ -75,7 +81,7 @@ class SermondistributorControllerPreacher extends FormController
 			return false;
 		}

-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('preacher.create', $this->option);
 	}

@ -89,16 +95,16 @@ class SermondistributorControllerPreacher extends FormController
 	 *
 	 * @since   1.6
 	 */
-	protected function allowEdit($data = array(), $key = 'id')
+	protected function allowEdit($data = [], $key = 'id')
 	{
 		// get user object.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		// get record id.
 		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;


 		// Access check.
-		$access = ($user->authorise('preacher.access', 'com_sermondistributor.preacher.' . (int) $recordId) &&  $user->authorise('preacher.access', 'com_sermondistributor'));
+		$access = ($user->authorise('preacher.access', 'com_sermondistributor.preacher.' . (int) $recordId) && $user->authorise('preacher.access', 'com_sermondistributor'));
 		if (!$access)
 		{
 			return false;
@ -163,12 +169,12 @@ class SermondistributorControllerPreacher extends FormController

 		// set the referral options
 		if ($refid && $ref)
-                {
-			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
+		{
+			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append = '&ref='. (string)$ref . $append;
+			$append = '&ref='. (string) $ref . $append;
 		}

 		return $append;
@ -185,13 +191,13 @@ class SermondistributorControllerPreacher extends FormController
 	 */
 	public function batch($model = null)
 	{
-		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));

 		// Set the model
-		$model = $this->getModel('Preacher', '', array());
+		$model = $this->getModel('Preacher', '', []);

 		// Preset the redirect
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=preachers' . $this->getRedirectToListAppend(), false));
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=preachers' . $this->getRedirectToListAppend(), false));

 		return parent::batch($model);
 	}
@ -216,13 +222,13 @@ class SermondistributorControllerPreacher extends FormController

 		$cancel = parent::cancel($key);

-		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
+		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
 		{
 			$redirect = base64_decode($return);

 			// Redirect to the return value.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					$redirect, false
 				)
 			);
@ -233,7 +239,7 @@ class SermondistributorControllerPreacher extends FormController

 			// Redirect to the item screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -244,7 +250,7 @@ class SermondistributorControllerPreacher extends FormController

 			// Redirect to the list screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -270,7 +276,7 @@ class SermondistributorControllerPreacher extends FormController

 		// Check if there is a return value
 		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));

 		if ($this->ref || $this->refid || $canReturn)
 		{
@ -288,29 +294,29 @@ class SermondistributorControllerPreacher extends FormController

 			// Redirect to the return value.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					$redirect, false
 				)
 			);
 		}
 		elseif ($this->refid && $this->ref)
 		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;

 			// Redirect to the item screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
 		elseif ($this->ref)
 		{
-			$redirect = '&view=' . (string)$this->ref;
+			$redirect = '&view=' . (string) $this->ref;

 			// Redirect to the list screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -322,16 +328,15 @@ class SermondistributorControllerPreacher extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   JModel  &$model     The data model object.
-	 * @param   array   $validData  The validated data.
+	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
 		return;
 	}
-
 }
--- a/admin/controllers/preachers.php
+++ b/admin/controllers/preachers.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		preachers.php
@ -25,8 +25,14 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;

 /**
 * Preachers Admin Controller
@ -60,13 +66,13 @@ class SermondistributorControllerPreachers extends AdminController
 	public function exportData()
 	{
 		// Check for request forgeries
-		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		// check if export is allowed for this user.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		if ($user->authorise('preacher.export', 'com_sermondistributor') && $user->authorise('core.export', 'com_sermondistributor'))
 		{
 			// Get the input
-			$input = JFactory::getApplication()->input;
+			$input = Factory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
 			$pks = ArrayHelper::toInteger($pks);
@ -74,16 +80,16 @@ class SermondistributorControllerPreachers extends AdminController
 			$model = $this->getModel('Preachers');
 			// get the data to export
 			$data = $model->getExportData($pks);
-			if (SermondistributorHelper::checkArray($data))
+			if (UtilitiesArrayHelper::check($data))
 			{
 				// now set the data to the spreadsheet
-				$date = JFactory::getDate();
+				$date = Factory::getDate();
 				SermondistributorHelper::xls($data,'Preachers_'.$date->format('jS_F_Y'),'Preachers exported ('.$date->format('jS F, Y').')','preachers');
 			}
 		}
 		// Redirect to the list screen with error.
-		$message = JText::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED');
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=preachers', false), $message, 'error');
+		$message = Text::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED');
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=preachers', false), $message, 'error');
 		return;
 	}

@ -91,32 +97,32 @@ class SermondistributorControllerPreachers extends AdminController
 	public function importData()
 	{
 		// Check for request forgeries
-		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		// check if import is allowed for this user.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		if ($user->authorise('preacher.import', 'com_sermondistributor') && $user->authorise('core.import', 'com_sermondistributor'))
 		{
 			// Get the import model
 			$model = $this->getModel('Preachers');
 			// get the headers to import
 			$headers = $model->getExImPortHeaders();
-			if (SermondistributorHelper::checkObject($headers))
+			if (ObjectHelper::check($headers))
 			{
 				// Load headers to session.
-				$session = JFactory::getSession();
+				$session = Factory::getSession();
 				$headers = json_encode($headers);
 				$session->set('preacher_VDM_IMPORTHEADERS', $headers);
 				$session->set('backto_VDM_IMPORT', 'preachers');
 				$session->set('dataType_VDM_IMPORTINTO', 'preacher');
 				// Redirect to import view.
-				$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_PREACHERS');
-				$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=import', false), $message);
+				$message = Text::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_PREACHERS');
+				$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=import', false), $message);
 				return;
 			}
 		}
 		// Redirect to the list screen with error.
-		$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=preachers', false), $message, 'error');
+		$message = Text::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=preachers', false), $message, 'error');
 		return;
 	}
-}
+}
--- a/admin/controllers/series.php
+++ b/admin/controllers/series.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		series.php
@ -25,8 +25,14 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Uri\Uri;

 /**
 * Series Form Controller
@ -49,13 +55,13 @@ class SermondistributorControllerSeries extends FormController
 	 *
 	 * @since   1.6
 	 */
-	public function __construct($config = array())
+	public function __construct($config = [])
 	{
 		$this->view_list = 'Series_list'; // safeguard for setting the return view listing to the main view.
 		parent::__construct($config);
 	}

-        /**
+	/**
 	 * Method override to check if you can add a new record.
 	 *
 	 * @param   array  $data  An array of input data.
@ -64,10 +70,10 @@ class SermondistributorControllerSeries extends FormController
 	 *
 	 * @since   1.6
 	 */
-	protected function allowAdd($data = array())
+	protected function allowAdd($data = [])
 	{
 		// Get user object.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		// Access check.
 		$access = $user->authorise('series.access', 'com_sermondistributor');
 		if (!$access)
@ -75,7 +81,7 @@ class SermondistributorControllerSeries extends FormController
 			return false;
 		}

-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('series.create', $this->option);
 	}

@ -89,16 +95,16 @@ class SermondistributorControllerSeries extends FormController
 	 *
 	 * @since   1.6
 	 */
-	protected function allowEdit($data = array(), $key = 'id')
+	protected function allowEdit($data = [], $key = 'id')
 	{
 		// get user object.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		// get record id.
 		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;


 		// Access check.
-		$access = ($user->authorise('series.access', 'com_sermondistributor.series.' . (int) $recordId) &&  $user->authorise('series.access', 'com_sermondistributor'));
+		$access = ($user->authorise('series.access', 'com_sermondistributor.series.' . (int) $recordId) && $user->authorise('series.access', 'com_sermondistributor'));
 		if (!$access)
 		{
 			return false;
@ -163,12 +169,12 @@ class SermondistributorControllerSeries extends FormController

 		// set the referral options
 		if ($refid && $ref)
-                {
-			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
+		{
+			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append = '&ref='. (string)$ref . $append;
+			$append = '&ref='. (string) $ref . $append;
 		}

 		return $append;
@ -185,13 +191,13 @@ class SermondistributorControllerSeries extends FormController
 	 */
 	public function batch($model = null)
 	{
-		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));

 		// Set the model
-		$model = $this->getModel('Series', '', array());
+		$model = $this->getModel('Series', '', []);

 		// Preset the redirect
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=series_list' . $this->getRedirectToListAppend(), false));
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=series_list' . $this->getRedirectToListAppend(), false));

 		return parent::batch($model);
 	}
@ -216,13 +222,13 @@ class SermondistributorControllerSeries extends FormController

 		$cancel = parent::cancel($key);

-		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
+		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
 		{
 			$redirect = base64_decode($return);

 			// Redirect to the return value.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					$redirect, false
 				)
 			);
@ -233,7 +239,7 @@ class SermondistributorControllerSeries extends FormController

 			// Redirect to the item screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -244,7 +250,7 @@ class SermondistributorControllerSeries extends FormController

 			// Redirect to the list screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -270,7 +276,7 @@ class SermondistributorControllerSeries extends FormController

 		// Check if there is a return value
 		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));

 		if ($this->ref || $this->refid || $canReturn)
 		{
@ -288,29 +294,29 @@ class SermondistributorControllerSeries extends FormController

 			// Redirect to the return value.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					$redirect, false
 				)
 			);
 		}
 		elseif ($this->refid && $this->ref)
 		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;

 			// Redirect to the item screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
 		elseif ($this->ref)
 		{
-			$redirect = '&view=' . (string)$this->ref;
+			$redirect = '&view=' . (string) $this->ref;

 			// Redirect to the list screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -322,16 +328,15 @@ class SermondistributorControllerSeries extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   JModel  &$model     The data model object.
-	 * @param   array   $validData  The validated data.
+	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
 		return;
 	}
-
 }
--- a/admin/controllers/series_list.php
+++ b/admin/controllers/series_list.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		series_list.php
@ -25,8 +25,14 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;

 /**
 * Series_list Admin Controller
@ -60,13 +66,13 @@ class SermondistributorControllerSeries_list extends AdminController
 	public function exportData()
 	{
 		// Check for request forgeries
-		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		// check if export is allowed for this user.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		if ($user->authorise('series.export', 'com_sermondistributor') && $user->authorise('core.export', 'com_sermondistributor'))
 		{
 			// Get the input
-			$input = JFactory::getApplication()->input;
+			$input = Factory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
 			$pks = ArrayHelper::toInteger($pks);
@ -74,16 +80,16 @@ class SermondistributorControllerSeries_list extends AdminController
 			$model = $this->getModel('Series_list');
 			// get the data to export
 			$data = $model->getExportData($pks);
-			if (SermondistributorHelper::checkArray($data))
+			if (UtilitiesArrayHelper::check($data))
 			{
 				// now set the data to the spreadsheet
-				$date = JFactory::getDate();
+				$date = Factory::getDate();
 				SermondistributorHelper::xls($data,'Series_list_'.$date->format('jS_F_Y'),'Series list exported ('.$date->format('jS F, Y').')','series list');
 			}
 		}
 		// Redirect to the list screen with error.
-		$message = JText::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED');
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=series_list', false), $message, 'error');
+		$message = Text::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED');
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=series_list', false), $message, 'error');
 		return;
 	}

@ -91,32 +97,32 @@ class SermondistributorControllerSeries_list extends AdminController
 	public function importData()
 	{
 		// Check for request forgeries
-		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		// check if import is allowed for this user.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		if ($user->authorise('series.import', 'com_sermondistributor') && $user->authorise('core.import', 'com_sermondistributor'))
 		{
 			// Get the import model
 			$model = $this->getModel('Series_list');
 			// get the headers to import
 			$headers = $model->getExImPortHeaders();
-			if (SermondistributorHelper::checkObject($headers))
+			if (ObjectHelper::check($headers))
 			{
 				// Load headers to session.
-				$session = JFactory::getSession();
+				$session = Factory::getSession();
 				$headers = json_encode($headers);
 				$session->set('series_VDM_IMPORTHEADERS', $headers);
 				$session->set('backto_VDM_IMPORT', 'series_list');
 				$session->set('dataType_VDM_IMPORTINTO', 'series');
 				// Redirect to import view.
-				$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_SERIES_LIST');
-				$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=import', false), $message);
+				$message = Text::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_SERIES_LIST');
+				$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=import', false), $message);
 				return;
 			}
 		}
 		// Redirect to the list screen with error.
-		$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=series_list', false), $message, 'error');
+		$message = Text::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=series_list', false), $message, 'error');
 		return;
 	}
-}
+}
--- a/admin/controllers/sermon.php
+++ b/admin/controllers/sermon.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		sermon.php
@ -25,8 +25,14 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Uri\Uri;

 /**
 * Sermon Form Controller
@ -49,13 +55,13 @@ class SermondistributorControllerSermon extends FormController
 	 *
 	 * @since   1.6
 	 */
-	public function __construct($config = array())
+	public function __construct($config = [])
 	{
 		$this->view_list = 'Sermons'; // safeguard for setting the return view listing to the main view.
 		parent::__construct($config);
 	}

-        /**
+	/**
 	 * Method override to check if you can add a new record.
 	 *
 	 * @param   array  $data  An array of input data.
@ -64,10 +70,10 @@ class SermondistributorControllerSermon extends FormController
 	 *
 	 * @since   1.6
 	 */
-	protected function allowAdd($data = array())
+	protected function allowAdd($data = [])
 	{
 		// Get user object.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		// Access check.
 		$access = $user->authorise('sermon.access', 'com_sermondistributor');
 		if (!$access)
@ -75,7 +81,7 @@ class SermondistributorControllerSermon extends FormController
 			return false;
 		}

-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('sermon.create', $this->option);
 	}

@ -89,9 +95,9 @@ class SermondistributorControllerSermon extends FormController
 	 *
 	 * @since   1.6
 	 */
-	protected function allowEdit($data = array(), $key = 'id')
+	protected function allowEdit($data = [], $key = 'id')
 	{		// get user object.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		// get record id.
 		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;

@ -162,12 +168,12 @@ class SermondistributorControllerSermon extends FormController

 		// set the referral options
 		if ($refid && $ref)
-                {
-			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
+		{
+			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append = '&ref='. (string)$ref . $append;
+			$append = '&ref='. (string) $ref . $append;
 		}

 		return $append;
@ -184,13 +190,13 @@ class SermondistributorControllerSermon extends FormController
 	 */
 	public function batch($model = null)
 	{
-		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));

 		// Set the model
-		$model = $this->getModel('Sermon', '', array());
+		$model = $this->getModel('Sermon', '', []);

 		// Preset the redirect
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=sermons' . $this->getRedirectToListAppend(), false));
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=sermons' . $this->getRedirectToListAppend(), false));

 		return parent::batch($model);
 	}
@ -215,13 +221,13 @@ class SermondistributorControllerSermon extends FormController

 		$cancel = parent::cancel($key);

-		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
+		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
 		{
 			$redirect = base64_decode($return);

 			// Redirect to the return value.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					$redirect, false
 				)
 			);
@ -232,7 +238,7 @@ class SermondistributorControllerSermon extends FormController

 			// Redirect to the item screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -243,7 +249,7 @@ class SermondistributorControllerSermon extends FormController

 			// Redirect to the list screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -269,7 +275,7 @@ class SermondistributorControllerSermon extends FormController

 		// Check if there is a return value
 		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));

 		if ($this->ref || $this->refid || $canReturn)
 		{
@ -287,29 +293,29 @@ class SermondistributorControllerSermon extends FormController

 			// Redirect to the return value.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					$redirect, false
 				)
 			);
 		}
 		elseif ($this->refid && $this->ref)
 		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;

 			// Redirect to the item screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
 		elseif ($this->ref)
 		{
-			$redirect = '&view=' . (string)$this->ref;
+			$redirect = '&view=' . (string) $this->ref;

 			// Redirect to the list screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -321,16 +327,15 @@ class SermondistributorControllerSermon extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   JModel  &$model     The data model object.
-	 * @param   array   $validData  The validated data.
+	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
 		return;
 	}
-
 }
--- a/admin/controllers/sermondistributor.php
+++ b/admin/controllers/sermondistributor.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		sermondistributor.php
@ -25,8 +25,12 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;

 /**
 * Sermondistributor Admin Controller
--- a/admin/controllers/sermons.php
+++ b/admin/controllers/sermons.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		sermons.php
@ -25,8 +25,14 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;

 /**
 * Sermons Admin Controller
@ -60,13 +66,13 @@ class SermondistributorControllerSermons extends AdminController
 	public function exportData()
 	{
 		// Check for request forgeries
-		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		// check if export is allowed for this user.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		if ($user->authorise('sermon.export', 'com_sermondistributor') && $user->authorise('core.export', 'com_sermondistributor'))
 		{
 			// Get the input
-			$input = JFactory::getApplication()->input;
+			$input = Factory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
 			$pks = ArrayHelper::toInteger($pks);
@ -74,16 +80,16 @@ class SermondistributorControllerSermons extends AdminController
 			$model = $this->getModel('Sermons');
 			// get the data to export
 			$data = $model->getExportData($pks);
-			if (SermondistributorHelper::checkArray($data))
+			if (UtilitiesArrayHelper::check($data))
 			{
 				// now set the data to the spreadsheet
-				$date = JFactory::getDate();
+				$date = Factory::getDate();
 				SermondistributorHelper::xls($data,'Sermons_'.$date->format('jS_F_Y'),'Sermons exported ('.$date->format('jS F, Y').')','sermons');
 			}
 		}
 		// Redirect to the list screen with error.
-		$message = JText::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED');
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=sermons', false), $message, 'error');
+		$message = Text::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED');
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=sermons', false), $message, 'error');
 		return;
 	}

@ -91,32 +97,32 @@ class SermondistributorControllerSermons extends AdminController
 	public function importData()
 	{
 		// Check for request forgeries
-		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		// check if import is allowed for this user.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		if ($user->authorise('sermon.import', 'com_sermondistributor') && $user->authorise('core.import', 'com_sermondistributor'))
 		{
 			// Get the import model
 			$model = $this->getModel('Sermons');
 			// get the headers to import
 			$headers = $model->getExImPortHeaders();
-			if (SermondistributorHelper::checkObject($headers))
+			if (ObjectHelper::check($headers))
 			{
 				// Load headers to session.
-				$session = JFactory::getSession();
+				$session = Factory::getSession();
 				$headers = json_encode($headers);
 				$session->set('sermon_VDM_IMPORTHEADERS', $headers);
 				$session->set('backto_VDM_IMPORT', 'sermons');
 				$session->set('dataType_VDM_IMPORTINTO', 'sermon');
 				// Redirect to import view.
-				$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_SERMONS');
-				$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=import', false), $message);
+				$message = Text::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_SERMONS');
+				$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=import', false), $message);
 				return;
 			}
 		}
 		// Redirect to the list screen with error.
-		$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=sermons', false), $message, 'error');
+		$message = Text::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=sermons', false), $message, 'error');
 		return;
 	}
-}
+}
--- a/admin/controllers/statistic.php
+++ b/admin/controllers/statistic.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		statistic.php
@ -25,8 +25,14 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Uri\Uri;

 /**
 * Statistic Form Controller
@ -49,13 +55,13 @@ class SermondistributorControllerStatistic extends FormController
 	 *
 	 * @since   1.6
 	 */
-	public function __construct($config = array())
+	public function __construct($config = [])
 	{
 		$this->view_list = 'Statistics'; // safeguard for setting the return view listing to the main view.
 		parent::__construct($config);
 	}

-        /**
+	/**
 	 * Method override to check if you can add a new record.
 	 *
 	 * @param   array  $data  An array of input data.
@ -64,10 +70,10 @@ class SermondistributorControllerStatistic extends FormController
 	 *
 	 * @since   1.6
 	 */
-	protected function allowAdd($data = array())
+	protected function allowAdd($data = [])
 	{
 		// Get user object.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		// Access check.
 		$access = $user->authorise('statistic.access', 'com_sermondistributor');
 		if (!$access)
@ -75,7 +81,7 @@ class SermondistributorControllerStatistic extends FormController
 			return false;
 		}

-		// In the absense of better information, revert to the component permissions.
+		// In the absence of better information, revert to the component permissions.
 		return $user->authorise('statistic.create', $this->option);
 	}

@ -89,16 +95,16 @@ class SermondistributorControllerStatistic extends FormController
 	 *
 	 * @since   1.6
 	 */
-	protected function allowEdit($data = array(), $key = 'id')
+	protected function allowEdit($data = [], $key = 'id')
 	{
 		// get user object.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		// get record id.
 		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;


 		// Access check.
-		$access = ($user->authorise('statistic.access', 'com_sermondistributor.statistic.' . (int) $recordId) &&  $user->authorise('statistic.access', 'com_sermondistributor'));
+		$access = ($user->authorise('statistic.access', 'com_sermondistributor.statistic.' . (int) $recordId) && $user->authorise('statistic.access', 'com_sermondistributor'));
 		if (!$access)
 		{
 			return false;
@ -163,12 +169,12 @@ class SermondistributorControllerStatistic extends FormController

 		// set the referral options
 		if ($refid && $ref)
-                {
-			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
+		{
+			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append = '&ref='. (string)$ref . $append;
+			$append = '&ref='. (string) $ref . $append;
 		}

 		return $append;
@ -185,13 +191,13 @@ class SermondistributorControllerStatistic extends FormController
 	 */
 	public function batch($model = null)
 	{
-		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));

 		// Set the model
-		$model = $this->getModel('Statistic', '', array());
+		$model = $this->getModel('Statistic', '', []);

 		// Preset the redirect
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=statistics' . $this->getRedirectToListAppend(), false));
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=statistics' . $this->getRedirectToListAppend(), false));

 		return parent::batch($model);
 	}
@ -216,13 +222,13 @@ class SermondistributorControllerStatistic extends FormController

 		$cancel = parent::cancel($key);

-		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
+		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
 		{
 			$redirect = base64_decode($return);

 			// Redirect to the return value.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					$redirect, false
 				)
 			);
@ -233,7 +239,7 @@ class SermondistributorControllerStatistic extends FormController

 			// Redirect to the item screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -244,7 +250,7 @@ class SermondistributorControllerStatistic extends FormController

 			// Redirect to the list screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -270,7 +276,7 @@ class SermondistributorControllerStatistic extends FormController

 		// Check if there is a return value
 		$return = $this->input->get('return', null, 'base64');
-		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));

 		if ($this->ref || $this->refid || $canReturn)
 		{
@ -288,29 +294,29 @@ class SermondistributorControllerStatistic extends FormController

 			// Redirect to the return value.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					$redirect, false
 				)
 			);
 		}
 		elseif ($this->refid && $this->ref)
 		{
-			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;

 			// Redirect to the item screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
 		elseif ($this->ref)
 		{
-			$redirect = '&view=' . (string)$this->ref;
+			$redirect = '&view=' . (string) $this->ref;

 			// Redirect to the list screen.
 			$this->setRedirect(
-				JRoute::_(
+				Route::_(
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
@ -322,16 +328,15 @@ class SermondistributorControllerStatistic extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   JModel  &$model     The data model object.
-	 * @param   array   $validData  The validated data.
+	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void
 	 *
 	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
 		return;
 	}
-
 }
--- a/admin/controllers/statistics.php
+++ b/admin/controllers/statistics.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		statistics.php
@ -25,8 +25,14 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;

 /**
 * Statistics Admin Controller
@ -60,13 +66,13 @@ class SermondistributorControllerStatistics extends AdminController
 	public function exportData()
 	{
 		// Check for request forgeries
-		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		// check if export is allowed for this user.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		if ($user->authorise('statistic.export', 'com_sermondistributor') && $user->authorise('core.export', 'com_sermondistributor'))
 		{
 			// Get the input
-			$input = JFactory::getApplication()->input;
+			$input = Factory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
 			$pks = ArrayHelper::toInteger($pks);
@ -74,16 +80,16 @@ class SermondistributorControllerStatistics extends AdminController
 			$model = $this->getModel('Statistics');
 			// get the data to export
 			$data = $model->getExportData($pks);
-			if (SermondistributorHelper::checkArray($data))
+			if (UtilitiesArrayHelper::check($data))
 			{
 				// now set the data to the spreadsheet
-				$date = JFactory::getDate();
+				$date = Factory::getDate();
 				SermondistributorHelper::xls($data,'Statistics_'.$date->format('jS_F_Y'),'Statistics exported ('.$date->format('jS F, Y').')','statistics');
 			}
 		}
 		// Redirect to the list screen with error.
-		$message = JText::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED');
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=statistics', false), $message, 'error');
+		$message = Text::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED');
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=statistics', false), $message, 'error');
 		return;
 	}

@ -91,32 +97,32 @@ class SermondistributorControllerStatistics extends AdminController
 	public function importData()
 	{
 		// Check for request forgeries
-		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		// check if import is allowed for this user.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		if ($user->authorise('statistic.import', 'com_sermondistributor') && $user->authorise('core.import', 'com_sermondistributor'))
 		{
 			// Get the import model
 			$model = $this->getModel('Statistics');
 			// get the headers to import
 			$headers = $model->getExImPortHeaders();
-			if (SermondistributorHelper::checkObject($headers))
+			if (ObjectHelper::check($headers))
 			{
 				// Load headers to session.
-				$session = JFactory::getSession();
+				$session = Factory::getSession();
 				$headers = json_encode($headers);
 				$session->set('statistic_VDM_IMPORTHEADERS', $headers);
 				$session->set('backto_VDM_IMPORT', 'statistics');
 				$session->set('dataType_VDM_IMPORTINTO', 'statistic');
 				// Redirect to import view.
-				$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_STATISTICS');
-				$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=import', false), $message);
+				$message = Text::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_STATISTICS');
+				$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=import', false), $message);
 				return;
 			}
 		}
 		// Redirect to the list screen with error.
-		$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
-		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=statistics', false), $message, 'error');
+		$message = Text::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
+		$this->setRedirect(Route::_('index.php?option=com_sermondistributor&view=statistics', false), $message, 'error');
 		return;
 	}
-}
+}
--- a/admin/helpers/headercheck.php
+++ b/admin/helpers/headercheck.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		headercheck.php
@ -25,24 +25,36 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+
 class sermondistributorHeaderCheck
 {
+	protected $document = null;
+	protected $app = null;
+
 	function js_loaded($script_name)
 	{
 		// UIkit check point
 		if (strpos($script_name,'uikit') !== false)
 		{
-			$app            	= JFactory::getApplication();
-			$getTemplateName  	= $app->getTemplate('template')->template;
-			
+			if (!$this->app)
+			{
+				$this->app = Factory::getApplication();
+			}
+
+			$getTemplateName = $this->app->getTemplate('template')->template;
 			if (strpos($getTemplateName,'yoo') !== false)
 			{
 				return true;
 			}
 		}
-		
-		$document 	= JFactory::getDocument();
-		$head_data 	= $document->getHeadData();
+
+		if (!$this->document)
+		{
+			$this->document = Factory::getDocument();
+		}
+
+		$head_data = $this->document->getHeadData();
 		foreach (array_keys($head_data['scripts']) as $script)
 		{
 			if (stristr($script, $script_name))
@ -53,24 +65,30 @@ class sermondistributorHeaderCheck

 		return false;
 	}
-	
+
 	function css_loaded($script_name)
 	{
 		// UIkit check point
 		if (strpos($script_name,'uikit') !== false)
 		{
-			$app            	= JFactory::getApplication();
-			$getTemplateName  	= $app->getTemplate('template')->template;
-			
+			if (!$this->app)
+			{
+				$this->app = Factory::getApplication();
+			}
+
+			$getTemplateName = $this->app->getTemplate('template')->template;
 			if (strpos($getTemplateName,'yoo') !== false)
 			{
 				return true;
 			}
 		}
-		
-		$document 	= JFactory::getDocument();
-		$head_data 	= $document->getHeadData();
-		
+
+		if (!$this->document)
+		{
+			$this->document = Factory::getDocument();
+		}
+
+		$head_data = $this->document->getHeadData();
 		foreach (array_keys($head_data['styleSheets']) as $script)
 		{
 			if (stristr($script, $script_name))
@ -81,4 +99,4 @@ class sermondistributorHeaderCheck

 		return false;
 	}
-}
+}
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		batch_.php
@ -38,7 +38,7 @@ abstract class JHtmlBatch_
 	 * @var    array
 	 * @since  3.0
 	 */
-	protected static $ListSelection = array();
+	protected static $ListSelection = [];

 	/**
 	 * Render the batch selection options.
--- a/admin/helpers/sermondistributor.php
+++ b/admin/helpers/sermondistributor.php
--- a/admin/language/en-GB/en-GB.com_sermondistributor.ini
+++ b/admin/language/en-GB/en-GB.com_sermondistributor.ini
@ -1,7 +1,7 @@
 COM_SERMONDISTRIBUTOR="Sermon Distributor"
 COM_SERMONDISTRIBUTOR_ADD_THE_STRONGAPP_GENERATED_ACCESS_TOKENSTRONG_HERE="Add the <strong>App Generated access token</strong> here."
 COM_SERMONDISTRIBUTOR_ADD_TOKEN_HERE="ADD TOKEN HERE!"
-COM_SERMONDISTRIBUTOR_ALL_IS_GOOD_PLEASE_CHECK_AGAIN_LATTER="All is good, please check again latter."
+COM_SERMONDISTRIBUTOR_ALL_IS_GOOD_PLEASE_CHECK_AGAIN_LATER="All is good, please check again later"
 COM_SERMONDISTRIBUTOR_ALWAYS_BETTER_TO_ADD_THE_FILES_TO_EXTERNAL_SOURCE_AND_LET_THE_SYSTEM_CREATE_THE_SERMON_FOR_YOU_PLEASE_READ_INSTRUCTIONS_BELOW_CAREFULLY="Always better to add the files to External Source and let the system create the sermon for you. Please read instructions below carefully."
 COM_SERMONDISTRIBUTOR_ARCHIVED="Archived"
 COM_SERMONDISTRIBUTOR_ARE_YOU_SURE_YOU_WANT_TO_DELETE_CONFIRMING_WILL_PERMANENTLY_DELETE_THE_SELECTED_ITEMS="Are you sure you want to delete? Confirming will permanently delete the selected item(s)!"
@ -138,6 +138,10 @@ COM_SERMONDISTRIBUTOR_CONFIG_GREEN="Green"
 COM_SERMONDISTRIBUTOR_CONFIG_GRID="Grid"
 COM_SERMONDISTRIBUTOR_CONFIG_HTML_5_BASIC="HTML 5 (basic)"
 COM_SERMONDISTRIBUTOR_CONFIG_JPLAYER="jPlayer"
+COM_SERMONDISTRIBUTOR_CONFIG_JQUERY_LOAD="Load jQuery"
+COM_SERMONDISTRIBUTOR_CONFIG_JQUERY_LOAD_DESC="Would you like to load the Joomla jQuery Framework?"
+COM_SERMONDISTRIBUTOR_CONFIG_JQUERY_LOAD_LABEL="Load Joomla jQuery"
+COM_SERMONDISTRIBUTOR_CONFIG_JQUERY_REMOVE="Remove jQuery"
 COM_SERMONDISTRIBUTOR_CONFIG_LEGACY="Legacy"
 COM_SERMONDISTRIBUTOR_CONFIG_LINES="Lines"
 COM_SERMONDISTRIBUTOR_CONFIG_LIST="List"
@ -315,7 +319,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED="Spaced"
 COM_SERMONDISTRIBUTOR_CONFIG_STRIPED="Striped"
 COM_SERMONDISTRIBUTOR_CONFIG_TABLE="Table"
 COM_SERMONDISTRIBUTOR_CONFIG_UIKIT="Uikit"
-COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_DESC="<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end frameworkfor developing fast and powerful web interfaces. For more info visit <a href="https://getuikit.com/v2/" target="_blank">version 2</a> or <a href="https://getuikit.com/" target="_blank">version 3</a>"
+COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_DESC="<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end frameworkfor developing fast and powerful web interfaces. For more info visit <a href='https://getuikit.com/v2/' target='_blank'>version 2</a> or <a href='https://getuikit.com/' target='_blank'>version 3</a>"
 COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_LABEL="Uikit2 and Uikit3 Settings"
 COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_LOAD_DESC="Set the uikit loading option."
 COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_LOAD_LABEL="Loading Options"
@ -368,7 +372,7 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_ACCESS_DESC="Allows the users in this gro
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_OPTIONS="Batch process the selected External Sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_TIP="All changes will be applied to all selected External Sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_USE="External Sources Batch Use"
-COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch external sources"
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_CREATE="External Sources Create"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_CREATE_DESC="Allows the users in this group to create create external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DASHBOARD_ADD="External Sources Dashboard Add"
@ -388,7 +392,7 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_OWN_DESC="Allows the users in this g
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_STATE="External Sources Edit State"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_STATE_DESC="Allows the users in this group to update the state of the external source"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_VERSION="External Sources Edit Version"
-COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version external sources"
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EXPORT="External Sources Export"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EXPORT_DESC="Allows the users in this group to export export external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_IMPORT="External Sources Import"
@ -444,6 +448,7 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_DROPBOXOPTIONS_LABEL="Options"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_DYNAMIC_AUTOMATIC_BUILD="Dynamic Automatic Build"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_EDIT="Editing the External Source"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_ERROR_UNIQUE_ALIAS="Another External Source has the same alias."
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_ERROR_UNIQUE_ALIAS_TRASHED="A trashed External Source has the same alias ."
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_EXTERNALSOURCES_DESCRIPTION="Only one option at this time"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_EXTERNALSOURCES_LABEL="External Sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FILETYPES_DESCRIPTION="Select the file types you would like to use from this external sources."
@ -606,7 +611,7 @@ COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_ACCESS_DESC="Allows the users in this group
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_OPTIONS="Batch process the selected Help Documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_TIP="All changes will be applied to all selected Help Documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_USE="Help Documents Batch Use"
-COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch help documents"
+COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_CREATE="Help Documents Create"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_CREATE_DESC="Allows the users in this group to create create help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_DASHBOARD_LIST="Help Documents Dashboard List"
@ -620,7 +625,7 @@ COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_OWN_DESC="Allows the users in this gro
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_STATE="Help Documents Edit State"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_STATE_DESC="Allows the users in this group to update the state of the help document"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_VERSION="Help Documents Edit Version"
-COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version help documents"
+COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EXPORT="Help Documents Export"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EXPORT_DESC="Allows the users in this group to export export help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_IMPORT="Help Documents Import"
@ -661,6 +666,7 @@ COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_CREATED_DATE_LABEL="Created Date"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_DETAILS="Details"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_EDIT="Editing the Help Document"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ERROR_UNIQUE_ALIAS="Another Help Document has the same alias."
+COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Help Document has the same alias ."
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_GROUPS_DESCRIPTION="Select a group/s"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_GROUPS_LABEL="Group/s"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ID="Id"
@ -759,7 +765,7 @@ COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_ACCESS_DESC="Allows the users in this group
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_OPTIONS="Batch process the selected Local Listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_TIP="All changes will be applied to all selected Local Listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_USE="Local Listings Batch Use"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch local listings"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_CREATE="Local Listings Create"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_CREATE_DESC="Allows the users in this group to create create local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_DASHBOARD_LIST="Local Listings Dashboard List"
@ -789,7 +795,7 @@ COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_STATE_DESC="Allows the users in this g
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_URL="Local Listings Edit Url"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_URL_DESC="Allows the users in this group to edit url of local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_VERSION="Local Listings Edit Version"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version local listings"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EXPORT="Local Listings Export"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EXPORT_DESC="Allows the users in this group to export export local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_IMPORT="Local Listings Import"
@ -825,6 +831,7 @@ COM_SERMONDISTRIBUTOR_LOCAL_LISTING_DETAILS="Details"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTING_DYNAMIC_AUTOMATIC_BUILD="Dynamic Automatic Build"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTING_EDIT="Editing the Local Listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTING_ERROR_UNIQUE_ALIAS="Another Local Listing has the same alias."
+COM_SERMONDISTRIBUTOR_LOCAL_LISTING_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Local Listing has the same alias ."
 COM_SERMONDISTRIBUTOR_LOCAL_LISTING_EXTERNAL_SOURCE_DESCRIPTION="The external source of this listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTING_EXTERNAL_SOURCE_LABEL="External Source"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTING_ID="Id"
@ -888,6 +895,7 @@ COM_SERMONDISTRIBUTOR_OPENED_THIS="opened this"
 COM_SERMONDISTRIBUTOR_OPEN_ON_GITHUB="Open on Github"
 COM_SERMONDISTRIBUTOR_OUT_OF_DATE="Out of date"
 COM_SERMONDISTRIBUTOR_PLEASE_ADD_FILES_TO_S="Please add files to (%s)"
+COM_SERMONDISTRIBUTOR_PLEASE_CHECK_AGAIN_LATER="Please check again later"
 COM_SERMONDISTRIBUTOR_PLEASE_CHECK_AGAIN_LATTER="Please check again latter."
 COM_SERMONDISTRIBUTOR_PREACHER="Preacher"
 COM_SERMONDISTRIBUTOR_PREACHERS="Preachers"
@ -898,7 +906,7 @@ COM_SERMONDISTRIBUTOR_PREACHERS_ACCESS_SITE_DESC="Allows the users in this group
 COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_OPTIONS="Batch process the selected Preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_TIP="All changes will be applied to all selected Preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_USE="Preachers Batch Use"
-COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch preachers"
+COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_CREATE="Preachers Create"
 COM_SERMONDISTRIBUTOR_PREACHERS_CREATE_DESC="Allows the users in this group to create create preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_DASHBOARD_ADD="Preachers Dashboard Add"
@ -918,7 +926,7 @@ COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_OWN_DESC="Allows the users in this group to
 COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_STATE="Preachers Edit State"
 COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_STATE_DESC="Allows the users in this group to update the state of the preacher"
 COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_VERSION="Preachers Edit Version"
-COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version preachers"
+COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_EXPORT="Preachers Export"
 COM_SERMONDISTRIBUTOR_PREACHERS_EXPORT_DESC="Allows the users in this group to export export preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_IMPORT="Preachers Import"
@ -961,6 +969,7 @@ COM_SERMONDISTRIBUTOR_PREACHER_EMAIL_HINT="demo@example.com"
 COM_SERMONDISTRIBUTOR_PREACHER_EMAIL_LABEL="Email<br><small>not required</small>"
 COM_SERMONDISTRIBUTOR_PREACHER_EMAIL_MESSAGE="Error! Please add email address here."
 COM_SERMONDISTRIBUTOR_PREACHER_ERROR_UNIQUE_ALIAS="Another Preacher has the same alias."
+COM_SERMONDISTRIBUTOR_PREACHER_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Preacher has the same alias ."
 COM_SERMONDISTRIBUTOR_PREACHER_ICON_DESCRIPTION="Must be 358px x 358px"
 COM_SERMONDISTRIBUTOR_PREACHER_ICON_LABEL="Icon"
 COM_SERMONDISTRIBUTOR_PREACHER_ID="Id"
@ -1011,6 +1020,7 @@ COM_SERMONDISTRIBUTOR_SERIES_DESCRIPTION_LABEL="Description"
 COM_SERMONDISTRIBUTOR_SERIES_DETAILS="Details"
 COM_SERMONDISTRIBUTOR_SERIES_EDIT="Editing the Series"
 COM_SERMONDISTRIBUTOR_SERIES_ERROR_UNIQUE_ALIAS="Another Series has the same alias."
+COM_SERMONDISTRIBUTOR_SERIES_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Series has the same alias ."
 COM_SERMONDISTRIBUTOR_SERIES_ICON_DESCRIPTION="Must be 358px x 358px"
 COM_SERMONDISTRIBUTOR_SERIES_ICON_LABEL="Icon"
 COM_SERMONDISTRIBUTOR_SERIES_ID="Id"
@ -1022,7 +1032,7 @@ COM_SERMONDISTRIBUTOR_SERIES_LIST_ACCESS_SITE_DESC="Allows the users in this gro
 COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_OPTIONS="Batch process the selected Series List"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_TIP="All changes will be applied to all selected Series List"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_USE="Series List Batch Use"
-COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch series list"
+COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_CREATE="Series List Create"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_CREATE_DESC="Allows the users in this group to create create series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_DASHBOARD_ADD="Series List Dashboard Add"
@ -1042,7 +1052,7 @@ COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_OWN_DESC="Allows the users in this group
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_STATE="Series List Edit State"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_STATE_DESC="Allows the users in this group to update the state of the series"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_VERSION="Series List Edit Version"
-COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_VERSION_DESC="Allows users in this group to edit versions of version series list"
+COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EXPORT="Series List Export"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EXPORT_DESC="Allows the users in this group to export export series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_IMPORT="Series List Import"
@ -1096,7 +1106,7 @@ COM_SERMONDISTRIBUTOR_SERMONS_ACCESS_DESC="Allows the users in this group to acc
 COM_SERMONDISTRIBUTOR_SERMONS_BATCH_OPTIONS="Batch process the selected Sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_BATCH_TIP="All changes will be applied to all selected Sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_BATCH_USE="Sermons Batch Use"
-COM_SERMONDISTRIBUTOR_SERMONS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch sermons"
+COM_SERMONDISTRIBUTOR_SERMONS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_CREATE="Sermons Create"
 COM_SERMONDISTRIBUTOR_SERMONS_CREATE_DESC="Allows the users in this group to create create sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_DASHBOARD_ADD="Sermons Dashboard Add"
@ -1116,7 +1126,7 @@ COM_SERMONDISTRIBUTOR_SERMONS_EDIT_OWN_DESC="Allows the users in this group to e
 COM_SERMONDISTRIBUTOR_SERMONS_EDIT_STATE="Sermons Edit State"
 COM_SERMONDISTRIBUTOR_SERMONS_EDIT_STATE_DESC="Allows the users in this group to update the state of the sermon"
 COM_SERMONDISTRIBUTOR_SERMONS_EDIT_VERSION="Sermons Edit Version"
-COM_SERMONDISTRIBUTOR_SERMONS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version sermons"
+COM_SERMONDISTRIBUTOR_SERMONS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_EXPORT="Sermons Export"
 COM_SERMONDISTRIBUTOR_SERMONS_EXPORT_DESC="Allows the users in this group to export export sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_IMPORT="Sermons Import"
@ -1162,6 +1172,7 @@ COM_SERMONDISTRIBUTOR_SERMON_DYNAMIC_AUTOMATIC_BUILD="Dynamic Automatic Build"
 COM_SERMONDISTRIBUTOR_SERMON_EDIT="Editing the Sermon"
 COM_SERMONDISTRIBUTOR_SERMON_ENCRYPTED="Encrypted"
 COM_SERMONDISTRIBUTOR_SERMON_ERROR_UNIQUE_ALIAS="Another Sermon has the same alias."
+COM_SERMONDISTRIBUTOR_SERMON_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Sermon has the same alias ."
 COM_SERMONDISTRIBUTOR_SERMON_EXTERNAL_SOURCE="External Source"
 COM_SERMONDISTRIBUTOR_SERMON_FILES="Files"
 COM_SERMONDISTRIBUTOR_SERMON_ICON_DESCRIPTION="Must be 358px x 358px"
@ -1234,7 +1245,7 @@ COM_SERMONDISTRIBUTOR_STATISTICS_ACCESS_DESC="Allows the users in this group to
 COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_OPTIONS="Batch process the selected Statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_TIP="All changes will be applied to all selected Statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_USE="Statistics Batch Use"
-COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch statistics"
+COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_CREATE="Statistics Create"
 COM_SERMONDISTRIBUTOR_STATISTICS_CREATE_DESC="Allows the users in this group to create create statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_DASHBOARD_LIST="Statistics Dashboard List"
@ -1252,7 +1263,7 @@ COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_OWN_DESC="Allows the users in this group t
 COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_STATE="Statistics Edit State"
 COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_STATE_DESC="Allows the users in this group to update the state of the statistic"
 COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_VERSION="Statistics Edit Version"
-COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version statistics"
+COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_EXPORT="Statistics Export"
 COM_SERMONDISTRIBUTOR_STATISTICS_EXPORT_DESC="Allows the users in this group to export export statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_IMPORT="Statistics Import"
@ -1289,6 +1300,7 @@ COM_SERMONDISTRIBUTOR_STATISTIC_CREATED_DATE_LABEL="Created Date"
 COM_SERMONDISTRIBUTOR_STATISTIC_DETAILS="Details"
 COM_SERMONDISTRIBUTOR_STATISTIC_EDIT="Editing the Statistic"
 COM_SERMONDISTRIBUTOR_STATISTIC_ERROR_UNIQUE_ALIAS="Another Statistic has the same alias."
+COM_SERMONDISTRIBUTOR_STATISTIC_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Statistic has the same alias ."
 COM_SERMONDISTRIBUTOR_STATISTIC_FILENAME_DESCRIPTION="Enter the file name."
 COM_SERMONDISTRIBUTOR_STATISTIC_FILENAME_HINT="the_file_name.mp3"
 COM_SERMONDISTRIBUTOR_STATISTIC_FILENAME_LABEL="File Name"
--- a/admin/language/en-GB/en-GB.com_sermondistributor.sys.ini
+++ b/admin/language/en-GB/en-GB.com_sermondistributor.sys.ini
@ -15,7 +15,7 @@ COM_SERMONDISTRIBUTOR_EXPORT_DATA_DESC="Allows users in this group to export dat
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_ACCESS="External Sources Access"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_ACCESS_DESC="Allows the users in this group to access access external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_USE="External Sources Batch Use"
-COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch external sources"
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_CREATE="External Sources Create"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_CREATE_DESC="Allows the users in this group to create create external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DASHBOARD_ADD="External Sources Dashboard Add"
@ -35,7 +35,7 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_OWN_DESC="Allows the users in this g
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_STATE="External Sources Edit State"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_STATE_DESC="Allows the users in this group to update the state of the external source"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_VERSION="External Sources Edit Version"
-COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version external sources"
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EXPORT="External Sources Export"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EXPORT_DESC="Allows the users in this group to export export external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_IMPORT="External Sources Import"
@ -49,7 +49,7 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_RESET_UPDATE_STATUS_BUTTON_ACCESS_DESC="Al
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_ACCESS="Help Documents Access"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_ACCESS_DESC="Allows the users in this group to access access help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_USE="Help Documents Batch Use"
-COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch help documents"
+COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_CREATE="Help Documents Create"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_CREATE_DESC="Allows the users in this group to create create help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_DASHBOARD_LIST="Help Documents Dashboard List"
@ -63,7 +63,7 @@ COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_OWN_DESC="Allows the users in this gro
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_STATE="Help Documents Edit State"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_STATE_DESC="Allows the users in this group to update the state of the help document"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_VERSION="Help Documents Edit Version"
-COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version help documents"
+COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EXPORT="Help Documents Export"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EXPORT_DESC="Allows the users in this group to export export help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_IMPORT="Help Documents Import"
@ -75,7 +75,7 @@ COM_SERMONDISTRIBUTOR_IMPORT_DATA_DESC="Allows users in this group to import dat
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_ACCESS="Local Listings Access"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_ACCESS_DESC="Allows the users in this group to access access local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_USE="Local Listings Batch Use"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch local listings"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_CREATE="Local Listings Create"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_CREATE_DESC="Allows the users in this group to create create local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_DASHBOARD_LIST="Local Listings Dashboard List"
@ -105,7 +105,7 @@ COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_STATE_DESC="Allows the users in this g
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_URL="Local Listings Edit Url"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_URL_DESC="Allows the users in this group to edit url of local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_VERSION="Local Listings Edit Version"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version local listings"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EXPORT="Local Listings Export"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EXPORT_DESC="Allows the users in this group to export export local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_IMPORT="Local Listings Import"
@ -147,7 +147,7 @@ COM_SERMONDISTRIBUTOR_PREACHERS_ACCESS_DESC="Allows the users in this group to a
 COM_SERMONDISTRIBUTOR_PREACHERS_ACCESS_SITE="Preachers (Site) Access"
 COM_SERMONDISTRIBUTOR_PREACHERS_ACCESS_SITE_DESC="Allows the users in this group to access site preachers."
 COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_USE="Preachers Batch Use"
-COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch preachers"
+COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_CREATE="Preachers Create"
 COM_SERMONDISTRIBUTOR_PREACHERS_CREATE_DESC="Allows the users in this group to create create preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_DASHBOARD_ADD="Preachers Dashboard Add"
@ -167,7 +167,7 @@ COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_OWN_DESC="Allows the users in this group to
 COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_STATE="Preachers Edit State"
 COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_STATE_DESC="Allows the users in this group to update the state of the preacher"
 COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_VERSION="Preachers Edit Version"
-COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version preachers"
+COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_EXPORT="Preachers Export"
 COM_SERMONDISTRIBUTOR_PREACHERS_EXPORT_DESC="Allows the users in this group to export export preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_IMPORT="Preachers Import"
@ -183,7 +183,7 @@ COM_SERMONDISTRIBUTOR_SERIES_LIST_ACCESS_DESC="Allows the users in this group to
 COM_SERMONDISTRIBUTOR_SERIES_LIST_ACCESS_SITE="Series List (Site) Access"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_ACCESS_SITE_DESC="Allows the users in this group to access site series list."
 COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_USE="Series List Batch Use"
-COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch series list"
+COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_CREATE="Series List Create"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_CREATE_DESC="Allows the users in this group to create create series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_DASHBOARD_ADD="Series List Dashboard Add"
@ -203,7 +203,7 @@ COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_OWN_DESC="Allows the users in this group
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_STATE="Series List Edit State"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_STATE_DESC="Allows the users in this group to update the state of the series"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_VERSION="Series List Edit Version"
-COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_VERSION_DESC="Allows users in this group to edit versions of version series list"
+COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EXPORT="Series List Export"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EXPORT_DESC="Allows the users in this group to export export series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_IMPORT="Series List Import"
@ -213,7 +213,7 @@ COM_SERMONDISTRIBUTOR_SERIES_LIST_SUBMENU_DESC="Allows the users in this group t
 COM_SERMONDISTRIBUTOR_SERMONS_ACCESS="Sermons Access"
 COM_SERMONDISTRIBUTOR_SERMONS_ACCESS_DESC="Allows the users in this group to access access sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_BATCH_USE="Sermons Batch Use"
-COM_SERMONDISTRIBUTOR_SERMONS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch sermons"
+COM_SERMONDISTRIBUTOR_SERMONS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_CREATE="Sermons Create"
 COM_SERMONDISTRIBUTOR_SERMONS_CREATE_DESC="Allows the users in this group to create create sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_DASHBOARD_ADD="Sermons Dashboard Add"
@ -233,7 +233,7 @@ COM_SERMONDISTRIBUTOR_SERMONS_EDIT_OWN_DESC="Allows the users in this group to e
 COM_SERMONDISTRIBUTOR_SERMONS_EDIT_STATE="Sermons Edit State"
 COM_SERMONDISTRIBUTOR_SERMONS_EDIT_STATE_DESC="Allows the users in this group to update the state of the sermon"
 COM_SERMONDISTRIBUTOR_SERMONS_EDIT_VERSION="Sermons Edit Version"
-COM_SERMONDISTRIBUTOR_SERMONS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version sermons"
+COM_SERMONDISTRIBUTOR_SERMONS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_EXPORT="Sermons Export"
 COM_SERMONDISTRIBUTOR_SERMONS_EXPORT_DESC="Allows the users in this group to export export sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_IMPORT="Sermons Import"
@ -245,7 +245,7 @@ COM_SERMONDISTRIBUTOR_SERMON_ACCESS_SITE_DESC="Allows the users in this group to
 COM_SERMONDISTRIBUTOR_STATISTICS_ACCESS="Statistics Access"
 COM_SERMONDISTRIBUTOR_STATISTICS_ACCESS_DESC="Allows the users in this group to access access statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_USE="Statistics Batch Use"
-COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch statistics"
+COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_CREATE="Statistics Create"
 COM_SERMONDISTRIBUTOR_STATISTICS_CREATE_DESC="Allows the users in this group to create create statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_DASHBOARD_LIST="Statistics Dashboard List"
@ -263,7 +263,7 @@ COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_OWN_DESC="Allows the users in this group t
 COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_STATE="Statistics Edit State"
 COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_STATE_DESC="Allows the users in this group to update the state of the statistic"
 COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_VERSION="Statistics Edit Version"
-COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version statistics"
+COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_EXPORT="Statistics Export"
 COM_SERMONDISTRIBUTOR_STATISTICS_EXPORT_DESC="Allows the users in this group to export export statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_IMPORT="Statistics Import"
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		batchselection.php
@ -25,6 +25,7 @@
 // No direct access to this file
 defined('JPATH_BASE') or die;

+use Joomla\CMS\Language\Text;
 JHtmlBehavior::core();
 $divWrapper = range(1,120,2);
 $counter = 0;
@ -32,8 +33,8 @@ $counter = 0;
 <?php if ($displayData->ListSelection) : ?>
 <div class="row-fluid">
 	<?php foreach ($displayData->ListSelection as $ListSelection) : ?>
-    <div class="control-group span6">
-    	<div class="controls">
+	<div class="control-group span6">
+		<div class="controls">
 		<label for="<?php echo $ListSelection['name']; ?>" class="element-invisible"><?php echo $ListSelection['label']; ?></label>
 		<select name="<?php echo $ListSelection['name']; ?>" id="<?php echo $ListSelection['name']; ?>" class="span12 small">
 			<?php if (!$ListSelection['noDefault']) : ?>
@ -41,21 +42,21 @@ $counter = 0;
 			<?php endif; ?>
 			<?php echo $ListSelection['options']; ?>
 		</select>
-      	</div>
+		  </div>
 	</div>
 		<?php if (in_array($counter,$divWrapper)) : ?>
 </div>
 <div class="row-fluid">
 		<?php endif; ?>
-        <?php $counter++; ?>
+		<?php $counter++; ?>
 	<?php endforeach; ?>
 </div>
 <div class="control-group radio" id="batch-move-copy">
 	<div class="controls">
-        <label class="radio" id="batch[move_copy]c-lbl" for="batch[move_copy]c">
-        <input type="radio" value="c" id="batch[move_copy]c" name="batch[move_copy]"><?php echo JText::_('Copy'); ?></label>
-        <label class="radio" id="batch[move_copy]m-lbl" for="batch[move_copy]m">
-        <input type="radio" checked="checked" value="m" id="batch[move_copy]m" name="batch[move_copy]"><?php echo JText::_('Update'); ?></label>
-    </div>
+		<label class="radio" id="batch[move_copy]c-lbl" for="batch[move_copy]c">
+		<input type="radio" value="c" id="batch[move_copy]c" name="batch[move_copy]"><?php echo Text::_('Copy'); ?></label>
+		<label class="radio" id="batch[move_copy]m-lbl" for="batch[move_copy]m">
+		<input type="radio" checked="checked" value="m" id="batch[move_copy]m" name="batch[move_copy]"><?php echo Text::_('Update'); ?></label>
+	</div>
 </div>
 <?php endif; ?>
--- a/admin/layouts/external_source/build_option_fullwidth.php
+++ b/admin/layouts/external_source/build_option_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		build_option_fullwidth.php
@ -44,7 +44,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_auto_externalsource'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/external_source/details_above.php
+++ b/admin/layouts/external_source/details_above.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php
@ -43,7 +43,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'externalsources'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/external_source/details_fullwidth.php
+++ b/admin/layouts/external_source/details_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php
@ -44,7 +44,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'apicronjob_note'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/external_source/details_left.php
+++ b/admin/layouts/external_source/details_left.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php
@ -46,7 +46,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'dropboxoptions'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/external_source/details_right.php
+++ b/admin/layouts/external_source/details_right.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php
@ -44,7 +44,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'filetypes'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/external_source/details_under.php
+++ b/admin/layouts/external_source/details_under.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_under.php
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'not_required'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/external_source/publishing.php
+++ b/admin/layouts/external_source/publishing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php
@ -46,7 +46,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'modified_by'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/external_source/publlshing.php
+++ b/admin/layouts/external_source/publlshing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publlshing.php
@ -46,7 +46,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'id'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/help_document/details_above.php
+++ b/admin/layouts/help_document/details_above.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php
@ -43,7 +43,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'alias'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/help_document/details_fullwidth.php
+++ b/admin/layouts/help_document/details_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'content'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/help_document/details_left.php
+++ b/admin/layouts/help_document/details_left.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php
@ -46,7 +46,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'site_view'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/help_document/details_right.php
+++ b/admin/layouts/help_document/details_right.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php
@ -44,7 +44,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'article'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/help_document/details_under.php
+++ b/admin/layouts/help_document/details_under.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_under.php
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'not_required'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/help_document/metadata.php
+++ b/admin/layouts/help_document/metadata.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		metadata.php
@ -25,6 +25,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Language\Text;
+
 $form = $displayData->getForm();

 // JLayout for standard handling of metadata fields in the administrator content edit screens.
@ -33,7 +35,7 @@ $fieldSets = $form->getFieldsets('metadata');

 <?php foreach ($fieldSets as $name => $fieldSet) : ?>
 	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
-		<p class="alert alert-info"><?php echo $this->escape(JText::_($fieldSet->description)); ?></p>
+		<p class="alert alert-info"><?php echo $this->escape(Text::_($fieldSet->description)); ?></p>
 	<?php endif; ?>

 	<?php
--- a/admin/layouts/help_document/publishing.php
+++ b/admin/layouts/help_document/publishing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php
@ -51,7 +51,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'id'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/local_listing/details_above.php
+++ b/admin/layouts/local_listing/details_above.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php
@ -43,7 +43,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'size'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/local_listing/details_fullwidth.php
+++ b/admin/layouts/local_listing/details_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php
@ -43,7 +43,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'url'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/local_listing/details_left.php
+++ b/admin/layouts/local_listing/details_left.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'external_source'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/local_listing/details_right.php
+++ b/admin/layouts/local_listing/details_right.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'build'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/local_listing/publishing.php
+++ b/admin/layouts/local_listing/publishing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php
@ -46,7 +46,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'modified_by'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/local_listing/publlshing.php
+++ b/admin/layouts/local_listing/publlshing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publlshing.php
@ -46,7 +46,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'id'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/preacher/details_above.php
+++ b/admin/layouts/preacher/details_above.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php
@ -43,7 +43,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'alias'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/preacher/details_fullwidth.php
+++ b/admin/layouts/preacher/details_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'description'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/preacher/details_left.php
+++ b/admin/layouts/preacher/details_left.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'icon'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/preacher/details_right.php
+++ b/admin/layouts/preacher/details_right.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php
@ -43,7 +43,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'website'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/preacher/metadata.php
+++ b/admin/layouts/preacher/metadata.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		metadata.php
@ -25,6 +25,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Language\Text;
+
 $form = $displayData->getForm();

 // JLayout for standard handling of metadata fields in the administrator content edit screens.
@ -33,7 +35,7 @@ $fieldSets = $form->getFieldsets('metadata');

 <?php foreach ($fieldSets as $name => $fieldSet) : ?>
 	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
-		<p class="alert alert-info"><?php echo $this->escape(JText::_($fieldSet->description)); ?></p>
+		<p class="alert alert-info"><?php echo $this->escape(Text::_($fieldSet->description)); ?></p>
 	<?php endif; ?>

 	<?php
--- a/admin/layouts/preacher/publishing.php
+++ b/admin/layouts/preacher/publishing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php
@ -52,7 +52,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'id'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/preacher/sermons_fullwidth.php
+++ b/admin/layouts/preacher/sermons_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		sermons_fullwidth.php
@ -25,22 +25,28 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+
 // set the defaults
 $items = $displayData->vvvsermons;
-$user = JFactory::getUser();
+$user = Factory::getUser();
 $id = $displayData->item->id;
 // set the edit URL
 $edit = "index.php?option=com_sermondistributor&view=sermons&task=sermon.edit";
 // set a return value
 $return = ($id) ? "index.php?option=com_sermondistributor&view=preacher&layout=edit&id=" . $id : "";
 // check for a return value
-$jinput = JFactory::getApplication()->input;
+$jinput = Factory::getApplication()->input;
 if ($_return = $jinput->get('return', null, 'base64'))
 {
 	$return .= "&return=" . $_return;
 }
 // check if return value was set
-if (SermondistributorHelper::checkString($return))
+if (StringHelper::check($return))
 {
 	// set the referral values
 	$ref = ($id) ? "&ref=preacher&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return));
@ -60,40 +66,40 @@ $can = SermondistributorHelper::getActions('sermon');
 <div class="form-vertical">
 <?php if ($can->get('sermon.create')): ?>
 	<div class="btn-group">
-		<a class="btn btn-small btn-success" href="<?php echo $new; ?>"><span class="icon-new icon-white"></span> <?php echo JText::_('COM_SERMONDISTRIBUTOR_NEW'); ?></a>
-		<a class="btn btn-small" onclick="Joomla.submitbutton('preacher.cancel');" href="<?php echo $close_new; ?>"><span class="icon-new"></span> <?php echo JText::_('COM_SERMONDISTRIBUTOR_CLOSE_NEW'); ?></a>
+		<a class="btn btn-small btn-success" href="<?php echo $new; ?>"><span class="icon-new icon-white"></span> <?php echo Text::_('COM_SERMONDISTRIBUTOR_NEW'); ?></a>
+		<a class="btn btn-small" onclick="Joomla.submitbutton('preacher.cancel');" href="<?php echo $close_new; ?>"><span class="icon-new"></span> <?php echo Text::_('COM_SERMONDISTRIBUTOR_CLOSE_NEW'); ?></a>
 	</div><br /><br />
 <?php endif; ?>
-<?php if (SermondistributorHelper::checkArray($items)): ?>
+<?php if (ArrayHelper::check($items)): ?>
 <table class="footable table data sermons metro-blue" data-page-size="20" data-filter="#filter_sermons">
 <thead>
 	<tr>
 		<th data-toggle="true">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_NAME_LABEL'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_NAME_LABEL'); ?>
 		</th>
 		<th data-hide="phone">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_PREACHER_LABEL'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_PREACHER_LABEL'); ?>
 		</th>
 		<th data-hide="phone">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_SERIES_LABEL'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_SERIES_LABEL'); ?>
 		</th>
 		<th data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_SHORT_DESCRIPTION_LABEL'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_SHORT_DESCRIPTION_LABEL'); ?>
 		</th>
 		<th data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_SERMONS_CATEGORIES'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_SERMONS_CATEGORIES'); ?>
 		</th>
 		<th data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_LINK_TYPE_LABEL'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_LINK_TYPE_LABEL'); ?>
 		</th>
 		<th data-hide="all">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_SOURCE_LABEL'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_SOURCE_LABEL'); ?>
 		</th>
 		<th width="10" data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_STATUS'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_STATUS'); ?>
 		</th>
 		<th width="5" data-type="numeric" data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_ID'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_ID'); ?>
 		</th>
 	</tr>
 </thead>
@ -101,7 +107,7 @@ $can = SermondistributorHelper::getActions('sermon');
 <?php foreach ($items as $i => $item): ?>
 	<?php
 		$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0;
-		$userChkOut = JFactory::getUser($item->checked_out);
+		$userChkOut = Factory::getUser($item->checked_out);
 		$canDo = SermondistributorHelper::getActions('sermon',$item,'sermons');
 	?>
 	<tr>
@ -109,7 +115,7 @@ $can = SermondistributorHelper::getActions('sermon');
 			<?php if ($canDo->get('sermon.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?><?php echo $ref; ?>"><?php echo $displayData->escape($item->name); ?></a>
 				<?php if ($item->checked_out): ?>
-					<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'sermons.', $canCheckin); ?>
+					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'sermons.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
 				<?php echo $displayData->escape($item->name); ?>
@ -136,33 +142,33 @@ $can = SermondistributorHelper::getActions('sermon');
 			<?php endif; ?>
 		</td>
 		<td>
-			<?php echo JText::_($item->link_type); ?>
+			<?php echo Text::_($item->link_type); ?>
 		</td>
 		<td>
-			<?php echo JText::_($item->source); ?>
+			<?php echo Text::_($item->source); ?>
 		</td>
 		<?php if ($item->published == 1): ?>
 			<td class="center"  data-value="1">
-				<span class="status-metro status-published" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_PUBLISHED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_PUBLISHED'); ?>
+				<span class="status-metro status-published" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_PUBLISHED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_PUBLISHED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 0): ?>
 			<td class="center"  data-value="2">
-				<span class="status-metro status-inactive" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_INACTIVE');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_INACTIVE'); ?>
+				<span class="status-metro status-inactive" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_INACTIVE');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_INACTIVE'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 2): ?>
 			<td class="center"  data-value="3">
-				<span class="status-metro status-archived" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_ARCHIVED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_ARCHIVED'); ?>
+				<span class="status-metro status-archived" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_ARCHIVED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_ARCHIVED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == -2): ?>
 			<td class="center"  data-value="4">
-				<span class="status-metro status-trashed" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_TRASHED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_TRASHED'); ?>
+				<span class="status-metro status-trashed" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_TRASHED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_TRASHED'); ?>
 				</span>
 			</td>
 		<?php endif; ?>
@ -182,7 +188,7 @@ $can = SermondistributorHelper::getActions('sermon');
 </table>
 <?php else: ?>
 	<div class="alert alert-no-items">
-		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 	</div>
 <?php endif; ?>
 </div>
--- a/admin/layouts/series/details_above.php
+++ b/admin/layouts/series/details_above.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php
@ -43,7 +43,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'alias'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/series/details_fullwidth.php
+++ b/admin/layouts/series/details_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'description'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/series/details_left.php
+++ b/admin/layouts/series/details_left.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'icon'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/series/details_right.php
+++ b/admin/layouts/series/details_right.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'scripture'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/series/metadata.php
+++ b/admin/layouts/series/metadata.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		metadata.php
@ -25,6 +25,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Language\Text;
+
 $form = $displayData->getForm();

 // JLayout for standard handling of metadata fields in the administrator content edit screens.
@ -33,7 +35,7 @@ $fieldSets = $form->getFieldsets('metadata');

 <?php foreach ($fieldSets as $name => $fieldSet) : ?>
 	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
-		<p class="alert alert-info"><?php echo $this->escape(JText::_($fieldSet->description)); ?></p>
+		<p class="alert alert-info"><?php echo $this->escape(Text::_($fieldSet->description)); ?></p>
 	<?php endif; ?>

 	<?php
--- a/admin/layouts/series/publishing.php
+++ b/admin/layouts/series/publishing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php
@ -52,7 +52,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'id'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/series/sermons_fullwidth.php
+++ b/admin/layouts/series/sermons_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		sermons_fullwidth.php
@ -25,22 +25,28 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+
 // set the defaults
 $items = $displayData->vwcsermons;
-$user = JFactory::getUser();
+$user = Factory::getUser();
 $id = $displayData->item->id;
 // set the edit URL
 $edit = "index.php?option=com_sermondistributor&view=sermons&task=sermon.edit";
 // set a return value
 $return = ($id) ? "index.php?option=com_sermondistributor&view=series&layout=edit&id=" . $id : "";
 // check for a return value
-$jinput = JFactory::getApplication()->input;
+$jinput = Factory::getApplication()->input;
 if ($_return = $jinput->get('return', null, 'base64'))
 {
 	$return .= "&return=" . $_return;
 }
 // check if return value was set
-if (SermondistributorHelper::checkString($return))
+if (StringHelper::check($return))
 {
 	// set the referral values
 	$ref = ($id) ? "&ref=series&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return));
@ -57,38 +63,38 @@ $can = SermondistributorHelper::getActions('sermon');
 ?>
 <div class="form-vertical">
 <?php if ($can->get('sermon.create')): ?>
-	<a class="btn btn-small btn-success" href="<?php echo $new; ?>"><span class="icon-new icon-white"></span> <?php echo JText::_('COM_SERMONDISTRIBUTOR_NEW'); ?></a><br /><br />
+	<a class="btn btn-small btn-success" href="<?php echo $new; ?>"><span class="icon-new icon-white"></span> <?php echo Text::_('COM_SERMONDISTRIBUTOR_NEW'); ?></a><br /><br />
 <?php endif; ?>
-<?php if (SermondistributorHelper::checkArray($items)): ?>
+<?php if (ArrayHelper::check($items)): ?>
 <table class="footable table data sermons metro-blue" data-page-size="20" data-filter="#filter_sermons">
 <thead>
 	<tr>
 		<th data-toggle="true">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_NAME_LABEL'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_NAME_LABEL'); ?>
 		</th>
 		<th data-hide="phone">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_PREACHER_LABEL'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_PREACHER_LABEL'); ?>
 		</th>
 		<th data-hide="phone">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_SERIES_LABEL'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_SERIES_LABEL'); ?>
 		</th>
 		<th data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_SHORT_DESCRIPTION_LABEL'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_SHORT_DESCRIPTION_LABEL'); ?>
 		</th>
 		<th data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_SERMONS_CATEGORIES'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_SERMONS_CATEGORIES'); ?>
 		</th>
 		<th data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_LINK_TYPE_LABEL'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_LINK_TYPE_LABEL'); ?>
 		</th>
 		<th data-hide="all">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_SOURCE_LABEL'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_SOURCE_LABEL'); ?>
 		</th>
 		<th width="10" data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_STATUS'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_STATUS'); ?>
 		</th>
 		<th width="5" data-type="numeric" data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_ID'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_ID'); ?>
 		</th>
 	</tr>
 </thead>
@ -96,7 +102,7 @@ $can = SermondistributorHelper::getActions('sermon');
 <?php foreach ($items as $i => $item): ?>
 	<?php
 		$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0;
-		$userChkOut = JFactory::getUser($item->checked_out);
+		$userChkOut = Factory::getUser($item->checked_out);
 		$canDo = SermondistributorHelper::getActions('sermon',$item,'sermons');
 	?>
 	<tr>
@ -104,7 +110,7 @@ $can = SermondistributorHelper::getActions('sermon');
 			<?php if ($canDo->get('sermon.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?><?php echo $ref; ?>"><?php echo $displayData->escape($item->name); ?></a>
 				<?php if ($item->checked_out): ?>
-					<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'sermons.', $canCheckin); ?>
+					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'sermons.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
 				<?php echo $displayData->escape($item->name); ?>
@ -131,33 +137,33 @@ $can = SermondistributorHelper::getActions('sermon');
 			<?php endif; ?>
 		</td>
 		<td>
-			<?php echo JText::_($item->link_type); ?>
+			<?php echo Text::_($item->link_type); ?>
 		</td>
 		<td>
-			<?php echo JText::_($item->source); ?>
+			<?php echo Text::_($item->source); ?>
 		</td>
 		<?php if ($item->published == 1): ?>
 			<td class="center"  data-value="1">
-				<span class="status-metro status-published" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_PUBLISHED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_PUBLISHED'); ?>
+				<span class="status-metro status-published" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_PUBLISHED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_PUBLISHED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 0): ?>
 			<td class="center"  data-value="2">
-				<span class="status-metro status-inactive" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_INACTIVE');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_INACTIVE'); ?>
+				<span class="status-metro status-inactive" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_INACTIVE');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_INACTIVE'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 2): ?>
 			<td class="center"  data-value="3">
-				<span class="status-metro status-archived" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_ARCHIVED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_ARCHIVED'); ?>
+				<span class="status-metro status-archived" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_ARCHIVED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_ARCHIVED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == -2): ?>
 			<td class="center"  data-value="4">
-				<span class="status-metro status-trashed" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_TRASHED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_TRASHED'); ?>
+				<span class="status-metro status-trashed" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_TRASHED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_TRASHED'); ?>
 				</span>
 			</td>
 		<?php endif; ?>
@ -177,7 +183,7 @@ $can = SermondistributorHelper::getActions('sermon');
 </table>
 <?php else: ?>
 	<div class="alert alert-no-items">
-		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 	</div>
 <?php endif; ?>
 </div>
--- a/admin/layouts/sermon/details_above.php
+++ b/admin/layouts/sermon/details_above.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php
@ -44,7 +44,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'preacher'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/sermon/details_fullwidth.php
+++ b/admin/layouts/sermon/details_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'description'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/sermon/details_left.php
+++ b/admin/layouts/sermon/details_left.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php
@ -44,7 +44,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'icon'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/sermon/details_right.php
+++ b/admin/layouts/sermon/details_right.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php
@ -44,7 +44,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'tags'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/sermon/details_under.php
+++ b/admin/layouts/sermon/details_under.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_under.php
@ -43,7 +43,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'auto_sermons'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/sermon/files_fullwidth.php
+++ b/admin/layouts/sermon/files_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		files_fullwidth.php
@ -51,7 +51,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'url'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/sermon/metadata.php
+++ b/admin/layouts/sermon/metadata.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		metadata.php
@ -25,6 +25,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Language\Text;
+
 $form = $displayData->getForm();

 // JLayout for standard handling of metadata fields in the administrator content edit screens.
@ -33,7 +35,7 @@ $fieldSets = $form->getFieldsets('metadata');

 <?php foreach ($fieldSets as $name => $fieldSet) : ?>
 	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
-		<p class="alert alert-info"><?php echo $this->escape(JText::_($fieldSet->description)); ?></p>
+		<p class="alert alert-info"><?php echo $this->escape(Text::_($fieldSet->description)); ?></p>
 	<?php endif; ?>

 	<?php
--- a/admin/layouts/sermon/publishing.php
+++ b/admin/layouts/sermon/publishing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php
@ -52,7 +52,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'id'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/sermon/stastics_fullwidth.php
+++ b/admin/layouts/sermon/stastics_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		stastics_fullwidth.php
@ -25,22 +25,28 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+
 // set the defaults
 $items = $displayData->vwbstastics;
-$user = JFactory::getUser();
+$user = Factory::getUser();
 $id = $displayData->item->id;
 // set the edit URL
 $edit = "index.php?option=com_sermondistributor&view=statistics&task=statistic.edit";
 // set a return value
 $return = ($id) ? "index.php?option=com_sermondistributor&view=sermon&layout=edit&id=" . $id : "";
 // check for a return value
-$jinput = JFactory::getApplication()->input;
+$jinput = Factory::getApplication()->input;
 if ($_return = $jinput->get('return', null, 'base64'))
 {
 	$return .= "&return=" . $_return;
 }
 // check if return value was set
-if (SermondistributorHelper::checkString($return))
+if (StringHelper::check($return))
 {
 	// set the referral values
 	$ref = ($id) ? "&ref=sermon&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return));
@ -52,30 +58,30 @@ else

 ?>
 <div class="form-vertical">
-<?php if (SermondistributorHelper::checkArray($items)): ?>
+<?php if (ArrayHelper::check($items)): ?>
 <table class="footable table data statistics metro-blue" data-page-size="20" data-filter="#filter_statistics">
 <thead>
 	<tr>
 		<th data-toggle="true">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_STATISTIC_FILENAME_LABEL'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_STATISTIC_FILENAME_LABEL'); ?>
 		</th>
 		<th data-hide="phone">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_STATISTIC_SERMON_LABEL'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_STATISTIC_SERMON_LABEL'); ?>
 		</th>
 		<th data-hide="phone">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_STATISTIC_PREACHER_LABEL'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_STATISTIC_PREACHER_LABEL'); ?>
 		</th>
 		<th data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_STATISTIC_SERIES_LABEL'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_STATISTIC_SERIES_LABEL'); ?>
 		</th>
 		<th data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_STATISTIC_COUNTER_LABEL'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_STATISTIC_COUNTER_LABEL'); ?>
 		</th>
 		<th width="10" data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_STATISTIC_STATUS'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_STATISTIC_STATUS'); ?>
 		</th>
 		<th width="5" data-type="numeric" data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_STATISTIC_ID'); ?>
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_STATISTIC_ID'); ?>
 		</th>
 	</tr>
 </thead>
@ -83,7 +89,7 @@ else
 <?php foreach ($items as $i => $item): ?>
 	<?php
 		$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0;
-		$userChkOut = JFactory::getUser($item->checked_out);
+		$userChkOut = Factory::getUser($item->checked_out);
 		$canDo = SermondistributorHelper::getActions('statistic',$item,'statistics');
 	?>
 	<tr>
@ -91,7 +97,7 @@ else
 			<?php if ($canDo->get('statistic.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?><?php echo $ref; ?>"><?php echo $item->filename; ?></a>
 				<?php if ($item->checked_out): ?>
-					<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'statistics.', $canCheckin); ?>
+					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'statistics.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
 				<?php echo $item->filename; ?>
@ -119,26 +125,26 @@ else
 		</td>
 		<?php if ($item->published == 1): ?>
 			<td class="center"  data-value="1">
-				<span class="status-metro status-published" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_PUBLISHED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_PUBLISHED'); ?>
+				<span class="status-metro status-published" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_PUBLISHED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_PUBLISHED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 0): ?>
 			<td class="center"  data-value="2">
-				<span class="status-metro status-inactive" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_INACTIVE');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_INACTIVE'); ?>
+				<span class="status-metro status-inactive" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_INACTIVE');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_INACTIVE'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 2): ?>
 			<td class="center"  data-value="3">
-				<span class="status-metro status-archived" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_ARCHIVED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_ARCHIVED'); ?>
+				<span class="status-metro status-archived" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_ARCHIVED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_ARCHIVED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == -2): ?>
 			<td class="center"  data-value="4">
-				<span class="status-metro status-trashed" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_TRASHED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_TRASHED'); ?>
+				<span class="status-metro status-trashed" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_TRASHED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_TRASHED'); ?>
 				</span>
 			</td>
 		<?php endif; ?>
@ -158,7 +164,7 @@ else
 </table>
 <?php else: ?>
 	<div class="alert alert-no-items">
-		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 	</div>
 <?php endif; ?>
 </div>
--- a/admin/layouts/statistic/details_above.php
+++ b/admin/layouts/statistic/details_above.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php
@ -43,7 +43,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'sermon'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/statistic/details_left.php
+++ b/admin/layouts/statistic/details_left.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php
@ -43,7 +43,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'series'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/statistic/details_right.php
+++ b/admin/layouts/statistic/details_right.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'counter'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/statistic/metadata.php
+++ b/admin/layouts/statistic/metadata.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		metadata.php
@ -25,6 +25,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Language\Text;
+
 $form = $displayData->getForm();

 // JLayout for standard handling of metadata fields in the administrator content edit screens.
@ -33,7 +35,7 @@ $fieldSets = $form->getFieldsets('metadata');

 <?php foreach ($fieldSets as $name => $fieldSet) : ?>
 	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
-		<p class="alert alert-info"><?php echo $this->escape(JText::_($fieldSet->description)); ?></p>
+		<p class="alert alert-info"><?php echo $this->escape(Text::_($fieldSet->description)); ?></p>
 	<?php endif; ?>

 	<?php
--- a/admin/layouts/statistic/publishing.php
+++ b/admin/layouts/statistic/publishing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php
@ -52,7 +52,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'id'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/trashhelper.php
+++ b/admin/layouts/trashhelper.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		trashhelper.php
@ -25,6 +25,11 @@
 // No direct access to this file
 defined('JPATH_BASE') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+


 ?>
@ -39,7 +44,7 @@ defined('JPATH_BASE') or die('Restricted access');
 				document.adminForm.elements['checkall-toggle'].checked=1;
 				Joomla.checkAll(document.adminForm.elements['checkall-toggle']);
 				// check to confirm the deletion
-				if(confirm('<?= JText::_("COM_SERMONDISTRIBUTOR_ARE_YOU_SURE_YOU_WANT_TO_DELETE_CONFIRMING_WILL_PERMANENTLY_DELETE_THE_SELECTED_ITEMS") ?>')) {
+				if(confirm('<?= Text::_("COM_SERMONDISTRIBUTOR_ARE_YOU_SURE_YOU_WANT_TO_DELETE_CONFIRMING_WILL_PERMANENTLY_DELETE_THE_SELECTED_ITEMS") ?>')) {
 					Joomla.submitbutton('<?= $displayData->get("name") ?>.delete');
 				} else {
 					document.adminForm.elements['checkall-toggle'].checked=0;
@ -47,7 +52,7 @@ defined('JPATH_BASE') or die('Restricted access');
 				}
 			} else {
 				// confirm deletion of those selected
-				if (confirm('<?= JText::_("COM_SERMONDISTRIBUTOR_ARE_YOU_SURE_YOU_WANT_TO_DELETE_CONFIRMING_WILL_PERMANENTLY_DELETE_THE_SELECTED_ITEMS") ?>')) {
+				if (confirm('<?= Text::_("COM_SERMONDISTRIBUTOR_ARE_YOU_SURE_YOU_WANT_TO_DELETE_CONFIRMING_WILL_PERMANENTLY_DELETE_THE_SELECTED_ITEMS") ?>')) {
 					Joomla.submitbutton('<?= $displayData->get("name") ?>.delete');
 				};
 			}
@ -64,23 +69,23 @@ defined('JPATH_BASE') or die('Restricted access');
 		<?php if (empty($displayData->items)): ?>
 			<h4 class="alert-heading">
 				<span class="icon-trash"></span>
-				<?= JText::_("COM_SERMONDISTRIBUTOR_TRASH_AREA") ?>
+				<?= Text::_("COM_SERMONDISTRIBUTOR_TRASH_AREA") ?>
 			</h4>
-			<p><?= JText::_("COM_SERMONDISTRIBUTOR_YOU_ARE_CURRENTLY_VIEWING_THE_TRASH_AREA_AND_YOU_DONT_HAVE_ANY_ITEMS_IN_TRASH_AT_THE_MOMENT") ?></p>
+			<p><?= Text::_("COM_SERMONDISTRIBUTOR_YOU_ARE_CURRENTLY_VIEWING_THE_TRASH_AREA_AND_YOU_DONT_HAVE_ANY_ITEMS_IN_TRASH_AT_THE_MOMENT") ?></p>
 		<?php else: ?>
 			<h4 class="alert-heading">
 				<span class="icon-trash"></span>
-				<?= JText::_("COM_SERMONDISTRIBUTOR_TRASHED_ITEMS") ?>
+				<?= Text::_("COM_SERMONDISTRIBUTOR_TRASHED_ITEMS") ?>
 			</h4>
-			<p><?= JText::_("COM_SERMONDISTRIBUTOR_YOU_ARE_CURRENTLY_VIEWING_THE_TRASHED_ITEMS") ?></p>
+			<p><?= Text::_("COM_SERMONDISTRIBUTOR_YOU_ARE_CURRENTLY_VIEWING_THE_TRASHED_ITEMS") ?></p>
 			<button onclick="emptyTrash();" class="btn btn-small btn-danger">
 				<span class="icon-delete" aria-hidden="true"></span>
-				<?= JText::_("COM_SERMONDISTRIBUTOR_EMPTY_TRASH") ?>
+				<?= Text::_("COM_SERMONDISTRIBUTOR_EMPTY_TRASH") ?>
 			</button>
 		<?php endif; ?>
 		<button onclick="exitTrash();" class="btn btn-small">
 			<span class="icon-back" aria-hidden="true"></span>
-			<?= JText::_("COM_SERMONDISTRIBUTOR_EXIT_TRASH") ?>
+			<?= Text::_("COM_SERMONDISTRIBUTOR_EXIT_TRASH") ?>
 		</button>
 	</div>
 <?php endif; ?>
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		3.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		ajax.php
@ -25,8 +25,18 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\Utilities\ArrayHelper;
+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;

 /**
 * Sermondistributor Ajax List Model
@ -34,26 +44,32 @@ use Joomla\Utilities\ArrayHelper;
 class SermondistributorModelAjax extends ListModel
 {
 	protected $app_params;
-	
-	public function __construct() 
-	{		
-		parent::__construct();		
+
+	public function __construct()
+	{
+		parent::__construct();
 		// get params
-		$this->app_params	= JComponentHelper::getParams('com_sermondistributor');
-		
+		$this->app_params = ComponentHelper::getParams('com_sermondistributor');
+
 	}

 	// Used in sermon

 	/**
-	* 	Check and if a vdm notice is new (per/user)
-	**/
-	public function isNew($notice)
+	 * Check and if a notice is new (per/user)
+	 *
+	 * @param string|null    $notice   The current notice
+	 *
+	 * @return  bool  true if is new
+	 * @since   2.0.0
+	 */
+	public function isNew(?string $notice): bool
 	{
 		// first get the file path
-		$path_filename = SermondistributorHelper::getFilePath('path', 'usernotice', 'md', JFactory::getUser()->username, JPATH_COMPONENT_ADMINISTRATOR);
+		$path_filename = FileHelper::getPath('path', 'usernotice', 'md', Factory::getUser()->username, JPATH_COMPONENT_ADMINISTRATOR);
+
 		// check if the file is set
-		if (($content = @file_get_contents($path_filename)) !== FALSE)
+		if (($content = FileHelper::getContent($path_filename, FALSE)) !== FALSE)
 		{
 			if ($notice == $content)
 			{
@ -64,33 +80,28 @@ class SermondistributorModelAjax extends ListModel
 	}

 	/**
-	* 	set That a notice has been read (per/user)
-	**/
-	public function isRead($notice)
+	 * Check if a notice has been read (per/user)
+	 *
+	 * @param string|null    $notice   The current notice
+	 *
+	 * @return  bool  true if is read
+	 * @since   2.0.0
+	 */
+	public function isRead(?string $notice): bool
 	{
 		// first get the file path
-		$path_filename = SermondistributorHelper::getFilePath('path', 'usernotice', 'md', JFactory::getUser()->username, JPATH_COMPONENT_ADMINISTRATOR);
+		$path_filename = FileHelper::getPath('path', 'usernotice', 'md', Factory::getUser()->username, JPATH_COMPONENT_ADMINISTRATOR);
+
 		// set as read if not already set
-		if (($content = @file_get_contents($path_filename)) !== FALSE)
+		if (($content = FileHelper::getContent($path_filename, FALSE)) !== FALSE)
 		{
 			if ($notice == $content)
 			{
 				return true;
 			}
 		}
-		return $this->saveFile($notice,$path_filename);
-	}

-	protected function saveFile($data,$path_filename)
-	{
-		if (SermondistributorHelper::checkString($data))
-		{
-			$fp = fopen($path_filename, 'w');
-			fwrite($fp, $data);
-			fclose($fp);
-			return true;
-		}
-		return false;
+		return FileHelper::write($path_filename, $notice);
 	}

 	// Used in external_source
@ -113,8 +124,8 @@ class SermondistributorModelAjax extends ListModel
 	{
 		// set the headers
 		$headers = array(
-			'tsharedurl' => JText::_('COM_SERMONDISTRIBUTOR_SHAREDURL'),
-			'tfolder' => JText::_('COM_SERMONDISTRIBUTOR_TARGETED_FOLDER')
+			'tsharedurl' => Text::_('COM_SERMONDISTRIBUTOR_SHAREDURL'),
+			'tfolder' => Text::_('COM_SERMONDISTRIBUTOR_TARGETED_FOLDER')
 		);
 		// loop the array
 		foreach ($headers as $key => $lang)
@ -128,7 +139,7 @@ class SermondistributorModelAjax extends ListModel
 		$functions = range(0,10);
 		foreach ($functions as $function)
 		{
-			$function = 'setAutoLang'.SermondistributorHelper::safeString($function, 'f');
+			$function = 'setAutoLang'.StringHelper::safe($function, 'f');
 			if (method_exists($this, $function))
 			{
 				$this->{$function}();
@ -136,7 +147,7 @@ class SermondistributorModelAjax extends ListModel
 		}
 		foreach ($functions as $function)
 		{
-			$function = 'setAutoFunc'.SermondistributorHelper::safeString($function, 'f');
+			$function = 'setAutoFunc'.StringHelper::safe($function, 'f');
 			if (method_exists($this, $function))
 			{
 				$this->{$function}();
@ -146,10 +157,10 @@ class SermondistributorModelAjax extends ListModel

 	public function getBuildTable($idName,$oject)
 	{
-		if (SermondistributorHelper::checkJson($oject) && SermondistributorHelper::checkString($idName))
+		if (JsonHelper::check($oject) && StringHelper::check($idName))
 		{
 			$array = json_decode($oject, true);
-			if (SermondistributorHelper::checkArray($array))
+			if (UtilitiesArrayHelper::check($array))
 			{ 
 				// make sure we run the autoloader to insure all is set
 				$this->autoLoader();
@ -160,9 +171,9 @@ class SermondistributorModelAjax extends ListModel
 				$rows		= array();
 				foreach ($array as $header => $values)
 				{
-					if (SermondistributorHelper::checkArray($values))
+					if (UtilitiesArrayHelper::check($values))
 					{
-						$targetHeader = (isset($targetHeaders[$header])) ? $targetHeaders[$header] : SermondistributorHelper::safeString($header, 'W');
+						$targetHeader = (isset($targetHeaders[$header])) ? $targetHeaders[$header] : StringHelper::safe($header, 'W');
 						$table .= '<th style="padding: 10px; text-align: center; border: 1px solid rgb(221, 221, 221);" scope="col">'.$targetHeader.'</th>';
 						foreach ($values as $nr => $value)
 						{
@ -174,7 +185,7 @@ class SermondistributorModelAjax extends ListModel
 				// close header start body
 				$table .= '</tr></thead><tbody>';
 				// add rows to table
-				if (SermondistributorHelper::checkArray($rows))
+				if (UtilitiesArrayHelper::check($rows))
 				{
 					foreach ($rows as $row)
 					{
@ -198,7 +209,7 @@ class SermondistributorModelAjax extends ListModel
 			$value = $this->{$this->functionArray[$header]}($header,$value);
 		}
 		// if no value are set
-		if (!SermondistributorHelper::checkString($value))
+		if (!StringHelper::check($value))
 		{
 			$value = '-';
 		}
@ -228,10 +239,10 @@ class SermondistributorModelAjax extends ListModel
 	**/
 	public function getCronPath($type)
 	{
-		$result = array('error' => '<span style="color: red;">' . JText::_('COM_SERMONDISTRIBUTOR_NO_CRONJOB_PATH_FOUND_SINCE_INCORRECT_TYPE_REQUESTED') . '</span>');
+		$result = array('error' => '<span style="color: red;">' . Text::_('COM_SERMONDISTRIBUTOR_NO_CRONJOB_PATH_FOUND_SINCE_INCORRECT_TYPE_REQUESTED') . '</span>');
 		if ('externalUpdate' === $type)
 		{
-			$result['error'] = '<span style="color: red;">' . JText::sprintf('COM_SERMONDISTRIBUTOR_NO_CRONJOB_PATH_FOUND_FOR_S', $type) . '</span>';
+			$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 "' .JURI::root() . 'index.php?option=com_sermondistributor&task=api.externalUpdate" >/dev/null 2>&1';
@ -265,14 +276,14 @@ class SermondistributorModelAjax extends ListModel
 			$type = 'auto';
 		}
 		// first get the file path
-		$path_filename = SermondistributorHelper::getFilePath('update', 'error', $id.$target.$typeID, '.txt', JPATH_COMPONENT_ADMINISTRATOR);
+		$path_filename = FileHelper::getPath('update', 'error', $id.$target.$typeID, '.txt', JPATH_COMPONENT_ADMINISTRATOR);
 		// check "die sleutel" and the type
-		if (isset($type) && SermondistributorHelper::checkString($sleutel))
+		if (isset($type) && StringHelper::check($sleutel))
 		{
 			// get database object
-			if (!isset($this->db) || !SermondistributorHelper::checkObject($this->db))
+			if (!isset($this->db) || !ObjectHelper::check($this->db))
 			{
-				$this->db = JFactory::getDBO();
+				$this->db = Factory::getDBO();
 			}
 			// run the update
 			if (SermondistributorHelper::updateExternalSource($id, $target, $type, true, $sleutel))
@ -292,7 +303,7 @@ class SermondistributorModelAjax extends ListModel
 			return array('error' => $error);
 		}
 		// store the error
-		$error = JText::_('COM_SERMONDISTRIBUTOR_BCOULD_NOT_USE_THE_GIVEN_TOKEN_OR_THE_GIVEN_BUILD_OPTION_DOES_NOT_EXISTB');
+		$error = Text::_('COM_SERMONDISTRIBUTOR_BCOULD_NOT_USE_THE_GIVEN_TOKEN_OR_THE_GIVEN_BUILD_OPTION_DOES_NOT_EXISTB');
 		SermondistributorHelper::writeFile($path_filename,$error);
 		return array('error' => $error);
 	}
@ -304,12 +315,12 @@ class SermondistributorModelAjax extends ListModel
 	{
 		// check if we should update with auto listing
 		$links_dropbox_auto = SermondistributorHelper::getExternalSourceLink('auto', 2);
-		if (SermondistributorHelper::checkArray($links_dropbox_auto))
+		if (UtilitiesArrayHelper::check($links_dropbox_auto))
 		{
 			// load system aliases
 			$this->getSermonAliasesUsed();
 			// set the class var for sermons
-			$this->sermons = new stdClass();
+			$this->sermons = new \stdClass();
 			// we must first get all the preacher names
 			foreach ($links_dropbox_auto as $placeholder => $link)
 			{
@ -353,7 +364,7 @@ class SermondistributorModelAjax extends ListModel
 	protected function setSermons()
 	{
 		// check if we have values
-		if (SermondistributorHelper::checkObject($this->sermons))
+		if (ObjectHelper::check($this->sermons))
 		{
 			foreach ($this->sermons as $sermon)
 			{
@ -420,7 +431,7 @@ class SermondistributorModelAjax extends ListModel
 		$fields = array(
 			$this->db->quoteName('published') . ' = 0'
 		);
-		if (isset($this->allSermons) && SermondistributorHelper::checkArray($this->allSermons))
+		if (isset($this->allSermons) && UtilitiesArrayHelper::check($this->allSermons))
 		{
 			// unpublish those AUTO sermons not found in this id list
 			$conditions = array(
@ -513,7 +524,7 @@ class SermondistributorModelAjax extends ListModel
 		else
 		{
 			// load the sermon data
-			$this->sermons->$key = new stdClass();
+			$this->sermons->$key = new \stdClass();
 		}
 		// check if this value has been set
 		if (!isset($this->sermons->$key->alias))
@ -534,7 +545,7 @@ class SermondistributorModelAjax extends ListModel
 			$this->sermons->$key->name = $name;
 		}
 		// check if this value has been set
-		if (!isset($this->sermons->$key->short_description) && SermondistributorHelper::checkString($description))
+		if (!isset($this->sermons->$key->short_description) && StringHelper::check($description))
 		{
 			$this->sermons->$key->short_description = $description;
 		}
@ -557,32 +568,32 @@ class SermondistributorModelAjax extends ListModel
 		if (!isset($this->sermons->$key->created))
 		{
 			// set the date object
-			$date = JFactory::getDate();
+			$date = Factory::getDate();
 			$this->sermons->$key->created = $date->toSql();
 		}		
 		// build the Download File NAme - first add the preacher name if set
 		if ($preacher)
 		{
-			$downloadName[] = SermondistributorHelper::safeString($preacherName,'U');
+			$downloadName[] = StringHelper::safe($preacherName,'U');
 		}
 		// add the series name if set
 		if ($series)
 		{
-			$downloadName[] = SermondistributorHelper::safeString($seriesName,'F');
+			$downloadName[] = StringHelper::safe($seriesName,'F');
 		}
 		// add the category name if set
 		if ($category)
 		{
-			$downloadName[] = SermondistributorHelper::safeString($categoryName, 'F');
+			$downloadName[] = StringHelper::safe($categoryName, 'F');
 		}
 		// add the main file name
-		$downloadName[] = SermondistributorHelper::safeString($name,'F');
+		$downloadName[] = StringHelper::safe($name,'F');
 		// now build the download file name
 		$downloadName = implode('__', $downloadName).'.'.$fileType;			
 		// load the placeholder to the sermon
 		$this->sermons->$key->auto_sermons[$downloadName] = $placeholder;
 		// set default metadate
-		if (!isset($this->sermons->$key->metadesc) && SermondistributorHelper::checkString($description))
+		if (!isset($this->sermons->$key->metadesc) && StringHelper::check($description))
 		{	
 			// Only process once per/sermon
 			$bad_characters = array("\"", "<", ">");
@ -613,7 +624,7 @@ class SermondistributorModelAjax extends ListModel
 	protected function getAlias($name,$type = false)
 	{
 		// sanitize the name to an alias
-		if (JFactory::getConfig()->get('unicodeslugs') == 1)
+		if (Factory::getConfig()->get('unicodeslugs') == 1)
 		{
 			$alias = JFilterOutput::stringURLUnicodeSlug($name);
 		}
@ -633,7 +644,7 @@ class SermondistributorModelAjax extends ListModel
 		// sanitize the name to an alias
 		$alias = $this->getAlias($name);
 		// check if there is a recored
-		if ($id = SermondistributorHelper::getVar($type, $alias, 'alias', 'id'))
+		if ($id = GetHelper::var($type, $alias, 'alias', 'id'))
 		{
 			return $id;
 		}
@ -646,9 +657,9 @@ class SermondistributorModelAjax extends ListModel
 				$name = ucwords($name);
 			}
 			// create the record
-			$object = new stdClass();
+			$object = new \stdClass();
 			// set the date object
-			$date = JFactory::getDate();
+			$date = Factory::getDate();
 			// build the object
 			$object->name			= $name;
 			$object->alias			= $alias;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Robot	304c0cd388	Stable release of v3.0.3 Removed the not_required field from the sermon model. #36.	2024-02-11 19:24:51 +02:00
Robot	3bca4fe609	Stable release of v3.0.2 Add the HTML class to the site default layout.	2024-02-10 13:39:52 +02:00
Robot	e63079caff	Stable release of v3.0.0 Moved all classes to 'use' classes away from JText format. Build with new JCB 3.1.31 beta.	2024-02-10 11:13:31 +02:00