Update with lates changes in JCB

README.md

@@ -23,7 +23,7 @@ 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 June, 2018
++ *Last Build*: 6th September, 2018
 + *Version*: 2.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
@@ -36,7 +36,7 @@ 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*: **66731**
++ *Line count*: **66852**
 + *File count*: **445**
 + *Folder count*: **93**
 

admin/README.txt

@@ -23,7 +23,7 @@ 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 June, 2018
++ *Last Build*: 6th September, 2018
 + *Version*: 2.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
@@ -36,7 +36,7 @@ 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*: **66731**
++ *Line count*: **66852**
 + *File count*: **445**
 + *Folder count*: **93**
 

admin/controller.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controller library
-jimport('joomla.application.component.controller');
-
 /**
  * General Controller of Sermondistributor component
  */

admin/controllers/ajax.json.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controller');
-
 /**
  * Sermondistributor Ajax Controller
  */

admin/controllers/external_source.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * External_source Controller
  */
@@ -42,6 +39,13 @@ class SermondistributorControllerExternal_source extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'External_sources'; // safeguard for setting the return view listing to the main view.
@@ -201,14 +205,17 @@ class SermondistributorControllerExternal_source extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('external_source.access', 'com_sermondistributor');
+		$access = $user->authorise('external_source.access', 'com_sermondistributor');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('external_source.create', $this->option);
+		return $user->authorise('external_source.create', $this->option);
 	}
 
 	/**
@@ -282,42 +289,25 @@ class SermondistributorControllerExternal_source extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -356,43 +346,45 @@ class SermondistributorControllerExternal_source extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -411,11 +403,15 @@ class SermondistributorControllerExternal_source extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -423,9 +419,22 @@ class SermondistributorControllerExternal_source extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -434,9 +443,9 @@ class SermondistributorControllerExternal_source extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/external_sources.php

@@ -25,24 +25,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * External_sources Controller
  */
 class SermondistributorControllerExternal_sources extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'External_source', $prefix = 'SermondistributorModel', $config = array())
+	protected $text_prefix = 'COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'External_source', $prefix = 'SermondistributorModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()

admin/controllers/help.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controller');
-
 /**
  * Sermondistributor Help Controller
  */

admin/controllers/help_document.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Help_document Controller
  */
@@ -42,6 +39,13 @@ class SermondistributorControllerHelp_document extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Help_documents'; // safeguard for setting the return view listing to the main view.
@@ -59,14 +63,17 @@ class SermondistributorControllerHelp_document extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('help_document.access', 'com_sermondistributor');
+		$access = $user->authorise('help_document.access', 'com_sermondistributor');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('help_document.create', $this->option);
+		return $user->authorise('help_document.create', $this->option);
 	}
 
 	/**
@@ -140,42 +147,25 @@ class SermondistributorControllerHelp_document extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -214,43 +204,45 @@ class SermondistributorControllerHelp_document extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -269,11 +261,15 @@ class SermondistributorControllerHelp_document extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -281,9 +277,22 @@ class SermondistributorControllerHelp_document extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -292,9 +301,9 @@ class SermondistributorControllerHelp_document extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/help_documents.php

@@ -25,24 +25,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Help_documents Controller
  */
 class SermondistributorControllerHelp_documents extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Help_document', $prefix = 'SermondistributorModel', $config = array())
+	protected $text_prefix = 'COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Help_document', $prefix = 'SermondistributorModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()

admin/controllers/local_listing.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Local_listing Controller
  */
@@ -42,6 +39,13 @@ class SermondistributorControllerLocal_listing extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Local_listings'; // safeguard for setting the return view listing to the main view.
@@ -59,14 +63,17 @@ class SermondistributorControllerLocal_listing extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('local_listing.access', 'com_sermondistributor');
+		$access = $user->authorise('local_listing.access', 'com_sermondistributor');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('local_listing.create', $this->option);
+		return $user->authorise('local_listing.create', $this->option);
 	}
 
 	/**
@@ -140,42 +147,25 @@ class SermondistributorControllerLocal_listing extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -214,43 +204,45 @@ class SermondistributorControllerLocal_listing extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -269,11 +261,15 @@ class SermondistributorControllerLocal_listing extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -281,9 +277,22 @@ class SermondistributorControllerLocal_listing extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -292,9 +301,9 @@ class SermondistributorControllerLocal_listing extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/local_listings.php

@@ -25,24 +25,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Local_listings Controller
  */
 class SermondistributorControllerLocal_listings extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Local_listing', $prefix = 'SermondistributorModel', $config = array())
+	protected $text_prefix = 'COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Local_listing', $prefix = 'SermondistributorModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()

admin/controllers/manual_updater.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Manual_updater Controller
  */

admin/controllers/preacher.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Preacher Controller
  */
@@ -42,6 +39,13 @@ class SermondistributorControllerPreacher extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Preachers'; // safeguard for setting the return view listing to the main view.
@@ -59,14 +63,17 @@ class SermondistributorControllerPreacher extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('preacher.access', 'com_sermondistributor');
+		$access = $user->authorise('preacher.access', 'com_sermondistributor');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('preacher.create', $this->option);
+		return $user->authorise('preacher.create', $this->option);
 	}
 
 	/**
@@ -140,42 +147,25 @@ class SermondistributorControllerPreacher extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -214,43 +204,45 @@ class SermondistributorControllerPreacher extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -269,11 +261,15 @@ class SermondistributorControllerPreacher extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -281,9 +277,22 @@ class SermondistributorControllerPreacher extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -292,9 +301,9 @@ class SermondistributorControllerPreacher extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/preachers.php

@@ -25,24 +25,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Preachers Controller
  */
 class SermondistributorControllerPreachers extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SERMONDISTRIBUTOR_PREACHERS';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Preacher', $prefix = 'SermondistributorModel', $config = array())
+	protected $text_prefix = 'COM_SERMONDISTRIBUTOR_PREACHERS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Preacher', $prefix = 'SermondistributorModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()

admin/controllers/series.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Series Controller
  */
@@ -42,6 +39,13 @@ class SermondistributorControllerSeries extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Series_list'; // safeguard for setting the return view listing to the main view.
@@ -59,14 +63,17 @@ class SermondistributorControllerSeries extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('series.access', 'com_sermondistributor');
+		$access = $user->authorise('series.access', 'com_sermondistributor');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('series.create', $this->option);
+		return $user->authorise('series.create', $this->option);
 	}
 
 	/**
@@ -140,42 +147,25 @@ class SermondistributorControllerSeries extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -214,43 +204,45 @@ class SermondistributorControllerSeries extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -269,11 +261,15 @@ class SermondistributorControllerSeries extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -281,9 +277,22 @@ class SermondistributorControllerSeries extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -292,9 +301,9 @@ class SermondistributorControllerSeries extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/series_list.php

@@ -25,24 +25,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Series_list Controller
  */
 class SermondistributorControllerSeries_list extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SERMONDISTRIBUTOR_SERIES_LIST';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Series', $prefix = 'SermondistributorModel', $config = array())
+	protected $text_prefix = 'COM_SERMONDISTRIBUTOR_SERIES_LIST';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Series', $prefix = 'SermondistributorModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()

admin/controllers/sermon.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Sermon Controller
  */
@@ -42,6 +39,13 @@ class SermondistributorControllerSermon extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Sermons'; // safeguard for setting the return view listing to the main view.
@@ -59,14 +63,17 @@ class SermondistributorControllerSermon extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('sermon.access', 'com_sermondistributor');
+		$access = $user->authorise('sermon.access', 'com_sermondistributor');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('sermon.create', $this->option);
+		return $user->authorise('sermon.create', $this->option);
 	}
 
 	/**
@@ -139,42 +146,25 @@ class SermondistributorControllerSermon extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -213,43 +203,45 @@ class SermondistributorControllerSermon extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -268,11 +260,15 @@ class SermondistributorControllerSermon extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -280,9 +276,22 @@ class SermondistributorControllerSermon extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -291,9 +300,9 @@ class SermondistributorControllerSermon extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/sermondistributor.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Sermondistributor Controller
  */

admin/controllers/sermons.php

@@ -25,24 +25,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Sermons Controller
  */
 class SermondistributorControllerSermons extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SERMONDISTRIBUTOR_SERMONS';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Sermon', $prefix = 'SermondistributorModel', $config = array())
+	protected $text_prefix = 'COM_SERMONDISTRIBUTOR_SERMONS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Sermon', $prefix = 'SermondistributorModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()

admin/controllers/statistic.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Statistic Controller
  */
@@ -42,6 +39,13 @@ class SermondistributorControllerStatistic extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Statistics'; // safeguard for setting the return view listing to the main view.
@@ -59,14 +63,17 @@ class SermondistributorControllerStatistic extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('statistic.access', 'com_sermondistributor');
+		$access = $user->authorise('statistic.access', 'com_sermondistributor');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('statistic.create', $this->option);
+		return $user->authorise('statistic.create', $this->option);
 	}
 
 	/**
@@ -140,42 +147,25 @@ class SermondistributorControllerStatistic extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
+		// get the referral options (old method use return instead see parent)
-		$layout = $this->input->get('layout', 'edit', 'string');
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
+		// get redirect info.
-		$refid 	= $this->input->get('refid', 0, 'int');
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
+		// set the referral options
-
+		if ($refid && $ref)
-		$append = '';
-
-		if ($refid)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
+			$append = '&ref='. (string)$ref . $append;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
 		}
 
 		return $append;
@@ -214,43 +204,45 @@ class SermondistributorControllerStatistic extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if ($this->refid)
+			$redirect = base64_decode($return);
-			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
 
-				// Redirect to the item screen.
+			// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -269,11 +261,15 @@ class SermondistributorControllerStatistic extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
+		// get the referral options
-		$this->ref 		= $this->input->get('ref', 0, 'word');
+		$this->ref = $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -281,9 +277,22 @@ class SermondistributorControllerStatistic extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
 			// Redirect to the item screen.
 			$this->setRedirect(
@@ -292,9 +301,9 @@ class SermondistributorControllerStatistic extends JControllerForm
 				)
 			);
 		}
-		elseif ($this->ref && $saved)
+		elseif ($this->ref)
 		{
-			$redirect = '&view='.(string)$this->ref;
+			$redirect = '&view=' . (string)$this->ref;
 
 			// Redirect to the list screen.
 			$this->setRedirect(

admin/controllers/statistics.php

@@ -25,24 +25,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Statistics Controller
  */
 class SermondistributorControllerStatistics extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_SERMONDISTRIBUTOR_STATISTICS';
 	/**
-	 * Proxy for getModel.
+	 * The prefix to use with controller messages.
-	 * @since	2.5
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Statistic', $prefix = 'SermondistributorModel', $config = array())
+	protected $text_prefix = 'COM_SERMONDISTRIBUTOR_STATISTICS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Statistic', $prefix = 'SermondistributorModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return parent::getModel($name, $prefix, $config);
-		
-		return $model;
 	}
 
 	public function exportData()

admin/helpers/sermondistributor.php

@@ -373,8 +373,13 @@ abstract class SermondistributorHelper
 	* @return  string    On success the path or url is returned based on the type requested
 	*
 	*/
-	public static function getFilePath($type = 'path', $target = 'filepath', $fileType = null, $key = '', $default = JPATH_SITE . '/images/', $createIfNotSet = true)
+	public static function getFilePath($type = 'path', $target = 'filepath', $fileType = null, $key = '', $default = '', $createIfNotSet = true)
 	{
+		// make sure to always have a string/path
+		if(!self::checkString($default))
+		{
+			$default = JPATH_SITE . '/images/';
+		}
 		// get the global settings
 		if (!self::checkObject(self::$params))
 		{
@@ -2284,34 +2289,37 @@ abstract class SermondistributorHelper
 	}
 
 	/**
-	* 	the locker
+	* the locker
 	*
-	*  	@var array 
+	* @var array 
 	**/
 	protected static $locker = array();
 
 	/**
-	* 	the dynamic replacement salt
+	* the dynamic replacement salt
 	*
-	*  	@var array 
+	* @var array 
 	**/
 	protected static $globalSalt = array();
 
 	/**
-	* 	the timer
+	* the timer
 	*
-	*  	@var object
+	* @var object
 	**/
 	protected static $keytimer;
 
 	/**
-	*	To Lock string
+	* To Lock string
+	*
+	* @param string   $string     The string/array to lock
+	* @param string   $key        The custom key to use
+	* @param int      $salt       The switch to add salt and type of salt
+	* @param int      $dynamic    The dynamic replacement array of salt build string
+	* @param int      $urlencode  The switch to control url encoding
+	*
+	* @return string    Encrypted String
 	*
-	*	@param string  $string       The string/array to lock
-	*	@param string  $key          The custom key to use
-	*	@param int      $salt           The switch to add salt and type of salt
-	*	@param int      $dynamic    The dynamic replacement array of salt build string
-	*	@param int      $urlencode  The switch to control url encoding
 	**/
 	public static function lock($string, $key = null, $salt = 2, $dynamic = null, $urlencode = true)
 	{
@@ -2325,13 +2333,13 @@ abstract class SermondistributorHelper
 			{
 				$timer = $salt;
 			}
+			// set the default key
+			$key = self::salt($timer, $dynamic);
+			// try getting the system key
 			if (method_exists(get_called_class(), "getCryptKey")) 
 			{
-				$key = self::getCryptKey('basic', self::salt($timer, $dynamic));
+				// try getting the medium key first the fall back to basic, and then default
-			}
+				$key = self::getCryptKey('medium', self::getCryptKey('basic', $key));
-			else
-			{
-				$key = self::salt($timer, $dynamic);
 			}
 		}
 		// check if we have a salt timer
@@ -2350,7 +2358,7 @@ abstract class SermondistributorHelper
 			$string = serialize($string);
 		}
 		// prep for url
-		if ($urlencode)
+		if ($urlencode && method_exists(get_called_class(), "base64_urlencode"))
 		{
 			return self::base64_urlencode(self::$locker[$key]->encryptString($string));
 		}
@@ -2358,13 +2366,16 @@ abstract class SermondistributorHelper
 	}
 
 	/**
-	* 	To un-Lock string
+	* To un-Lock string
+	*
+	* @param string  $string       The string to unlock
+	* @param string  $key          The custom key to use
+	* @param int      $salt           The switch to add salt and type of salt
+	* @param int      $dynamic    The dynamic replacement array of salt build string
+	* @param int      $urlencode  The switch to control url decoding
+	*
+	* @return string    Decrypted String
 	*
-	*	@param string  $string       The string to unlock
-	*	@param string  $key          The custom key to use
-	*	@param int      $salt           The switch to add salt and type of salt
-	*	@param int      $dynamic    The dynamic replacement array of salt build string
-	*	@param int      $urlencode  The switch to control url decoding
 	**/
 	public static function unlock($string, $key = null, $salt = 2, $dynamic = null, $urlencode = true)
 	{
@@ -2378,14 +2389,13 @@ abstract class SermondistributorHelper
 			{
 				$timer = $salt;
 			}
-			// get secure key
+			// set the default key
+			$key = self::salt($timer, $dynamic);
+			// try getting the system key
 			if (method_exists(get_called_class(), "getCryptKey")) 
 			{
-				$key = self::getCryptKey('basic', self::salt($timer, $dynamic));
+				// try getting the medium key first the fall back to basic, and then default
-			}
+				$key = self::getCryptKey('medium', self::getCryptKey('basic', $key));
-			else
-			{
-				$key = self::salt($timer, $dynamic);
 			}
 		}
 		// check if we have a salt timer
@@ -2399,7 +2409,7 @@ abstract class SermondistributorHelper
 			self::$locker[$key] = new FOFEncryptAes($key, 128);
 		}
 		// make sure we have real base64
-		if ($urlencode)
+		if ($urlencode && method_exists(get_called_class(), "base64_urldecode"))
 		{
 			$string = self::base64_urldecode($string);
 		}
@@ -2417,10 +2427,13 @@ abstract class SermondistributorHelper
 	}
 
 	/**
-	* 	The Salt
+	* The Salt
+	*
+	* @param int   $type      The type of length the salt should be valid
+	* @param int   $dynamic   The dynamic replacement array of salt build string
+	*
+	* @return string
 	*
-	*	@param int      $type          The type of length the salt should be valid
-	*	@param int      $dynamic    The dynamic replacement array of salt build string
 	**/
 	public static function salt($type = 1, $dynamic = null)
 	{
@@ -2465,9 +2478,9 @@ abstract class SermondistributorHelper
 	}
 
 	/**
-	*	The function to insure the salt is valid within the given period (third try)
+	* The function to insure the salt is valid within the given period (third try)
 	*
-	*	@param int $main    The main number
+	* @param int $main    The main number
 	*/
 	protected static function periodFix($main)
 	{
@@ -2475,8 +2488,12 @@ abstract class SermondistributorHelper
 	}
 
 	/**
-	*	Check if a string is serialized
+	* Check if a string is serialized
-	*	@param string $string
+	*
+	* @param  string   $string
+	*
+	* @return Boolean
+	*
 	*/
 	public static function is_serial($string)
 	{
@@ -2484,7 +2501,7 @@ abstract class SermondistributorHelper
 	}
 
 	/**
-	*	Get dynamic replacement salt
+	* Get dynamic replacement salt
 	*/
 	public static function getDynamicSalt($dynamic = null)
 	{
@@ -2501,7 +2518,7 @@ abstract class SermondistributorHelper
 	}
 
 	/**
-	*	The random or dynamic secret salt
+	* The random or dynamic secret salt
 	*/
 	public static function getSecretSalt($string = null, $size = 9)
 	{
@@ -2524,7 +2541,7 @@ abstract class SermondistributorHelper
 	}
 
 	/**
-	*	Get global replacement salt
+	* Get global replacement salt
 	*/
 	public static function getGlobalSalt()
 	{
@@ -2564,7 +2581,7 @@ abstract class SermondistributorHelper
 	}
 
 	/**
-	*	Close public protocol
+	* Close public protocol
 	*/
 	public static function closePublicProtocol($id, $public)
 	{
@@ -2591,7 +2608,7 @@ abstract class SermondistributorHelper
 	}
 
 	/**
-	*	Open public protocol
+	* Open public protocol
 	*/
 	public static function openPublicProtocol($SECRET, $ID, $PUBLIC)
 	{
@@ -3214,16 +3231,16 @@ abstract class SermondistributorHelper
 					{
 						if ($external)
 						{
-							if ($name = self::getVar(null, $val, $id, $name, '=', $table))
+							if ($_name = self::getVar(null, $val, $id, $name, '=', $table))
 							{
-								$names[] = $name;
+								$names[] = $_name;
 							}
 						}
 						else
 						{
-							if ($name = self::getVar($table, $val, $id, $name))
+							if ($_name = self::getVar($table, $val, $id, $name))
 							{
-								$names[] = $name;
+								$names[] = $_name;
 							}
 						}
 					}
@@ -3719,6 +3736,46 @@ abstract class SermondistributorHelper
 		}
 	}
 
+	/**
+	 * get the field object
+	 *
+	 * @param   array      $attributes   The array of attributes
+	 * @param   string     $default      The default of the field
+	 * @param   array      $options      The options to apply to the XML element
+	 *
+	 * @return  object
+	 *
+	 */
+	public static function getFieldObject(&$attributes, $default = '', $options = null)
+	{
+		// make sure we have attributes and a type value
+		if (self::checkArray($attributes) && isset($attributes['type']))
+		{
+			// make sure the form helper class is loaded
+			if (!method_exists('JFormHelper', 'loadFieldType'))
+			{
+				jimport('joomla.form.form');
+			}
+			// get field type
+			$field = JFormHelper::loadFieldType($attributes['type'],true);
+			// start field xml
+			$XML = new SimpleXMLElement('<field/>');
+			// load the attributes
+			self::xmlAddAttributes($XML, $attributes);
+			// check if we have options
+			if (self::checkArray($options))
+			{
+				// load the options
+				self::xmlAddOptions($XML, $options);
+			}
+			// setup the field
+			$field->setup($XML, $default);
+			// return the field object
+			return $field;
+		}
+		return false;
+	}
+
 	/**
 	 * Render Bool Button
 	 *
@@ -3737,8 +3794,6 @@ abstract class SermondistributorHelper
 		$args = func_get_args();
 		// check if there is additional button class
 		$additional = isset($args[1]) ? (string) $args[1] : ''; // not used at this time
-		// start the xml
-		$buttonXML = new SimpleXMLElement('<field/>');
 		// button attributes
 		$buttonAttributes = array(
 			'type' => 'radio',
@@ -3747,22 +3802,12 @@ abstract class SermondistributorHelper
 			'class' => 'btn-group',
 			'filter' => 'INT',
 			'default' => isset($args[2]) ? (int) $args[2] : 0);
-		// load the haskey attributes
-		self::xmlAddAttributes($buttonXML, $buttonAttributes);
 		// set the button options
 		$buttonOptions = array(
 			'1' => isset($args[3]) ? self::htmlEscape($args[3]) : 'JYES',
 			'0' => isset($args[4]) ? self::htmlEscape($args[4]) : 'JNO');
-		// load the button options
+		// return the input
-		self::xmlAddOptions($buttonXML, $buttonOptions);
+		return self::getFieldObject($buttonAttributes, $buttonAttributes['default'], $buttonOptions)->input;
-
-		// get the radio element
-		$button = JFormHelper::loadFieldType('radio');
-
-		// run
-		$button->setup($buttonXML, $buttonAttributes['default']);
-
-		return $button->input;
 	}
 
 	/**
@@ -3945,7 +3990,7 @@ abstract class SermondistributorHelper
 	*
 	*	@returns string on success
 	**/
-	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true)
+	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true, $keepOnlyCharacters = true)
 	{
 		if ($replaceNumbers === true)
 		{
@@ -3974,7 +4019,16 @@ abstract class SermondistributorHelper
 			$string = trim($string);
 			$string = preg_replace('/'.$spacer.'+/', ' ', $string);
 			$string = preg_replace('/\s+/', ' ', $string);
-			$string = preg_replace("/[^A-Za-z ]/", '', $string);
+			// remove all and keep only characters
+			if ($keepOnlyCharacters)
+			{
+				$string = preg_replace("/[^A-Za-z ]/", '', $string);
+			}
+			// keep both numbers and characters
+			else
+			{
+				$string = preg_replace("/[^A-Za-z0-9 ]/", '', $string);
+			}
 			// select final adaptations
 			if ($type === 'L' || $type === 'strtolower')
 			{

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

@@ -370,9 +370,9 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_USE_DESC="Allows users in this grou
 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"
-COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the external source"
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of external source"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DASHBOARD_LIST="External Sources Dashboard List"
-COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the external source"
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of external source"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DELETE="External Sources Delete"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DELETE_DESC="Allows the users in this group to delete delete external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT="External Sources Edit"
@@ -409,7 +409,7 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_N_ITEMS_UNFEATURED_1="%s External Source
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_N_ITEMS_UNPUBLISHED="%s External Sources unpublished."
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_N_ITEMS_UNPUBLISHED_1="%s External Source unpublished."
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_SUBMENU="External Sources Submenu"
-COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_SUBMENU_DESC="Allows the users in this group to update the submenu of the external source"
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_SUBMENU_DESC="Allows the users in this group to submenu of external source"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_APICRONJOB_NOTE_DESCRIPTION="You must setup a cronjob that will update your local listing with the external sources.<br /><br /><b>USE THE FOLLOWING:</b> <span id='cronjob-externalUpdate'>loading...<span class='loading-dots' ></span></span><br /><br />Please note that if your Joomla website has a Firewall installed, it will not allow cronjob via direct URL (most of the time), you will then need to adapt the cornjob request to look like a browser. For more info please read https://stackoverflow.com/a/31597823/1429677
 <script  type='text/javascript'>
 jQuery(document).ready(function($) {
@@ -668,7 +668,7 @@ COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_USE_DESC="Allows users in this group
 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"
-COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the help document"
+COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of help document"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_DELETE="Help Documents Delete"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_DELETE_DESC="Allows the users in this group to delete delete help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT="Help Documents Edit"
@@ -701,7 +701,7 @@ COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_N_ITEMS_UNFEATURED_1="%s Help Document unfe
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_N_ITEMS_UNPUBLISHED="%s Help Documents unpublished."
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_N_ITEMS_UNPUBLISHED_1="%s Help Document unpublished."
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_SUBMENU="Help Documents Submenu"
-COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the help document"
+COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to submenu of help document"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ADMIN="Admin"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ADMIN_VIEW="Admin View"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ADMIN_VIEW_DESCRIPTION="Select the view being target."
@@ -830,31 +830,31 @@ COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_USE_DESC="Allows users in this group
 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"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the local listing"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_DELETE="Local Listings Delete"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_DELETE_DESC="Allows the users in this group to delete delete local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT="Local Listings Edit"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_BUILD="Local Listings Edit Build"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_BUILD_DESC="Allows the users in this group to update the edit build of the local listing"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_BUILD_DESC="Allows the users in this group to edit build of local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_CREATED_BY="Local Listings Edit Created By"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_CREATED_DATE="Local Listings Edit Created Date"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_DESC="Allows the users in this group to edit the local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_EXTERNAL_SOURCE="Local Listings Edit External Source"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_EXTERNAL_SOURCE_DESC="Allows the users in this group to update the edit external source of the local listing"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_EXTERNAL_SOURCE_DESC="Allows the users in this group to edit external source of local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_KEY="Local Listings Edit Key"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_KEY_DESC="Allows the users in this group to update the edit key of the local listing"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_KEY_DESC="Allows the users in this group to edit key of local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_NAME="Local Listings Edit Name"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the local listing"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_NAME_DESC="Allows the users in this group to edit name of local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_OWN="Local Listings Edit Own"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_OWN_DESC="Allows the users in this group to edit edit own local listings created by them"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_SIZE="Local Listings Edit Size"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_SIZE_DESC="Allows the users in this group to update the edit size of the local listing"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_SIZE_DESC="Allows the users in this group to edit size of local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_STATE="Local Listings Edit State"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_STATE_DESC="Allows the users in this group to update the state of the local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_URL="Local Listings Edit Url"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_URL_DESC="Allows the users in this group to update the edit url of the local listing"
+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_EXPORT="Local Listings Export"
@@ -879,7 +879,7 @@ COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_N_ITEMS_UNFEATURED_1="%s Local Listing unfe
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_N_ITEMS_UNPUBLISHED="%s Local Listings unpublished."
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_N_ITEMS_UNPUBLISHED_1="%s Local Listing unpublished."
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_SUBMENU="Local Listings Submenu"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_SUBMENU_DESC="Allows the users in this group to update the submenu of the local listing"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_SUBMENU_DESC="Allows the users in this group to submenu of local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTING_BUILD="Build"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTING_BUILD_DESCRIPTION="Set the method used to add files."
 COM_SERMONDISTRIBUTOR_LOCAL_LISTING_BUILD_LABEL="Build Option"
@@ -935,12 +935,12 @@ COM_SERMONDISTRIBUTOR_MANUAL_UPDATER="Manual Updater"
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_ACCESS="Manual Updater Access"
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_ACCESS_DESC="Allows the users in this group to access Manual Updater"
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_DASHBOARD_LIST="Manual Updater Dashboard List"
-COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the Manual Updater"
+COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Manual Updater"
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_DESC="Manual Updater"
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_EXTERNAL_SOURCES_BUTTON_ACCESS="Manual Updater External Sources Button Access"
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_EXTERNAL_SOURCES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the external sources button."
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_SUBMENU="Manual Updater Submenu"
-COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_SUBMENU_DESC="Allows the users in this group to update the submenu of the Manual Updater"
+COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_SUBMENU_DESC="Allows the users in this group to submenu of Manual Updater"
 COM_SERMONDISTRIBUTOR_NEW="New"
 COM_SERMONDISTRIBUTOR_NEW_ISSUE="New Issue"
 COM_SERMONDISTRIBUTOR_NOTICE="Notice!"
@@ -973,9 +973,9 @@ COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_USE_DESC="Allows users in this group to us
 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"
-COM_SERMONDISTRIBUTOR_PREACHERS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the preacher"
+COM_SERMONDISTRIBUTOR_PREACHERS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of preacher"
 COM_SERMONDISTRIBUTOR_PREACHERS_DASHBOARD_LIST="Preachers Dashboard List"
-COM_SERMONDISTRIBUTOR_PREACHERS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the preacher"
+COM_SERMONDISTRIBUTOR_PREACHERS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of preacher"
 COM_SERMONDISTRIBUTOR_PREACHERS_DELETE="Preachers Delete"
 COM_SERMONDISTRIBUTOR_PREACHERS_DELETE_DESC="Allows the users in this group to delete delete preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_EDIT="Preachers Edit"
@@ -1011,8 +1011,9 @@ COM_SERMONDISTRIBUTOR_PREACHERS_N_ITEMS_UNFEATURED="%s Preachers unfeatured."
 COM_SERMONDISTRIBUTOR_PREACHERS_N_ITEMS_UNFEATURED_1="%s Preacher unfeatured."
 COM_SERMONDISTRIBUTOR_PREACHERS_N_ITEMS_UNPUBLISHED="%s Preachers unpublished."
 COM_SERMONDISTRIBUTOR_PREACHERS_N_ITEMS_UNPUBLISHED_1="%s Preacher unpublished."
+COM_SERMONDISTRIBUTOR_PREACHERS_PREACHER_DETAILS="Preacher Details"
 COM_SERMONDISTRIBUTOR_PREACHERS_SUBMENU="Preachers Submenu"
-COM_SERMONDISTRIBUTOR_PREACHERS_SUBMENU_DESC="Allows the users in this group to update the submenu of the preacher"
+COM_SERMONDISTRIBUTOR_PREACHERS_SUBMENU_DESC="Allows the users in this group to submenu of preacher"
 COM_SERMONDISTRIBUTOR_PREACHER_ACCESS_SITE="Preacher (Site) Access"
 COM_SERMONDISTRIBUTOR_PREACHER_ACCESS_SITE_DESC=" Allows the users in this group to access site preacher."
 COM_SERMONDISTRIBUTOR_PREACHER_ALIAS="Alias"
@@ -1099,9 +1100,9 @@ COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_USE_DESC="Allows users in this group to
 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"
-COM_SERMONDISTRIBUTOR_SERIES_LIST_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the series"
+COM_SERMONDISTRIBUTOR_SERIES_LIST_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of series"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_DASHBOARD_LIST="Series List Dashboard List"
-COM_SERMONDISTRIBUTOR_SERIES_LIST_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the series"
+COM_SERMONDISTRIBUTOR_SERIES_LIST_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of series"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_DELETE="Series List Delete"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_DELETE_DESC="Allows the users in this group to delete delete series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT="Series List Edit"
@@ -1138,7 +1139,7 @@ COM_SERMONDISTRIBUTOR_SERIES_LIST_N_ITEMS_UNFEATURED_1="%s Series unfeatured."
 COM_SERMONDISTRIBUTOR_SERIES_LIST_N_ITEMS_UNPUBLISHED="%s Series List unpublished."
 COM_SERMONDISTRIBUTOR_SERIES_LIST_N_ITEMS_UNPUBLISHED_1="%s Series unpublished."
 COM_SERMONDISTRIBUTOR_SERIES_LIST_SUBMENU="Series List Submenu"
-COM_SERMONDISTRIBUTOR_SERIES_LIST_SUBMENU_DESC="Allows the users in this group to update the submenu of the series"
+COM_SERMONDISTRIBUTOR_SERIES_LIST_SUBMENU_DESC="Allows the users in this group to submenu of series"
 COM_SERMONDISTRIBUTOR_SERIES_MODIFIED_BY_DESC="The last user that modified this Series."
 COM_SERMONDISTRIBUTOR_SERIES_MODIFIED_BY_LABEL="Modified By"
 COM_SERMONDISTRIBUTOR_SERIES_MODIFIED_DATE_DESC="The date this Series was modified."
@@ -1173,9 +1174,9 @@ COM_SERMONDISTRIBUTOR_SERMONS_BATCH_USE_DESC="Allows users in this group to use
 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"
-COM_SERMONDISTRIBUTOR_SERMONS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the sermon"
+COM_SERMONDISTRIBUTOR_SERMONS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of sermon"
 COM_SERMONDISTRIBUTOR_SERMONS_DASHBOARD_LIST="Sermons Dashboard List"
-COM_SERMONDISTRIBUTOR_SERMONS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the sermon"
+COM_SERMONDISTRIBUTOR_SERMONS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of sermon"
 COM_SERMONDISTRIBUTOR_SERMONS_DELETE="Sermons Delete"
 COM_SERMONDISTRIBUTOR_SERMONS_DELETE_DESC="Allows the users in this group to delete delete sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_EDIT="Sermons Edit"
@@ -1212,7 +1213,7 @@ COM_SERMONDISTRIBUTOR_SERMONS_N_ITEMS_UNFEATURED_1="%s Sermon unfeatured."
 COM_SERMONDISTRIBUTOR_SERMONS_N_ITEMS_UNPUBLISHED="%s Sermons unpublished."
 COM_SERMONDISTRIBUTOR_SERMONS_N_ITEMS_UNPUBLISHED_1="%s Sermon unpublished."
 COM_SERMONDISTRIBUTOR_SERMONS_SUBMENU="Sermons Submenu"
-COM_SERMONDISTRIBUTOR_SERMONS_SUBMENU_DESC="Allows the users in this group to update the submenu of the sermon"
+COM_SERMONDISTRIBUTOR_SERMONS_SUBMENU_DESC="Allows the users in this group to submenu of sermon"
 COM_SERMONDISTRIBUTOR_SERMON_ACCESS_SITE="Sermon (Site) Access"
 COM_SERMONDISTRIBUTOR_SERMON_ACCESS_SITE_DESC=" Allows the users in this group to access site sermon."
 COM_SERMONDISTRIBUTOR_SERMON_ALIAS="Alias"
@@ -1399,7 +1400,7 @@ COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_USE_DESC="Allows users in this group to u
 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"
-COM_SERMONDISTRIBUTOR_STATISTICS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the statistic"
+COM_SERMONDISTRIBUTOR_STATISTICS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of statistic"
 COM_SERMONDISTRIBUTOR_STATISTICS_DELETE="Statistics Delete"
 COM_SERMONDISTRIBUTOR_STATISTICS_DELETE_DESC="Allows the users in this group to delete delete statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_EDIT="Statistics Edit"
@@ -1436,7 +1437,7 @@ COM_SERMONDISTRIBUTOR_STATISTICS_N_ITEMS_UNFEATURED_1="%s Statistic unfeatured."
 COM_SERMONDISTRIBUTOR_STATISTICS_N_ITEMS_UNPUBLISHED="%s Statistics unpublished."
 COM_SERMONDISTRIBUTOR_STATISTICS_N_ITEMS_UNPUBLISHED_1="%s Statistic unpublished."
 COM_SERMONDISTRIBUTOR_STATISTICS_SUBMENU="Statistics Submenu"
-COM_SERMONDISTRIBUTOR_STATISTICS_SUBMENU_DESC="Allows the users in this group to update the submenu of the statistic"
+COM_SERMONDISTRIBUTOR_STATISTICS_SUBMENU_DESC="Allows the users in this group to submenu of statistic"
 COM_SERMONDISTRIBUTOR_STATISTIC_COUNTER="Counter"
 COM_SERMONDISTRIBUTOR_STATISTIC_COUNTER_DESCRIPTION="Enter number."
 COM_SERMONDISTRIBUTOR_STATISTIC_COUNTER_HINT="Number Here."
@@ -1512,5 +1513,4 @@ COM_SERMONDISTRIBUTOR_VIEW_MORE_RELEASES_ON_GITHUB="View more releases on Github
 COM_SERMONDISTRIBUTOR_VIEW_UPDATE_STATUS="View Update Status"
 COM_SERMONDISTRIBUTOR_WEBSITE="Website"
 COM_SERMONDISTRIBUTOR_YOU_DO_NOT_HAVE_PERMISSION_TO_CLEAR_LOCAL_LISTING="You do not have permission to clear local listing."
-COM_SERMONDISTRIBUTOR_YOU_DO_NOT_HAVE_PERMISSION_TO_RESET_UPDATE_STATUS="You do not have permission to reset update status."
+COM_SERMONDISTRIBUTOR_YOU_DO_NOT_HAVE_PERMISSION_TO_RESET_UPDATE_STATUS="You do not have permission to reset update status."
-PREACHERS_PREACHER_DETAILS="Preacher Details"

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

@@ -19,9 +19,9 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_USE_DESC="Allows users in this grou
 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"
-COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the external source"
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of external source"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DASHBOARD_LIST="External Sources Dashboard List"
-COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the external source"
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of external source"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DELETE="External Sources Delete"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DELETE_DESC="Allows the users in this group to delete delete external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT="External Sources Edit"
@@ -41,7 +41,7 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EXPORT_DESC="Allows the users in this gro
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_IMPORT="External Sources Import"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_IMPORT_DESC="Allows the users in this group to import import external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_SUBMENU="External Sources Submenu"
-COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_SUBMENU_DESC="Allows the users in this group to update the submenu of the external source"
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_SUBMENU_DESC="Allows the users in this group to submenu of external source"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_CLEAR_LOCAL_LISTING_BUTTON_ACCESS="External Source Clear Local Listing Button Access"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_CLEAR_LOCAL_LISTING_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear local listing button."
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_RESET_UPDATE_STATUS_BUTTON_ACCESS="External Source Reset Update Status Button Access"
@@ -53,7 +53,7 @@ COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_USE_DESC="Allows users in this group
 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"
-COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the help document"
+COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of help document"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_DELETE="Help Documents Delete"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_DELETE_DESC="Allows the users in this group to delete delete help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT="Help Documents Edit"
@@ -69,7 +69,7 @@ COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EXPORT_DESC="Allows the users in this group
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_IMPORT="Help Documents Import"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_IMPORT_DESC="Allows the users in this group to import import help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_SUBMENU="Help Documents Submenu"
-COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the help document"
+COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to submenu of help document"
 COM_SERMONDISTRIBUTOR_IMPORT_DATA="Import Data"
 COM_SERMONDISTRIBUTOR_IMPORT_DATA_DESC=" Allows users in this group to import data."
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_ACCESS="Local Listings Access"
@@ -79,31 +79,31 @@ COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_USE_DESC="Allows users in this group
 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"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the local listing"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_DELETE="Local Listings Delete"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_DELETE_DESC="Allows the users in this group to delete delete local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT="Local Listings Edit"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_BUILD="Local Listings Edit Build"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_BUILD_DESC="Allows the users in this group to update the edit build of the local listing"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_BUILD_DESC="Allows the users in this group to edit build of local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_CREATED_BY="Local Listings Edit Created By"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_CREATED_DATE="Local Listings Edit Created Date"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_DESC="Allows the users in this group to edit the local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_EXTERNAL_SOURCE="Local Listings Edit External Source"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_EXTERNAL_SOURCE_DESC="Allows the users in this group to update the edit external source of the local listing"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_EXTERNAL_SOURCE_DESC="Allows the users in this group to edit external source of local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_KEY="Local Listings Edit Key"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_KEY_DESC="Allows the users in this group to update the edit key of the local listing"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_KEY_DESC="Allows the users in this group to edit key of local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_NAME="Local Listings Edit Name"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the local listing"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_NAME_DESC="Allows the users in this group to edit name of local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_OWN="Local Listings Edit Own"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_OWN_DESC="Allows the users in this group to edit edit own local listings created by them"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_SIZE="Local Listings Edit Size"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_SIZE_DESC="Allows the users in this group to update the edit size of the local listing"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_SIZE_DESC="Allows the users in this group to edit size of local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_STATE="Local Listings Edit State"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_STATE_DESC="Allows the users in this group to update the state of the local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_URL="Local Listings Edit Url"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_URL_DESC="Allows the users in this group to update the edit url of the local listing"
+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_EXPORT="Local Listings Export"
@@ -111,15 +111,15 @@ COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EXPORT_DESC="Allows the users in this group
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_IMPORT="Local Listings Import"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_IMPORT_DESC="Allows the users in this group to import import local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_SUBMENU="Local Listings Submenu"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_SUBMENU_DESC="Allows the users in this group to update the submenu of the local listing"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_SUBMENU_DESC="Allows the users in this group to submenu of local listing"
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_ACCESS="Manual Updater Access"
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_ACCESS_DESC="Allows the users in this group to access Manual Updater"
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_DASHBOARD_LIST="Manual Updater Dashboard List"
-COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the Manual Updater"
+COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Manual Updater"
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_EXTERNAL_SOURCES_BUTTON_ACCESS="Manual Updater External Sources Button Access"
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_EXTERNAL_SOURCES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the external sources button."
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_SUBMENU="Manual Updater Submenu"
-COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_SUBMENU_DESC="Allows the users in this group to update the submenu of the Manual Updater"
+COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_SUBMENU_DESC="Allows the users in this group to submenu of Manual Updater"
 COM_SERMONDISTRIBUTOR_MENU="» Sermon Distributor"
 COM_SERMONDISTRIBUTOR_MENU_CATEGORIES_DESC="All categories that are published"
 COM_SERMONDISTRIBUTOR_MENU_CATEGORIES_OPTION="Categories"
@@ -151,9 +151,9 @@ COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_USE_DESC="Allows users in this group to us
 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"
-COM_SERMONDISTRIBUTOR_PREACHERS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the preacher"
+COM_SERMONDISTRIBUTOR_PREACHERS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of preacher"
 COM_SERMONDISTRIBUTOR_PREACHERS_DASHBOARD_LIST="Preachers Dashboard List"
-COM_SERMONDISTRIBUTOR_PREACHERS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the preacher"
+COM_SERMONDISTRIBUTOR_PREACHERS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of preacher"
 COM_SERMONDISTRIBUTOR_PREACHERS_DELETE="Preachers Delete"
 COM_SERMONDISTRIBUTOR_PREACHERS_DELETE_DESC="Allows the users in this group to delete delete preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_EDIT="Preachers Edit"
@@ -173,7 +173,7 @@ COM_SERMONDISTRIBUTOR_PREACHERS_EXPORT_DESC="Allows the users in this group to e
 COM_SERMONDISTRIBUTOR_PREACHERS_IMPORT="Preachers Import"
 COM_SERMONDISTRIBUTOR_PREACHERS_IMPORT_DESC="Allows the users in this group to import import preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_SUBMENU="Preachers Submenu"
-COM_SERMONDISTRIBUTOR_PREACHERS_SUBMENU_DESC="Allows the users in this group to update the submenu of the preacher"
+COM_SERMONDISTRIBUTOR_PREACHERS_SUBMENU_DESC="Allows the users in this group to submenu of preacher"
 COM_SERMONDISTRIBUTOR_PREACHER_ACCESS_SITE="Preacher (Site) Access"
 COM_SERMONDISTRIBUTOR_PREACHER_ACCESS_SITE_DESC=" Allows the users in this group to access site preacher."
 COM_SERMONDISTRIBUTOR_SERIES_ACCESS_SITE="Series (Site) Access"
@@ -187,9 +187,9 @@ COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_USE_DESC="Allows users in this group to
 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"
-COM_SERMONDISTRIBUTOR_SERIES_LIST_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the series"
+COM_SERMONDISTRIBUTOR_SERIES_LIST_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of series"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_DASHBOARD_LIST="Series List Dashboard List"
-COM_SERMONDISTRIBUTOR_SERIES_LIST_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the series"
+COM_SERMONDISTRIBUTOR_SERIES_LIST_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of series"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_DELETE="Series List Delete"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_DELETE_DESC="Allows the users in this group to delete delete series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT="Series List Edit"
@@ -209,7 +209,7 @@ COM_SERMONDISTRIBUTOR_SERIES_LIST_EXPORT_DESC="Allows the users in this group to
 COM_SERMONDISTRIBUTOR_SERIES_LIST_IMPORT="Series List Import"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_IMPORT_DESC="Allows the users in this group to import import series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_SUBMENU="Series List Submenu"
-COM_SERMONDISTRIBUTOR_SERIES_LIST_SUBMENU_DESC="Allows the users in this group to update the submenu of the series"
+COM_SERMONDISTRIBUTOR_SERIES_LIST_SUBMENU_DESC="Allows the users in this group to submenu of series"
 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"
@@ -217,9 +217,9 @@ COM_SERMONDISTRIBUTOR_SERMONS_BATCH_USE_DESC="Allows users in this group to use
 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"
-COM_SERMONDISTRIBUTOR_SERMONS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the sermon"
+COM_SERMONDISTRIBUTOR_SERMONS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of sermon"
 COM_SERMONDISTRIBUTOR_SERMONS_DASHBOARD_LIST="Sermons Dashboard List"
-COM_SERMONDISTRIBUTOR_SERMONS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the sermon"
+COM_SERMONDISTRIBUTOR_SERMONS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of sermon"
 COM_SERMONDISTRIBUTOR_SERMONS_DELETE="Sermons Delete"
 COM_SERMONDISTRIBUTOR_SERMONS_DELETE_DESC="Allows the users in this group to delete delete sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_EDIT="Sermons Edit"
@@ -239,7 +239,7 @@ COM_SERMONDISTRIBUTOR_SERMONS_EXPORT_DESC="Allows the users in this group to exp
 COM_SERMONDISTRIBUTOR_SERMONS_IMPORT="Sermons Import"
 COM_SERMONDISTRIBUTOR_SERMONS_IMPORT_DESC="Allows the users in this group to import import sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_SUBMENU="Sermons Submenu"
-COM_SERMONDISTRIBUTOR_SERMONS_SUBMENU_DESC="Allows the users in this group to update the submenu of the sermon"
+COM_SERMONDISTRIBUTOR_SERMONS_SUBMENU_DESC="Allows the users in this group to submenu of sermon"
 COM_SERMONDISTRIBUTOR_SERMON_ACCESS_SITE="Sermon (Site) Access"
 COM_SERMONDISTRIBUTOR_SERMON_ACCESS_SITE_DESC=" Allows the users in this group to access site sermon."
 COM_SERMONDISTRIBUTOR_STATISTICS_ACCESS="Statistics Access"
@@ -249,7 +249,7 @@ COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_USE_DESC="Allows users in this group to u
 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"
-COM_SERMONDISTRIBUTOR_STATISTICS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the statistic"
+COM_SERMONDISTRIBUTOR_STATISTICS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of statistic"
 COM_SERMONDISTRIBUTOR_STATISTICS_DELETE="Statistics Delete"
 COM_SERMONDISTRIBUTOR_STATISTICS_DELETE_DESC="Allows the users in this group to delete delete statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_EDIT="Statistics Edit"
@@ -269,6 +269,6 @@ COM_SERMONDISTRIBUTOR_STATISTICS_EXPORT_DESC="Allows the users in this group to
 COM_SERMONDISTRIBUTOR_STATISTICS_IMPORT="Statistics Import"
 COM_SERMONDISTRIBUTOR_STATISTICS_IMPORT_DESC="Allows the users in this group to import import statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_SUBMENU="Statistics Submenu"
-COM_SERMONDISTRIBUTOR_STATISTICS_SUBMENU_DESC="Allows the users in this group to update the submenu of the statistic"
+COM_SERMONDISTRIBUTOR_STATISTICS_SUBMENU_DESC="Allows the users in this group to submenu of statistic"
 COM_SERMONDISTRIBUTOR_USE_BATCH="Use Batch"
 COM_SERMONDISTRIBUTOR_USE_BATCH_DESC=" Allows users in this group to use batch copy/update method."

admin/layouts/batchselection.php

@@ -26,8 +26,8 @@
 defined('JPATH_BASE') or die;
 
 JHtmlBehavior::core();
-$divWrapper 	= range(1,120,2);
+$divWrapper = range(1,120,2);
-$counter 		= 0;
+$counter = 0;
 ?>
 <?php if ($displayData->ListSelection) : ?>
 <div class="row-fluid">

admin/layouts/external_source/build_option_fullwidth.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/external_source/details_above.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/external_source/details_fullwidth.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/external_source/details_left.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/external_source/details_right.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/external_source/details_under.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/external_source/publishing.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();

admin/layouts/external_source/publlshing.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();

admin/layouts/help_document/details_above.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/help_document/details_fullwidth.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/help_document/details_left.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/help_document/details_right.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/help_document/details_under.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/help_document/metadata.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/help_document/publishing.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();

admin/layouts/local_listing/details_above.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/local_listing/details_fullwidth.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/local_listing/details_left.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/local_listing/details_right.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/local_listing/publishing.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();

admin/layouts/local_listing/publlshing.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();

admin/layouts/preacher/details_above.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/preacher/details_fullwidth.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/preacher/details_left.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/preacher/details_right.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/preacher/metadata.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/preacher/publishing.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();

admin/layouts/preacher/sermons_fullwidth.php

@@ -23,17 +23,29 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->vvvsermons;
+$items = $displayData->vvvsermons;
-$user	= JFactory::getUser();
+$user = JFactory::getUser();
-$id	= $displayData->item->id;
+$id = $displayData->item->id;
+// set the edit URL
 $edit = "index.php?option=com_sermondistributor&view=sermons&task=sermon.edit";
-$ref = ($id) ? "&ref=preacher&refid=".$id : "";
+// 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;
+if ($_return = $jinput->get('return', null, 'base64'))
+{
+	$return .= "&return=" . $_return;
+}
+// set the referral values
+$ref = ($id) ? "&ref=preacher&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "";
+// set the create new URL
 $new = "index.php?option=com_sermondistributor&view=sermon&layout=edit".$ref;
+// set the create new and close URL
 $close_new = "index.php?option=com_sermondistributor&view=sermon&layout=edit";
+// load the action object
 $can = SermondistributorHelper::getActions('sermon');
 
 ?>
@@ -87,7 +99,7 @@ $can = SermondistributorHelper::getActions('sermon');
 	<tr>
 		<td>
 			<?php if ($canDo->get('sermon.edit')): ?>
-				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=preacher&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->name); ?></a>
+				<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 endif; ?>
@@ -100,7 +112,7 @@ $can = SermondistributorHelper::getActions('sermon');
 		</td>
 		<td>
 			<?php if ($user->authorise('series.edit', 'com_sermondistributor.series.' . (int)$item->series)): ?>
-				<a href="index.php?option=com_sermondistributor&view=all_series&task=series.edit&id=<?php echo $item->series; ?>&ref=preacher&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->series_name); ?></a>
+				<a href="index.php?option=com_sermondistributor&view=all_series&task=series.edit&id=<?php echo $item->series; ?><?php echo $ref; ?>"><?php echo $displayData->escape($item->series_name); ?></a>
 			<?php else: ?>
 				<?php echo $displayData->escape($item->series_name); ?>
 			<?php endif; ?>

admin/layouts/series/details_above.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/series/details_fullwidth.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/series/details_left.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/series/details_right.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/series/metadata.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/series/publishing.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();

admin/layouts/series/sermons_fullwidth.php

@@ -23,16 +23,27 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->vwcsermons;
+$items = $displayData->vwcsermons;
-$user	= JFactory::getUser();
+$user = JFactory::getUser();
-$id	= $displayData->item->id;
+$id = $displayData->item->id;
+// set the edit URL
 $edit = "index.php?option=com_sermondistributor&view=sermons&task=sermon.edit";
-$ref = ($id) ? "&ref=series&refid=".$id : "";
+// 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;
+if ($_return = $jinput->get('return', null, 'base64'))
+{
+	$return .= "&return=" . $_return;
+}
+// set the referral values
+$ref = ($id) ? "&ref=series&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "";
+// set the create new URL
 $new = "index.php?option=com_sermondistributor&view=sermon&layout=edit".$ref;
+// load the action object
 $can = SermondistributorHelper::getActions('sermon');
 
 ?>
@@ -83,7 +94,7 @@ $can = SermondistributorHelper::getActions('sermon');
 	<tr>
 		<td>
 			<?php if ($canDo->get('sermon.edit')): ?>
-				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=series&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->name); ?></a>
+				<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 endif; ?>
@@ -93,7 +104,7 @@ $can = SermondistributorHelper::getActions('sermon');
 		</td>
 		<td>
 			<?php if ($user->authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int)$item->preacher)): ?>
-				<a href="index.php?option=com_sermondistributor&view=preachers&task=preacher.edit&id=<?php echo $item->preacher; ?>&ref=series&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->preacher_name); ?></a>
+				<a href="index.php?option=com_sermondistributor&view=preachers&task=preacher.edit&id=<?php echo $item->preacher; ?><?php echo $ref; ?>"><?php echo $displayData->escape($item->preacher_name); ?></a>
 			<?php else: ?>
 				<?php echo $displayData->escape($item->preacher_name); ?>
 			<?php endif; ?>

admin/layouts/sermon/details_above.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/sermon/details_fullwidth.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/sermon/details_left.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/sermon/details_right.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/sermon/details_under.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/sermon/files_fullwidth.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/sermon/metadata.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/sermon/publishing.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();

admin/layouts/sermon/stastics_fullwidth.php

@@ -23,14 +23,24 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->vwbstastics;
+$items = $displayData->vwbstastics;
-$user	= JFactory::getUser();
+$user = JFactory::getUser();
-$id	= $displayData->item->id;
+$id = $displayData->item->id;
-$edit = "index.php?option=com_sermondistributor&view=statistics&task=statistic.edit";
+// 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;
+if ($_return = $jinput->get('return', null, 'base64'))
+{
+	$return .= "&return=" . $_return;
+}
+// set the referral values
+$ref = ($id) ? "&ref=sermon&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "";
 
 ?>
 <div class="form-vertical">
@@ -71,7 +81,7 @@ $edit = "index.php?option=com_sermondistributor&view=statistics&task=statistic.e
 	<tr>
 		<td>
 			<?php if ($canDo->get('statistic.edit')): ?>
-				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=sermon&refid=<?php echo $id; ?>"><?php echo $item->filename; ?></a>
+				<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 endif; ?>
@@ -84,14 +94,14 @@ $edit = "index.php?option=com_sermondistributor&view=statistics&task=statistic.e
 		</td>
 		<td>
 			<?php if ($user->authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int)$item->preacher)): ?>
-				<a href="index.php?option=com_sermondistributor&view=preachers&task=preacher.edit&id=<?php echo $item->preacher; ?>&ref=sermon&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->preacher_name); ?></a>
+				<a href="index.php?option=com_sermondistributor&view=preachers&task=preacher.edit&id=<?php echo $item->preacher; ?><?php echo $ref; ?>"><?php echo $displayData->escape($item->preacher_name); ?></a>
 			<?php else: ?>
 				<?php echo $displayData->escape($item->preacher_name); ?>
 			<?php endif; ?>
 		</td>
 		<td>
 			<?php if ($user->authorise('series.edit', 'com_sermondistributor.series.' . (int)$item->series)): ?>
-				<a href="index.php?option=com_sermondistributor&view=all_series&task=series.edit&id=<?php echo $item->series; ?>&ref=sermon&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->series_name); ?></a>
+				<a href="index.php?option=com_sermondistributor&view=all_series&task=series.edit&id=<?php echo $item->series; ?><?php echo $ref; ?>"><?php echo $displayData->escape($item->series_name); ?></a>
 			<?php else: ?>
 				<?php echo $displayData->escape($item->series_name); ?>
 			<?php endif; ?>

admin/layouts/statistic/details_above.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/statistic/details_left.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/statistic/details_right.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/statistic/metadata.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();

admin/layouts/statistic/publishing.php

@@ -23,7 +23,6 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();

admin/models/ajax.php

@@ -25,8 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-jimport('joomla.application.component.helper');
-
 /**
  * Sermondistributor Ajax Model
  */

admin/models/external_source.php

@@ -27,9 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Sermondistributor External_source Model
  */
@@ -62,6 +59,9 @@ class SermondistributorModelExternal_source extends JModelAdmin
 	 */
 	public function getTable($type = 'external_source', $prefix = 'SermondistributorTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_sermondistributor/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
@@ -200,15 +200,18 @@ class SermondistributorModelExternal_source extends JModelAdmin
 	 *
 	 * @param   array    $data      Data for the form.
 	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 * @param   array    $options   Optional array of options for the form creation.
 	 *
 	 * @return  mixed  A JForm object on success, false on failure
 	 *
 	 * @since   1.6
 	 */
-	public function getForm($data = array(), $loadData = true)
+	public function getForm($data = array(), $loadData = true, $options = array('control' => 'jform'))
-	{
+	{
+		// set load data option
+		$options['load_data'] = $loadData;
 		// Get the form.
-		$form = $this->loadForm('com_sermondistributor.external_source', 'external_source', array('control' => 'jform', 'load_data' => $loadData));
+		$form = $this->loadForm('com_sermondistributor.external_source', 'external_source', $options);
 
 		if (empty($form))
 		{
@@ -271,17 +274,20 @@ class SermondistributorModelExternal_source extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
+			// Set redirected view name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
+			$redirectedView = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
+			// Set field name (or fall back to view name)
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}
 

admin/models/external_sources.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * External_sources Model
  */

admin/models/fields/externalsource.php

@@ -73,9 +73,15 @@ class JFormFieldExternalsource extends JFormFieldList
 			$refJ = '';
 			if (!is_null($values['id']) && strlen($values['view']))
 			{
-				// only load referal if not new item.
+				// only load referral if not new item.
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
+				// get the return value.
+				$_uri = (string) JUri::getInstance();
+				$_return = urlencode(base64_encode($_uri));
+				// load return value.
+				$ref .= '&return=' . $_return;
+				$refJ .= '&return=' . $_return;
 			}
 			$user = JFactory::getUser();
 			// only add if user allowed to create external_source

admin/models/fields/sermon.php

@@ -73,9 +73,15 @@ class JFormFieldSermon extends JFormFieldList
 			$refJ = '';
 			if (!is_null($values['id']) && strlen($values['view']))
 			{
-				// only load referal if not new item.
+				// only load referral if not new item.
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
+				// get the return value.
+				$_uri = (string) JUri::getInstance();
+				$_return = urlencode(base64_encode($_uri));
+				// load return value.
+				$ref .= '&return=' . $_return;
+				$refJ .= '&return=' . $_return;
 			}
 			$user = JFactory::getUser();
 			// only add if user allowed to create sermon

admin/models/forms/preacher.xml

@@ -142,6 +142,7 @@
 			class="text_area"
 			filter="url"
 			validated="url"
+			scheme="http,https"
 			message="COM_SERMONDISTRIBUTOR_PREACHER_WEBSITE_MESSAGE"
 			hint="COM_SERMONDISTRIBUTOR_PREACHER_WEBSITE_HINT"
 		/>

admin/models/help_document.php

@@ -27,9 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Sermondistributor Help_document Model
  */
@@ -62,6 +59,9 @@ class SermondistributorModelHelp_document extends JModelAdmin
 	 */
 	public function getTable($type = 'help_document', $prefix = 'SermondistributorTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_sermondistributor/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -115,15 +115,18 @@ class SermondistributorModelHelp_document extends JModelAdmin
 	 *
 	 * @param   array    $data      Data for the form.
 	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 * @param   array    $options   Optional array of options for the form creation.
 	 *
 	 * @return  mixed  A JForm object on success, false on failure
 	 *
 	 * @since   1.6
 	 */
-	public function getForm($data = array(), $loadData = true)
+	public function getForm($data = array(), $loadData = true, $options = array('control' => 'jform'))
-	{
+	{
+		// set load data option
+		$options['load_data'] = $loadData;
 		// Get the form.
-		$form = $this->loadForm('com_sermondistributor.help_document', 'help_document', array('control' => 'jform', 'load_data' => $loadData));
+		$form = $this->loadForm('com_sermondistributor.help_document', 'help_document', $options);
 
 		if (empty($form))
 		{
@@ -184,17 +187,20 @@ class SermondistributorModelHelp_document extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
+			// Set redirected view name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
+			$redirectedView = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
+			// Set field name (or fall back to view name)
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}
 

admin/models/help_documents.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Help_documents Model
  */

admin/models/local_listing.php

@@ -27,9 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Sermondistributor Local_listing Model
  */
@@ -62,6 +59,9 @@ class SermondistributorModelLocal_listing extends JModelAdmin
 	 */
 	public function getTable($type = 'local_listing', $prefix = 'SermondistributorTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_sermondistributor/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
@@ -152,15 +152,18 @@ class SermondistributorModelLocal_listing extends JModelAdmin
 	 *
 	 * @param   array    $data      Data for the form.
 	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 * @param   array    $options   Optional array of options for the form creation.
 	 *
 	 * @return  mixed  A JForm object on success, false on failure
 	 *
 	 * @since   1.6
 	 */
-	public function getForm($data = array(), $loadData = true)
+	public function getForm($data = array(), $loadData = true, $options = array('control' => 'jform'))
-	{
+	{
+		// set load data option
+		$options['load_data'] = $loadData;
 		// Get the form.
-		$form = $this->loadForm('com_sermondistributor.local_listing', 'local_listing', array('control' => 'jform', 'load_data' => $loadData));
+		$form = $this->loadForm('com_sermondistributor.local_listing', 'local_listing', $options);
 
 		if (empty($form))
 		{
@@ -228,6 +231,7 @@ class SermondistributorModelLocal_listing extends JModelAdmin
 			$form->setFieldAttribute('name', 'disabled', 'true');
 			// Disable fields for display.
 			$form->setFieldAttribute('name', 'readonly', 'true');
+			// If there is no value continue.
 			if (!$form->getValue('name'))
 			{
 				// Disable fields while saving.
@@ -244,6 +248,7 @@ class SermondistributorModelLocal_listing extends JModelAdmin
 			$form->setFieldAttribute('build', 'disabled', 'true');
 			// Disable fields for display.
 			$form->setFieldAttribute('build', 'readonly', 'true');
+			// If there is no value continue.
 			if (!$form->getValue('build'))
 			{
 				// Disable fields while saving.
@@ -260,6 +265,7 @@ class SermondistributorModelLocal_listing extends JModelAdmin
 			$form->setFieldAttribute('size', 'disabled', 'true');
 			// Disable fields for display.
 			$form->setFieldAttribute('size', 'readonly', 'true');
+			// If there is no value continue.
 			if (!$form->getValue('size'))
 			{
 				// Disable fields while saving.
@@ -276,6 +282,7 @@ class SermondistributorModelLocal_listing extends JModelAdmin
 			$form->setFieldAttribute('external_source', 'disabled', 'true');
 			// Disable fields for display.
 			$form->setFieldAttribute('external_source', 'readonly', 'true');
+			// If there is no value continue.
 			if (!$form->getValue('external_source'))
 			{
 				// Disable fields while saving.
@@ -292,6 +299,7 @@ class SermondistributorModelLocal_listing extends JModelAdmin
 			$form->setFieldAttribute('key', 'disabled', 'true');
 			// Disable fields for display.
 			$form->setFieldAttribute('key', 'readonly', 'true');
+			// If there is no value continue.
 			if (!$form->getValue('key'))
 			{
 				// Disable fields while saving.
@@ -308,6 +316,7 @@ class SermondistributorModelLocal_listing extends JModelAdmin
 			$form->setFieldAttribute('url', 'disabled', 'true');
 			// Disable fields for display.
 			$form->setFieldAttribute('url', 'readonly', 'true');
+			// If there is no value continue.
 			if (!$form->getValue('url'))
 			{
 				// Disable fields while saving.
@@ -319,17 +328,20 @@ class SermondistributorModelLocal_listing extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
+			// Set redirected view name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
+			$redirectedView = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
+			// Set field name (or fall back to view name)
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}
 

admin/models/local_listings.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Local_listings Model
  */

admin/models/manual_updater.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Sermondistributor Model for Manual_updater
  */
@@ -122,11 +119,13 @@ class SermondistributorModelManual_updater extends JModelList
 			{
 				// Always create a slug for sef URL's
 				$item->slug = (isset($item->alias) && isset($item->id)) ? $item->id.':'.$item->alias : $item->id;
+				// Check if we can decode filetypes
 				if (SermondistributorHelper::checkJson($item->filetypes))
 				{
 					// Decode filetypes
 					$item->filetypes = json_decode($item->filetypes, true);
 				}
+				// Check if we can decode oauthtoken
 				if (!empty($item->oauthtoken) && $basickey && !is_numeric($item->oauthtoken) && $item->oauthtoken === base64_encode(base64_decode($item->oauthtoken, true)))
 				{
 					// Decode oauthtoken
@@ -139,7 +138,6 @@ class SermondistributorModelManual_updater extends JModelList
 		return $items;
 	}
 
-
 	/**
 	 * Get the uikit needed components
 	 *

admin/models/preacher.php

@@ -27,9 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Sermondistributor Preacher Model
  */
@@ -62,6 +59,9 @@ class SermondistributorModelPreacher extends JModelAdmin
 	 */
 	public function getTable($type = 'preacher', $prefix = 'SermondistributorTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_sermondistributor/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -250,15 +250,18 @@ class SermondistributorModelPreacher extends JModelAdmin
 	 *
 	 * @param   array    $data      Data for the form.
 	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 * @param   array    $options   Optional array of options for the form creation.
 	 *
 	 * @return  mixed  A JForm object on success, false on failure
 	 *
 	 * @since   1.6
 	 */
-	public function getForm($data = array(), $loadData = true)
+	public function getForm($data = array(), $loadData = true, $options = array('control' => 'jform'))
-	{
+	{
+		// set load data option
+		$options['load_data'] = $loadData;
 		// Get the form.
-		$form = $this->loadForm('com_sermondistributor.preacher', 'preacher', array('control' => 'jform', 'load_data' => $loadData));
+		$form = $this->loadForm('com_sermondistributor.preacher', 'preacher', $options);
 
 		if (empty($form))
 		{
@@ -321,17 +324,20 @@ class SermondistributorModelPreacher extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
+			// Set redirected view name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
+			$redirectedView = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
+			// Set field name (or fall back to view name)
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}
 

admin/models/preachers.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Preachers Model
  */

admin/models/series.php

@@ -27,9 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Sermondistributor Series Model
  */
@@ -62,6 +59,9 @@ class SermondistributorModelSeries extends JModelAdmin
 	 */
 	public function getTable($type = 'series', $prefix = 'SermondistributorTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_sermondistributor/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -250,15 +250,18 @@ class SermondistributorModelSeries extends JModelAdmin
 	 *
 	 * @param   array    $data      Data for the form.
 	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 * @param   array    $options   Optional array of options for the form creation.
 	 *
 	 * @return  mixed  A JForm object on success, false on failure
 	 *
 	 * @since   1.6
 	 */
-	public function getForm($data = array(), $loadData = true)
+	public function getForm($data = array(), $loadData = true, $options = array('control' => 'jform'))
-	{
+	{
+		// set load data option
+		$options['load_data'] = $loadData;
 		// Get the form.
-		$form = $this->loadForm('com_sermondistributor.series', 'series', array('control' => 'jform', 'load_data' => $loadData));
+		$form = $this->loadForm('com_sermondistributor.series', 'series', $options);
 
 		if (empty($form))
 		{
@@ -321,17 +324,20 @@ class SermondistributorModelSeries extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
+			// Set redirected view name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
+			$redirectedView = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
+			// Set field name (or fall back to view name)
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}
 

admin/models/series_list.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Series_list Model
  */

admin/models/sermon.php

@@ -27,9 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Sermondistributor Sermon Model
  */
@@ -62,6 +59,9 @@ class SermondistributorModelSermon extends JModelAdmin
 	 */
 	public function getTable($type = 'sermon', $prefix = 'SermondistributorTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_sermondistributor/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -213,15 +213,18 @@ class SermondistributorModelSermon extends JModelAdmin
 	 *
 	 * @param   array    $data      Data for the form.
 	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 * @param   array    $options   Optional array of options for the form creation.
 	 *
 	 * @return  mixed  A JForm object on success, false on failure
 	 *
 	 * @since   1.6
 	 */
-	public function getForm($data = array(), $loadData = true)
+	public function getForm($data = array(), $loadData = true, $options = array('control' => 'jform'))
-	{
+	{
+		// set load data option
+		$options['load_data'] = $loadData;
 		// Get the form.
-		$form = $this->loadForm('com_sermondistributor.sermon', 'sermon', array('control' => 'jform', 'load_data' => $loadData));
+		$form = $this->loadForm('com_sermondistributor.sermon', 'sermon', $options);
 
 		if (empty($form))
 		{
@@ -284,17 +287,20 @@ class SermondistributorModelSermon extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
+			// Set redirected view name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
+			$redirectedView = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
+			// Set field name (or fall back to view name)
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}
 

admin/models/sermondistributor.php

@@ -25,10 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-jimport('joomla.application.component.helper');
-
 /**
  * Sermondistributor Model
  */

admin/models/sermons.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Sermons Model
  */

admin/models/statistic.php

@@ -27,9 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Sermondistributor Statistic Model
  */
@@ -62,6 +59,9 @@ class SermondistributorModelStatistic extends JModelAdmin
 	 */
 	public function getTable($type = 'statistic', $prefix = 'SermondistributorTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_sermondistributor/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -109,15 +109,18 @@ class SermondistributorModelStatistic extends JModelAdmin
 	 *
 	 * @param   array    $data      Data for the form.
 	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 * @param   array    $options   Optional array of options for the form creation.
 	 *
 	 * @return  mixed  A JForm object on success, false on failure
 	 *
 	 * @since   1.6
 	 */
-	public function getForm($data = array(), $loadData = true)
+	public function getForm($data = array(), $loadData = true, $options = array('control' => 'jform'))
-	{
+	{
+		// set load data option
+		$options['load_data'] = $loadData;
 		// Get the form.
-		$form = $this->loadForm('com_sermondistributor.statistic', 'statistic', array('control' => 'jform', 'load_data' => $loadData));
+		$form = $this->loadForm('com_sermondistributor.statistic', 'statistic', $options);
 
 		if (empty($form))
 		{
@@ -180,17 +183,20 @@ class SermondistributorModelStatistic extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
+			// Set redirected view name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
+			$redirectedView = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
+			// Set field name (or fall back to view name)
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
 				$form->setValue($redirectedField, null, $redirectedValue);
 			}
 		}
-
 		return $form;
 	}
 

admin/models/statistics.php

@@ -25,9 +25,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Statistics Model
  */

admin/sermondistributor.php

@@ -24,29 +24,22 @@
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
+JHtml::_('behavior.tabstate');
 
 // Access check.
 if (!JFactory::getUser()->authorise('core.manage', 'com_sermondistributor'))
 {
-	return JError::raiseWaring(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 };
 
-// Load cms libraries
-JLoader::registerPrefix('J', JPATH_PLATFORM . '/cms');
-// Load joomla libraries without overwrite
-JLoader::registerPrefix('J', JPATH_PLATFORM . '/joomla',false);
-
 // Add CSS file for all pages
 $document = JFactory::getDocument();
 $document->addStyleSheet('components/com_sermondistributor/assets/css/admin.css');
 $document->addScript('components/com_sermondistributor/assets/js/admin.js');
 
 // require helper files
-JLoader::register('SermondistributorHelper', dirname(__FILE__) . '/helpers/sermondistributor.php'); 
+JLoader::register('SermondistributorHelper', __DIR__ . '/helpers/sermondistributor.php'); 
-JLoader::register('JHtmlBatch_', dirname(__FILE__) . '/helpers/html/batch_.php'); 
+JLoader::register('JHtmlBatch_', __DIR__ . '/helpers/html/batch_.php'); 
-
-// import joomla controller library
-jimport('joomla.application.component.controller');
 
 // Get an instance of the controller prefixed by Sermondistributor
 $controller = JControllerLegacy::getInstance('Sermondistributor');

admin/tables/external_source.php

@@ -27,9 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * External_sources Table class
  */

admin/tables/help_document.php

@@ -27,9 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Help_documents Table class
  */

admin/tables/local_listing.php

@@ -27,9 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Local_listings Table class
  */

admin/tables/preacher.php

@@ -27,9 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Preachers Table class
  */

admin/tables/series.php

@@ -27,9 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Series_list Table class
  */