diff --git a/README.md b/README.md index bb99e3c7..0286478c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Sermon Distributor (2.0.x) +# Sermon Distributor (2.1.x) ![Sermon Distributor image](https://raw.githubusercontent.com/Llewellynvdm/Joomla-Sermon-Distributor/master/admin/assets/images/vdm-component.jpg "The Sermon Distributor") @@ -24,8 +24,8 @@ 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*: 2nd March, 2022 -+ *Version*: 2.0.x ++ *Last Build*: 27th May, 2022 ++ *Version*: 2.1.x + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -37,11 +37,11 @@ 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*: **73932** ++ *Line count*: **74036** + *File count*: **472** + *Folder count*: **99** -**136 Hours** or **17 Eight Hour Days** (the actual time the author spent) +**137 Hours** or **17 Eight Hour Days** (the actual time the author spent) > (with the following break down: > **debugging @52hours** = codingtime / 4; @@ -49,7 +49,7 @@ due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder > **mapping @21hours** = codingtime / 10; > **office @34hours** = codingtime / 6;) -**342 Hours** or **43 Eight Hour Days** +**343 Hours** or **43 Eight Hour Days** (a total of the realistic time frame for this project) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, diff --git a/admin/README.txt b/admin/README.txt index bb99e3c7..0286478c 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -1,4 +1,4 @@ -# Sermon Distributor (2.0.x) +# Sermon Distributor (2.1.x) ![Sermon Distributor image](https://raw.githubusercontent.com/Llewellynvdm/Joomla-Sermon-Distributor/master/admin/assets/images/vdm-component.jpg "The Sermon Distributor") @@ -24,8 +24,8 @@ 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*: 2nd March, 2022 -+ *Version*: 2.0.x ++ *Last Build*: 27th May, 2022 ++ *Version*: 2.1.x + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -37,11 +37,11 @@ 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*: **73932** ++ *Line count*: **74036** + *File count*: **472** + *Folder count*: **99** -**136 Hours** or **17 Eight Hour Days** (the actual time the author spent) +**137 Hours** or **17 Eight Hour Days** (the actual time the author spent) > (with the following break down: > **debugging @52hours** = codingtime / 4; @@ -49,7 +49,7 @@ due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder > **mapping @21hours** = codingtime / 10; > **office @34hours** = codingtime / 6;) -**342 Hours** or **43 Eight Hour Days** +**343 Hours** or **43 Eight Hour Days** (a total of the realistic time frame for this project) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 837fbceb..b5842c4c 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage admin.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 19a4289c..407f3138 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage dashboard.css diff --git a/admin/assets/css/external_source.css b/admin/assets/css/external_source.css index 17f304a4..d5dcd5d6 100644 --- a/admin/assets/css/external_source.css +++ b/admin/assets/css/external_source.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage external_source.css diff --git a/admin/assets/css/external_sources.css b/admin/assets/css/external_sources.css index ff8ad243..b0ebcb10 100644 --- a/admin/assets/css/external_sources.css +++ b/admin/assets/css/external_sources.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage external_sources.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index 2e0c6d35..d466832c 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage help_document.css diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index cd88052b..8f301dc7 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage help_documents.css diff --git a/admin/assets/css/local_listing.css b/admin/assets/css/local_listing.css index d4863663..668726f4 100644 --- a/admin/assets/css/local_listing.css +++ b/admin/assets/css/local_listing.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage local_listing.css diff --git a/admin/assets/css/local_listings.css b/admin/assets/css/local_listings.css index 745f7e10..34354d3d 100644 --- a/admin/assets/css/local_listings.css +++ b/admin/assets/css/local_listings.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage local_listings.css diff --git a/admin/assets/css/manual_updater.css b/admin/assets/css/manual_updater.css index b1aff1ae..eea232d1 100644 --- a/admin/assets/css/manual_updater.css +++ b/admin/assets/css/manual_updater.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage manual_updater.css diff --git a/admin/assets/css/preacher.css b/admin/assets/css/preacher.css index a13953b0..99d15e58 100644 --- a/admin/assets/css/preacher.css +++ b/admin/assets/css/preacher.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.css diff --git a/admin/assets/css/preachers.css b/admin/assets/css/preachers.css index 9d17adb6..5f209cd8 100644 --- a/admin/assets/css/preachers.css +++ b/admin/assets/css/preachers.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.css diff --git a/admin/assets/css/series.css b/admin/assets/css/series.css index 78ca4b4f..7bcfec11 100644 --- a/admin/assets/css/series.css +++ b/admin/assets/css/series.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage series.css diff --git a/admin/assets/css/series_list.css b/admin/assets/css/series_list.css index 693139d9..52c14012 100644 --- a/admin/assets/css/series_list.css +++ b/admin/assets/css/series_list.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage series_list.css diff --git a/admin/assets/css/sermon.css b/admin/assets/css/sermon.css index 77db0028..f4192d9c 100644 --- a/admin/assets/css/sermon.css +++ b/admin/assets/css/sermon.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.css diff --git a/admin/assets/css/sermons.css b/admin/assets/css/sermons.css index baa1c1aa..b16e2bea 100644 --- a/admin/assets/css/sermons.css +++ b/admin/assets/css/sermons.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons.css diff --git a/admin/assets/css/statistic.css b/admin/assets/css/statistic.css index a2e10f65..93f896fa 100644 --- a/admin/assets/css/statistic.css +++ b/admin/assets/css/statistic.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage statistic.css diff --git a/admin/assets/css/statistics.css b/admin/assets/css/statistics.css index 49fab9ce..637e843b 100644 --- a/admin/assets/css/statistics.css +++ b/admin/assets/css/statistics.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage statistics.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index a378527f..0ac8b757 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage admin.js diff --git a/admin/controller.php b/admin/controller.php index c84ae24b..90bafaf8 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage controller.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** * General Controller of Sermondistributor component */ -class SermondistributorController extends JControllerLegacy +class SermondistributorController extends BaseController { /** * Constructor. diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index dcf05658..4e2ec5a3 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage ajax.json.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Ajax Controller + * Sermondistributor Ajax Base Controller */ -class SermondistributorControllerAjax extends JControllerLegacy +class SermondistributorControllerAjax extends BaseController { public function __construct($config) { diff --git a/admin/controllers/external_source.php b/admin/controllers/external_source.php index 38237a3d..f06e4479 100644 --- a/admin/controllers/external_source.php +++ b/admin/controllers/external_source.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage external_source.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * External_source Controller + * External_source Form Controller */ -class SermondistributorControllerExternal_source extends JControllerForm +class SermondistributorControllerExternal_source extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/external_sources.php b/admin/controllers/external_sources.php index 1c883d23..d3bd3db0 100644 --- a/admin/controllers/external_sources.php +++ b/admin/controllers/external_sources.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage external_sources.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * External_sources Controller + * External_sources Admin Controller */ -class SermondistributorControllerExternal_sources extends JControllerAdmin +class SermondistributorControllerExternal_sources extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 6f159352..91892d00 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage help.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Help Controller + * Sermondistributor Help Base Controller */ -class SermondistributorControllerHelp extends JControllerLegacy +class SermondistributorControllerHelp extends BaseController { public function __construct($config) { diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index ab098288..ec8b60e4 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage help_document.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Help_document Controller + * Help_document Form Controller */ -class SermondistributorControllerHelp_document extends JControllerForm +class SermondistributorControllerHelp_document extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index ca088e88..d41cc2e3 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage help_documents.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Help_documents Controller + * Help_documents Admin Controller */ -class SermondistributorControllerHelp_documents extends JControllerAdmin +class SermondistributorControllerHelp_documents extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 0e2af138..b26652bc 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage import.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Import Controller + * Sermondistributor Import Base Controller */ -class SermondistributorControllerImport extends JControllerLegacy +class SermondistributorControllerImport extends BaseController { /** * Import an spreadsheet. diff --git a/admin/controllers/local_listing.php b/admin/controllers/local_listing.php index c8b5f314..7c01f87a 100644 --- a/admin/controllers/local_listing.php +++ b/admin/controllers/local_listing.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage local_listing.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Local_listing Controller + * Local_listing Form Controller */ -class SermondistributorControllerLocal_listing extends JControllerForm +class SermondistributorControllerLocal_listing extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/local_listings.php b/admin/controllers/local_listings.php index ff001eff..d5f3e1ec 100644 --- a/admin/controllers/local_listings.php +++ b/admin/controllers/local_listings.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage local_listings.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Local_listings Controller + * Local_listings Admin Controller */ -class SermondistributorControllerLocal_listings extends JControllerAdmin +class SermondistributorControllerLocal_listings extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/manual_updater.php b/admin/controllers/manual_updater.php index 59fa8cc4..48b34601 100644 --- a/admin/controllers/manual_updater.php +++ b/admin/controllers/manual_updater.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage manual_updater.php @@ -25,14 +25,22 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Manual_updater Controller + * Manual_updater Admin Controller */ -class SermondistributorControllerManual_updater extends JControllerAdmin +class SermondistributorControllerManual_updater extends AdminController { + /** + * The prefix to use with controller messages. + * + * @var string + * @since 1.6 + */ protected $text_prefix = 'COM_SERMONDISTRIBUTOR_MANUAL_UPDATER'; + /** * Proxy for getModel. * @since 2.5 @@ -44,7 +52,7 @@ class SermondistributorControllerManual_updater extends JControllerAdmin return $model; } - public function dashboard() + public function dashboard() { $this->setRedirect(JRoute::_('index.php?option=com_sermondistributor', false)); return; diff --git a/admin/controllers/preacher.php b/admin/controllers/preacher.php index cf82d396..af2ef781 100644 --- a/admin/controllers/preacher.php +++ b/admin/controllers/preacher.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Preacher Controller + * Preacher Form Controller */ -class SermondistributorControllerPreacher extends JControllerForm +class SermondistributorControllerPreacher extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/preachers.php b/admin/controllers/preachers.php index 480a6a66..95168672 100644 --- a/admin/controllers/preachers.php +++ b/admin/controllers/preachers.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Preachers Controller + * Preachers Admin Controller */ -class SermondistributorControllerPreachers extends JControllerAdmin +class SermondistributorControllerPreachers extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/series.php b/admin/controllers/series.php index 1a0c18c5..c39f8846 100644 --- a/admin/controllers/series.php +++ b/admin/controllers/series.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Series Controller + * Series Form Controller */ -class SermondistributorControllerSeries extends JControllerForm +class SermondistributorControllerSeries extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/series_list.php b/admin/controllers/series_list.php index 014b2134..64a172fc 100644 --- a/admin/controllers/series_list.php +++ b/admin/controllers/series_list.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage series_list.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Series_list Controller + * Series_list Admin Controller */ -class SermondistributorControllerSeries_list extends JControllerAdmin +class SermondistributorControllerSeries_list extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/sermon.php b/admin/controllers/sermon.php index a58b0735..38d90ab9 100644 --- a/admin/controllers/sermon.php +++ b/admin/controllers/sermon.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Sermon Controller + * Sermon Form Controller */ -class SermondistributorControllerSermon extends JControllerForm +class SermondistributorControllerSermon extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/sermondistributor.php b/admin/controllers/sermondistributor.php index 3a5dc3ea..cca77968 100644 --- a/admin/controllers/sermondistributor.php +++ b/admin/controllers/sermondistributor.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); - +use Joomla\CMS\MVC\Controller\AdminController; +use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Controller + * Sermondistributor Admin Controller */ -class SermondistributorControllerSermondistributor extends JControllerAdmin +class SermondistributorControllerSermondistributor extends AdminController { } diff --git a/admin/controllers/sermons.php b/admin/controllers/sermons.php index b27ba21b..3bb2b568 100644 --- a/admin/controllers/sermons.php +++ b/admin/controllers/sermons.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Sermons Controller + * Sermons Admin Controller */ -class SermondistributorControllerSermons extends JControllerAdmin +class SermondistributorControllerSermons extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/statistic.php b/admin/controllers/statistic.php index 8bd1000b..ea1fe35f 100644 --- a/admin/controllers/statistic.php +++ b/admin/controllers/statistic.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage statistic.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Statistic Controller + * Statistic Form Controller */ -class SermondistributorControllerStatistic extends JControllerForm +class SermondistributorControllerStatistic extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/statistics.php b/admin/controllers/statistics.php index 733af6a3..44380186 100644 --- a/admin/controllers/statistics.php +++ b/admin/controllers/statistics.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage statistics.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Statistics Controller + * Statistics Admin Controller */ -class SermondistributorControllerStatistics extends JControllerAdmin +class SermondistributorControllerStatistics extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index 295b3e01..a049a32a 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 8ef20900..ff7f840d 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage batch_.php diff --git a/admin/helpers/sermondistributor.php b/admin/helpers/sermondistributor.php index 34915537..914fc851 100644 --- a/admin/helpers/sermondistributor.php +++ b/admin/helpers/sermondistributor.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php @@ -689,12 +689,12 @@ abstract class SermondistributorHelper } /** - * File Extension to Mimetype + * File Extensions to Mimetypes * https://gist.github.com/Llewellynvdm/74be373357e131b8775a7582c3de508b * http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types - * + * * @var array - **/ + */ protected static $fileExtensionToMimeType = array( '123' => 'application/vnd.lotus-1-2-3', '3dml' => 'text/vnd.in3d.3dml', @@ -1239,6 +1239,7 @@ abstract class SermondistributorHelper 'opf' => 'application/oebps-package+xml', 'opml' => 'text/x-opml', 'oprc' => 'application/vnd.palm', + 'opus' => 'audio/ogg', 'org' => 'application/vnd.lotus-organizer', 'osf' => 'application/vnd.yamaha.openscoreformat', 'osfpvg' => 'application/vnd.yamaha.openscoreformat.osfpvg+xml', @@ -1700,7 +1701,7 @@ abstract class SermondistributorHelper */ // get the extension form file - $extension = \strtolower(\pathinfo($file, \PATHINFO_EXTENSION)); + $extension = strtolower(pathinfo($file, PATHINFO_EXTENSION)); // check if we have the extension listed if (isset(self::$fileExtensionToMimeType[$extension])) { @@ -4595,3 +4596,4 @@ abstract class SermondistributorHelper return $default; } } + diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 9fd349c6..3492b47b 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage batchselection.php diff --git a/admin/layouts/external_source/build_option_fullwidth.php b/admin/layouts/external_source/build_option_fullwidth.php index 69fbf76b..85847056 100644 --- a/admin/layouts/external_source/build_option_fullwidth.php +++ b/admin/layouts/external_source/build_option_fullwidth.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage build_option_fullwidth.php diff --git a/admin/layouts/external_source/details_above.php b/admin/layouts/external_source/details_above.php index d9fa9da0..324e42c9 100644 --- a/admin/layouts/external_source/details_above.php +++ b/admin/layouts/external_source/details_above.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/external_source/details_fullwidth.php b/admin/layouts/external_source/details_fullwidth.php index 5d225520..21c767bc 100644 --- a/admin/layouts/external_source/details_fullwidth.php +++ b/admin/layouts/external_source/details_fullwidth.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_fullwidth.php diff --git a/admin/layouts/external_source/details_left.php b/admin/layouts/external_source/details_left.php index 2b1e50b3..f64196ba 100644 --- a/admin/layouts/external_source/details_left.php +++ b/admin/layouts/external_source/details_left.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/external_source/details_right.php b/admin/layouts/external_source/details_right.php index b8ff1d16..dd57d52f 100644 --- a/admin/layouts/external_source/details_right.php +++ b/admin/layouts/external_source/details_right.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/external_source/details_under.php b/admin/layouts/external_source/details_under.php index a4f7fc51..aaadd756 100644 --- a/admin/layouts/external_source/details_under.php +++ b/admin/layouts/external_source/details_under.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_under.php diff --git a/admin/layouts/external_source/publishing.php b/admin/layouts/external_source/publishing.php index aa66d017..1c3304ab 100644 --- a/admin/layouts/external_source/publishing.php +++ b/admin/layouts/external_source/publishing.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/layouts/external_source/publlshing.php b/admin/layouts/external_source/publlshing.php index cb6a8e49..57b2f712 100644 --- a/admin/layouts/external_source/publlshing.php +++ b/admin/layouts/external_source/publlshing.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index 33362ef5..275a4093 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index bdb71099..030bf924 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index bca5007a..95657c04 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index 2dc531e7..05a0d500 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index a4f7fc51..aaadd756 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_under.php diff --git a/admin/layouts/help_document/metadata.php b/admin/layouts/help_document/metadata.php index ab1d01cf..cf54d36d 100644 --- a/admin/layouts/help_document/metadata.php +++ b/admin/layouts/help_document/metadata.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage metadata.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 7f6fefc1..a23a3b51 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/layouts/local_listing/details_above.php b/admin/layouts/local_listing/details_above.php index 00b82510..01c7bdc9 100644 --- a/admin/layouts/local_listing/details_above.php +++ b/admin/layouts/local_listing/details_above.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/local_listing/details_fullwidth.php b/admin/layouts/local_listing/details_fullwidth.php index 608568f3..ca312c37 100644 --- a/admin/layouts/local_listing/details_fullwidth.php +++ b/admin/layouts/local_listing/details_fullwidth.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_fullwidth.php diff --git a/admin/layouts/local_listing/details_left.php b/admin/layouts/local_listing/details_left.php index 820876f1..58b6da11 100644 --- a/admin/layouts/local_listing/details_left.php +++ b/admin/layouts/local_listing/details_left.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/local_listing/details_right.php b/admin/layouts/local_listing/details_right.php index 64d121ef..33c7251b 100644 --- a/admin/layouts/local_listing/details_right.php +++ b/admin/layouts/local_listing/details_right.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/local_listing/publishing.php b/admin/layouts/local_listing/publishing.php index aa66d017..1c3304ab 100644 --- a/admin/layouts/local_listing/publishing.php +++ b/admin/layouts/local_listing/publishing.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/layouts/local_listing/publlshing.php b/admin/layouts/local_listing/publlshing.php index cb6a8e49..57b2f712 100644 --- a/admin/layouts/local_listing/publlshing.php +++ b/admin/layouts/local_listing/publlshing.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage publlshing.php diff --git a/admin/layouts/preacher/details_above.php b/admin/layouts/preacher/details_above.php index 40abb315..5f52f0f5 100644 --- a/admin/layouts/preacher/details_above.php +++ b/admin/layouts/preacher/details_above.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/preacher/details_fullwidth.php b/admin/layouts/preacher/details_fullwidth.php index 4a49d421..89384fca 100644 --- a/admin/layouts/preacher/details_fullwidth.php +++ b/admin/layouts/preacher/details_fullwidth.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_fullwidth.php diff --git a/admin/layouts/preacher/details_left.php b/admin/layouts/preacher/details_left.php index 3f808f63..8b81eb10 100644 --- a/admin/layouts/preacher/details_left.php +++ b/admin/layouts/preacher/details_left.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/preacher/details_right.php b/admin/layouts/preacher/details_right.php index 5ca71466..ab2524e5 100644 --- a/admin/layouts/preacher/details_right.php +++ b/admin/layouts/preacher/details_right.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/preacher/metadata.php b/admin/layouts/preacher/metadata.php index ab1d01cf..cf54d36d 100644 --- a/admin/layouts/preacher/metadata.php +++ b/admin/layouts/preacher/metadata.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage metadata.php diff --git a/admin/layouts/preacher/publishing.php b/admin/layouts/preacher/publishing.php index bfa69531..741d7413 100644 --- a/admin/layouts/preacher/publishing.php +++ b/admin/layouts/preacher/publishing.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/layouts/preacher/sermons_fullwidth.php b/admin/layouts/preacher/sermons_fullwidth.php index 59f4cd16..63a85b6f 100644 --- a/admin/layouts/preacher/sermons_fullwidth.php +++ b/admin/layouts/preacher/sermons_fullwidth.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons_fullwidth.php @@ -119,7 +119,7 @@ $can = SermondistributorHelper::getActions('sermon'); escape($item->preacher_name); ?> - authorise('series.edit', 'com_sermondistributor.series.' . (int)$item->series)): ?> + authorise('series.edit', 'com_sermondistributor.series.' . (int) $item->series)): ?> escape($item->series_name); ?> escape($item->series_name); ?> diff --git a/admin/layouts/series/details_above.php b/admin/layouts/series/details_above.php index 40abb315..5f52f0f5 100644 --- a/admin/layouts/series/details_above.php +++ b/admin/layouts/series/details_above.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/series/details_fullwidth.php b/admin/layouts/series/details_fullwidth.php index 4a49d421..89384fca 100644 --- a/admin/layouts/series/details_fullwidth.php +++ b/admin/layouts/series/details_fullwidth.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_fullwidth.php diff --git a/admin/layouts/series/details_left.php b/admin/layouts/series/details_left.php index 3f808f63..8b81eb10 100644 --- a/admin/layouts/series/details_left.php +++ b/admin/layouts/series/details_left.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/series/details_right.php b/admin/layouts/series/details_right.php index 98ab5eae..549ad60b 100644 --- a/admin/layouts/series/details_right.php +++ b/admin/layouts/series/details_right.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/series/metadata.php b/admin/layouts/series/metadata.php index ab1d01cf..cf54d36d 100644 --- a/admin/layouts/series/metadata.php +++ b/admin/layouts/series/metadata.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage metadata.php diff --git a/admin/layouts/series/publishing.php b/admin/layouts/series/publishing.php index bfa69531..741d7413 100644 --- a/admin/layouts/series/publishing.php +++ b/admin/layouts/series/publishing.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/layouts/series/sermons_fullwidth.php b/admin/layouts/series/sermons_fullwidth.php index 86f54d34..93aa618c 100644 --- a/admin/layouts/series/sermons_fullwidth.php +++ b/admin/layouts/series/sermons_fullwidth.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons_fullwidth.php @@ -111,7 +111,7 @@ $can = SermondistributorHelper::getActions('sermon'); - authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int)$item->preacher)): ?> + authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int) $item->preacher)): ?> escape($item->preacher_name); ?> escape($item->preacher_name); ?> diff --git a/admin/layouts/sermon/details_above.php b/admin/layouts/sermon/details_above.php index b4cdf532..6218a9d6 100644 --- a/admin/layouts/sermon/details_above.php +++ b/admin/layouts/sermon/details_above.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/sermon/details_fullwidth.php b/admin/layouts/sermon/details_fullwidth.php index 4a49d421..89384fca 100644 --- a/admin/layouts/sermon/details_fullwidth.php +++ b/admin/layouts/sermon/details_fullwidth.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_fullwidth.php diff --git a/admin/layouts/sermon/details_left.php b/admin/layouts/sermon/details_left.php index 1b4d4415..725eb983 100644 --- a/admin/layouts/sermon/details_left.php +++ b/admin/layouts/sermon/details_left.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/sermon/details_right.php b/admin/layouts/sermon/details_right.php index e2ae9459..7968829d 100644 --- a/admin/layouts/sermon/details_right.php +++ b/admin/layouts/sermon/details_right.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/sermon/details_under.php b/admin/layouts/sermon/details_under.php index c8ebbd4d..c365dc40 100644 --- a/admin/layouts/sermon/details_under.php +++ b/admin/layouts/sermon/details_under.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_under.php diff --git a/admin/layouts/sermon/files_fullwidth.php b/admin/layouts/sermon/files_fullwidth.php index bbb978b3..11e49adb 100644 --- a/admin/layouts/sermon/files_fullwidth.php +++ b/admin/layouts/sermon/files_fullwidth.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage files_fullwidth.php diff --git a/admin/layouts/sermon/metadata.php b/admin/layouts/sermon/metadata.php index ab1d01cf..cf54d36d 100644 --- a/admin/layouts/sermon/metadata.php +++ b/admin/layouts/sermon/metadata.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage metadata.php diff --git a/admin/layouts/sermon/publishing.php b/admin/layouts/sermon/publishing.php index bfa69531..741d7413 100644 --- a/admin/layouts/sermon/publishing.php +++ b/admin/layouts/sermon/publishing.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/layouts/sermon/stastics_fullwidth.php b/admin/layouts/sermon/stastics_fullwidth.php index 9c3d45fc..db88f257 100644 --- a/admin/layouts/sermon/stastics_fullwidth.php +++ b/admin/layouts/sermon/stastics_fullwidth.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage stastics_fullwidth.php @@ -101,14 +101,14 @@ else escape($item->sermon_name); ?> - authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int)$item->preacher)): ?> + authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int) $item->preacher)): ?> escape($item->preacher_name); ?> escape($item->preacher_name); ?> - authorise('series.edit', 'com_sermondistributor.series.' . (int)$item->series)): ?> + authorise('series.edit', 'com_sermondistributor.series.' . (int) $item->series)): ?> escape($item->series_name); ?> escape($item->series_name); ?> diff --git a/admin/layouts/statistic/details_above.php b/admin/layouts/statistic/details_above.php index 4954b8e3..942766bd 100644 --- a/admin/layouts/statistic/details_above.php +++ b/admin/layouts/statistic/details_above.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/statistic/details_left.php b/admin/layouts/statistic/details_left.php index 0569c7be..e81d61de 100644 --- a/admin/layouts/statistic/details_left.php +++ b/admin/layouts/statistic/details_left.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/statistic/details_right.php b/admin/layouts/statistic/details_right.php index dadef11f..777c011a 100644 --- a/admin/layouts/statistic/details_right.php +++ b/admin/layouts/statistic/details_right.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/statistic/metadata.php b/admin/layouts/statistic/metadata.php index ab1d01cf..cf54d36d 100644 --- a/admin/layouts/statistic/metadata.php +++ b/admin/layouts/statistic/metadata.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage metadata.php diff --git a/admin/layouts/statistic/publishing.php b/admin/layouts/statistic/publishing.php index bfa69531..741d7413 100644 --- a/admin/layouts/statistic/publishing.php +++ b/admin/layouts/statistic/publishing.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/layouts/trashhelper.php b/admin/layouts/trashhelper.php index c94347ca..0f24f745 100644 --- a/admin/layouts/trashhelper.php +++ b/admin/layouts/trashhelper.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage trashhelper.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index e032e815..8210fce0 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage ajax.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Ajax Model + * Sermondistributor Ajax List Model */ -class SermondistributorModelAjax extends JModelList +class SermondistributorModelAjax extends ListModel { protected $app_params; diff --git a/admin/models/external_source.php b/admin/models/external_source.php index 0a324a92..218dc769 100644 --- a/admin/models/external_source.php +++ b/admin/models/external_source.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage external_source.php @@ -25,14 +25,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor External_source Model + * Sermondistributor External_source Admin Model */ -class SermondistributorModelExternal_source extends JModelAdmin +class SermondistributorModelExternal_source extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/external_sources.php b/admin/models/external_sources.php index 11c0946e..db5719f4 100644 --- a/admin/models/external_sources.php +++ b/admin/models/external_sources.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage external_sources.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * External_sources Model + * External_sources List Model */ -class SermondistributorModelExternal_sources extends JModelList +class SermondistributorModelExternal_sources extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 27d4d980..3cdb37c8 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index f2e80f6d..a412ae81 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage articles.php diff --git a/admin/models/fields/externalsource.php b/admin/models/fields/externalsource.php index 0ecbb336..b1d1922f 100644 --- a/admin/models/fields/externalsource.php +++ b/admin/models/fields/externalsource.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage externalsource.php diff --git a/admin/models/fields/externalsourcefiles.php b/admin/models/fields/externalsourcefiles.php index 601e1123..7aa93ebd 100644 --- a/admin/models/fields/externalsourcefiles.php +++ b/admin/models/fields/externalsourcefiles.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage externalsourcefiles.php diff --git a/admin/models/fields/externalsourcesfilterbuild.php b/admin/models/fields/externalsourcesfilterbuild.php index 1388693f..8fbc1a54 100644 --- a/admin/models/fields/externalsourcesfilterbuild.php +++ b/admin/models/fields/externalsourcesfilterbuild.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage externalsourcesfilterbuild.php diff --git a/admin/models/fields/externalsourcesfilterexternalsources.php b/admin/models/fields/externalsourcesfilterexternalsources.php index bad66f0f..4579ce75 100644 --- a/admin/models/fields/externalsourcesfilterexternalsources.php +++ b/admin/models/fields/externalsourcesfilterexternalsources.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage externalsourcesfilterexternalsources.php diff --git a/admin/models/fields/externalsourcesfilterupdatemethod.php b/admin/models/fields/externalsourcesfilterupdatemethod.php index a595532d..05947981 100644 --- a/admin/models/fields/externalsourcesfilterupdatemethod.php +++ b/admin/models/fields/externalsourcesfilterupdatemethod.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage externalsourcesfilterupdatemethod.php diff --git a/admin/models/fields/helpdocumentsfilterlocation.php b/admin/models/fields/helpdocumentsfilterlocation.php index e5904f8f..ef6a8811 100644 --- a/admin/models/fields/helpdocumentsfilterlocation.php +++ b/admin/models/fields/helpdocumentsfilterlocation.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage helpdocumentsfilterlocation.php diff --git a/admin/models/fields/helpdocumentsfiltertype.php b/admin/models/fields/helpdocumentsfiltertype.php index 678cdd2c..c753f8ce 100644 --- a/admin/models/fields/helpdocumentsfiltertype.php +++ b/admin/models/fields/helpdocumentsfiltertype.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage helpdocumentsfiltertype.php diff --git a/admin/models/fields/localfiles.php b/admin/models/fields/localfiles.php index b6c028ee..63fa4aa0 100644 --- a/admin/models/fields/localfiles.php +++ b/admin/models/fields/localfiles.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage localfiles.php diff --git a/admin/models/fields/locallistingsfilterbuild.php b/admin/models/fields/locallistingsfilterbuild.php index d4335114..3b02ab34 100644 --- a/admin/models/fields/locallistingsfilterbuild.php +++ b/admin/models/fields/locallistingsfilterbuild.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage locallistingsfilterbuild.php diff --git a/admin/models/fields/preachers.php b/admin/models/fields/preachers.php index 3a1afedf..5efa15b7 100644 --- a/admin/models/fields/preachers.php +++ b/admin/models/fields/preachers.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.php diff --git a/admin/models/fields/series.php b/admin/models/fields/series.php index 050cb3e7..573aea0a 100644 --- a/admin/models/fields/series.php +++ b/admin/models/fields/series.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php diff --git a/admin/models/fields/sermon.php b/admin/models/fields/sermon.php index 0ee2b8cc..120e3fe1 100644 --- a/admin/models/fields/sermon.php +++ b/admin/models/fields/sermon.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php diff --git a/admin/models/fields/sermonsfilterlinktype.php b/admin/models/fields/sermonsfilterlinktype.php index 3422ce89..1ca8cae0 100644 --- a/admin/models/fields/sermonsfilterlinktype.php +++ b/admin/models/fields/sermonsfilterlinktype.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermonsfilterlinktype.php diff --git a/admin/models/fields/sermonsfiltersource.php b/admin/models/fields/sermonsfiltersource.php index 739ded09..93da4c4f 100644 --- a/admin/models/fields/sermonsfiltersource.php +++ b/admin/models/fields/sermonsfiltersource.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermonsfiltersource.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index ebeb2aca..a7116df7 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage siteviewfolderlist.php diff --git a/admin/models/help_document.php b/admin/models/help_document.php index a3329bf6..39fa2d8a 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage help_document.php @@ -25,14 +25,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Help_document Model + * Sermondistributor Help_document Admin Model */ -class SermondistributorModelHelp_document extends JModelAdmin +class SermondistributorModelHelp_document extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 518bc589..f0e6dfa3 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage help_documents.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Help_documents Model + * Help_documents List Model */ -class SermondistributorModelHelp_documents extends JModelList +class SermondistributorModelHelp_documents extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/import.php b/admin/models/import.php index 431eee23..e1bc61a4 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage import.php @@ -25,15 +25,16 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\BaseDatabaseModel; use Joomla\CMS\Filesystem\File; use Joomla\CMS\Filesystem\Folder; use Joomla\Utilities\ArrayHelper; use PhpOffice\PhpSpreadsheet\IOFactory; /** - * Sermondistributor Import Model + * Sermondistributor Import Base Database Model */ -class SermondistributorModelImport extends JModelLegacy +class SermondistributorModelImport extends BaseDatabaseModel { // set uploading values protected $use_streams = false; diff --git a/admin/models/local_listing.php b/admin/models/local_listing.php index 31361582..ead9f874 100644 --- a/admin/models/local_listing.php +++ b/admin/models/local_listing.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage local_listing.php @@ -25,14 +25,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Local_listing Model + * Sermondistributor Local_listing Admin Model */ -class SermondistributorModelLocal_listing extends JModelAdmin +class SermondistributorModelLocal_listing extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/local_listings.php b/admin/models/local_listings.php index da5ea5cf..0885ef43 100644 --- a/admin/models/local_listings.php +++ b/admin/models/local_listings.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage local_listings.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Local_listings Model + * Local_listings List Model */ -class SermondistributorModelLocal_listings extends JModelList +class SermondistributorModelLocal_listings extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/manual_updater.php b/admin/models/manual_updater.php index 7320f519..7a184def 100644 --- a/admin/models/manual_updater.php +++ b/admin/models/manual_updater.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage manual_updater.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Model for Manual_updater + * Sermondistributor List Model for Manual_updater */ -class SermondistributorModelManual_updater extends JModelList +class SermondistributorModelManual_updater extends ListModel { /** * Model user data. diff --git a/admin/models/preacher.php b/admin/models/preacher.php index a4d380b8..9c8a0c23 100644 --- a/admin/models/preacher.php +++ b/admin/models/preacher.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.php @@ -25,14 +25,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Preacher Model + * Sermondistributor Preacher Admin Model */ -class SermondistributorModelPreacher extends JModelAdmin +class SermondistributorModelPreacher extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/preachers.php b/admin/models/preachers.php index e0767b7b..b584c48e 100644 --- a/admin/models/preachers.php +++ b/admin/models/preachers.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Preachers Model + * Preachers List Model */ -class SermondistributorModelPreachers extends JModelList +class SermondistributorModelPreachers extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/series.php b/admin/models/series.php index 28f9a09a..7fdca8d4 100644 --- a/admin/models/series.php +++ b/admin/models/series.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php @@ -25,14 +25,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Series Model + * Sermondistributor Series Admin Model */ -class SermondistributorModelSeries extends JModelAdmin +class SermondistributorModelSeries extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/series_list.php b/admin/models/series_list.php index 047f60cd..4bc50497 100644 --- a/admin/models/series_list.php +++ b/admin/models/series_list.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage series_list.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Series_list Model + * Series_list List Model */ -class SermondistributorModelSeries_list extends JModelList +class SermondistributorModelSeries_list extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/sermon.php b/admin/models/sermon.php index e4b439d2..e65876b5 100644 --- a/admin/models/sermon.php +++ b/admin/models/sermon.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php @@ -25,14 +25,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Sermon Model + * Sermondistributor Sermon Admin Model */ -class SermondistributorModelSermon extends JModelAdmin +class SermondistributorModelSermon extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/sermondistributor.php b/admin/models/sermondistributor.php index 6b47a439..6e1d10fb 100644 --- a/admin/models/sermondistributor.php +++ b/admin/models/sermondistributor.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); - +use Joomla\CMS\MVC\Model\ListModel; +use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Model + * Sermondistributor List Model */ -class SermondistributorModelSermondistributor extends JModelList +class SermondistributorModelSermondistributor extends ListModel { public function getIcons() { @@ -468,7 +469,7 @@ jQuery(document).ready( function($) { jQuery(document).ready(function () { jQuery.get(getreadme) .success(function(readme) { - jQuery("#readme-md").html(marked(readme)); + jQuery("#readme-md").html(marked.parse(readme)); }) .error(function(jqXHR, textStatus, errorThrown) { jQuery("#readme-md").html("'.JText::_('COM_SERMONDISTRIBUTOR_PLEASE_CHECK_AGAIN_LATTER').'"); diff --git a/admin/models/sermons.php b/admin/models/sermons.php index 94c8f93a..06b6f70c 100644 --- a/admin/models/sermons.php +++ b/admin/models/sermons.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Sermons Model + * Sermons List Model */ -class SermondistributorModelSermons extends JModelList +class SermondistributorModelSermons extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/statistic.php b/admin/models/statistic.php index 158ef8ab..338fc141 100644 --- a/admin/models/statistic.php +++ b/admin/models/statistic.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage statistic.php @@ -25,14 +25,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Statistic Model + * Sermondistributor Statistic Admin Model */ -class SermondistributorModelStatistic extends JModelAdmin +class SermondistributorModelStatistic extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/statistics.php b/admin/models/statistics.php index 70a22665..d92abfbc 100644 --- a/admin/models/statistics.php +++ b/admin/models/statistics.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage statistics.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Statistics Model + * Statistics List Model */ -class SermondistributorModelStatistics extends JModelList +class SermondistributorModelStatistics extends ListModel { public function __construct($config = array()) { diff --git a/admin/sermondistributor.php b/admin/sermondistributor.php index 93f988ad..f6824c5c 100644 --- a/admin/sermondistributor.php +++ b/admin/sermondistributor.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php diff --git a/admin/tables/external_source.php b/admin/tables/external_source.php index 2f37d02f..648193f7 100644 --- a/admin/tables/external_source.php +++ b/admin/tables/external_source.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage external_source.php @@ -25,6 +25,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -32,7 +33,7 @@ use Joomla\Utilities\ArrayHelper; /** * External_sources Table class */ -class SermondistributorTableExternal_source extends JTable +class SermondistributorTableExternal_source extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index 57a1bc1f..949509a6 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage help_document.php @@ -25,6 +25,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -32,7 +33,7 @@ use Joomla\Utilities\ArrayHelper; /** * Help_documents Table class */ -class SermondistributorTableHelp_document extends JTable +class SermondistributorTableHelp_document extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/local_listing.php b/admin/tables/local_listing.php index a432305d..f8c731e9 100644 --- a/admin/tables/local_listing.php +++ b/admin/tables/local_listing.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage local_listing.php @@ -25,6 +25,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -32,7 +33,7 @@ use Joomla\Utilities\ArrayHelper; /** * Local_listings Table class */ -class SermondistributorTableLocal_listing extends JTable +class SermondistributorTableLocal_listing extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/preacher.php b/admin/tables/preacher.php index 5800014d..2dbb4e9d 100644 --- a/admin/tables/preacher.php +++ b/admin/tables/preacher.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.php @@ -25,6 +25,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -32,7 +33,7 @@ use Joomla\Utilities\ArrayHelper; /** * Preachers Table class */ -class SermondistributorTablePreacher extends JTable +class SermondistributorTablePreacher extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/series.php b/admin/tables/series.php index f482b50f..1e8ac8a8 100644 --- a/admin/tables/series.php +++ b/admin/tables/series.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php @@ -25,6 +25,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -32,7 +33,7 @@ use Joomla\Utilities\ArrayHelper; /** * Series_list Table class */ -class SermondistributorTableSeries extends JTable +class SermondistributorTableSeries extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/sermon.php b/admin/tables/sermon.php index 051f18ed..e22fcdc2 100644 --- a/admin/tables/sermon.php +++ b/admin/tables/sermon.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php @@ -25,6 +25,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -32,7 +33,7 @@ use Joomla\Utilities\ArrayHelper; /** * Sermons Table class */ -class SermondistributorTableSermon extends JTable +class SermondistributorTableSermon extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/statistic.php b/admin/tables/statistic.php index d3795087..981cbaae 100644 --- a/admin/tables/statistic.php +++ b/admin/tables/statistic.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage statistic.php @@ -25,6 +25,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -32,7 +33,7 @@ use Joomla\Utilities\ArrayHelper; /** * Statistics Table class */ -class SermondistributorTableStatistic extends JTable +class SermondistributorTableStatistic extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/views/external_source/submitbutton.js b/admin/views/external_source/submitbutton.js index 89d71ace..a3607a70 100644 --- a/admin/views/external_source/submitbutton.js +++ b/admin/views/external_source/submitbutton.js @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage submitbutton.js diff --git a/admin/views/external_source/tmpl/edit.php b/admin/views/external_source/tmpl/edit.php index 2c605302..c44e77f8 100644 --- a/admin/views/external_source/tmpl/edit.php +++ b/admin/views/external_source/tmpl/edit.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage edit.php diff --git a/admin/views/external_source/view.html.php b/admin/views/external_source/view.html.php index be80987d..97cadc70 100644 --- a/admin/views/external_source/view.html.php +++ b/admin/views/external_source/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,10 +25,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * External_source View class + * External_source Html View class */ -class SermondistributorViewExternal_source extends JViewLegacy +class SermondistributorViewExternal_source extends HtmlView { /** * display method of View diff --git a/admin/views/external_sources/tmpl/default.php b/admin/views/external_sources/tmpl/default.php index 485cd19f..08568268 100644 --- a/admin/views/external_sources/tmpl/default.php +++ b/admin/views/external_sources/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/external_sources/tmpl/default_batch_body.php b/admin/views/external_sources/tmpl/default_batch_body.php index 3e956403..cea27113 100644 --- a/admin/views/external_sources/tmpl/default_batch_body.php +++ b/admin/views/external_sources/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_body.php diff --git a/admin/views/external_sources/tmpl/default_batch_footer.php b/admin/views/external_sources/tmpl/default_batch_footer.php index f699511b..a702d428 100644 --- a/admin/views/external_sources/tmpl/default_batch_footer.php +++ b/admin/views/external_sources/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_footer.php diff --git a/admin/views/external_sources/tmpl/default_body.php b/admin/views/external_sources/tmpl/default_body.php index be338b3d..aeaf13e7 100644 --- a/admin/views/external_sources/tmpl/default_body.php +++ b/admin/views/external_sources/tmpl/default_body.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_body.php diff --git a/admin/views/external_sources/tmpl/default_foot.php b/admin/views/external_sources/tmpl/default_foot.php index 30540e1f..d111908e 100644 --- a/admin/views/external_sources/tmpl/default_foot.php +++ b/admin/views/external_sources/tmpl/default_foot.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_foot.php diff --git a/admin/views/external_sources/tmpl/default_head.php b/admin/views/external_sources/tmpl/default_head.php index 5fb25367..90e3dc9f 100644 --- a/admin/views/external_sources/tmpl/default_head.php +++ b/admin/views/external_sources/tmpl/default_head.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_head.php diff --git a/admin/views/external_sources/tmpl/default_toolbar.php b/admin/views/external_sources/tmpl/default_toolbar.php index 0a75cf55..257fb6ab 100644 --- a/admin/views/external_sources/tmpl/default_toolbar.php +++ b/admin/views/external_sources/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_toolbar.php diff --git a/admin/views/external_sources/view.html.php b/admin/views/external_sources/view.html.php index c470793e..fccdf84e 100644 --- a/admin/views/external_sources/view.html.php +++ b/admin/views/external_sources/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,10 +25,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Sermondistributor View class for the External_sources + * Sermondistributor Html View class for the External_sources */ -class SermondistributorViewExternal_sources extends JViewLegacy +class SermondistributorViewExternal_sources extends HtmlView { /** * External_sources view display method diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js index 171a0eb5..afbec5bf 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage submitbutton.js diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php index a035ff40..b32d75af 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage edit.php diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index 49997373..1d8de090 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,10 +25,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Help_document View class + * Help_document Html View class */ -class SermondistributorViewHelp_document extends JViewLegacy +class SermondistributorViewHelp_document extends HtmlView { /** * display method of View diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php index fb5f601a..187adc86 100644 --- a/admin/views/help_documents/tmpl/default.php +++ b/admin/views/help_documents/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php index 8e19cfc5..26ad206f 100644 --- a/admin/views/help_documents/tmpl/default_batch_body.php +++ b/admin/views/help_documents/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_body.php diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php index 5b03e350..524e7233 100644 --- a/admin/views/help_documents/tmpl/default_batch_footer.php +++ b/admin/views/help_documents/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_footer.php diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php index 26392b9d..b234951a 100644 --- a/admin/views/help_documents/tmpl/default_body.php +++ b/admin/views/help_documents/tmpl/default_body.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_body.php diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php index 034f01dd..f9f7dd40 100644 --- a/admin/views/help_documents/tmpl/default_foot.php +++ b/admin/views/help_documents/tmpl/default_foot.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_foot.php diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php index 3d325255..1e8369f9 100644 --- a/admin/views/help_documents/tmpl/default_head.php +++ b/admin/views/help_documents/tmpl/default_head.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_head.php diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php index 11c616fc..e421dabf 100644 --- a/admin/views/help_documents/tmpl/default_toolbar.php +++ b/admin/views/help_documents/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_toolbar.php diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index 43b74eea..88c207c8 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,10 +25,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Sermondistributor View class for the Help_documents + * Sermondistributor Html View class for the Help_documents */ -class SermondistributorViewHelp_documents extends JViewLegacy +class SermondistributorViewHelp_documents extends HtmlView { /** * Help_documents view display method diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index a01a201d..981e2a45 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 7a241abe..86ffcad7 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,10 +25,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Sermondistributor Import View + * Sermondistributor Import Html View */ -class SermondistributorViewImport extends JViewLegacy +class SermondistributorViewImport extends HtmlView { protected $headerList; protected $hasPackage = false; diff --git a/admin/views/local_listing/submitbutton.js b/admin/views/local_listing/submitbutton.js index bd64f427..2f1d446a 100644 --- a/admin/views/local_listing/submitbutton.js +++ b/admin/views/local_listing/submitbutton.js @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage submitbutton.js diff --git a/admin/views/local_listing/tmpl/edit.php b/admin/views/local_listing/tmpl/edit.php index 05026d15..ebc7f254 100644 --- a/admin/views/local_listing/tmpl/edit.php +++ b/admin/views/local_listing/tmpl/edit.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage edit.php diff --git a/admin/views/local_listing/view.html.php b/admin/views/local_listing/view.html.php index 703e547f..3c34ec57 100644 --- a/admin/views/local_listing/view.html.php +++ b/admin/views/local_listing/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,10 +25,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Local_listing View class + * Local_listing Html View class */ -class SermondistributorViewLocal_listing extends JViewLegacy +class SermondistributorViewLocal_listing extends HtmlView { /** * display method of View diff --git a/admin/views/local_listings/tmpl/default.php b/admin/views/local_listings/tmpl/default.php index 000f2480..12054ed7 100644 --- a/admin/views/local_listings/tmpl/default.php +++ b/admin/views/local_listings/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/local_listings/tmpl/default_batch_body.php b/admin/views/local_listings/tmpl/default_batch_body.php index ca8190c2..bd853c4a 100644 --- a/admin/views/local_listings/tmpl/default_batch_body.php +++ b/admin/views/local_listings/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_body.php diff --git a/admin/views/local_listings/tmpl/default_batch_footer.php b/admin/views/local_listings/tmpl/default_batch_footer.php index b1ab2ca5..4abfcc74 100644 --- a/admin/views/local_listings/tmpl/default_batch_footer.php +++ b/admin/views/local_listings/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_footer.php diff --git a/admin/views/local_listings/tmpl/default_body.php b/admin/views/local_listings/tmpl/default_body.php index 0cab2eeb..09345582 100644 --- a/admin/views/local_listings/tmpl/default_body.php +++ b/admin/views/local_listings/tmpl/default_body.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_body.php @@ -90,7 +90,7 @@ $edit = "index.php?option=com_sermondistributor&view=local_listings&task=local_l
- user->authorise('external_source.edit', 'com_sermondistributor.external_source.' . (int)$item->external_source)): ?> + user->authorise('external_source.edit', 'com_sermondistributor.external_source.' . (int) $item->external_source)): ?> escape($item->external_source_description); ?> escape($item->external_source_description); ?> diff --git a/admin/views/local_listings/tmpl/default_foot.php b/admin/views/local_listings/tmpl/default_foot.php index 30540e1f..d111908e 100644 --- a/admin/views/local_listings/tmpl/default_foot.php +++ b/admin/views/local_listings/tmpl/default_foot.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_foot.php diff --git a/admin/views/local_listings/tmpl/default_head.php b/admin/views/local_listings/tmpl/default_head.php index 1b96a278..96c38e55 100644 --- a/admin/views/local_listings/tmpl/default_head.php +++ b/admin/views/local_listings/tmpl/default_head.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_head.php diff --git a/admin/views/local_listings/tmpl/default_toolbar.php b/admin/views/local_listings/tmpl/default_toolbar.php index 21dd1f6c..450e292c 100644 --- a/admin/views/local_listings/tmpl/default_toolbar.php +++ b/admin/views/local_listings/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_toolbar.php diff --git a/admin/views/local_listings/view.html.php b/admin/views/local_listings/view.html.php index 0504ee4d..9a12394a 100644 --- a/admin/views/local_listings/view.html.php +++ b/admin/views/local_listings/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,10 +25,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Sermondistributor View class for the Local_listings + * Sermondistributor Html View class for the Local_listings */ -class SermondistributorViewLocal_listings extends JViewLegacy +class SermondistributorViewLocal_listings extends HtmlView { /** * Local_listings view display method diff --git a/admin/views/manual_updater/tmpl/default.php b/admin/views/manual_updater/tmpl/default.php index b221784a..8d48c389 100644 --- a/admin/views/manual_updater/tmpl/default.php +++ b/admin/views/manual_updater/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/manual_updater/view.html.php b/admin/views/manual_updater/view.html.php index e4d6d079..6593614f 100644 --- a/admin/views/manual_updater/view.html.php +++ b/admin/views/manual_updater/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; use Joomla\CMS\Filesystem\File; /** - * Sermondistributor View class for the Manual_updater + * Sermondistributor Html View class for the Manual_updater */ -class SermondistributorViewManual_updater extends JViewLegacy +class SermondistributorViewManual_updater extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -95,12 +96,12 @@ class SermondistributorViewManual_updater extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // Load the script to find all uikit components needed. @@ -125,13 +126,13 @@ class SermondistributorViewManual_updater extends JViewLegacy if (File::exists(JPATH_ROOT.'/media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); } // check if the JavaScript file exists. if (File::exists(JPATH_ROOT.'/media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true); + JHtml::_('script', 'media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); } } } @@ -143,13 +144,13 @@ class SermondistributorViewManual_updater extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', ['version' => 'auto']); } } // add the document default css file diff --git a/admin/views/preacher/submitbutton.js b/admin/views/preacher/submitbutton.js index 64d93955..712543e9 100644 --- a/admin/views/preacher/submitbutton.js +++ b/admin/views/preacher/submitbutton.js @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage submitbutton.js diff --git a/admin/views/preacher/tmpl/edit.php b/admin/views/preacher/tmpl/edit.php index 2e98b8a0..ca4892d0 100644 --- a/admin/views/preacher/tmpl/edit.php +++ b/admin/views/preacher/tmpl/edit.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage edit.php diff --git a/admin/views/preacher/view.html.php b/admin/views/preacher/view.html.php index 725fe9cb..340465d9 100644 --- a/admin/views/preacher/view.html.php +++ b/admin/views/preacher/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; use Joomla\CMS\Filesystem\File; /** - * Preacher View class + * Preacher Html View class */ -class SermondistributorViewPreacher extends JViewLegacy +class SermondistributorViewPreacher extends HtmlView { /** * display method of View @@ -208,24 +209,24 @@ class SermondistributorViewPreacher extends JViewLegacy $this->document->addStyleSheet(JURI::root() . "administrator/components/com_sermondistributor/assets/css/preacher.css", (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.core.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.sort.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.filter.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.paginate.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.paginate.js', ['version' => 'auto']); $footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable(); }); jQuery('.nav-tabs').on('click', 'li', function() { setTimeout(tableFix, 10); }); }); function tableFix() { jQuery('.footable').trigger('footable_resize'); }"; $this->document->addScriptDeclaration($footable); diff --git a/admin/views/preachers/tmpl/default.php b/admin/views/preachers/tmpl/default.php index df383027..6b4847f9 100644 --- a/admin/views/preachers/tmpl/default.php +++ b/admin/views/preachers/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/preachers/tmpl/default_batch_body.php b/admin/views/preachers/tmpl/default_batch_body.php index be3d941f..b8c3f2f1 100644 --- a/admin/views/preachers/tmpl/default_batch_body.php +++ b/admin/views/preachers/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_body.php diff --git a/admin/views/preachers/tmpl/default_batch_footer.php b/admin/views/preachers/tmpl/default_batch_footer.php index 814e4625..7ae27c86 100644 --- a/admin/views/preachers/tmpl/default_batch_footer.php +++ b/admin/views/preachers/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_footer.php diff --git a/admin/views/preachers/tmpl/default_body.php b/admin/views/preachers/tmpl/default_body.php index a492e68d..071ae972 100644 --- a/admin/views/preachers/tmpl/default_body.php +++ b/admin/views/preachers/tmpl/default_body.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_body.php diff --git a/admin/views/preachers/tmpl/default_foot.php b/admin/views/preachers/tmpl/default_foot.php index f1e97a1f..16e7d277 100644 --- a/admin/views/preachers/tmpl/default_foot.php +++ b/admin/views/preachers/tmpl/default_foot.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_foot.php diff --git a/admin/views/preachers/tmpl/default_head.php b/admin/views/preachers/tmpl/default_head.php index f3073997..63ebdf76 100644 --- a/admin/views/preachers/tmpl/default_head.php +++ b/admin/views/preachers/tmpl/default_head.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_head.php diff --git a/admin/views/preachers/tmpl/default_toolbar.php b/admin/views/preachers/tmpl/default_toolbar.php index 9ba71de2..2039457c 100644 --- a/admin/views/preachers/tmpl/default_toolbar.php +++ b/admin/views/preachers/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_toolbar.php diff --git a/admin/views/preachers/view.html.php b/admin/views/preachers/view.html.php index bf7dfb32..d9b27863 100644 --- a/admin/views/preachers/view.html.php +++ b/admin/views/preachers/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; use Joomla\CMS\Filesystem\File; /** - * Sermondistributor View class for the Preachers + * Sermondistributor Html View class for the Preachers */ -class SermondistributorViewPreachers extends JViewLegacy +class SermondistributorViewPreachers extends HtmlView { /** * Preachers view display method diff --git a/admin/views/series/submitbutton.js b/admin/views/series/submitbutton.js index 980c4bf4..c8a2de86 100644 --- a/admin/views/series/submitbutton.js +++ b/admin/views/series/submitbutton.js @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage submitbutton.js diff --git a/admin/views/series/tmpl/edit.php b/admin/views/series/tmpl/edit.php index 5917cde6..1bd63c85 100644 --- a/admin/views/series/tmpl/edit.php +++ b/admin/views/series/tmpl/edit.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage edit.php diff --git a/admin/views/series/view.html.php b/admin/views/series/view.html.php index 70b235ad..2c28c59d 100644 --- a/admin/views/series/view.html.php +++ b/admin/views/series/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; use Joomla\CMS\Filesystem\File; /** - * Series View class + * Series Html View class */ -class SermondistributorViewSeries extends JViewLegacy +class SermondistributorViewSeries extends HtmlView { /** * display method of View @@ -208,24 +209,24 @@ class SermondistributorViewSeries extends JViewLegacy $this->document->addStyleSheet(JURI::root() . "administrator/components/com_sermondistributor/assets/css/series.css", (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.core.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.sort.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.filter.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.paginate.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.paginate.js', ['version' => 'auto']); $footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable(); }); jQuery('.nav-tabs').on('click', 'li', function() { setTimeout(tableFix, 10); }); }); function tableFix() { jQuery('.footable').trigger('footable_resize'); }"; $this->document->addScriptDeclaration($footable); diff --git a/admin/views/series_list/tmpl/default.php b/admin/views/series_list/tmpl/default.php index e5ebc4d0..8a86b47d 100644 --- a/admin/views/series_list/tmpl/default.php +++ b/admin/views/series_list/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/series_list/tmpl/default_batch_body.php b/admin/views/series_list/tmpl/default_batch_body.php index bd4a5052..ace524ad 100644 --- a/admin/views/series_list/tmpl/default_batch_body.php +++ b/admin/views/series_list/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_body.php diff --git a/admin/views/series_list/tmpl/default_batch_footer.php b/admin/views/series_list/tmpl/default_batch_footer.php index 027d2e57..31f907a3 100644 --- a/admin/views/series_list/tmpl/default_batch_footer.php +++ b/admin/views/series_list/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_footer.php diff --git a/admin/views/series_list/tmpl/default_body.php b/admin/views/series_list/tmpl/default_body.php index c8f7bf55..c81baace 100644 --- a/admin/views/series_list/tmpl/default_body.php +++ b/admin/views/series_list/tmpl/default_body.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_body.php diff --git a/admin/views/series_list/tmpl/default_foot.php b/admin/views/series_list/tmpl/default_foot.php index f1e97a1f..16e7d277 100644 --- a/admin/views/series_list/tmpl/default_foot.php +++ b/admin/views/series_list/tmpl/default_foot.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_foot.php diff --git a/admin/views/series_list/tmpl/default_head.php b/admin/views/series_list/tmpl/default_head.php index 1b2d97b1..741edf43 100644 --- a/admin/views/series_list/tmpl/default_head.php +++ b/admin/views/series_list/tmpl/default_head.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_head.php diff --git a/admin/views/series_list/tmpl/default_toolbar.php b/admin/views/series_list/tmpl/default_toolbar.php index 6ef1c8a9..b086d4d1 100644 --- a/admin/views/series_list/tmpl/default_toolbar.php +++ b/admin/views/series_list/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_toolbar.php diff --git a/admin/views/series_list/view.html.php b/admin/views/series_list/view.html.php index ee139d94..d7fbd8bc 100644 --- a/admin/views/series_list/view.html.php +++ b/admin/views/series_list/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,10 +25,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Sermondistributor View class for the Series_list + * Sermondistributor Html View class for the Series_list */ -class SermondistributorViewSeries_list extends JViewLegacy +class SermondistributorViewSeries_list extends HtmlView { /** * Series_list view display method diff --git a/admin/views/sermon/submitbutton.js b/admin/views/sermon/submitbutton.js index 080fc129..a9a57c6a 100644 --- a/admin/views/sermon/submitbutton.js +++ b/admin/views/sermon/submitbutton.js @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage submitbutton.js diff --git a/admin/views/sermon/tmpl/edit.php b/admin/views/sermon/tmpl/edit.php index 47b5c7a2..41e0547e 100644 --- a/admin/views/sermon/tmpl/edit.php +++ b/admin/views/sermon/tmpl/edit.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage edit.php diff --git a/admin/views/sermon/view.html.php b/admin/views/sermon/view.html.php index 44a23aab..27eb87a4 100644 --- a/admin/views/sermon/view.html.php +++ b/admin/views/sermon/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; use Joomla\CMS\Filesystem\File; /** - * Sermon View class + * Sermon Html View class */ -class SermondistributorViewSermon extends JViewLegacy +class SermondistributorViewSermon extends HtmlView { /** * display method of View @@ -210,24 +211,24 @@ class SermondistributorViewSermon extends JViewLegacy $this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.core.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.sort.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.filter.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.paginate.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.paginate.js', ['version' => 'auto']); $footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable(); }); jQuery('.nav-tabs').on('click', 'li', function() { setTimeout(tableFix, 10); }); }); function tableFix() { jQuery('.footable').trigger('footable_resize'); }"; $this->document->addScriptDeclaration($footable); diff --git a/admin/views/sermondistributor/tmpl/default.php b/admin/views/sermondistributor/tmpl/default.php index 25636810..ff89933a 100644 --- a/admin/views/sermondistributor/tmpl/default.php +++ b/admin/views/sermondistributor/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/sermondistributor/tmpl/default_closed_issues_the_closed_issues_on_github.php b/admin/views/sermondistributor/tmpl/default_closed_issues_the_closed_issues_on_github.php index 99b33404..78a82d96 100644 --- a/admin/views/sermondistributor/tmpl/default_closed_issues_the_closed_issues_on_github.php +++ b/admin/views/sermondistributor/tmpl/default_closed_issues_the_closed_issues_on_github.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_closed_issues_the_closed_issues_on_github.php diff --git a/admin/views/sermondistributor/tmpl/default_main.php b/admin/views/sermondistributor/tmpl/default_main.php index 942fee9a..b1433360 100644 --- a/admin/views/sermondistributor/tmpl/default_main.php +++ b/admin/views/sermondistributor/tmpl/default_main.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_main.php diff --git a/admin/views/sermondistributor/tmpl/default_open_issues_the_open_issues_on_github.php b/admin/views/sermondistributor/tmpl/default_open_issues_the_open_issues_on_github.php index c4306647..aca740fb 100644 --- a/admin/views/sermondistributor/tmpl/default_open_issues_the_open_issues_on_github.php +++ b/admin/views/sermondistributor/tmpl/default_open_issues_the_open_issues_on_github.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_open_issues_the_open_issues_on_github.php diff --git a/admin/views/sermondistributor/tmpl/default_readme_information.php b/admin/views/sermondistributor/tmpl/default_readme_information.php index a61dc146..a877c37b 100644 --- a/admin/views/sermondistributor/tmpl/default_readme_information.php +++ b/admin/views/sermondistributor/tmpl/default_readme_information.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_readme_information.php diff --git a/admin/views/sermondistributor/tmpl/default_releases_information.php b/admin/views/sermondistributor/tmpl/default_releases_information.php index ce42d286..62dc3273 100644 --- a/admin/views/sermondistributor/tmpl/default_releases_information.php +++ b/admin/views/sermondistributor/tmpl/default_releases_information.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_releases_information.php diff --git a/admin/views/sermondistributor/tmpl/default_vast_development_method_notice_board.php b/admin/views/sermondistributor/tmpl/default_vast_development_method_notice_board.php index 76b6d656..44ef9118 100644 --- a/admin/views/sermondistributor/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/sermondistributor/tmpl/default_vast_development_method_notice_board.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_vast_development_method_notice_board.php diff --git a/admin/views/sermondistributor/tmpl/default_vdm.php b/admin/views/sermondistributor/tmpl/default_vdm.php index 8120ac34..3b4a6a98 100644 --- a/admin/views/sermondistributor/tmpl/default_vdm.php +++ b/admin/views/sermondistributor/tmpl/default_vdm.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_vdm.php diff --git a/admin/views/sermondistributor/view.html.php b/admin/views/sermondistributor/view.html.php index 24261d6f..619d7dd3 100644 --- a/admin/views/sermondistributor/view.html.php +++ b/admin/views/sermondistributor/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/admin/views/sermons/tmpl/default.php b/admin/views/sermons/tmpl/default.php index 6b90d009..b27f2b9e 100644 --- a/admin/views/sermons/tmpl/default.php +++ b/admin/views/sermons/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/sermons/tmpl/default_batch_body.php b/admin/views/sermons/tmpl/default_batch_body.php index 2669ae2a..1eb22643 100644 --- a/admin/views/sermons/tmpl/default_batch_body.php +++ b/admin/views/sermons/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_body.php diff --git a/admin/views/sermons/tmpl/default_batch_footer.php b/admin/views/sermons/tmpl/default_batch_footer.php index e9ea2ba1..2a92a806 100644 --- a/admin/views/sermons/tmpl/default_batch_footer.php +++ b/admin/views/sermons/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_footer.php diff --git a/admin/views/sermons/tmpl/default_body.php b/admin/views/sermons/tmpl/default_body.php index 087e16d2..3ce8ae8c 100644 --- a/admin/views/sermons/tmpl/default_body.php +++ b/admin/views/sermons/tmpl/default_body.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_body.php @@ -84,7 +84,7 @@ $edit = "index.php?option=com_sermondistributor&view=sermons&task=sermon.edit";
- user->authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int)$item->preacher)): ?> + user->authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int) $item->preacher)): ?> escape($item->preacher_name); ?> escape($item->preacher_name); ?> @@ -93,7 +93,7 @@ $edit = "index.php?option=com_sermondistributor&view=sermons&task=sermon.edit";
- user->authorise('series.edit', 'com_sermondistributor.series.' . (int)$item->series)): ?> + user->authorise('series.edit', 'com_sermondistributor.series.' . (int) $item->series)): ?> escape($item->series_name); ?> escape($item->series_name); ?> diff --git a/admin/views/sermons/tmpl/default_foot.php b/admin/views/sermons/tmpl/default_foot.php index 12d28df0..9afbf28b 100644 --- a/admin/views/sermons/tmpl/default_foot.php +++ b/admin/views/sermons/tmpl/default_foot.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_foot.php diff --git a/admin/views/sermons/tmpl/default_head.php b/admin/views/sermons/tmpl/default_head.php index f47b1d72..f9c5cc65 100644 --- a/admin/views/sermons/tmpl/default_head.php +++ b/admin/views/sermons/tmpl/default_head.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_head.php diff --git a/admin/views/sermons/tmpl/default_toolbar.php b/admin/views/sermons/tmpl/default_toolbar.php index a826fbc2..f1cf2010 100644 --- a/admin/views/sermons/tmpl/default_toolbar.php +++ b/admin/views/sermons/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_toolbar.php diff --git a/admin/views/sermons/view.html.php b/admin/views/sermons/view.html.php index 3a429f2a..68e8e6db 100644 --- a/admin/views/sermons/view.html.php +++ b/admin/views/sermons/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,10 +25,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Sermondistributor View class for the Sermons + * Sermondistributor Html View class for the Sermons */ -class SermondistributorViewSermons extends JViewLegacy +class SermondistributorViewSermons extends HtmlView { /** * Sermons view display method diff --git a/admin/views/statistic/submitbutton.js b/admin/views/statistic/submitbutton.js index a8136a52..22bf8953 100644 --- a/admin/views/statistic/submitbutton.js +++ b/admin/views/statistic/submitbutton.js @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage submitbutton.js diff --git a/admin/views/statistic/tmpl/edit.php b/admin/views/statistic/tmpl/edit.php index 3017bbab..15d10386 100644 --- a/admin/views/statistic/tmpl/edit.php +++ b/admin/views/statistic/tmpl/edit.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage edit.php diff --git a/admin/views/statistic/view.html.php b/admin/views/statistic/view.html.php index 56f3425e..02971971 100644 --- a/admin/views/statistic/view.html.php +++ b/admin/views/statistic/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,10 +25,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Statistic View class + * Statistic Html View class */ -class SermondistributorViewStatistic extends JViewLegacy +class SermondistributorViewStatistic extends HtmlView { /** * display method of View diff --git a/admin/views/statistics/tmpl/default.php b/admin/views/statistics/tmpl/default.php index f1f057df..2e2c0194 100644 --- a/admin/views/statistics/tmpl/default.php +++ b/admin/views/statistics/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/statistics/tmpl/default_batch_body.php b/admin/views/statistics/tmpl/default_batch_body.php index 8a5cef1b..00be6d14 100644 --- a/admin/views/statistics/tmpl/default_batch_body.php +++ b/admin/views/statistics/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_body.php diff --git a/admin/views/statistics/tmpl/default_batch_footer.php b/admin/views/statistics/tmpl/default_batch_footer.php index 8281cf13..0c53ecf4 100644 --- a/admin/views/statistics/tmpl/default_batch_footer.php +++ b/admin/views/statistics/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_footer.php diff --git a/admin/views/statistics/tmpl/default_body.php b/admin/views/statistics/tmpl/default_body.php index cc7aeae2..88f03b23 100644 --- a/admin/views/statistics/tmpl/default_body.php +++ b/admin/views/statistics/tmpl/default_body.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_body.php @@ -84,7 +84,7 @@ $edit = "index.php?option=com_sermondistributor&view=statistics&task=statistic.e
- user->authorise('sermon.edit', 'com_sermondistributor.sermon.' . (int)$item->sermon)): ?> + user->authorise('sermon.edit', 'com_sermondistributor.sermon.' . (int) $item->sermon)): ?> escape($item->sermon_name); ?> escape($item->sermon_name); ?> @@ -93,7 +93,7 @@ $edit = "index.php?option=com_sermondistributor&view=statistics&task=statistic.e
- user->authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int)$item->preacher)): ?> + user->authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int) $item->preacher)): ?> escape($item->preacher_name); ?> escape($item->preacher_name); ?> @@ -102,7 +102,7 @@ $edit = "index.php?option=com_sermondistributor&view=statistics&task=statistic.e
- user->authorise('series.edit', 'com_sermondistributor.series.' . (int)$item->series)): ?> + user->authorise('series.edit', 'com_sermondistributor.series.' . (int) $item->series)): ?> escape($item->series_name); ?> escape($item->series_name); ?> diff --git a/admin/views/statistics/tmpl/default_foot.php b/admin/views/statistics/tmpl/default_foot.php index 30540e1f..d111908e 100644 --- a/admin/views/statistics/tmpl/default_foot.php +++ b/admin/views/statistics/tmpl/default_foot.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_foot.php diff --git a/admin/views/statistics/tmpl/default_head.php b/admin/views/statistics/tmpl/default_head.php index c402dd23..5e85d912 100644 --- a/admin/views/statistics/tmpl/default_head.php +++ b/admin/views/statistics/tmpl/default_head.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_head.php diff --git a/admin/views/statistics/tmpl/default_toolbar.php b/admin/views/statistics/tmpl/default_toolbar.php index 3f51d5c0..a71d3ddf 100644 --- a/admin/views/statistics/tmpl/default_toolbar.php +++ b/admin/views/statistics/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_toolbar.php diff --git a/admin/views/statistics/view.html.php b/admin/views/statistics/view.html.php index 806e8375..f43ea95e 100644 --- a/admin/views/statistics/view.html.php +++ b/admin/views/statistics/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,10 +25,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Sermondistributor View class for the Statistics + * Sermondistributor Html View class for the Statistics */ -class SermondistributorViewStatistics extends JViewLegacy +class SermondistributorViewStatistics extends HtmlView { /** * Statistics view display method diff --git a/media/js/external_source.js b/media/js/external_source.js index 8979f509..877b7f45 100644 --- a/media/js/external_source.js +++ b/media/js/external_source.js @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage external_source.js diff --git a/media/js/help_document.js b/media/js/help_document.js index f00d6cf0..7e79fafc 100644 --- a/media/js/help_document.js +++ b/media/js/help_document.js @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage help_document.js diff --git a/media/js/local_listing.js b/media/js/local_listing.js index b9c2d4d2..cb9579e1 100644 --- a/media/js/local_listing.js +++ b/media/js/local_listing.js @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage local_listing.js diff --git a/media/js/preacher.js b/media/js/preacher.js index bc3d5d27..9cc67f27 100644 --- a/media/js/preacher.js +++ b/media/js/preacher.js @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.js diff --git a/media/js/series.js b/media/js/series.js index e5c1fd01..84fb103b 100644 --- a/media/js/series.js +++ b/media/js/series.js @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage series.js diff --git a/media/js/sermon.js b/media/js/sermon.js index 26b2165b..498cf85b 100644 --- a/media/js/sermon.js +++ b/media/js/sermon.js @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.js diff --git a/media/js/statistic.js b/media/js/statistic.js index 4f2dea20..d73fb926 100644 --- a/media/js/statistic.js +++ b/media/js/statistic.js @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage statistic.js diff --git a/script.php b/script.php index 6356993d..d319e039 100644 --- a/script.php +++ b/script.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage script.php @@ -1840,7 +1840,7 @@ class com_sermondistributorInstallerScript echo ' -

Upgrade to Version 2.0.5 Was Successful! Let us know if anything is not working as expected.

'; +

Upgrade to Version 2.1.0 Was Successful! Let us know if anything is not working as expected.

'; // Set db if not set already. if (!isset($db)) diff --git a/sermondistributor.xml b/sermondistributor.xml index 30b9f341..7e9f5379 100644 --- a/sermondistributor.xml +++ b/sermondistributor.xml @@ -1,15 +1,15 @@ COM_SERMONDISTRIBUTOR - 2nd March, 2022 + 27th May, 2022 Llewellyn van der Merwe joomla@vdm.io https://www.vdm.io/ Copyright (C) 2015. All Rights Reserved GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - 2.0.5 + 2.1.0 Sermon Distributor (v.2.0.5) +

Sermon Distributor (v.2.1.0)

Distributor is a highly advanced sermon distributor that runs on the [Joomla 3.x](http://www.joomla.org) framework. You can link a shared folder from Dropbox to the component and use Dropbox as your file host, not to mention the advanced auto builder that gives you the ability to simply load sermons to your website by only adding them to Dropbox.

Created by Llewellyn van der Merwe
Development started 22nd October, 2015

diff --git a/sermondistributor_update_server.xml b/sermondistributor_update_server.xml index 9948cbde..466ef487 100644 --- a/sermondistributor_update_server.xml +++ b/sermondistributor_update_server.xml @@ -7,7 +7,7 @@ 1.0.0 https://www.vdm.io/ - https://github.com/Llewellynvdm/Joomla-Sermon-Distributor/archive/V1.2.9.zip + https://git.vdm.dev/christian/Joomla-Sermon-Distributor/archive/v1.2.9.zip stable @@ -24,7 +24,7 @@ 1.3.8 https://www.vdm.io/ - https://github.com/Llewellynvdm/Joomla-Sermon-Distributor/releases/download/v1.3.8/SD_v1.3.8.zip + https://git.vdm.dev/christian/Joomla-Sermon-Distributor/archive/v1.3.8.zip stable @@ -41,7 +41,7 @@ 2.0.3 https://www.vdm.io/ - https://github.com/Llewellynvdm/Joomla-Sermon-Distributor/releases/download/v2.0.3/SD_v2.0.3.zip + https://git.vdm.dev/christian/Joomla-Sermon-Distributor/archive/v2.0.3.zip stable @@ -55,10 +55,10 @@ A sermon distributor that links to Dropbox. com_sermondistributor component - 2.0.5 + 2.1.0 https://www.vdm.io/ - https://github.com/Llewellynvdm/Joomla-Sermon-Distributor/releases/download/v2.0.5/SD_v2.0.5.zip + https://git.vdm.dev/christian/Joomla-Sermon-Distributor/archive/v2.1.0.zip stable diff --git a/site/assets/css/api.css b/site/assets/css/api.css index 39c4f1b7..876de334 100644 --- a/site/assets/css/api.css +++ b/site/assets/css/api.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage api.css diff --git a/site/assets/css/categories.css b/site/assets/css/categories.css index 64bac492..1a941d61 100644 --- a/site/assets/css/categories.css +++ b/site/assets/css/categories.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage categories.css diff --git a/site/assets/css/category.css b/site/assets/css/category.css index 96e16d14..0ad67227 100644 --- a/site/assets/css/category.css +++ b/site/assets/css/category.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage category.css diff --git a/site/assets/css/preacher.css b/site/assets/css/preacher.css index a13953b0..99d15e58 100644 --- a/site/assets/css/preacher.css +++ b/site/assets/css/preacher.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.css diff --git a/site/assets/css/preachers.css b/site/assets/css/preachers.css index 9d17adb6..5f209cd8 100644 --- a/site/assets/css/preachers.css +++ b/site/assets/css/preachers.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.css diff --git a/site/assets/css/series.css b/site/assets/css/series.css index 78ca4b4f..7bcfec11 100644 --- a/site/assets/css/series.css +++ b/site/assets/css/series.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage series.css diff --git a/site/assets/css/serieslist.css b/site/assets/css/serieslist.css index 02165fb1..22719d6c 100644 --- a/site/assets/css/serieslist.css +++ b/site/assets/css/serieslist.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage serieslist.css diff --git a/site/assets/css/sermon.css b/site/assets/css/sermon.css index 77db0028..f4192d9c 100644 --- a/site/assets/css/sermon.css +++ b/site/assets/css/sermon.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.css diff --git a/site/assets/css/site.css b/site/assets/css/site.css index 441f4d2f..eea731c5 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage site.css diff --git a/site/assets/js/site.js b/site/assets/js/site.js index 3757ddf8..b24e99b1 100644 --- a/site/assets/js/site.js +++ b/site/assets/js/site.js @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage site.js diff --git a/site/controller.php b/site/controller.php index 01a65e80..5bb16d89 100644 --- a/site/controller.php +++ b/site/controller.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage controller.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Component Controller + * Sermondistributor Component Base Controller */ -class SermondistributorController extends JControllerLegacy +class SermondistributorController extends BaseController { /** * Method to display a view. diff --git a/site/controllers/ajax.json.php b/site/controllers/ajax.json.php index 87a81395..91d2cda3 100644 --- a/site/controllers/ajax.json.php +++ b/site/controllers/ajax.json.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage ajax.json.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Ajax Controller + * Sermondistributor Ajax Base Controller */ -class SermondistributorControllerAjax extends JControllerLegacy +class SermondistributorControllerAjax extends BaseController { public function __construct($config) { diff --git a/site/controllers/api.php b/site/controllers/api.php index 3a6d3b8a..246d91fa 100644 --- a/site/controllers/api.php +++ b/site/controllers/api.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage api.php @@ -28,9 +28,9 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Api Controller + * Sermondistributor Api Form Controller */ -class SermondistributorControllerApi extends JControllerForm +class SermondistributorControllerApi extends FormController { /** * Current or most recently performed task. diff --git a/site/controllers/download.php b/site/controllers/download.php index d47dea1f..9605f049 100644 --- a/site/controllers/download.php +++ b/site/controllers/download.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage download.php diff --git a/site/controllers/help.php b/site/controllers/help.php index 75e7267c..f724779f 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage help.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Help Controller + * Sermondistributor Help Base Controller */ -class SermondistributorControllerHelp extends JControllerLegacy +class SermondistributorControllerHelp extends BaseController { public function __construct($config) { diff --git a/site/helpers/category.php b/site/helpers/category.php index 87f388d0..c7254aea 100644 --- a/site/helpers/category.php +++ b/site/helpers/category.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage category.php diff --git a/site/helpers/categorysermon.php b/site/helpers/categorysermon.php index 06b22c71..9c55a0d5 100644 --- a/site/helpers/categorysermon.php +++ b/site/helpers/categorysermon.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage categorysermon.php diff --git a/site/helpers/dropboxupdater.php b/site/helpers/dropboxupdater.php index 87597495..7788e4d1 100644 --- a/site/helpers/dropboxupdater.php +++ b/site/helpers/dropboxupdater.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage dropboxupdater.php diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index 295b3e01..a049a32a 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index 0572197b..f48fc86a 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage route.php diff --git a/site/helpers/sermondistributor.php b/site/helpers/sermondistributor.php index b58e04b6..9addd4e2 100644 --- a/site/helpers/sermondistributor.php +++ b/site/helpers/sermondistributor.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php @@ -686,12 +686,12 @@ abstract class SermondistributorHelper } /** - * File Extension to Mimetype + * File Extensions to Mimetypes * https://gist.github.com/Llewellynvdm/74be373357e131b8775a7582c3de508b * http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types - * + * * @var array - **/ + */ protected static $fileExtensionToMimeType = array( '123' => 'application/vnd.lotus-1-2-3', '3dml' => 'text/vnd.in3d.3dml', @@ -1236,6 +1236,7 @@ abstract class SermondistributorHelper 'opf' => 'application/oebps-package+xml', 'opml' => 'text/x-opml', 'oprc' => 'application/vnd.palm', + 'opus' => 'audio/ogg', 'org' => 'application/vnd.lotus-organizer', 'osf' => 'application/vnd.yamaha.openscoreformat', 'osfpvg' => 'application/vnd.yamaha.openscoreformat.osfpvg+xml', @@ -1697,7 +1698,7 @@ abstract class SermondistributorHelper */ // get the extension form file - $extension = \strtolower(\pathinfo($file, \PATHINFO_EXTENSION)); + $extension = strtolower(pathinfo($file, PATHINFO_EXTENSION)); // check if we have the extension listed if (isset(self::$fileExtensionToMimeType[$extension])) { @@ -4331,3 +4332,4 @@ abstract class SermondistributorHelper return $default; } } + diff --git a/site/layouts/addtodropboxbutton.php b/site/layouts/addtodropboxbutton.php index 874ede7e..fc21b7ac 100644 --- a/site/layouts/addtodropboxbutton.php +++ b/site/layouts/addtodropboxbutton.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage addtodropboxbutton.php diff --git a/site/layouts/addtodropboxicon.php b/site/layouts/addtodropboxicon.php index 3d7efcc8..af205a14 100644 --- a/site/layouts/addtodropboxicon.php +++ b/site/layouts/addtodropboxicon.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage addtodropboxicon.php diff --git a/site/layouts/categorieslistitem.php b/site/layouts/categorieslistitem.php index 6f5357c6..922ee50a 100644 --- a/site/layouts/categorieslistitem.php +++ b/site/layouts/categorieslistitem.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage categorieslistitem.php diff --git a/site/layouts/categoriespanel.php b/site/layouts/categoriespanel.php index 68b1511e..534a77a9 100644 --- a/site/layouts/categoriespanel.php +++ b/site/layouts/categoriespanel.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage categoriespanel.php diff --git a/site/layouts/categoriesrow.php b/site/layouts/categoriesrow.php index ab4cee6c..e8321cb9 100644 --- a/site/layouts/categoriesrow.php +++ b/site/layouts/categoriesrow.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage categoriesrow.php diff --git a/site/layouts/downloadsermonbutton.php b/site/layouts/downloadsermonbutton.php index 92a4f690..8a6946ff 100644 --- a/site/layouts/downloadsermonbutton.php +++ b/site/layouts/downloadsermonbutton.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage downloadsermonbutton.php diff --git a/site/layouts/htmlfive.php b/site/layouts/htmlfive.php index 43e36349..0f6b8c33 100644 --- a/site/layouts/htmlfive.php +++ b/site/layouts/htmlfive.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage htmlfive.php diff --git a/site/layouts/isnew.php b/site/layouts/isnew.php index faefc42b..991ef8f2 100644 --- a/site/layouts/isnew.php +++ b/site/layouts/isnew.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage isnew.php diff --git a/site/layouts/jplayerbluemonday.php b/site/layouts/jplayerbluemonday.php index 7867dfaa..e76ae025 100644 --- a/site/layouts/jplayerbluemonday.php +++ b/site/layouts/jplayerbluemonday.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage jplayerbluemonday.php diff --git a/site/layouts/jplayerbluemondaylist.php b/site/layouts/jplayerbluemondaylist.php index 25e1718f..48d53139 100644 --- a/site/layouts/jplayerbluemondaylist.php +++ b/site/layouts/jplayerbluemondaylist.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage jplayerbluemondaylist.php diff --git a/site/layouts/mediaplayer.php b/site/layouts/mediaplayer.php index 662b6f69..0e23009a 100644 --- a/site/layouts/mediaplayer.php +++ b/site/layouts/mediaplayer.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage mediaplayer.php diff --git a/site/layouts/opensermonbutton.php b/site/layouts/opensermonbutton.php index e82602e5..8034880c 100644 --- a/site/layouts/opensermonbutton.php +++ b/site/layouts/opensermonbutton.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage opensermonbutton.php diff --git a/site/layouts/preacherslistitem.php b/site/layouts/preacherslistitem.php index a438bae1..cf541985 100644 --- a/site/layouts/preacherslistitem.php +++ b/site/layouts/preacherslistitem.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage preacherslistitem.php diff --git a/site/layouts/preacherspanel.php b/site/layouts/preacherspanel.php index 4faaea81..15c57f6c 100644 --- a/site/layouts/preacherspanel.php +++ b/site/layouts/preacherspanel.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage preacherspanel.php diff --git a/site/layouts/preachersrow.php b/site/layouts/preachersrow.php index 62f9367d..68e067a2 100644 --- a/site/layouts/preachersrow.php +++ b/site/layouts/preachersrow.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage preachersrow.php diff --git a/site/layouts/serieslistitem.php b/site/layouts/serieslistitem.php index 4927bd5e..03b903a4 100644 --- a/site/layouts/serieslistitem.php +++ b/site/layouts/serieslistitem.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage serieslistitem.php diff --git a/site/layouts/seriespanel.php b/site/layouts/seriespanel.php index 57b2a63d..26f20ab8 100644 --- a/site/layouts/seriespanel.php +++ b/site/layouts/seriespanel.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage seriespanel.php diff --git a/site/layouts/seriesrow.php b/site/layouts/seriesrow.php index 1dd006b9..09e92762 100644 --- a/site/layouts/seriesrow.php +++ b/site/layouts/seriesrow.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage seriesrow.php diff --git a/site/layouts/sermonslistitem.php b/site/layouts/sermonslistitem.php index 566a962e..5b0b73b5 100644 --- a/site/layouts/sermonslistitem.php +++ b/site/layouts/sermonslistitem.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermonslistitem.php diff --git a/site/layouts/sermonspanel.php b/site/layouts/sermonspanel.php index 15257bc6..385f448f 100644 --- a/site/layouts/sermonspanel.php +++ b/site/layouts/sermonspanel.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermonspanel.php diff --git a/site/layouts/sermonsrow.php b/site/layouts/sermonsrow.php index 96744490..2af86f2a 100644 --- a/site/layouts/sermonsrow.php +++ b/site/layouts/sermonsrow.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermonsrow.php diff --git a/site/layouts/soundmanagerthreesixty.php b/site/layouts/soundmanagerthreesixty.php index 564c234c..fd16455d 100644 --- a/site/layouts/soundmanagerthreesixty.php +++ b/site/layouts/soundmanagerthreesixty.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage soundmanagerthreesixty.php diff --git a/site/models/ajax.php b/site/models/ajax.php index 62cfb5a0..77f67bb0 100644 --- a/site/models/ajax.php +++ b/site/models/ajax.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage ajax.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Ajax Model + * Sermondistributor Ajax List Model */ -class SermondistributorModelAjax extends JModelList +class SermondistributorModelAjax extends ListModel { protected $app_params; diff --git a/site/models/api.php b/site/models/api.php index 979a584c..ec79e182 100644 --- a/site/models/api.php +++ b/site/models/api.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage api.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Model for Api + * Sermondistributor List Model for Api */ -class SermondistributorModelApi extends JModelList +class SermondistributorModelApi extends ListModel { /** * Model user data. diff --git a/site/models/categories.php b/site/models/categories.php index 089d839e..1e992d26 100644 --- a/site/models/categories.php +++ b/site/models/categories.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage categories.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Model for Categories + * Sermondistributor List Model for Categories */ -class SermondistributorModelCategories extends JModelList +class SermondistributorModelCategories extends ListModel { /** * Model user data. diff --git a/site/models/category.php b/site/models/category.php index 16ab6342..d5d96b32 100644 --- a/site/models/category.php +++ b/site/models/category.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage category.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Model for Category + * Sermondistributor List Model for Category */ -class SermondistributorModelCategory extends JModelList +class SermondistributorModelCategory extends ListModel { /** * Model user data. diff --git a/site/models/preacher.php b/site/models/preacher.php index 2f2ce561..bfc7d18d 100644 --- a/site/models/preacher.php +++ b/site/models/preacher.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Model for Preacher + * Sermondistributor List Model for Preacher */ -class SermondistributorModelPreacher extends JModelList +class SermondistributorModelPreacher extends ListModel { /** * Model user data. diff --git a/site/models/preachers.php b/site/models/preachers.php index 2527c510..929e1b00 100644 --- a/site/models/preachers.php +++ b/site/models/preachers.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Model for Preachers + * Sermondistributor List Model for Preachers */ -class SermondistributorModelPreachers extends JModelList +class SermondistributorModelPreachers extends ListModel { /** * Model user data. diff --git a/site/models/series.php b/site/models/series.php index e10f8cd1..5a94a2f4 100644 --- a/site/models/series.php +++ b/site/models/series.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Model for Series + * Sermondistributor List Model for Series */ -class SermondistributorModelSeries extends JModelList +class SermondistributorModelSeries extends ListModel { /** * Model user data. diff --git a/site/models/serieslist.php b/site/models/serieslist.php index cbe33011..baa912b0 100644 --- a/site/models/serieslist.php +++ b/site/models/serieslist.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage serieslist.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Model for Serieslist + * Sermondistributor List Model for Serieslist */ -class SermondistributorModelSerieslist extends JModelList +class SermondistributorModelSerieslist extends ListModel { /** * Model user data. diff --git a/site/models/sermon.php b/site/models/sermon.php index 13962a18..57d70d52 100644 --- a/site/models/sermon.php +++ b/site/models/sermon.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ItemModel; use Joomla\Utilities\ArrayHelper; /** - * Sermondistributor Sermon Model + * Sermondistributor Sermon Item Model */ -class SermondistributorModelSermon extends JModelItem +class SermondistributorModelSermon extends ItemModel { /** * Model context string. diff --git a/site/router.php b/site/router.php index 484e7791..de417db5 100644 --- a/site/router.php +++ b/site/router.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage router.php diff --git a/site/sermondistributor.php b/site/sermondistributor.php index 501d4e5a..cef4810f 100644 --- a/site/sermondistributor.php +++ b/site/sermondistributor.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php diff --git a/site/views/api/submitbutton.js b/site/views/api/submitbutton.js index 5e555354..4662cc66 100644 --- a/site/views/api/submitbutton.js +++ b/site/views/api/submitbutton.js @@ -9,7 +9,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage submitbutton.js diff --git a/site/views/api/tmpl/default.php b/site/views/api/tmpl/default.php index c838d19f..d2981325 100644 --- a/site/views/api/tmpl/default.php +++ b/site/views/api/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/site/views/api/view.html.php b/site/views/api/view.html.php index 7513b4af..407ce267 100644 --- a/site/views/api/view.html.php +++ b/site/views/api/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,10 +25,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Sermondistributor View class for the Api + * Sermondistributor Html View class for the Api */ -class SermondistributorViewApi extends JViewLegacy +class SermondistributorViewApi extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -89,12 +91,12 @@ class SermondistributorViewApi extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } } // Use Uikit Version 3 @@ -103,13 +105,13 @@ class SermondistributorViewApi extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', ['version' => 'auto']); } } // add the document default css file diff --git a/site/views/categories/tmpl/default.php b/site/views/categories/tmpl/default.php index dfbb7d87..2f7d21e2 100644 --- a/site/views/categories/tmpl/default.php +++ b/site/views/categories/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/site/views/categories/tmpl/default_categories-grid.php b/site/views/categories/tmpl/default_categories-grid.php index d8b59151..396dce90 100644 --- a/site/views/categories/tmpl/default_categories-grid.php +++ b/site/views/categories/tmpl/default_categories-grid.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_categories-grid.php diff --git a/site/views/categories/tmpl/default_categories-list.php b/site/views/categories/tmpl/default_categories-list.php index e59072c9..c28995cc 100644 --- a/site/views/categories/tmpl/default_categories-list.php +++ b/site/views/categories/tmpl/default_categories-list.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_categories-list.php diff --git a/site/views/categories/tmpl/default_categories-table.php b/site/views/categories/tmpl/default_categories-table.php index 57649baa..32ee8c7b 100644 --- a/site/views/categories/tmpl/default_categories-table.php +++ b/site/views/categories/tmpl/default_categories-table.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_categories-table.php diff --git a/site/views/categories/view.html.php b/site/views/categories/view.html.php index c5ec5d48..838ac01f 100644 --- a/site/views/categories/view.html.php +++ b/site/views/categories/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; use Joomla\CMS\Filesystem\File; /** - * Sermondistributor View class for the Categories + * Sermondistributor Html View class for the Categories */ -class SermondistributorViewCategories extends JViewLegacy +class SermondistributorViewCategories extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -112,12 +113,12 @@ class SermondistributorViewCategories extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // Load the script to find all uikit components needed. @@ -143,13 +144,13 @@ class SermondistributorViewCategories extends JViewLegacy if (File::exists(JPATH_ROOT.'/media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); } // check if the JavaScript file exists. if (File::exists(JPATH_ROOT.'/media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true); + JHtml::_('script', 'media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); } } } @@ -161,35 +162,35 @@ class SermondistributorViewCategories extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', ['version' => 'auto']); } } // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.core.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.sort.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.filter.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.paginate.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.paginate.js', ['version' => 'auto']); // load the meta description if ($this->params->get('menu-meta_description')) { diff --git a/site/views/category/tmpl/default.php b/site/views/category/tmpl/default.php index 174181de..e6035ddd 100644 --- a/site/views/category/tmpl/default.php +++ b/site/views/category/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/site/views/category/tmpl/default_categorybox.php b/site/views/category/tmpl/default_categorybox.php index 48426060..b556f85a 100644 --- a/site/views/category/tmpl/default_categorybox.php +++ b/site/views/category/tmpl/default_categorybox.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_categorybox.php diff --git a/site/views/category/tmpl/default_categorypanel.php b/site/views/category/tmpl/default_categorypanel.php index f4938e58..2caea8cf 100644 --- a/site/views/category/tmpl/default_categorypanel.php +++ b/site/views/category/tmpl/default_categorypanel.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_categorypanel.php diff --git a/site/views/category/tmpl/default_categorysmall.php b/site/views/category/tmpl/default_categorysmall.php index 362876d9..3477313b 100644 --- a/site/views/category/tmpl/default_categorysmall.php +++ b/site/views/category/tmpl/default_categorysmall.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_categorysmall.php diff --git a/site/views/category/tmpl/default_sermons-grid.php b/site/views/category/tmpl/default_sermons-grid.php index 618b24b2..4f885c58 100644 --- a/site/views/category/tmpl/default_sermons-grid.php +++ b/site/views/category/tmpl/default_sermons-grid.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-grid.php diff --git a/site/views/category/tmpl/default_sermons-list.php b/site/views/category/tmpl/default_sermons-list.php index e5336fe3..ef424276 100644 --- a/site/views/category/tmpl/default_sermons-list.php +++ b/site/views/category/tmpl/default_sermons-list.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-list.php diff --git a/site/views/category/tmpl/default_sermons-table.php b/site/views/category/tmpl/default_sermons-table.php index b4434f75..e5025f33 100644 --- a/site/views/category/tmpl/default_sermons-table.php +++ b/site/views/category/tmpl/default_sermons-table.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-table.php diff --git a/site/views/category/view.html.php b/site/views/category/view.html.php index c7c58c39..b967d1f2 100644 --- a/site/views/category/view.html.php +++ b/site/views/category/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; use Joomla\CMS\Filesystem\File; /** - * Sermondistributor View class for the Category + * Sermondistributor Html View class for the Category */ -class SermondistributorViewCategory extends JViewLegacy +class SermondistributorViewCategory extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -160,12 +161,12 @@ class SermondistributorViewCategory extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // Load the script to find all uikit components needed. @@ -205,13 +206,13 @@ class SermondistributorViewCategory extends JViewLegacy if (File::exists(JPATH_ROOT.'/media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); } // check if the JavaScript file exists. if (File::exists(JPATH_ROOT.'/media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true); + JHtml::_('script', 'media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); } } } @@ -223,35 +224,35 @@ class SermondistributorViewCategory extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', ['version' => 'auto']); } } // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.core.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.sort.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.filter.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.paginate.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.paginate.js', ['version' => 'auto']); // load the meta description if (isset($this->category->metadesc) && $this->category->metadesc) { diff --git a/site/views/preacher/tmpl/default.php b/site/views/preacher/tmpl/default.php index a3fc8b0d..855d7094 100644 --- a/site/views/preacher/tmpl/default.php +++ b/site/views/preacher/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/site/views/preacher/tmpl/default_preacherbox.php b/site/views/preacher/tmpl/default_preacherbox.php index 20615c1a..4f34749c 100644 --- a/site/views/preacher/tmpl/default_preacherbox.php +++ b/site/views/preacher/tmpl/default_preacherbox.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_preacherbox.php diff --git a/site/views/preacher/tmpl/default_preacherpanel.php b/site/views/preacher/tmpl/default_preacherpanel.php index 86d3d7c9..727527a4 100644 --- a/site/views/preacher/tmpl/default_preacherpanel.php +++ b/site/views/preacher/tmpl/default_preacherpanel.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_preacherpanel.php diff --git a/site/views/preacher/tmpl/default_preachersmall.php b/site/views/preacher/tmpl/default_preachersmall.php index 7a25d980..f16fd491 100644 --- a/site/views/preacher/tmpl/default_preachersmall.php +++ b/site/views/preacher/tmpl/default_preachersmall.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_preachersmall.php diff --git a/site/views/preacher/tmpl/default_sermons-grid.php b/site/views/preacher/tmpl/default_sermons-grid.php index 2d5161d7..347dcd04 100644 --- a/site/views/preacher/tmpl/default_sermons-grid.php +++ b/site/views/preacher/tmpl/default_sermons-grid.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-grid.php diff --git a/site/views/preacher/tmpl/default_sermons-list.php b/site/views/preacher/tmpl/default_sermons-list.php index b1827e84..da5fbdf2 100644 --- a/site/views/preacher/tmpl/default_sermons-list.php +++ b/site/views/preacher/tmpl/default_sermons-list.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-list.php diff --git a/site/views/preacher/tmpl/default_sermons-table.php b/site/views/preacher/tmpl/default_sermons-table.php index 1a5e6d80..fec187c5 100644 --- a/site/views/preacher/tmpl/default_sermons-table.php +++ b/site/views/preacher/tmpl/default_sermons-table.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-table.php diff --git a/site/views/preacher/view.html.php b/site/views/preacher/view.html.php index 8ed70272..6307627d 100644 --- a/site/views/preacher/view.html.php +++ b/site/views/preacher/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; use Joomla\CMS\Filesystem\File; /** - * Sermondistributor View class for the Preacher + * Sermondistributor Html View class for the Preacher */ -class SermondistributorViewPreacher extends JViewLegacy +class SermondistributorViewPreacher extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -155,12 +156,12 @@ class SermondistributorViewPreacher extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // Load the script to find all uikit components needed. @@ -201,13 +202,13 @@ class SermondistributorViewPreacher extends JViewLegacy if (File::exists(JPATH_ROOT.'/media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); } // check if the JavaScript file exists. if (File::exists(JPATH_ROOT.'/media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true); + JHtml::_('script', 'media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); } } } @@ -219,35 +220,35 @@ class SermondistributorViewPreacher extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', ['version' => 'auto']); } } // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.core.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.sort.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.filter.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.paginate.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.paginate.js', ['version' => 'auto']); // load the meta description if (isset($this->preacher->metadesc) && $this->preacher->metadesc) { diff --git a/site/views/preachers/tmpl/default.php b/site/views/preachers/tmpl/default.php index 42dc74a0..b4e733a5 100644 --- a/site/views/preachers/tmpl/default.php +++ b/site/views/preachers/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/site/views/preachers/tmpl/default_preachers-grid.php b/site/views/preachers/tmpl/default_preachers-grid.php index 3f54847e..c662d273 100644 --- a/site/views/preachers/tmpl/default_preachers-grid.php +++ b/site/views/preachers/tmpl/default_preachers-grid.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_preachers-grid.php diff --git a/site/views/preachers/tmpl/default_preachers-list.php b/site/views/preachers/tmpl/default_preachers-list.php index bd8cce67..b5d7bb35 100644 --- a/site/views/preachers/tmpl/default_preachers-list.php +++ b/site/views/preachers/tmpl/default_preachers-list.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_preachers-list.php diff --git a/site/views/preachers/tmpl/default_preachers-table.php b/site/views/preachers/tmpl/default_preachers-table.php index e8828867..e7cf9e40 100644 --- a/site/views/preachers/tmpl/default_preachers-table.php +++ b/site/views/preachers/tmpl/default_preachers-table.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_preachers-table.php diff --git a/site/views/preachers/view.html.php b/site/views/preachers/view.html.php index 14b1ebcb..1e02048c 100644 --- a/site/views/preachers/view.html.php +++ b/site/views/preachers/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; use Joomla\CMS\Filesystem\File; /** - * Sermondistributor View class for the Preachers + * Sermondistributor Html View class for the Preachers */ -class SermondistributorViewPreachers extends JViewLegacy +class SermondistributorViewPreachers extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -112,12 +113,12 @@ class SermondistributorViewPreachers extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // Load the script to find all uikit components needed. @@ -158,13 +159,13 @@ class SermondistributorViewPreachers extends JViewLegacy if (File::exists(JPATH_ROOT.'/media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); } // check if the JavaScript file exists. if (File::exists(JPATH_ROOT.'/media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true); + JHtml::_('script', 'media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); } } } @@ -176,35 +177,35 @@ class SermondistributorViewPreachers extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', ['version' => 'auto']); } } // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.core.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.sort.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.filter.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.paginate.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.paginate.js', ['version' => 'auto']); // load the meta description if ($this->params->get('menu-meta_description')) { diff --git a/site/views/series/tmpl/default.php b/site/views/series/tmpl/default.php index 6915682f..7fd05622 100644 --- a/site/views/series/tmpl/default.php +++ b/site/views/series/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/site/views/series/tmpl/default_seriesbox.php b/site/views/series/tmpl/default_seriesbox.php index e70cb92c..818594ca 100644 --- a/site/views/series/tmpl/default_seriesbox.php +++ b/site/views/series/tmpl/default_seriesbox.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_seriesbox.php diff --git a/site/views/series/tmpl/default_seriespanel.php b/site/views/series/tmpl/default_seriespanel.php index 48e49ee0..252b9462 100644 --- a/site/views/series/tmpl/default_seriespanel.php +++ b/site/views/series/tmpl/default_seriespanel.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_seriespanel.php diff --git a/site/views/series/tmpl/default_seriessmall.php b/site/views/series/tmpl/default_seriessmall.php index 4de976b0..52343b50 100644 --- a/site/views/series/tmpl/default_seriessmall.php +++ b/site/views/series/tmpl/default_seriessmall.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_seriessmall.php diff --git a/site/views/series/tmpl/default_sermons-grid.php b/site/views/series/tmpl/default_sermons-grid.php index ad942114..bb565143 100644 --- a/site/views/series/tmpl/default_sermons-grid.php +++ b/site/views/series/tmpl/default_sermons-grid.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-grid.php diff --git a/site/views/series/tmpl/default_sermons-list.php b/site/views/series/tmpl/default_sermons-list.php index 04901223..acec7f81 100644 --- a/site/views/series/tmpl/default_sermons-list.php +++ b/site/views/series/tmpl/default_sermons-list.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-list.php diff --git a/site/views/series/tmpl/default_sermons-table.php b/site/views/series/tmpl/default_sermons-table.php index 9dc4665e..7c4405a5 100644 --- a/site/views/series/tmpl/default_sermons-table.php +++ b/site/views/series/tmpl/default_sermons-table.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-table.php diff --git a/site/views/series/view.html.php b/site/views/series/view.html.php index 3bd25f5c..6bcef520 100644 --- a/site/views/series/view.html.php +++ b/site/views/series/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; use Joomla\CMS\Filesystem\File; /** - * Sermondistributor View class for the Series + * Sermondistributor Html View class for the Series */ -class SermondistributorViewSeries extends JViewLegacy +class SermondistributorViewSeries extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -155,12 +156,12 @@ class SermondistributorViewSeries extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // Load the script to find all uikit components needed. @@ -200,13 +201,13 @@ class SermondistributorViewSeries extends JViewLegacy if (File::exists(JPATH_ROOT.'/media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); } // check if the JavaScript file exists. if (File::exists(JPATH_ROOT.'/media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true); + JHtml::_('script', 'media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); } } } @@ -218,35 +219,35 @@ class SermondistributorViewSeries extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', ['version' => 'auto']); } } // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.core.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.sort.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.filter.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.paginate.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.paginate.js', ['version' => 'auto']); // load the meta description if (isset($this->series->metadesc) && $this->series->metadesc) { diff --git a/site/views/serieslist/tmpl/default.php b/site/views/serieslist/tmpl/default.php index 933b2756..83bed956 100644 --- a/site/views/serieslist/tmpl/default.php +++ b/site/views/serieslist/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/site/views/serieslist/tmpl/default_series-grid.php b/site/views/serieslist/tmpl/default_series-grid.php index 0dc4b375..1f706653 100644 --- a/site/views/serieslist/tmpl/default_series-grid.php +++ b/site/views/serieslist/tmpl/default_series-grid.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_series-grid.php diff --git a/site/views/serieslist/tmpl/default_series-list.php b/site/views/serieslist/tmpl/default_series-list.php index 785b5bdd..282c6242 100644 --- a/site/views/serieslist/tmpl/default_series-list.php +++ b/site/views/serieslist/tmpl/default_series-list.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_series-list.php diff --git a/site/views/serieslist/tmpl/default_series-table.php b/site/views/serieslist/tmpl/default_series-table.php index dcfbf6bf..92cb8234 100644 --- a/site/views/serieslist/tmpl/default_series-table.php +++ b/site/views/serieslist/tmpl/default_series-table.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_series-table.php diff --git a/site/views/serieslist/view.html.php b/site/views/serieslist/view.html.php index d889743b..77a0ccc2 100644 --- a/site/views/serieslist/view.html.php +++ b/site/views/serieslist/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; use Joomla\CMS\Filesystem\File; /** - * Sermondistributor View class for the Serieslist + * Sermondistributor Html View class for the Serieslist */ -class SermondistributorViewSerieslist extends JViewLegacy +class SermondistributorViewSerieslist extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -112,12 +113,12 @@ class SermondistributorViewSerieslist extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // Load the script to find all uikit components needed. @@ -158,13 +159,13 @@ class SermondistributorViewSerieslist extends JViewLegacy if (File::exists(JPATH_ROOT.'/media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); } // check if the JavaScript file exists. if (File::exists(JPATH_ROOT.'/media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true); + JHtml::_('script', 'media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); } } } @@ -176,35 +177,35 @@ class SermondistributorViewSerieslist extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', ['version' => 'auto']); } } // Add the CSS for Footable. - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.core.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.core.min.css', ['version' => 'auto']); // Use the Metro Style if (!isset($this->fooTableStyle) || 0 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.metro.min.css', ['version' => 'auto']); } // Use the Legacy Style. elseif (isset($this->fooTableStyle) && 1 == $this->fooTableStyle) { - $this->document->addStyleSheet(JURI::root() .'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']); } // Add the JavaScript for Footable - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.sort.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.filter.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root() .'media/com_sermondistributor/footable-v2/js/footable.paginate.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.sort.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.filter.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/footable-v2/js/footable.paginate.js', ['version' => 'auto']); // load the meta description if ($this->params->get('menu-meta_description')) { diff --git a/site/views/sermon/tmpl/default.php b/site/views/sermon/tmpl/default.php index 47a6a246..8cfb362b 100644 --- a/site/views/sermon/tmpl/default.php +++ b/site/views/sermon/tmpl/default.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/site/views/sermon/tmpl/default_sermonbig.php b/site/views/sermon/tmpl/default_sermonbig.php index 1a1826be..b0e19b98 100644 --- a/site/views/sermon/tmpl/default_sermonbig.php +++ b/site/views/sermon/tmpl/default_sermonbig.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermonbig.php diff --git a/site/views/sermon/tmpl/default_sermonbox.php b/site/views/sermon/tmpl/default_sermonbox.php index b8cf5364..4dcc8e42 100644 --- a/site/views/sermon/tmpl/default_sermonbox.php +++ b/site/views/sermon/tmpl/default_sermonbox.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermonbox.php diff --git a/site/views/sermon/tmpl/default_sermonpanel.php b/site/views/sermon/tmpl/default_sermonpanel.php index 2cce9c38..9aff712d 100644 --- a/site/views/sermon/tmpl/default_sermonpanel.php +++ b/site/views/sermon/tmpl/default_sermonpanel.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermonpanel.php diff --git a/site/views/sermon/view.html.php b/site/views/sermon/view.html.php index 75be40e4..efd84926 100644 --- a/site/views/sermon/view.html.php +++ b/site/views/sermon/view.html.php @@ -10,7 +10,7 @@ /------------------------------------------------------------------------------------------------------------------------------------/ - @version 2.0.x + @version 2.1.x @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -25,12 +25,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; use Joomla\CMS\Filesystem\File; /** - * Sermondistributor View class for the Sermon + * Sermondistributor Html View class for the Sermon */ -class SermondistributorViewSermon extends JViewLegacy +class SermondistributorViewSermon extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -129,12 +130,12 @@ class SermondistributorViewSermon extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // Load the script to find all uikit components needed. @@ -175,13 +176,13 @@ class SermondistributorViewSermon extends JViewLegacy if (File::exists(JPATH_ROOT.'/media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); } // check if the JavaScript file exists. if (File::exists(JPATH_ROOT.'/media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true); + JHtml::_('script', 'media/com_sermondistributor/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); } } } @@ -193,13 +194,13 @@ class SermondistributorViewSermon extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addStyleSheet(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); + JHtml::_('stylesheet', 'media/com_sermondistributor/uikit-v3/css/uikit'.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); - $this->document->addScript(JURI::root(true) .'/media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', (SermondistributorHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit'.$size.'.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_sermondistributor/uikit-v3/js/uikit-icons'.$size.'.js', ['version' => 'auto']); } } // load the meta description