diff --git a/README.md b/README.md index 49eee7cf..cd70fcae 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Sermon Distributor (1.4.0) +# Sermon Distributor (1.4.1) ![Sermon Distributor image](https://raw.githubusercontent.com/SermonDistributor/Joomla-3-Component/master/admin/assets/images/component-300.jpg "The Sermon Distributor") @@ -20,27 +20,27 @@ The best way to see all your options is to install this component on you Joomla # Build Details + *Company*: [Vast Development Method](https://www.vdm.io/) -+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@vdm.io) ++ *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Sermon Distributor](https://www.vdm.io/) + *First Build*: 22nd October, 2015 -+ *Last Build*: 4th December, 2016 -+ *Version*: 1.4.0 ++ *Last Build*: 17th February, 2017 ++ *Version*: 1.4.1 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html ## Build Time :hourglass: -**180 Hours** or **23 Eight Hour Days** (actual time the author saved - +**181 Hours** or **23 Eight Hour Days** (actual time the author saved - due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder)) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > never making one mistake or taking any coffee break.) -+ *Line count*: **64519** -+ *File count*: **436** ++ *Line count*: **64745** ++ *File count*: **439** + *Folder count*: **90** -**119 Hours** or **14 Eight Hour Days** (the actual time the author spent) +**119 Hours** or **15 Eight Hour Days** (the actual time the author spent) > (with the following break down: > **debugging @45hours** = codingtime / 4; @@ -48,13 +48,13 @@ due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder > **mapping @18hours** = codingtime / 10; > **office @30hours** = codingtime / 6;) -**299 Hours** or **37 Eight Hour Days** +**300 Hours** or **38 Eight Hour Days** (a total of the realistic time frame for this project) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > with the normal everyday realities at the office, that includes the component planning, mapping & debugging.) -Project duration: **7.4 weeks** or **1.5 months** +Project duration: **7.6 weeks** or **1.6 months** > This **component** was build with a Joomla [Automated Component Builder](https://www.vdm.io/joomla-component-builder). > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io) diff --git a/admin/README.txt b/admin/README.txt index 49eee7cf..cd70fcae 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -1,4 +1,4 @@ -# Sermon Distributor (1.4.0) +# Sermon Distributor (1.4.1) ![Sermon Distributor image](https://raw.githubusercontent.com/SermonDistributor/Joomla-3-Component/master/admin/assets/images/component-300.jpg "The Sermon Distributor") @@ -20,27 +20,27 @@ The best way to see all your options is to install this component on you Joomla # Build Details + *Company*: [Vast Development Method](https://www.vdm.io/) -+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@vdm.io) ++ *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Sermon Distributor](https://www.vdm.io/) + *First Build*: 22nd October, 2015 -+ *Last Build*: 4th December, 2016 -+ *Version*: 1.4.0 ++ *Last Build*: 17th February, 2017 ++ *Version*: 1.4.1 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html ## Build Time :hourglass: -**180 Hours** or **23 Eight Hour Days** (actual time the author saved - +**181 Hours** or **23 Eight Hour Days** (actual time the author saved - due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder)) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > never making one mistake or taking any coffee break.) -+ *Line count*: **64519** -+ *File count*: **436** ++ *Line count*: **64745** ++ *File count*: **439** + *Folder count*: **90** -**119 Hours** or **14 Eight Hour Days** (the actual time the author spent) +**119 Hours** or **15 Eight Hour Days** (the actual time the author spent) > (with the following break down: > **debugging @45hours** = codingtime / 4; @@ -48,13 +48,13 @@ due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder > **mapping @18hours** = codingtime / 10; > **office @30hours** = codingtime / 6;) -**299 Hours** or **37 Eight Hour Days** +**300 Hours** or **38 Eight Hour Days** (a total of the realistic time frame for this project) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > with the normal everyday realities at the office, that includes the component planning, mapping & debugging.) -Project duration: **7.4 weeks** or **1.5 months** +Project duration: **7.6 weeks** or **1.6 months** > This **component** was build with a Joomla [Automated Component Builder](https://www.vdm.io/joomla-component-builder). > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io) diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index da1c6a13..2ab8660a 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 b462aac8..c920eea2 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 c472059a..19c8b7c5 100644 --- a/admin/assets/css/external_source.css +++ b/admin/assets/css/external_source.css @@ -9,9 +9,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage external_source.css @author Llewellyn van der Merwe diff --git a/admin/assets/css/external_sources.css b/admin/assets/css/external_sources.css index c066e9d1..1517bb3b 100644 --- a/admin/assets/css/external_sources.css +++ b/admin/assets/css/external_sources.css @@ -9,9 +9,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage external_sources.css @author Llewellyn van der Merwe diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index a0eca8b0..b20caa8a 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -9,9 +9,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage help_document.css @author Llewellyn van der Merwe diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index 4a1f0693..3756ca62 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -9,9 +9,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage help_documents.css @author Llewellyn van der Merwe diff --git a/admin/assets/css/local_listing.css b/admin/assets/css/local_listing.css index 92a465a5..ac78c3a9 100644 --- a/admin/assets/css/local_listing.css +++ b/admin/assets/css/local_listing.css @@ -9,9 +9,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage local_listing.css @author Llewellyn van der Merwe diff --git a/admin/assets/css/local_listings.css b/admin/assets/css/local_listings.css index f0dbbbed..7092eb00 100644 --- a/admin/assets/css/local_listings.css +++ b/admin/assets/css/local_listings.css @@ -9,9 +9,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage local_listings.css @author Llewellyn van der Merwe diff --git a/admin/assets/css/manual_updater.css b/admin/assets/css/manual_updater.css index 4084aad8..c1802582 100644 --- a/admin/assets/css/manual_updater.css +++ b/admin/assets/css/manual_updater.css @@ -9,9 +9,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 44 of this MVC + @build 27th November, 2016 + @created 4th November, 2016 @package Sermon Distributor @subpackage manual_updater.css @author Llewellyn van der Merwe diff --git a/admin/assets/css/preacher.css b/admin/assets/css/preacher.css index b688ad25..7262bee3 100644 --- a/admin/assets/css/preacher.css +++ b/admin/assets/css/preacher.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 16 of this MVC + @build 4th November, 2016 @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 cfa76191..a37d4bfc 100644 --- a/admin/assets/css/preachers.css +++ b/admin/assets/css/preachers.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 16 of this MVC + @build 4th November, 2016 @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 c7ef72cd..9eb52e0c 100644 --- a/admin/assets/css/series.css +++ b/admin/assets/css/series.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 16 of this MVC + @build 4th November, 2016 @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 b097e723..4d2155f4 100644 --- a/admin/assets/css/series_list.css +++ b/admin/assets/css/series_list.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 16 of this MVC + @build 4th November, 2016 @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 40526b9a..e0b72d9f 100644 --- a/admin/assets/css/sermon.css +++ b/admin/assets/css/sermon.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 89 of this MVC + @build 16th February, 2017 @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 5aa4ec2e..5b30a075 100644 --- a/admin/assets/css/sermons.css +++ b/admin/assets/css/sermons.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 89 of this MVC + @build 16th February, 2017 @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 3f8aa43f..c76e5c8d 100644 --- a/admin/assets/css/statistic.css +++ b/admin/assets/css/statistic.css @@ -9,9 +9,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 8 of this MVC + @build 18th November, 2015 + @created 29th October, 2015 @package Sermon Distributor @subpackage statistic.css @author Llewellyn van der Merwe diff --git a/admin/assets/css/statistics.css b/admin/assets/css/statistics.css index baf2a94a..02cde899 100644 --- a/admin/assets/css/statistics.css +++ b/admin/assets/css/statistics.css @@ -9,9 +9,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 8 of this MVC + @build 18th November, 2015 + @created 29th October, 2015 @package Sermon Distributor @subpackage statistics.css @author Llewellyn van der Merwe diff --git a/admin/config.xml b/admin/config.xml index 4ffe2e4a..1ce1d83c 100644 --- a/admin/config.xml +++ b/admin/config.xml @@ -80,7 +80,7 @@ label="COM_SERMONDISTRIBUTOR_CONFIG_AUTHOR_EMAIL_LABEL" description="COM_SERMONDISTRIBUTOR_CONFIG_AUTHOR_EMAIL_DESC" size="60" - default="llewellyn@vdm.io" + default="joomla@vdm.io" readonly="true" class="readonly" /> @@ -379,6 +379,8 @@ COM_SERMONDISTRIBUTOR_CONFIG_SOUNDMANAGER +
registerTask('autoUpdateLocalListingExternal', 'ajax'); + $this->registerTask('theQueue', 'ajax'); $this->registerTask('updateLocalListingExternal', 'ajax'); $this->registerTask('isNew', 'ajax'); $this->registerTask('isRead', 'ajax'); @@ -62,16 +62,16 @@ public function ajax() $task = $this->getTask(); switch($task) { - case 'autoUpdateLocalListingExternal': + case 'theQueue': try { $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); - $listingValue = $jinput->get('listing', NULL, 'INT'); - $targetValue = $jinput->get('target', NULL, 'INT'); + $listValue = $jinput->get('list', NULL, 'INT'); + $tarValue = $jinput->get('tar', NULL, 'INT'); $typeValue = $jinput->get('type', NULL, 'INT'); - if($listingValue && $targetValue && $typeValue) + if($listValue && $tarValue && $typeValue) { - $result = $this->getModel('ajax')->autoUpdateLocalListingExternal($listingValue, $targetValue, $typeValue); + $result = $this->getModel('ajax')->theQueue($listValue, $tarValue, $typeValue); } else { diff --git a/admin/controllers/external_source.php b/admin/controllers/external_source.php index 246b5237..f2274b4a 100644 --- a/admin/controllers/external_source.php +++ b/admin/controllers/external_source.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage external_source.php @author Llewellyn van der Merwe @@ -241,7 +241,7 @@ protected function allowEdit($data = array(), $key = 'id') { // The record has been set. Check the record permissions. $permission = $user->authorise('external_source.edit', 'com_sermondistributor.external_source.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('external_source.edit.own', 'com_sermondistributor.external_source.' . $recordId)) { diff --git a/admin/controllers/external_sources.php b/admin/controllers/external_sources.php index 9096e4e6..bf0ea8c4 100644 --- a/admin/controllers/external_sources.php +++ b/admin/controllers/external_sources.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage external_sources.php @author Llewellyn van der Merwe diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 58acd4d0..5a5258e2 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage help.php diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index 93a5b869..5324e708 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage help_document.php @author Llewellyn van der Merwe @@ -99,7 +99,7 @@ protected function allowEdit($data = array(), $key = 'id') { // The record has been set. Check the record permissions. $permission = $user->authorise('help_document.edit', 'com_sermondistributor.help_document.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('help_document.edit.own', 'com_sermondistributor.help_document.' . $recordId)) { diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index 892b0876..d5192ade 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage help_documents.php @author Llewellyn van der Merwe diff --git a/admin/controllers/import.php b/admin/controllers/import.php index f4af4245..4d115dca 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage import.php diff --git a/admin/controllers/local_listing.php b/admin/controllers/local_listing.php index a971c491..d2ce5f6f 100644 --- a/admin/controllers/local_listing.php +++ b/admin/controllers/local_listing.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage local_listing.php @author Llewellyn van der Merwe @@ -99,7 +99,7 @@ protected function allowEdit($data = array(), $key = 'id') { // The record has been set. Check the record permissions. $permission = $user->authorise('local_listing.edit', 'com_sermondistributor.local_listing.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('local_listing.edit.own', 'com_sermondistributor.local_listing.' . $recordId)) { diff --git a/admin/controllers/local_listings.php b/admin/controllers/local_listings.php index 8f73db23..478b6fca 100644 --- a/admin/controllers/local_listings.php +++ b/admin/controllers/local_listings.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage local_listings.php @author Llewellyn van der Merwe diff --git a/admin/controllers/manual_updater.php b/admin/controllers/manual_updater.php index 265eb0d5..cbb85149 100644 --- a/admin/controllers/manual_updater.php +++ b/admin/controllers/manual_updater.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 44 of this MVC + @build 27th November, 2016 + @created 4th November, 2016 @package Sermon Distributor @subpackage manual_updater.php @author Llewellyn van der Merwe diff --git a/admin/controllers/preacher.php b/admin/controllers/preacher.php index 25635b8f..1a2364e0 100644 --- a/admin/controllers/preacher.php +++ b/admin/controllers/preacher.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 16 of this MVC + @build 4th November, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.php @@ -99,7 +99,7 @@ protected function allowEdit($data = array(), $key = 'id') { // The record has been set. Check the record permissions. $permission = $user->authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('preacher.edit.own', 'com_sermondistributor.preacher.' . $recordId)) { diff --git a/admin/controllers/preachers.php b/admin/controllers/preachers.php index d7a70279..6e012d3d 100644 --- a/admin/controllers/preachers.php +++ b/admin/controllers/preachers.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 16 of this MVC + @build 4th November, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.php diff --git a/admin/controllers/series.php b/admin/controllers/series.php index 23b4a444..3f7022dc 100644 --- a/admin/controllers/series.php +++ b/admin/controllers/series.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 16 of this MVC + @build 4th November, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php @@ -99,7 +99,7 @@ protected function allowEdit($data = array(), $key = 'id') { // The record has been set. Check the record permissions. $permission = $user->authorise('series.edit', 'com_sermondistributor.series.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('series.edit.own', 'com_sermondistributor.series.' . $recordId)) { diff --git a/admin/controllers/series_list.php b/admin/controllers/series_list.php index d509da30..9d3e4594 100644 --- a/admin/controllers/series_list.php +++ b/admin/controllers/series_list.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 16 of this MVC + @build 4th November, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series_list.php diff --git a/admin/controllers/sermon.php b/admin/controllers/sermon.php index c4625064..89d481f5 100644 --- a/admin/controllers/sermon.php +++ b/admin/controllers/sermon.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 89 of this MVC + @build 16th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php @@ -60,33 +60,14 @@ public function __construct($config = array()) */ protected function allowAdd($data = array()) { - // get the user object - $user = JFactory::getUser(); - // Access check. - $access = $user->authorise('sermon.access', 'com_sermondistributor'); + $access = JFactory::getUser()->authorise('sermon.access', 'com_sermondistributor'); if (!$access) { return false; } - $categoryId = JArrayHelper::getValue($data, 'catid', $this->input->getInt('filter_category_id'), 'int'); - $allow = null; - - if ($categoryId) - { - // If the category has been passed in the URL check it. - $allow = $user->authorise('core.create', $this->option . '.sermons.category.' . $categoryId); - } - - if ($allow === null) - { - // In the absense of better information, revert to the component permissions. - return $user->authorise('sermon.create', $this->option); - } - else - { - return $allow; - } + // In the absense of better information, revert to the component permissions. + return JFactory::getUser()->authorise('sermon.create', $this->option); } /** @@ -117,7 +98,7 @@ protected function allowEdit($data = array(), $key = 'id') { // The record has been set. Check the record permissions. $permission = $user->authorise('sermon.edit', 'com_sermondistributor.sermon.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('sermon.edit.own', 'com_sermondistributor.sermon.' . $recordId)) { @@ -146,18 +127,6 @@ protected function allowEdit($data = array(), $key = 'id') } return false; } - - $categoryId = (int) isset($data['catid']) ? $data['catid']: $this->getModel()->getItem($recordId)->catid; - - if ($categoryId) - { - // The category has been set. Check the category permissions. - $catpermission = $user->authorise('core.edit', $this->option . '.sermons.category.' . $categoryId); - if (!$catpermission && !is_null($catpermission)) - { - return false; - } - } } // Since there is no permission, revert to the component permissions. return $user->authorise('sermon.edit', $this->option); diff --git a/admin/controllers/sermondistributor.php b/admin/controllers/sermondistributor.php index 8f186f48..9b45c7d9 100644 --- a/admin/controllers/sermondistributor.php +++ b/admin/controllers/sermondistributor.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php diff --git a/admin/controllers/sermons.php b/admin/controllers/sermons.php index f6c2162a..464ff8a3 100644 --- a/admin/controllers/sermons.php +++ b/admin/controllers/sermons.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 89 of this MVC + @build 16th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons.php diff --git a/admin/controllers/statistic.php b/admin/controllers/statistic.php index 10fea745..a57456c1 100644 --- a/admin/controllers/statistic.php +++ b/admin/controllers/statistic.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 8 of this MVC + @build 18th November, 2015 + @created 29th October, 2015 @package Sermon Distributor @subpackage statistic.php @author Llewellyn van der Merwe @@ -99,7 +99,7 @@ protected function allowEdit($data = array(), $key = 'id') { // The record has been set. Check the record permissions. $permission = $user->authorise('statistic.edit', 'com_sermondistributor.statistic.' . (int) $recordId); - if (!$permission && !is_null($permission)) + if (!$permission) { if ($user->authorise('statistic.edit.own', 'com_sermondistributor.statistic.' . $recordId)) { diff --git a/admin/controllers/statistics.php b/admin/controllers/statistics.php index 71661332..fd011454 100644 --- a/admin/controllers/statistics.php +++ b/admin/controllers/statistics.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 8 of this MVC + @build 18th November, 2015 + @created 29th October, 2015 @package Sermon Distributor @subpackage statistics.php @author Llewellyn van der Merwe diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php new file mode 100644 index 00000000..43fd568b --- /dev/null +++ b/admin/helpers/headercheck.php @@ -0,0 +1,85 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + A sermon distributor that links to Dropbox. + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +class HeaderCheck +{ + function js_loaded($script_name) + { + // UIkit check point + if (strpos($script_name,'uikit') !== false) + { + $app = JFactory::getApplication(); + $getTemplateName = $app->getTemplate('template')->template; + + if (strpos($getTemplateName,'yoo') !== false) + { + return true; + } + } + + $document = JFactory::getDocument(); + $head_data = $document->getHeadData(); + foreach (array_keys($head_data['scripts']) as $script) + { + if (stristr($script, $script_name)) + { + return true; + } + } + + return false; + } + + function css_loaded($script_name) + { + // UIkit check point + if (strpos($script_name,'uikit') !== false) + { + $app = JFactory::getApplication(); + $getTemplateName = $app->getTemplate('template')->template; + + if (strpos($getTemplateName,'yoo') !== false) + { + return true; + } + } + + $document = JFactory::getDocument(); + $head_data = $document->getHeadData(); + + foreach (array_keys($head_data['styleSheets']) as $script) + { + if (stristr($script, $script_name)) + { + return true; + } + } + + return false; + } +} \ No newline at end of file diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 3fb9d927..48b643e4 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage batch_.php diff --git a/admin/helpers/sermondistributor.php b/admin/helpers/sermondistributor.php index 5f9e57b9..959ca6f8 100644 --- a/admin/helpers/sermondistributor.php +++ b/admin/helpers/sermondistributor.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php @@ -50,19 +50,13 @@ public static function loadExternalUpdateAjax($document) { $document->addScriptDeclaration(" jQuery(window).load(function() { - checkExternalListing(".$update."); + theQueue(".$update."); }); - function checkExternalListing(id, target, type) { - checkExternalListing_server(id, target, type).done(function(result) { - // good it is done - }); - } - - function checkExternalListing_server(id, target, type) { - var getUrl = '".JURI::root()."administrator/index.php?option=com_sermondistributor&task=ajax.autoUpdateLocalListingExternal&format=json'; + function theQueue(id, target, type) { + var getUrl = '".JURI::root()."administrator/index.php?option=com_sermondistributor&task=ajax.theQueue&format=json'; if(target > 0 && type > 0 && id > 0){ - var request = 'token=".JSession::getFormToken()."&target='+target+'&listing='+id+'&type='+type; + var request = 'token=".JSession::getFormToken()."&tar='+target+'&list='+id+'&type='+type; } return jQuery.ajax({ type: 'GET', @@ -114,7 +108,7 @@ function checkExternalListing_server(id, target, type) { * The update errors **/ protected static $updateErrors = array(); - + /** * prepare base64 string for url **/ @@ -139,7 +133,7 @@ public static function base64_urldecode($string, $decode = false) } return $string; } - + /** * get Download links of a sermon **/ @@ -813,7 +807,7 @@ protected static function setUpdateError($id, $errorArray) } } } - + /** * Change to nice fancy date */ @@ -826,6 +820,18 @@ public static function fancyDate($date) return date('jS \o\f F Y',$date); } + /** + * Change to nice fancy day time and date + */ + public static function fancyDayTimeDate($time) + { + if (!self::isValidTimeStamp($time)) + { + $time = strtotime($time); + } + return date('D ga jS \o\f F Y',$time); + } + /** * Change to nice fancy time and date */ @@ -859,6 +865,7 @@ public static function isValidTimeStamp($timestamp) && ($timestamp <= PHP_INT_MAX) && ($timestamp >= ~PHP_INT_MAX); } + /** * Load the Component xml manifest. **/ @@ -986,40 +993,40 @@ public static function addSubmenu($submenu) // load user for access menus $user = JFactory::getUser(); // load the submenus to sidebar - JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_DASHBOARD'), 'index.php?option=com_sermondistributor&view=sermondistributor', $submenu == 'sermondistributor'); + JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_DASHBOARD'), 'index.php?option=com_sermondistributor&view=sermondistributor', $submenu === 'sermondistributor'); if ($user->authorise('preacher.access', 'com_sermondistributor') && $user->authorise('preacher.submenu', 'com_sermondistributor')) { - JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_PREACHERS'), 'index.php?option=com_sermondistributor&view=preachers', $submenu == 'preachers'); + JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_PREACHERS'), 'index.php?option=com_sermondistributor&view=preachers', $submenu === 'preachers'); } if ($user->authorise('sermon.access', 'com_sermondistributor') && $user->authorise('sermon.submenu', 'com_sermondistributor')) { - JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_SERMONS'), 'index.php?option=com_sermondistributor&view=sermons', $submenu == 'sermons'); - JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SERMON_SERMON_CATEGORY'), 'index.php?option=com_categories&view=categories&extension=com_sermondistributor.sermons', $submenu == 'categories.sermons'); + JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_SERMONS'), 'index.php?option=com_sermondistributor&view=sermons', $submenu === 'sermons'); + JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SERMON_SERMON_CATEGORY'), 'index.php?option=com_categories&view=categories&extension=com_sermondistributor.sermons', $submenu === 'categories.sermons'); } if ($user->authorise('series.access', 'com_sermondistributor') && $user->authorise('series.submenu', 'com_sermondistributor')) { - JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_SERIES_LIST'), 'index.php?option=com_sermondistributor&view=series_list', $submenu == 'series_list'); + JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_SERIES_LIST'), 'index.php?option=com_sermondistributor&view=series_list', $submenu === 'series_list'); } if ($user->authorise('statistic.access', 'com_sermondistributor') && $user->authorise('statistic.submenu', 'com_sermondistributor')) { - JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_STATISTICS'), 'index.php?option=com_sermondistributor&view=statistics', $submenu == 'statistics'); + JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_STATISTICS'), 'index.php?option=com_sermondistributor&view=statistics', $submenu === 'statistics'); } if ($user->authorise('external_source.access', 'com_sermondistributor') && $user->authorise('external_source.submenu', 'com_sermondistributor')) { - JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_EXTERNAL_SOURCES'), 'index.php?option=com_sermondistributor&view=external_sources', $submenu == 'external_sources'); + JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_EXTERNAL_SOURCES'), 'index.php?option=com_sermondistributor&view=external_sources', $submenu === 'external_sources'); } // Access control (manual_updater.access && manual_updater.submenu). if ($user->authorise('manual_updater.access', 'com_sermondistributor') && $user->authorise('manual_updater.submenu', 'com_sermondistributor')) { - JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_MANUAL_UPDATER'), 'index.php?option=com_sermondistributor&view=manual_updater', $submenu == 'manual_updater'); + JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_MANUAL_UPDATER'), 'index.php?option=com_sermondistributor&view=manual_updater', $submenu === 'manual_updater'); } if ($user->authorise('local_listing.access', 'com_sermondistributor') && $user->authorise('local_listing.submenu', 'com_sermondistributor')) { - JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_LOCAL_LISTINGS'), 'index.php?option=com_sermondistributor&view=local_listings', $submenu == 'local_listings'); + JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_LOCAL_LISTINGS'), 'index.php?option=com_sermondistributor&view=local_listings', $submenu === 'local_listings'); } if ($user->authorise('help_document.access', 'com_sermondistributor') && $user->authorise('help_document.submenu', 'com_sermondistributor')) { - JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_HELP_DOCUMENTS'), 'index.php?option=com_sermondistributor&view=help_documents', $submenu == 'help_documents'); + JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_HELP_DOCUMENTS'), 'index.php?option=com_sermondistributor&view=help_documents', $submenu === 'help_documents'); } } @@ -1213,7 +1220,7 @@ public static function xls($rows,$fileName = null,$title = null,$subjectTab = nu $objPHPExcel->getActiveSheet()->getColumnDimension($a)->setAutoSize(true); $objPHPExcel->getActiveSheet()->getStyle($a.$i)->applyFromArray($headerStyles); $objPHPExcel->getActiveSheet()->getStyle($a.$i)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER); - } elseif ($a == 'A'){ + } elseif ($a === 'A'){ $objPHPExcel->getActiveSheet()->getStyle($a.$i)->applyFromArray($sideStyles); } else { $objPHPExcel->getActiveSheet()->getStyle($a.$i)->applyFromArray($normalStyles); @@ -1476,7 +1483,7 @@ public static function getActions($view,&$record = null,$views = null) { // The record has been set. Check the record permissions. $permission = $user->authorise($action->name, 'com_sermondistributor.'.$view.'.' . (int) $record->id); - if (!$permission && !is_null($permission)) + if (!$permission) // TODO removed && !is_null($permission) { if ($action->name == 'core.edit' || $action->name == $view.'.edit') { @@ -1811,10 +1818,22 @@ public static function checkObject($object) return false; } - public static function checkArray($array) + public static function checkArray($array, $removeEmptyString = false) { if (isset($array) && is_array($array) && count($array) > 0) { + // also make sure the empty strings are removed + if ($removeEmptyString) + { + foreach ($array as $key => $string) + { + if (empty($string)) + { + unset($array[$key]); + } + } + return self::checkArray($array, false); + } return true; } return false; @@ -1882,55 +1901,67 @@ public static function sorten($string, $length = 40, $addTip = true) public static function safeString($string, $type = 'L', $spacer = '_') { - // remove all numbers and replace with english text version (works well only up to a thousand) + // remove all numbers and replace with english text version (works well only up to millions) $string = self::replaceNumbers($string); - + // 0nly continue if we have a string if (self::checkString($string)) { - // remove all other characters - $string = trim($string); - $string = preg_replace('/'.$spacer.'+/', ' ', $string); - $string = preg_replace('/\s+/', ' ', $string); - $string = preg_replace("/[^A-Za-z ]/", '', $string); - // return a string with all first letter of each word uppercase(no undersocre) - if ($type == 'W') - { - return ucwords(strtolower($string)); - } - elseif ($type == 'w') + // remove all other characters + $string = trim($string); + $string = preg_replace('/'.$spacer.'+/', ' ', $string); + $string = preg_replace('/\s+/', ' ', $string); + $string = preg_replace("/[^A-Za-z ]/", '', $string); + // select final adaptations + if ($type === 'L' || $type === 'strtolower') { - return strtolower($string); - } - elseif ($type == 'Ww') - { - return ucfirst(strtolower($string)); - } - elseif ($type == 'WW') - { - return strtoupper($string); + // replace white space with underscore + $string = preg_replace('/\s+/', $spacer, $string); + // default is to return lower + return strtolower($string); } - elseif ($type == 'U') + elseif ($type === 'W') + { + // return a string with all first letter of each word uppercase(no undersocre) + return ucwords(strtolower($string)); + } + elseif ($type === 'w' || $type === 'word') + { + // return a string with all lowercase(no undersocre) + return strtolower($string); + } + elseif ($type === 'Ww' || $type === 'Word') + { + // return a string with first letter of the first word uppercase and all the rest lowercase(no undersocre) + return ucfirst(strtolower($string)); + } + elseif ($type === 'WW' || $type === 'WORD') + { + // return a string with all the uppercase(no undersocre) + return strtoupper($string); + } + elseif ($type === 'U' || $type === 'strtoupper') { // replace white space with underscore $string = preg_replace('/\s+/', $spacer, $string); // return all upper return strtoupper($string); } - elseif ($type == 'F') + elseif ($type === 'F' || $type === 'ucfirst') { // replace white space with underscore $string = preg_replace('/\s+/', $spacer, $string); // return with first caracter to upper return ucfirst(strtolower($string)); } - elseif ($type == 'L') - { - // replace white space with underscore - $string = preg_replace('/\s+/', $spacer, $string); - // default is to return lower - return strtolower($string); - } - + elseif ($type === 'cA' || $type === 'cAmel' || $type === 'camelcase') + { + // convert all words to first letter uppercase + $string = ucwords(strtolower($string)); + // remove white space + $string = preg_replace('/\s+/', '', $string); + // now return first letter lowercase + return lcfirst($string); + } // return string return $string; } @@ -2089,7 +2120,7 @@ public static function randomkey($size) public static function getCryptKey($type, $default = null) { - if ('basic' == $type) + if ('basic' === $type) { // Get the global params $params = JComponentHelper::getParams('com_sermondistributor', true); diff --git a/admin/language/en-GB/en-GB.com_sermondistributor.ini b/admin/language/en-GB/en-GB.com_sermondistributor.ini index c13cb5dc..af186b87 100644 --- a/admin/language/en-GB/en-GB.com_sermondistributor.ini +++ b/admin/language/en-GB/en-GB.com_sermondistributor.ini @@ -133,6 +133,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_GLOBAL_LABEL="Global" COM_SERMONDISTRIBUTOR_CONFIG_GRADIANT_LOAD="Gradient" COM_SERMONDISTRIBUTOR_CONFIG_GREEN="Green" COM_SERMONDISTRIBUTOR_CONFIG_GRID="Grid" +COM_SERMONDISTRIBUTOR_CONFIG_HTML_FIVE_BASIC="HTML 5 (basic)" COM_SERMONDISTRIBUTOR_CONFIG_JPLAYER="jPlayer" COM_SERMONDISTRIBUTOR_CONFIG_LEGACY="Legacy" COM_SERMONDISTRIBUTOR_CONFIG_LINES="Lines" @@ -896,6 +897,7 @@ COM_SERMONDISTRIBUTOR_NO_ID_FOUND_CAN_NOT_RESET_THE_UPDATE_STATUS="No id found, COM_SERMONDISTRIBUTOR_NO_MANUAL_UPDATES_AVAILABLE="No Manual Updates Available" COM_SERMONDISTRIBUTOR_NUMBER_OF_FILES_LISTED="Number of Files Listed" COM_SERMONDISTRIBUTOR_OPENED_BY="opened by" +COM_SERMONDISTRIBUTOR_PLEASE_ADD_FILES_TO_S="Please add files to (%s)" COM_SERMONDISTRIBUTOR_PLEASE_CHECK_AGAIN_LATTER="Please check again latter." COM_SERMONDISTRIBUTOR_PREACHER="Preacher" COM_SERMONDISTRIBUTOR_PREACHERS="Preachers" @@ -1416,6 +1418,7 @@ COM_SERMONDISTRIBUTOR_THERE_IS_NO_TARGETS_SET_FOR_THIS_SOURCE_CAN_NOT_RESET_THE_ COM_SERMONDISTRIBUTOR_THERE_WAS_AN_ERROR_DURING_THE_LAST_UPDATE_ATTEMPT="There was an error during the last update attempt." COM_SERMONDISTRIBUTOR_THE_EXTERNAL_SOURCE_COULD_NOT_BE_FOUND="The external source could not be found." COM_SERMONDISTRIBUTOR_THE_FILES_LINKED_FROM_EXTERNAL_SOURCE="The Files Linked from External Source" +COM_SERMONDISTRIBUTOR_THE_LOCAL_LISTING_OF_THE_MANUAL_EXTERNAL_SOURCE_FOLDERS_IS_EMPTY="The local listing of the Manual External Source folder/s is empty." COM_SERMONDISTRIBUTOR_THE_NOTICE_BOARD_IS_LOADING="The notice board is loading" COM_SERMONDISTRIBUTOR_THE_README_IS_LOADING="The readme is loading" COM_SERMONDISTRIBUTOR_THE_UPDATE_IS_RUNNING="The update is running." diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index a35bd26b..6634616e 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 0f48712b..5a1ce07b 100644 --- a/admin/layouts/external_source/build_option_fullwidth.php +++ b/admin/layouts/external_source/build_option_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 83e4afdd..9170ad4d 100644 --- a/admin/layouts/external_source/details_above.php +++ b/admin/layouts/external_source/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 06700e1c..7b6f80d7 100644 --- a/admin/layouts/external_source/details_fullwidth.php +++ b/admin/layouts/external_source/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 790073e5..cfa9b09a 100644 --- a/admin/layouts/external_source/details_left.php +++ b/admin/layouts/external_source/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 c7bf6c42..4b469747 100644 --- a/admin/layouts/external_source/details_right.php +++ b/admin/layouts/external_source/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 3b1f684f..6f093716 100644 --- a/admin/layouts/external_source/details_under.php +++ b/admin/layouts/external_source/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 30e27531..d095369f 100644 --- a/admin/layouts/external_source/publishing.php +++ b/admin/layouts/external_source/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 0cb2cc6b..59015e8f 100644 --- a/admin/layouts/external_source/publlshing.php +++ b/admin/layouts/external_source/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 19720481..209d8ce8 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 5a5b3b09..4e7dcd57 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 57151526..ebb2ea7a 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 6f56d947..4ccf80fb 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 3b1f684f..6f093716 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 952f76e1..f9151e59 100644 --- a/admin/layouts/help_document/metadata.php +++ b/admin/layouts/help_document/metadata.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 b6631241..7f4a55fa 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 53d2bedb..b56b948b 100644 --- a/admin/layouts/local_listing/details_above.php +++ b/admin/layouts/local_listing/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 ab4f5e70..1843a6ed 100644 --- a/admin/layouts/local_listing/details_fullwidth.php +++ b/admin/layouts/local_listing/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 9a0592b8..95f4ecba 100644 --- a/admin/layouts/local_listing/details_left.php +++ b/admin/layouts/local_listing/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 5ba2612b..1ac7e092 100644 --- a/admin/layouts/local_listing/details_right.php +++ b/admin/layouts/local_listing/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 30e27531..d095369f 100644 --- a/admin/layouts/local_listing/publishing.php +++ b/admin/layouts/local_listing/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 0cb2cc6b..59015e8f 100644 --- a/admin/layouts/local_listing/publlshing.php +++ b/admin/layouts/local_listing/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 65790aed..b70f00fe 100644 --- a/admin/layouts/preacher/details_above.php +++ b/admin/layouts/preacher/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 e1c38980..63bc7353 100644 --- a/admin/layouts/preacher/details_fullwidth.php +++ b/admin/layouts/preacher/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 bde441d4..4054658c 100644 --- a/admin/layouts/preacher/details_left.php +++ b/admin/layouts/preacher/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 afaf94a7..8937d5f6 100644 --- a/admin/layouts/preacher/details_right.php +++ b/admin/layouts/preacher/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 952f76e1..f9151e59 100644 --- a/admin/layouts/preacher/metadata.php +++ b/admin/layouts/preacher/metadata.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 b6631241..7f4a55fa 100644 --- a/admin/layouts/preacher/publishing.php +++ b/admin/layouts/preacher/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 0f5ec42e..f6916e2a 100644 --- a/admin/layouts/preacher/sermons_fullwidth.php +++ b/admin/layouts/preacher/sermons_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons_fullwidth.php diff --git a/admin/layouts/series/details_above.php b/admin/layouts/series/details_above.php index 65790aed..b70f00fe 100644 --- a/admin/layouts/series/details_above.php +++ b/admin/layouts/series/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 e1c38980..63bc7353 100644 --- a/admin/layouts/series/details_fullwidth.php +++ b/admin/layouts/series/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 bde441d4..4054658c 100644 --- a/admin/layouts/series/details_left.php +++ b/admin/layouts/series/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 50470001..5637a751 100644 --- a/admin/layouts/series/details_right.php +++ b/admin/layouts/series/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 952f76e1..f9151e59 100644 --- a/admin/layouts/series/metadata.php +++ b/admin/layouts/series/metadata.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 b6631241..7f4a55fa 100644 --- a/admin/layouts/series/publishing.php +++ b/admin/layouts/series/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 77e93451..7c1f1c86 100644 --- a/admin/layouts/series/sermons_fullwidth.php +++ b/admin/layouts/series/sermons_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons_fullwidth.php diff --git a/admin/layouts/sermon/details_above.php b/admin/layouts/sermon/details_above.php index 6b6cf5c7..ddf46260 100644 --- a/admin/layouts/sermon/details_above.php +++ b/admin/layouts/sermon/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 e1c38980..63bc7353 100644 --- a/admin/layouts/sermon/details_fullwidth.php +++ b/admin/layouts/sermon/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 4ab5cac4..26f8e951 100644 --- a/admin/layouts/sermon/details_left.php +++ b/admin/layouts/sermon/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 71ea2565..a007614f 100644 --- a/admin/layouts/sermon/details_right.php +++ b/admin/layouts/sermon/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 dd49ec07..30ce07a6 100644 --- a/admin/layouts/sermon/details_under.php +++ b/admin/layouts/sermon/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 8a4b118e..023cc2cd 100644 --- a/admin/layouts/sermon/files_fullwidth.php +++ b/admin/layouts/sermon/files_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 952f76e1..f9151e59 100644 --- a/admin/layouts/sermon/metadata.php +++ b/admin/layouts/sermon/metadata.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 b6631241..7f4a55fa 100644 --- a/admin/layouts/sermon/publishing.php +++ b/admin/layouts/sermon/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 853d72ad..54d8cd05 100644 --- a/admin/layouts/sermon/stastics_fullwidth.php +++ b/admin/layouts/sermon/stastics_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage stastics_fullwidth.php diff --git a/admin/layouts/statistic/details_above.php b/admin/layouts/statistic/details_above.php index 16fcac41..fbc51755 100644 --- a/admin/layouts/statistic/details_above.php +++ b/admin/layouts/statistic/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 1ab2b302..a064a014 100644 --- a/admin/layouts/statistic/details_left.php +++ b/admin/layouts/statistic/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 a1a04e79..22dea2f8 100644 --- a/admin/layouts/statistic/details_right.php +++ b/admin/layouts/statistic/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 952f76e1..f9151e59 100644 --- a/admin/layouts/statistic/metadata.php +++ b/admin/layouts/statistic/metadata.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 b6631241..7f4a55fa 100644 --- a/admin/layouts/statistic/publishing.php +++ b/admin/layouts/statistic/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index c930b611..5d3aac9c 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage ajax.php @@ -44,13 +44,14 @@ public function __construct() } // Used in sermon + /** * Check and if a vdm notice is new (per/user) **/ public function isNew($notice) { // first get the file path - $path_filename = SermondistributorHelper::getFilePath('user', 'notice', JFactory::getUser()->username, '.md', JPATH_COMPONENT_ADMINISTRATOR); + $path_filename = SermondistributorHelper::getFilePath('user', 'notice', JFactory::getUser()->username, $fileType = '.md', JPATH_COMPONENT_ADMINISTRATOR); // check if the file is set if (($content = @file_get_contents($path_filename)) !== FALSE) { @@ -68,7 +69,7 @@ public function isNew($notice) public function isRead($notice) { // first get the file path - $path_filename = SermondistributorHelper::getFilePath('user', 'notice', JFactory::getUser()->username, '.md', JPATH_COMPONENT_ADMINISTRATOR); + $path_filename = SermondistributorHelper::getFilePath('user', 'notice', JFactory::getUser()->username, $fileType = '.md', JPATH_COMPONENT_ADMINISTRATOR); // set as read if not already set if (($content = @file_get_contents($path_filename)) !== FALSE) { @@ -90,12 +91,11 @@ protected function saveFile($data,$path_filename) return true; } return false; - } - + } /** - * Auto Update Local Listing External + * The Queue to Update Local Listing of External Source **/ - public function autoUpdateLocalListingExternal($id, $target, $typeID) + public function theQueue($id, $target, $typeID) { if (1 == $typeID) { diff --git a/admin/models/external_source.php b/admin/models/external_source.php index ad51b294..c938f7ce 100644 --- a/admin/models/external_source.php +++ b/admin/models/external_source.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage external_source.php @author Llewellyn van der Merwe @@ -1038,7 +1038,7 @@ protected function batchMove($values, $pks, $contexts) foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } @@ -1128,7 +1128,7 @@ public function save($data) } // Alter the uniqe field for save as copy - if ($input->get('task') == 'save2copy') + if ($input->get('task') === 'save2copy') { // Automatic handling of other uniqe fields $uniqeFields = $this->getUniqeFields(); diff --git a/admin/models/external_sources.php b/admin/models/external_sources.php index 4b33f6db..2aee93d8 100644 --- a/admin/models/external_sources.php +++ b/admin/models/external_sources.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage external_sources.php @author Llewellyn van der Merwe @@ -181,7 +181,7 @@ public function getItems() public function selectionTranslation($value,$name) { // Array of externalsources language strings - if ($name == 'externalsources') + if ($name === 'externalsources') { $externalsourcesArray = array( 0 => 'COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SELECT_AN_OPTION', @@ -194,7 +194,7 @@ public function selectionTranslation($value,$name) } } // Array of update_method language strings - if ($name == 'update_method') + if ($name === 'update_method') { $update_methodArray = array( 1 => 'COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_MANUAL', @@ -207,7 +207,7 @@ public function selectionTranslation($value,$name) } } // Array of filetypes language strings - if ($name == 'filetypes') + if ($name === 'filetypes') { $filetypesArray = array( '.mp3' => 'COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_MPTHREE', @@ -246,7 +246,7 @@ public function selectionTranslation($value,$name) } } // Array of build language strings - if ($name == 'build') + if ($name === 'build') { $buildArray = array( 0 => 'COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SELECT_AN_OPTION', diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 740b768f..e5dd1299 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage adminviewfolderlist.php @@ -61,7 +61,8 @@ protected function getInput() $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ protected function getInput() } $user = JFactory::getUser(); // only add if user allowed to create - if ($user->authorise('core.create', 'com_sermondistributor')) + if ($user->authorise('core.create', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ protected function getInput() '; } // only add if user allowed to edit - if (($buttonName == '' || $buttonName == '') && $user->authorise('core.edit', 'com_sermondistributor')) + if (($buttonName === '' || $buttonName === '') && $user->authorise('core.edit', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index fc01c998..f9bf88f9 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage articles.php @@ -61,7 +61,8 @@ protected function getInput() $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ protected function getInput() } $user = JFactory::getUser(); // only add if user allowed to create article - if ($user->authorise('core.create', 'com_sermondistributor')) + if ($user->authorise('core.create', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ protected function getInput() '; } // only add if user allowed to edit article - if (($buttonName == 'article' || $buttonName == 'articles') && $user->authorise('core.edit', 'com_sermondistributor')) + if (($buttonName === 'article' || $buttonName === 'articles') && $user->authorise('core.edit', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/externalsource.php b/admin/models/fields/externalsource.php index de172112..bf52708e 100644 --- a/admin/models/fields/externalsource.php +++ b/admin/models/fields/externalsource.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage externalsource.php @@ -61,7 +61,8 @@ protected function getInput() $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ protected function getInput() } $user = JFactory::getUser(); // only add if user allowed to create external_source - if ($user->authorise('external_source.create', 'com_sermondistributor')) + if ($user->authorise('external_source.create', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ protected function getInput() '; } // only add if user allowed to edit external_source - if (($buttonName == 'external_source' || $buttonName == 'external_sources') && $user->authorise('external_source.edit', 'com_sermondistributor')) + if (($buttonName === 'external_source' || $buttonName === 'external_sources') && $user->authorise('external_source.edit', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/externalsourcefiles.php b/admin/models/fields/externalsourcefiles.php index 395fd180..eb741f73 100644 --- a/admin/models/fields/externalsourcefiles.php +++ b/admin/models/fields/externalsourcefiles.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage externalsourcefiles.php @@ -61,7 +61,8 @@ protected function getInput() $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ protected function getInput() } $user = JFactory::getUser(); // only add if user allowed to create - if ($user->authorise('core.create', 'com_sermondistributor')) + if ($user->authorise('core.create', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ protected function getInput() '; } // only add if user allowed to edit - if (($buttonName == '' || $buttonName == '') && $user->authorise('core.edit', 'com_sermondistributor')) + if (($buttonName === '' || $buttonName === '') && $user->authorise('core.edit', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); @@ -149,7 +150,7 @@ function ".$buttonName."Button(value) { public function getOptions() { // set the default - $options[] = JHtml::_('select.option', '', JText::_('The local listing of the Manual External Source folder/s is empty.')); + $options[] = JHtml::_('select.option', '', JText::_('COM_SERMONDISTRIBUTOR_THE_LOCAL_LISTING_OF_THE_MANUAL_EXTERNAL_SOURCE_FOLDERS_IS_EMPTY')); $selection = SermondistributorHelper::getExternalSourceLink('manual', 2, false, 'select'); if (SermondistributorHelper::checkArray($selection)) { diff --git a/admin/models/fields/localfiles.php b/admin/models/fields/localfiles.php index 57bc4865..f473b60a 100644 --- a/admin/models/fields/localfiles.php +++ b/admin/models/fields/localfiles.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage localfiles.php @@ -61,7 +61,8 @@ protected function getInput() $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ protected function getInput() } $user = JFactory::getUser(); // only add if user allowed to create - if ($user->authorise('core.create', 'com_sermondistributor')) + if ($user->authorise('core.create', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ protected function getInput() '; } // only add if user allowed to edit - if (($buttonName == '' || $buttonName == '') && $user->authorise('core.edit', 'com_sermondistributor')) + if (($buttonName === '' || $buttonName === '') && $user->authorise('core.edit', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); @@ -151,7 +152,7 @@ public function getOptions() // get local folder $localfolder = JComponentHelper::getParams('com_sermondistributor')->get('localfolder', JPATH_ROOT.'/images'); // set the default - $options[] = JHtml::_('select.option', '', JText::sprintf('Please add files to (%s)',$localfolder)); + $options[] = JHtml::_('select.option', '', JText::sprintf('COM_SERMONDISTRIBUTOR_PLEASE_ADD_FILES_TO_S',$localfolder)); // inport all needed classes jimport('joomla.filesystem.file'); jimport('joomla.filesystem.folder'); diff --git a/admin/models/fields/preachers.php b/admin/models/fields/preachers.php index 8c53964b..d0426bb0 100644 --- a/admin/models/fields/preachers.php +++ b/admin/models/fields/preachers.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.php @@ -61,7 +61,8 @@ protected function getInput() $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ protected function getInput() } $user = JFactory::getUser(); // only add if user allowed to create preacher - if ($user->authorise('preacher.create', 'com_sermondistributor')) + if ($user->authorise('preacher.create', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ protected function getInput() '; } // only add if user allowed to edit preacher - if (($buttonName == 'preacher' || $buttonName == 'preachers') && $user->authorise('preacher.edit', 'com_sermondistributor')) + if (($buttonName === 'preacher' || $buttonName === 'preachers') && $user->authorise('preacher.edit', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/series.php b/admin/models/fields/series.php index 6ecb3617..78160a0f 100644 --- a/admin/models/fields/series.php +++ b/admin/models/fields/series.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php @@ -61,7 +61,8 @@ protected function getInput() $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ protected function getInput() } $user = JFactory::getUser(); // only add if user allowed to create series - if ($user->authorise('series.create', 'com_sermondistributor')) + if ($user->authorise('series.create', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ protected function getInput() '; } // only add if user allowed to edit series - if (($buttonName == 'series' || $buttonName == 'all_series') && $user->authorise('series.edit', 'com_sermondistributor')) + if (($buttonName === 'series' || $buttonName === 'all_series') && $user->authorise('series.edit', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/sermon.php b/admin/models/fields/sermon.php index 576564ed..09d53048 100644 --- a/admin/models/fields/sermon.php +++ b/admin/models/fields/sermon.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php @@ -61,7 +61,8 @@ protected function getInput() $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ protected function getInput() } $user = JFactory::getUser(); // only add if user allowed to create sermon - if ($user->authorise('sermon.create', 'com_sermondistributor')) + if ($user->authorise('sermon.create', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ protected function getInput() '; } // only add if user allowed to edit sermon - if (($buttonName == 'sermon' || $buttonName == 'sermons') && $user->authorise('sermon.edit', 'com_sermondistributor')) + if (($buttonName === 'sermon' || $buttonName === 'sermons') && $user->authorise('sermon.edit', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index 98c4e559..c99babf2 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage siteviewfolderlist.php @@ -61,7 +61,8 @@ protected function getInput() $script = array(); $buttonName = $this->getAttribute('name'); // get the input from url - $jinput = JFactory::getApplication()->input; + $app = JFactory::getApplication(); + $jinput = $app->input; // get the view name & id $values = $jinput->getArray(array( 'id' => 'int', @@ -78,7 +79,7 @@ protected function getInput() } $user = JFactory::getUser(); // only add if user allowed to create - if ($user->authorise('core.create', 'com_sermondistributor')) + if ($user->authorise('core.create', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -91,7 +92,7 @@ protected function getInput() '; } // only add if user allowed to edit - if (($buttonName == '' || $buttonName == '') && $user->authorise('core.edit', 'com_sermondistributor')) + if (($buttonName === '' || $buttonName === '') && $user->authorise('core.edit', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/forms/external_source.js b/admin/models/forms/external_source.js index 0ddfb4bc..1656f9cf 100644 --- a/admin/models/forms/external_source.js +++ b/admin/models/forms/external_source.js @@ -9,9 +9,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage external_source.js @author Llewellyn van der Merwe diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index 93895f35..41760e17 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -9,9 +9,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage help_document.js @author Llewellyn van der Merwe diff --git a/admin/models/forms/local_listing.js b/admin/models/forms/local_listing.js index 0ab9d0a9..55def31d 100644 --- a/admin/models/forms/local_listing.js +++ b/admin/models/forms/local_listing.js @@ -9,9 +9,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage local_listing.js @author Llewellyn van der Merwe diff --git a/admin/models/forms/preacher.js b/admin/models/forms/preacher.js index 89df1f3d..5437ba1c 100644 --- a/admin/models/forms/preacher.js +++ b/admin/models/forms/preacher.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 16 of this MVC + @build 4th November, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.js diff --git a/admin/models/forms/series.js b/admin/models/forms/series.js index 42d331f3..5f7223ce 100644 --- a/admin/models/forms/series.js +++ b/admin/models/forms/series.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 16 of this MVC + @build 4th November, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series.js diff --git a/admin/models/forms/sermon.js b/admin/models/forms/sermon.js index d97f4491..e00ed430 100644 --- a/admin/models/forms/sermon.js +++ b/admin/models/forms/sermon.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 89 of this MVC + @build 16th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.js diff --git a/admin/models/forms/statistic.js b/admin/models/forms/statistic.js index d86e12da..fe2ca90d 100644 --- a/admin/models/forms/statistic.js +++ b/admin/models/forms/statistic.js @@ -9,9 +9,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 8 of this MVC + @build 18th November, 2015 + @created 29th October, 2015 @package Sermon Distributor @subpackage statistic.js @author Llewellyn van der Merwe diff --git a/admin/models/help_document.php b/admin/models/help_document.php index 0739ce49..47a4e52a 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage help_document.php @author Llewellyn van der Merwe @@ -760,7 +760,7 @@ protected function batchMove($values, $pks, $contexts) foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } @@ -839,7 +839,7 @@ public function save($data) } // Alter the title for save as copy - if ($input->get('task') == 'save2copy') + if ($input->get('task') === 'save2copy') { $origTable = clone $this->getTable(); $origTable->load($input->getInt('id')); @@ -893,7 +893,7 @@ public function save($data) } // Alter the uniqe field for save as copy - if ($input->get('task') == 'save2copy') + if ($input->get('task') === 'save2copy') { // Automatic handling of other uniqe fields $uniqeFields = $this->getUniqeFields(); diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index ecd40c58..23382178 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage help_documents.php @author Llewellyn van der Merwe @@ -181,7 +181,7 @@ public function getItems() public function selectionTranslation($value,$name) { // Array of type language strings - if ($name == 'type') + if ($name === 'type') { $typeArray = array( 0 => 'COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_SELECT_AN_OPTION', @@ -196,7 +196,7 @@ public function selectionTranslation($value,$name) } } // Array of location language strings - if ($name == 'location') + if ($name === 'location') { $locationArray = array( 1 => 'COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ADMIN', diff --git a/admin/models/import.php b/admin/models/import.php index 04e935f4..01faa810 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage import.php diff --git a/admin/models/local_listing.php b/admin/models/local_listing.php index 39f32682..0e498ff6 100644 --- a/admin/models/local_listing.php +++ b/admin/models/local_listing.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage local_listing.php @author Llewellyn van der Merwe @@ -859,7 +859,7 @@ protected function batchMove($values, $pks, $contexts) foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } @@ -943,7 +943,7 @@ public function save($data) } // Alter the uniqe field for save as copy - if ($input->get('task') == 'save2copy') + if ($input->get('task') === 'save2copy') { // Automatic handling of other uniqe fields $uniqeFields = $this->getUniqeFields(); diff --git a/admin/models/local_listings.php b/admin/models/local_listings.php index 5f39b7bd..d10f3094 100644 --- a/admin/models/local_listings.php +++ b/admin/models/local_listings.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage local_listings.php @author Llewellyn van der Merwe @@ -159,7 +159,7 @@ public function getItems() public function selectionTranslation($value,$name) { // Array of build language strings - if ($name == 'build') + if ($name === 'build') { $buildArray = array( 0 => 'COM_SERMONDISTRIBUTOR_LOCAL_LISTING_SELECT_AN_OPTION', diff --git a/admin/models/manual_updater.php b/admin/models/manual_updater.php index 2d95597d..2c6c30c5 100644 --- a/admin/models/manual_updater.php +++ b/admin/models/manual_updater.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 44 of this MVC + @build 27th November, 2016 + @created 4th November, 2016 @package Sermon Distributor @subpackage manual_updater.php @author Llewellyn van der Merwe @@ -115,19 +115,22 @@ public function getItems() $basic = new FOFEncryptAes($basickey, 128); // Convert the parameter fields into objects. - foreach ($items as $nr => &$item) + if (SermondistributorHelper::checkArray($items)) { - // Always create a slug for sef URL's - $item->slug = (isset($item->alias)) ? $item->id.':'.$item->alias : $item->id; - if (SermondistributorHelper::checkString($item->filetypes)) + foreach ($items as $nr => &$item) { - // Decode filetypes - $item->filetypes = json_decode($item->filetypes, true); - } - if (!empty($item->oauthtoken) && $basickey && !is_numeric($item->oauthtoken) && $item->oauthtoken === base64_encode(base64_decode($item->oauthtoken, true))) - { - // Decode oauthtoken - $item->oauthtoken = rtrim($basic->decryptString($item->oauthtoken), "\0"); + // Always create a slug for sef URL's + $item->slug = (isset($item->alias) && isset($item->id)) ? $item->id.':'.$item->alias : $item->id; + if (SermondistributorHelper::checkJson($item->filetypes)) + { + // Decode filetypes + $item->filetypes = json_decode($item->filetypes, true); + } + if (!empty($item->oauthtoken) && $basickey && !is_numeric($item->oauthtoken) && $item->oauthtoken === base64_encode(base64_decode($item->oauthtoken, true))) + { + // Decode oauthtoken + $item->oauthtoken = rtrim($basic->decryptString($item->oauthtoken), "\0"); + } } } diff --git a/admin/models/preacher.php b/admin/models/preacher.php index ee3bea54..3f53e003 100644 --- a/admin/models/preacher.php +++ b/admin/models/preacher.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 16 of this MVC + @build 4th November, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.php @@ -218,7 +218,7 @@ public function getVvvsermons() public function selectionTranslationVvvsermons($value,$name) { // Array of link_type language strings - if ($name == 'link_type') + if ($name === 'link_type') { $link_typeArray = array( 1 => 'COM_SERMONDISTRIBUTOR_SERMON_ENCRYPTED', @@ -231,7 +231,7 @@ public function selectionTranslationVvvsermons($value,$name) } } // Array of source language strings - if ($name == 'source') + if ($name === 'source') { $sourceArray = array( 0 => 'COM_SERMONDISTRIBUTOR_SERMON_SELECT_SOURCE', @@ -863,7 +863,7 @@ protected function batchMove($values, $pks, $contexts) foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } @@ -936,7 +936,7 @@ public function save($data) } // Alter the name for save as copy - if ($input->get('task') == 'save2copy') + if ($input->get('task') === 'save2copy') { $origTable = clone $this->getTable(); $origTable->load($input->getInt('id')); @@ -990,7 +990,7 @@ public function save($data) } // Alter the uniqe field for save as copy - if ($input->get('task') == 'save2copy') + if ($input->get('task') === 'save2copy') { // Automatic handling of other uniqe fields $uniqeFields = $this->getUniqeFields(); diff --git a/admin/models/preachers.php b/admin/models/preachers.php index dfe4922d..5a93cb8f 100644 --- a/admin/models/preachers.php +++ b/admin/models/preachers.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 16 of this MVC + @build 4th November, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.php diff --git a/admin/models/series.php b/admin/models/series.php index e8d10979..e9740963 100644 --- a/admin/models/series.php +++ b/admin/models/series.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 16 of this MVC + @build 4th November, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php @@ -218,7 +218,7 @@ public function getVwcsermons() public function selectionTranslationVwcsermons($value,$name) { // Array of link_type language strings - if ($name == 'link_type') + if ($name === 'link_type') { $link_typeArray = array( 1 => 'COM_SERMONDISTRIBUTOR_SERMON_ENCRYPTED', @@ -231,7 +231,7 @@ public function selectionTranslationVwcsermons($value,$name) } } // Array of source language strings - if ($name == 'source') + if ($name === 'source') { $sourceArray = array( 0 => 'COM_SERMONDISTRIBUTOR_SERMON_SELECT_SOURCE', @@ -863,7 +863,7 @@ protected function batchMove($values, $pks, $contexts) foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } @@ -936,7 +936,7 @@ public function save($data) } // Alter the name for save as copy - if ($input->get('task') == 'save2copy') + if ($input->get('task') === 'save2copy') { $origTable = clone $this->getTable(); $origTable->load($input->getInt('id')); @@ -990,7 +990,7 @@ public function save($data) } // Alter the uniqe field for save as copy - if ($input->get('task') == 'save2copy') + if ($input->get('task') === 'save2copy') { // Automatic handling of other uniqe fields $uniqeFields = $this->getUniqeFields(); diff --git a/admin/models/series_list.php b/admin/models/series_list.php index 68f4c03f..141a1b7e 100644 --- a/admin/models/series_list.php +++ b/admin/models/series_list.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 16 of this MVC + @build 4th November, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series_list.php diff --git a/admin/models/sermon.php b/admin/models/sermon.php index 1d094e07..35d1ef64 100644 --- a/admin/models/sermon.php +++ b/admin/models/sermon.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 89 of this MVC + @build 16th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php @@ -243,42 +243,17 @@ public function getForm($data = array(), $loadData = true) { $id = $jinput->get('id', 0, 'INT'); } - // Determine correct permissions to check. - if ($this->getState('sermon.id')) - { - $id = $this->getState('sermon.id'); - - $catid = 0; - if (isset($this->getItem($id)->catid)) - { - // set catagory id - $catid = $this->getItem($id)->catid; - - // Existing record. Can only edit in selected categories. - $form->setFieldAttribute('catid', 'action', 'core.edit'); - - // Existing record. Can only edit own items in selected categories. - $form->setFieldAttribute('catid', 'action', 'core.edit.own'); - } - } - else - { - // New record. Can only create in selected categories. - $form->setFieldAttribute('catid', 'action', 'core.create'); - } $user = JFactory::getUser(); // Check for existing item. // Modify the form based on Edit State access controls. if ($id != 0 && (!$user->authorise('sermon.edit.state', 'com_sermondistributor.sermon.' . (int) $id)) - || (isset($catid) && $catid != 0 && !$user->authorise('core.edit.state', 'com_sermondistributor.sermons.category.' . (int) $catid)) || ($id == 0 && !$user->authorise('sermon.edit.state', 'com_sermondistributor'))) { // Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); $form->setFieldAttribute('published', 'disabled', 'true'); - // Disable fields while saving. $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); @@ -355,14 +330,8 @@ protected function canDelete($record) } $user = JFactory::getUser(); - $allow = $user->authorise('core.delete', 'com_sermondistributor.sermons.category.' . (int) $record->catid); - - if ($allow) - { - // The record has been set. Check the record permissions. - return $user->authorise('sermon.delete', 'com_sermondistributor.sermon.' . (int) $record->id); - } - return $allow; + // The record has been set. Check the record permissions. + return $user->authorise('sermon.delete', 'com_sermondistributor.sermon.' . (int) $record->id); } return false; } @@ -390,15 +359,6 @@ protected function canEditState($record) return false; } } - // Check against the category. - if (!empty($record->catid)) - { - $catpermission = $user->authorise('core.edit.state', 'com_sermondistributor.sermons.category.' . (int) $record->catid); - if (!$catpermission && !is_null($catpermission)) - { - return false; - } - } // In the absense of better information, revert to the component permissions. return $user->authorise('sermon.edit.state', 'com_sermondistributor'); } @@ -940,7 +900,7 @@ protected function batchMove($values, $pks, $contexts) foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } @@ -1025,7 +985,7 @@ public function save($data) } // Alter the name for save as copy - if ($input->get('task') == 'save2copy') + if ($input->get('task') === 'save2copy') { $origTable = clone $this->getTable(); $origTable->load($input->getInt('id')); @@ -1079,7 +1039,7 @@ public function save($data) } // Alter the uniqe field for save as copy - if ($input->get('task') == 'save2copy') + if ($input->get('task') === 'save2copy') { // Automatic handling of other uniqe fields $uniqeFields = $this->getUniqeFields(); diff --git a/admin/models/sermondistributor.php b/admin/models/sermondistributor.php index 625f6cab..92a7ce15 100644 --- a/admin/models/sermondistributor.php +++ b/admin/models/sermondistributor.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php diff --git a/admin/models/sermons.php b/admin/models/sermons.php index 0f593cfc..7f80d29c 100644 --- a/admin/models/sermons.php +++ b/admin/models/sermons.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 89 of this MVC + @build 16th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons.php @@ -177,7 +177,7 @@ public function getItems() public function selectionTranslation($value,$name) { // Array of link_type language strings - if ($name == 'link_type') + if ($name === 'link_type') { $link_typeArray = array( 1 => 'COM_SERMONDISTRIBUTOR_SERMON_ENCRYPTED', @@ -190,7 +190,7 @@ public function selectionTranslation($value,$name) } } // Array of source language strings - if ($name == 'source') + if ($name === 'source') { $sourceArray = array( 0 => 'COM_SERMONDISTRIBUTOR_SERMON_SELECT_SOURCE', diff --git a/admin/models/statistic.php b/admin/models/statistic.php index 1273daec..3d2775b7 100644 --- a/admin/models/statistic.php +++ b/admin/models/statistic.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 8 of this MVC + @build 18th November, 2015 + @created 29th October, 2015 @package Sermon Distributor @subpackage statistic.php @author Llewellyn van der Merwe @@ -720,7 +720,7 @@ protected function batchMove($values, $pks, $contexts) foreach ($values as $key => $value) { // Do special action for access. - if ('access' == $key && strlen($value) > 0) + if ('access' === $key && strlen($value) > 0) { $this->table->$key = $value; } @@ -793,7 +793,7 @@ public function save($data) } // Alter the uniqe field for save as copy - if ($input->get('task') == 'save2copy') + if ($input->get('task') === 'save2copy') { // Automatic handling of other uniqe fields $uniqeFields = $this->getUniqeFields(); diff --git a/admin/models/statistics.php b/admin/models/statistics.php index 69df7377..4f3d76b2 100644 --- a/admin/models/statistics.php +++ b/admin/models/statistics.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 8 of this MVC + @build 18th November, 2015 + @created 29th October, 2015 @package Sermon Distributor @subpackage statistics.php @author Llewellyn van der Merwe diff --git a/admin/sermondistributor.php b/admin/sermondistributor.php index f8c854d4..64a86bdd 100644 --- a/admin/sermondistributor.php +++ b/admin/sermondistributor.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index e5edbf5b..aef7a7ec 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -1,24 +1,24 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_preacher` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', + `id` INT(11) NOT NULL AUTO_INCREMENT, + `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `alias` CHAR(64) NOT NULL DEFAULT '', `description` TEXT NOT NULL, `email` VARCHAR(255) NOT NULL DEFAULT '', `icon` CHAR(64) NOT NULL DEFAULT '', `name` VARCHAR(255) NOT NULL DEFAULT '', `website` VARCHAR(255) NOT NULL DEFAULT '', - `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `params` text NOT NULL DEFAULT '', + `published` TINYINT(3) NOT NULL DEFAULT 1, + `created_by` INT(10) unsigned NOT NULL DEFAULT 0, + `modified_by` INT(10) unsigned NOT NULL DEFAULT 0, `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` int(11) unsigned NOT NULL DEFAULT 0, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `access` int(11) DEFAULT NULL, - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(10) unsigned NOT NULL DEFAULT 1, + `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, + `ordering` INT(11) NOT NULL DEFAULT 0, `metakey` TEXT NOT NULL DEFAULT '', `metadesc` TEXT NOT NULL DEFAULT '', `metadata` TEXT NOT NULL DEFAULT '', @@ -33,8 +33,8 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_preacher` ( ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__sermondistributor_sermon` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', + `id` INT(11) NOT NULL AUTO_INCREMENT, + `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `alias` CHAR(64) NOT NULL DEFAULT '', `auto_sermons` TEXT NOT NULL, `build` TINYINT(1) NOT NULL DEFAULT '0', @@ -52,18 +52,18 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_sermon` ( `short_description` VARCHAR(255) NOT NULL DEFAULT '', `source` TINYINT(1) NOT NULL DEFAULT '0', `url` VARCHAR(255) NOT NULL DEFAULT '', - `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `params` text NOT NULL DEFAULT '', + `published` TINYINT(3) NOT NULL DEFAULT 1, + `created_by` INT(10) unsigned NOT NULL DEFAULT 0, + `modified_by` INT(10) unsigned NOT NULL DEFAULT 0, `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` int(11) unsigned NOT NULL DEFAULT 0, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `access` int(11) DEFAULT NULL, - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(10) unsigned NOT NULL DEFAULT 1, + `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, + `ordering` INT(11) NOT NULL DEFAULT 0, `metakey` TEXT NOT NULL DEFAULT '', `metadesc` TEXT NOT NULL DEFAULT '', `metadata` TEXT NOT NULL DEFAULT '', @@ -83,25 +83,25 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_sermon` ( ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__sermondistributor_series` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', + `id` INT(11) NOT NULL AUTO_INCREMENT, + `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `alias` CHAR(64) NOT NULL DEFAULT '', `description` TEXT NOT NULL, `icon` CHAR(64) NOT NULL DEFAULT '', `name` VARCHAR(255) NOT NULL DEFAULT '', `scripture` VARCHAR(255) NOT NULL DEFAULT '', - `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `params` text NOT NULL DEFAULT '', + `published` TINYINT(3) NOT NULL DEFAULT 1, + `created_by` INT(10) unsigned NOT NULL DEFAULT 0, + `modified_by` INT(10) unsigned NOT NULL DEFAULT 0, `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` int(11) unsigned NOT NULL DEFAULT 0, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `access` int(11) DEFAULT NULL, - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(10) unsigned NOT NULL DEFAULT 1, + `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, + `ordering` INT(11) NOT NULL DEFAULT 0, `metakey` TEXT NOT NULL DEFAULT '', `metadesc` TEXT NOT NULL DEFAULT '', `metadata` TEXT NOT NULL DEFAULT '', @@ -116,25 +116,25 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_series` ( ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__sermondistributor_statistic` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', + `id` INT(11) NOT NULL AUTO_INCREMENT, + `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `counter` INT(64) NOT NULL DEFAULT '0', `filename` VARCHAR(255) NOT NULL DEFAULT '', `preacher` INT(11) NOT NULL DEFAULT '0', `series` INT(11) NOT NULL DEFAULT '0', `sermon` INT(11) NOT NULL DEFAULT '0', - `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `params` text NOT NULL DEFAULT '', + `published` TINYINT(3) NOT NULL DEFAULT 1, + `created_by` INT(10) unsigned NOT NULL DEFAULT 0, + `modified_by` INT(10) unsigned NOT NULL DEFAULT 0, `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` int(11) unsigned NOT NULL DEFAULT 0, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `access` int(11) DEFAULT NULL, - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(10) unsigned NOT NULL DEFAULT 1, + `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, + `ordering` INT(11) NOT NULL DEFAULT 0, `metakey` TEXT NOT NULL DEFAULT '', `metadesc` TEXT NOT NULL DEFAULT '', `metadata` TEXT NOT NULL DEFAULT '', @@ -151,8 +151,8 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_statistic` ( ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__sermondistributor_external_source` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', + `id` INT(11) NOT NULL AUTO_INCREMENT, + `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `build` TINYINT(1) NOT NULL DEFAULT '0', `description` VARCHAR(255) NOT NULL DEFAULT '', `dropboxoptions` TINYINT(1) NOT NULL DEFAULT '1', @@ -165,17 +165,17 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_external_source` ( `sharedurl` TEXT NOT NULL, `update_method` TINYINT NOT NULL DEFAULT '0', `update_timer` INT(1) NOT NULL DEFAULT '0', - `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `params` text NOT NULL DEFAULT '', + `published` TINYINT(3) NOT NULL DEFAULT 1, + `created_by` INT(10) unsigned NOT NULL DEFAULT 0, + `modified_by` INT(10) unsigned NOT NULL DEFAULT 0, `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` int(11) unsigned NOT NULL DEFAULT 0, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(10) unsigned NOT NULL DEFAULT 1, + `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), @@ -190,25 +190,25 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_external_source` ( ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__sermondistributor_local_listing` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', + `id` INT(11) NOT NULL AUTO_INCREMENT, + `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `build` TINYINT(1) NOT NULL DEFAULT '0', `external_source` INT(11) NOT NULL DEFAULT '0', `key` VARCHAR(255) NOT NULL DEFAULT '', `name` VARCHAR(255) NOT NULL DEFAULT '', `size` INT(50) NOT NULL DEFAULT '0', `url` TEXT NOT NULL, - `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `params` text NOT NULL DEFAULT '', + `published` TINYINT(3) NOT NULL DEFAULT 1, + `created_by` INT(10) unsigned NOT NULL DEFAULT 0, + `modified_by` INT(10) unsigned NOT NULL DEFAULT 0, `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` int(11) unsigned NOT NULL DEFAULT 0, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(10) unsigned NOT NULL DEFAULT 1, + `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `ordering` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), KEY `idx_checkout` (`checked_out`), KEY `idx_createdby` (`created_by`), @@ -220,8 +220,8 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_local_listing` ( ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__sermondistributor_help_document` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', + `id` INT(11) NOT NULL AUTO_INCREMENT, + `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `admin_view` CHAR(255) NOT NULL DEFAULT '', `alias` CHAR(64) NOT NULL DEFAULT '', `article` TINYINT(1) NOT NULL DEFAULT '0', @@ -234,18 +234,18 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_help_document` ( `title` CHAR(64) NOT NULL DEFAULT '', `type` TINYINT(1) NOT NULL DEFAULT '0', `url` VARCHAR(255) NOT NULL DEFAULT '', - `params` TEXT NOT NULL, - `published` tinyint(1) NOT NULL DEFAULT '1', - `created_by` int(11) NOT NULL DEFAULT '0', - `modified_by` int(11) NOT NULL DEFAULT '0', + `params` text NOT NULL DEFAULT '', + `published` TINYINT(3) NOT NULL DEFAULT 1, + `created_by` INT(10) unsigned NOT NULL DEFAULT 0, + `modified_by` INT(10) unsigned NOT NULL DEFAULT 0, `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `checked_out` int(11) NOT NULL, + `checked_out` int(11) unsigned NOT NULL DEFAULT 0, `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `version` int(11) NOT NULL DEFAULT '1', - `hits` int(11) NOT NULL DEFAULT '0', - `access` int(11) DEFAULT NULL, - `ordering` int(11) NOT NULL DEFAULT '0', + `version` INT(10) unsigned NOT NULL DEFAULT 1, + `hits` INT(10) unsigned NOT NULL DEFAULT 0, + `access` INT(10) unsigned NOT NULL DEFAULT 0, + `ordering` INT(11) NOT NULL DEFAULT 0, `metakey` TEXT NOT NULL DEFAULT '', `metadesc` TEXT NOT NULL DEFAULT '', `metadata` TEXT NOT NULL DEFAULT '', diff --git a/admin/sql/updates/mysql/1.4.0.sql b/admin/sql/updates/mysql/1.4.0.sql new file mode 100644 index 00000000..d3f5a12f --- /dev/null +++ b/admin/sql/updates/mysql/1.4.0.sql @@ -0,0 +1 @@ + diff --git a/admin/tables/external_source.php b/admin/tables/external_source.php index 67f2984c..1accda7f 100644 --- a/admin/tables/external_source.php +++ b/admin/tables/external_source.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage external_source.php @author Llewellyn van der Merwe diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index 6cb5aef8..a9e009e4 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage help_document.php @author Llewellyn van der Merwe diff --git a/admin/tables/local_listing.php b/admin/tables/local_listing.php index b872b8d0..89fc5e1b 100644 --- a/admin/tables/local_listing.php +++ b/admin/tables/local_listing.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage local_listing.php @author Llewellyn van der Merwe diff --git a/admin/tables/preacher.php b/admin/tables/preacher.php index 04c5537f..0326a208 100644 --- a/admin/tables/preacher.php +++ b/admin/tables/preacher.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 16 of this MVC + @build 4th November, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.php diff --git a/admin/tables/series.php b/admin/tables/series.php index 7e031b8c..3e796933 100644 --- a/admin/tables/series.php +++ b/admin/tables/series.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 16 of this MVC + @build 4th November, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php diff --git a/admin/tables/sermon.php b/admin/tables/sermon.php index 04e7dcd9..03bf9e39 100644 --- a/admin/tables/sermon.php +++ b/admin/tables/sermon.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version @update number 89 of this MVC + @build 16th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php diff --git a/admin/tables/statistic.php b/admin/tables/statistic.php index 86d927af..d7dac841 100644 --- a/admin/tables/statistic.php +++ b/admin/tables/statistic.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 8 of this MVC + @build 18th November, 2015 + @created 29th October, 2015 @package Sermon Distributor @subpackage statistic.php @author Llewellyn van der Merwe diff --git a/admin/views/external_source/submitbutton.js b/admin/views/external_source/submitbutton.js index 1ff3ca25..be5ee612 100644 --- a/admin/views/external_source/submitbutton.js +++ b/admin/views/external_source/submitbutton.js @@ -9,9 +9,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage submitbutton.js @author Llewellyn van der Merwe diff --git a/admin/views/external_source/tmpl/edit.php b/admin/views/external_source/tmpl/edit.php index 5e87fcdc..2bacfac5 100644 --- a/admin/views/external_source/tmpl/edit.php +++ b/admin/views/external_source/tmpl/edit.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage edit.php @author Llewellyn van der Merwe diff --git a/admin/views/external_source/view.html.php b/admin/views/external_source/view.html.php index a73fc652..585b8d2c 100644 --- a/admin/views/external_source/view.html.php +++ b/admin/views/external_source/view.html.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage view.html.php @author Llewellyn van der Merwe diff --git a/admin/views/external_sources/tmpl/default.php b/admin/views/external_sources/tmpl/default.php index d4f33d03..e2e9af14 100644 --- a/admin/views/external_sources/tmpl/default.php +++ b/admin/views/external_sources/tmpl/default.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage default.php @author Llewellyn van der Merwe diff --git a/admin/views/external_sources/tmpl/default_batch_body.php b/admin/views/external_sources/tmpl/default_batch_body.php index 3d939d3d..4e4e412b 100644 --- a/admin/views/external_sources/tmpl/default_batch_body.php +++ b/admin/views/external_sources/tmpl/default_batch_body.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage default_batch_body.php @author Llewellyn van der Merwe diff --git a/admin/views/external_sources/tmpl/default_batch_footer.php b/admin/views/external_sources/tmpl/default_batch_footer.php index aebd77fe..7ec1fea3 100644 --- a/admin/views/external_sources/tmpl/default_batch_footer.php +++ b/admin/views/external_sources/tmpl/default_batch_footer.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage default_batch_footer.php @author Llewellyn van der Merwe diff --git a/admin/views/external_sources/tmpl/default_body.php b/admin/views/external_sources/tmpl/default_body.php index d7cb38a7..993f5d82 100644 --- a/admin/views/external_sources/tmpl/default_body.php +++ b/admin/views/external_sources/tmpl/default_body.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage default_body.php @author Llewellyn van der Merwe diff --git a/admin/views/external_sources/tmpl/default_foot.php b/admin/views/external_sources/tmpl/default_foot.php index 04351172..fa7b592f 100644 --- a/admin/views/external_sources/tmpl/default_foot.php +++ b/admin/views/external_sources/tmpl/default_foot.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage default_foot.php @author Llewellyn van der Merwe diff --git a/admin/views/external_sources/tmpl/default_head.php b/admin/views/external_sources/tmpl/default_head.php index 8b6f3549..05bd3623 100644 --- a/admin/views/external_sources/tmpl/default_head.php +++ b/admin/views/external_sources/tmpl/default_head.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage default_head.php @author Llewellyn van der Merwe diff --git a/admin/views/external_sources/tmpl/default_toolbar.php b/admin/views/external_sources/tmpl/default_toolbar.php index d380b470..03ac25f5 100644 --- a/admin/views/external_sources/tmpl/default_toolbar.php +++ b/admin/views/external_sources/tmpl/default_toolbar.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage default_toolbar.php @author Llewellyn van der Merwe diff --git a/admin/views/external_sources/view.html.php b/admin/views/external_sources/view.html.php index a5eee7a2..167952d7 100644 --- a/admin/views/external_sources/view.html.php +++ b/admin/views/external_sources/view.html.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 53 of this MVC + @build 27th November, 2016 + @created 3rd November, 2016 @package Sermon Distributor @subpackage view.html.php @author Llewellyn van der Merwe @@ -340,15 +340,15 @@ protected function getTheExternalsourcesSelections() // get model $model = $this->getModel(); $results = array_unique($results); - $filter = array(); + $_filter = array(); foreach ($results as $externalsources) { // Translate the externalsources selection $text = $model->selectionTranslation($externalsources,'externalsources'); // Now add the externalsources and its text to the options array - $filter[] = JHtml::_('select.option', $externalsources, JText::_($text)); + $_filter[] = JHtml::_('select.option', $externalsources, JText::_($text)); } - return $filter; + return $_filter; } return false; } @@ -376,15 +376,15 @@ protected function getTheUpdate_methodSelections() // get model $model = $this->getModel(); $results = array_unique($results); - $filter = array(); + $_filter = array(); foreach ($results as $update_method) { // Translate the update_method selection $text = $model->selectionTranslation($update_method,'update_method'); // Now add the update_method and its text to the options array - $filter[] = JHtml::_('select.option', $update_method, JText::_($text)); + $_filter[] = JHtml::_('select.option', $update_method, JText::_($text)); } - return $filter; + return $_filter; } return false; } @@ -412,15 +412,15 @@ protected function getTheBuildSelections() // get model $model = $this->getModel(); $results = array_unique($results); - $filter = array(); + $_filter = array(); foreach ($results as $build) { // Translate the build selection $text = $model->selectionTranslation($build,'build'); // Now add the build and its text to the options array - $filter[] = JHtml::_('select.option', $build, JText::_($text)); + $_filter[] = JHtml::_('select.option', $build, JText::_($text)); } - return $filter; + return $_filter; } return false; } diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js index acef21cf..3707e202 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -9,9 +9,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage submitbutton.js @author Llewellyn van der Merwe diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php index 667e1137..92161e92 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage edit.php @author Llewellyn van der Merwe diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index 97f08b03..70ac5c28 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage view.html.php @author Llewellyn van der Merwe diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php index 9078bf59..7451d0ff 100644 --- a/admin/views/help_documents/tmpl/default.php +++ b/admin/views/help_documents/tmpl/default.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage default.php @author Llewellyn van der Merwe diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php index 17158550..79b05aea 100644 --- a/admin/views/help_documents/tmpl/default_batch_body.php +++ b/admin/views/help_documents/tmpl/default_batch_body.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage default_batch_body.php @author Llewellyn van der Merwe diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php index 9e41b08c..d2299115 100644 --- a/admin/views/help_documents/tmpl/default_batch_footer.php +++ b/admin/views/help_documents/tmpl/default_batch_footer.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage default_batch_footer.php @author Llewellyn van der Merwe diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php index 0215af6f..1a9fa5c5 100644 --- a/admin/views/help_documents/tmpl/default_body.php +++ b/admin/views/help_documents/tmpl/default_body.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage default_body.php @author Llewellyn van der Merwe diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php index 3bbcbbbd..79608e42 100644 --- a/admin/views/help_documents/tmpl/default_foot.php +++ b/admin/views/help_documents/tmpl/default_foot.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage default_foot.php @author Llewellyn van der Merwe diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php index b153f1b3..b78e4c94 100644 --- a/admin/views/help_documents/tmpl/default_head.php +++ b/admin/views/help_documents/tmpl/default_head.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage default_head.php @author Llewellyn van der Merwe diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php index 1caa83c2..59009fc9 100644 --- a/admin/views/help_documents/tmpl/default_toolbar.php +++ b/admin/views/help_documents/tmpl/default_toolbar.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage default_toolbar.php @author Llewellyn van der Merwe diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index 127e8227..80f3af5b 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 20 of this MVC + @build 17th October, 2016 + @created 13th July, 2015 @package Sermon Distributor @subpackage view.html.php @author Llewellyn van der Merwe @@ -363,15 +363,15 @@ protected function getTheTypeSelections() // get model $model = $this->getModel(); $results = array_unique($results); - $filter = array(); + $_filter = array(); foreach ($results as $type) { // Translate the type selection $text = $model->selectionTranslation($type,'type'); // Now add the type and its text to the options array - $filter[] = JHtml::_('select.option', $type, JText::_($text)); + $_filter[] = JHtml::_('select.option', $type, JText::_($text)); } - return $filter; + return $_filter; } return false; } @@ -399,15 +399,15 @@ protected function getTheLocationSelections() // get model $model = $this->getModel(); $results = array_unique($results); - $filter = array(); + $_filter = array(); foreach ($results as $location) { // Translate the location selection $text = $model->selectionTranslation($location,'location'); // Now add the location and its text to the options array - $filter[] = JHtml::_('select.option', $location, JText::_($text)); + $_filter[] = JHtml::_('select.option', $location, JText::_($text)); } - return $filter; + return $_filter; } return false; } diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index 4488452a..7024fe2c 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @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 8167f800..6b415b9d 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 + @version 1.4.1 + @build 17th February, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/admin/views/local_listing/submitbutton.js b/admin/views/local_listing/submitbutton.js index eb81b0c2..3266de72 100644 --- a/admin/views/local_listing/submitbutton.js +++ b/admin/views/local_listing/submitbutton.js @@ -9,9 +9,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage submitbutton.js @author Llewellyn van der Merwe diff --git a/admin/views/local_listing/tmpl/edit.php b/admin/views/local_listing/tmpl/edit.php index 87b37e29..35b32c94 100644 --- a/admin/views/local_listing/tmpl/edit.php +++ b/admin/views/local_listing/tmpl/edit.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage edit.php @author Llewellyn van der Merwe diff --git a/admin/views/local_listing/view.html.php b/admin/views/local_listing/view.html.php index 6bda090f..4c68717c 100644 --- a/admin/views/local_listing/view.html.php +++ b/admin/views/local_listing/view.html.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage view.html.php @author Llewellyn van der Merwe diff --git a/admin/views/local_listings/tmpl/default.php b/admin/views/local_listings/tmpl/default.php index 81b26424..54111e9f 100644 --- a/admin/views/local_listings/tmpl/default.php +++ b/admin/views/local_listings/tmpl/default.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage default.php @author Llewellyn van der Merwe diff --git a/admin/views/local_listings/tmpl/default_batch_body.php b/admin/views/local_listings/tmpl/default_batch_body.php index 4f236b19..a6a041b5 100644 --- a/admin/views/local_listings/tmpl/default_batch_body.php +++ b/admin/views/local_listings/tmpl/default_batch_body.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage default_batch_body.php @author Llewellyn van der Merwe diff --git a/admin/views/local_listings/tmpl/default_batch_footer.php b/admin/views/local_listings/tmpl/default_batch_footer.php index 367e9fb0..c2dee37a 100644 --- a/admin/views/local_listings/tmpl/default_batch_footer.php +++ b/admin/views/local_listings/tmpl/default_batch_footer.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage default_batch_footer.php @author Llewellyn van der Merwe diff --git a/admin/views/local_listings/tmpl/default_body.php b/admin/views/local_listings/tmpl/default_body.php index bc991b08..963ea047 100644 --- a/admin/views/local_listings/tmpl/default_body.php +++ b/admin/views/local_listings/tmpl/default_body.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage default_body.php @author Llewellyn van der Merwe diff --git a/admin/views/local_listings/tmpl/default_foot.php b/admin/views/local_listings/tmpl/default_foot.php index 04351172..af9972e4 100644 --- a/admin/views/local_listings/tmpl/default_foot.php +++ b/admin/views/local_listings/tmpl/default_foot.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage default_foot.php @author Llewellyn van der Merwe diff --git a/admin/views/local_listings/tmpl/default_head.php b/admin/views/local_listings/tmpl/default_head.php index e1ec2624..c683158c 100644 --- a/admin/views/local_listings/tmpl/default_head.php +++ b/admin/views/local_listings/tmpl/default_head.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage default_head.php @author Llewellyn van der Merwe diff --git a/admin/views/local_listings/tmpl/default_toolbar.php b/admin/views/local_listings/tmpl/default_toolbar.php index 18ff79eb..79f52aca 100644 --- a/admin/views/local_listings/tmpl/default_toolbar.php +++ b/admin/views/local_listings/tmpl/default_toolbar.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage default_toolbar.php @author Llewellyn van der Merwe diff --git a/admin/views/local_listings/view.html.php b/admin/views/local_listings/view.html.php index 9ffd9e46..b55dea41 100644 --- a/admin/views/local_listings/view.html.php +++ b/admin/views/local_listings/view.html.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 10 of this MVC + @build 27th November, 2016 + @created 20th November, 2016 @package Sermon Distributor @subpackage view.html.php @author Llewellyn van der Merwe @@ -319,15 +319,15 @@ protected function getTheBuildSelections() // get model $model = $this->getModel(); $results = array_unique($results); - $filter = array(); + $_filter = array(); foreach ($results as $build) { // Translate the build selection $text = $model->selectionTranslation($build,'build'); // Now add the build and its text to the options array - $filter[] = JHtml::_('select.option', $build, JText::_($text)); + $_filter[] = JHtml::_('select.option', $build, JText::_($text)); } - return $filter; + return $_filter; } return false; } diff --git a/admin/views/manual_updater/tmpl/default.php b/admin/views/manual_updater/tmpl/default.php index 94c63102..6965f230 100644 --- a/admin/views/manual_updater/tmpl/default.php +++ b/admin/views/manual_updater/tmpl/default.php @@ -10,9 +10,9 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 1.4.0 - @build 4th December, 2016 - @created 22nd October, 2015 + @version @update number 44 of this MVC + @build 27th November, 2016 + @created 4th November, 2016 @package Sermon Distributor @subpackage default.php @author Llewellyn van der Merwe @@ -38,7 +38,7 @@ canDo->get('manual_updater.access')): ?>