updated via JCB

README.md

@@ -23,38 +23,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*: 28th February, 2017
++ *Last Build*: 17th August, 2017
 + *Version*: 1.4.1
 + *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:
 
-**181 Hours** or **23 Eight Hour Days** (actual time the author saved -
+**177 Hours** or **22 Eight Hour Days** (actual time the author saved -
 due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder))
 
 > (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*: **64751**
++ *Line count*: **63277**
-+ *File count*: **439**
++ *File count*: **441**
 + *Folder count*: **90**
 
-**119 Hours** or **15 Eight Hour Days** (the actual time the author spent)
+**116 Hours** or **15 Eight Hour Days** (the actual time the author spent)
 
 > (with the following break down:
-> **debugging @45hours** = codingtime / 4;
+> **debugging @44hours** = codingtime / 4;
-> **planning @26hours** = codingtime / 7;
+> **planning @25hours** = codingtime / 7;
 > **mapping @18hours** = codingtime / 10;
-> **office @30hours** = codingtime / 6;)
+> **office @29hours** = codingtime / 6;)
 
-**300 Hours** or **38 Eight Hour Days**
+**293 Hours** or **37 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: **7.6 weeks** or **1.6 months**
+Project duration: **7.4 weeks** or **1.5 months**
 
 > This **component** was build with a Joomla [Automated Component Builder](https://www.vdm.io/joomla-component-builder).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)

admin/README.txt

@@ -23,38 +23,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*: 28th February, 2017
++ *Last Build*: 17th August, 2017
 + *Version*: 1.4.1
 + *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:
 
-**181 Hours** or **23 Eight Hour Days** (actual time the author saved -
+**177 Hours** or **22 Eight Hour Days** (actual time the author saved -
 due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder))
 
 > (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*: **64751**
++ *Line count*: **63277**
-+ *File count*: **439**
++ *File count*: **441**
 + *Folder count*: **90**
 
-**119 Hours** or **15 Eight Hour Days** (the actual time the author spent)
+**116 Hours** or **15 Eight Hour Days** (the actual time the author spent)
 
 > (with the following break down:
-> **debugging @45hours** = codingtime / 4;
+> **debugging @44hours** = codingtime / 4;
-> **planning @26hours** = codingtime / 7;
+> **planning @25hours** = codingtime / 7;
 > **mapping @18hours** = codingtime / 10;
-> **office @30hours** = codingtime / 6;)
+> **office @29hours** = codingtime / 6;)
 
-**300 Hours** or **38 Eight Hour Days**
+**293 Hours** or **37 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: **7.6 weeks** or **1.6 months**
+Project duration: **7.4 weeks** or **1.5 months**
 
 > This **component** was build with a Joomla [Automated Component Builder](https://www.vdm.io/joomla-component-builder).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)

admin/access.xml

@@ -83,7 +83,6 @@
 		<action name="manual_updater.submenu" title="COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_SUBMENU" description="COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_SUBMENU_DESC" />
 		<action name="site.preacher.access" title="COM_SERMONDISTRIBUTOR_PREACHER_ACCESS_SITE" description="COM_SERMONDISTRIBUTOR_PREACHER_ACCESS_SITE_DESC" />
 		<action name="preacher.access" title="COM_SERMONDISTRIBUTOR_PREACHERS_ACCESS" description="COM_SERMONDISTRIBUTOR_PREACHERS_ACCESS_DESC" />
-		<action name="site.preachers.access" title="COM_SERMONDISTRIBUTOR_PREACHERS_ACCESS_SITE" description="COM_SERMONDISTRIBUTOR_PREACHERS_ACCESS_SITE_DESC" />
 		<action name="preacher.batch" title="COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_USE" description="COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_USE_DESC" />
 		<action name="preacher.create" title="COM_SERMONDISTRIBUTOR_PREACHERS_CREATE" description="COM_SERMONDISTRIBUTOR_PREACHERS_CREATE_DESC" />
 		<action name="preacher.dashboard_add" title="COM_SERMONDISTRIBUTOR_PREACHERS_DASHBOARD_ADD" description="COM_SERMONDISTRIBUTOR_PREACHERS_DASHBOARD_ADD_DESC" />
@@ -204,12 +203,12 @@
 		<action name="external_source.edit.update_method" title="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_UPDATE_METHOD" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_UPDATE_METHOD_DESC" />
 		<action name="external_source.edit.filetypes" title="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_FILETYPES" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_FILETYPES_DESC" />
 		<action name="external_source.edit.build" title="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_BUILD" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_BUILD_DESC" />
-		<action name="external_source.edit.folder" title="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_FOLDER" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_FOLDER_DESC" />
 		<action name="external_source.edit.dropboxoptions" title="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_DROPBOXOPTIONS" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_DROPBOXOPTIONS_DESC" />
 		<action name="external_source.edit.update_timer" title="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_UPDATE_TIMER" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_UPDATE_TIMER_DESC" />
+		<action name="external_source.edit.oauthtoken" title="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_OAUTHTOKEN" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_OAUTHTOKEN_DESC" />
 		<action name="external_source.edit.permissiontype" title="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_PERMISSIONTYPE" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_PERMISSIONTYPE_DESC" />
 		<action name="external_source.edit.sharedurl" title="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_SHAREDURL" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_SHAREDURL_DESC" />
-		<action name="external_source.edit.oauthtoken" title="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_OAUTHTOKEN" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_OAUTHTOKEN_DESC" />
+		<action name="external_source.edit.folder" title="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_FOLDER" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_FOLDER_DESC" />
 		<action name="external_source.version" title="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_VERSION" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_VERSION_DESC" />
 	</section>
 	<section name="local_listing">

admin/assets/css/admin.css

@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		admin.css

admin/assets/css/dashboard.css

@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		dashboard.css

admin/assets/css/external_source.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 53 of this MVC
+	@version		@update number 55 of this MVC
-	@build			27th November, 2016
+	@build			17th July, 2017
 	@created		3rd November, 2016
 	@package		Sermon Distributor
 	@subpackage		external_source.css

admin/assets/css/external_sources.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 53 of this MVC
+	@version		@update number 55 of this MVC
-	@build			27th November, 2016
+	@build			17th July, 2017
 	@created		3rd November, 2016
 	@package		Sermon Distributor
 	@subpackage		external_sources.css

admin/assets/css/help_document.css

@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 20 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		13th July, 2015
 	@package		Sermon Distributor
 	@subpackage		help_document.css

admin/assets/css/help_documents.css

@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 20 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		13th July, 2015
 	@package		Sermon Distributor
 	@subpackage		help_documents.css

admin/assets/css/local_listing.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 10 of this MVC
+	@version		@update number 11 of this MVC
-	@build			27th November, 2016
+	@build			31st March, 2017
 	@created		20th November, 2016
 	@package		Sermon Distributor
 	@subpackage		local_listing.css

admin/assets/css/local_listings.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 10 of this MVC
+	@version		@update number 11 of this MVC
-	@build			27th November, 2016
+	@build			31st March, 2017
 	@created		20th November, 2016
 	@package		Sermon Distributor
 	@subpackage		local_listings.css

admin/assets/css/manual_updater.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 44 of this MVC
+	@version		@update number 45 of this MVC
-	@build			27th November, 2016
+	@build			7th July, 2017
 	@created		4th November, 2016
 	@package		Sermon Distributor
 	@subpackage		manual_updater.css

admin/assets/css/statistic.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 8 of this MVC
+	@version		@update number 9 of this MVC
-	@build			18th November, 2015
+	@build			9th July, 2017
 	@created		29th October, 2015
 	@package		Sermon Distributor
 	@subpackage		statistic.css

admin/assets/css/statistics.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 8 of this MVC
+	@version		@update number 9 of this MVC
-	@build			18th November, 2015
+	@build			9th July, 2017
 	@created		29th October, 2015
 	@package		Sermon Distributor
 	@subpackage		statistics.css

admin/controller.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		controller.php

admin/controllers/ajax.json.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		ajax.json.php

admin/controllers/external_source.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 53 of this MVC
+	@version		@update number 55 of this MVC
-	@build			27th November, 2016
+	@build			17th July, 2017
 	@created		3rd November, 2016
 	@package		Sermon Distributor
 	@subpackage		external_source.php

admin/controllers/external_sources.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 53 of this MVC
+	@version		@update number 55 of this MVC
-	@build			27th November, 2016
+	@build			17th July, 2017
 	@created		3rd November, 2016
 	@package		Sermon Distributor
 	@subpackage		external_sources.php
@@ -107,5 +107,5 @@ class SermondistributorControllerExternal_sources extends JControllerAdmin
 		$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=external_sources', false), $message, 'error');
 		return;
-	} 
+	}  
 }

admin/controllers/help.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		help.php

admin/controllers/help_document.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 20 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		13th July, 2015
 	@package		Sermon Distributor
 	@subpackage		help_document.php

admin/controllers/help_documents.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 20 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		13th July, 2015
 	@package		Sermon Distributor
 	@subpackage		help_documents.php
@@ -107,5 +107,5 @@ class SermondistributorControllerHelp_documents extends JControllerAdmin
 		$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=help_documents', false), $message, 'error');
 		return;
-	} 
+	}  
 }

admin/controllers/import.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		import.php

admin/controllers/local_listing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 10 of this MVC
+	@version		@update number 11 of this MVC
-	@build			27th November, 2016
+	@build			31st March, 2017
 	@created		20th November, 2016
 	@package		Sermon Distributor
 	@subpackage		local_listing.php

admin/controllers/local_listings.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 10 of this MVC
+	@version		@update number 11 of this MVC
-	@build			27th November, 2016
+	@build			31st March, 2017
 	@created		20th November, 2016
 	@package		Sermon Distributor
 	@subpackage		local_listings.php
@@ -107,5 +107,5 @@ class SermondistributorControllerLocal_listings extends JControllerAdmin
 		$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=local_listings', false), $message, 'error');
 		return;
-	} 
+	}  
 }

admin/controllers/manual_updater.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 44 of this MVC
+	@version		@update number 45 of this MVC
-	@build			27th November, 2016
+	@build			7th July, 2017
 	@created		4th November, 2016
 	@package		Sermon Distributor
 	@subpackage		manual_updater.php

admin/controllers/preachers.php

@@ -107,5 +107,5 @@ class SermondistributorControllerPreachers extends JControllerAdmin
 		$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=preachers', false), $message, 'error');
 		return;
-	} 
+	}  
 }

admin/controllers/series_list.php

@@ -107,5 +107,5 @@ class SermondistributorControllerSeries_list extends JControllerAdmin
 		$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=series_list', false), $message, 'error');
 		return;
-	} 
+	}  
 }

admin/controllers/sermondistributor.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		sermondistributor.php

admin/controllers/sermons.php

@@ -107,5 +107,5 @@ class SermondistributorControllerSermons extends JControllerAdmin
 		$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=sermons', false), $message, 'error');
 		return;
-	} 
+	}  
 }

admin/controllers/statistic.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 8 of this MVC
+	@version		@update number 9 of this MVC
-	@build			18th November, 2015
+	@build			9th July, 2017
 	@created		29th October, 2015
 	@package		Sermon Distributor
 	@subpackage		statistic.php

admin/controllers/statistics.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 8 of this MVC
+	@version		@update number 9 of this MVC
-	@build			18th November, 2015
+	@build			9th July, 2017
 	@created		29th October, 2015
 	@package		Sermon Distributor
 	@subpackage		statistics.php
@@ -107,5 +107,5 @@ class SermondistributorControllerStatistics extends JControllerAdmin
 		$message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED');
 		$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=statistics', false), $message, 'error');
 		return;
-	} 
+	}  
 }

admin/helpers/headercheck.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		headercheck.php
@@ -26,7 +26,7 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-class HeaderCheck
+class sermondistributorHeaderCheck
 {
 	function js_loaded($script_name)
 	{

admin/helpers/html/batch_.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		batch_.php

admin/helpers/sermondistributor.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		sermondistributor.php
@@ -1364,13 +1364,18 @@ abstract class SermondistributorHelper
 
 		if (self::checkArray($where))
 		{
+			// prep main <-- why? well if $main='' is empty then $table can be categories or users
+			if (self::checkString($main))
+			{
+				$main = '_'.ltrim($main, '_');
+			}
 			// Get a db connection.
 			$db = JFactory::getDbo();
 			// Create a new query object.
 			$query = $db->getQuery(true);
 
 			$query->select($db->quoteName(array($what)));
-			$query->from($db->quoteName('#__'.$main.'_'.$table));
+			$query->from($db->quoteName('#_'.$main.'_'.$table));
 			$query->where($db->quoteName($whereString) . ' '.$operator.' (' . implode(',',$where) . ')');
 			$db->setQuery($query);
 			$db->execute();
@@ -1909,6 +1914,21 @@ abstract class SermondistributorHelper
 		// 0nly continue if we have a string
                 if (self::checkString($string))
                 {
+			// create file name without the extention that is safe
+			if ($type === 'filename')
+			{
+				// make sure VDM is not in the string
+				$string = str_replace('VDM', 'vDm', $string);
+				// Remove anything which isn't a word, whitespace, number
+				// or any of the following caracters -_()
+				// If you don't need to handle multi-byte characters
+				// you can use preg_replace rather than mb_ereg_replace
+				// Thanks @Łukasz Rysiak!
+				// $string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string);
+				$string = preg_replace("([^\w\s\d\-_\(\)])", '', $string);
+				// http://stackoverflow.com/a/2021729/1429677
+				return preg_replace('/\s+/', ' ', $string);
+			}
 			// remove all other characters
 			$string = trim($string);
 			$string = preg_replace('/'.$spacer.'+/', ' ', $string);

admin/language/en-GB/en-GB.com_sermondistributor.ini

@@ -336,7 +336,7 @@ COM_SERMONDISTRIBUTOR_DASHBOARD_PREACHER_ADD="Add&nbsp;Preacher<br /><br />"
 COM_SERMONDISTRIBUTOR_DASHBOARD_SERIES_ADD="Add&nbsp;Series<br /><br />"
 COM_SERMONDISTRIBUTOR_DASHBOARD_SERIES_LIST="Series List<br /><br />"
 COM_SERMONDISTRIBUTOR_DASHBOARD_SERMONS="Sermons<br /><br />"
-COM_SERMONDISTRIBUTOR_DASHBOARD_SERMONS_CATID="Catagory &nbsp;For<br />Sermons"
+COM_SERMONDISTRIBUTOR_DASHBOARD_SERMONS_CATID="Category &nbsp;For<br />Sermons"
 COM_SERMONDISTRIBUTOR_DASHBOARD_SERMON_ADD="Add&nbsp;Sermon<br /><br />"
 COM_SERMONDISTRIBUTOR_DASHBOARD_STATISTICS="Statistics<br /><br />"
 COM_SERMONDISTRIBUTOR_DATE="Date"
@@ -903,8 +903,6 @@ COM_SERMONDISTRIBUTOR_PREACHER="Preacher"
 COM_SERMONDISTRIBUTOR_PREACHERS="Preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_ACCESS="Preachers Access"
 COM_SERMONDISTRIBUTOR_PREACHERS_ACCESS_DESC="Allows the users in this group to access access preachers"
-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_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"
@@ -1306,7 +1304,7 @@ COM_SERMONDISTRIBUTOR_SERMON_SOURCE_LABEL="File Source"
 COM_SERMONDISTRIBUTOR_SERMON_STASTICS="Stastics"
 COM_SERMONDISTRIBUTOR_SERMON_STATUS="Status"
 COM_SERMONDISTRIBUTOR_SERMON_TAGS="Tags"
-COM_SERMONDISTRIBUTOR_SERMON_TAGS_DESCRIPTION="Assign tags to ###VIEW### items. Tag names must be unique."
+COM_SERMONDISTRIBUTOR_SERMON_TAGS_DESCRIPTION="Assign tags to SERMON items. Tag names must be unique."
 COM_SERMONDISTRIBUTOR_SERMON_TAGS_LABEL="Tags"
 COM_SERMONDISTRIBUTOR_SERMON_URL="Url"
 COM_SERMONDISTRIBUTOR_SERMON_URL_DESCRIPTION="The url to download the sermon."

admin/layouts/batchselection.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		batchselection.php

admin/layouts/external_source/build_option_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		build_option_fullwidth.php

admin/layouts/external_source/details_above.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php

admin/layouts/external_source/details_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php

admin/layouts/external_source/details_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php

admin/layouts/external_source/details_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php

admin/layouts/external_source/details_under.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_under.php

admin/layouts/external_source/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php

admin/layouts/external_source/publlshing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publlshing.php

admin/layouts/help_document/details_above.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php

admin/layouts/help_document/details_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php

admin/layouts/help_document/details_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php

admin/layouts/help_document/details_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php

admin/layouts/help_document/details_under.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_under.php

admin/layouts/help_document/metadata.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		metadata.php

admin/layouts/help_document/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php

admin/layouts/local_listing/details_above.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php

admin/layouts/local_listing/details_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php

admin/layouts/local_listing/details_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php

admin/layouts/local_listing/details_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php

admin/layouts/local_listing/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php

admin/layouts/local_listing/publlshing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publlshing.php

admin/layouts/preacher/details_above.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php

admin/layouts/preacher/details_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php

admin/layouts/preacher/details_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php

admin/layouts/preacher/details_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php

admin/layouts/preacher/metadata.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		metadata.php

admin/layouts/preacher/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php

admin/layouts/preacher/sermons_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		sermons_fullwidth.php

admin/layouts/series/details_above.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php

admin/layouts/series/details_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php

admin/layouts/series/details_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php

admin/layouts/series/details_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php

admin/layouts/series/metadata.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		metadata.php

admin/layouts/series/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php

admin/layouts/series/sermons_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		sermons_fullwidth.php

admin/layouts/sermon/details_above.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php

admin/layouts/sermon/details_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php

admin/layouts/sermon/details_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php

admin/layouts/sermon/details_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php

admin/layouts/sermon/details_under.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_under.php

admin/layouts/sermon/files_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		files_fullwidth.php

admin/layouts/sermon/metadata.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		metadata.php

admin/layouts/sermon/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php

admin/layouts/sermon/stastics_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		stastics_fullwidth.php

admin/layouts/statistic/details_above.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php

admin/layouts/statistic/details_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php

admin/layouts/statistic/details_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php

admin/layouts/statistic/metadata.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		metadata.php

admin/layouts/statistic/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php

admin/models/ajax.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		ajax.php

admin/models/external_source.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 53 of this MVC
+	@version		@update number 55 of this MVC
-	@build			27th November, 2016
+	@build			17th July, 2017
 	@created		3rd November, 2016
 	@package		Sermon Distributor
 	@subpackage		external_source.php
@@ -352,25 +352,6 @@ class SermondistributorModelExternal_source extends JModelAdmin
 				$form->setFieldAttribute('build', 'required', 'false');
 			}
 		}
-		// Modify the form based on Edit Folder access controls.
-		if ($id != 0 && (!$user->authorise('external_source.edit.folder', 'com_sermondistributor.external_source.' . (int) $id))
-			|| ($id == 0 && !$user->authorise('external_source.edit.folder', 'com_sermondistributor')))
-		{
-			// Disable fields for display.
-			$form->setFieldAttribute('folder', 'disabled', 'true');
-			// Disable fields for display.
-			$form->setFieldAttribute('folder', 'readonly', 'true');
-			// Disable radio button for display.
-			$class = $form->getFieldAttribute('folder', 'class', '');
-			$form->setFieldAttribute('folder', 'class', $class.' disabled no-click');
-			if (!$form->getValue('folder'))
-			{
-				// Disable fields while saving.
-				$form->setFieldAttribute('folder', 'filter', 'unset');
-				// Disable fields while saving.
-				$form->setFieldAttribute('folder', 'required', 'false');
-			}
-		}
 		// Modify the form based on Edit Dropboxoptions access controls.
 		if ($id != 0 && (!$user->authorise('external_source.edit.dropboxoptions', 'com_sermondistributor.external_source.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('external_source.edit.dropboxoptions', 'com_sermondistributor')))
@@ -406,6 +387,22 @@ class SermondistributorModelExternal_source extends JModelAdmin
 				$form->setFieldAttribute('update_timer', 'required', 'false');
 			}
 		}
+		// Modify the form based on Edit Oauthtoken access controls.
+		if ($id != 0 && (!$user->authorise('external_source.edit.oauthtoken', 'com_sermondistributor.external_source.' . (int) $id))
+			|| ($id == 0 && !$user->authorise('external_source.edit.oauthtoken', 'com_sermondistributor')))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('oauthtoken', 'disabled', 'true');
+			// Disable fields for display.
+			$form->setFieldAttribute('oauthtoken', 'readonly', 'true');
+			if (!$form->getValue('oauthtoken'))
+			{
+				// Disable fields while saving.
+				$form->setFieldAttribute('oauthtoken', 'filter', 'unset');
+				// Disable fields while saving.
+				$form->setFieldAttribute('oauthtoken', 'required', 'false');
+			}
+		}
 		// Modify the form based on Edit Permissiontype access controls.
 		if ($id != 0 && (!$user->authorise('external_source.edit.permissiontype', 'com_sermondistributor.external_source.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('external_source.edit.permissiontype', 'com_sermondistributor')))
@@ -444,20 +441,23 @@ class SermondistributorModelExternal_source extends JModelAdmin
 				$form->setFieldAttribute('sharedurl', 'required', 'false');
 			}
 		}
-		// Modify the form based on Edit Oauthtoken access controls.
+		// Modify the form based on Edit Folder access controls.
-		if ($id != 0 && (!$user->authorise('external_source.edit.oauthtoken', 'com_sermondistributor.external_source.' . (int) $id))
+		if ($id != 0 && (!$user->authorise('external_source.edit.folder', 'com_sermondistributor.external_source.' . (int) $id))
-			|| ($id == 0 && !$user->authorise('external_source.edit.oauthtoken', 'com_sermondistributor')))
+			|| ($id == 0 && !$user->authorise('external_source.edit.folder', 'com_sermondistributor')))
 		{
 			// Disable fields for display.
-			$form->setFieldAttribute('oauthtoken', 'disabled', 'true');
+			$form->setFieldAttribute('folder', 'disabled', 'true');
 			// Disable fields for display.
-			$form->setFieldAttribute('oauthtoken', 'readonly', 'true');
+			$form->setFieldAttribute('folder', 'readonly', 'true');
-			if (!$form->getValue('oauthtoken'))
+			// Disable radio button for display.
+			$class = $form->getFieldAttribute('folder', 'class', '');
+			$form->setFieldAttribute('folder', 'class', $class.' disabled no-click');
+			if (!$form->getValue('folder'))
 			{
 				// Disable fields while saving.
-				$form->setFieldAttribute('oauthtoken', 'filter', 'unset');
+				$form->setFieldAttribute('folder', 'filter', 'unset');
 				// Disable fields while saving.
-				$form->setFieldAttribute('oauthtoken', 'required', 'false');
+				$form->setFieldAttribute('folder', 'required', 'false');
 			}
 		}
 		// Only load these values if no id is found

admin/models/external_sources.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 53 of this MVC
+	@version		@update number 55 of this MVC
-	@build			27th November, 2016
+	@build			17th July, 2017
 	@created		3rd November, 2016
 	@package		Sermon Distributor
 	@subpackage		external_sources.php

admin/models/fields/adminviewfolderlist.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		adminviewfolderlist.php

admin/models/fields/articles.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		articles.php

admin/models/fields/externalsource.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		externalsource.php

admin/models/fields/externalsourcefiles.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		externalsourcefiles.php

admin/models/fields/localfiles.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		localfiles.php

admin/models/fields/preachers.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		preachers.php

admin/models/fields/series.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		series.php

admin/models/fields/sermon.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		sermon.php

admin/models/fields/siteviewfolderlist.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.4.1
-	@build			28th February, 2017
+	@build			17th August, 2017
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		siteviewfolderlist.php

admin/models/forms/external_source.js

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 53 of this MVC
+	@version		@update number 55 of this MVC
-	@build			27th November, 2016
+	@build			17th July, 2017
 	@created		3rd November, 2016
 	@package		Sermon Distributor
 	@subpackage		external_source.js
@@ -86,9 +86,6 @@ jQuery(document).ready(function()
 	var externalsources_vvvvvwv = jQuery("#jform_externalsources").val();
 	var dropboxoptions_vvvvvwv = jQuery("#jform_dropboxoptions input[type='radio']:checked").val();
 	vvvvvwv(permissiontype_vvvvvwv,externalsources_vvvvvwv,dropboxoptions_vvvvvwv);
-
-	var build_vvvvvww = jQuery("#jform_build").val();
-	vvvvvww(build_vvvvvww);
 });
 
 // the vvvvvwe function
@@ -1001,42 +998,6 @@ function dropboxoptions_vvvvvwv_SomeFunc(dropboxoptions_vvvvvwv)
 	return false;
 }
 
-// the vvvvvww function
-function vvvvvww(build_vvvvvww)
-{
-	if (isSet(build_vvvvvww) && build_vvvvvww.constructor !== Array)
-	{
-		var temp_vvvvvww = build_vvvvvww;
-		var build_vvvvvww = [];
-		build_vvvvvww.push(temp_vvvvvww);
-	}
-	else if (!isSet(build_vvvvvww))
-	{
-		var build_vvvvvww = [];
-	}
-	var build = build_vvvvvww.some(build_vvvvvww_SomeFunc);
-
-
-	// set this function logic
-	if (build)
-	{
-	}
-	else
-	{
-	}
-}
-
-// the vvvvvww Some function
-function build_vvvvvww_SomeFunc(build_vvvvvww)
-{
-	// set the function logic
-	if (build_vvvvvww != '')
-	{
-		return true;
-	}
-	return false;
-}
-
 // update required fields
 function updateFieldRequired(name,status)
 {

admin/models/forms/external_source.xml

@@ -215,6 +215,104 @@
 			<option value="2">
 				COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_DYNAMIC_AUTOMATIC_BUILD</option>
 		</field>
+		<!-- Dropboxoptions Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="dropboxoptions"
+			label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_DROPBOXOPTIONS_LABEL"
+			description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_DROPBOXOPTIONS_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHARED_URL</option>
+			<option value="2">
+				COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FOLDER_PATH</option>
+		</field>
+		<!-- App_limitation_note Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="app_limitation_note" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_APP_LIMITATION_NOTE_DESCRIPTION" class="app_limitation_note" />
+		<!-- Generated_access_token_note Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="generated_access_token_note" label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_GENERATED_ACCESS_TOKEN_NOTE_LABEL" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_GENERATED_ACCESS_TOKEN_NOTE_DESCRIPTION" heading="h4" class="alert alert-info generated_access_token_note" />
+		<!-- Update_timer Field. Type: Integer. (joomla) -->
+		<field
+			type="integer"
+			name="update_timer"
+			label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_UPDATE_TIMER_LABEL"
+			default="60"
+			description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_UPDATE_TIMER_DESCRIPTION"
+			class="text_area"
+			required="true"
+			first="60"
+			last="50000"
+			step="10"
+		/>
+		<!-- Oauthtoken Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="oauthtoken"
+			label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_OAUTHTOKEN_LABEL"
+			size="250"
+			maxlength="250"
+			description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_OAUTHTOKEN_DESCRIPTION"
+			class="text_area"
+			required="true"
+			filter="STRING"
+			message="Error! Please add generated access token here."
+			hint="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_OAUTHTOKEN_HINT"
+		/>
+		<!-- Permissiontype Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="permissiontype"
+			label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_PERMISSIONTYPE_LABEL"
+			description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_PERMISSIONTYPE_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="app">
+			<!-- Option Set. -->
+			<option value="full">
+				COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FULL_DROPBOX</option>
+			<option value="app">
+				COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_APP_FOLDER</option>
+		</field>
+		<!-- Note_manual_externalsource Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_manual_externalsource" label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_MANUAL_EXTERNALSOURCE_LABEL" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_MANUAL_EXTERNALSOURCE_DESCRIPTION" heading="h4" class="alert alert-info note_manual_externalsource" />
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
+		<field
+			type="hidden"
+			name="not_required"
+			default="[]"
+		/>
+		<!-- Sharedurl Field. Type: Repeatable. (joomla) -->
+		<field
+			type="repeatable"
+			name="sharedurl"
+			label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHAREDURL_LABEL"
+			description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHAREDURL_DESCRIPTION"
+			id="sharedurl"
+			class="sharedurls"
+			select="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHAREDURL_SELECT"
+			icon="list"
+			maximum="10">
+			<fields name="sharedurl_fields" label="">
+				<fieldset hidden="true" name="sharedurl_modal" repeat="true">
+					<!-- Tsharedurl Field. Type: Url. (joomla) -->
+					<field
+						type="url"
+						name="tsharedurl"
+						label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_TSHAREDURL_LABEL"
+						size="40"
+						maxlength="120"
+						description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_TSHAREDURL_DESCRIPTION"
+						class="text_area span12"
+						required="false"
+						filter="url"
+						validated="url"
+						message="Error! Please add shared-url here."
+						hint="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_TSHAREDURL_HINT"
+					/>
+				</fieldset>
+			</fields>
+		</field>
 		<!-- Folder Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
@@ -247,104 +345,6 @@
 		</field>
 		<!-- Note_auto_externalsource Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_auto_externalsource" label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_AUTO_EXTERNALSOURCE_LABEL" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_AUTO_EXTERNALSOURCE_DESCRIPTION" heading="h4" class="alert alert-info note_auto_externalsource" />
-		<!-- Dropboxoptions Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="dropboxoptions"
-			label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_DROPBOXOPTIONS_LABEL"
-			description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_DROPBOXOPTIONS_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="1">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHARED_URL</option>
-			<option value="2">
-				COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FOLDER_PATH</option>
-		</field>
-		<!-- Update_timer Field. Type: Integer. (joomla) -->
-		<field
-			type="integer"
-			name="update_timer"
-			label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_UPDATE_TIMER_LABEL"
-			default="60"
-			description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_UPDATE_TIMER_DESCRIPTION"
-			class="text_area"
-			required="true"
-			first="60"
-			last="50000"
-			step="10"
-		/>
-		<!-- App_limitation_note Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="app_limitation_note" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_APP_LIMITATION_NOTE_DESCRIPTION" class="app_limitation_note" />
-		<!-- Permissiontype Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="permissiontype"
-			label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_PERMISSIONTYPE_LABEL"
-			description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_PERMISSIONTYPE_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="app">
-			<!-- Option Set. -->
-			<option value="full">
-				COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FULL_DROPBOX</option>
-			<option value="app">
-				COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_APP_FOLDER</option>
-		</field>
-		<!-- Sharedurl Field. Type: Repeatable. (joomla) -->
-		<field
-			type="repeatable"
-			name="sharedurl"
-			label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHAREDURL_LABEL"
-			description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHAREDURL_DESCRIPTION"
-			id="sharedurl"
-			class="sharedurls"
-			select="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHAREDURL_SELECT"
-			icon="list"
-			maximum="10">
-			<fields name="sharedurl_fields" label="">
-				<fieldset hidden="true" name="sharedurl_modal" repeat="true">
-					<!-- Tsharedurl Field. Type: Url. (joomla) -->
-					<field
-						type="url"
-						name="tsharedurl"
-						label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_TSHAREDURL_LABEL"
-						size="40"
-						maxlength="120"
-						description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_TSHAREDURL_DESCRIPTION"
-						class="text_area span12"
-						required="false"
-						filter="url"
-						validated="url"
-						message="Error! Please add shared-url here."
-						hint="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_TSHAREDURL_HINT"
-					/>
-				</fieldset>
-			</fields>
-		</field>
-		<!-- Oauthtoken Field. Type: Text. (joomla) -->
-		<field
-			type="text"
-			name="oauthtoken"
-			label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_OAUTHTOKEN_LABEL"
-			size="250"
-			maxlength="250"
-			description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_OAUTHTOKEN_DESCRIPTION"
-			class="text_area"
-			required="true"
-			filter="STRING"
-			message="Error! Please add generated access token here."
-			hint="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_OAUTHTOKEN_HINT"
-		/>
-		<!-- Note_manual_externalsource Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_manual_externalsource" label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_MANUAL_EXTERNALSOURCE_LABEL" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_MANUAL_EXTERNALSOURCE_DESCRIPTION" heading="h4" class="alert alert-info note_manual_externalsource" />
-		<!-- Generated_access_token_note Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="generated_access_token_note" label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_GENERATED_ACCESS_TOKEN_NOTE_LABEL" description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_GENERATED_ACCESS_TOKEN_NOTE_DESCRIPTION" heading="h4" class="alert alert-info generated_access_token_note" />
-		<!-- Not_required Field. Type: Hidden. (joomla) -->
-		<field
-			type="hidden"
-			name="not_required"
-			default="[]"
-		/>
 	</fieldset>
 	
 	<!-- Access Control Fields. -->