diff --git a/README.md b/README.md index 63016499..38ebbd64 100644 --- a/README.md +++ b/README.md @@ -23,20 +23,20 @@ The best way to see all your options is to install this component on you Joomla + *Author*: [Llewellyn van der Merwe] (mailto:llewellyn@vdm.io) + *Name*: [Sermon Distributor] (https://www.vdm.io/) + *First Build*: 22nd October, 2015 -+ *Last Build*: 26th May, 2016 ++ *Last Build*: 24th June, 2016 + *Version*: 1.3.2 + *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: -**136 Hours** or **17 Eight Hour Days** (actual time the author saved - +**137 Hours** or **17 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*: **48865** ++ *Line count*: **49030** + *File count*: **354** + *Folder count*: **80** @@ -44,11 +44,11 @@ due to [Automated Component Builder] (https://www.vdm.io/joomla-component-builde > (with the following break down: > **debugging @34hours** = codingtime / 4; -> **planning @19hours** = codingtime / 7; +> **planning @20hours** = codingtime / 7; > **mapping @14hours** = codingtime / 10; > **office @23hours** = codingtime / 6;) -**226 Hours** or **28 Eight Hour Days** +**227 Hours** or **28 Eight Hour Days** (a total of the realistic time frame for this project) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 44e1d1b9..d3d22d3c 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 206f3853..f0f0c5a3 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage dashboard.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index 483a0e42..c4f29d5e 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help_document.css diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index 9c59543c..7f78d2f1 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help_documents.css diff --git a/admin/assets/css/preacher.css b/admin/assets/css/preacher.css index 98ad8752..d0b54917 100644 --- a/admin/assets/css/preacher.css +++ b/admin/assets/css/preacher.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 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 8b3fe9d6..9bd7e430 100644 --- a/admin/assets/css/preachers.css +++ b/admin/assets/css/preachers.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 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 ea43e389..19e01985 100644 --- a/admin/assets/css/series.css +++ b/admin/assets/css/series.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 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 f5b4a48e..f0e2d510 100644 --- a/admin/assets/css/series_list.css +++ b/admin/assets/css/series_list.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 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 83e7c15a..89457cfa 100644 --- a/admin/assets/css/sermon.css +++ b/admin/assets/css/sermon.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 f00e946c..adf96ec2 100644 --- a/admin/assets/css/sermons.css +++ b/admin/assets/css/sermons.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 37264ed4..4fd1680f 100644 --- a/admin/assets/css/statistic.css +++ b/admin/assets/css/statistic.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage statistic.css diff --git a/admin/assets/css/statistics.css b/admin/assets/css/statistics.css index e33dd6bf..a4a8380c 100644 --- a/admin/assets/css/statistics.css +++ b/admin/assets/css/statistics.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage statistics.css diff --git a/admin/config.xml b/admin/config.xml index dcba1654..4d49ade2 100644 --- a/admin/config.xml +++ b/admin/config.xml @@ -47,7 +47,7 @@ /> - + - + - + - + - + - + - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_AUTO_LOAD" @@ -373,7 +373,7 @@ description="COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_MIN_DESC" class="btn-group btn-group-yesno" default=""> - + COM_SERMONDISTRIBUTOR_CONFIG_NO" @@ -385,7 +385,7 @@ description="COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_STYLE_DESC" class="btn-group btn-group-yesno" default=""> - + COM_SERMONDISTRIBUTOR_CONFIG_FLAT_LOAD" @@ -398,7 +398,7 @@ name="player_custom_config" label="COM_SERMONDISTRIBUTOR_CONFIG_PLAYER"> - + - + COM_SERMONDISTRIBUTOR_CONFIG_SELECT_AN_OPTION @@ -422,9 +422,9 @@ name="dropbox_custom_config" label="COM_SERMONDISTRIBUTOR_CONFIG_DROPBOX"> - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_MPTHREE @@ -506,11 +506,11 @@ COM_SERMONDISTRIBUTOR_CONFIG_GIF - + - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_MANUAL COM_SERMONDISTRIBUTOR_CONFIG_AUTOMATIC - + - + - + - + - + - + - + - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_MANUAL COM_SERMONDISTRIBUTOR_CONFIG_AUTOMATIC - + - + - + - + - + - + - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_PUBLISHED @@ -712,7 +712,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_TRASHED - + - + COM_SERMONDISTRIBUTOR_CONFIG_PUBLISHED @@ -732,7 +732,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_TRASHED - + - + COM_SERMONDISTRIBUTOR_CONFIG_PUBLISHED @@ -752,7 +752,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_TRASHED - + - + COM_SERMONDISTRIBUTOR_CONFIG_ENCRYPTED @@ -771,7 +771,7 @@ name="preachers_custom_config" label="COM_SERMONDISTRIBUTOR_CONFIG_PREACHERS"> - + - + COM_SERMONDISTRIBUTOR_CONFIG_TABLE @@ -787,7 +787,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_LIST - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -807,7 +807,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED - + - + COM_SERMONDISTRIBUTOR_CONFIG_BLUE @@ -837,7 +837,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_NONE - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES @@ -926,7 +926,7 @@ name="preacher_custom_config" label="COM_SERMONDISTRIBUTOR_CONFIG_PREACHER"> - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_PANEL @@ -951,7 +951,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SMALL - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -985,7 +985,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_TABLE @@ -1087,7 +1087,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_LIST - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -1107,7 +1107,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED - + - + COM_SERMONDISTRIBUTOR_CONFIG_BLUE @@ -1137,7 +1137,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_NONE - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES @@ -1254,7 +1254,7 @@ name="categories_custom_config" label="COM_SERMONDISTRIBUTOR_CONFIG_CATEGORIES"> - + - + COM_SERMONDISTRIBUTOR_CONFIG_TABLE @@ -1270,7 +1270,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_LIST - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -1290,7 +1290,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED - + - + COM_SERMONDISTRIBUTOR_CONFIG_BLUE @@ -1320,7 +1320,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_NONE - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES @@ -1381,7 +1381,7 @@ name="category_custom_config" label="COM_SERMONDISTRIBUTOR_CONFIG_CATEGORY"> - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_PANEL @@ -1406,7 +1406,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SMALL - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -1440,7 +1440,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_TABLE @@ -1514,7 +1514,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_LIST - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -1534,7 +1534,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED - + - + COM_SERMONDISTRIBUTOR_CONFIG_BLUE @@ -1564,7 +1564,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_NONE - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES @@ -1681,7 +1681,7 @@ name="series_list_custom_config" label="COM_SERMONDISTRIBUTOR_CONFIG_SERIES_LIST"> - + - + COM_SERMONDISTRIBUTOR_CONFIG_TABLE @@ -1697,7 +1697,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_LIST - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -1717,7 +1717,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED - + - + COM_SERMONDISTRIBUTOR_CONFIG_BLUE @@ -1747,7 +1747,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_NONE - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES @@ -1808,7 +1808,7 @@ name="series_custom_config" label="COM_SERMONDISTRIBUTOR_CONFIG_SERIES"> - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_PANEL @@ -1833,7 +1833,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SMALL - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -1867,7 +1867,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_TABLE @@ -1941,7 +1941,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_LIST - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -1961,7 +1961,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED - + - + COM_SERMONDISTRIBUTOR_CONFIG_BLUE @@ -1991,7 +1991,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_NONE - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES @@ -2108,7 +2108,7 @@ name="sermon_custom_config" label="COM_SERMONDISTRIBUTOR_CONFIG_SERMON"> - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_PANEL @@ -2133,7 +2133,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_BIG - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -2167,7 +2167,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES diff --git a/admin/controller.php b/admin/controller.php index 1c834e5a..48210a27 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage controller.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 3bff1257..700148c1 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage ajax.json.php @@ -72,9 +72,9 @@ class SermondistributorControllerAjax extends JControllerLegacy { $result = false; } - if(array_key_exists('callback',$_GET)) + if($callback = $jinput->get('callback', null, 'CMD')) { - echo $_GET['callback'] . "(".json_encode($result).");"; + echo $callback . "(".json_encode($result).");"; } elseif($returnRaw) { @@ -87,9 +87,9 @@ class SermondistributorControllerAjax extends JControllerLegacy } catch(Exception $e) { - if(array_key_exists('callback',$_GET)) + if($callback = $jinput->get('callback', null, 'CMD')) { - echo $_GET['callback']."(".json_encode($e).");"; + echo $callback."(".json_encode($e).");"; } else { @@ -110,9 +110,9 @@ class SermondistributorControllerAjax extends JControllerLegacy { $result = false; } - if(array_key_exists('callback',$_GET)) + if($callback = $jinput->get('callback', null, 'CMD')) { - echo $_GET['callback'] . "(".json_encode($result).");"; + echo $callback . "(".json_encode($result).");"; } elseif($returnRaw) { @@ -125,9 +125,9 @@ class SermondistributorControllerAjax extends JControllerLegacy } catch(Exception $e) { - if(array_key_exists('callback',$_GET)) + if($callback = $jinput->get('callback', null, 'CMD')) { - echo $_GET['callback']."(".json_encode($e).");"; + echo $callback."(".json_encode($e).");"; } else { @@ -148,9 +148,9 @@ class SermondistributorControllerAjax extends JControllerLegacy { $result = false; } - if(array_key_exists('callback',$_GET)) + if($callback = $jinput->get('callback', null, 'CMD')) { - echo $_GET['callback'] . "(".json_encode($result).");"; + echo $callback . "(".json_encode($result).");"; } elseif($returnRaw) { @@ -163,9 +163,9 @@ class SermondistributorControllerAjax extends JControllerLegacy } catch(Exception $e) { - if(array_key_exists('callback',$_GET)) + if($callback = $jinput->get('callback', null, 'CMD')) { - echo $_GET['callback']."(".json_encode($e).");"; + echo $callback."(".json_encode($e).");"; } else { @@ -177,9 +177,9 @@ class SermondistributorControllerAjax extends JControllerLegacy } else { - if(array_key_exists('callback',$_GET)) + if($callback = $jinput->get('callback', null, 'CMD')) { - echo $_GET['callback']."(".json_encode(false).");"; + echo $callback."(".json_encode(false).");"; } else { diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 0dd39704..5a6bdc2d 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 4bb1511c..985c211f 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help_document.php @@ -60,13 +60,13 @@ class SermondistributorControllerHelp_document extends JControllerForm */ protected function allowAdd($data = array()) { - // [Interpretation 8855] Access check. + // [Interpretation 9081] Access check. $access = JFactory::getUser()->authorise('help_document.access', 'com_sermondistributor'); if (!$access) { return false; } - // [Interpretation 8866] In the absense of better information, revert to the component permissions. + // [Interpretation 9092] In the absense of better information, revert to the component permissions. return JFactory::getUser()->authorise('help_document.create', $this->option); } @@ -82,13 +82,13 @@ class SermondistributorControllerHelp_document extends JControllerForm */ protected function allowEdit($data = array(), $key = 'id') { - // [Interpretation 9009] get user object. + // [Interpretation 9235] get user object. $user = JFactory::getUser(); - // [Interpretation 9011] get record id. + // [Interpretation 9237] get record id. $recordId = (int) isset($data[$key]) ? $data[$key] : 0; - // [Interpretation 9018] Access check. + // [Interpretation 9244] Access check. $access = ($user->authorise('help_document.access', 'com_sermondistributor.help_document.' . (int) $recordId) && $user->authorise('help_document.access', 'com_sermondistributor')); if (!$access) { @@ -97,17 +97,17 @@ class SermondistributorControllerHelp_document extends JControllerForm if ($recordId) { - // [Interpretation 9027] The record has been set. Check the record permissions. + // [Interpretation 9253] 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 ($user->authorise('help_document.edit.own', 'com_sermondistributor.help_document.' . $recordId)) { - // [Interpretation 9049] Now test the owner is the user. + // [Interpretation 9275] Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; if (empty($ownerId)) { - // [Interpretation 9053] Need to do a lookup from the model. + // [Interpretation 9279] Need to do a lookup from the model. $record = $this->getModel()->getItem($recordId); if (empty($record)) @@ -117,7 +117,7 @@ class SermondistributorControllerHelp_document extends JControllerForm $ownerId = $record->created_by; } - // [Interpretation 9061] If the owner matches 'me' then allow. + // [Interpretation 9287] If the owner matches 'me' then allow. if ($ownerId == $user->id) { if ($user->authorise('help_document.edit.own', 'com_sermondistributor')) @@ -129,7 +129,7 @@ class SermondistributorControllerHelp_document extends JControllerForm return false; } } - // [Interpretation 9083] Since there is no permission, revert to the component permissions. + // [Interpretation 9309] Since there is no permission, revert to the component permissions. return $user->authorise('help_document.edit', $this->option); } diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index e6be79b2..6251eafd 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help_documents.php @@ -48,29 +48,29 @@ class SermondistributorControllerHelp_documents extends JControllerAdmin public function exportData() { - // [Interpretation 6800] Check for request forgeries + // [Interpretation 7013] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [Interpretation 6802] check if export is allowed for this user. + // [Interpretation 7015] check if export is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('help_document.export', 'com_sermondistributor') && $user->authorise('core.export', 'com_sermondistributor')) { - // [Interpretation 6806] Get the input + // [Interpretation 7019] Get the input $input = JFactory::getApplication()->input; $pks = $input->post->get('cid', array(), 'array'); - // [Interpretation 6809] Sanitize the input + // [Interpretation 7022] Sanitize the input JArrayHelper::toInteger($pks); - // [Interpretation 6811] Get the model + // [Interpretation 7024] Get the model $model = $this->getModel('Help_documents'); - // [Interpretation 6813] get the data to export + // [Interpretation 7026] get the data to export $data = $model->getExportData($pks); if (SermondistributorHelper::checkArray($data)) { - // [Interpretation 6817] now set the data to the spreadsheet + // [Interpretation 7030] now set the data to the spreadsheet $date = JFactory::getDate(); SermondistributorHelper::xls($data,'Help_documents_'.$date->format('jS_F_Y'),'Help documents exported ('.$date->format('jS F, Y').')','help documents'); } } - // [Interpretation 6822] Redirect to the list screen with error. + // [Interpretation 7035] Redirect to the list screen with error. $message = JText::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=help_documents', false), $message, 'error'); return; @@ -79,31 +79,31 @@ class SermondistributorControllerHelp_documents extends JControllerAdmin public function importData() { - // [Interpretation 6831] Check for request forgeries + // [Interpretation 7044] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [Interpretation 6833] check if import is allowed for this user. + // [Interpretation 7046] check if import is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('help_document.import', 'com_sermondistributor') && $user->authorise('core.import', 'com_sermondistributor')) { - // [Interpretation 6837] Get the import model + // [Interpretation 7050] Get the import model $model = $this->getModel('Help_documents'); - // [Interpretation 6839] get the headers to import + // [Interpretation 7052] get the headers to import $headers = $model->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { - // [Interpretation 6843] Load headers to session. + // [Interpretation 7056] Load headers to session. $session = JFactory::getSession(); $headers = json_encode($headers); $session->set('help_document_VDM_IMPORTHEADERS', $headers); $session->set('backto_VDM_IMPORT', 'help_documents'); $session->set('dataType_VDM_IMPORTINTO', 'help_document'); - // [Interpretation 6849] Redirect to import view. + // [Interpretation 7062] Redirect to import view. $message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_HELP_DOCUMENTS'); $this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=import', false), $message); return; } } - // [Interpretation 6869] Redirect to the list screen with error. + // [Interpretation 7082] Redirect to the list screen with error. $message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=help_documents', false), $message, 'error'); return; diff --git a/admin/controllers/import.php b/admin/controllers/import.php index f6f2f9b7..c35d805e 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage import.php diff --git a/admin/controllers/preacher.php b/admin/controllers/preacher.php index 76d659b8..880a8626 100644 --- a/admin/controllers/preacher.php +++ b/admin/controllers/preacher.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.php @@ -60,13 +60,13 @@ class SermondistributorControllerPreacher extends JControllerForm */ protected function allowAdd($data = array()) { - // [Interpretation 8855] Access check. + // [Interpretation 9081] Access check. $access = JFactory::getUser()->authorise('preacher.access', 'com_sermondistributor'); if (!$access) { return false; } - // [Interpretation 8866] In the absense of better information, revert to the component permissions. + // [Interpretation 9092] In the absense of better information, revert to the component permissions. return JFactory::getUser()->authorise('preacher.create', $this->option); } @@ -82,13 +82,13 @@ class SermondistributorControllerPreacher extends JControllerForm */ protected function allowEdit($data = array(), $key = 'id') { - // [Interpretation 9009] get user object. + // [Interpretation 9235] get user object. $user = JFactory::getUser(); - // [Interpretation 9011] get record id. + // [Interpretation 9237] get record id. $recordId = (int) isset($data[$key]) ? $data[$key] : 0; - // [Interpretation 9018] Access check. + // [Interpretation 9244] Access check. $access = ($user->authorise('preacher.access', 'com_sermondistributor.preacher.' . (int) $recordId) && $user->authorise('preacher.access', 'com_sermondistributor')); if (!$access) { @@ -97,17 +97,17 @@ class SermondistributorControllerPreacher extends JControllerForm if ($recordId) { - // [Interpretation 9027] The record has been set. Check the record permissions. + // [Interpretation 9253] 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 ($user->authorise('preacher.edit.own', 'com_sermondistributor.preacher.' . $recordId)) { - // [Interpretation 9049] Now test the owner is the user. + // [Interpretation 9275] Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; if (empty($ownerId)) { - // [Interpretation 9053] Need to do a lookup from the model. + // [Interpretation 9279] Need to do a lookup from the model. $record = $this->getModel()->getItem($recordId); if (empty($record)) @@ -117,7 +117,7 @@ class SermondistributorControllerPreacher extends JControllerForm $ownerId = $record->created_by; } - // [Interpretation 9061] If the owner matches 'me' then allow. + // [Interpretation 9287] If the owner matches 'me' then allow. if ($ownerId == $user->id) { if ($user->authorise('preacher.edit.own', 'com_sermondistributor')) @@ -129,7 +129,7 @@ class SermondistributorControllerPreacher extends JControllerForm return false; } } - // [Interpretation 9083] Since there is no permission, revert to the component permissions. + // [Interpretation 9309] Since there is no permission, revert to the component permissions. return $user->authorise('preacher.edit', $this->option); } diff --git a/admin/controllers/preachers.php b/admin/controllers/preachers.php index 21cc8d0b..9fcb36e2 100644 --- a/admin/controllers/preachers.php +++ b/admin/controllers/preachers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.php @@ -48,29 +48,29 @@ class SermondistributorControllerPreachers extends JControllerAdmin public function exportData() { - // [Interpretation 6800] Check for request forgeries + // [Interpretation 7013] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [Interpretation 6802] check if export is allowed for this user. + // [Interpretation 7015] check if export is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('preacher.export', 'com_sermondistributor') && $user->authorise('core.export', 'com_sermondistributor')) { - // [Interpretation 6806] Get the input + // [Interpretation 7019] Get the input $input = JFactory::getApplication()->input; $pks = $input->post->get('cid', array(), 'array'); - // [Interpretation 6809] Sanitize the input + // [Interpretation 7022] Sanitize the input JArrayHelper::toInteger($pks); - // [Interpretation 6811] Get the model + // [Interpretation 7024] Get the model $model = $this->getModel('Preachers'); - // [Interpretation 6813] get the data to export + // [Interpretation 7026] get the data to export $data = $model->getExportData($pks); if (SermondistributorHelper::checkArray($data)) { - // [Interpretation 6817] now set the data to the spreadsheet + // [Interpretation 7030] now set the data to the spreadsheet $date = JFactory::getDate(); SermondistributorHelper::xls($data,'Preachers_'.$date->format('jS_F_Y'),'Preachers exported ('.$date->format('jS F, Y').')','preachers'); } } - // [Interpretation 6822] Redirect to the list screen with error. + // [Interpretation 7035] Redirect to the list screen with error. $message = JText::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=preachers', false), $message, 'error'); return; @@ -79,31 +79,31 @@ class SermondistributorControllerPreachers extends JControllerAdmin public function importData() { - // [Interpretation 6831] Check for request forgeries + // [Interpretation 7044] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [Interpretation 6833] check if import is allowed for this user. + // [Interpretation 7046] check if import is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('preacher.import', 'com_sermondistributor') && $user->authorise('core.import', 'com_sermondistributor')) { - // [Interpretation 6837] Get the import model + // [Interpretation 7050] Get the import model $model = $this->getModel('Preachers'); - // [Interpretation 6839] get the headers to import + // [Interpretation 7052] get the headers to import $headers = $model->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { - // [Interpretation 6843] Load headers to session. + // [Interpretation 7056] Load headers to session. $session = JFactory::getSession(); $headers = json_encode($headers); $session->set('preacher_VDM_IMPORTHEADERS', $headers); $session->set('backto_VDM_IMPORT', 'preachers'); $session->set('dataType_VDM_IMPORTINTO', 'preacher'); - // [Interpretation 6849] Redirect to import view. + // [Interpretation 7062] Redirect to import view. $message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_PREACHERS'); $this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=import', false), $message); return; } } - // [Interpretation 6869] Redirect to the list screen with error. + // [Interpretation 7082] Redirect to the list screen with error. $message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=preachers', false), $message, 'error'); return; diff --git a/admin/controllers/series.php b/admin/controllers/series.php index 0b46e956..33c7acfa 100644 --- a/admin/controllers/series.php +++ b/admin/controllers/series.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php @@ -60,13 +60,13 @@ class SermondistributorControllerSeries extends JControllerForm */ protected function allowAdd($data = array()) { - // [Interpretation 8855] Access check. + // [Interpretation 9081] Access check. $access = JFactory::getUser()->authorise('series.access', 'com_sermondistributor'); if (!$access) { return false; } - // [Interpretation 8866] In the absense of better information, revert to the component permissions. + // [Interpretation 9092] In the absense of better information, revert to the component permissions. return JFactory::getUser()->authorise('series.create', $this->option); } @@ -82,13 +82,13 @@ class SermondistributorControllerSeries extends JControllerForm */ protected function allowEdit($data = array(), $key = 'id') { - // [Interpretation 9009] get user object. + // [Interpretation 9235] get user object. $user = JFactory::getUser(); - // [Interpretation 9011] get record id. + // [Interpretation 9237] get record id. $recordId = (int) isset($data[$key]) ? $data[$key] : 0; - // [Interpretation 9018] Access check. + // [Interpretation 9244] Access check. $access = ($user->authorise('series.access', 'com_sermondistributor.series.' . (int) $recordId) && $user->authorise('series.access', 'com_sermondistributor')); if (!$access) { @@ -97,17 +97,17 @@ class SermondistributorControllerSeries extends JControllerForm if ($recordId) { - // [Interpretation 9027] The record has been set. Check the record permissions. + // [Interpretation 9253] 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 ($user->authorise('series.edit.own', 'com_sermondistributor.series.' . $recordId)) { - // [Interpretation 9049] Now test the owner is the user. + // [Interpretation 9275] Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; if (empty($ownerId)) { - // [Interpretation 9053] Need to do a lookup from the model. + // [Interpretation 9279] Need to do a lookup from the model. $record = $this->getModel()->getItem($recordId); if (empty($record)) @@ -117,7 +117,7 @@ class SermondistributorControllerSeries extends JControllerForm $ownerId = $record->created_by; } - // [Interpretation 9061] If the owner matches 'me' then allow. + // [Interpretation 9287] If the owner matches 'me' then allow. if ($ownerId == $user->id) { if ($user->authorise('series.edit.own', 'com_sermondistributor')) @@ -129,7 +129,7 @@ class SermondistributorControllerSeries extends JControllerForm return false; } } - // [Interpretation 9083] Since there is no permission, revert to the component permissions. + // [Interpretation 9309] Since there is no permission, revert to the component permissions. return $user->authorise('series.edit', $this->option); } diff --git a/admin/controllers/series_list.php b/admin/controllers/series_list.php index b11e9ff0..f9def1d3 100644 --- a/admin/controllers/series_list.php +++ b/admin/controllers/series_list.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series_list.php @@ -48,29 +48,29 @@ class SermondistributorControllerSeries_list extends JControllerAdmin public function exportData() { - // [Interpretation 6800] Check for request forgeries + // [Interpretation 7013] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [Interpretation 6802] check if export is allowed for this user. + // [Interpretation 7015] check if export is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('series.export', 'com_sermondistributor') && $user->authorise('core.export', 'com_sermondistributor')) { - // [Interpretation 6806] Get the input + // [Interpretation 7019] Get the input $input = JFactory::getApplication()->input; $pks = $input->post->get('cid', array(), 'array'); - // [Interpretation 6809] Sanitize the input + // [Interpretation 7022] Sanitize the input JArrayHelper::toInteger($pks); - // [Interpretation 6811] Get the model + // [Interpretation 7024] Get the model $model = $this->getModel('Series_list'); - // [Interpretation 6813] get the data to export + // [Interpretation 7026] get the data to export $data = $model->getExportData($pks); if (SermondistributorHelper::checkArray($data)) { - // [Interpretation 6817] now set the data to the spreadsheet + // [Interpretation 7030] now set the data to the spreadsheet $date = JFactory::getDate(); SermondistributorHelper::xls($data,'Series_list_'.$date->format('jS_F_Y'),'Series list exported ('.$date->format('jS F, Y').')','series list'); } } - // [Interpretation 6822] Redirect to the list screen with error. + // [Interpretation 7035] Redirect to the list screen with error. $message = JText::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=series_list', false), $message, 'error'); return; @@ -79,31 +79,31 @@ class SermondistributorControllerSeries_list extends JControllerAdmin public function importData() { - // [Interpretation 6831] Check for request forgeries + // [Interpretation 7044] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [Interpretation 6833] check if import is allowed for this user. + // [Interpretation 7046] check if import is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('series.import', 'com_sermondistributor') && $user->authorise('core.import', 'com_sermondistributor')) { - // [Interpretation 6837] Get the import model + // [Interpretation 7050] Get the import model $model = $this->getModel('Series_list'); - // [Interpretation 6839] get the headers to import + // [Interpretation 7052] get the headers to import $headers = $model->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { - // [Interpretation 6843] Load headers to session. + // [Interpretation 7056] Load headers to session. $session = JFactory::getSession(); $headers = json_encode($headers); $session->set('series_VDM_IMPORTHEADERS', $headers); $session->set('backto_VDM_IMPORT', 'series_list'); $session->set('dataType_VDM_IMPORTINTO', 'series'); - // [Interpretation 6849] Redirect to import view. + // [Interpretation 7062] Redirect to import view. $message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_SERIES_LIST'); $this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=import', false), $message); return; } } - // [Interpretation 6869] Redirect to the list screen with error. + // [Interpretation 7082] Redirect to the list screen with error. $message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=series_list', false), $message, 'error'); return; diff --git a/admin/controllers/sermon.php b/admin/controllers/sermon.php index a8827b2a..307f1619 100644 --- a/admin/controllers/sermon.php +++ b/admin/controllers/sermon.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php @@ -60,10 +60,10 @@ class SermondistributorControllerSermon extends JControllerForm */ protected function allowAdd($data = array()) { - // [Interpretation 8810] get the user object + // [Interpretation 9036] get the user object $user = JFactory::getUser(); - // [Interpretation 8815] Access check. + // [Interpretation 9041] Access check. $access = $user->authorise('sermon.access', 'com_sermondistributor'); if (!$access) { @@ -74,13 +74,13 @@ class SermondistributorControllerSermon extends JControllerForm if ($categoryId) { - // [Interpretation 8826] If the category has been passed in the URL check it. + // [Interpretation 9052] If the category has been passed in the URL check it. $allow = $user->authorise('core.create', $this->option . '.sermons.category.' . $categoryId); } if ($allow === null) { - // [Interpretation 8835] In the absense of better information, revert to the component permissions. + // [Interpretation 9061] In the absense of better information, revert to the component permissions. return $user->authorise('sermon.create', $this->option); } else @@ -100,13 +100,13 @@ class SermondistributorControllerSermon extends JControllerForm * @since 1.6 */ protected function allowEdit($data = array(), $key = 'id') - { // [Interpretation 8913] get user object. + { // [Interpretation 9139] get user object. $user = JFactory::getUser(); - // [Interpretation 8915] get record id. + // [Interpretation 9141] get record id. $recordId = (int) isset($data[$key]) ? $data[$key] : 0; - // [Interpretation 8922] Access check. + // [Interpretation 9148] Access check. $access = ($user->authorise('sermon.access', 'com_sermondistributor.sermon.' . (int) $recordId) && $user->authorise('sermon.access', 'com_sermondistributor')); if (!$access) { @@ -115,17 +115,17 @@ class SermondistributorControllerSermon extends JControllerForm if ($recordId) { - // [Interpretation 8931] The record has been set. Check the record permissions. + // [Interpretation 9157] 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 ($user->authorise('sermon.edit.own', 'com_sermondistributor.sermon.' . $recordId)) { - // [Interpretation 8953] Fallback on edit.own. Now test the owner is the user. + // [Interpretation 9179] Fallback on edit.own. Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; if (empty($ownerId)) { - // [Interpretation 8957] Need to do a lookup from the model. + // [Interpretation 9183] Need to do a lookup from the model. $record = $this->getModel()->getItem($recordId); if (empty($record)) @@ -135,7 +135,7 @@ class SermondistributorControllerSermon extends JControllerForm $ownerId = $record->created_by; } - // [Interpretation 8965] If the owner matches 'me' then do the test. + // [Interpretation 9191] If the owner matches 'me' then do the test. if ($ownerId == $user->id) { if ($user->authorise('sermon.edit.own', 'com_sermondistributor')) @@ -151,7 +151,7 @@ class SermondistributorControllerSermon extends JControllerForm if ($categoryId) { - // [Interpretation 8987] The category has been set. Check the category permissions. + // [Interpretation 9213] The category has been set. Check the category permissions. $catpermission = $user->authorise('core.edit', $this->option . '.sermons.category.' . $categoryId); if (!$catpermission && !is_null($catpermission)) { @@ -159,7 +159,7 @@ class SermondistributorControllerSermon extends JControllerForm } } } - // [Interpretation 8997] Since there is no permission, revert to the component permissions. + // [Interpretation 9223] 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 3bc62e70..67046c1b 100644 --- a/admin/controllers/sermondistributor.php +++ b/admin/controllers/sermondistributor.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php diff --git a/admin/controllers/sermons.php b/admin/controllers/sermons.php index f638cce5..82e8b912 100644 --- a/admin/controllers/sermons.php +++ b/admin/controllers/sermons.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons.php @@ -48,29 +48,29 @@ class SermondistributorControllerSermons extends JControllerAdmin public function exportData() { - // [Interpretation 6800] Check for request forgeries + // [Interpretation 7013] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [Interpretation 6802] check if export is allowed for this user. + // [Interpretation 7015] check if export is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('sermon.export', 'com_sermondistributor') && $user->authorise('core.export', 'com_sermondistributor')) { - // [Interpretation 6806] Get the input + // [Interpretation 7019] Get the input $input = JFactory::getApplication()->input; $pks = $input->post->get('cid', array(), 'array'); - // [Interpretation 6809] Sanitize the input + // [Interpretation 7022] Sanitize the input JArrayHelper::toInteger($pks); - // [Interpretation 6811] Get the model + // [Interpretation 7024] Get the model $model = $this->getModel('Sermons'); - // [Interpretation 6813] get the data to export + // [Interpretation 7026] get the data to export $data = $model->getExportData($pks); if (SermondistributorHelper::checkArray($data)) { - // [Interpretation 6817] now set the data to the spreadsheet + // [Interpretation 7030] now set the data to the spreadsheet $date = JFactory::getDate(); SermondistributorHelper::xls($data,'Sermons_'.$date->format('jS_F_Y'),'Sermons exported ('.$date->format('jS F, Y').')','sermons'); } } - // [Interpretation 6822] Redirect to the list screen with error. + // [Interpretation 7035] Redirect to the list screen with error. $message = JText::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=sermons', false), $message, 'error'); return; @@ -79,31 +79,31 @@ class SermondistributorControllerSermons extends JControllerAdmin public function importData() { - // [Interpretation 6831] Check for request forgeries + // [Interpretation 7044] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [Interpretation 6833] check if import is allowed for this user. + // [Interpretation 7046] check if import is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('sermon.import', 'com_sermondistributor') && $user->authorise('core.import', 'com_sermondistributor')) { - // [Interpretation 6837] Get the import model + // [Interpretation 7050] Get the import model $model = $this->getModel('Sermons'); - // [Interpretation 6839] get the headers to import + // [Interpretation 7052] get the headers to import $headers = $model->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { - // [Interpretation 6843] Load headers to session. + // [Interpretation 7056] Load headers to session. $session = JFactory::getSession(); $headers = json_encode($headers); $session->set('sermon_VDM_IMPORTHEADERS', $headers); $session->set('backto_VDM_IMPORT', 'sermons'); $session->set('dataType_VDM_IMPORTINTO', 'sermon'); - // [Interpretation 6849] Redirect to import view. + // [Interpretation 7062] Redirect to import view. $message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_SERMONS'); $this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=import', false), $message); return; } } - // [Interpretation 6869] Redirect to the list screen with error. + // [Interpretation 7082] Redirect to the list screen with error. $message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=sermons', false), $message, 'error'); return; diff --git a/admin/controllers/statistic.php b/admin/controllers/statistic.php index 7b978b73..b55a718c 100644 --- a/admin/controllers/statistic.php +++ b/admin/controllers/statistic.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage statistic.php @@ -60,13 +60,13 @@ class SermondistributorControllerStatistic extends JControllerForm */ protected function allowAdd($data = array()) { - // [Interpretation 8855] Access check. + // [Interpretation 9081] Access check. $access = JFactory::getUser()->authorise('statistic.access', 'com_sermondistributor'); if (!$access) { return false; } - // [Interpretation 8866] In the absense of better information, revert to the component permissions. + // [Interpretation 9092] In the absense of better information, revert to the component permissions. return JFactory::getUser()->authorise('statistic.create', $this->option); } @@ -82,13 +82,13 @@ class SermondistributorControllerStatistic extends JControllerForm */ protected function allowEdit($data = array(), $key = 'id') { - // [Interpretation 9009] get user object. + // [Interpretation 9235] get user object. $user = JFactory::getUser(); - // [Interpretation 9011] get record id. + // [Interpretation 9237] get record id. $recordId = (int) isset($data[$key]) ? $data[$key] : 0; - // [Interpretation 9018] Access check. + // [Interpretation 9244] Access check. $access = ($user->authorise('statistic.access', 'com_sermondistributor.statistic.' . (int) $recordId) && $user->authorise('statistic.access', 'com_sermondistributor')); if (!$access) { @@ -97,17 +97,17 @@ class SermondistributorControllerStatistic extends JControllerForm if ($recordId) { - // [Interpretation 9027] The record has been set. Check the record permissions. + // [Interpretation 9253] 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 ($user->authorise('statistic.edit.own', 'com_sermondistributor.statistic.' . $recordId)) { - // [Interpretation 9049] Now test the owner is the user. + // [Interpretation 9275] Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; if (empty($ownerId)) { - // [Interpretation 9053] Need to do a lookup from the model. + // [Interpretation 9279] Need to do a lookup from the model. $record = $this->getModel()->getItem($recordId); if (empty($record)) @@ -117,7 +117,7 @@ class SermondistributorControllerStatistic extends JControllerForm $ownerId = $record->created_by; } - // [Interpretation 9061] If the owner matches 'me' then allow. + // [Interpretation 9287] If the owner matches 'me' then allow. if ($ownerId == $user->id) { if ($user->authorise('statistic.edit.own', 'com_sermondistributor')) @@ -129,7 +129,7 @@ class SermondistributorControllerStatistic extends JControllerForm return false; } } - // [Interpretation 9083] Since there is no permission, revert to the component permissions. + // [Interpretation 9309] Since there is no permission, revert to the component permissions. return $user->authorise('statistic.edit', $this->option); } diff --git a/admin/controllers/statistics.php b/admin/controllers/statistics.php index 87ca9678..d8fd8299 100644 --- a/admin/controllers/statistics.php +++ b/admin/controllers/statistics.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage statistics.php @@ -48,29 +48,29 @@ class SermondistributorControllerStatistics extends JControllerAdmin public function exportData() { - // [Interpretation 6800] Check for request forgeries + // [Interpretation 7013] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [Interpretation 6802] check if export is allowed for this user. + // [Interpretation 7015] check if export is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('statistic.export', 'com_sermondistributor') && $user->authorise('core.export', 'com_sermondistributor')) { - // [Interpretation 6806] Get the input + // [Interpretation 7019] Get the input $input = JFactory::getApplication()->input; $pks = $input->post->get('cid', array(), 'array'); - // [Interpretation 6809] Sanitize the input + // [Interpretation 7022] Sanitize the input JArrayHelper::toInteger($pks); - // [Interpretation 6811] Get the model + // [Interpretation 7024] Get the model $model = $this->getModel('Statistics'); - // [Interpretation 6813] get the data to export + // [Interpretation 7026] get the data to export $data = $model->getExportData($pks); if (SermondistributorHelper::checkArray($data)) { - // [Interpretation 6817] now set the data to the spreadsheet + // [Interpretation 7030] now set the data to the spreadsheet $date = JFactory::getDate(); SermondistributorHelper::xls($data,'Statistics_'.$date->format('jS_F_Y'),'Statistics exported ('.$date->format('jS F, Y').')','statistics'); } } - // [Interpretation 6822] Redirect to the list screen with error. + // [Interpretation 7035] Redirect to the list screen with error. $message = JText::_('COM_SERMONDISTRIBUTOR_EXPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=statistics', false), $message, 'error'); return; @@ -79,31 +79,31 @@ class SermondistributorControllerStatistics extends JControllerAdmin public function importData() { - // [Interpretation 6831] Check for request forgeries + // [Interpretation 7044] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [Interpretation 6833] check if import is allowed for this user. + // [Interpretation 7046] check if import is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('statistic.import', 'com_sermondistributor') && $user->authorise('core.import', 'com_sermondistributor')) { - // [Interpretation 6837] Get the import model + // [Interpretation 7050] Get the import model $model = $this->getModel('Statistics'); - // [Interpretation 6839] get the headers to import + // [Interpretation 7052] get the headers to import $headers = $model->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { - // [Interpretation 6843] Load headers to session. + // [Interpretation 7056] Load headers to session. $session = JFactory::getSession(); $headers = json_encode($headers); $session->set('statistic_VDM_IMPORTHEADERS', $headers); $session->set('backto_VDM_IMPORT', 'statistics'); $session->set('dataType_VDM_IMPORTINTO', 'statistic'); - // [Interpretation 6849] Redirect to import view. + // [Interpretation 7062] Redirect to import view. $message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_SELECT_FILE_FOR_STATISTICS'); $this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=import', false), $message); return; } } - // [Interpretation 6869] Redirect to the list screen with error. + // [Interpretation 7082] Redirect to the list screen with error. $message = JText::_('COM_SERMONDISTRIBUTOR_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view=statistics', false), $message, 'error'); return; diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 0c301e91..0bcbf1b8 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage batch_.php diff --git a/admin/helpers/sermondistributor.php b/admin/helpers/sermondistributor.php index b79aeb32..22658f30 100644 --- a/admin/helpers/sermondistributor.php +++ b/admin/helpers/sermondistributor.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php @@ -919,9 +919,15 @@ abstract class SermondistributorHelper $db = JFactory::getDbo(); // Create a new query object. $query = $db->getQuery(true); - $query->select($db->quoteName(array($what))); - $query->from($db->quoteName('#__'.$main.'_'.$table)); + if (empty($table)) + { + $query->from($db->quoteName('#__'.$main)); + } + else + { + $query->from($db->quoteName('#__'.$main.'_'.$table)); + } if (is_numeric($where)) { $query->where($db->quoteName($whereString) . ' '.$operator.' '.(int) $where); diff --git a/admin/language/en-GB/en-GB.com_sermondistributor.ini b/admin/language/en-GB/en-GB.com_sermondistributor.ini index a8c50c08..b82350c5 100644 --- a/admin/language/en-GB/en-GB.com_sermondistributor.ini +++ b/admin/language/en-GB/en-GB.com_sermondistributor.ini @@ -754,10 +754,10 @@ COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ARTICLE="Article" COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ARTICLE_LABEL="Article" COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_CONTENT="Content" COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_CONTENT_LABEL="Content" -COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_CREATED_BY_DESC="The user that created the Help Document." -COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_CREATED_BY_LABEL="Created by" -COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_CREATED_DATE_DESC="The date Help Document was created." -COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_CREATED_DATE_LABEL="Created date" +COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_CREATED_BY_DESC="The user that created this Help Document." +COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_CREATED_BY_LABEL="Created By" +COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_CREATED_DATE_DESC="The date this Help Document was created." +COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_CREATED_DATE_LABEL="Created Date" COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_DETAILS="Details" COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_EDIT="Editing the Help Document" COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ERROR_UNIQUE_ALIAS="Another Help Document has the same alias." @@ -769,6 +769,10 @@ COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_JOOMLA_ARTICLE="Joomla Article" COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_LOCATION="Location" COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_LOCATION_DESCRIPTION="Select the help target location." COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_LOCATION_LABEL="Location" +COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_MODIFIED_BY_DESC="The last user that modified this Help Document." +COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_MODIFIED_BY_LABEL="Modified By" +COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_MODIFIED_DATE_DESC="The date this Help Document was modified." +COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_MODIFIED_DATE_LABEL="Modified Date" COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_NEW="A New Help Document" COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_NOT_REQUIRED="Not Required" COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ORDERING_LABEL="Ordering" @@ -906,10 +910,10 @@ COM_SERMONDISTRIBUTOR_PREACHER_ACCESS_SITE_DESC=" Allows the users in this group COM_SERMONDISTRIBUTOR_PREACHER_ALIAS="Alias" COM_SERMONDISTRIBUTOR_PREACHER_ALIAS_HINT="Auto-generated from name" COM_SERMONDISTRIBUTOR_PREACHER_ALIAS_LABEL="Alias" -COM_SERMONDISTRIBUTOR_PREACHER_CREATED_BY_DESC="The user that created the Preacher." -COM_SERMONDISTRIBUTOR_PREACHER_CREATED_BY_LABEL="Created by" -COM_SERMONDISTRIBUTOR_PREACHER_CREATED_DATE_DESC="The date Preacher was created." -COM_SERMONDISTRIBUTOR_PREACHER_CREATED_DATE_LABEL="Created date" +COM_SERMONDISTRIBUTOR_PREACHER_CREATED_BY_DESC="The user that created this Preacher." +COM_SERMONDISTRIBUTOR_PREACHER_CREATED_BY_LABEL="Created By" +COM_SERMONDISTRIBUTOR_PREACHER_CREATED_DATE_DESC="The date this Preacher was created." +COM_SERMONDISTRIBUTOR_PREACHER_CREATED_DATE_LABEL="Created Date" COM_SERMONDISTRIBUTOR_PREACHER_DESCRIPTION="Description" COM_SERMONDISTRIBUTOR_PREACHER_DESCRIPTION_LABEL="Description" COM_SERMONDISTRIBUTOR_PREACHER_DETAILS="Details" @@ -923,6 +927,10 @@ COM_SERMONDISTRIBUTOR_PREACHER_ICON="Icon" COM_SERMONDISTRIBUTOR_PREACHER_ICON_DESCRIPTION="Must be 358px x 358px" COM_SERMONDISTRIBUTOR_PREACHER_ICON_LABEL="Icon" COM_SERMONDISTRIBUTOR_PREACHER_ID="Id" +COM_SERMONDISTRIBUTOR_PREACHER_MODIFIED_BY_DESC="The last user that modified this Preacher." +COM_SERMONDISTRIBUTOR_PREACHER_MODIFIED_BY_LABEL="Modified By" +COM_SERMONDISTRIBUTOR_PREACHER_MODIFIED_DATE_DESC="The date this Preacher was modified." +COM_SERMONDISTRIBUTOR_PREACHER_MODIFIED_DATE_LABEL="Modified Date" COM_SERMONDISTRIBUTOR_PREACHER_NAME="Name" COM_SERMONDISTRIBUTOR_PREACHER_NAME_DESCRIPTION="Enter Name Here" COM_SERMONDISTRIBUTOR_PREACHER_NAME_HINT="Name Here" @@ -948,10 +956,10 @@ COM_SERMONDISTRIBUTOR_SERIES_ACCESS_SITE_DESC=" Allows the users in this group t COM_SERMONDISTRIBUTOR_SERIES_ALIAS="Alias" COM_SERMONDISTRIBUTOR_SERIES_ALIAS_HINT="Auto-generated from name" COM_SERMONDISTRIBUTOR_SERIES_ALIAS_LABEL="Alias" -COM_SERMONDISTRIBUTOR_SERIES_CREATED_BY_DESC="The user that created the Series." -COM_SERMONDISTRIBUTOR_SERIES_CREATED_BY_LABEL="Created by" -COM_SERMONDISTRIBUTOR_SERIES_CREATED_DATE_DESC="The date Series was created." -COM_SERMONDISTRIBUTOR_SERIES_CREATED_DATE_LABEL="Created date" +COM_SERMONDISTRIBUTOR_SERIES_CREATED_BY_DESC="The user that created this Series." +COM_SERMONDISTRIBUTOR_SERIES_CREATED_BY_LABEL="Created By" +COM_SERMONDISTRIBUTOR_SERIES_CREATED_DATE_DESC="The date this Series was created." +COM_SERMONDISTRIBUTOR_SERIES_CREATED_DATE_LABEL="Created Date" COM_SERMONDISTRIBUTOR_SERIES_DESCRIPTION="Description" COM_SERMONDISTRIBUTOR_SERIES_DESCRIPTION_LABEL="Description" COM_SERMONDISTRIBUTOR_SERIES_DETAILS="Details" @@ -1013,6 +1021,10 @@ COM_SERMONDISTRIBUTOR_SERIES_LIST_N_ITEMS_UNPUBLISHED="%s Series List unpublishe COM_SERMONDISTRIBUTOR_SERIES_LIST_N_ITEMS_UNPUBLISHED_1="%s Series unpublished." COM_SERMONDISTRIBUTOR_SERIES_LIST_SUBMENU="Series List Submenu" COM_SERMONDISTRIBUTOR_SERIES_LIST_SUBMENU_DESC="Allows the users in this group to update the submenu of the series" +COM_SERMONDISTRIBUTOR_SERIES_MODIFIED_BY_DESC="The last user that modified this Series." +COM_SERMONDISTRIBUTOR_SERIES_MODIFIED_BY_LABEL="Modified By" +COM_SERMONDISTRIBUTOR_SERIES_MODIFIED_DATE_DESC="The date this Series was modified." +COM_SERMONDISTRIBUTOR_SERIES_MODIFIED_DATE_LABEL="Modified Date" COM_SERMONDISTRIBUTOR_SERIES_NAME="Name" COM_SERMONDISTRIBUTOR_SERIES_NAME_DESCRIPTION="Enter Name Here" COM_SERMONDISTRIBUTOR_SERIES_NAME_HINT="Name Here" @@ -1093,10 +1105,10 @@ COM_SERMONDISTRIBUTOR_SERMON_BUILD_DESCRIPTION="Set the method used to add files COM_SERMONDISTRIBUTOR_SERMON_BUILD_LABEL="Build Option" COM_SERMONDISTRIBUTOR_SERMON_CATID_DESCRIPTION="select one of the following categories" COM_SERMONDISTRIBUTOR_SERMON_CATID_LABEL="Category" -COM_SERMONDISTRIBUTOR_SERMON_CREATED_BY_DESC="The user that created the Sermon." -COM_SERMONDISTRIBUTOR_SERMON_CREATED_BY_LABEL="Created by" -COM_SERMONDISTRIBUTOR_SERMON_CREATED_DATE_DESC="The date Sermon was created." -COM_SERMONDISTRIBUTOR_SERMON_CREATED_DATE_LABEL="Created date" +COM_SERMONDISTRIBUTOR_SERMON_CREATED_BY_DESC="The user that created this Sermon." +COM_SERMONDISTRIBUTOR_SERMON_CREATED_BY_LABEL="Created By" +COM_SERMONDISTRIBUTOR_SERMON_CREATED_DATE_DESC="The date this Sermon was created." +COM_SERMONDISTRIBUTOR_SERMON_CREATED_DATE_LABEL="Created Date" COM_SERMONDISTRIBUTOR_SERMON_DESCRIPTION="Description" COM_SERMONDISTRIBUTOR_SERMON_DESCRIPTION_LABEL="Description" COM_SERMONDISTRIBUTOR_SERMON_DETAILS="Details" @@ -1121,6 +1133,10 @@ COM_SERMONDISTRIBUTOR_SERMON_MANUAL="Manual" COM_SERMONDISTRIBUTOR_SERMON_MANUAL_FILES="Manual Files" COM_SERMONDISTRIBUTOR_SERMON_MANUAL_FILES_DESCRIPTION="Select the files you would like to add to this sermon." COM_SERMONDISTRIBUTOR_SERMON_MANUAL_FILES_LABEL="Files" +COM_SERMONDISTRIBUTOR_SERMON_MODIFIED_BY_DESC="The last user that modified this Sermon." +COM_SERMONDISTRIBUTOR_SERMON_MODIFIED_BY_LABEL="Modified By" +COM_SERMONDISTRIBUTOR_SERMON_MODIFIED_DATE_DESC="The date this Sermon was modified." +COM_SERMONDISTRIBUTOR_SERMON_MODIFIED_DATE_LABEL="Modified Date" COM_SERMONDISTRIBUTOR_SERMON_NAME="Name" COM_SERMONDISTRIBUTOR_SERMON_NAME_DESCRIPTION="Enter Name Here" COM_SERMONDISTRIBUTOR_SERMON_NAME_HINT="Name Here" @@ -1298,10 +1314,10 @@ COM_SERMONDISTRIBUTOR_STATISTIC_COUNTER="Counter" COM_SERMONDISTRIBUTOR_STATISTIC_COUNTER_DESCRIPTION="Enter number." COM_SERMONDISTRIBUTOR_STATISTIC_COUNTER_HINT="Number Here." COM_SERMONDISTRIBUTOR_STATISTIC_COUNTER_LABEL="Counter" -COM_SERMONDISTRIBUTOR_STATISTIC_CREATED_BY_DESC="The user that created the Statistic." -COM_SERMONDISTRIBUTOR_STATISTIC_CREATED_BY_LABEL="Created by" -COM_SERMONDISTRIBUTOR_STATISTIC_CREATED_DATE_DESC="The date Statistic was created." -COM_SERMONDISTRIBUTOR_STATISTIC_CREATED_DATE_LABEL="Created date" +COM_SERMONDISTRIBUTOR_STATISTIC_CREATED_BY_DESC="The user that created this Statistic." +COM_SERMONDISTRIBUTOR_STATISTIC_CREATED_BY_LABEL="Created By" +COM_SERMONDISTRIBUTOR_STATISTIC_CREATED_DATE_DESC="The date this Statistic was created." +COM_SERMONDISTRIBUTOR_STATISTIC_CREATED_DATE_LABEL="Created Date" COM_SERMONDISTRIBUTOR_STATISTIC_DETAILS="Details" COM_SERMONDISTRIBUTOR_STATISTIC_EDIT="Editing the Statistic" COM_SERMONDISTRIBUTOR_STATISTIC_ERROR_UNIQUE_ALIAS="Another Statistic has the same alias." @@ -1310,6 +1326,10 @@ COM_SERMONDISTRIBUTOR_STATISTIC_FILENAME_DESCRIPTION="Enter the file name." COM_SERMONDISTRIBUTOR_STATISTIC_FILENAME_HINT="the_file_name.mp3" COM_SERMONDISTRIBUTOR_STATISTIC_FILENAME_LABEL="File Name" COM_SERMONDISTRIBUTOR_STATISTIC_ID="Id" +COM_SERMONDISTRIBUTOR_STATISTIC_MODIFIED_BY_DESC="The last user that modified this Statistic." +COM_SERMONDISTRIBUTOR_STATISTIC_MODIFIED_BY_LABEL="Modified By" +COM_SERMONDISTRIBUTOR_STATISTIC_MODIFIED_DATE_DESC="The date this Statistic was modified." +COM_SERMONDISTRIBUTOR_STATISTIC_MODIFIED_DATE_LABEL="Modified Date" COM_SERMONDISTRIBUTOR_STATISTIC_NEW="A New Statistic" COM_SERMONDISTRIBUTOR_STATISTIC_ORDERING_LABEL="Ordering" COM_SERMONDISTRIBUTOR_STATISTIC_PERMISSION="Permissions" diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 90206802..c66f2480 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage batchselection.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index 0d4d05cb..ed1df403 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 b49a84c9..4115ff1d 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 ff32d940..882ad423 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 ce5441b0..f79d38e7 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 e7e75f6d..44605afb 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 cccfd419..ffc14078 100644 --- a/admin/layouts/help_document/metadata.php +++ b/admin/layouts/help_document/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 898a1286..a135fb12 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/layouts/preacher/details_above.php b/admin/layouts/preacher/details_above.php index 59f95f79..30f94efc 100644 --- a/admin/layouts/preacher/details_above.php +++ b/admin/layouts/preacher/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 aba2deec..4e127af5 100644 --- a/admin/layouts/preacher/details_fullwidth.php +++ b/admin/layouts/preacher/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 185cf8ed..152ed944 100644 --- a/admin/layouts/preacher/details_left.php +++ b/admin/layouts/preacher/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 f3d45fae..5b9af6e4 100644 --- a/admin/layouts/preacher/details_right.php +++ b/admin/layouts/preacher/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 cccfd419..ffc14078 100644 --- a/admin/layouts/preacher/metadata.php +++ b/admin/layouts/preacher/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 898a1286..a135fb12 100644 --- a/admin/layouts/preacher/publishing.php +++ b/admin/layouts/preacher/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 7aeed496..1f62f3a7 100644 --- a/admin/layouts/preacher/sermons_fullwidth.php +++ b/admin/layouts/preacher/sermons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 59f95f79..30f94efc 100644 --- a/admin/layouts/series/details_above.php +++ b/admin/layouts/series/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 aba2deec..4e127af5 100644 --- a/admin/layouts/series/details_fullwidth.php +++ b/admin/layouts/series/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 185cf8ed..152ed944 100644 --- a/admin/layouts/series/details_left.php +++ b/admin/layouts/series/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 bf5c194a..9f9884ae 100644 --- a/admin/layouts/series/details_right.php +++ b/admin/layouts/series/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 cccfd419..ffc14078 100644 --- a/admin/layouts/series/metadata.php +++ b/admin/layouts/series/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 898a1286..a135fb12 100644 --- a/admin/layouts/series/publishing.php +++ b/admin/layouts/series/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 1940f75b..87e3d366 100644 --- a/admin/layouts/series/sermons_fullwidth.php +++ b/admin/layouts/series/sermons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 3aeba862..b1ec5c2c 100644 --- a/admin/layouts/sermon/details_above.php +++ b/admin/layouts/sermon/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 aba2deec..4e127af5 100644 --- a/admin/layouts/sermon/details_fullwidth.php +++ b/admin/layouts/sermon/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 678f1eb1..bcd7bc93 100644 --- a/admin/layouts/sermon/details_left.php +++ b/admin/layouts/sermon/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 b83e4df6..d80aec9b 100644 --- a/admin/layouts/sermon/details_right.php +++ b/admin/layouts/sermon/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 1cd5ff2a..68c4b4e9 100644 --- a/admin/layouts/sermon/details_under.php +++ b/admin/layouts/sermon/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 a7471787..956da50a 100644 --- a/admin/layouts/sermon/files_fullwidth.php +++ b/admin/layouts/sermon/files_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 cccfd419..ffc14078 100644 --- a/admin/layouts/sermon/metadata.php +++ b/admin/layouts/sermon/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 898a1286..a135fb12 100644 --- a/admin/layouts/sermon/publishing.php +++ b/admin/layouts/sermon/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 0c8c506c..118ab3b6 100644 --- a/admin/layouts/sermon/stastics_fullwidth.php +++ b/admin/layouts/sermon/stastics_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 24e4b6f7..99817ace 100644 --- a/admin/layouts/statistic/details_above.php +++ b/admin/layouts/statistic/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 5f92f847..1ff883a6 100644 --- a/admin/layouts/statistic/details_left.php +++ b/admin/layouts/statistic/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 1a53617d..69b5a562 100644 --- a/admin/layouts/statistic/details_right.php +++ b/admin/layouts/statistic/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 cccfd419..ffc14078 100644 --- a/admin/layouts/statistic/metadata.php +++ b/admin/layouts/statistic/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 898a1286..a135fb12 100644 --- a/admin/layouts/statistic/publishing.php +++ b/admin/layouts/statistic/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 416f9b65..ace595ac 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage ajax.php @@ -43,7 +43,7 @@ class SermondistributorModelAjax extends JModelList } - // [Interpretation 8452] Used in sermon + // [Interpretation 8673] Used in sermon /** * Check and Set Dropbox local listing **/ diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index a86ab0ca..d727e4d4 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage articles.php @@ -50,48 +50,58 @@ class JFormFieldArticles extends JFormFieldList */ protected function getInput() { - // [Interpretation 7157] see if we should add buttons + // [Interpretation 7370] see if we should add buttons $setButton = $this->getAttribute('button'); - // [Interpretation 7159] get html + // [Interpretation 7372] get html $html = parent::getInput(); - // [Interpretation 7161] if true set button + // [Interpretation 7374] if true set button if ($setButton === 'true') { $button = array(); $script = array(); $buttonName = $this->getAttribute('name'); - // [Interpretation 7167] get the input from url + // [Interpretation 7380] get the input from url $jinput = JFactory::getApplication()->input; - // [Interpretation 7169] get the view name & id + // [Interpretation 7382] get the view name & id $values = $jinput->getArray(array( 'id' => 'int', 'view' => 'word' )); - // [Interpretation 7174] check if new item + // [Interpretation 7387] check if new item $ref = ''; $refJ = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // [Interpretation 7179] only load referal if not new item. + // [Interpretation 7392] only load referal if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; } $user = JFactory::getUser(); - // [Interpretation 7184] only add if user allowed to create article + // [Interpretation 7397] only add if user allowed to create article if ($user->authorise('core.create', 'com_sermondistributor')) { - // [Interpretation 7202] build Create button - $button[] = ' '; } - // [Interpretation 7207] only add if user allowed to edit article + // [Interpretation 7425] only add if user allowed to edit article if (($buttonName == 'article' || $buttonName == 'articles') && $user->authorise('core.edit', 'com_sermondistributor')) { - // [Interpretation 7218] build edit button - $button[] = ' + // [Interpretation 7436] build edit button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ' '; - // [Interpretation 7221] build script + // [Interpretation 7444] build script $script[] = " jQuery(document).ready(function() { jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { @@ -118,18 +128,18 @@ class JFormFieldArticles extends JFormFieldList } }"; } - // [Interpretation 7248] check if button was created for article field. - if (SermondistributorHelper::checkArray($button)) + // [Interpretation 7471] check if button was created for article field. + if (is_array($button) && count($button) > 0) { - // [Interpretation 7251] Add some final script + // [Interpretation 7474] Add some final script $script[] = " jQuery(document).ready(function() { jQuery('#jform_".$buttonName."').closest('.control-group').addClass('input-append'); });"; - // [Interpretation 7256] Load the needed script. + // [Interpretation 7479] Load the needed script. $document = JFactory::getDocument(); $document->addScriptDeclaration(implode(' ',$script)); - // [Interpretation 7259] return the button attached to input field. + // [Interpretation 7482] return the button attached to input field. return $html . implode('',$button); } } diff --git a/admin/models/fields/dropboxfiles.php b/admin/models/fields/dropboxfiles.php index f1fa25e9..c8c86379 100644 --- a/admin/models/fields/dropboxfiles.php +++ b/admin/models/fields/dropboxfiles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage dropboxfiles.php @@ -50,48 +50,58 @@ class JFormFieldDropboxfiles extends JFormFieldList */ protected function getInput() { - // [Interpretation 7157] see if we should add buttons + // [Interpretation 7370] see if we should add buttons $setButton = $this->getAttribute('button'); - // [Interpretation 7159] get html + // [Interpretation 7372] get html $html = parent::getInput(); - // [Interpretation 7161] if true set button + // [Interpretation 7374] if true set button if ($setButton === 'true') { $button = array(); $script = array(); $buttonName = $this->getAttribute('name'); - // [Interpretation 7167] get the input from url + // [Interpretation 7380] get the input from url $jinput = JFactory::getApplication()->input; - // [Interpretation 7169] get the view name & id + // [Interpretation 7382] get the view name & id $values = $jinput->getArray(array( 'id' => 'int', 'view' => 'word' )); - // [Interpretation 7174] check if new item + // [Interpretation 7387] check if new item $ref = ''; $refJ = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // [Interpretation 7179] only load referal if not new item. + // [Interpretation 7392] only load referal if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; } $user = JFactory::getUser(); - // [Interpretation 7184] only add if user allowed to create + // [Interpretation 7397] only add if user allowed to create if ($user->authorise('core.create', 'com_sermondistributor')) { - // [Interpretation 7202] build Create button - $button[] = ' '; } - // [Interpretation 7207] only add if user allowed to edit + // [Interpretation 7425] only add if user allowed to edit if (($buttonName == '' || $buttonName == '') && $user->authorise('core.edit', 'com_sermondistributor')) { - // [Interpretation 7218] build edit button - $button[] = ' + // [Interpretation 7436] build edit button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ' '; - // [Interpretation 7221] build script + // [Interpretation 7444] build script $script[] = " jQuery(document).ready(function() { jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { @@ -118,18 +128,18 @@ class JFormFieldDropboxfiles extends JFormFieldList } }"; } - // [Interpretation 7248] check if button was created for field. - if (SermondistributorHelper::checkArray($button)) + // [Interpretation 7471] check if button was created for field. + if (is_array($button) && count($button) > 0) { - // [Interpretation 7251] Add some final script + // [Interpretation 7474] Add some final script $script[] = " jQuery(document).ready(function() { jQuery('#jform_".$buttonName."').closest('.control-group').addClass('input-append'); });"; - // [Interpretation 7256] Load the needed script. + // [Interpretation 7479] Load the needed script. $document = JFactory::getDocument(); $document->addScriptDeclaration(implode(' ',$script)); - // [Interpretation 7259] return the button attached to input field. + // [Interpretation 7482] return the button attached to input field. return $html . implode('',$button); } } diff --git a/admin/models/fields/localfiles.php b/admin/models/fields/localfiles.php index 63fcc98d..e0216ca0 100644 --- a/admin/models/fields/localfiles.php +++ b/admin/models/fields/localfiles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage localfiles.php @@ -50,48 +50,58 @@ class JFormFieldLocalfiles extends JFormFieldList */ protected function getInput() { - // [Interpretation 7157] see if we should add buttons + // [Interpretation 7370] see if we should add buttons $setButton = $this->getAttribute('button'); - // [Interpretation 7159] get html + // [Interpretation 7372] get html $html = parent::getInput(); - // [Interpretation 7161] if true set button + // [Interpretation 7374] if true set button if ($setButton === 'true') { $button = array(); $script = array(); $buttonName = $this->getAttribute('name'); - // [Interpretation 7167] get the input from url + // [Interpretation 7380] get the input from url $jinput = JFactory::getApplication()->input; - // [Interpretation 7169] get the view name & id + // [Interpretation 7382] get the view name & id $values = $jinput->getArray(array( 'id' => 'int', 'view' => 'word' )); - // [Interpretation 7174] check if new item + // [Interpretation 7387] check if new item $ref = ''; $refJ = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // [Interpretation 7179] only load referal if not new item. + // [Interpretation 7392] only load referal if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; } $user = JFactory::getUser(); - // [Interpretation 7184] only add if user allowed to create + // [Interpretation 7397] only add if user allowed to create if ($user->authorise('core.create', 'com_sermondistributor')) { - // [Interpretation 7202] build Create button - $button[] = ' '; } - // [Interpretation 7207] only add if user allowed to edit + // [Interpretation 7425] only add if user allowed to edit if (($buttonName == '' || $buttonName == '') && $user->authorise('core.edit', 'com_sermondistributor')) { - // [Interpretation 7218] build edit button - $button[] = ' + // [Interpretation 7436] build edit button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ' '; - // [Interpretation 7221] build script + // [Interpretation 7444] build script $script[] = " jQuery(document).ready(function() { jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { @@ -118,18 +128,18 @@ class JFormFieldLocalfiles extends JFormFieldList } }"; } - // [Interpretation 7248] check if button was created for field. - if (SermondistributorHelper::checkArray($button)) + // [Interpretation 7471] check if button was created for field. + if (is_array($button) && count($button) > 0) { - // [Interpretation 7251] Add some final script + // [Interpretation 7474] Add some final script $script[] = " jQuery(document).ready(function() { jQuery('#jform_".$buttonName."').closest('.control-group').addClass('input-append'); });"; - // [Interpretation 7256] Load the needed script. + // [Interpretation 7479] Load the needed script. $document = JFactory::getDocument(); $document->addScriptDeclaration(implode(' ',$script)); - // [Interpretation 7259] return the button attached to input field. + // [Interpretation 7482] return the button attached to input field. return $html . implode('',$button); } } diff --git a/admin/models/fields/preachers.php b/admin/models/fields/preachers.php index 1d9e4823..12e311e7 100644 --- a/admin/models/fields/preachers.php +++ b/admin/models/fields/preachers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.php @@ -50,48 +50,58 @@ class JFormFieldPreachers extends JFormFieldList */ protected function getInput() { - // [Interpretation 7157] see if we should add buttons + // [Interpretation 7370] see if we should add buttons $setButton = $this->getAttribute('button'); - // [Interpretation 7159] get html + // [Interpretation 7372] get html $html = parent::getInput(); - // [Interpretation 7161] if true set button + // [Interpretation 7374] if true set button if ($setButton === 'true') { $button = array(); $script = array(); $buttonName = $this->getAttribute('name'); - // [Interpretation 7167] get the input from url + // [Interpretation 7380] get the input from url $jinput = JFactory::getApplication()->input; - // [Interpretation 7169] get the view name & id + // [Interpretation 7382] get the view name & id $values = $jinput->getArray(array( 'id' => 'int', 'view' => 'word' )); - // [Interpretation 7174] check if new item + // [Interpretation 7387] check if new item $ref = ''; $refJ = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // [Interpretation 7179] only load referal if not new item. + // [Interpretation 7392] only load referal if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; } $user = JFactory::getUser(); - // [Interpretation 7184] only add if user allowed to create preacher + // [Interpretation 7397] only add if user allowed to create preacher if ($user->authorise('preacher.create', 'com_sermondistributor')) { - // [Interpretation 7202] build Create button - $button[] = ' '; } - // [Interpretation 7207] only add if user allowed to edit preacher + // [Interpretation 7425] only add if user allowed to edit preacher if (($buttonName == 'preacher' || $buttonName == 'preachers') && $user->authorise('preacher.edit', 'com_sermondistributor')) { - // [Interpretation 7218] build edit button - $button[] = ' + // [Interpretation 7436] build edit button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ' '; - // [Interpretation 7221] build script + // [Interpretation 7444] build script $script[] = " jQuery(document).ready(function() { jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { @@ -118,18 +128,18 @@ class JFormFieldPreachers extends JFormFieldList } }"; } - // [Interpretation 7248] check if button was created for preacher field. - if (SermondistributorHelper::checkArray($button)) + // [Interpretation 7471] check if button was created for preacher field. + if (is_array($button) && count($button) > 0) { - // [Interpretation 7251] Add some final script + // [Interpretation 7474] Add some final script $script[] = " jQuery(document).ready(function() { jQuery('#jform_".$buttonName."').closest('.control-group').addClass('input-append'); });"; - // [Interpretation 7256] Load the needed script. + // [Interpretation 7479] Load the needed script. $document = JFactory::getDocument(); $document->addScriptDeclaration(implode(' ',$script)); - // [Interpretation 7259] return the button attached to input field. + // [Interpretation 7482] return the button attached to input field. return $html . implode('',$button); } } diff --git a/admin/models/fields/series.php b/admin/models/fields/series.php index 0f962759..d3be2223 100644 --- a/admin/models/fields/series.php +++ b/admin/models/fields/series.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php @@ -50,48 +50,58 @@ class JFormFieldSeries extends JFormFieldList */ protected function getInput() { - // [Interpretation 7157] see if we should add buttons + // [Interpretation 7370] see if we should add buttons $setButton = $this->getAttribute('button'); - // [Interpretation 7159] get html + // [Interpretation 7372] get html $html = parent::getInput(); - // [Interpretation 7161] if true set button + // [Interpretation 7374] if true set button if ($setButton === 'true') { $button = array(); $script = array(); $buttonName = $this->getAttribute('name'); - // [Interpretation 7167] get the input from url + // [Interpretation 7380] get the input from url $jinput = JFactory::getApplication()->input; - // [Interpretation 7169] get the view name & id + // [Interpretation 7382] get the view name & id $values = $jinput->getArray(array( 'id' => 'int', 'view' => 'word' )); - // [Interpretation 7174] check if new item + // [Interpretation 7387] check if new item $ref = ''; $refJ = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // [Interpretation 7179] only load referal if not new item. + // [Interpretation 7392] only load referal if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; } $user = JFactory::getUser(); - // [Interpretation 7184] only add if user allowed to create series + // [Interpretation 7397] only add if user allowed to create series if ($user->authorise('series.create', 'com_sermondistributor')) { - // [Interpretation 7202] build Create button - $button[] = ' '; } - // [Interpretation 7207] only add if user allowed to edit series + // [Interpretation 7425] only add if user allowed to edit series if (($buttonName == 'series' || $buttonName == 'all_series') && $user->authorise('series.edit', 'com_sermondistributor')) { - // [Interpretation 7218] build edit button - $button[] = ' + // [Interpretation 7436] build edit button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ' '; - // [Interpretation 7221] build script + // [Interpretation 7444] build script $script[] = " jQuery(document).ready(function() { jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { @@ -118,18 +128,18 @@ class JFormFieldSeries extends JFormFieldList } }"; } - // [Interpretation 7248] check if button was created for series field. - if (SermondistributorHelper::checkArray($button)) + // [Interpretation 7471] check if button was created for series field. + if (is_array($button) && count($button) > 0) { - // [Interpretation 7251] Add some final script + // [Interpretation 7474] Add some final script $script[] = " jQuery(document).ready(function() { jQuery('#jform_".$buttonName."').closest('.control-group').addClass('input-append'); });"; - // [Interpretation 7256] Load the needed script. + // [Interpretation 7479] Load the needed script. $document = JFactory::getDocument(); $document->addScriptDeclaration(implode(' ',$script)); - // [Interpretation 7259] return the button attached to input field. + // [Interpretation 7482] return the button attached to input field. return $html . implode('',$button); } } diff --git a/admin/models/fields/sermon.php b/admin/models/fields/sermon.php index 1c6ca0ed..db486ef9 100644 --- a/admin/models/fields/sermon.php +++ b/admin/models/fields/sermon.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php @@ -50,48 +50,58 @@ class JFormFieldSermon extends JFormFieldList */ protected function getInput() { - // [Interpretation 7157] see if we should add buttons + // [Interpretation 7370] see if we should add buttons $setButton = $this->getAttribute('button'); - // [Interpretation 7159] get html + // [Interpretation 7372] get html $html = parent::getInput(); - // [Interpretation 7161] if true set button + // [Interpretation 7374] if true set button if ($setButton === 'true') { $button = array(); $script = array(); $buttonName = $this->getAttribute('name'); - // [Interpretation 7167] get the input from url + // [Interpretation 7380] get the input from url $jinput = JFactory::getApplication()->input; - // [Interpretation 7169] get the view name & id + // [Interpretation 7382] get the view name & id $values = $jinput->getArray(array( 'id' => 'int', 'view' => 'word' )); - // [Interpretation 7174] check if new item + // [Interpretation 7387] check if new item $ref = ''; $refJ = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // [Interpretation 7179] only load referal if not new item. + // [Interpretation 7392] only load referal if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; } $user = JFactory::getUser(); - // [Interpretation 7184] only add if user allowed to create sermon + // [Interpretation 7397] only add if user allowed to create sermon if ($user->authorise('sermon.create', 'com_sermondistributor')) { - // [Interpretation 7202] build Create button - $button[] = ' '; } - // [Interpretation 7207] only add if user allowed to edit sermon + // [Interpretation 7425] only add if user allowed to edit sermon if (($buttonName == 'sermon' || $buttonName == 'sermons') && $user->authorise('sermon.edit', 'com_sermondistributor')) { - // [Interpretation 7218] build edit button - $button[] = ' + // [Interpretation 7436] build edit button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ' '; - // [Interpretation 7221] build script + // [Interpretation 7444] build script $script[] = " jQuery(document).ready(function() { jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { @@ -118,18 +128,18 @@ class JFormFieldSermon extends JFormFieldList } }"; } - // [Interpretation 7248] check if button was created for sermon field. - if (SermondistributorHelper::checkArray($button)) + // [Interpretation 7471] check if button was created for sermon field. + if (is_array($button) && count($button) > 0) { - // [Interpretation 7251] Add some final script + // [Interpretation 7474] Add some final script $script[] = " jQuery(document).ready(function() { jQuery('#jform_".$buttonName."').closest('.control-group').addClass('input-append'); });"; - // [Interpretation 7256] Load the needed script. + // [Interpretation 7479] Load the needed script. $document = JFactory::getDocument(); $document->addScriptDeclaration(implode(' ',$script)); - // [Interpretation 7259] return the button attached to input field. + // [Interpretation 7482] return the button attached to input field. return $html . implode('',$button); } } diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index 01b645fc..88f9eb3a 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help_document.js @@ -53,7 +53,7 @@ jQuery(document).ready(function() // the vvvvvwe function function vvvvvwe(location_vvvvvwe) { - // [Interpretation 7534] set the function logic + // [Interpretation 7755] set the function logic if (location_vvvvvwe == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); @@ -67,7 +67,7 @@ function vvvvvwe(location_vvvvvwe) // the vvvvvwf function function vvvvvwf(location_vvvvvwf) { - // [Interpretation 7534] set the function logic + // [Interpretation 7755] set the function logic if (location_vvvvvwf == 2) { jQuery('#jform_site_view').closest('.control-group').show(); @@ -94,7 +94,7 @@ function vvvvvwg(type_vvvvvwg) var type = type_vvvvvwg.some(type_vvvvvwg_SomeFunc); - // [Interpretation 7512] set this function logic + // [Interpretation 7733] set this function logic if (type) { jQuery('#jform_url').closest('.control-group').show(); @@ -125,7 +125,7 @@ function vvvvvwg(type_vvvvvwg) // the vvvvvwg Some function function type_vvvvvwg_SomeFunc(type_vvvvvwg) { - // [Interpretation 7499] set the function logic + // [Interpretation 7720] set the function logic if (type_vvvvvwg == 3) { return true; @@ -149,7 +149,7 @@ function vvvvvwh(type_vvvvvwh) var type = type_vvvvvwh.some(type_vvvvvwh_SomeFunc); - // [Interpretation 7512] set this function logic + // [Interpretation 7733] set this function logic if (type) { jQuery('#jform_article').closest('.control-group').show(); @@ -180,7 +180,7 @@ function vvvvvwh(type_vvvvvwh) // the vvvvvwh Some function function type_vvvvvwh_SomeFunc(type_vvvvvwh) { - // [Interpretation 7499] set the function logic + // [Interpretation 7720] set the function logic if (type_vvvvvwh == 1) { return true; @@ -204,7 +204,7 @@ function vvvvvwi(type_vvvvvwi) var type = type_vvvvvwi.some(type_vvvvvwi_SomeFunc); - // [Interpretation 7512] set this function logic + // [Interpretation 7733] set this function logic if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); @@ -235,7 +235,7 @@ function vvvvvwi(type_vvvvvwi) // the vvvvvwi Some function function type_vvvvvwi_SomeFunc(type_vvvvvwi) { - // [Interpretation 7499] set the function logic + // [Interpretation 7720] set the function logic if (type_vvvvvwi == 2) { return true; @@ -246,7 +246,7 @@ function type_vvvvvwi_SomeFunc(type_vvvvvwi) // the vvvvvwj function function vvvvvwj(target_vvvvvwj) { - // [Interpretation 7534] set the function logic + // [Interpretation 7755] set the function logic if (target_vvvvvwj == 1) { jQuery('#jform_groups').closest('.control-group').show(); diff --git a/admin/models/forms/help_document.xml b/admin/models/forms/help_document.xml index d1b7560c..f746f04a 100644 --- a/admin/models/forms/help_document.xml +++ b/admin/models/forms/help_document.xml @@ -4,34 +4,37 @@ addfieldpath="/administrator/components/com_sermondistributor/models/fields" > - - + + - + - + - + JPUBLISHED @@ -42,26 +45,28 @@ JTRASHED - + - + - + - + - + - + - + - - + + - + - + COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_SELECT_AN_OPTION @@ -137,7 +143,7 @@ COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_URL - + - + - + COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ADMIN COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_SITE - + - + - + - + COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_SOME COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ALL - + - + - + - + - + - + - + JGLOBAL_INDEX_NOFOLLOW JGLOBAL_NOINDEX_NOFOLLOW - + - + - + - + - + - - + + - + - + - + JPUBLISHED @@ -42,26 +45,28 @@ JTRASHED - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + JGLOBAL_INDEX_NOFOLLOW JGLOBAL_NOINDEX_NOFOLLOW - + - + - + - + - + - - + + - + - + - + JPUBLISHED @@ -42,26 +45,28 @@ JTRASHED - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + JGLOBAL_INDEX_NOFOLLOW JGLOBAL_NOINDEX_NOFOLLOW - + - + - + - + - + - - + + - + - + - + JPUBLISHED @@ -42,26 +45,28 @@ JTRASHED - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + COM_SERMONDISTRIBUTOR_SERMON_ENCRYPTED COM_SERMONDISTRIBUTOR_SERMON_DIRECT - + - + COM_SERMONDISTRIBUTOR_SERMON_SELECT_SOURCE @@ -199,7 +205,7 @@ COM_SERMONDISTRIBUTOR_SERMON_URL - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + COM_SERMONDISTRIBUTOR_SERMON_MANUAL COM_SERMONDISTRIBUTOR_SERMON_AUTOMATIC - + - + - + JGLOBAL_INDEX_NOFOLLOW JGLOBAL_NOINDEX_NOFOLLOW - + - + - + - + - + - - + + - + - + - + JPUBLISHED @@ -42,26 +45,28 @@ JTRASHED - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + JGLOBAL_INDEX_NOFOLLOW JGLOBAL_NOINDEX_NOFOLLOW - + - + - + - + - + loadForm('com_sermondistributor.help_document', 'help_document', array('control' => 'jform', 'load_data' => $loadData)); if (empty($form)) @@ -132,12 +132,12 @@ class SermondistributorModelHelp_document extends JModelAdmin $jinput = JFactory::getApplication()->input; - // [Interpretation 9187] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first. + // [Interpretation 9413] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first. if ($jinput->get('a_id')) { $id = $jinput->get('a_id', 0, 'INT'); } - // [Interpretation 9192] The back end uses id so we use that the rest of the time and set it to 0 by default. + // [Interpretation 9418] The back end uses id so we use that the rest of the time and set it to 0 by default. else { $id = $jinput->get('id', 0, 'INT'); @@ -145,52 +145,52 @@ class SermondistributorModelHelp_document extends JModelAdmin $user = JFactory::getUser(); - // [Interpretation 9198] Check for existing item. - // [Interpretation 9199] Modify the form based on Edit State access controls. + // [Interpretation 9424] Check for existing item. + // [Interpretation 9425] Modify the form based on Edit State access controls. if ($id != 0 && (!$user->authorise('help_document.edit.state', 'com_sermondistributor.help_document.' . (int) $id)) || ($id == 0 && !$user->authorise('help_document.edit.state', 'com_sermondistributor'))) { - // [Interpretation 9212] Disable fields for display. + // [Interpretation 9438] Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); $form->setFieldAttribute('published', 'disabled', 'true'); - // [Interpretation 9215] Disable fields while saving. + // [Interpretation 9441] Disable fields while saving. $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } - // [Interpretation 9220] If this is a new item insure the greated by is set. + // [Interpretation 9446] If this is a new item insure the greated by is set. if (0 == $id) { - // [Interpretation 9223] Set the created_by to this user + // [Interpretation 9449] Set the created_by to this user $form->setValue('created_by', null, $user->id); } - // [Interpretation 9226] Modify the form based on Edit Creaded By access controls. + // [Interpretation 9452] Modify the form based on Edit Creaded By access controls. if (!$user->authorise('core.edit.created_by', 'com_sermondistributor')) { - // [Interpretation 9238] Disable fields for display. + // [Interpretation 9464] Disable fields for display. $form->setFieldAttribute('created_by', 'disabled', 'true'); - // [Interpretation 9240] Disable fields for display. + // [Interpretation 9466] Disable fields for display. $form->setFieldAttribute('created_by', 'readonly', 'true'); - // [Interpretation 9242] Disable fields while saving. + // [Interpretation 9468] Disable fields while saving. $form->setFieldAttribute('created_by', 'filter', 'unset'); } - // [Interpretation 9245] Modify the form based on Edit Creaded Date access controls. + // [Interpretation 9471] Modify the form based on Edit Creaded Date access controls. if (!$user->authorise('core.edit.created', 'com_sermondistributor')) { - // [Interpretation 9257] Disable fields for display. + // [Interpretation 9483] Disable fields for display. $form->setFieldAttribute('created', 'disabled', 'true'); - // [Interpretation 9259] Disable fields while saving. + // [Interpretation 9485] Disable fields while saving. $form->setFieldAttribute('created', 'filter', 'unset'); } - // [Interpretation 9292] Only load these values if no id is found + // [Interpretation 9518] Only load these values if no id is found if (0 == $id) { - // [Interpretation 9295] Set redirected field name + // [Interpretation 9521] Set redirected field name $redirectedField = $jinput->get('ref', null, 'STRING'); - // [Interpretation 9297] Set redirected field value + // [Interpretation 9523] Set redirected field value $redirectedValue = $jinput->get('refid', 0, 'INT'); if (0 != $redirectedValue && $redirectedField) { - // [Interpretation 9301] Now set the local-redirected field default value + // [Interpretation 9527] Now set the local-redirected field default value $form->setValue($redirectedField, null, $redirectedValue); } } @@ -227,7 +227,7 @@ class SermondistributorModelHelp_document extends JModelAdmin } $user = JFactory::getUser(); - // [Interpretation 9423] The record has been set. Check the record permissions. + // [Interpretation 9649] The record has been set. Check the record permissions. return $user->authorise('help_document.delete', 'com_sermondistributor.help_document.' . (int) $record->id); } return false; @@ -249,14 +249,14 @@ class SermondistributorModelHelp_document extends JModelAdmin if ($recordId) { - // [Interpretation 9510] The record has been set. Check the record permissions. + // [Interpretation 9736] The record has been set. Check the record permissions. $permission = $user->authorise('help_document.edit.state', 'com_sermondistributor.help_document.' . (int) $recordId); if (!$permission && !is_null($permission)) { return false; } } - // [Interpretation 9527] In the absense of better information, revert to the component permissions. + // [Interpretation 9753] In the absense of better information, revert to the component permissions. return $user->authorise('help_document.edit.state', 'com_sermondistributor'); } @@ -271,7 +271,7 @@ class SermondistributorModelHelp_document extends JModelAdmin */ protected function allowEdit($data = array(), $key = 'id') { - // [Interpretation 9335] Check specific edit permission then general edit permission. + // [Interpretation 9561] Check specific edit permission then general edit permission. $user = JFactory::getUser(); return $user->authorise('help_document.edit', 'com_sermondistributor.help_document.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('help_document.edit', 'com_sermondistributor'); @@ -370,20 +370,20 @@ class SermondistributorModelHelp_document extends JModelAdmin */ public function validate($form, $data, $group = null) { - // [Interpretation 8301] check if the not_required field is set + // [Interpretation 8522] check if the not_required field is set if (SermondistributorHelper::checkString($data['not_required'])) { $requiredFields = (array) explode(',',(string) $data['not_required']); $requiredFields = array_unique($requiredFields); - // [Interpretation 8306] now change the required field attributes value + // [Interpretation 8527] now change the required field attributes value foreach ($requiredFields as $requiredField) { - // [Interpretation 8309] make sure there is a string value + // [Interpretation 8530] make sure there is a string value if (SermondistributorHelper::checkString($requiredField)) { - // [Interpretation 8312] change to false + // [Interpretation 8533] change to false $form->setFieldAttribute($requiredField, 'required', 'false'); - // [Interpretation 8314] also clear the data set + // [Interpretation 8535] also clear the data set $data[$requiredField] = ''; } } diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 3c7cf74b..b29ca18a 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help_documents.php @@ -113,16 +113,16 @@ class SermondistributorModelHelp_documents extends JModelList */ public function getItems() { - // [Interpretation 10096] check in items + // [Interpretation 10327] check in items $this->checkInNow(); // load parent items $items = parent::getItems(); - // [Interpretation 10171] set values to display correctly. + // [Interpretation 10402] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [Interpretation 10174] get user object. + // [Interpretation 10405] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -133,7 +133,7 @@ class SermondistributorModelHelp_documents extends JModelList continue; } - // [Interpretation 10242] decode groups + // [Interpretation 10473] decode groups $groupsArray = json_decode($item->groups, true); if (SermondistributorHelper::checkArray($groupsArray)) { @@ -156,14 +156,14 @@ class SermondistributorModelHelp_documents extends JModelList } } - // [Interpretation 10443] set selection value to a translatable value + // [Interpretation 10674] set selection value to a translatable value if (SermondistributorHelper::checkArray($items)) { foreach ($items as $nr => &$item) { - // [Interpretation 10450] convert type + // [Interpretation 10681] convert type $item->type = $this->selectionTranslation($item->type, 'type'); - // [Interpretation 10450] convert location + // [Interpretation 10681] convert location $item->location = $this->selectionTranslation($item->location, 'location'); } } @@ -180,7 +180,7 @@ class SermondistributorModelHelp_documents extends JModelList */ public function selectionTranslation($value,$name) { - // [Interpretation 10476] Array of type language strings + // [Interpretation 10707] Array of type language strings if ($name == 'type') { $typeArray = array( @@ -189,20 +189,20 @@ class SermondistributorModelHelp_documents extends JModelList 2 => 'COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_TEXT', 3 => 'COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_URL' ); - // [Interpretation 10507] Now check if value is found in this array + // [Interpretation 10738] Now check if value is found in this array if (isset($typeArray[$value]) && SermondistributorHelper::checkString($typeArray[$value])) { return $typeArray[$value]; } } - // [Interpretation 10476] Array of location language strings + // [Interpretation 10707] Array of location language strings if ($name == 'location') { $locationArray = array( 1 => 'COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ADMIN', 2 => 'COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_SITE' ); - // [Interpretation 10507] Now check if value is found in this array + // [Interpretation 10738] Now check if value is found in this array if (isset($locationArray[$value]) && SermondistributorHelper::checkString($locationArray[$value])) { return $locationArray[$value]; @@ -218,19 +218,19 @@ class SermondistributorModelHelp_documents extends JModelList */ protected function getListQuery() { - // [Interpretation 6981] Get the user object. + // [Interpretation 7194] Get the user object. $user = JFactory::getUser(); - // [Interpretation 6983] Create a new query object. + // [Interpretation 7196] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [Interpretation 6986] Select some fields + // [Interpretation 7199] Select some fields $query->select('a.*'); - // [Interpretation 6993] From the sermondistributor_item table + // [Interpretation 7206] From the sermondistributor_item table $query->from($db->quoteName('#__sermondistributor_help_document', 'a')); - // [Interpretation 7007] Filter by published state + // [Interpretation 7220] Filter by published state $published = $this->getState('filter.published'); if (is_numeric($published)) { @@ -241,21 +241,21 @@ class SermondistributorModelHelp_documents extends JModelList $query->where('(a.published = 0 OR a.published = 1)'); } - // [Interpretation 7019] Join over the asset groups. + // [Interpretation 7232] Join over the asset groups. $query->select('ag.title AS access_level'); $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // [Interpretation 7022] Filter by access level. + // [Interpretation 7235] Filter by access level. if ($access = $this->getState('filter.access')) { $query->where('a.access = ' . (int) $access); } - // [Interpretation 7027] Implement View Level Access + // [Interpretation 7240] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [Interpretation 7104] Filter by search. + // [Interpretation 7317] Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) { @@ -270,28 +270,28 @@ class SermondistributorModelHelp_documents extends JModelList } } - // [Interpretation 7287] Filter by Type. + // [Interpretation 7510] Filter by Type. if ($type = $this->getState('filter.type')) { $query->where('a.type = ' . $db->quote($db->escape($type, true))); } - // [Interpretation 7287] Filter by Location. + // [Interpretation 7510] Filter by Location. if ($location = $this->getState('filter.location')) { $query->where('a.location = ' . $db->quote($db->escape($location, true))); } - // [Interpretation 7287] Filter by Admin_view. + // [Interpretation 7510] Filter by Admin_view. if ($admin_view = $this->getState('filter.admin_view')) { $query->where('a.admin_view = ' . $db->quote($db->escape($admin_view, true))); } - // [Interpretation 7287] Filter by Site_view. + // [Interpretation 7510] Filter by Site_view. if ($site_view = $this->getState('filter.site_view')) { $query->where('a.site_view = ' . $db->quote($db->escape($site_view, true))); } - // [Interpretation 7063] Add the list ordering clause. + // [Interpretation 7276] Add the list ordering clause. $orderCol = $this->state->get('list.ordering', 'a.id'); $orderDirn = $this->state->get('list.direction', 'asc'); if ($orderCol != '') @@ -309,42 +309,44 @@ class SermondistributorModelHelp_documents extends JModelList */ public function getExportData($pks) { - // [Interpretation 6718] setup the query + // [Interpretation 6929] setup the query if (SermondistributorHelper::checkArray($pks)) { - // [Interpretation 6721] Get the user object. + // [Interpretation 6932] Set a value to know this is exporting method. + $_export = true; + // [Interpretation 6934] Get the user object. $user = JFactory::getUser(); - // [Interpretation 6723] Create a new query object. + // [Interpretation 6936] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [Interpretation 6726] Select some fields + // [Interpretation 6939] Select some fields $query->select('a.*'); - // [Interpretation 6728] From the sermondistributor_help_document table + // [Interpretation 6941] From the sermondistributor_help_document table $query->from($db->quoteName('#__sermondistributor_help_document', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); - // [Interpretation 6738] Implement View Level Access + // [Interpretation 6951] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [Interpretation 6745] Order the results by ordering + // [Interpretation 6958] Order the results by ordering $query->order('a.ordering ASC'); - // [Interpretation 6747] Load the items + // [Interpretation 6960] Load the items $db->setQuery($query); $db->execute(); if ($db->getNumRows()) { $items = $db->loadObjectList(); - // [Interpretation 10171] set values to display correctly. + // [Interpretation 10402] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [Interpretation 10174] get user object. + // [Interpretation 10405] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -355,13 +357,13 @@ class SermondistributorModelHelp_documents extends JModelList continue; } - // [Interpretation 10390] unset the values we don't want exported. + // [Interpretation 10621] unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); unset($item->checked_out_time); } } - // [Interpretation 10399] Add headers to items array. + // [Interpretation 10630] Add headers to items array. $headers = $this->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { @@ -380,13 +382,13 @@ class SermondistributorModelHelp_documents extends JModelList */ public function getExImPortHeaders() { - // [Interpretation 6767] Get a db connection. + // [Interpretation 6980] Get a db connection. $db = JFactory::getDbo(); - // [Interpretation 6769] get the columns + // [Interpretation 6982] get the columns $columns = $db->getTableColumns("#__sermondistributor_help_document"); if (SermondistributorHelper::checkArray($columns)) { - // [Interpretation 6773] remove the headers you don't import/export. + // [Interpretation 6986] remove the headers you don't import/export. unset($columns['asset_id']); unset($columns['checked_out']); unset($columns['checked_out_time']); @@ -408,7 +410,7 @@ class SermondistributorModelHelp_documents extends JModelList */ protected function getStoreId($id = '') { - // [Interpretation 9719] Compile the store id. + // [Interpretation 9945] Compile the store id. $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); @@ -432,15 +434,15 @@ class SermondistributorModelHelp_documents extends JModelList */ protected function checkInNow() { - // [Interpretation 10112] Get set check in time + // [Interpretation 10343] Get set check in time $time = JComponentHelper::getParams('com_sermondistributor')->get('check_in'); if ($time) { - // [Interpretation 10117] Get a db connection. + // [Interpretation 10348] Get a db connection. $db = JFactory::getDbo(); - // [Interpretation 10119] reset query + // [Interpretation 10350] reset query $query = $db->getQuery(true); $query->select('*'); $query->from($db->quoteName('#__sermondistributor_help_document')); @@ -448,24 +450,24 @@ class SermondistributorModelHelp_documents extends JModelList $db->execute(); if ($db->getNumRows()) { - // [Interpretation 10127] Get Yesterdays date + // [Interpretation 10358] Get Yesterdays date $date = JFactory::getDate()->modify($time)->toSql(); - // [Interpretation 10129] reset query + // [Interpretation 10360] reset query $query = $db->getQuery(true); - // [Interpretation 10131] Fields to update. + // [Interpretation 10362] Fields to update. $fields = array( $db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'', $db->quoteName('checked_out') . '=0' ); - // [Interpretation 10136] Conditions for which records should be updated. + // [Interpretation 10367] Conditions for which records should be updated. $conditions = array( $db->quoteName('checked_out') . '!=0', $db->quoteName('checked_out_time') . '<\''.$date.'\'' ); - // [Interpretation 10141] Check table + // [Interpretation 10372] Check table $query->update($db->quoteName('#__sermondistributor_help_document'))->set($fields)->where($conditions); $db->setQuery($query); diff --git a/admin/models/import.php b/admin/models/import.php index 546330bb..2c2315d3 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage import.php diff --git a/admin/models/preacher.php b/admin/models/preacher.php index 1e24ca82..043864bd 100644 --- a/admin/models/preacher.php +++ b/admin/models/preacher.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.php @@ -113,29 +113,29 @@ class SermondistributorModelPreacher extends JModelAdmin */ public function getVvvsermons() { - // [Interpretation 6432] Get the user object. + // [Interpretation 6643] Get the user object. $user = JFactory::getUser(); - // [Interpretation 6434] Create a new query object. + // [Interpretation 6645] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [Interpretation 6437] Select some fields + // [Interpretation 6648] Select some fields $query->select('a.*'); $query->select($db->quoteName('c.title','category_title')); - // [Interpretation 6444] From the sermondistributor_sermon table + // [Interpretation 6655] From the sermondistributor_sermon table $query->from($db->quoteName('#__sermondistributor_sermon', 'a')); $query->join('LEFT', $db->quoteName('#__categories', 'c') . ' ON (' . $db->quoteName('a.catid') . ' = ' . $db->quoteName('c.id') . ')'); - // [Interpretation 7134] From the sermondistributor_preacher table. + // [Interpretation 7347] From the sermondistributor_preacher table. $query->select($db->quoteName('g.name','preacher_name')); $query->join('LEFT', $db->quoteName('#__sermondistributor_preacher', 'g') . ' ON (' . $db->quoteName('a.preacher') . ' = ' . $db->quoteName('g.id') . ')'); - // [Interpretation 7134] From the sermondistributor_series table. + // [Interpretation 7347] From the sermondistributor_series table. $query->select($db->quoteName('h.name','series_name')); $query->join('LEFT', $db->quoteName('#__sermondistributor_series', 'h') . ' ON (' . $db->quoteName('a.series') . ' = ' . $db->quoteName('h.id') . ')'); - // [Interpretation 6460] Filter by preachervvvv global. + // [Interpretation 6671] Filter by preachervvvv global. $preachervvvv = $this->preachervvvv; if (is_numeric($preachervvvv )) { @@ -150,36 +150,36 @@ class SermondistributorModelPreacher extends JModelAdmin $query->where('a.preacher = -5'); } - // [Interpretation 6477] Join over the asset groups. + // [Interpretation 6688] Join over the asset groups. $query->select('ag.title AS access_level'); $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // [Interpretation 6480] Filter by access level. + // [Interpretation 6691] Filter by access level. if ($access = $this->getState('filter.access')) { $query->where('a.access = ' . (int) $access); } - // [Interpretation 6485] Implement View Level Access + // [Interpretation 6696] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [Interpretation 6492] Order the results by ordering + // [Interpretation 6703] Order the results by ordering $query->order('a.published ASC'); $query->order('a.ordering ASC'); - // [Interpretation 6494] Load the items + // [Interpretation 6705] Load the items $db->setQuery($query); $db->execute(); if ($db->getNumRows()) { $items = $db->loadObjectList(); - // [Interpretation 10171] set values to display correctly. + // [Interpretation 10402] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [Interpretation 10174] get user object. + // [Interpretation 10405] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -193,14 +193,14 @@ class SermondistributorModelPreacher extends JModelAdmin } } - // [Interpretation 10443] set selection value to a translatable value + // [Interpretation 10674] set selection value to a translatable value if (SermondistributorHelper::checkArray($items)) { foreach ($items as $nr => &$item) { - // [Interpretation 10450] convert link_type + // [Interpretation 10681] convert link_type $item->link_type = $this->selectionTranslationVvvsermons($item->link_type, 'link_type'); - // [Interpretation 10450] convert source + // [Interpretation 10681] convert source $item->source = $this->selectionTranslationVvvsermons($item->source, 'source'); } } @@ -217,20 +217,20 @@ class SermondistributorModelPreacher extends JModelAdmin */ public function selectionTranslationVvvsermons($value,$name) { - // [Interpretation 10476] Array of link_type language strings + // [Interpretation 10707] Array of link_type language strings if ($name == 'link_type') { $link_typeArray = array( 1 => 'COM_SERMONDISTRIBUTOR_SERMON_ENCRYPTED', 2 => 'COM_SERMONDISTRIBUTOR_SERMON_DIRECT' ); - // [Interpretation 10507] Now check if value is found in this array + // [Interpretation 10738] Now check if value is found in this array if (isset($link_typeArray[$value]) && SermondistributorHelper::checkString($link_typeArray[$value])) { return $link_typeArray[$value]; } } - // [Interpretation 10476] Array of source language strings + // [Interpretation 10707] Array of source language strings if ($name == 'source') { $sourceArray = array( @@ -239,7 +239,7 @@ class SermondistributorModelPreacher extends JModelAdmin 2 => 'COM_SERMONDISTRIBUTOR_SERMON_DROPBOX', 3 => 'COM_SERMONDISTRIBUTOR_SERMON_URL' ); - // [Interpretation 10507] Now check if value is found in this array + // [Interpretation 10738] Now check if value is found in this array if (isset($sourceArray[$value]) && SermondistributorHelper::checkString($sourceArray[$value])) { return $sourceArray[$value]; @@ -259,7 +259,7 @@ class SermondistributorModelPreacher extends JModelAdmin * @since 1.6 */ public function getForm($data = array(), $loadData = true) - { // [Interpretation 9102] Get the form. + { // [Interpretation 9328] Get the form. $form = $this->loadForm('com_sermondistributor.preacher', 'preacher', array('control' => 'jform', 'load_data' => $loadData)); if (empty($form)) @@ -269,12 +269,12 @@ class SermondistributorModelPreacher extends JModelAdmin $jinput = JFactory::getApplication()->input; - // [Interpretation 9187] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first. + // [Interpretation 9413] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first. if ($jinput->get('a_id')) { $id = $jinput->get('a_id', 0, 'INT'); } - // [Interpretation 9192] The back end uses id so we use that the rest of the time and set it to 0 by default. + // [Interpretation 9418] The back end uses id so we use that the rest of the time and set it to 0 by default. else { $id = $jinput->get('id', 0, 'INT'); @@ -282,54 +282,54 @@ class SermondistributorModelPreacher extends JModelAdmin $user = JFactory::getUser(); - // [Interpretation 9198] Check for existing item. - // [Interpretation 9199] Modify the form based on Edit State access controls. + // [Interpretation 9424] Check for existing item. + // [Interpretation 9425] Modify the form based on Edit State access controls. if ($id != 0 && (!$user->authorise('preacher.edit.state', 'com_sermondistributor.preacher.' . (int) $id)) || ($id == 0 && !$user->authorise('preacher.edit.state', 'com_sermondistributor'))) { - // [Interpretation 9212] Disable fields for display. + // [Interpretation 9438] Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); $form->setFieldAttribute('published', 'disabled', 'true'); - // [Interpretation 9215] Disable fields while saving. + // [Interpretation 9441] Disable fields while saving. $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } - // [Interpretation 9220] If this is a new item insure the greated by is set. + // [Interpretation 9446] If this is a new item insure the greated by is set. if (0 == $id) { - // [Interpretation 9223] Set the created_by to this user + // [Interpretation 9449] Set the created_by to this user $form->setValue('created_by', null, $user->id); } - // [Interpretation 9226] Modify the form based on Edit Creaded By access controls. + // [Interpretation 9452] Modify the form based on Edit Creaded By access controls. if ($id != 0 && (!$user->authorise('preacher.edit.created_by', 'com_sermondistributor.preacher.' . (int) $id)) || ($id == 0 && !$user->authorise('preacher.edit.created_by', 'com_sermondistributor'))) { - // [Interpretation 9238] Disable fields for display. + // [Interpretation 9464] Disable fields for display. $form->setFieldAttribute('created_by', 'disabled', 'true'); - // [Interpretation 9240] Disable fields for display. + // [Interpretation 9466] Disable fields for display. $form->setFieldAttribute('created_by', 'readonly', 'true'); - // [Interpretation 9242] Disable fields while saving. + // [Interpretation 9468] Disable fields while saving. $form->setFieldAttribute('created_by', 'filter', 'unset'); } - // [Interpretation 9245] Modify the form based on Edit Creaded Date access controls. + // [Interpretation 9471] Modify the form based on Edit Creaded Date access controls. if ($id != 0 && (!$user->authorise('preacher.edit.created', 'com_sermondistributor.preacher.' . (int) $id)) || ($id == 0 && !$user->authorise('preacher.edit.created', 'com_sermondistributor'))) { - // [Interpretation 9257] Disable fields for display. + // [Interpretation 9483] Disable fields for display. $form->setFieldAttribute('created', 'disabled', 'true'); - // [Interpretation 9259] Disable fields while saving. + // [Interpretation 9485] Disable fields while saving. $form->setFieldAttribute('created', 'filter', 'unset'); } - // [Interpretation 9292] Only load these values if no id is found + // [Interpretation 9518] Only load these values if no id is found if (0 == $id) { - // [Interpretation 9295] Set redirected field name + // [Interpretation 9521] Set redirected field name $redirectedField = $jinput->get('ref', null, 'STRING'); - // [Interpretation 9297] Set redirected field value + // [Interpretation 9523] Set redirected field value $redirectedValue = $jinput->get('refid', 0, 'INT'); if (0 != $redirectedValue && $redirectedField) { - // [Interpretation 9301] Now set the local-redirected field default value + // [Interpretation 9527] Now set the local-redirected field default value $form->setValue($redirectedField, null, $redirectedValue); } } @@ -366,7 +366,7 @@ class SermondistributorModelPreacher extends JModelAdmin } $user = JFactory::getUser(); - // [Interpretation 9423] The record has been set. Check the record permissions. + // [Interpretation 9649] The record has been set. Check the record permissions. return $user->authorise('preacher.delete', 'com_sermondistributor.preacher.' . (int) $record->id); } return false; @@ -388,14 +388,14 @@ class SermondistributorModelPreacher extends JModelAdmin if ($recordId) { - // [Interpretation 9510] The record has been set. Check the record permissions. + // [Interpretation 9736] The record has been set. Check the record permissions. $permission = $user->authorise('preacher.edit.state', 'com_sermondistributor.preacher.' . (int) $recordId); if (!$permission && !is_null($permission)) { return false; } } - // [Interpretation 9527] In the absense of better information, revert to the component permissions. + // [Interpretation 9753] In the absense of better information, revert to the component permissions. return $user->authorise('preacher.edit.state', 'com_sermondistributor'); } @@ -410,7 +410,7 @@ class SermondistributorModelPreacher extends JModelAdmin */ protected function allowEdit($data = array(), $key = 'id') { - // [Interpretation 9335] Check specific edit permission then general edit permission. + // [Interpretation 9561] Check specific edit permission then general edit permission. $user = JFactory::getUser(); return $user->authorise('preacher.edit', 'com_sermondistributor.preacher.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('preacher.edit', 'com_sermondistributor'); diff --git a/admin/models/preachers.php b/admin/models/preachers.php index e40423ca..b8cfe9a0 100644 --- a/admin/models/preachers.php +++ b/admin/models/preachers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.php @@ -101,16 +101,16 @@ class SermondistributorModelPreachers extends JModelList */ public function getItems() { - // [Interpretation 10096] check in items + // [Interpretation 10327] check in items $this->checkInNow(); // load parent items $items = parent::getItems(); - // [Interpretation 10171] set values to display correctly. + // [Interpretation 10402] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [Interpretation 10174] get user object. + // [Interpretation 10405] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -135,19 +135,19 @@ class SermondistributorModelPreachers extends JModelList */ protected function getListQuery() { - // [Interpretation 6981] Get the user object. + // [Interpretation 7194] Get the user object. $user = JFactory::getUser(); - // [Interpretation 6983] Create a new query object. + // [Interpretation 7196] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [Interpretation 6986] Select some fields + // [Interpretation 7199] Select some fields $query->select('a.*'); - // [Interpretation 6993] From the sermondistributor_item table + // [Interpretation 7206] From the sermondistributor_item table $query->from($db->quoteName('#__sermondistributor_preacher', 'a')); - // [Interpretation 7007] Filter by published state + // [Interpretation 7220] Filter by published state $published = $this->getState('filter.published'); if (is_numeric($published)) { @@ -158,21 +158,21 @@ class SermondistributorModelPreachers extends JModelList $query->where('(a.published = 0 OR a.published = 1)'); } - // [Interpretation 7019] Join over the asset groups. + // [Interpretation 7232] Join over the asset groups. $query->select('ag.title AS access_level'); $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // [Interpretation 7022] Filter by access level. + // [Interpretation 7235] Filter by access level. if ($access = $this->getState('filter.access')) { $query->where('a.access = ' . (int) $access); } - // [Interpretation 7027] Implement View Level Access + // [Interpretation 7240] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [Interpretation 7104] Filter by search. + // [Interpretation 7317] Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) { @@ -188,7 +188,7 @@ class SermondistributorModelPreachers extends JModelList } - // [Interpretation 7063] Add the list ordering clause. + // [Interpretation 7276] Add the list ordering clause. $orderCol = $this->state->get('list.ordering', 'a.id'); $orderDirn = $this->state->get('list.direction', 'asc'); if ($orderCol != '') @@ -206,42 +206,44 @@ class SermondistributorModelPreachers extends JModelList */ public function getExportData($pks) { - // [Interpretation 6718] setup the query + // [Interpretation 6929] setup the query if (SermondistributorHelper::checkArray($pks)) { - // [Interpretation 6721] Get the user object. + // [Interpretation 6932] Set a value to know this is exporting method. + $_export = true; + // [Interpretation 6934] Get the user object. $user = JFactory::getUser(); - // [Interpretation 6723] Create a new query object. + // [Interpretation 6936] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [Interpretation 6726] Select some fields + // [Interpretation 6939] Select some fields $query->select('a.*'); - // [Interpretation 6728] From the sermondistributor_preacher table + // [Interpretation 6941] From the sermondistributor_preacher table $query->from($db->quoteName('#__sermondistributor_preacher', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); - // [Interpretation 6738] Implement View Level Access + // [Interpretation 6951] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [Interpretation 6745] Order the results by ordering + // [Interpretation 6958] Order the results by ordering $query->order('a.ordering ASC'); - // [Interpretation 6747] Load the items + // [Interpretation 6960] Load the items $db->setQuery($query); $db->execute(); if ($db->getNumRows()) { $items = $db->loadObjectList(); - // [Interpretation 10171] set values to display correctly. + // [Interpretation 10402] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [Interpretation 10174] get user object. + // [Interpretation 10405] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -252,13 +254,13 @@ class SermondistributorModelPreachers extends JModelList continue; } - // [Interpretation 10390] unset the values we don't want exported. + // [Interpretation 10621] unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); unset($item->checked_out_time); } } - // [Interpretation 10399] Add headers to items array. + // [Interpretation 10630] Add headers to items array. $headers = $this->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { @@ -277,13 +279,13 @@ class SermondistributorModelPreachers extends JModelList */ public function getExImPortHeaders() { - // [Interpretation 6767] Get a db connection. + // [Interpretation 6980] Get a db connection. $db = JFactory::getDbo(); - // [Interpretation 6769] get the columns + // [Interpretation 6982] get the columns $columns = $db->getTableColumns("#__sermondistributor_preacher"); if (SermondistributorHelper::checkArray($columns)) { - // [Interpretation 6773] remove the headers you don't import/export. + // [Interpretation 6986] remove the headers you don't import/export. unset($columns['asset_id']); unset($columns['checked_out']); unset($columns['checked_out_time']); @@ -305,7 +307,7 @@ class SermondistributorModelPreachers extends JModelList */ protected function getStoreId($id = '') { - // [Interpretation 9719] Compile the store id. + // [Interpretation 9945] Compile the store id. $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); @@ -326,15 +328,15 @@ class SermondistributorModelPreachers extends JModelList */ protected function checkInNow() { - // [Interpretation 10112] Get set check in time + // [Interpretation 10343] Get set check in time $time = JComponentHelper::getParams('com_sermondistributor')->get('check_in'); if ($time) { - // [Interpretation 10117] Get a db connection. + // [Interpretation 10348] Get a db connection. $db = JFactory::getDbo(); - // [Interpretation 10119] reset query + // [Interpretation 10350] reset query $query = $db->getQuery(true); $query->select('*'); $query->from($db->quoteName('#__sermondistributor_preacher')); @@ -342,24 +344,24 @@ class SermondistributorModelPreachers extends JModelList $db->execute(); if ($db->getNumRows()) { - // [Interpretation 10127] Get Yesterdays date + // [Interpretation 10358] Get Yesterdays date $date = JFactory::getDate()->modify($time)->toSql(); - // [Interpretation 10129] reset query + // [Interpretation 10360] reset query $query = $db->getQuery(true); - // [Interpretation 10131] Fields to update. + // [Interpretation 10362] Fields to update. $fields = array( $db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'', $db->quoteName('checked_out') . '=0' ); - // [Interpretation 10136] Conditions for which records should be updated. + // [Interpretation 10367] Conditions for which records should be updated. $conditions = array( $db->quoteName('checked_out') . '!=0', $db->quoteName('checked_out_time') . '<\''.$date.'\'' ); - // [Interpretation 10141] Check table + // [Interpretation 10372] Check table $query->update($db->quoteName('#__sermondistributor_preacher'))->set($fields)->where($conditions); $db->setQuery($query); diff --git a/admin/models/series.php b/admin/models/series.php index 4c327d2e..bb909b06 100644 --- a/admin/models/series.php +++ b/admin/models/series.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php @@ -113,29 +113,29 @@ class SermondistributorModelSeries extends JModelAdmin */ public function getVwcsermons() { - // [Interpretation 6432] Get the user object. + // [Interpretation 6643] Get the user object. $user = JFactory::getUser(); - // [Interpretation 6434] Create a new query object. + // [Interpretation 6645] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [Interpretation 6437] Select some fields + // [Interpretation 6648] Select some fields $query->select('a.*'); $query->select($db->quoteName('c.title','category_title')); - // [Interpretation 6444] From the sermondistributor_sermon table + // [Interpretation 6655] From the sermondistributor_sermon table $query->from($db->quoteName('#__sermondistributor_sermon', 'a')); $query->join('LEFT', $db->quoteName('#__categories', 'c') . ' ON (' . $db->quoteName('a.catid') . ' = ' . $db->quoteName('c.id') . ')'); - // [Interpretation 7134] From the sermondistributor_preacher table. + // [Interpretation 7347] From the sermondistributor_preacher table. $query->select($db->quoteName('g.name','preacher_name')); $query->join('LEFT', $db->quoteName('#__sermondistributor_preacher', 'g') . ' ON (' . $db->quoteName('a.preacher') . ' = ' . $db->quoteName('g.id') . ')'); - // [Interpretation 7134] From the sermondistributor_series table. + // [Interpretation 7347] From the sermondistributor_series table. $query->select($db->quoteName('h.name','series_name')); $query->join('LEFT', $db->quoteName('#__sermondistributor_series', 'h') . ' ON (' . $db->quoteName('a.series') . ' = ' . $db->quoteName('h.id') . ')'); - // [Interpretation 6460] Filter by seriesvvvx global. + // [Interpretation 6671] Filter by seriesvvvx global. $seriesvvvx = $this->seriesvvvx; if (is_numeric($seriesvvvx )) { @@ -150,36 +150,36 @@ class SermondistributorModelSeries extends JModelAdmin $query->where('a.series = -5'); } - // [Interpretation 6477] Join over the asset groups. + // [Interpretation 6688] Join over the asset groups. $query->select('ag.title AS access_level'); $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // [Interpretation 6480] Filter by access level. + // [Interpretation 6691] Filter by access level. if ($access = $this->getState('filter.access')) { $query->where('a.access = ' . (int) $access); } - // [Interpretation 6485] Implement View Level Access + // [Interpretation 6696] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [Interpretation 6492] Order the results by ordering + // [Interpretation 6703] Order the results by ordering $query->order('a.published ASC'); $query->order('a.ordering ASC'); - // [Interpretation 6494] Load the items + // [Interpretation 6705] Load the items $db->setQuery($query); $db->execute(); if ($db->getNumRows()) { $items = $db->loadObjectList(); - // [Interpretation 10171] set values to display correctly. + // [Interpretation 10402] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [Interpretation 10174] get user object. + // [Interpretation 10405] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -193,14 +193,14 @@ class SermondistributorModelSeries extends JModelAdmin } } - // [Interpretation 10443] set selection value to a translatable value + // [Interpretation 10674] set selection value to a translatable value if (SermondistributorHelper::checkArray($items)) { foreach ($items as $nr => &$item) { - // [Interpretation 10450] convert link_type + // [Interpretation 10681] convert link_type $item->link_type = $this->selectionTranslationVwcsermons($item->link_type, 'link_type'); - // [Interpretation 10450] convert source + // [Interpretation 10681] convert source $item->source = $this->selectionTranslationVwcsermons($item->source, 'source'); } } @@ -217,20 +217,20 @@ class SermondistributorModelSeries extends JModelAdmin */ public function selectionTranslationVwcsermons($value,$name) { - // [Interpretation 10476] Array of link_type language strings + // [Interpretation 10707] Array of link_type language strings if ($name == 'link_type') { $link_typeArray = array( 1 => 'COM_SERMONDISTRIBUTOR_SERMON_ENCRYPTED', 2 => 'COM_SERMONDISTRIBUTOR_SERMON_DIRECT' ); - // [Interpretation 10507] Now check if value is found in this array + // [Interpretation 10738] Now check if value is found in this array if (isset($link_typeArray[$value]) && SermondistributorHelper::checkString($link_typeArray[$value])) { return $link_typeArray[$value]; } } - // [Interpretation 10476] Array of source language strings + // [Interpretation 10707] Array of source language strings if ($name == 'source') { $sourceArray = array( @@ -239,7 +239,7 @@ class SermondistributorModelSeries extends JModelAdmin 2 => 'COM_SERMONDISTRIBUTOR_SERMON_DROPBOX', 3 => 'COM_SERMONDISTRIBUTOR_SERMON_URL' ); - // [Interpretation 10507] Now check if value is found in this array + // [Interpretation 10738] Now check if value is found in this array if (isset($sourceArray[$value]) && SermondistributorHelper::checkString($sourceArray[$value])) { return $sourceArray[$value]; @@ -259,7 +259,7 @@ class SermondistributorModelSeries extends JModelAdmin * @since 1.6 */ public function getForm($data = array(), $loadData = true) - { // [Interpretation 9102] Get the form. + { // [Interpretation 9328] Get the form. $form = $this->loadForm('com_sermondistributor.series', 'series', array('control' => 'jform', 'load_data' => $loadData)); if (empty($form)) @@ -269,12 +269,12 @@ class SermondistributorModelSeries extends JModelAdmin $jinput = JFactory::getApplication()->input; - // [Interpretation 9187] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first. + // [Interpretation 9413] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first. if ($jinput->get('a_id')) { $id = $jinput->get('a_id', 0, 'INT'); } - // [Interpretation 9192] The back end uses id so we use that the rest of the time and set it to 0 by default. + // [Interpretation 9418] The back end uses id so we use that the rest of the time and set it to 0 by default. else { $id = $jinput->get('id', 0, 'INT'); @@ -282,54 +282,54 @@ class SermondistributorModelSeries extends JModelAdmin $user = JFactory::getUser(); - // [Interpretation 9198] Check for existing item. - // [Interpretation 9199] Modify the form based on Edit State access controls. + // [Interpretation 9424] Check for existing item. + // [Interpretation 9425] Modify the form based on Edit State access controls. if ($id != 0 && (!$user->authorise('series.edit.state', 'com_sermondistributor.series.' . (int) $id)) || ($id == 0 && !$user->authorise('series.edit.state', 'com_sermondistributor'))) { - // [Interpretation 9212] Disable fields for display. + // [Interpretation 9438] Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); $form->setFieldAttribute('published', 'disabled', 'true'); - // [Interpretation 9215] Disable fields while saving. + // [Interpretation 9441] Disable fields while saving. $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } - // [Interpretation 9220] If this is a new item insure the greated by is set. + // [Interpretation 9446] If this is a new item insure the greated by is set. if (0 == $id) { - // [Interpretation 9223] Set the created_by to this user + // [Interpretation 9449] Set the created_by to this user $form->setValue('created_by', null, $user->id); } - // [Interpretation 9226] Modify the form based on Edit Creaded By access controls. + // [Interpretation 9452] Modify the form based on Edit Creaded By access controls. if ($id != 0 && (!$user->authorise('series.edit.created_by', 'com_sermondistributor.series.' . (int) $id)) || ($id == 0 && !$user->authorise('series.edit.created_by', 'com_sermondistributor'))) { - // [Interpretation 9238] Disable fields for display. + // [Interpretation 9464] Disable fields for display. $form->setFieldAttribute('created_by', 'disabled', 'true'); - // [Interpretation 9240] Disable fields for display. + // [Interpretation 9466] Disable fields for display. $form->setFieldAttribute('created_by', 'readonly', 'true'); - // [Interpretation 9242] Disable fields while saving. + // [Interpretation 9468] Disable fields while saving. $form->setFieldAttribute('created_by', 'filter', 'unset'); } - // [Interpretation 9245] Modify the form based on Edit Creaded Date access controls. + // [Interpretation 9471] Modify the form based on Edit Creaded Date access controls. if ($id != 0 && (!$user->authorise('series.edit.created', 'com_sermondistributor.series.' . (int) $id)) || ($id == 0 && !$user->authorise('series.edit.created', 'com_sermondistributor'))) { - // [Interpretation 9257] Disable fields for display. + // [Interpretation 9483] Disable fields for display. $form->setFieldAttribute('created', 'disabled', 'true'); - // [Interpretation 9259] Disable fields while saving. + // [Interpretation 9485] Disable fields while saving. $form->setFieldAttribute('created', 'filter', 'unset'); } - // [Interpretation 9292] Only load these values if no id is found + // [Interpretation 9518] Only load these values if no id is found if (0 == $id) { - // [Interpretation 9295] Set redirected field name + // [Interpretation 9521] Set redirected field name $redirectedField = $jinput->get('ref', null, 'STRING'); - // [Interpretation 9297] Set redirected field value + // [Interpretation 9523] Set redirected field value $redirectedValue = $jinput->get('refid', 0, 'INT'); if (0 != $redirectedValue && $redirectedField) { - // [Interpretation 9301] Now set the local-redirected field default value + // [Interpretation 9527] Now set the local-redirected field default value $form->setValue($redirectedField, null, $redirectedValue); } } @@ -366,7 +366,7 @@ class SermondistributorModelSeries extends JModelAdmin } $user = JFactory::getUser(); - // [Interpretation 9423] The record has been set. Check the record permissions. + // [Interpretation 9649] The record has been set. Check the record permissions. return $user->authorise('series.delete', 'com_sermondistributor.series.' . (int) $record->id); } return false; @@ -388,14 +388,14 @@ class SermondistributorModelSeries extends JModelAdmin if ($recordId) { - // [Interpretation 9510] The record has been set. Check the record permissions. + // [Interpretation 9736] The record has been set. Check the record permissions. $permission = $user->authorise('series.edit.state', 'com_sermondistributor.series.' . (int) $recordId); if (!$permission && !is_null($permission)) { return false; } } - // [Interpretation 9527] In the absense of better information, revert to the component permissions. + // [Interpretation 9753] In the absense of better information, revert to the component permissions. return $user->authorise('series.edit.state', 'com_sermondistributor'); } @@ -410,7 +410,7 @@ class SermondistributorModelSeries extends JModelAdmin */ protected function allowEdit($data = array(), $key = 'id') { - // [Interpretation 9335] Check specific edit permission then general edit permission. + // [Interpretation 9561] Check specific edit permission then general edit permission. $user = JFactory::getUser(); return $user->authorise('series.edit', 'com_sermondistributor.series.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('series.edit', 'com_sermondistributor'); diff --git a/admin/models/series_list.php b/admin/models/series_list.php index 6903d6ef..467eee87 100644 --- a/admin/models/series_list.php +++ b/admin/models/series_list.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series_list.php @@ -97,16 +97,16 @@ class SermondistributorModelSeries_list extends JModelList */ public function getItems() { - // [Interpretation 10096] check in items + // [Interpretation 10327] check in items $this->checkInNow(); // load parent items $items = parent::getItems(); - // [Interpretation 10171] set values to display correctly. + // [Interpretation 10402] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [Interpretation 10174] get user object. + // [Interpretation 10405] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -131,19 +131,19 @@ class SermondistributorModelSeries_list extends JModelList */ protected function getListQuery() { - // [Interpretation 6981] Get the user object. + // [Interpretation 7194] Get the user object. $user = JFactory::getUser(); - // [Interpretation 6983] Create a new query object. + // [Interpretation 7196] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [Interpretation 6986] Select some fields + // [Interpretation 7199] Select some fields $query->select('a.*'); - // [Interpretation 6993] From the sermondistributor_item table + // [Interpretation 7206] From the sermondistributor_item table $query->from($db->quoteName('#__sermondistributor_series', 'a')); - // [Interpretation 7007] Filter by published state + // [Interpretation 7220] Filter by published state $published = $this->getState('filter.published'); if (is_numeric($published)) { @@ -154,21 +154,21 @@ class SermondistributorModelSeries_list extends JModelList $query->where('(a.published = 0 OR a.published = 1)'); } - // [Interpretation 7019] Join over the asset groups. + // [Interpretation 7232] Join over the asset groups. $query->select('ag.title AS access_level'); $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // [Interpretation 7022] Filter by access level. + // [Interpretation 7235] Filter by access level. if ($access = $this->getState('filter.access')) { $query->where('a.access = ' . (int) $access); } - // [Interpretation 7027] Implement View Level Access + // [Interpretation 7240] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [Interpretation 7104] Filter by search. + // [Interpretation 7317] Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) { @@ -184,7 +184,7 @@ class SermondistributorModelSeries_list extends JModelList } - // [Interpretation 7063] Add the list ordering clause. + // [Interpretation 7276] Add the list ordering clause. $orderCol = $this->state->get('list.ordering', 'a.id'); $orderDirn = $this->state->get('list.direction', 'asc'); if ($orderCol != '') @@ -202,42 +202,44 @@ class SermondistributorModelSeries_list extends JModelList */ public function getExportData($pks) { - // [Interpretation 6718] setup the query + // [Interpretation 6929] setup the query if (SermondistributorHelper::checkArray($pks)) { - // [Interpretation 6721] Get the user object. + // [Interpretation 6932] Set a value to know this is exporting method. + $_export = true; + // [Interpretation 6934] Get the user object. $user = JFactory::getUser(); - // [Interpretation 6723] Create a new query object. + // [Interpretation 6936] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [Interpretation 6726] Select some fields + // [Interpretation 6939] Select some fields $query->select('a.*'); - // [Interpretation 6728] From the sermondistributor_series table + // [Interpretation 6941] From the sermondistributor_series table $query->from($db->quoteName('#__sermondistributor_series', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); - // [Interpretation 6738] Implement View Level Access + // [Interpretation 6951] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [Interpretation 6745] Order the results by ordering + // [Interpretation 6958] Order the results by ordering $query->order('a.ordering ASC'); - // [Interpretation 6747] Load the items + // [Interpretation 6960] Load the items $db->setQuery($query); $db->execute(); if ($db->getNumRows()) { $items = $db->loadObjectList(); - // [Interpretation 10171] set values to display correctly. + // [Interpretation 10402] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [Interpretation 10174] get user object. + // [Interpretation 10405] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -248,13 +250,13 @@ class SermondistributorModelSeries_list extends JModelList continue; } - // [Interpretation 10390] unset the values we don't want exported. + // [Interpretation 10621] unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); unset($item->checked_out_time); } } - // [Interpretation 10399] Add headers to items array. + // [Interpretation 10630] Add headers to items array. $headers = $this->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { @@ -273,13 +275,13 @@ class SermondistributorModelSeries_list extends JModelList */ public function getExImPortHeaders() { - // [Interpretation 6767] Get a db connection. + // [Interpretation 6980] Get a db connection. $db = JFactory::getDbo(); - // [Interpretation 6769] get the columns + // [Interpretation 6982] get the columns $columns = $db->getTableColumns("#__sermondistributor_series"); if (SermondistributorHelper::checkArray($columns)) { - // [Interpretation 6773] remove the headers you don't import/export. + // [Interpretation 6986] remove the headers you don't import/export. unset($columns['asset_id']); unset($columns['checked_out']); unset($columns['checked_out_time']); @@ -301,7 +303,7 @@ class SermondistributorModelSeries_list extends JModelList */ protected function getStoreId($id = '') { - // [Interpretation 9719] Compile the store id. + // [Interpretation 9945] Compile the store id. $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); @@ -321,15 +323,15 @@ class SermondistributorModelSeries_list extends JModelList */ protected function checkInNow() { - // [Interpretation 10112] Get set check in time + // [Interpretation 10343] Get set check in time $time = JComponentHelper::getParams('com_sermondistributor')->get('check_in'); if ($time) { - // [Interpretation 10117] Get a db connection. + // [Interpretation 10348] Get a db connection. $db = JFactory::getDbo(); - // [Interpretation 10119] reset query + // [Interpretation 10350] reset query $query = $db->getQuery(true); $query->select('*'); $query->from($db->quoteName('#__sermondistributor_series')); @@ -337,24 +339,24 @@ class SermondistributorModelSeries_list extends JModelList $db->execute(); if ($db->getNumRows()) { - // [Interpretation 10127] Get Yesterdays date + // [Interpretation 10358] Get Yesterdays date $date = JFactory::getDate()->modify($time)->toSql(); - // [Interpretation 10129] reset query + // [Interpretation 10360] reset query $query = $db->getQuery(true); - // [Interpretation 10131] Fields to update. + // [Interpretation 10362] Fields to update. $fields = array( $db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'', $db->quoteName('checked_out') . '=0' ); - // [Interpretation 10136] Conditions for which records should be updated. + // [Interpretation 10367] Conditions for which records should be updated. $conditions = array( $db->quoteName('checked_out') . '!=0', $db->quoteName('checked_out_time') . '<\''.$date.'\'' ); - // [Interpretation 10141] Check table + // [Interpretation 10372] Check table $query->update($db->quoteName('#__sermondistributor_series'))->set($fields)->where($conditions); $db->setQuery($query); diff --git a/admin/models/sermon.php b/admin/models/sermon.php index 010f4332..1a70756e 100644 --- a/admin/models/sermon.php +++ b/admin/models/sermon.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php @@ -125,31 +125,31 @@ class SermondistributorModelSermon extends JModelAdmin */ public function getVwbstastics() { - // [Interpretation 6432] Get the user object. + // [Interpretation 6643] Get the user object. $user = JFactory::getUser(); - // [Interpretation 6434] Create a new query object. + // [Interpretation 6645] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [Interpretation 6437] Select some fields + // [Interpretation 6648] Select some fields $query->select('a.*'); - // [Interpretation 6444] From the sermondistributor_statistic table + // [Interpretation 6655] From the sermondistributor_statistic table $query->from($db->quoteName('#__sermondistributor_statistic', 'a')); - // [Interpretation 7134] From the sermondistributor_sermon table. + // [Interpretation 7347] From the sermondistributor_sermon table. $query->select($db->quoteName('g.name','sermon_name')); $query->join('LEFT', $db->quoteName('#__sermondistributor_sermon', 'g') . ' ON (' . $db->quoteName('a.sermon') . ' = ' . $db->quoteName('g.id') . ')'); - // [Interpretation 7134] From the sermondistributor_preacher table. + // [Interpretation 7347] From the sermondistributor_preacher table. $query->select($db->quoteName('h.name','preacher_name')); $query->join('LEFT', $db->quoteName('#__sermondistributor_preacher', 'h') . ' ON (' . $db->quoteName('a.preacher') . ' = ' . $db->quoteName('h.id') . ')'); - // [Interpretation 7134] From the sermondistributor_series table. + // [Interpretation 7347] From the sermondistributor_series table. $query->select($db->quoteName('i.name','series_name')); $query->join('LEFT', $db->quoteName('#__sermondistributor_series', 'i') . ' ON (' . $db->quoteName('a.series') . ' = ' . $db->quoteName('i.id') . ')'); - // [Interpretation 6460] Filter by sermonvvvw global. + // [Interpretation 6671] Filter by sermonvvvw global. $sermonvvvw = $this->sermonvvvw; if (is_numeric($sermonvvvw )) { @@ -164,36 +164,36 @@ class SermondistributorModelSermon extends JModelAdmin $query->where('a.sermon = -5'); } - // [Interpretation 6477] Join over the asset groups. + // [Interpretation 6688] Join over the asset groups. $query->select('ag.title AS access_level'); $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // [Interpretation 6480] Filter by access level. + // [Interpretation 6691] Filter by access level. if ($access = $this->getState('filter.access')) { $query->where('a.access = ' . (int) $access); } - // [Interpretation 6485] Implement View Level Access + // [Interpretation 6696] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [Interpretation 6492] Order the results by ordering + // [Interpretation 6703] Order the results by ordering $query->order('a.published ASC'); $query->order('a.ordering ASC'); - // [Interpretation 6494] Load the items + // [Interpretation 6705] Load the items $db->setQuery($query); $db->execute(); if ($db->getNumRows()) { $items = $db->loadObjectList(); - // [Interpretation 10171] set values to display correctly. + // [Interpretation 10402] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [Interpretation 10174] get user object. + // [Interpretation 10405] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -222,7 +222,7 @@ class SermondistributorModelSermon extends JModelAdmin * @since 1.6 */ public function getForm($data = array(), $loadData = true) - { // [Interpretation 9102] Get the form. + { // [Interpretation 9328] Get the form. $form = $this->loadForm('com_sermondistributor.sermon', 'sermon', array('control' => 'jform', 'load_data' => $loadData)); if (empty($form)) @@ -232,17 +232,17 @@ class SermondistributorModelSermon extends JModelAdmin $jinput = JFactory::getApplication()->input; - // [Interpretation 9129] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first. + // [Interpretation 9355] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first. if ($jinput->get('a_id')) { $id = $jinput->get('a_id', 0, 'INT'); } - // [Interpretation 9134] The back end uses id so we use that the rest of the time and set it to 0 by default. + // [Interpretation 9360] The back end uses id so we use that the rest of the time and set it to 0 by default. else { $id = $jinput->get('id', 0, 'INT'); } - // [Interpretation 9139] Determine correct permissions to check. + // [Interpretation 9365] Determine correct permissions to check. if ($this->getState('sermon.id')) { $id = $this->getState('sermon.id'); @@ -250,74 +250,74 @@ class SermondistributorModelSermon extends JModelAdmin $catid = 0; if (isset($this->getItem($id)->catid)) { - // [Interpretation 9146] set catagory id + // [Interpretation 9372] set catagory id $catid = $this->getItem($id)->catid; - // [Interpretation 9148] Existing record. Can only edit in selected categories. + // [Interpretation 9374] Existing record. Can only edit in selected categories. $form->setFieldAttribute('catid', 'action', 'core.edit'); - // [Interpretation 9150] Existing record. Can only edit own items in selected categories. + // [Interpretation 9376] Existing record. Can only edit own items in selected categories. $form->setFieldAttribute('catid', 'action', 'core.edit.own'); } } else { - // [Interpretation 9156] New record. Can only create in selected categories. + // [Interpretation 9382] New record. Can only create in selected categories. $form->setFieldAttribute('catid', 'action', 'core.create'); } $user = JFactory::getUser(); - // [Interpretation 9160] Check for existing item. - // [Interpretation 9161] Modify the form based on Edit State access controls. + // [Interpretation 9386] Check for existing item. + // [Interpretation 9387] 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'))) { - // [Interpretation 9176] Disable fields for display. + // [Interpretation 9402] Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); $form->setFieldAttribute('published', 'disabled', 'true'); - // [Interpretation 9179] Disable fields while saving. + // [Interpretation 9405] Disable fields while saving. $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } - // [Interpretation 9220] If this is a new item insure the greated by is set. + // [Interpretation 9446] If this is a new item insure the greated by is set. if (0 == $id) { - // [Interpretation 9223] Set the created_by to this user + // [Interpretation 9449] Set the created_by to this user $form->setValue('created_by', null, $user->id); } - // [Interpretation 9226] Modify the form based on Edit Creaded By access controls. + // [Interpretation 9452] Modify the form based on Edit Creaded By access controls. if ($id != 0 && (!$user->authorise('sermon.edit.created_by', 'com_sermondistributor.sermon.' . (int) $id)) || ($id == 0 && !$user->authorise('sermon.edit.created_by', 'com_sermondistributor'))) { - // [Interpretation 9238] Disable fields for display. + // [Interpretation 9464] Disable fields for display. $form->setFieldAttribute('created_by', 'disabled', 'true'); - // [Interpretation 9240] Disable fields for display. + // [Interpretation 9466] Disable fields for display. $form->setFieldAttribute('created_by', 'readonly', 'true'); - // [Interpretation 9242] Disable fields while saving. + // [Interpretation 9468] Disable fields while saving. $form->setFieldAttribute('created_by', 'filter', 'unset'); } - // [Interpretation 9245] Modify the form based on Edit Creaded Date access controls. + // [Interpretation 9471] Modify the form based on Edit Creaded Date access controls. if ($id != 0 && (!$user->authorise('sermon.edit.created', 'com_sermondistributor.sermon.' . (int) $id)) || ($id == 0 && !$user->authorise('sermon.edit.created', 'com_sermondistributor'))) { - // [Interpretation 9257] Disable fields for display. + // [Interpretation 9483] Disable fields for display. $form->setFieldAttribute('created', 'disabled', 'true'); - // [Interpretation 9259] Disable fields while saving. + // [Interpretation 9485] Disable fields while saving. $form->setFieldAttribute('created', 'filter', 'unset'); } - // [Interpretation 9292] Only load these values if no id is found + // [Interpretation 9518] Only load these values if no id is found if (0 == $id) { - // [Interpretation 9295] Set redirected field name + // [Interpretation 9521] Set redirected field name $redirectedField = $jinput->get('ref', null, 'STRING'); - // [Interpretation 9297] Set redirected field value + // [Interpretation 9523] Set redirected field value $redirectedValue = $jinput->get('refid', 0, 'INT'); if (0 != $redirectedValue && $redirectedField) { - // [Interpretation 9301] Now set the local-redirected field default value + // [Interpretation 9527] Now set the local-redirected field default value $form->setValue($redirectedField, null, $redirectedValue); } } @@ -358,7 +358,7 @@ class SermondistributorModelSermon extends JModelAdmin if ($allow) { - // [Interpretation 9394] The record has been set. Check the record permissions. + // [Interpretation 9620] The record has been set. Check the record permissions. return $user->authorise('sermon.delete', 'com_sermondistributor.sermon.' . (int) $record->id); } return $allow; @@ -382,14 +382,14 @@ class SermondistributorModelSermon extends JModelAdmin if ($recordId) { - // [Interpretation 9467] The record has been set. Check the record permissions. + // [Interpretation 9693] The record has been set. Check the record permissions. $permission = $user->authorise('sermon.edit.state', 'com_sermondistributor.sermon.' . (int) $recordId); if (!$permission && !is_null($permission)) { return false; } } - // [Interpretation 9483] Check against the category. + // [Interpretation 9709] Check against the category. if (!empty($record->catid)) { $catpermission = $user->authorise('core.edit.state', 'com_sermondistributor.sermons.category.' . (int) $record->catid); @@ -398,7 +398,7 @@ class SermondistributorModelSermon extends JModelAdmin return false; } } - // [Interpretation 9494] In the absense of better information, revert to the component permissions. + // [Interpretation 9720] In the absense of better information, revert to the component permissions. return $user->authorise('sermon.edit.state', 'com_sermondistributor'); } @@ -413,7 +413,7 @@ class SermondistributorModelSermon extends JModelAdmin */ protected function allowEdit($data = array(), $key = 'id') { - // [Interpretation 9335] Check specific edit permission then general edit permission. + // [Interpretation 9561] Check specific edit permission then general edit permission. $user = JFactory::getUser(); return $user->authorise('sermon.edit', 'com_sermondistributor.sermon.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('sermon.edit', 'com_sermondistributor'); @@ -512,20 +512,20 @@ class SermondistributorModelSermon extends JModelAdmin */ public function validate($form, $data, $group = null) { - // [Interpretation 8301] check if the not_required field is set + // [Interpretation 8522] check if the not_required field is set if (SermondistributorHelper::checkString($data['not_required'])) { $requiredFields = (array) explode(',',(string) $data['not_required']); $requiredFields = array_unique($requiredFields); - // [Interpretation 8306] now change the required field attributes value + // [Interpretation 8527] now change the required field attributes value foreach ($requiredFields as $requiredField) { - // [Interpretation 8309] make sure there is a string value + // [Interpretation 8530] make sure there is a string value if (SermondistributorHelper::checkString($requiredField)) { - // [Interpretation 8312] change to false + // [Interpretation 8533] change to false $form->setFieldAttribute($requiredField, 'required', 'false'); - // [Interpretation 8314] also clear the data set + // [Interpretation 8535] also clear the data set $data[$requiredField] = ''; } } diff --git a/admin/models/sermondistributor.php b/admin/models/sermondistributor.php index 9c48b1fa..3b244b02 100644 --- a/admin/models/sermondistributor.php +++ b/admin/models/sermondistributor.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php @@ -45,7 +45,7 @@ class SermondistributorModelSermondistributor extends JModelList $viewGroups = array( 'main' => array('png.preacher.add', 'png.preachers', 'png.sermon.add', 'png.sermons', 'png.sermons.catid', 'png.series.add', 'png.series_list', 'png.statistics', 'png.help_documents') ); - // [Interpretation 10559] view access array + // [Interpretation 10790] view access array $viewAccess = array( 'preacher.create' => 'preacher.create', 'preachers.access' => 'preacher.access', diff --git a/admin/models/sermons.php b/admin/models/sermons.php index 7f76d231..a11883ce 100644 --- a/admin/models/sermons.php +++ b/admin/models/sermons.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons.php @@ -129,16 +129,16 @@ class SermondistributorModelSermons extends JModelList */ public function getItems() { - // [Interpretation 10096] check in items + // [Interpretation 10327] check in items $this->checkInNow(); // load parent items $items = parent::getItems(); - // [Interpretation 10171] set values to display correctly. + // [Interpretation 10402] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [Interpretation 10174] get user object. + // [Interpretation 10405] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -152,14 +152,14 @@ class SermondistributorModelSermons extends JModelList } } - // [Interpretation 10443] set selection value to a translatable value + // [Interpretation 10674] set selection value to a translatable value if (SermondistributorHelper::checkArray($items)) { foreach ($items as $nr => &$item) { - // [Interpretation 10450] convert link_type + // [Interpretation 10681] convert link_type $item->link_type = $this->selectionTranslation($item->link_type, 'link_type'); - // [Interpretation 10450] convert source + // [Interpretation 10681] convert source $item->source = $this->selectionTranslation($item->source, 'source'); } } @@ -176,20 +176,20 @@ class SermondistributorModelSermons extends JModelList */ public function selectionTranslation($value,$name) { - // [Interpretation 10476] Array of link_type language strings + // [Interpretation 10707] Array of link_type language strings if ($name == 'link_type') { $link_typeArray = array( 1 => 'COM_SERMONDISTRIBUTOR_SERMON_ENCRYPTED', 2 => 'COM_SERMONDISTRIBUTOR_SERMON_DIRECT' ); - // [Interpretation 10507] Now check if value is found in this array + // [Interpretation 10738] Now check if value is found in this array if (isset($link_typeArray[$value]) && SermondistributorHelper::checkString($link_typeArray[$value])) { return $link_typeArray[$value]; } } - // [Interpretation 10476] Array of source language strings + // [Interpretation 10707] Array of source language strings if ($name == 'source') { $sourceArray = array( @@ -198,7 +198,7 @@ class SermondistributorModelSermons extends JModelList 2 => 'COM_SERMONDISTRIBUTOR_SERMON_DROPBOX', 3 => 'COM_SERMONDISTRIBUTOR_SERMON_URL' ); - // [Interpretation 10507] Now check if value is found in this array + // [Interpretation 10738] Now check if value is found in this array if (isset($sourceArray[$value]) && SermondistributorHelper::checkString($sourceArray[$value])) { return $sourceArray[$value]; @@ -214,29 +214,29 @@ class SermondistributorModelSermons extends JModelList */ protected function getListQuery() { - // [Interpretation 6981] Get the user object. + // [Interpretation 7194] Get the user object. $user = JFactory::getUser(); - // [Interpretation 6983] Create a new query object. + // [Interpretation 7196] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [Interpretation 6986] Select some fields + // [Interpretation 7199] Select some fields $query->select('a.*'); $query->select($db->quoteName('c.title','category_title')); - // [Interpretation 6993] From the sermondistributor_item table + // [Interpretation 7206] From the sermondistributor_item table $query->from($db->quoteName('#__sermondistributor_sermon', 'a')); $query->join('LEFT', $db->quoteName('#__categories', 'c') . ' ON (' . $db->quoteName('a.catid') . ' = ' . $db->quoteName('c.id') . ')'); - // [Interpretation 7134] From the sermondistributor_preacher table. + // [Interpretation 7347] From the sermondistributor_preacher table. $query->select($db->quoteName('g.name','preacher_name')); $query->join('LEFT', $db->quoteName('#__sermondistributor_preacher', 'g') . ' ON (' . $db->quoteName('a.preacher') . ' = ' . $db->quoteName('g.id') . ')'); - // [Interpretation 7134] From the sermondistributor_series table. + // [Interpretation 7347] From the sermondistributor_series table. $query->select($db->quoteName('h.name','series_name')); $query->join('LEFT', $db->quoteName('#__sermondistributor_series', 'h') . ' ON (' . $db->quoteName('a.series') . ' = ' . $db->quoteName('h.id') . ')'); - // [Interpretation 7007] Filter by published state + // [Interpretation 7220] Filter by published state $published = $this->getState('filter.published'); if (is_numeric($published)) { @@ -247,21 +247,21 @@ class SermondistributorModelSermons extends JModelList $query->where('(a.published = 0 OR a.published = 1)'); } - // [Interpretation 7019] Join over the asset groups. + // [Interpretation 7232] Join over the asset groups. $query->select('ag.title AS access_level'); $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // [Interpretation 7022] Filter by access level. + // [Interpretation 7235] Filter by access level. if ($access = $this->getState('filter.access')) { $query->where('a.access = ' . (int) $access); } - // [Interpretation 7027] Implement View Level Access + // [Interpretation 7240] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [Interpretation 7104] Filter by search. + // [Interpretation 7317] Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) { @@ -276,28 +276,28 @@ class SermondistributorModelSermons extends JModelList } } - // [Interpretation 7278] Filter by preacher. + // [Interpretation 7501] Filter by preacher. if ($preacher = $this->getState('filter.preacher')) { $query->where('a.preacher = ' . $db->quote($db->escape($preacher, true))); } - // [Interpretation 7278] Filter by series. + // [Interpretation 7501] Filter by series. if ($series = $this->getState('filter.series')) { $query->where('a.series = ' . $db->quote($db->escape($series, true))); } - // [Interpretation 7287] Filter by Link_type. + // [Interpretation 7510] Filter by Link_type. if ($link_type = $this->getState('filter.link_type')) { $query->where('a.link_type = ' . $db->quote($db->escape($link_type, true))); } - // [Interpretation 7287] Filter by Source. + // [Interpretation 7510] Filter by Source. if ($source = $this->getState('filter.source')) { $query->where('a.source = ' . $db->quote($db->escape($source, true))); } - // [Interpretation 7041] Filter by a single or group of categories. + // [Interpretation 7254] Filter by a single or group of categories. $baselevel = 1; $categoryId = $this->getState('filter.category_id'); @@ -319,7 +319,7 @@ class SermondistributorModelSermons extends JModelList } - // [Interpretation 7063] Add the list ordering clause. + // [Interpretation 7276] Add the list ordering clause. $orderCol = $this->state->get('list.ordering', 'a.id'); $orderDirn = $this->state->get('list.direction', 'asc'); if ($orderCol != '') @@ -337,42 +337,44 @@ class SermondistributorModelSermons extends JModelList */ public function getExportData($pks) { - // [Interpretation 6718] setup the query + // [Interpretation 6929] setup the query if (SermondistributorHelper::checkArray($pks)) { - // [Interpretation 6721] Get the user object. + // [Interpretation 6932] Set a value to know this is exporting method. + $_export = true; + // [Interpretation 6934] Get the user object. $user = JFactory::getUser(); - // [Interpretation 6723] Create a new query object. + // [Interpretation 6936] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [Interpretation 6726] Select some fields + // [Interpretation 6939] Select some fields $query->select('a.*'); - // [Interpretation 6728] From the sermondistributor_sermon table + // [Interpretation 6941] From the sermondistributor_sermon table $query->from($db->quoteName('#__sermondistributor_sermon', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); - // [Interpretation 6738] Implement View Level Access + // [Interpretation 6951] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [Interpretation 6745] Order the results by ordering + // [Interpretation 6958] Order the results by ordering $query->order('a.ordering ASC'); - // [Interpretation 6747] Load the items + // [Interpretation 6960] Load the items $db->setQuery($query); $db->execute(); if ($db->getNumRows()) { $items = $db->loadObjectList(); - // [Interpretation 10171] set values to display correctly. + // [Interpretation 10402] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [Interpretation 10174] get user object. + // [Interpretation 10405] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -383,13 +385,13 @@ class SermondistributorModelSermons extends JModelList continue; } - // [Interpretation 10390] unset the values we don't want exported. + // [Interpretation 10621] unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); unset($item->checked_out_time); } } - // [Interpretation 10399] Add headers to items array. + // [Interpretation 10630] Add headers to items array. $headers = $this->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { @@ -408,13 +410,13 @@ class SermondistributorModelSermons extends JModelList */ public function getExImPortHeaders() { - // [Interpretation 6767] Get a db connection. + // [Interpretation 6980] Get a db connection. $db = JFactory::getDbo(); - // [Interpretation 6769] get the columns + // [Interpretation 6982] get the columns $columns = $db->getTableColumns("#__sermondistributor_sermon"); if (SermondistributorHelper::checkArray($columns)) { - // [Interpretation 6773] remove the headers you don't import/export. + // [Interpretation 6986] remove the headers you don't import/export. unset($columns['asset_id']); unset($columns['checked_out']); unset($columns['checked_out_time']); @@ -436,7 +438,7 @@ class SermondistributorModelSermons extends JModelList */ protected function getStoreId($id = '') { - // [Interpretation 9719] Compile the store id. + // [Interpretation 9945] Compile the store id. $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); @@ -464,15 +466,15 @@ class SermondistributorModelSermons extends JModelList */ protected function checkInNow() { - // [Interpretation 10112] Get set check in time + // [Interpretation 10343] Get set check in time $time = JComponentHelper::getParams('com_sermondistributor')->get('check_in'); if ($time) { - // [Interpretation 10117] Get a db connection. + // [Interpretation 10348] Get a db connection. $db = JFactory::getDbo(); - // [Interpretation 10119] reset query + // [Interpretation 10350] reset query $query = $db->getQuery(true); $query->select('*'); $query->from($db->quoteName('#__sermondistributor_sermon')); @@ -480,24 +482,24 @@ class SermondistributorModelSermons extends JModelList $db->execute(); if ($db->getNumRows()) { - // [Interpretation 10127] Get Yesterdays date + // [Interpretation 10358] Get Yesterdays date $date = JFactory::getDate()->modify($time)->toSql(); - // [Interpretation 10129] reset query + // [Interpretation 10360] reset query $query = $db->getQuery(true); - // [Interpretation 10131] Fields to update. + // [Interpretation 10362] Fields to update. $fields = array( $db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'', $db->quoteName('checked_out') . '=0' ); - // [Interpretation 10136] Conditions for which records should be updated. + // [Interpretation 10367] Conditions for which records should be updated. $conditions = array( $db->quoteName('checked_out') . '!=0', $db->quoteName('checked_out_time') . '<\''.$date.'\'' ); - // [Interpretation 10141] Check table + // [Interpretation 10372] Check table $query->update($db->quoteName('#__sermondistributor_sermon'))->set($fields)->where($conditions); $db->setQuery($query); diff --git a/admin/models/statistic.php b/admin/models/statistic.php index 465605f7..06c970eb 100644 --- a/admin/models/statistic.php +++ b/admin/models/statistic.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage statistic.php @@ -116,7 +116,7 @@ class SermondistributorModelStatistic extends JModelAdmin * @since 1.6 */ public function getForm($data = array(), $loadData = true) - { // [Interpretation 9102] Get the form. + { // [Interpretation 9328] Get the form. $form = $this->loadForm('com_sermondistributor.statistic', 'statistic', array('control' => 'jform', 'load_data' => $loadData)); if (empty($form)) @@ -126,12 +126,12 @@ class SermondistributorModelStatistic extends JModelAdmin $jinput = JFactory::getApplication()->input; - // [Interpretation 9187] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first. + // [Interpretation 9413] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first. if ($jinput->get('a_id')) { $id = $jinput->get('a_id', 0, 'INT'); } - // [Interpretation 9192] The back end uses id so we use that the rest of the time and set it to 0 by default. + // [Interpretation 9418] The back end uses id so we use that the rest of the time and set it to 0 by default. else { $id = $jinput->get('id', 0, 'INT'); @@ -139,54 +139,54 @@ class SermondistributorModelStatistic extends JModelAdmin $user = JFactory::getUser(); - // [Interpretation 9198] Check for existing item. - // [Interpretation 9199] Modify the form based on Edit State access controls. + // [Interpretation 9424] Check for existing item. + // [Interpretation 9425] Modify the form based on Edit State access controls. if ($id != 0 && (!$user->authorise('statistic.edit.state', 'com_sermondistributor.statistic.' . (int) $id)) || ($id == 0 && !$user->authorise('statistic.edit.state', 'com_sermondistributor'))) { - // [Interpretation 9212] Disable fields for display. + // [Interpretation 9438] Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); $form->setFieldAttribute('published', 'disabled', 'true'); - // [Interpretation 9215] Disable fields while saving. + // [Interpretation 9441] Disable fields while saving. $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } - // [Interpretation 9220] If this is a new item insure the greated by is set. + // [Interpretation 9446] If this is a new item insure the greated by is set. if (0 == $id) { - // [Interpretation 9223] Set the created_by to this user + // [Interpretation 9449] Set the created_by to this user $form->setValue('created_by', null, $user->id); } - // [Interpretation 9226] Modify the form based on Edit Creaded By access controls. + // [Interpretation 9452] Modify the form based on Edit Creaded By access controls. if ($id != 0 && (!$user->authorise('statistic.edit.created_by', 'com_sermondistributor.statistic.' . (int) $id)) || ($id == 0 && !$user->authorise('statistic.edit.created_by', 'com_sermondistributor'))) { - // [Interpretation 9238] Disable fields for display. + // [Interpretation 9464] Disable fields for display. $form->setFieldAttribute('created_by', 'disabled', 'true'); - // [Interpretation 9240] Disable fields for display. + // [Interpretation 9466] Disable fields for display. $form->setFieldAttribute('created_by', 'readonly', 'true'); - // [Interpretation 9242] Disable fields while saving. + // [Interpretation 9468] Disable fields while saving. $form->setFieldAttribute('created_by', 'filter', 'unset'); } - // [Interpretation 9245] Modify the form based on Edit Creaded Date access controls. + // [Interpretation 9471] Modify the form based on Edit Creaded Date access controls. if ($id != 0 && (!$user->authorise('statistic.edit.created', 'com_sermondistributor.statistic.' . (int) $id)) || ($id == 0 && !$user->authorise('statistic.edit.created', 'com_sermondistributor'))) { - // [Interpretation 9257] Disable fields for display. + // [Interpretation 9483] Disable fields for display. $form->setFieldAttribute('created', 'disabled', 'true'); - // [Interpretation 9259] Disable fields while saving. + // [Interpretation 9485] Disable fields while saving. $form->setFieldAttribute('created', 'filter', 'unset'); } - // [Interpretation 9292] Only load these values if no id is found + // [Interpretation 9518] Only load these values if no id is found if (0 == $id) { - // [Interpretation 9295] Set redirected field name + // [Interpretation 9521] Set redirected field name $redirectedField = $jinput->get('ref', null, 'STRING'); - // [Interpretation 9297] Set redirected field value + // [Interpretation 9523] Set redirected field value $redirectedValue = $jinput->get('refid', 0, 'INT'); if (0 != $redirectedValue && $redirectedField) { - // [Interpretation 9301] Now set the local-redirected field default value + // [Interpretation 9527] Now set the local-redirected field default value $form->setValue($redirectedField, null, $redirectedValue); } } @@ -223,7 +223,7 @@ class SermondistributorModelStatistic extends JModelAdmin } $user = JFactory::getUser(); - // [Interpretation 9423] The record has been set. Check the record permissions. + // [Interpretation 9649] The record has been set. Check the record permissions. return $user->authorise('statistic.delete', 'com_sermondistributor.statistic.' . (int) $record->id); } return false; @@ -245,14 +245,14 @@ class SermondistributorModelStatistic extends JModelAdmin if ($recordId) { - // [Interpretation 9510] The record has been set. Check the record permissions. + // [Interpretation 9736] The record has been set. Check the record permissions. $permission = $user->authorise('statistic.edit.state', 'com_sermondistributor.statistic.' . (int) $recordId); if (!$permission && !is_null($permission)) { return false; } } - // [Interpretation 9527] In the absense of better information, revert to the component permissions. + // [Interpretation 9753] In the absense of better information, revert to the component permissions. return $user->authorise('statistic.edit.state', 'com_sermondistributor'); } @@ -267,7 +267,7 @@ class SermondistributorModelStatistic extends JModelAdmin */ protected function allowEdit($data = array(), $key = 'id') { - // [Interpretation 9335] Check specific edit permission then general edit permission. + // [Interpretation 9561] Check specific edit permission then general edit permission. $user = JFactory::getUser(); return $user->authorise('statistic.edit', 'com_sermondistributor.statistic.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('statistic.edit', 'com_sermondistributor'); diff --git a/admin/models/statistics.php b/admin/models/statistics.php index f2bb981c..ec13a711 100644 --- a/admin/models/statistics.php +++ b/admin/models/statistics.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage statistics.php @@ -113,16 +113,16 @@ class SermondistributorModelStatistics extends JModelList */ public function getItems() { - // [Interpretation 10096] check in items + // [Interpretation 10327] check in items $this->checkInNow(); // load parent items $items = parent::getItems(); - // [Interpretation 10171] set values to display correctly. + // [Interpretation 10402] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [Interpretation 10174] get user object. + // [Interpretation 10405] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -147,31 +147,31 @@ class SermondistributorModelStatistics extends JModelList */ protected function getListQuery() { - // [Interpretation 6981] Get the user object. + // [Interpretation 7194] Get the user object. $user = JFactory::getUser(); - // [Interpretation 6983] Create a new query object. + // [Interpretation 7196] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [Interpretation 6986] Select some fields + // [Interpretation 7199] Select some fields $query->select('a.*'); - // [Interpretation 6993] From the sermondistributor_item table + // [Interpretation 7206] From the sermondistributor_item table $query->from($db->quoteName('#__sermondistributor_statistic', 'a')); - // [Interpretation 7134] From the sermondistributor_sermon table. + // [Interpretation 7347] From the sermondistributor_sermon table. $query->select($db->quoteName('g.name','sermon_name')); $query->join('LEFT', $db->quoteName('#__sermondistributor_sermon', 'g') . ' ON (' . $db->quoteName('a.sermon') . ' = ' . $db->quoteName('g.id') . ')'); - // [Interpretation 7134] From the sermondistributor_preacher table. + // [Interpretation 7347] From the sermondistributor_preacher table. $query->select($db->quoteName('h.name','preacher_name')); $query->join('LEFT', $db->quoteName('#__sermondistributor_preacher', 'h') . ' ON (' . $db->quoteName('a.preacher') . ' = ' . $db->quoteName('h.id') . ')'); - // [Interpretation 7134] From the sermondistributor_series table. + // [Interpretation 7347] From the sermondistributor_series table. $query->select($db->quoteName('i.name','series_name')); $query->join('LEFT', $db->quoteName('#__sermondistributor_series', 'i') . ' ON (' . $db->quoteName('a.series') . ' = ' . $db->quoteName('i.id') . ')'); - // [Interpretation 7007] Filter by published state + // [Interpretation 7220] Filter by published state $published = $this->getState('filter.published'); if (is_numeric($published)) { @@ -182,21 +182,21 @@ class SermondistributorModelStatistics extends JModelList $query->where('(a.published = 0 OR a.published = 1)'); } - // [Interpretation 7019] Join over the asset groups. + // [Interpretation 7232] Join over the asset groups. $query->select('ag.title AS access_level'); $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // [Interpretation 7022] Filter by access level. + // [Interpretation 7235] Filter by access level. if ($access = $this->getState('filter.access')) { $query->where('a.access = ' . (int) $access); } - // [Interpretation 7027] Implement View Level Access + // [Interpretation 7240] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [Interpretation 7104] Filter by search. + // [Interpretation 7317] Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) { @@ -211,23 +211,23 @@ class SermondistributorModelStatistics extends JModelList } } - // [Interpretation 7278] Filter by sermon. + // [Interpretation 7501] Filter by sermon. if ($sermon = $this->getState('filter.sermon')) { $query->where('a.sermon = ' . $db->quote($db->escape($sermon, true))); } - // [Interpretation 7278] Filter by preacher. + // [Interpretation 7501] Filter by preacher. if ($preacher = $this->getState('filter.preacher')) { $query->where('a.preacher = ' . $db->quote($db->escape($preacher, true))); } - // [Interpretation 7278] Filter by series. + // [Interpretation 7501] Filter by series. if ($series = $this->getState('filter.series')) { $query->where('a.series = ' . $db->quote($db->escape($series, true))); } - // [Interpretation 7063] Add the list ordering clause. + // [Interpretation 7276] Add the list ordering clause. $orderCol = $this->state->get('list.ordering', 'a.id'); $orderDirn = $this->state->get('list.direction', 'asc'); if ($orderCol != '') @@ -245,42 +245,44 @@ class SermondistributorModelStatistics extends JModelList */ public function getExportData($pks) { - // [Interpretation 6718] setup the query + // [Interpretation 6929] setup the query if (SermondistributorHelper::checkArray($pks)) { - // [Interpretation 6721] Get the user object. + // [Interpretation 6932] Set a value to know this is exporting method. + $_export = true; + // [Interpretation 6934] Get the user object. $user = JFactory::getUser(); - // [Interpretation 6723] Create a new query object. + // [Interpretation 6936] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [Interpretation 6726] Select some fields + // [Interpretation 6939] Select some fields $query->select('a.*'); - // [Interpretation 6728] From the sermondistributor_statistic table + // [Interpretation 6941] From the sermondistributor_statistic table $query->from($db->quoteName('#__sermondistributor_statistic', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); - // [Interpretation 6738] Implement View Level Access + // [Interpretation 6951] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [Interpretation 6745] Order the results by ordering + // [Interpretation 6958] Order the results by ordering $query->order('a.ordering ASC'); - // [Interpretation 6747] Load the items + // [Interpretation 6960] Load the items $db->setQuery($query); $db->execute(); if ($db->getNumRows()) { $items = $db->loadObjectList(); - // [Interpretation 10171] set values to display correctly. + // [Interpretation 10402] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [Interpretation 10174] get user object. + // [Interpretation 10405] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -291,13 +293,13 @@ class SermondistributorModelStatistics extends JModelList continue; } - // [Interpretation 10390] unset the values we don't want exported. + // [Interpretation 10621] unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); unset($item->checked_out_time); } } - // [Interpretation 10399] Add headers to items array. + // [Interpretation 10630] Add headers to items array. $headers = $this->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { @@ -316,13 +318,13 @@ class SermondistributorModelStatistics extends JModelList */ public function getExImPortHeaders() { - // [Interpretation 6767] Get a db connection. + // [Interpretation 6980] Get a db connection. $db = JFactory::getDbo(); - // [Interpretation 6769] get the columns + // [Interpretation 6982] get the columns $columns = $db->getTableColumns("#__sermondistributor_statistic"); if (SermondistributorHelper::checkArray($columns)) { - // [Interpretation 6773] remove the headers you don't import/export. + // [Interpretation 6986] remove the headers you don't import/export. unset($columns['asset_id']); unset($columns['checked_out']); unset($columns['checked_out_time']); @@ -344,7 +346,7 @@ class SermondistributorModelStatistics extends JModelList */ protected function getStoreId($id = '') { - // [Interpretation 9719] Compile the store id. + // [Interpretation 9945] Compile the store id. $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); @@ -368,15 +370,15 @@ class SermondistributorModelStatistics extends JModelList */ protected function checkInNow() { - // [Interpretation 10112] Get set check in time + // [Interpretation 10343] Get set check in time $time = JComponentHelper::getParams('com_sermondistributor')->get('check_in'); if ($time) { - // [Interpretation 10117] Get a db connection. + // [Interpretation 10348] Get a db connection. $db = JFactory::getDbo(); - // [Interpretation 10119] reset query + // [Interpretation 10350] reset query $query = $db->getQuery(true); $query->select('*'); $query->from($db->quoteName('#__sermondistributor_statistic')); @@ -384,24 +386,24 @@ class SermondistributorModelStatistics extends JModelList $db->execute(); if ($db->getNumRows()) { - // [Interpretation 10127] Get Yesterdays date + // [Interpretation 10358] Get Yesterdays date $date = JFactory::getDate()->modify($time)->toSql(); - // [Interpretation 10129] reset query + // [Interpretation 10360] reset query $query = $db->getQuery(true); - // [Interpretation 10131] Fields to update. + // [Interpretation 10362] Fields to update. $fields = array( $db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'', $db->quoteName('checked_out') . '=0' ); - // [Interpretation 10136] Conditions for which records should be updated. + // [Interpretation 10367] Conditions for which records should be updated. $conditions = array( $db->quoteName('checked_out') . '!=0', $db->quoteName('checked_out_time') . '<\''.$date.'\'' ); - // [Interpretation 10141] Check table + // [Interpretation 10372] Check table $query->update($db->quoteName('#__sermondistributor_statistic'))->set($fields)->where($conditions); $db->setQuery($query); diff --git a/admin/sermondistributor.php b/admin/sermondistributor.php index 2a8121fd..540747d0 100644 --- a/admin/sermondistributor.php +++ b/admin/sermondistributor.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @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 f1e8fa6c..7aea2349 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -194,3 +194,9 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_help_document` ( KEY `idx_article` (`article`) ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; + + +-- +-- Always insure this column is large enough for all the access control values. +-- +ALTER TABLE `#__assets` CHANGE `rules` `rules` MEDIUMTEXT NOT NULL COMMENT 'JSON encoded access control.'; diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index 66b8e429..eb2aa62b 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help_document.php diff --git a/admin/tables/preacher.php b/admin/tables/preacher.php index bebd5588..0db224cb 100644 --- a/admin/tables/preacher.php +++ b/admin/tables/preacher.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.php diff --git a/admin/tables/series.php b/admin/tables/series.php index be4f1b8c..3ecc10f4 100644 --- a/admin/tables/series.php +++ b/admin/tables/series.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php diff --git a/admin/tables/sermon.php b/admin/tables/sermon.php index 21be7d93..ac434d77 100644 --- a/admin/tables/sermon.php +++ b/admin/tables/sermon.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php diff --git a/admin/tables/statistic.php b/admin/tables/statistic.php index 51fc6d40..407048ab 100644 --- a/admin/tables/statistic.php +++ b/admin/tables/statistic.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage statistic.php diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js index bb256de9..9f2bcdac 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage submitbutton.js diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php index 2ac87912..6d45308e 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 26th May, 2016 + @build 24th June, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage edit.php @@ -33,7 +33,29 @@ JHtml::_('formbehavior.chosen', 'select'); JHtml::_('behavior.keepalive'); $componentParams = JComponentHelper::getParams('com_sermondistributor'); ?> - + + @@ -98,7 +120,8 @@ $componentParams = JComponentHelper::getParams('com_sermondistributor'); - + +