diff --git a/admin/config.xml b/admin/config.xml index 9461b3eb..d399d938 100644 --- a/admin/config.xml +++ b/admin/config.xml @@ -45,7 +45,7 @@ /> - + - + - + - + - + - + - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_AUTO_LOAD" @@ -371,7 +371,7 @@ description="COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_MIN_DESC" class="btn-group btn-group-yesno" default=""> - + COM_SERMONDISTRIBUTOR_CONFIG_NO" @@ -383,7 +383,7 @@ description="COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_STYLE_DESC" class="btn-group btn-group-yesno" default=""> - + COM_SERMONDISTRIBUTOR_CONFIG_FLAT_LOAD" @@ -396,9 +396,9 @@ name="dropbox_custom_config" label="COM_SERMONDISTRIBUTOR_CONFIG_DROPBOX"> - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_MPTHREE @@ -480,11 +480,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 @@ -686,7 +686,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_TRASHED - + - + COM_SERMONDISTRIBUTOR_CONFIG_PUBLISHED @@ -706,7 +706,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_TRASHED - + - + COM_SERMONDISTRIBUTOR_CONFIG_PUBLISHED @@ -726,7 +726,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_TRASHED - + - + COM_SERMONDISTRIBUTOR_CONFIG_ENCRYPTED @@ -745,7 +745,7 @@ name="preachers_custom_config" label="COM_SERMONDISTRIBUTOR_CONFIG_PREACHERS"> - + - + COM_SERMONDISTRIBUTOR_CONFIG_TABLE @@ -761,7 +761,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_LIST - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -781,7 +781,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED - + - + COM_SERMONDISTRIBUTOR_CONFIG_BLUE @@ -811,7 +811,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 @@ -900,7 +900,7 @@ name="preacher_custom_config" label="COM_SERMONDISTRIBUTOR_CONFIG_PREACHER"> - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_PANEL @@ -925,7 +925,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SMALL - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -959,7 +959,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 @@ -1061,7 +1061,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_LIST - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -1081,7 +1081,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED - + - + COM_SERMONDISTRIBUTOR_CONFIG_BLUE @@ -1111,7 +1111,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 @@ -1228,7 +1228,7 @@ name="categories_custom_config" label="COM_SERMONDISTRIBUTOR_CONFIG_CATEGORIES"> - + - + COM_SERMONDISTRIBUTOR_CONFIG_TABLE @@ -1244,7 +1244,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_LIST - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -1264,7 +1264,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED - + - + COM_SERMONDISTRIBUTOR_CONFIG_BLUE @@ -1294,7 +1294,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 @@ -1355,7 +1355,7 @@ name="category_custom_config" label="COM_SERMONDISTRIBUTOR_CONFIG_CATEGORY"> - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_PANEL @@ -1380,7 +1380,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SMALL - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -1414,7 +1414,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 @@ -1488,7 +1488,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_LIST - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -1508,7 +1508,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED - + - + COM_SERMONDISTRIBUTOR_CONFIG_BLUE @@ -1538,7 +1538,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 @@ -1655,7 +1655,7 @@ name="series_list_custom_config" label="COM_SERMONDISTRIBUTOR_CONFIG_SERIES_LIST"> - + - + COM_SERMONDISTRIBUTOR_CONFIG_TABLE @@ -1671,7 +1671,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_LIST - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -1691,7 +1691,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED - + - + COM_SERMONDISTRIBUTOR_CONFIG_BLUE @@ -1721,7 +1721,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 @@ -1782,7 +1782,7 @@ name="series_custom_config" label="COM_SERMONDISTRIBUTOR_CONFIG_SERIES"> - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_PANEL @@ -1807,7 +1807,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SMALL - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -1841,7 +1841,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 @@ -1915,7 +1915,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_LIST - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -1935,7 +1935,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED - + - + COM_SERMONDISTRIBUTOR_CONFIG_BLUE @@ -1965,7 +1965,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 @@ -2082,7 +2082,7 @@ name="sermon_custom_config" label="COM_SERMONDISTRIBUTOR_CONFIG_SERMON"> - + - + - + COM_SERMONDISTRIBUTOR_CONFIG_PANEL @@ -2107,7 +2107,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_BIG - + - + COM_SERMONDISTRIBUTOR_CONFIG_YES COM_SERMONDISTRIBUTOR_CONFIG_NO - + - + COM_SERMONDISTRIBUTOR_CONFIG_PLAIN @@ -2141,7 +2141,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/controllers/help_document.php b/admin/controllers/help_document.php index 7ffd762e..d413a0b0 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -55,13 +55,13 @@ class SermondistributorControllerHelp_document extends JControllerForm */ protected function allowAdd($data = array()) { - // [9312] Access check. + // [9319] Access check. $access = JFactory::getUser()->authorise('help_document.access', 'com_sermondistributor'); if (!$access) { return false; } - // [9323] In the absense of better information, revert to the component permissions. + // [9330] In the absense of better information, revert to the component permissions. return JFactory::getUser()->authorise('help_document.create', $this->option); } @@ -77,13 +77,13 @@ class SermondistributorControllerHelp_document extends JControllerForm */ protected function allowEdit($data = array(), $key = 'id') { - // [9466] get user object. + // [9473] get user object. $user = JFactory::getUser(); - // [9468] get record id. + // [9475] get record id. $recordId = (int) isset($data[$key]) ? $data[$key] : 0; - // [9475] Access check. + // [9482] Access check. $access = ($user->authorise('help_document.access', 'com_sermondistributor.help_document.' . (int) $recordId) && $user->authorise('help_document.access', 'com_sermondistributor')); if (!$access) { @@ -92,17 +92,17 @@ class SermondistributorControllerHelp_document extends JControllerForm if ($recordId) { - // [9484] The record has been set. Check the record permissions. + // [9491] 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)) { - // [9506] Now test the owner is the user. + // [9513] Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; if (empty($ownerId)) { - // [9510] Need to do a lookup from the model. + // [9517] Need to do a lookup from the model. $record = $this->getModel()->getItem($recordId); if (empty($record)) @@ -112,7 +112,7 @@ class SermondistributorControllerHelp_document extends JControllerForm $ownerId = $record->created_by; } - // [9518] If the owner matches 'me' then allow. + // [9525] If the owner matches 'me' then allow. if ($ownerId == $user->id) { if ($user->authorise('help_document.edit.own', 'com_sermondistributor')) @@ -124,7 +124,7 @@ class SermondistributorControllerHelp_document extends JControllerForm return false; } } - // [9540] Since there is no permission, revert to the component permissions. + // [9547] 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 38dac123..22cd3978 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -43,29 +43,29 @@ class SermondistributorControllerHelp_documents extends JControllerAdmin public function exportData() { - // [7262] Check for request forgeries + // [7269] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [7264] check if export is allowed for this user. + // [7271] 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')) { - // [7268] Get the input + // [7275] Get the input $input = JFactory::getApplication()->input; $pks = $input->post->get('cid', array(), 'array'); - // [7271] Sanitize the input + // [7278] Sanitize the input JArrayHelper::toInteger($pks); - // [7273] Get the model + // [7280] Get the model $model = $this->getModel('Help_documents'); - // [7275] get the data to export + // [7282] get the data to export $data = $model->getExportData($pks); if (SermondistributorHelper::checkArray($data)) { - // [7279] now set the data to the spreadsheet + // [7286] 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'); } } - // [7284] Redirect to the list screen with error. + // [7291] 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; @@ -74,31 +74,31 @@ class SermondistributorControllerHelp_documents extends JControllerAdmin public function importData() { - // [7293] Check for request forgeries + // [7300] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [7295] check if import is allowed for this user. + // [7302] 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')) { - // [7299] Get the import model + // [7306] Get the import model $model = $this->getModel('Help_documents'); - // [7301] get the headers to import + // [7308] get the headers to import $headers = $model->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { - // [7305] Load headers to session. + // [7312] 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'); - // [7311] Redirect to import view. + // [7318] 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; } } - // [7323] Redirect to the list screen with error. + // [7330] 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/preacher.php b/admin/controllers/preacher.php index b3ea7ec3..48e115ca 100644 --- a/admin/controllers/preacher.php +++ b/admin/controllers/preacher.php @@ -55,13 +55,13 @@ class SermondistributorControllerPreacher extends JControllerForm */ protected function allowAdd($data = array()) { - // [9312] Access check. + // [9319] Access check. $access = JFactory::getUser()->authorise('preacher.access', 'com_sermondistributor'); if (!$access) { return false; } - // [9323] In the absense of better information, revert to the component permissions. + // [9330] In the absense of better information, revert to the component permissions. return JFactory::getUser()->authorise('preacher.create', $this->option); } @@ -77,13 +77,13 @@ class SermondistributorControllerPreacher extends JControllerForm */ protected function allowEdit($data = array(), $key = 'id') { - // [9466] get user object. + // [9473] get user object. $user = JFactory::getUser(); - // [9468] get record id. + // [9475] get record id. $recordId = (int) isset($data[$key]) ? $data[$key] : 0; - // [9475] Access check. + // [9482] Access check. $access = ($user->authorise('preacher.access', 'com_sermondistributor.preacher.' . (int) $recordId) && $user->authorise('preacher.access', 'com_sermondistributor')); if (!$access) { @@ -92,17 +92,17 @@ class SermondistributorControllerPreacher extends JControllerForm if ($recordId) { - // [9484] The record has been set. Check the record permissions. + // [9491] 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)) { - // [9506] Now test the owner is the user. + // [9513] Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; if (empty($ownerId)) { - // [9510] Need to do a lookup from the model. + // [9517] Need to do a lookup from the model. $record = $this->getModel()->getItem($recordId); if (empty($record)) @@ -112,7 +112,7 @@ class SermondistributorControllerPreacher extends JControllerForm $ownerId = $record->created_by; } - // [9518] If the owner matches 'me' then allow. + // [9525] If the owner matches 'me' then allow. if ($ownerId == $user->id) { if ($user->authorise('preacher.edit.own', 'com_sermondistributor')) @@ -124,7 +124,7 @@ class SermondistributorControllerPreacher extends JControllerForm return false; } } - // [9540] Since there is no permission, revert to the component permissions. + // [9547] 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 38ecc42b..f14a4931 100644 --- a/admin/controllers/preachers.php +++ b/admin/controllers/preachers.php @@ -43,29 +43,29 @@ class SermondistributorControllerPreachers extends JControllerAdmin public function exportData() { - // [7262] Check for request forgeries + // [7269] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [7264] check if export is allowed for this user. + // [7271] check if export is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('preacher.export', 'com_sermondistributor') && $user->authorise('core.export', 'com_sermondistributor')) { - // [7268] Get the input + // [7275] Get the input $input = JFactory::getApplication()->input; $pks = $input->post->get('cid', array(), 'array'); - // [7271] Sanitize the input + // [7278] Sanitize the input JArrayHelper::toInteger($pks); - // [7273] Get the model + // [7280] Get the model $model = $this->getModel('Preachers'); - // [7275] get the data to export + // [7282] get the data to export $data = $model->getExportData($pks); if (SermondistributorHelper::checkArray($data)) { - // [7279] now set the data to the spreadsheet + // [7286] 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'); } } - // [7284] Redirect to the list screen with error. + // [7291] 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; @@ -74,31 +74,31 @@ class SermondistributorControllerPreachers extends JControllerAdmin public function importData() { - // [7293] Check for request forgeries + // [7300] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [7295] check if import is allowed for this user. + // [7302] check if import is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('preacher.import', 'com_sermondistributor') && $user->authorise('core.import', 'com_sermondistributor')) { - // [7299] Get the import model + // [7306] Get the import model $model = $this->getModel('Preachers'); - // [7301] get the headers to import + // [7308] get the headers to import $headers = $model->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { - // [7305] Load headers to session. + // [7312] 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'); - // [7311] Redirect to import view. + // [7318] 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; } } - // [7323] Redirect to the list screen with error. + // [7330] 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 07ff138f..0e3fdf96 100644 --- a/admin/controllers/series.php +++ b/admin/controllers/series.php @@ -55,13 +55,13 @@ class SermondistributorControllerSeries extends JControllerForm */ protected function allowAdd($data = array()) { - // [9312] Access check. + // [9319] Access check. $access = JFactory::getUser()->authorise('series.access', 'com_sermondistributor'); if (!$access) { return false; } - // [9323] In the absense of better information, revert to the component permissions. + // [9330] In the absense of better information, revert to the component permissions. return JFactory::getUser()->authorise('series.create', $this->option); } @@ -77,13 +77,13 @@ class SermondistributorControllerSeries extends JControllerForm */ protected function allowEdit($data = array(), $key = 'id') { - // [9466] get user object. + // [9473] get user object. $user = JFactory::getUser(); - // [9468] get record id. + // [9475] get record id. $recordId = (int) isset($data[$key]) ? $data[$key] : 0; - // [9475] Access check. + // [9482] Access check. $access = ($user->authorise('series.access', 'com_sermondistributor.series.' . (int) $recordId) && $user->authorise('series.access', 'com_sermondistributor')); if (!$access) { @@ -92,17 +92,17 @@ class SermondistributorControllerSeries extends JControllerForm if ($recordId) { - // [9484] The record has been set. Check the record permissions. + // [9491] 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)) { - // [9506] Now test the owner is the user. + // [9513] Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; if (empty($ownerId)) { - // [9510] Need to do a lookup from the model. + // [9517] Need to do a lookup from the model. $record = $this->getModel()->getItem($recordId); if (empty($record)) @@ -112,7 +112,7 @@ class SermondistributorControllerSeries extends JControllerForm $ownerId = $record->created_by; } - // [9518] If the owner matches 'me' then allow. + // [9525] If the owner matches 'me' then allow. if ($ownerId == $user->id) { if ($user->authorise('series.edit.own', 'com_sermondistributor')) @@ -124,7 +124,7 @@ class SermondistributorControllerSeries extends JControllerForm return false; } } - // [9540] Since there is no permission, revert to the component permissions. + // [9547] 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 a249fd29..7d0987a3 100644 --- a/admin/controllers/series_list.php +++ b/admin/controllers/series_list.php @@ -43,29 +43,29 @@ class SermondistributorControllerSeries_list extends JControllerAdmin public function exportData() { - // [7262] Check for request forgeries + // [7269] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [7264] check if export is allowed for this user. + // [7271] check if export is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('series.export', 'com_sermondistributor') && $user->authorise('core.export', 'com_sermondistributor')) { - // [7268] Get the input + // [7275] Get the input $input = JFactory::getApplication()->input; $pks = $input->post->get('cid', array(), 'array'); - // [7271] Sanitize the input + // [7278] Sanitize the input JArrayHelper::toInteger($pks); - // [7273] Get the model + // [7280] Get the model $model = $this->getModel('Series_list'); - // [7275] get the data to export + // [7282] get the data to export $data = $model->getExportData($pks); if (SermondistributorHelper::checkArray($data)) { - // [7279] now set the data to the spreadsheet + // [7286] 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'); } } - // [7284] Redirect to the list screen with error. + // [7291] 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; @@ -74,31 +74,31 @@ class SermondistributorControllerSeries_list extends JControllerAdmin public function importData() { - // [7293] Check for request forgeries + // [7300] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [7295] check if import is allowed for this user. + // [7302] check if import is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('series.import', 'com_sermondistributor') && $user->authorise('core.import', 'com_sermondistributor')) { - // [7299] Get the import model + // [7306] Get the import model $model = $this->getModel('Series_list'); - // [7301] get the headers to import + // [7308] get the headers to import $headers = $model->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { - // [7305] Load headers to session. + // [7312] 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'); - // [7311] Redirect to import view. + // [7318] 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; } } - // [7323] Redirect to the list screen with error. + // [7330] 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 591b6806..eed363b5 100644 --- a/admin/controllers/sermon.php +++ b/admin/controllers/sermon.php @@ -55,10 +55,10 @@ class SermondistributorControllerSermon extends JControllerForm */ protected function allowAdd($data = array()) { - // [9267] get the user object + // [9274] get the user object $user = JFactory::getUser(); - // [9272] Access check. + // [9279] Access check. $access = $user->authorise('sermon.access', 'com_sermondistributor'); if (!$access) { @@ -69,13 +69,13 @@ class SermondistributorControllerSermon extends JControllerForm if ($categoryId) { - // [9283] If the category has been passed in the URL check it. + // [9290] If the category has been passed in the URL check it. $allow = $user->authorise('core.create', $this->option . '.sermons.category.' . $categoryId); } if ($allow === null) { - // [9292] In the absense of better information, revert to the component permissions. + // [9299] In the absense of better information, revert to the component permissions. return $user->authorise('sermon.create', $this->option); } else @@ -95,13 +95,13 @@ class SermondistributorControllerSermon extends JControllerForm * @since 1.6 */ protected function allowEdit($data = array(), $key = 'id') - { // [9370] get user object. + { // [9377] get user object. $user = JFactory::getUser(); - // [9372] get record id. + // [9379] get record id. $recordId = (int) isset($data[$key]) ? $data[$key] : 0; - // [9379] Access check. + // [9386] Access check. $access = ($user->authorise('sermon.access', 'com_sermondistributor.sermon.' . (int) $recordId) && $user->authorise('sermon.access', 'com_sermondistributor')); if (!$access) { @@ -110,17 +110,17 @@ class SermondistributorControllerSermon extends JControllerForm if ($recordId) { - // [9388] The record has been set. Check the record permissions. + // [9395] 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)) { - // [9410] Fallback on edit.own. Now test the owner is the user. + // [9417] Fallback on edit.own. Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; if (empty($ownerId)) { - // [9414] Need to do a lookup from the model. + // [9421] Need to do a lookup from the model. $record = $this->getModel()->getItem($recordId); if (empty($record)) @@ -130,7 +130,7 @@ class SermondistributorControllerSermon extends JControllerForm $ownerId = $record->created_by; } - // [9422] If the owner matches 'me' then do the test. + // [9429] If the owner matches 'me' then do the test. if ($ownerId == $user->id) { if ($user->authorise('sermon.edit.own', 'com_sermondistributor')) @@ -146,7 +146,7 @@ class SermondistributorControllerSermon extends JControllerForm if ($categoryId) { - // [9444] The category has been set. Check the category permissions. + // [9451] The category has been set. Check the category permissions. $catpermission = $user->authorise('core.edit', $this->option . '.sermons.category.' . $categoryId); if (!$catpermission && !is_null($catpermission)) { @@ -154,7 +154,7 @@ class SermondistributorControllerSermon extends JControllerForm } } } - // [9454] Since there is no permission, revert to the component permissions. + // [9461] Since there is no permission, revert to the component permissions. return $user->authorise('sermon.edit', $this->option); } diff --git a/admin/controllers/sermons.php b/admin/controllers/sermons.php index a8171717..027f28e7 100644 --- a/admin/controllers/sermons.php +++ b/admin/controllers/sermons.php @@ -43,29 +43,29 @@ class SermondistributorControllerSermons extends JControllerAdmin public function exportData() { - // [7262] Check for request forgeries + // [7269] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [7264] check if export is allowed for this user. + // [7271] check if export is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('sermon.export', 'com_sermondistributor') && $user->authorise('core.export', 'com_sermondistributor')) { - // [7268] Get the input + // [7275] Get the input $input = JFactory::getApplication()->input; $pks = $input->post->get('cid', array(), 'array'); - // [7271] Sanitize the input + // [7278] Sanitize the input JArrayHelper::toInteger($pks); - // [7273] Get the model + // [7280] Get the model $model = $this->getModel('Sermons'); - // [7275] get the data to export + // [7282] get the data to export $data = $model->getExportData($pks); if (SermondistributorHelper::checkArray($data)) { - // [7279] now set the data to the spreadsheet + // [7286] 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'); } } - // [7284] Redirect to the list screen with error. + // [7291] 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; @@ -74,31 +74,31 @@ class SermondistributorControllerSermons extends JControllerAdmin public function importData() { - // [7293] Check for request forgeries + // [7300] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [7295] check if import is allowed for this user. + // [7302] check if import is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('sermon.import', 'com_sermondistributor') && $user->authorise('core.import', 'com_sermondistributor')) { - // [7299] Get the import model + // [7306] Get the import model $model = $this->getModel('Sermons'); - // [7301] get the headers to import + // [7308] get the headers to import $headers = $model->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { - // [7305] Load headers to session. + // [7312] 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'); - // [7311] Redirect to import view. + // [7318] 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; } } - // [7323] Redirect to the list screen with error. + // [7330] 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 92775294..2bae9f28 100644 --- a/admin/controllers/statistic.php +++ b/admin/controllers/statistic.php @@ -55,13 +55,13 @@ class SermondistributorControllerStatistic extends JControllerForm */ protected function allowAdd($data = array()) { - // [9312] Access check. + // [9319] Access check. $access = JFactory::getUser()->authorise('statistic.access', 'com_sermondistributor'); if (!$access) { return false; } - // [9323] In the absense of better information, revert to the component permissions. + // [9330] In the absense of better information, revert to the component permissions. return JFactory::getUser()->authorise('statistic.create', $this->option); } @@ -77,13 +77,13 @@ class SermondistributorControllerStatistic extends JControllerForm */ protected function allowEdit($data = array(), $key = 'id') { - // [9466] get user object. + // [9473] get user object. $user = JFactory::getUser(); - // [9468] get record id. + // [9475] get record id. $recordId = (int) isset($data[$key]) ? $data[$key] : 0; - // [9475] Access check. + // [9482] Access check. $access = ($user->authorise('statistic.access', 'com_sermondistributor.statistic.' . (int) $recordId) && $user->authorise('statistic.access', 'com_sermondistributor')); if (!$access) { @@ -92,17 +92,17 @@ class SermondistributorControllerStatistic extends JControllerForm if ($recordId) { - // [9484] The record has been set. Check the record permissions. + // [9491] 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)) { - // [9506] Now test the owner is the user. + // [9513] Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; if (empty($ownerId)) { - // [9510] Need to do a lookup from the model. + // [9517] Need to do a lookup from the model. $record = $this->getModel()->getItem($recordId); if (empty($record)) @@ -112,7 +112,7 @@ class SermondistributorControllerStatistic extends JControllerForm $ownerId = $record->created_by; } - // [9518] If the owner matches 'me' then allow. + // [9525] If the owner matches 'me' then allow. if ($ownerId == $user->id) { if ($user->authorise('statistic.edit.own', 'com_sermondistributor')) @@ -124,7 +124,7 @@ class SermondistributorControllerStatistic extends JControllerForm return false; } } - // [9540] Since there is no permission, revert to the component permissions. + // [9547] 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 a1e4588f..0fe49e0f 100644 --- a/admin/controllers/statistics.php +++ b/admin/controllers/statistics.php @@ -43,29 +43,29 @@ class SermondistributorControllerStatistics extends JControllerAdmin public function exportData() { - // [7262] Check for request forgeries + // [7269] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [7264] check if export is allowed for this user. + // [7271] check if export is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('statistic.export', 'com_sermondistributor') && $user->authorise('core.export', 'com_sermondistributor')) { - // [7268] Get the input + // [7275] Get the input $input = JFactory::getApplication()->input; $pks = $input->post->get('cid', array(), 'array'); - // [7271] Sanitize the input + // [7278] Sanitize the input JArrayHelper::toInteger($pks); - // [7273] Get the model + // [7280] Get the model $model = $this->getModel('Statistics'); - // [7275] get the data to export + // [7282] get the data to export $data = $model->getExportData($pks); if (SermondistributorHelper::checkArray($data)) { - // [7279] now set the data to the spreadsheet + // [7286] 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'); } } - // [7284] Redirect to the list screen with error. + // [7291] 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; @@ -74,31 +74,31 @@ class SermondistributorControllerStatistics extends JControllerAdmin public function importData() { - // [7293] Check for request forgeries + // [7300] Check for request forgeries JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // [7295] check if import is allowed for this user. + // [7302] check if import is allowed for this user. $user = JFactory::getUser(); if ($user->authorise('statistic.import', 'com_sermondistributor') && $user->authorise('core.import', 'com_sermondistributor')) { - // [7299] Get the import model + // [7306] Get the import model $model = $this->getModel('Statistics'); - // [7301] get the headers to import + // [7308] get the headers to import $headers = $model->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { - // [7305] Load headers to session. + // [7312] 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'); - // [7311] Redirect to import view. + // [7318] 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; } } - // [7323] Redirect to the list screen with error. + // [7330] 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/layouts/preacher/sermons_fullwidth.php b/admin/layouts/preacher/sermons_fullwidth.php index dbc7a403..3428ff25 100644 --- a/admin/layouts/preacher/sermons_fullwidth.php +++ b/admin/layouts/preacher/sermons_fullwidth.php @@ -23,7 +23,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->iuwsermons; +$items = $displayData->juisermons; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_sermondistributor&view=sermons&task=sermon.edit"; diff --git a/admin/layouts/series/sermons_fullwidth.php b/admin/layouts/series/sermons_fullwidth.php index 7bd6a976..8c603978 100644 --- a/admin/layouts/series/sermons_fullwidth.php +++ b/admin/layouts/series/sermons_fullwidth.php @@ -23,7 +23,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->mzrsermons; +$items = $displayData->wxrsermons; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_sermondistributor&view=sermons&task=sermon.edit"; diff --git a/admin/layouts/sermon/stastics_fullwidth.php b/admin/layouts/sermon/stastics_fullwidth.php index c76b389e..58dfa0ba 100644 --- a/admin/layouts/sermon/stastics_fullwidth.php +++ b/admin/layouts/sermon/stastics_fullwidth.php @@ -23,7 +23,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->scistastics; +$items = $displayData->zgfstastics; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_sermondistributor&view=statistics&task=statistic.edit"; diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 266485a0..83c20a32 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -38,7 +38,7 @@ class SermondistributorModelAjax extends JModelList } - // [8909] Used in sermon + // [8916] Used in sermon /** * Check and Set Dropbox local listing **/ diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 0cebacc8..86811f7a 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -45,36 +45,36 @@ class JFormFieldArticles extends JFormFieldList */ protected function getInput() { - // [7684] see if we should add buttons + // [7691] see if we should add buttons $setButton = $this->getAttribute('button'); - // [7686] get html + // [7693] get html $html = parent::getInput(); - // [7688] if true set button + // [7695] if true set button if ($setButton === 'true') { $user = JFactory::getUser(); - // [7692] only add if user allowed to create article + // [7699] only add if user allowed to create article if ($user->authorise('core.create', 'com_sermondistributor')) { - // [7710] get the input from url + // [7717] get the input from url $jinput = JFactory::getApplication()->input; - // [7712] get the view name & id + // [7719] get the view name & id $values = $jinput->getArray(array( 'id' => 'int', 'view' => 'word' )); - // [7717] check if new item + // [7724] check if new item $ref = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // [7721] only load referal if not new item. + // [7728] only load referal if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; } - // [7724] build the button + // [7731] build the button $button = ' ' . JText::_('COM_SERMONDISTRIBUTOR_NEW') . ''; - // [7728] return the button attached to input field + // [7735] return the button attached to input field return $html . $button; } } diff --git a/admin/models/fields/dropboxfiles.php b/admin/models/fields/dropboxfiles.php index fc2c4d10..452b212a 100644 --- a/admin/models/fields/dropboxfiles.php +++ b/admin/models/fields/dropboxfiles.php @@ -45,36 +45,36 @@ class JFormFieldDropboxfiles extends JFormFieldList */ protected function getInput() { - // [7684] see if we should add buttons + // [7691] see if we should add buttons $setButton = $this->getAttribute('button'); - // [7686] get html + // [7693] get html $html = parent::getInput(); - // [7688] if true set button + // [7695] if true set button if ($setButton === 'true') { $user = JFactory::getUser(); - // [7692] only add if user allowed to create + // [7699] only add if user allowed to create if ($user->authorise('core.create', 'com_sermondistributor')) { - // [7710] get the input from url + // [7717] get the input from url $jinput = JFactory::getApplication()->input; - // [7712] get the view name & id + // [7719] get the view name & id $values = $jinput->getArray(array( 'id' => 'int', 'view' => 'word' )); - // [7717] check if new item + // [7724] check if new item $ref = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // [7721] only load referal if not new item. + // [7728] only load referal if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; } - // [7724] build the button + // [7731] build the button $button = ' ' . JText::_('COM_SERMONDISTRIBUTOR_NEW') . ''; - // [7728] return the button attached to input field + // [7735] return the button attached to input field return $html . $button; } } diff --git a/admin/models/fields/localfiles.php b/admin/models/fields/localfiles.php index bd7821ac..93a5fb70 100644 --- a/admin/models/fields/localfiles.php +++ b/admin/models/fields/localfiles.php @@ -45,36 +45,36 @@ class JFormFieldLocalfiles extends JFormFieldList */ protected function getInput() { - // [7684] see if we should add buttons + // [7691] see if we should add buttons $setButton = $this->getAttribute('button'); - // [7686] get html + // [7693] get html $html = parent::getInput(); - // [7688] if true set button + // [7695] if true set button if ($setButton === 'true') { $user = JFactory::getUser(); - // [7692] only add if user allowed to create + // [7699] only add if user allowed to create if ($user->authorise('core.create', 'com_sermondistributor')) { - // [7710] get the input from url + // [7717] get the input from url $jinput = JFactory::getApplication()->input; - // [7712] get the view name & id + // [7719] get the view name & id $values = $jinput->getArray(array( 'id' => 'int', 'view' => 'word' )); - // [7717] check if new item + // [7724] check if new item $ref = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // [7721] only load referal if not new item. + // [7728] only load referal if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; } - // [7724] build the button + // [7731] build the button $button = ' ' . JText::_('COM_SERMONDISTRIBUTOR_NEW') . ''; - // [7728] return the button attached to input field + // [7735] return the button attached to input field return $html . $button; } } diff --git a/admin/models/fields/preachers.php b/admin/models/fields/preachers.php index 7d687b93..90b33873 100644 --- a/admin/models/fields/preachers.php +++ b/admin/models/fields/preachers.php @@ -45,36 +45,36 @@ class JFormFieldPreachers extends JFormFieldList */ protected function getInput() { - // [7684] see if we should add buttons + // [7691] see if we should add buttons $setButton = $this->getAttribute('button'); - // [7686] get html + // [7693] get html $html = parent::getInput(); - // [7688] if true set button + // [7695] if true set button if ($setButton === 'true') { $user = JFactory::getUser(); - // [7692] only add if user allowed to create preacher + // [7699] only add if user allowed to create preacher if ($user->authorise('preacher.create', 'com_sermondistributor')) { - // [7710] get the input from url + // [7717] get the input from url $jinput = JFactory::getApplication()->input; - // [7712] get the view name & id + // [7719] get the view name & id $values = $jinput->getArray(array( 'id' => 'int', 'view' => 'word' )); - // [7717] check if new item + // [7724] check if new item $ref = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // [7721] only load referal if not new item. + // [7728] only load referal if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; } - // [7724] build the button + // [7731] build the button $button = ' ' . JText::_('COM_SERMONDISTRIBUTOR_NEW') . ''; - // [7728] return the button attached to input field + // [7735] return the button attached to input field return $html . $button; } } diff --git a/admin/models/fields/series.php b/admin/models/fields/series.php index b61304aa..556abbd2 100644 --- a/admin/models/fields/series.php +++ b/admin/models/fields/series.php @@ -45,36 +45,36 @@ class JFormFieldSeries extends JFormFieldList */ protected function getInput() { - // [7684] see if we should add buttons + // [7691] see if we should add buttons $setButton = $this->getAttribute('button'); - // [7686] get html + // [7693] get html $html = parent::getInput(); - // [7688] if true set button + // [7695] if true set button if ($setButton === 'true') { $user = JFactory::getUser(); - // [7692] only add if user allowed to create series + // [7699] only add if user allowed to create series if ($user->authorise('series.create', 'com_sermondistributor')) { - // [7710] get the input from url + // [7717] get the input from url $jinput = JFactory::getApplication()->input; - // [7712] get the view name & id + // [7719] get the view name & id $values = $jinput->getArray(array( 'id' => 'int', 'view' => 'word' )); - // [7717] check if new item + // [7724] check if new item $ref = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // [7721] only load referal if not new item. + // [7728] only load referal if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; } - // [7724] build the button + // [7731] build the button $button = ' ' . JText::_('COM_SERMONDISTRIBUTOR_NEW') . ''; - // [7728] return the button attached to input field + // [7735] return the button attached to input field return $html . $button; } } diff --git a/admin/models/fields/sermon.php b/admin/models/fields/sermon.php index aeeaef05..7a5fe386 100644 --- a/admin/models/fields/sermon.php +++ b/admin/models/fields/sermon.php @@ -45,36 +45,36 @@ class JFormFieldSermon extends JFormFieldList */ protected function getInput() { - // [7684] see if we should add buttons + // [7691] see if we should add buttons $setButton = $this->getAttribute('button'); - // [7686] get html + // [7693] get html $html = parent::getInput(); - // [7688] if true set button + // [7695] if true set button if ($setButton === 'true') { $user = JFactory::getUser(); - // [7692] only add if user allowed to create sermon + // [7699] only add if user allowed to create sermon if ($user->authorise('sermon.create', 'com_sermondistributor')) { - // [7710] get the input from url + // [7717] get the input from url $jinput = JFactory::getApplication()->input; - // [7712] get the view name & id + // [7719] get the view name & id $values = $jinput->getArray(array( 'id' => 'int', 'view' => 'word' )); - // [7717] check if new item + // [7724] check if new item $ref = ''; if (!is_null($values['id']) && strlen($values['view'])) { - // [7721] only load referal if not new item. + // [7728] only load referal if not new item. $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; } - // [7724] build the button + // [7731] build the button $button = ' ' . JText::_('COM_SERMONDISTRIBUTOR_NEW') . ''; - // [7728] return the button attached to input field + // [7735] return the button attached to input field return $html . $button; } } diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index 0e6672d5..89fe49d6 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -18,38 +18,38 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_oGAMfTbxuS_required = false; -jform_LTWmzwABJL_required = false; -jform_UCmYIbJcaV_required = false; -jform_Opviezbfev_required = false; +jform_RCpdpBjqah_required = false; +jform_tzmdvkqrgG_required = false; +jform_tOoDUnWPZO_required = false; +jform_ZRloSvLdIL_required = false; // Initial Script jQuery(document).ready(function() { - var location_bqdlaIg = jQuery("#jform_location input[type='radio']:checked").val(); - bqdlaIg(location_bqdlaIg); + var location_TUtVLEk = jQuery("#jform_location input[type='radio']:checked").val(); + TUtVLEk(location_TUtVLEk); - var location_YOOAZiI = jQuery("#jform_location input[type='radio']:checked").val(); - YOOAZiI(location_YOOAZiI); + var location_gUAUNQj = jQuery("#jform_location input[type='radio']:checked").val(); + gUAUNQj(location_gUAUNQj); - var type_oGAMfTb = jQuery("#jform_type").val(); - oGAMfTb(type_oGAMfTb); + var type_RCpdpBj = jQuery("#jform_type").val(); + RCpdpBj(type_RCpdpBj); - var type_LTWmzwA = jQuery("#jform_type").val(); - LTWmzwA(type_LTWmzwA); + var type_tzmdvkq = jQuery("#jform_type").val(); + tzmdvkq(type_tzmdvkq); - var type_UCmYIbJ = jQuery("#jform_type").val(); - UCmYIbJ(type_UCmYIbJ); + var type_tOoDUnW = jQuery("#jform_type").val(); + tOoDUnW(type_tOoDUnW); - var target_Opviezb = jQuery("#jform_target input[type='radio']:checked").val(); - Opviezb(target_Opviezb); + var target_ZRloSvL = jQuery("#jform_target input[type='radio']:checked").val(); + ZRloSvL(target_ZRloSvL); }); -// the bqdlaIg function -function bqdlaIg(location_bqdlaIg) +// the TUtVLEk function +function TUtVLEk(location_TUtVLEk) { - // [8001] set the function logic - if (location_bqdlaIg == 1) + // [8008] set the function logic + if (location_TUtVLEk == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); } @@ -59,11 +59,11 @@ function bqdlaIg(location_bqdlaIg) } } -// the YOOAZiI function -function YOOAZiI(location_YOOAZiI) +// the gUAUNQj function +function gUAUNQj(location_gUAUNQj) { - // [8001] set the function logic - if (location_YOOAZiI == 2) + // [8008] set the function logic + if (location_gUAUNQj == 2) { jQuery('#jform_site_view').closest('.control-group').show(); } @@ -73,198 +73,198 @@ function YOOAZiI(location_YOOAZiI) } } -// the oGAMfTb function -function oGAMfTb(type_oGAMfTb) +// the RCpdpBj function +function RCpdpBj(type_RCpdpBj) { - if (isSet(type_oGAMfTb) && type_oGAMfTb.constructor !== Array) + if (isSet(type_RCpdpBj) && type_RCpdpBj.constructor !== Array) { - var temp_oGAMfTb = type_oGAMfTb; - var type_oGAMfTb = []; - type_oGAMfTb.push(temp_oGAMfTb); + var temp_RCpdpBj = type_RCpdpBj; + var type_RCpdpBj = []; + type_RCpdpBj.push(temp_RCpdpBj); } - else if (!isSet(type_oGAMfTb)) + else if (!isSet(type_RCpdpBj)) { - var type_oGAMfTb = []; + var type_RCpdpBj = []; } - var type = type_oGAMfTb.some(type_oGAMfTb_SomeFunc); + var type = type_RCpdpBj.some(type_RCpdpBj_SomeFunc); - // [7979] set this function logic + // [7986] set this function logic if (type) { jQuery('#jform_url').closest('.control-group').show(); - if (jform_oGAMfTbxuS_required) + if (jform_RCpdpBjqah_required) { updateFieldRequired('url',0); jQuery('#jform_url').prop('required','required'); jQuery('#jform_url').attr('aria-required',true); jQuery('#jform_url').addClass('required'); - jform_oGAMfTbxuS_required = false; + jform_RCpdpBjqah_required = false; } } else { jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_oGAMfTbxuS_required) + if (!jform_RCpdpBjqah_required) { updateFieldRequired('url',1); jQuery('#jform_url').removeAttr('required'); jQuery('#jform_url').removeAttr('aria-required'); jQuery('#jform_url').removeClass('required'); - jform_oGAMfTbxuS_required = true; + jform_RCpdpBjqah_required = true; } } } -// the oGAMfTb Some function -function type_oGAMfTb_SomeFunc(type_oGAMfTb) +// the RCpdpBj Some function +function type_RCpdpBj_SomeFunc(type_RCpdpBj) { - // [7966] set the function logic - if (type_oGAMfTb == 3) + // [7973] set the function logic + if (type_RCpdpBj == 3) { return true; } return false; } -// the LTWmzwA function -function LTWmzwA(type_LTWmzwA) +// the tzmdvkq function +function tzmdvkq(type_tzmdvkq) { - if (isSet(type_LTWmzwA) && type_LTWmzwA.constructor !== Array) + if (isSet(type_tzmdvkq) && type_tzmdvkq.constructor !== Array) { - var temp_LTWmzwA = type_LTWmzwA; - var type_LTWmzwA = []; - type_LTWmzwA.push(temp_LTWmzwA); + var temp_tzmdvkq = type_tzmdvkq; + var type_tzmdvkq = []; + type_tzmdvkq.push(temp_tzmdvkq); } - else if (!isSet(type_LTWmzwA)) + else if (!isSet(type_tzmdvkq)) { - var type_LTWmzwA = []; + var type_tzmdvkq = []; } - var type = type_LTWmzwA.some(type_LTWmzwA_SomeFunc); + var type = type_tzmdvkq.some(type_tzmdvkq_SomeFunc); - // [7979] set this function logic + // [7986] set this function logic if (type) { jQuery('#jform_article').closest('.control-group').show(); - if (jform_LTWmzwABJL_required) + if (jform_tzmdvkqrgG_required) { updateFieldRequired('article',0); jQuery('#jform_article').prop('required','required'); jQuery('#jform_article').attr('aria-required',true); jQuery('#jform_article').addClass('required'); - jform_LTWmzwABJL_required = false; + jform_tzmdvkqrgG_required = false; } } else { jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_LTWmzwABJL_required) + if (!jform_tzmdvkqrgG_required) { updateFieldRequired('article',1); jQuery('#jform_article').removeAttr('required'); jQuery('#jform_article').removeAttr('aria-required'); jQuery('#jform_article').removeClass('required'); - jform_LTWmzwABJL_required = true; + jform_tzmdvkqrgG_required = true; } } } -// the LTWmzwA Some function -function type_LTWmzwA_SomeFunc(type_LTWmzwA) +// the tzmdvkq Some function +function type_tzmdvkq_SomeFunc(type_tzmdvkq) { - // [7966] set the function logic - if (type_LTWmzwA == 1) + // [7973] set the function logic + if (type_tzmdvkq == 1) { return true; } return false; } -// the UCmYIbJ function -function UCmYIbJ(type_UCmYIbJ) +// the tOoDUnW function +function tOoDUnW(type_tOoDUnW) { - if (isSet(type_UCmYIbJ) && type_UCmYIbJ.constructor !== Array) + if (isSet(type_tOoDUnW) && type_tOoDUnW.constructor !== Array) { - var temp_UCmYIbJ = type_UCmYIbJ; - var type_UCmYIbJ = []; - type_UCmYIbJ.push(temp_UCmYIbJ); + var temp_tOoDUnW = type_tOoDUnW; + var type_tOoDUnW = []; + type_tOoDUnW.push(temp_tOoDUnW); } - else if (!isSet(type_UCmYIbJ)) + else if (!isSet(type_tOoDUnW)) { - var type_UCmYIbJ = []; + var type_tOoDUnW = []; } - var type = type_UCmYIbJ.some(type_UCmYIbJ_SomeFunc); + var type = type_tOoDUnW.some(type_tOoDUnW_SomeFunc); - // [7979] set this function logic + // [7986] set this function logic if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_UCmYIbJcaV_required) + if (jform_tOoDUnWPZO_required) { updateFieldRequired('content',0); jQuery('#jform_content').prop('required','required'); jQuery('#jform_content').attr('aria-required',true); jQuery('#jform_content').addClass('required'); - jform_UCmYIbJcaV_required = false; + jform_tOoDUnWPZO_required = false; } } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_UCmYIbJcaV_required) + if (!jform_tOoDUnWPZO_required) { updateFieldRequired('content',1); jQuery('#jform_content').removeAttr('required'); jQuery('#jform_content').removeAttr('aria-required'); jQuery('#jform_content').removeClass('required'); - jform_UCmYIbJcaV_required = true; + jform_tOoDUnWPZO_required = true; } } } -// the UCmYIbJ Some function -function type_UCmYIbJ_SomeFunc(type_UCmYIbJ) +// the tOoDUnW Some function +function type_tOoDUnW_SomeFunc(type_tOoDUnW) { - // [7966] set the function logic - if (type_UCmYIbJ == 2) + // [7973] set the function logic + if (type_tOoDUnW == 2) { return true; } return false; } -// the Opviezb function -function Opviezb(target_Opviezb) +// the ZRloSvL function +function ZRloSvL(target_ZRloSvL) { - // [8001] set the function logic - if (target_Opviezb == 1) + // [8008] set the function logic + if (target_ZRloSvL == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_Opviezbfev_required) + if (jform_ZRloSvLdIL_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_Opviezbfev_required = false; + jform_ZRloSvLdIL_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_Opviezbfev_required) + if (!jform_ZRloSvLdIL_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_Opviezbfev_required = true; + jform_ZRloSvLdIL_required = true; } } } diff --git a/admin/models/forms/help_document.xml b/admin/models/forms/help_document.xml index 24e40154..21779ac0 100644 --- a/admin/models/forms/help_document.xml +++ b/admin/models/forms/help_document.xml @@ -4,15 +4,15 @@ addfieldpath="/administrator/components/com_sermondistributor/models/fields" > - - + + - + - + - + @@ -42,18 +42,18 @@ JTRASHED - + - + - + - + - + - + - + - - + + - + - + COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_SELECT_AN_OPTION @@ -137,7 +137,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 - + - + - + - + - + - - + + - + - + - + @@ -42,18 +42,18 @@ JTRASHED - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + JGLOBAL_INDEX_NOFOLLOW JGLOBAL_NOINDEX_NOFOLLOW - + - + - + - + - + - - + + - + - + - + @@ -42,18 +42,18 @@ JTRASHED - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + JGLOBAL_INDEX_NOFOLLOW JGLOBAL_NOINDEX_NOFOLLOW - + - + - + - + - + - - + + - + - + - + @@ -42,18 +42,18 @@ JTRASHED - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + COM_SERMONDISTRIBUTOR_SERMON_ENCRYPTED COM_SERMONDISTRIBUTOR_SERMON_DIRECT - + - + COM_SERMONDISTRIBUTOR_SERMON_SELECT_SOURCE @@ -199,7 +199,7 @@ COM_SERMONDISTRIBUTOR_SERMON_URL - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + COM_SERMONDISTRIBUTOR_SERMON_MANUAL COM_SERMONDISTRIBUTOR_SERMON_AUTOMATIC - + - + - + JGLOBAL_INDEX_NOFOLLOW JGLOBAL_NOINDEX_NOFOLLOW - + - + - + - + - + - - + + - + - + - + @@ -42,18 +42,18 @@ JTRASHED - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + JGLOBAL_INDEX_NOFOLLOW JGLOBAL_NOINDEX_NOFOLLOW - + - + - + - + - + groups)) { - // [3989] JSON Decode groups. + // [3996] JSON Decode groups. $item->groups = json_decode($item->groups,true); } @@ -117,7 +117,7 @@ class SermondistributorModelHelp_document extends JModelAdmin * @since 1.6 */ public function getForm($data = array(), $loadData = true) - { // [9559] Get the form. + { // [9566] Get the form. $form = $this->loadForm('com_sermondistributor.help_document', 'help_document', array('control' => 'jform', 'load_data' => $loadData)); if (empty($form)) @@ -127,12 +127,12 @@ class SermondistributorModelHelp_document extends JModelAdmin $jinput = JFactory::getApplication()->input; - // [9644] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first. + // [9651] 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'); } - // [9649] The back end uses id so we use that the rest of the time and set it to 0 by default. + // [9656] 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'); @@ -140,34 +140,34 @@ class SermondistributorModelHelp_document extends JModelAdmin $user = JFactory::getUser(); - // [9655] Check for existing item. - // [9656] Modify the form based on Edit State access controls. + // [9662] Check for existing item. + // [9663] 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'))) { - // [9669] Disable fields for display. + // [9676] Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); $form->setFieldAttribute('published', 'disabled', 'true'); - // [9672] Disable fields while saving. + // [9679] Disable fields while saving. $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } - // [9677] Modify the form based on Edit Creaded By access controls. + // [9684] Modify the form based on Edit Creaded By access controls. if (!$user->authorise('core.edit.created_by', 'com_sermondistributor')) { - // [9689] Disable fields for display. + // [9696] Disable fields for display. $form->setFieldAttribute('created_by', 'disabled', 'true'); - // [9691] Disable fields for display. + // [9698] Disable fields for display. $form->setFieldAttribute('created_by', 'readonly', 'true'); - // [9693] Disable fields while saving. + // [9700] Disable fields while saving. $form->setFieldAttribute('created_by', 'filter', 'unset'); } - // [9696] Modify the form based on Edit Creaded Date access controls. + // [9703] Modify the form based on Edit Creaded Date access controls. if (!$user->authorise('core.edit.created', 'com_sermondistributor')) { - // [9708] Disable fields for display. + // [9715] Disable fields for display. $form->setFieldAttribute('created', 'disabled', 'true'); - // [9710] Disable fields while saving. + // [9717] Disable fields while saving. $form->setFieldAttribute('created', 'filter', 'unset'); } @@ -203,7 +203,7 @@ class SermondistributorModelHelp_document extends JModelAdmin } $user = JFactory::getUser(); - // [9860] The record has been set. Check the record permissions. + // [9867] The record has been set. Check the record permissions. return $user->authorise('help_document.delete', 'com_sermondistributor.help_document.' . (int) $record->id); } return false; @@ -225,14 +225,14 @@ class SermondistributorModelHelp_document extends JModelAdmin if ($recordId) { - // [9947] The record has been set. Check the record permissions. + // [9954] 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; } } - // [9964] In the absense of better information, revert to the component permissions. + // [9971] In the absense of better information, revert to the component permissions. return $user->authorise('help_document.edit.state', 'com_sermondistributor'); } @@ -247,7 +247,7 @@ class SermondistributorModelHelp_document extends JModelAdmin */ protected function allowEdit($data = array(), $key = 'id') { - // [9772] Check specific edit permission then general edit permission. + // [9779] 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'); @@ -346,20 +346,20 @@ class SermondistributorModelHelp_document extends JModelAdmin */ public function validate($form, $data, $group = null) { - // [8763] check if the not_required field is set + // [8770] 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); - // [8768] now change the required field attributes value + // [8775] now change the required field attributes value foreach ($requiredFields as $requiredField) { - // [8771] make sure there is a string value + // [8778] make sure there is a string value if (SermondistributorHelper::checkString($requiredField)) { - // [8774] change to false + // [8781] change to false $form->setFieldAttribute($requiredField, 'required', 'false'); - // [8776] also clear the data set + // [8783] also clear the data set $data[$requiredField] = ''; } } @@ -490,7 +490,7 @@ class SermondistributorModelHelp_document extends JModelAdmin { if (empty($this->batchSet)) { - // [4925] Set some needed variables. + // [4932] Set some needed variables. $this->user = JFactory::getUser(); $this->table = $this->getTable(); $this->tableClassName = get_class($this->table); @@ -504,12 +504,12 @@ class SermondistributorModelHelp_document extends JModelAdmin return false; } - // [4945] get list of uniqe fields + // [4952] get list of uniqe fields $uniqeFields = $this->getUniqeFields(); - // [4947] remove move_copy from array + // [4954] remove move_copy from array unset($values['move_copy']); - // [4950] make sure published is set + // [4957] make sure published is set if (!isset($values['published'])) { $values['published'] = 0; @@ -521,21 +521,21 @@ class SermondistributorModelHelp_document extends JModelAdmin $newIds = array(); - // [4987] Parent exists so let's proceed + // [4994] Parent exists so let's proceed while (!empty($pks)) { - // [4990] Pop the first ID off the stack + // [4997] Pop the first ID off the stack $pk = array_shift($pks); $this->table->reset(); - // [4995] only allow copy if user may edit this item. + // [5002] only allow copy if user may edit this item. if (!$this->user->authorise('help_document.edit', $contexts[$pk])) { - // [5005] Not fatal error + // [5012] Not fatal error $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk)); @@ -543,19 +543,19 @@ class SermondistributorModelHelp_document extends JModelAdmin } - // [5010] Check that the row actually exists + // [5017] Check that the row actually exists if (!$this->table->load($pk)) { if ($error = $this->table->getError()) { - // [5015] Fatal error + // [5022] Fatal error $this->setError($error); return false; } else { - // [5022] Not fatal error + // [5029] Not fatal error $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk)); continue; } @@ -563,7 +563,7 @@ class SermondistributorModelHelp_document extends JModelAdmin list($this->table->title, $this->table->alias) = $this->_generateNewTitle($this->table->alias, $this->table->title); - // [5058] insert all set values + // [5065] insert all set values if (SermondistributorHelper::checkArray($values)) { foreach ($values as $key => $value) @@ -575,7 +575,7 @@ class SermondistributorModelHelp_document extends JModelAdmin } } - // [5070] update all uniqe fields + // [5077] update all uniqe fields if (SermondistributorHelper::checkArray($uniqeFields)) { foreach ($uniqeFields as $uniqeField) @@ -584,13 +584,13 @@ class SermondistributorModelHelp_document extends JModelAdmin } } - // [5079] Reset the ID because we are making a copy + // [5086] Reset the ID because we are making a copy $this->table->id = 0; - // [5082] TODO: Deal with ordering? - // [5083] $this->table->ordering = 1; + // [5089] TODO: Deal with ordering? + // [5090] $this->table->ordering = 1; - // [5085] Check the row. + // [5092] Check the row. if (!$this->table->check()) { $this->setError($this->table->getError()); @@ -603,7 +603,7 @@ class SermondistributorModelHelp_document extends JModelAdmin $this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table); } - // [5098] Store the row. + // [5105] Store the row. if (!$this->table->store()) { $this->setError($this->table->getError()); @@ -611,14 +611,14 @@ class SermondistributorModelHelp_document extends JModelAdmin return false; } - // [5106] Get the new item ID + // [5113] Get the new item ID $newId = $this->table->get('id'); - // [5109] Add the new ID to the array + // [5116] Add the new ID to the array $newIds[$pk] = $newId; } - // [5113] Clean the cache + // [5120] Clean the cache $this->cleanCache(); return $newIds; @@ -639,7 +639,7 @@ class SermondistributorModelHelp_document extends JModelAdmin { if (empty($this->batchSet)) { - // [4727] Set some needed variables. + // [4734] Set some needed variables. $this->user = JFactory::getUser(); $this->table = $this->getTable(); $this->tableClassName = get_class($this->table); @@ -654,15 +654,15 @@ class SermondistributorModelHelp_document extends JModelAdmin return false; } - // [4749] make sure published only updates if user has the permission. + // [4756] make sure published only updates if user has the permission. if (isset($values['published']) && !$this->canDo->get('help_document.edit.state')) { unset($values['published']); } - // [4762] remove move_copy from array + // [4769] remove move_copy from array unset($values['move_copy']); - // [4783] Parent exists so we proceed + // [4790] Parent exists so we proceed foreach ($pks as $pk) { if (!$this->user->authorise('help_document.edit', $contexts[$pk])) @@ -672,30 +672,30 @@ class SermondistributorModelHelp_document extends JModelAdmin return false; } - // [4800] Check that the row actually exists + // [4807] Check that the row actually exists if (!$this->table->load($pk)) { if ($error = $this->table->getError()) { - // [4805] Fatal error + // [4812] Fatal error $this->setError($error); return false; } else { - // [4812] Not fatal error + // [4819] Not fatal error $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk)); continue; } } - // [4818] insert all set values. + // [4825] insert all set values. if (SermondistributorHelper::checkArray($values)) { foreach ($values as $key => $value) { - // [4823] Do special action for access. + // [4830] Do special action for access. if ('access' == $key && strlen($value) > 0) { $this->table->$key = $value; @@ -708,7 +708,7 @@ class SermondistributorModelHelp_document extends JModelAdmin } - // [4835] Check the row. + // [4842] Check the row. if (!$this->table->check()) { $this->setError($this->table->getError()); @@ -721,7 +721,7 @@ class SermondistributorModelHelp_document extends JModelAdmin $this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table); } - // [4848] Store the row. + // [4855] Store the row. if (!$this->table->store()) { $this->setError($this->table->getError()); @@ -730,7 +730,7 @@ class SermondistributorModelHelp_document extends JModelAdmin } } - // [4857] Clean the cache + // [4864] Clean the cache $this->cleanCache(); return true; @@ -760,7 +760,7 @@ class SermondistributorModelHelp_document extends JModelAdmin $data['metadata'] = (string) $metadata; } - // [4099] Set the groups string to JSON string. + // [4106] Set the groups string to JSON string. if (isset($data['groups'])) { $data['groups'] = (string) json_encode($data['groups']); @@ -774,7 +774,7 @@ class SermondistributorModelHelp_document extends JModelAdmin $data['params'] = (string) $params; } - // [5139] Alter the title for save as copy + // [5146] Alter the title for save as copy if ($input->get('task') == 'save2copy') { $origTable = clone $this->getTable(); @@ -797,7 +797,7 @@ class SermondistributorModelHelp_document extends JModelAdmin $data['published'] = 0; } - // [5166] Automatic handling of alias for empty fields + // [5173] Automatic handling of alias for empty fields if (in_array($input->get('task'), array('apply', 'save', 'save2new')) && (int) $input->get('id') == 0) { if ($data['alias'] == null) @@ -828,10 +828,10 @@ class SermondistributorModelHelp_document extends JModelAdmin } } - // [5205] Alter the uniqe field for save as copy + // [5212] Alter the uniqe field for save as copy if ($input->get('task') == 'save2copy') { - // [5208] Automatic handling of other uniqe fields + // [5215] Automatic handling of other uniqe fields $uniqeFields = $this->getUniqeFields(); if (SermondistributorHelper::checkArray($uniqeFields)) { @@ -885,7 +885,7 @@ class SermondistributorModelHelp_document extends JModelAdmin protected function _generateNewTitle($alias, $title) { - // [5239] Alter the title & alias + // [5246] Alter the title & alias $table = $this->getTable(); while ($table->load(array('alias' => $alias))) diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 099ae9be..a8b18008 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -108,16 +108,16 @@ class SermondistributorModelHelp_documents extends JModelList */ public function getItems() { - // [10529] check in items + // [10536] check in items $this->checkInNow(); // load parent items $items = parent::getItems(); - // [10604] set values to display correctly. + // [10611] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [10607] get user object. + // [10614] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -128,7 +128,7 @@ class SermondistributorModelHelp_documents extends JModelList continue; } - // [10675] decode groups + // [10682] decode groups $groupsArray = json_decode($item->groups, true); if (SermondistributorHelper::checkArray($groupsArray)) { @@ -151,14 +151,14 @@ class SermondistributorModelHelp_documents extends JModelList } } - // [10870] set selection value to a translatable value + // [10877] set selection value to a translatable value if (SermondistributorHelper::checkArray($items)) { foreach ($items as $nr => &$item) { - // [10877] convert type + // [10884] convert type $item->type = $this->selectionTranslation($item->type, 'type'); - // [10877] convert location + // [10884] convert location $item->location = $this->selectionTranslation($item->location, 'location'); } } @@ -175,7 +175,7 @@ class SermondistributorModelHelp_documents extends JModelList */ public function selectionTranslation($value,$name) { - // [10903] Array of type language strings + // [10910] Array of type language strings if ($name == 'type') { $typeArray = array( @@ -184,20 +184,20 @@ class SermondistributorModelHelp_documents extends JModelList 2 => 'COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_TEXT', 3 => 'COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_URL' ); - // [10934] Now check if value is found in this array + // [10941] Now check if value is found in this array if (isset($typeArray[$value]) && SermondistributorHelper::checkString($typeArray[$value])) { return $typeArray[$value]; } } - // [10903] Array of location language strings + // [10910] Array of location language strings if ($name == 'location') { $locationArray = array( 1 => 'COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ADMIN', 2 => 'COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_SITE' ); - // [10934] Now check if value is found in this array + // [10941] Now check if value is found in this array if (isset($locationArray[$value]) && SermondistributorHelper::checkString($locationArray[$value])) { return $locationArray[$value]; @@ -213,19 +213,19 @@ class SermondistributorModelHelp_documents extends JModelList */ protected function getListQuery() { - // [7390] Get the user object. + // [7397] Get the user object. $user = JFactory::getUser(); - // [7392] Create a new query object. + // [7399] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [7395] Select some fields + // [7402] Select some fields $query->select('a.*'); - // [7402] From the sermondistributor_item table + // [7409] From the sermondistributor_item table $query->from($db->quoteName('#__sermondistributor_help_document', 'a')); - // [7416] Filter by published state + // [7423] Filter by published state $published = $this->getState('filter.published'); if (is_numeric($published)) { @@ -236,21 +236,21 @@ class SermondistributorModelHelp_documents extends JModelList $query->where('(a.published = 0 OR a.published = 1)'); } - // [7428] Join over the asset groups. + // [7435] Join over the asset groups. $query->select('ag.title AS access_level'); $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // [7431] Filter by access level. + // [7438] Filter by access level. if ($access = $this->getState('filter.access')) { $query->where('a.access = ' . (int) $access); } - // [7436] Implement View Level Access + // [7443] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [7513] Filter by search. + // [7520] Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) { @@ -265,28 +265,28 @@ class SermondistributorModelHelp_documents extends JModelList } } - // [7756] Filter by Type. + // [7763] Filter by Type. if ($type = $this->getState('filter.type')) { $query->where('a.type = ' . $db->quote($db->escape($type, true))); } - // [7756] Filter by Location. + // [7763] Filter by Location. if ($location = $this->getState('filter.location')) { $query->where('a.location = ' . $db->quote($db->escape($location, true))); } - // [7756] Filter by Admin_view. + // [7763] Filter by Admin_view. if ($admin_view = $this->getState('filter.admin_view')) { $query->where('a.admin_view = ' . $db->quote($db->escape($admin_view, true))); } - // [7756] Filter by Site_view. + // [7763] Filter by Site_view. if ($site_view = $this->getState('filter.site_view')) { $query->where('a.site_view = ' . $db->quote($db->escape($site_view, true))); } - // [7472] Add the list ordering clause. + // [7479] Add the list ordering clause. $orderCol = $this->state->get('list.ordering', 'a.id'); $orderDirn = $this->state->get('list.direction', 'asc'); if ($orderCol != '') @@ -304,42 +304,42 @@ class SermondistributorModelHelp_documents extends JModelList */ public function getExportData($pks) { - // [7180] setup the query + // [7187] setup the query if (SermondistributorHelper::checkArray($pks)) { - // [7183] Get the user object. + // [7190] Get the user object. $user = JFactory::getUser(); - // [7185] Create a new query object. + // [7192] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [7188] Select some fields + // [7195] Select some fields $query->select('a.*'); - // [7190] From the sermondistributor_help_document table + // [7197] From the sermondistributor_help_document table $query->from($db->quoteName('#__sermondistributor_help_document', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); - // [7200] Implement View Level Access + // [7207] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [7207] Order the results by ordering + // [7214] Order the results by ordering $query->order('a.ordering ASC'); - // [7209] Load the items + // [7216] Load the items $db->setQuery($query); $db->execute(); if ($db->getNumRows()) { $items = $db->loadObjectList(); - // [10604] set values to display correctly. + // [10611] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [10607] get user object. + // [10614] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -350,13 +350,13 @@ class SermondistributorModelHelp_documents extends JModelList continue; } - // [10817] unset the values we don't want exported. + // [10824] unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); unset($item->checked_out_time); } } - // [10826] Add headers to items array. + // [10833] Add headers to items array. $headers = $this->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { @@ -375,13 +375,13 @@ class SermondistributorModelHelp_documents extends JModelList */ public function getExImPortHeaders() { - // [7229] Get a db connection. + // [7236] Get a db connection. $db = JFactory::getDbo(); - // [7231] get the columns + // [7238] get the columns $columns = $db->getTableColumns("#__sermondistributor_help_document"); if (SermondistributorHelper::checkArray($columns)) { - // [7235] remove the headers you don't import/export. + // [7242] remove the headers you don't import/export. unset($columns['asset_id']); unset($columns['checked_out']); unset($columns['checked_out_time']); @@ -403,7 +403,7 @@ class SermondistributorModelHelp_documents extends JModelList */ protected function getStoreId($id = '') { - // [10152] Compile the store id. + // [10159] Compile the store id. $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); @@ -427,15 +427,15 @@ class SermondistributorModelHelp_documents extends JModelList */ protected function checkInNow() { - // [10545] Get set check in time + // [10552] Get set check in time $time = JComponentHelper::getParams('com_sermondistributor')->get('check_in'); if ($time) { - // [10550] Get a db connection. + // [10557] Get a db connection. $db = JFactory::getDbo(); - // [10552] reset query + // [10559] reset query $query = $db->getQuery(true); $query->select('*'); $query->from($db->quoteName('#__sermondistributor_help_document')); @@ -443,24 +443,24 @@ class SermondistributorModelHelp_documents extends JModelList $db->execute(); if ($db->getNumRows()) { - // [10560] Get Yesterdays date + // [10567] Get Yesterdays date $date = JFactory::getDate()->modify($time)->toSql(); - // [10562] reset query + // [10569] reset query $query = $db->getQuery(true); - // [10564] Fields to update. + // [10571] Fields to update. $fields = array( $db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'', $db->quoteName('checked_out') . '=0' ); - // [10569] Conditions for which records should be updated. + // [10576] Conditions for which records should be updated. $conditions = array( $db->quoteName('checked_out') . '!=0', $db->quoteName('checked_out_time') . '<\''.$date.'\'' ); - // [10574] Check table + // [10581] Check table $query->update($db->quoteName('#__sermondistributor_help_document'))->set($fields)->where($conditions); $db->setQuery($query); diff --git a/admin/models/preacher.php b/admin/models/preacher.php index d1a2522c..44a9e1f4 100644 --- a/admin/models/preacher.php +++ b/admin/models/preacher.php @@ -96,7 +96,7 @@ class SermondistributorModelPreacher extends JModelAdmin $item->tags->getTagIds($item->id, 'com_sermondistributor.preacher'); } } - $this->preacherynwu = $item->id; + $this->preacherjhqc = $item->id; return $item; } @@ -106,74 +106,74 @@ class SermondistributorModelPreacher extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getIuwsermons() + public function getJuisermons() { - // [6938] Get the user object. + // [6945] Get the user object. $user = JFactory::getUser(); - // [6940] Create a new query object. + // [6947] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [6943] Select some fields + // [6950] Select some fields $query->select('a.*'); $query->select($db->quoteName('c.title','category_title')); - // [6950] From the sermondistributor_sermon table + // [6957] 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') . ')'); - // [7543] From the sermondistributor_preacher table. + // [7550] 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') . ')'); - // [7543] From the sermondistributor_series table. + // [7550] 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') . ')'); - // [6966] Filter by preacherynwu global. - $preacherynwu = $this->preacherynwu; - if (is_numeric($preacherynwu )) + // [6973] Filter by preacherjhqc global. + $preacherjhqc = $this->preacherjhqc; + if (is_numeric($preacherjhqc )) { - $query->where('a.preacher = ' . (int) $preacherynwu ); + $query->where('a.preacher = ' . (int) $preacherjhqc ); } - elseif (is_string($preacherynwu)) + elseif (is_string($preacherjhqc)) { - $query->where('a.preacher = ' . $db->quote($preacherynwu)); + $query->where('a.preacher = ' . $db->quote($preacherjhqc)); } else { $query->where('a.preacher = -5'); } - // [6983] Join over the asset groups. + // [6990] Join over the asset groups. $query->select('ag.title AS access_level'); $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // [6986] Filter by access level. + // [6993] Filter by access level. if ($access = $this->getState('filter.access')) { $query->where('a.access = ' . (int) $access); } - // [6991] Implement View Level Access + // [6998] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [6998] Order the results by ordering + // [7005] Order the results by ordering $query->order('a.ordering ASC'); - // [7000] Load the items + // [7007] Load the items $db->setQuery($query); $db->execute(); if ($db->getNumRows()) { $items = $db->loadObjectList(); - // [10604] set values to display correctly. + // [10611] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [10607] get user object. + // [10614] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -187,15 +187,15 @@ class SermondistributorModelPreacher extends JModelAdmin } } - // [10870] set selection value to a translatable value + // [10877] set selection value to a translatable value if (SermondistributorHelper::checkArray($items)) { foreach ($items as $nr => &$item) { - // [10877] convert link_type - $item->link_type = $this->selectionTranslationIuwsermons($item->link_type, 'link_type'); - // [10877] convert source - $item->source = $this->selectionTranslationIuwsermons($item->source, 'source'); + // [10884] convert link_type + $item->link_type = $this->selectionTranslationJuisermons($item->link_type, 'link_type'); + // [10884] convert source + $item->source = $this->selectionTranslationJuisermons($item->source, 'source'); } } @@ -209,22 +209,22 @@ class SermondistributorModelPreacher extends JModelAdmin * * @return translatable string */ - public function selectionTranslationIuwsermons($value,$name) + public function selectionTranslationJuisermons($value,$name) { - // [10903] Array of link_type language strings + // [10910] Array of link_type language strings if ($name == 'link_type') { $link_typeArray = array( 1 => 'COM_SERMONDISTRIBUTOR_SERMON_ENCRYPTED', 2 => 'COM_SERMONDISTRIBUTOR_SERMON_DIRECT' ); - // [10934] Now check if value is found in this array + // [10941] Now check if value is found in this array if (isset($link_typeArray[$value]) && SermondistributorHelper::checkString($link_typeArray[$value])) { return $link_typeArray[$value]; } } - // [10903] Array of source language strings + // [10910] Array of source language strings if ($name == 'source') { $sourceArray = array( @@ -233,7 +233,7 @@ class SermondistributorModelPreacher extends JModelAdmin 2 => 'COM_SERMONDISTRIBUTOR_SERMON_DROPBOX', 3 => 'COM_SERMONDISTRIBUTOR_SERMON_URL' ); - // [10934] Now check if value is found in this array + // [10941] Now check if value is found in this array if (isset($sourceArray[$value]) && SermondistributorHelper::checkString($sourceArray[$value])) { return $sourceArray[$value]; @@ -253,7 +253,7 @@ class SermondistributorModelPreacher extends JModelAdmin * @since 1.6 */ public function getForm($data = array(), $loadData = true) - { // [9559] Get the form. + { // [9566] Get the form. $form = $this->loadForm('com_sermondistributor.preacher', 'preacher', array('control' => 'jform', 'load_data' => $loadData)); if (empty($form)) @@ -263,12 +263,12 @@ class SermondistributorModelPreacher extends JModelAdmin $jinput = JFactory::getApplication()->input; - // [9644] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first. + // [9651] 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'); } - // [9649] The back end uses id so we use that the rest of the time and set it to 0 by default. + // [9656] 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'); @@ -276,36 +276,36 @@ class SermondistributorModelPreacher extends JModelAdmin $user = JFactory::getUser(); - // [9655] Check for existing item. - // [9656] Modify the form based on Edit State access controls. + // [9662] Check for existing item. + // [9663] 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'))) { - // [9669] Disable fields for display. + // [9676] Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); $form->setFieldAttribute('published', 'disabled', 'true'); - // [9672] Disable fields while saving. + // [9679] Disable fields while saving. $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } - // [9677] Modify the form based on Edit Creaded By access controls. + // [9684] 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'))) { - // [9689] Disable fields for display. + // [9696] Disable fields for display. $form->setFieldAttribute('created_by', 'disabled', 'true'); - // [9691] Disable fields for display. + // [9698] Disable fields for display. $form->setFieldAttribute('created_by', 'readonly', 'true'); - // [9693] Disable fields while saving. + // [9700] Disable fields while saving. $form->setFieldAttribute('created_by', 'filter', 'unset'); } - // [9696] Modify the form based on Edit Creaded Date access controls. + // [9703] 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'))) { - // [9708] Disable fields for display. + // [9715] Disable fields for display. $form->setFieldAttribute('created', 'disabled', 'true'); - // [9710] Disable fields while saving. + // [9717] Disable fields while saving. $form->setFieldAttribute('created', 'filter', 'unset'); } @@ -341,7 +341,7 @@ class SermondistributorModelPreacher extends JModelAdmin } $user = JFactory::getUser(); - // [9860] The record has been set. Check the record permissions. + // [9867] The record has been set. Check the record permissions. return $user->authorise('preacher.delete', 'com_sermondistributor.preacher.' . (int) $record->id); } return false; @@ -363,14 +363,14 @@ class SermondistributorModelPreacher extends JModelAdmin if ($recordId) { - // [9947] The record has been set. Check the record permissions. + // [9954] 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; } } - // [9964] In the absense of better information, revert to the component permissions. + // [9971] In the absense of better information, revert to the component permissions. return $user->authorise('preacher.edit.state', 'com_sermondistributor'); } @@ -385,7 +385,7 @@ class SermondistributorModelPreacher extends JModelAdmin */ protected function allowEdit($data = array(), $key = 'id') { - // [9772] Check specific edit permission then general edit permission. + // [9779] 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'); @@ -592,7 +592,7 @@ class SermondistributorModelPreacher extends JModelAdmin { if (empty($this->batchSet)) { - // [4925] Set some needed variables. + // [4932] Set some needed variables. $this->user = JFactory::getUser(); $this->table = $this->getTable(); $this->tableClassName = get_class($this->table); @@ -606,12 +606,12 @@ class SermondistributorModelPreacher extends JModelAdmin return false; } - // [4945] get list of uniqe fields + // [4952] get list of uniqe fields $uniqeFields = $this->getUniqeFields(); - // [4947] remove move_copy from array + // [4954] remove move_copy from array unset($values['move_copy']); - // [4950] make sure published is set + // [4957] make sure published is set if (!isset($values['published'])) { $values['published'] = 0; @@ -623,21 +623,21 @@ class SermondistributorModelPreacher extends JModelAdmin $newIds = array(); - // [4987] Parent exists so let's proceed + // [4994] Parent exists so let's proceed while (!empty($pks)) { - // [4990] Pop the first ID off the stack + // [4997] Pop the first ID off the stack $pk = array_shift($pks); $this->table->reset(); - // [4995] only allow copy if user may edit this item. + // [5002] only allow copy if user may edit this item. if (!$this->user->authorise('preacher.edit', $contexts[$pk])) { - // [5005] Not fatal error + // [5012] Not fatal error $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk)); @@ -645,19 +645,19 @@ class SermondistributorModelPreacher extends JModelAdmin } - // [5010] Check that the row actually exists + // [5017] Check that the row actually exists if (!$this->table->load($pk)) { if ($error = $this->table->getError()) { - // [5015] Fatal error + // [5022] Fatal error $this->setError($error); return false; } else { - // [5022] Not fatal error + // [5029] Not fatal error $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk)); continue; } @@ -665,7 +665,7 @@ class SermondistributorModelPreacher extends JModelAdmin list($this->table->name, $this->table->alias) = $this->_generateNewTitle($this->table->alias, $this->table->name); - // [5058] insert all set values + // [5065] insert all set values if (SermondistributorHelper::checkArray($values)) { foreach ($values as $key => $value) @@ -677,7 +677,7 @@ class SermondistributorModelPreacher extends JModelAdmin } } - // [5070] update all uniqe fields + // [5077] update all uniqe fields if (SermondistributorHelper::checkArray($uniqeFields)) { foreach ($uniqeFields as $uniqeField) @@ -686,13 +686,13 @@ class SermondistributorModelPreacher extends JModelAdmin } } - // [5079] Reset the ID because we are making a copy + // [5086] Reset the ID because we are making a copy $this->table->id = 0; - // [5082] TODO: Deal with ordering? - // [5083] $this->table->ordering = 1; + // [5089] TODO: Deal with ordering? + // [5090] $this->table->ordering = 1; - // [5085] Check the row. + // [5092] Check the row. if (!$this->table->check()) { $this->setError($this->table->getError()); @@ -705,7 +705,7 @@ class SermondistributorModelPreacher extends JModelAdmin $this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table); } - // [5098] Store the row. + // [5105] Store the row. if (!$this->table->store()) { $this->setError($this->table->getError()); @@ -713,14 +713,14 @@ class SermondistributorModelPreacher extends JModelAdmin return false; } - // [5106] Get the new item ID + // [5113] Get the new item ID $newId = $this->table->get('id'); - // [5109] Add the new ID to the array + // [5116] Add the new ID to the array $newIds[$pk] = $newId; } - // [5113] Clean the cache + // [5120] Clean the cache $this->cleanCache(); return $newIds; @@ -741,7 +741,7 @@ class SermondistributorModelPreacher extends JModelAdmin { if (empty($this->batchSet)) { - // [4727] Set some needed variables. + // [4734] Set some needed variables. $this->user = JFactory::getUser(); $this->table = $this->getTable(); $this->tableClassName = get_class($this->table); @@ -756,15 +756,15 @@ class SermondistributorModelPreacher extends JModelAdmin return false; } - // [4749] make sure published only updates if user has the permission. + // [4756] make sure published only updates if user has the permission. if (isset($values['published']) && !$this->canDo->get('preacher.edit.state')) { unset($values['published']); } - // [4762] remove move_copy from array + // [4769] remove move_copy from array unset($values['move_copy']); - // [4783] Parent exists so we proceed + // [4790] Parent exists so we proceed foreach ($pks as $pk) { if (!$this->user->authorise('preacher.edit', $contexts[$pk])) @@ -774,30 +774,30 @@ class SermondistributorModelPreacher extends JModelAdmin return false; } - // [4800] Check that the row actually exists + // [4807] Check that the row actually exists if (!$this->table->load($pk)) { if ($error = $this->table->getError()) { - // [4805] Fatal error + // [4812] Fatal error $this->setError($error); return false; } else { - // [4812] Not fatal error + // [4819] Not fatal error $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk)); continue; } } - // [4818] insert all set values. + // [4825] insert all set values. if (SermondistributorHelper::checkArray($values)) { foreach ($values as $key => $value) { - // [4823] Do special action for access. + // [4830] Do special action for access. if ('access' == $key && strlen($value) > 0) { $this->table->$key = $value; @@ -810,7 +810,7 @@ class SermondistributorModelPreacher extends JModelAdmin } - // [4835] Check the row. + // [4842] Check the row. if (!$this->table->check()) { $this->setError($this->table->getError()); @@ -823,7 +823,7 @@ class SermondistributorModelPreacher extends JModelAdmin $this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table); } - // [4848] Store the row. + // [4855] Store the row. if (!$this->table->store()) { $this->setError($this->table->getError()); @@ -832,7 +832,7 @@ class SermondistributorModelPreacher extends JModelAdmin } } - // [4857] Clean the cache + // [4864] Clean the cache $this->cleanCache(); return true; @@ -870,7 +870,7 @@ class SermondistributorModelPreacher extends JModelAdmin $data['params'] = (string) $params; } - // [5139] Alter the name for save as copy + // [5146] Alter the name for save as copy if ($input->get('task') == 'save2copy') { $origTable = clone $this->getTable(); @@ -893,7 +893,7 @@ class SermondistributorModelPreacher extends JModelAdmin $data['published'] = 0; } - // [5166] Automatic handling of alias for empty fields + // [5173] Automatic handling of alias for empty fields if (in_array($input->get('task'), array('apply', 'save', 'save2new')) && (int) $input->get('id') == 0) { if ($data['alias'] == null) @@ -924,10 +924,10 @@ class SermondistributorModelPreacher extends JModelAdmin } } - // [5205] Alter the uniqe field for save as copy + // [5212] Alter the uniqe field for save as copy if ($input->get('task') == 'save2copy') { - // [5208] Automatic handling of other uniqe fields + // [5215] Automatic handling of other uniqe fields $uniqeFields = $this->getUniqeFields(); if (SermondistributorHelper::checkArray($uniqeFields)) { @@ -981,7 +981,7 @@ class SermondistributorModelPreacher extends JModelAdmin protected function _generateNewTitle($alias, $title) { - // [5239] Alter the title & alias + // [5246] Alter the title & alias $table = $this->getTable(); while ($table->load(array('alias' => $alias))) diff --git a/admin/models/preachers.php b/admin/models/preachers.php index 5a8d966b..cec34458 100644 --- a/admin/models/preachers.php +++ b/admin/models/preachers.php @@ -96,16 +96,16 @@ class SermondistributorModelPreachers extends JModelList */ public function getItems() { - // [10529] check in items + // [10536] check in items $this->checkInNow(); // load parent items $items = parent::getItems(); - // [10604] set values to display correctly. + // [10611] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [10607] get user object. + // [10614] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -130,19 +130,19 @@ class SermondistributorModelPreachers extends JModelList */ protected function getListQuery() { - // [7390] Get the user object. + // [7397] Get the user object. $user = JFactory::getUser(); - // [7392] Create a new query object. + // [7399] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [7395] Select some fields + // [7402] Select some fields $query->select('a.*'); - // [7402] From the sermondistributor_item table + // [7409] From the sermondistributor_item table $query->from($db->quoteName('#__sermondistributor_preacher', 'a')); - // [7416] Filter by published state + // [7423] Filter by published state $published = $this->getState('filter.published'); if (is_numeric($published)) { @@ -153,21 +153,21 @@ class SermondistributorModelPreachers extends JModelList $query->where('(a.published = 0 OR a.published = 1)'); } - // [7428] Join over the asset groups. + // [7435] Join over the asset groups. $query->select('ag.title AS access_level'); $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // [7431] Filter by access level. + // [7438] Filter by access level. if ($access = $this->getState('filter.access')) { $query->where('a.access = ' . (int) $access); } - // [7436] Implement View Level Access + // [7443] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [7513] Filter by search. + // [7520] Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) { @@ -183,7 +183,7 @@ class SermondistributorModelPreachers extends JModelList } - // [7472] Add the list ordering clause. + // [7479] Add the list ordering clause. $orderCol = $this->state->get('list.ordering', 'a.id'); $orderDirn = $this->state->get('list.direction', 'asc'); if ($orderCol != '') @@ -201,42 +201,42 @@ class SermondistributorModelPreachers extends JModelList */ public function getExportData($pks) { - // [7180] setup the query + // [7187] setup the query if (SermondistributorHelper::checkArray($pks)) { - // [7183] Get the user object. + // [7190] Get the user object. $user = JFactory::getUser(); - // [7185] Create a new query object. + // [7192] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [7188] Select some fields + // [7195] Select some fields $query->select('a.*'); - // [7190] From the sermondistributor_preacher table + // [7197] From the sermondistributor_preacher table $query->from($db->quoteName('#__sermondistributor_preacher', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); - // [7200] Implement View Level Access + // [7207] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [7207] Order the results by ordering + // [7214] Order the results by ordering $query->order('a.ordering ASC'); - // [7209] Load the items + // [7216] Load the items $db->setQuery($query); $db->execute(); if ($db->getNumRows()) { $items = $db->loadObjectList(); - // [10604] set values to display correctly. + // [10611] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [10607] get user object. + // [10614] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -247,13 +247,13 @@ class SermondistributorModelPreachers extends JModelList continue; } - // [10817] unset the values we don't want exported. + // [10824] unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); unset($item->checked_out_time); } } - // [10826] Add headers to items array. + // [10833] Add headers to items array. $headers = $this->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { @@ -272,13 +272,13 @@ class SermondistributorModelPreachers extends JModelList */ public function getExImPortHeaders() { - // [7229] Get a db connection. + // [7236] Get a db connection. $db = JFactory::getDbo(); - // [7231] get the columns + // [7238] get the columns $columns = $db->getTableColumns("#__sermondistributor_preacher"); if (SermondistributorHelper::checkArray($columns)) { - // [7235] remove the headers you don't import/export. + // [7242] remove the headers you don't import/export. unset($columns['asset_id']); unset($columns['checked_out']); unset($columns['checked_out_time']); @@ -300,7 +300,7 @@ class SermondistributorModelPreachers extends JModelList */ protected function getStoreId($id = '') { - // [10152] Compile the store id. + // [10159] Compile the store id. $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); @@ -321,15 +321,15 @@ class SermondistributorModelPreachers extends JModelList */ protected function checkInNow() { - // [10545] Get set check in time + // [10552] Get set check in time $time = JComponentHelper::getParams('com_sermondistributor')->get('check_in'); if ($time) { - // [10550] Get a db connection. + // [10557] Get a db connection. $db = JFactory::getDbo(); - // [10552] reset query + // [10559] reset query $query = $db->getQuery(true); $query->select('*'); $query->from($db->quoteName('#__sermondistributor_preacher')); @@ -337,24 +337,24 @@ class SermondistributorModelPreachers extends JModelList $db->execute(); if ($db->getNumRows()) { - // [10560] Get Yesterdays date + // [10567] Get Yesterdays date $date = JFactory::getDate()->modify($time)->toSql(); - // [10562] reset query + // [10569] reset query $query = $db->getQuery(true); - // [10564] Fields to update. + // [10571] Fields to update. $fields = array( $db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'', $db->quoteName('checked_out') . '=0' ); - // [10569] Conditions for which records should be updated. + // [10576] Conditions for which records should be updated. $conditions = array( $db->quoteName('checked_out') . '!=0', $db->quoteName('checked_out_time') . '<\''.$date.'\'' ); - // [10574] Check table + // [10581] 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 945b3823..6043604e 100644 --- a/admin/models/series.php +++ b/admin/models/series.php @@ -96,7 +96,7 @@ class SermondistributorModelSeries extends JModelAdmin $item->tags->getTagIds($item->id, 'com_sermondistributor.series'); } } - $this->serieswuoy = $item->id; + $this->serieshsnv = $item->id; return $item; } @@ -106,74 +106,74 @@ class SermondistributorModelSeries extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getMzrsermons() + public function getWxrsermons() { - // [6938] Get the user object. + // [6945] Get the user object. $user = JFactory::getUser(); - // [6940] Create a new query object. + // [6947] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [6943] Select some fields + // [6950] Select some fields $query->select('a.*'); $query->select($db->quoteName('c.title','category_title')); - // [6950] From the sermondistributor_sermon table + // [6957] 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') . ')'); - // [7543] From the sermondistributor_preacher table. + // [7550] 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') . ')'); - // [7543] From the sermondistributor_series table. + // [7550] 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') . ')'); - // [6966] Filter by serieswuoy global. - $serieswuoy = $this->serieswuoy; - if (is_numeric($serieswuoy )) + // [6973] Filter by serieshsnv global. + $serieshsnv = $this->serieshsnv; + if (is_numeric($serieshsnv )) { - $query->where('a.series = ' . (int) $serieswuoy ); + $query->where('a.series = ' . (int) $serieshsnv ); } - elseif (is_string($serieswuoy)) + elseif (is_string($serieshsnv)) { - $query->where('a.series = ' . $db->quote($serieswuoy)); + $query->where('a.series = ' . $db->quote($serieshsnv)); } else { $query->where('a.series = -5'); } - // [6983] Join over the asset groups. + // [6990] Join over the asset groups. $query->select('ag.title AS access_level'); $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // [6986] Filter by access level. + // [6993] Filter by access level. if ($access = $this->getState('filter.access')) { $query->where('a.access = ' . (int) $access); } - // [6991] Implement View Level Access + // [6998] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [6998] Order the results by ordering + // [7005] Order the results by ordering $query->order('a.ordering ASC'); - // [7000] Load the items + // [7007] Load the items $db->setQuery($query); $db->execute(); if ($db->getNumRows()) { $items = $db->loadObjectList(); - // [10604] set values to display correctly. + // [10611] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [10607] get user object. + // [10614] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -187,15 +187,15 @@ class SermondistributorModelSeries extends JModelAdmin } } - // [10870] set selection value to a translatable value + // [10877] set selection value to a translatable value if (SermondistributorHelper::checkArray($items)) { foreach ($items as $nr => &$item) { - // [10877] convert link_type - $item->link_type = $this->selectionTranslationMzrsermons($item->link_type, 'link_type'); - // [10877] convert source - $item->source = $this->selectionTranslationMzrsermons($item->source, 'source'); + // [10884] convert link_type + $item->link_type = $this->selectionTranslationWxrsermons($item->link_type, 'link_type'); + // [10884] convert source + $item->source = $this->selectionTranslationWxrsermons($item->source, 'source'); } } @@ -209,22 +209,22 @@ class SermondistributorModelSeries extends JModelAdmin * * @return translatable string */ - public function selectionTranslationMzrsermons($value,$name) + public function selectionTranslationWxrsermons($value,$name) { - // [10903] Array of link_type language strings + // [10910] Array of link_type language strings if ($name == 'link_type') { $link_typeArray = array( 1 => 'COM_SERMONDISTRIBUTOR_SERMON_ENCRYPTED', 2 => 'COM_SERMONDISTRIBUTOR_SERMON_DIRECT' ); - // [10934] Now check if value is found in this array + // [10941] Now check if value is found in this array if (isset($link_typeArray[$value]) && SermondistributorHelper::checkString($link_typeArray[$value])) { return $link_typeArray[$value]; } } - // [10903] Array of source language strings + // [10910] Array of source language strings if ($name == 'source') { $sourceArray = array( @@ -233,7 +233,7 @@ class SermondistributorModelSeries extends JModelAdmin 2 => 'COM_SERMONDISTRIBUTOR_SERMON_DROPBOX', 3 => 'COM_SERMONDISTRIBUTOR_SERMON_URL' ); - // [10934] Now check if value is found in this array + // [10941] Now check if value is found in this array if (isset($sourceArray[$value]) && SermondistributorHelper::checkString($sourceArray[$value])) { return $sourceArray[$value]; @@ -253,7 +253,7 @@ class SermondistributorModelSeries extends JModelAdmin * @since 1.6 */ public function getForm($data = array(), $loadData = true) - { // [9559] Get the form. + { // [9566] Get the form. $form = $this->loadForm('com_sermondistributor.series', 'series', array('control' => 'jform', 'load_data' => $loadData)); if (empty($form)) @@ -263,12 +263,12 @@ class SermondistributorModelSeries extends JModelAdmin $jinput = JFactory::getApplication()->input; - // [9644] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first. + // [9651] 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'); } - // [9649] The back end uses id so we use that the rest of the time and set it to 0 by default. + // [9656] 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'); @@ -276,36 +276,36 @@ class SermondistributorModelSeries extends JModelAdmin $user = JFactory::getUser(); - // [9655] Check for existing item. - // [9656] Modify the form based on Edit State access controls. + // [9662] Check for existing item. + // [9663] 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'))) { - // [9669] Disable fields for display. + // [9676] Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); $form->setFieldAttribute('published', 'disabled', 'true'); - // [9672] Disable fields while saving. + // [9679] Disable fields while saving. $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } - // [9677] Modify the form based on Edit Creaded By access controls. + // [9684] 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'))) { - // [9689] Disable fields for display. + // [9696] Disable fields for display. $form->setFieldAttribute('created_by', 'disabled', 'true'); - // [9691] Disable fields for display. + // [9698] Disable fields for display. $form->setFieldAttribute('created_by', 'readonly', 'true'); - // [9693] Disable fields while saving. + // [9700] Disable fields while saving. $form->setFieldAttribute('created_by', 'filter', 'unset'); } - // [9696] Modify the form based on Edit Creaded Date access controls. + // [9703] 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'))) { - // [9708] Disable fields for display. + // [9715] Disable fields for display. $form->setFieldAttribute('created', 'disabled', 'true'); - // [9710] Disable fields while saving. + // [9717] Disable fields while saving. $form->setFieldAttribute('created', 'filter', 'unset'); } @@ -341,7 +341,7 @@ class SermondistributorModelSeries extends JModelAdmin } $user = JFactory::getUser(); - // [9860] The record has been set. Check the record permissions. + // [9867] The record has been set. Check the record permissions. return $user->authorise('series.delete', 'com_sermondistributor.series.' . (int) $record->id); } return false; @@ -363,14 +363,14 @@ class SermondistributorModelSeries extends JModelAdmin if ($recordId) { - // [9947] The record has been set. Check the record permissions. + // [9954] 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; } } - // [9964] In the absense of better information, revert to the component permissions. + // [9971] In the absense of better information, revert to the component permissions. return $user->authorise('series.edit.state', 'com_sermondistributor'); } @@ -385,7 +385,7 @@ class SermondistributorModelSeries extends JModelAdmin */ protected function allowEdit($data = array(), $key = 'id') { - // [9772] Check specific edit permission then general edit permission. + // [9779] 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'); @@ -592,7 +592,7 @@ class SermondistributorModelSeries extends JModelAdmin { if (empty($this->batchSet)) { - // [4925] Set some needed variables. + // [4932] Set some needed variables. $this->user = JFactory::getUser(); $this->table = $this->getTable(); $this->tableClassName = get_class($this->table); @@ -606,12 +606,12 @@ class SermondistributorModelSeries extends JModelAdmin return false; } - // [4945] get list of uniqe fields + // [4952] get list of uniqe fields $uniqeFields = $this->getUniqeFields(); - // [4947] remove move_copy from array + // [4954] remove move_copy from array unset($values['move_copy']); - // [4950] make sure published is set + // [4957] make sure published is set if (!isset($values['published'])) { $values['published'] = 0; @@ -623,21 +623,21 @@ class SermondistributorModelSeries extends JModelAdmin $newIds = array(); - // [4987] Parent exists so let's proceed + // [4994] Parent exists so let's proceed while (!empty($pks)) { - // [4990] Pop the first ID off the stack + // [4997] Pop the first ID off the stack $pk = array_shift($pks); $this->table->reset(); - // [4995] only allow copy if user may edit this item. + // [5002] only allow copy if user may edit this item. if (!$this->user->authorise('series.edit', $contexts[$pk])) { - // [5005] Not fatal error + // [5012] Not fatal error $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk)); @@ -645,19 +645,19 @@ class SermondistributorModelSeries extends JModelAdmin } - // [5010] Check that the row actually exists + // [5017] Check that the row actually exists if (!$this->table->load($pk)) { if ($error = $this->table->getError()) { - // [5015] Fatal error + // [5022] Fatal error $this->setError($error); return false; } else { - // [5022] Not fatal error + // [5029] Not fatal error $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk)); continue; } @@ -665,7 +665,7 @@ class SermondistributorModelSeries extends JModelAdmin list($this->table->name, $this->table->alias) = $this->_generateNewTitle($this->table->alias, $this->table->name); - // [5058] insert all set values + // [5065] insert all set values if (SermondistributorHelper::checkArray($values)) { foreach ($values as $key => $value) @@ -677,7 +677,7 @@ class SermondistributorModelSeries extends JModelAdmin } } - // [5070] update all uniqe fields + // [5077] update all uniqe fields if (SermondistributorHelper::checkArray($uniqeFields)) { foreach ($uniqeFields as $uniqeField) @@ -686,13 +686,13 @@ class SermondistributorModelSeries extends JModelAdmin } } - // [5079] Reset the ID because we are making a copy + // [5086] Reset the ID because we are making a copy $this->table->id = 0; - // [5082] TODO: Deal with ordering? - // [5083] $this->table->ordering = 1; + // [5089] TODO: Deal with ordering? + // [5090] $this->table->ordering = 1; - // [5085] Check the row. + // [5092] Check the row. if (!$this->table->check()) { $this->setError($this->table->getError()); @@ -705,7 +705,7 @@ class SermondistributorModelSeries extends JModelAdmin $this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table); } - // [5098] Store the row. + // [5105] Store the row. if (!$this->table->store()) { $this->setError($this->table->getError()); @@ -713,14 +713,14 @@ class SermondistributorModelSeries extends JModelAdmin return false; } - // [5106] Get the new item ID + // [5113] Get the new item ID $newId = $this->table->get('id'); - // [5109] Add the new ID to the array + // [5116] Add the new ID to the array $newIds[$pk] = $newId; } - // [5113] Clean the cache + // [5120] Clean the cache $this->cleanCache(); return $newIds; @@ -741,7 +741,7 @@ class SermondistributorModelSeries extends JModelAdmin { if (empty($this->batchSet)) { - // [4727] Set some needed variables. + // [4734] Set some needed variables. $this->user = JFactory::getUser(); $this->table = $this->getTable(); $this->tableClassName = get_class($this->table); @@ -756,15 +756,15 @@ class SermondistributorModelSeries extends JModelAdmin return false; } - // [4749] make sure published only updates if user has the permission. + // [4756] make sure published only updates if user has the permission. if (isset($values['published']) && !$this->canDo->get('series.edit.state')) { unset($values['published']); } - // [4762] remove move_copy from array + // [4769] remove move_copy from array unset($values['move_copy']); - // [4783] Parent exists so we proceed + // [4790] Parent exists so we proceed foreach ($pks as $pk) { if (!$this->user->authorise('series.edit', $contexts[$pk])) @@ -774,30 +774,30 @@ class SermondistributorModelSeries extends JModelAdmin return false; } - // [4800] Check that the row actually exists + // [4807] Check that the row actually exists if (!$this->table->load($pk)) { if ($error = $this->table->getError()) { - // [4805] Fatal error + // [4812] Fatal error $this->setError($error); return false; } else { - // [4812] Not fatal error + // [4819] Not fatal error $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk)); continue; } } - // [4818] insert all set values. + // [4825] insert all set values. if (SermondistributorHelper::checkArray($values)) { foreach ($values as $key => $value) { - // [4823] Do special action for access. + // [4830] Do special action for access. if ('access' == $key && strlen($value) > 0) { $this->table->$key = $value; @@ -810,7 +810,7 @@ class SermondistributorModelSeries extends JModelAdmin } - // [4835] Check the row. + // [4842] Check the row. if (!$this->table->check()) { $this->setError($this->table->getError()); @@ -823,7 +823,7 @@ class SermondistributorModelSeries extends JModelAdmin $this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table); } - // [4848] Store the row. + // [4855] Store the row. if (!$this->table->store()) { $this->setError($this->table->getError()); @@ -832,7 +832,7 @@ class SermondistributorModelSeries extends JModelAdmin } } - // [4857] Clean the cache + // [4864] Clean the cache $this->cleanCache(); return true; @@ -870,7 +870,7 @@ class SermondistributorModelSeries extends JModelAdmin $data['params'] = (string) $params; } - // [5139] Alter the name for save as copy + // [5146] Alter the name for save as copy if ($input->get('task') == 'save2copy') { $origTable = clone $this->getTable(); @@ -893,7 +893,7 @@ class SermondistributorModelSeries extends JModelAdmin $data['published'] = 0; } - // [5166] Automatic handling of alias for empty fields + // [5173] Automatic handling of alias for empty fields if (in_array($input->get('task'), array('apply', 'save', 'save2new')) && (int) $input->get('id') == 0) { if ($data['alias'] == null) @@ -924,10 +924,10 @@ class SermondistributorModelSeries extends JModelAdmin } } - // [5205] Alter the uniqe field for save as copy + // [5212] Alter the uniqe field for save as copy if ($input->get('task') == 'save2copy') { - // [5208] Automatic handling of other uniqe fields + // [5215] Automatic handling of other uniqe fields $uniqeFields = $this->getUniqeFields(); if (SermondistributorHelper::checkArray($uniqeFields)) { @@ -981,7 +981,7 @@ class SermondistributorModelSeries extends JModelAdmin protected function _generateNewTitle($alias, $title) { - // [5239] Alter the title & alias + // [5246] Alter the title & alias $table = $this->getTable(); while ($table->load(array('alias' => $alias))) diff --git a/admin/models/series_list.php b/admin/models/series_list.php index d3af41aa..c124bdf5 100644 --- a/admin/models/series_list.php +++ b/admin/models/series_list.php @@ -92,16 +92,16 @@ class SermondistributorModelSeries_list extends JModelList */ public function getItems() { - // [10529] check in items + // [10536] check in items $this->checkInNow(); // load parent items $items = parent::getItems(); - // [10604] set values to display correctly. + // [10611] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [10607] get user object. + // [10614] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -126,19 +126,19 @@ class SermondistributorModelSeries_list extends JModelList */ protected function getListQuery() { - // [7390] Get the user object. + // [7397] Get the user object. $user = JFactory::getUser(); - // [7392] Create a new query object. + // [7399] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [7395] Select some fields + // [7402] Select some fields $query->select('a.*'); - // [7402] From the sermondistributor_item table + // [7409] From the sermondistributor_item table $query->from($db->quoteName('#__sermondistributor_series', 'a')); - // [7416] Filter by published state + // [7423] Filter by published state $published = $this->getState('filter.published'); if (is_numeric($published)) { @@ -149,21 +149,21 @@ class SermondistributorModelSeries_list extends JModelList $query->where('(a.published = 0 OR a.published = 1)'); } - // [7428] Join over the asset groups. + // [7435] Join over the asset groups. $query->select('ag.title AS access_level'); $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // [7431] Filter by access level. + // [7438] Filter by access level. if ($access = $this->getState('filter.access')) { $query->where('a.access = ' . (int) $access); } - // [7436] Implement View Level Access + // [7443] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [7513] Filter by search. + // [7520] Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) { @@ -179,7 +179,7 @@ class SermondistributorModelSeries_list extends JModelList } - // [7472] Add the list ordering clause. + // [7479] Add the list ordering clause. $orderCol = $this->state->get('list.ordering', 'a.id'); $orderDirn = $this->state->get('list.direction', 'asc'); if ($orderCol != '') @@ -197,42 +197,42 @@ class SermondistributorModelSeries_list extends JModelList */ public function getExportData($pks) { - // [7180] setup the query + // [7187] setup the query if (SermondistributorHelper::checkArray($pks)) { - // [7183] Get the user object. + // [7190] Get the user object. $user = JFactory::getUser(); - // [7185] Create a new query object. + // [7192] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [7188] Select some fields + // [7195] Select some fields $query->select('a.*'); - // [7190] From the sermondistributor_series table + // [7197] From the sermondistributor_series table $query->from($db->quoteName('#__sermondistributor_series', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); - // [7200] Implement View Level Access + // [7207] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [7207] Order the results by ordering + // [7214] Order the results by ordering $query->order('a.ordering ASC'); - // [7209] Load the items + // [7216] Load the items $db->setQuery($query); $db->execute(); if ($db->getNumRows()) { $items = $db->loadObjectList(); - // [10604] set values to display correctly. + // [10611] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [10607] get user object. + // [10614] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -243,13 +243,13 @@ class SermondistributorModelSeries_list extends JModelList continue; } - // [10817] unset the values we don't want exported. + // [10824] unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); unset($item->checked_out_time); } } - // [10826] Add headers to items array. + // [10833] Add headers to items array. $headers = $this->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { @@ -268,13 +268,13 @@ class SermondistributorModelSeries_list extends JModelList */ public function getExImPortHeaders() { - // [7229] Get a db connection. + // [7236] Get a db connection. $db = JFactory::getDbo(); - // [7231] get the columns + // [7238] get the columns $columns = $db->getTableColumns("#__sermondistributor_series"); if (SermondistributorHelper::checkArray($columns)) { - // [7235] remove the headers you don't import/export. + // [7242] remove the headers you don't import/export. unset($columns['asset_id']); unset($columns['checked_out']); unset($columns['checked_out_time']); @@ -296,7 +296,7 @@ class SermondistributorModelSeries_list extends JModelList */ protected function getStoreId($id = '') { - // [10152] Compile the store id. + // [10159] Compile the store id. $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); @@ -316,15 +316,15 @@ class SermondistributorModelSeries_list extends JModelList */ protected function checkInNow() { - // [10545] Get set check in time + // [10552] Get set check in time $time = JComponentHelper::getParams('com_sermondistributor')->get('check_in'); if ($time) { - // [10550] Get a db connection. + // [10557] Get a db connection. $db = JFactory::getDbo(); - // [10552] reset query + // [10559] reset query $query = $db->getQuery(true); $query->select('*'); $query->from($db->quoteName('#__sermondistributor_series')); @@ -332,24 +332,24 @@ class SermondistributorModelSeries_list extends JModelList $db->execute(); if ($db->getNumRows()) { - // [10560] Get Yesterdays date + // [10567] Get Yesterdays date $date = JFactory::getDate()->modify($time)->toSql(); - // [10562] reset query + // [10569] reset query $query = $db->getQuery(true); - // [10564] Fields to update. + // [10571] Fields to update. $fields = array( $db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'', $db->quoteName('checked_out') . '=0' ); - // [10569] Conditions for which records should be updated. + // [10576] Conditions for which records should be updated. $conditions = array( $db->quoteName('checked_out') . '!=0', $db->quoteName('checked_out_time') . '<\''.$date.'\'' ); - // [10574] Check table + // [10581] 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 69e8f3f6..96718b3e 100644 --- a/admin/models/sermon.php +++ b/admin/models/sermon.php @@ -92,13 +92,13 @@ class SermondistributorModelSermon extends JModelAdmin if (!empty($item->local_files)) { - // [3989] JSON Decode local_files. + // [3996] JSON Decode local_files. $item->local_files = json_decode($item->local_files); } if (!empty($item->manual_files)) { - // [3989] JSON Decode manual_files. + // [3996] JSON Decode manual_files. $item->manual_files = json_decode($item->manual_files); } @@ -108,7 +108,7 @@ class SermondistributorModelSermon extends JModelAdmin $item->tags->getTagIds($item->id, 'com_sermondistributor.sermon'); } } - $this->sermonduql = $item->id; + $this->sermonqkhc = $item->id; return $item; } @@ -118,76 +118,76 @@ class SermondistributorModelSermon extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getScistastics() + public function getZgfstastics() { - // [6938] Get the user object. + // [6945] Get the user object. $user = JFactory::getUser(); - // [6940] Create a new query object. + // [6947] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [6943] Select some fields + // [6950] Select some fields $query->select('a.*'); - // [6950] From the sermondistributor_statistic table + // [6957] From the sermondistributor_statistic table $query->from($db->quoteName('#__sermondistributor_statistic', 'a')); - // [7543] From the sermondistributor_sermon table. + // [7550] 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') . ')'); - // [7543] From the sermondistributor_preacher table. + // [7550] 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') . ')'); - // [7543] From the sermondistributor_series table. + // [7550] 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') . ')'); - // [6966] Filter by sermonduql global. - $sermonduql = $this->sermonduql; - if (is_numeric($sermonduql )) + // [6973] Filter by sermonqkhc global. + $sermonqkhc = $this->sermonqkhc; + if (is_numeric($sermonqkhc )) { - $query->where('a.sermon = ' . (int) $sermonduql ); + $query->where('a.sermon = ' . (int) $sermonqkhc ); } - elseif (is_string($sermonduql)) + elseif (is_string($sermonqkhc)) { - $query->where('a.sermon = ' . $db->quote($sermonduql)); + $query->where('a.sermon = ' . $db->quote($sermonqkhc)); } else { $query->where('a.sermon = -5'); } - // [6983] Join over the asset groups. + // [6990] Join over the asset groups. $query->select('ag.title AS access_level'); $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // [6986] Filter by access level. + // [6993] Filter by access level. if ($access = $this->getState('filter.access')) { $query->where('a.access = ' . (int) $access); } - // [6991] Implement View Level Access + // [6998] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [6998] Order the results by ordering + // [7005] Order the results by ordering $query->order('a.ordering ASC'); - // [7000] Load the items + // [7007] Load the items $db->setQuery($query); $db->execute(); if ($db->getNumRows()) { $items = $db->loadObjectList(); - // [10604] set values to display correctly. + // [10611] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [10607] get user object. + // [10614] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -216,7 +216,7 @@ class SermondistributorModelSermon extends JModelAdmin * @since 1.6 */ public function getForm($data = array(), $loadData = true) - { // [9559] Get the form. + { // [9566] Get the form. $form = $this->loadForm('com_sermondistributor.sermon', 'sermon', array('control' => 'jform', 'load_data' => $loadData)); if (empty($form)) @@ -226,17 +226,17 @@ class SermondistributorModelSermon extends JModelAdmin $jinput = JFactory::getApplication()->input; - // [9586] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first. + // [9593] 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'); } - // [9591] The back end uses id so we use that the rest of the time and set it to 0 by default. + // [9598] 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'); } - // [9596] Determine correct permissions to check. + // [9603] Determine correct permissions to check. if ($this->getState('sermon.id')) { $id = $this->getState('sermon.id'); @@ -244,56 +244,56 @@ class SermondistributorModelSermon extends JModelAdmin $catid = 0; if (isset($this->getItem($id)->catid)) { - // [9603] set catagory id + // [9610] set catagory id $catid = $this->getItem($id)->catid; - // [9605] Existing record. Can only edit in selected categories. + // [9612] Existing record. Can only edit in selected categories. $form->setFieldAttribute('catid', 'action', 'core.edit'); - // [9607] Existing record. Can only edit own items in selected categories. + // [9614] Existing record. Can only edit own items in selected categories. $form->setFieldAttribute('catid', 'action', 'core.edit.own'); } } else { - // [9613] New record. Can only create in selected categories. + // [9620] New record. Can only create in selected categories. $form->setFieldAttribute('catid', 'action', 'core.create'); } $user = JFactory::getUser(); - // [9617] Check for existing item. - // [9618] Modify the form based on Edit State access controls. + // [9624] Check for existing item. + // [9625] 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'))) { - // [9633] Disable fields for display. + // [9640] Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); $form->setFieldAttribute('published', 'disabled', 'true'); - // [9636] Disable fields while saving. + // [9643] Disable fields while saving. $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } - // [9677] Modify the form based on Edit Creaded By access controls. + // [9684] 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'))) { - // [9689] Disable fields for display. + // [9696] Disable fields for display. $form->setFieldAttribute('created_by', 'disabled', 'true'); - // [9691] Disable fields for display. + // [9698] Disable fields for display. $form->setFieldAttribute('created_by', 'readonly', 'true'); - // [9693] Disable fields while saving. + // [9700] Disable fields while saving. $form->setFieldAttribute('created_by', 'filter', 'unset'); } - // [9696] Modify the form based on Edit Creaded Date access controls. + // [9703] 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'))) { - // [9708] Disable fields for display. + // [9715] Disable fields for display. $form->setFieldAttribute('created', 'disabled', 'true'); - // [9710] Disable fields while saving. + // [9717] Disable fields while saving. $form->setFieldAttribute('created', 'filter', 'unset'); } @@ -333,7 +333,7 @@ class SermondistributorModelSermon extends JModelAdmin if ($allow) { - // [9831] The record has been set. Check the record permissions. + // [9838] The record has been set. Check the record permissions. return $user->authorise('sermon.delete', 'com_sermondistributor.sermon.' . (int) $record->id); } return $allow; @@ -357,14 +357,14 @@ class SermondistributorModelSermon extends JModelAdmin if ($recordId) { - // [9904] The record has been set. Check the record permissions. + // [9911] 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; } } - // [9920] Check against the category. + // [9927] Check against the category. if (!empty($record->catid)) { $catpermission = $user->authorise('core.edit.state', 'com_sermondistributor.sermons.category.' . (int) $record->catid); @@ -373,7 +373,7 @@ class SermondistributorModelSermon extends JModelAdmin return false; } } - // [9931] In the absense of better information, revert to the component permissions. + // [9938] In the absense of better information, revert to the component permissions. return $user->authorise('sermon.edit.state', 'com_sermondistributor'); } @@ -388,7 +388,7 @@ class SermondistributorModelSermon extends JModelAdmin */ protected function allowEdit($data = array(), $key = 'id') { - // [9772] Check specific edit permission then general edit permission. + // [9779] 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'); @@ -487,20 +487,20 @@ class SermondistributorModelSermon extends JModelAdmin */ public function validate($form, $data, $group = null) { - // [8763] check if the not_required field is set + // [8770] 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); - // [8768] now change the required field attributes value + // [8775] now change the required field attributes value foreach ($requiredFields as $requiredField) { - // [8771] make sure there is a string value + // [8778] make sure there is a string value if (SermondistributorHelper::checkString($requiredField)) { - // [8774] change to false + // [8781] change to false $form->setFieldAttribute($requiredField, 'required', 'false'); - // [8776] also clear the data set + // [8783] also clear the data set $data[$requiredField] = ''; } } @@ -631,7 +631,7 @@ class SermondistributorModelSermon extends JModelAdmin { if (empty($this->batchSet)) { - // [4925] Set some needed variables. + // [4932] Set some needed variables. $this->user = JFactory::getUser(); $this->table = $this->getTable(); $this->tableClassName = get_class($this->table); @@ -645,12 +645,12 @@ class SermondistributorModelSermon extends JModelAdmin return false; } - // [4945] get list of uniqe fields + // [4952] get list of uniqe fields $uniqeFields = $this->getUniqeFields(); - // [4947] remove move_copy from array + // [4954] remove move_copy from array unset($values['move_copy']); - // [4950] make sure published is set + // [4957] make sure published is set if (!isset($values['published'])) { $values['published'] = 0; @@ -666,7 +666,7 @@ class SermondistributorModelSermon extends JModelAdmin } elseif (isset($values['category']) && (int) $values['category'] > 0) { - // [4975] move the category value to correct field name + // [4982] move the category value to correct field name $values['catid'] = $values['category']; unset($values['category']); } @@ -677,21 +677,21 @@ class SermondistributorModelSermon extends JModelAdmin $newIds = array(); - // [4987] Parent exists so let's proceed + // [4994] Parent exists so let's proceed while (!empty($pks)) { - // [4990] Pop the first ID off the stack + // [4997] Pop the first ID off the stack $pk = array_shift($pks); $this->table->reset(); - // [4995] only allow copy if user may edit this item. + // [5002] only allow copy if user may edit this item. if (!$this->user->authorise('sermon.edit', $contexts[$pk])) { - // [5005] Not fatal error + // [5012] Not fatal error $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk)); @@ -699,19 +699,19 @@ class SermondistributorModelSermon extends JModelAdmin } - // [5010] Check that the row actually exists + // [5017] Check that the row actually exists if (!$this->table->load($pk)) { if ($error = $this->table->getError()) { - // [5015] Fatal error + // [5022] Fatal error $this->setError($error); return false; } else { - // [5022] Not fatal error + // [5029] Not fatal error $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk)); continue; } @@ -726,7 +726,7 @@ class SermondistributorModelSermon extends JModelAdmin list($this->table->name, $this->table->alias) = $this->generateNewTitle($this->table->catid, $this->table->alias, $this->table->name); } - // [5058] insert all set values + // [5065] insert all set values if (SermondistributorHelper::checkArray($values)) { foreach ($values as $key => $value) @@ -738,7 +738,7 @@ class SermondistributorModelSermon extends JModelAdmin } } - // [5070] update all uniqe fields + // [5077] update all uniqe fields if (SermondistributorHelper::checkArray($uniqeFields)) { foreach ($uniqeFields as $uniqeField) @@ -747,13 +747,13 @@ class SermondistributorModelSermon extends JModelAdmin } } - // [5079] Reset the ID because we are making a copy + // [5086] Reset the ID because we are making a copy $this->table->id = 0; - // [5082] TODO: Deal with ordering? - // [5083] $this->table->ordering = 1; + // [5089] TODO: Deal with ordering? + // [5090] $this->table->ordering = 1; - // [5085] Check the row. + // [5092] Check the row. if (!$this->table->check()) { $this->setError($this->table->getError()); @@ -766,7 +766,7 @@ class SermondistributorModelSermon extends JModelAdmin $this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table); } - // [5098] Store the row. + // [5105] Store the row. if (!$this->table->store()) { $this->setError($this->table->getError()); @@ -774,14 +774,14 @@ class SermondistributorModelSermon extends JModelAdmin return false; } - // [5106] Get the new item ID + // [5113] Get the new item ID $newId = $this->table->get('id'); - // [5109] Add the new ID to the array + // [5116] Add the new ID to the array $newIds[$pk] = $newId; } - // [5113] Clean the cache + // [5120] Clean the cache $this->cleanCache(); return $newIds; @@ -802,7 +802,7 @@ class SermondistributorModelSermon extends JModelAdmin { if (empty($this->batchSet)) { - // [4727] Set some needed variables. + // [4734] Set some needed variables. $this->user = JFactory::getUser(); $this->table = $this->getTable(); $this->tableClassName = get_class($this->table); @@ -817,12 +817,12 @@ class SermondistributorModelSermon extends JModelAdmin return false; } - // [4749] make sure published only updates if user has the permission. + // [4756] make sure published only updates if user has the permission. if (isset($values['published']) && !$this->canDo->get('sermon.edit.state')) { unset($values['published']); } - // [4762] remove move_copy from array + // [4769] remove move_copy from array unset($values['move_copy']); if (isset($values['category']) && (int) $values['category'] > 0 && !static::checkCategoryId($values['category'])) @@ -831,7 +831,7 @@ class SermondistributorModelSermon extends JModelAdmin } elseif (isset($values['category']) && (int) $values['category'] > 0) { - // [4773] move the category value to correct field name + // [4780] move the category value to correct field name $values['catid'] = $values['category']; unset($values['category']); } @@ -841,7 +841,7 @@ class SermondistributorModelSermon extends JModelAdmin } - // [4783] Parent exists so we proceed + // [4790] Parent exists so we proceed foreach ($pks as $pk) { if (!$this->user->authorise('sermon.edit', $contexts[$pk])) @@ -851,30 +851,30 @@ class SermondistributorModelSermon extends JModelAdmin return false; } - // [4800] Check that the row actually exists + // [4807] Check that the row actually exists if (!$this->table->load($pk)) { if ($error = $this->table->getError()) { - // [4805] Fatal error + // [4812] Fatal error $this->setError($error); return false; } else { - // [4812] Not fatal error + // [4819] Not fatal error $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk)); continue; } } - // [4818] insert all set values. + // [4825] insert all set values. if (SermondistributorHelper::checkArray($values)) { foreach ($values as $key => $value) { - // [4823] Do special action for access. + // [4830] Do special action for access. if ('access' == $key && strlen($value) > 0) { $this->table->$key = $value; @@ -887,7 +887,7 @@ class SermondistributorModelSermon extends JModelAdmin } - // [4835] Check the row. + // [4842] Check the row. if (!$this->table->check()) { $this->setError($this->table->getError()); @@ -900,7 +900,7 @@ class SermondistributorModelSermon extends JModelAdmin $this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table); } - // [4848] Store the row. + // [4855] Store the row. if (!$this->table->store()) { $this->setError($this->table->getError()); @@ -909,7 +909,7 @@ class SermondistributorModelSermon extends JModelAdmin } } - // [4857] Clean the cache + // [4864] Clean the cache $this->cleanCache(); return true; @@ -939,13 +939,13 @@ class SermondistributorModelSermon extends JModelAdmin $data['metadata'] = (string) $metadata; } - // [4099] Set the local_files string to JSON string. + // [4106] Set the local_files string to JSON string. if (isset($data['local_files'])) { $data['local_files'] = (string) json_encode($data['local_files']); } - // [4099] Set the manual_files string to JSON string. + // [4106] Set the manual_files string to JSON string. if (isset($data['manual_files'])) { $data['manual_files'] = (string) json_encode($data['manual_files']); @@ -959,7 +959,7 @@ class SermondistributorModelSermon extends JModelAdmin $data['params'] = (string) $params; } - // [5139] Alter the name for save as copy + // [5146] Alter the name for save as copy if ($input->get('task') == 'save2copy') { $origTable = clone $this->getTable(); @@ -982,7 +982,7 @@ class SermondistributorModelSermon extends JModelAdmin $data['published'] = 0; } - // [5166] Automatic handling of alias for empty fields + // [5173] Automatic handling of alias for empty fields if (in_array($input->get('task'), array('apply', 'save', 'save2new')) && (int) $input->get('id') == 0) { if ($data['alias'] == null) @@ -1013,10 +1013,10 @@ class SermondistributorModelSermon extends JModelAdmin } } - // [5205] Alter the uniqe field for save as copy + // [5212] Alter the uniqe field for save as copy if ($input->get('task') == 'save2copy') { - // [5208] Automatic handling of other uniqe fields + // [5215] Automatic handling of other uniqe fields $uniqeFields = $this->getUniqeFields(); if (SermondistributorHelper::checkArray($uniqeFields)) { @@ -1070,7 +1070,7 @@ class SermondistributorModelSermon extends JModelAdmin protected function _generateNewTitle($alias, $title) { - // [5239] Alter the title & alias + // [5246] Alter the title & alias $table = $this->getTable(); while ($table->load(array('alias' => $alias))) diff --git a/admin/models/sermondistributor.php b/admin/models/sermondistributor.php index a8a791e9..1706db24 100644 --- a/admin/models/sermondistributor.php +++ b/admin/models/sermondistributor.php @@ -40,7 +40,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') ); - // [12175] view access array + // [12182] 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 56c84ec9..1e6fba6d 100644 --- a/admin/models/sermons.php +++ b/admin/models/sermons.php @@ -124,16 +124,16 @@ class SermondistributorModelSermons extends JModelList */ public function getItems() { - // [10529] check in items + // [10536] check in items $this->checkInNow(); // load parent items $items = parent::getItems(); - // [10604] set values to display correctly. + // [10611] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [10607] get user object. + // [10614] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -147,14 +147,14 @@ class SermondistributorModelSermons extends JModelList } } - // [10870] set selection value to a translatable value + // [10877] set selection value to a translatable value if (SermondistributorHelper::checkArray($items)) { foreach ($items as $nr => &$item) { - // [10877] convert link_type + // [10884] convert link_type $item->link_type = $this->selectionTranslation($item->link_type, 'link_type'); - // [10877] convert source + // [10884] convert source $item->source = $this->selectionTranslation($item->source, 'source'); } } @@ -171,20 +171,20 @@ class SermondistributorModelSermons extends JModelList */ public function selectionTranslation($value,$name) { - // [10903] Array of link_type language strings + // [10910] Array of link_type language strings if ($name == 'link_type') { $link_typeArray = array( 1 => 'COM_SERMONDISTRIBUTOR_SERMON_ENCRYPTED', 2 => 'COM_SERMONDISTRIBUTOR_SERMON_DIRECT' ); - // [10934] Now check if value is found in this array + // [10941] Now check if value is found in this array if (isset($link_typeArray[$value]) && SermondistributorHelper::checkString($link_typeArray[$value])) { return $link_typeArray[$value]; } } - // [10903] Array of source language strings + // [10910] Array of source language strings if ($name == 'source') { $sourceArray = array( @@ -193,7 +193,7 @@ class SermondistributorModelSermons extends JModelList 2 => 'COM_SERMONDISTRIBUTOR_SERMON_DROPBOX', 3 => 'COM_SERMONDISTRIBUTOR_SERMON_URL' ); - // [10934] Now check if value is found in this array + // [10941] Now check if value is found in this array if (isset($sourceArray[$value]) && SermondistributorHelper::checkString($sourceArray[$value])) { return $sourceArray[$value]; @@ -209,29 +209,29 @@ class SermondistributorModelSermons extends JModelList */ protected function getListQuery() { - // [7390] Get the user object. + // [7397] Get the user object. $user = JFactory::getUser(); - // [7392] Create a new query object. + // [7399] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [7395] Select some fields + // [7402] Select some fields $query->select('a.*'); $query->select($db->quoteName('c.title','category_title')); - // [7402] From the sermondistributor_item table + // [7409] 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') . ')'); - // [7543] From the sermondistributor_preacher table. + // [7550] 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') . ')'); - // [7543] From the sermondistributor_series table. + // [7550] 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') . ')'); - // [7416] Filter by published state + // [7423] Filter by published state $published = $this->getState('filter.published'); if (is_numeric($published)) { @@ -242,21 +242,21 @@ class SermondistributorModelSermons extends JModelList $query->where('(a.published = 0 OR a.published = 1)'); } - // [7428] Join over the asset groups. + // [7435] Join over the asset groups. $query->select('ag.title AS access_level'); $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // [7431] Filter by access level. + // [7438] Filter by access level. if ($access = $this->getState('filter.access')) { $query->where('a.access = ' . (int) $access); } - // [7436] Implement View Level Access + // [7443] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [7513] Filter by search. + // [7520] Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) { @@ -271,28 +271,28 @@ class SermondistributorModelSermons extends JModelList } } - // [7747] Filter by preacher. + // [7754] Filter by preacher. if ($preacher = $this->getState('filter.preacher')) { $query->where('a.preacher = ' . $db->quote($db->escape($preacher, true))); } - // [7747] Filter by series. + // [7754] Filter by series. if ($series = $this->getState('filter.series')) { $query->where('a.series = ' . $db->quote($db->escape($series, true))); } - // [7756] Filter by Link_type. + // [7763] Filter by Link_type. if ($link_type = $this->getState('filter.link_type')) { $query->where('a.link_type = ' . $db->quote($db->escape($link_type, true))); } - // [7756] Filter by Source. + // [7763] Filter by Source. if ($source = $this->getState('filter.source')) { $query->where('a.source = ' . $db->quote($db->escape($source, true))); } - // [7450] Filter by a single or group of categories. + // [7457] Filter by a single or group of categories. $baselevel = 1; $categoryId = $this->getState('filter.category_id'); @@ -314,7 +314,7 @@ class SermondistributorModelSermons extends JModelList } - // [7472] Add the list ordering clause. + // [7479] Add the list ordering clause. $orderCol = $this->state->get('list.ordering', 'a.id'); $orderDirn = $this->state->get('list.direction', 'asc'); if ($orderCol != '') @@ -332,42 +332,42 @@ class SermondistributorModelSermons extends JModelList */ public function getExportData($pks) { - // [7180] setup the query + // [7187] setup the query if (SermondistributorHelper::checkArray($pks)) { - // [7183] Get the user object. + // [7190] Get the user object. $user = JFactory::getUser(); - // [7185] Create a new query object. + // [7192] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [7188] Select some fields + // [7195] Select some fields $query->select('a.*'); - // [7190] From the sermondistributor_sermon table + // [7197] From the sermondistributor_sermon table $query->from($db->quoteName('#__sermondistributor_sermon', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); - // [7200] Implement View Level Access + // [7207] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [7207] Order the results by ordering + // [7214] Order the results by ordering $query->order('a.ordering ASC'); - // [7209] Load the items + // [7216] Load the items $db->setQuery($query); $db->execute(); if ($db->getNumRows()) { $items = $db->loadObjectList(); - // [10604] set values to display correctly. + // [10611] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [10607] get user object. + // [10614] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -378,13 +378,13 @@ class SermondistributorModelSermons extends JModelList continue; } - // [10817] unset the values we don't want exported. + // [10824] unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); unset($item->checked_out_time); } } - // [10826] Add headers to items array. + // [10833] Add headers to items array. $headers = $this->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { @@ -403,13 +403,13 @@ class SermondistributorModelSermons extends JModelList */ public function getExImPortHeaders() { - // [7229] Get a db connection. + // [7236] Get a db connection. $db = JFactory::getDbo(); - // [7231] get the columns + // [7238] get the columns $columns = $db->getTableColumns("#__sermondistributor_sermon"); if (SermondistributorHelper::checkArray($columns)) { - // [7235] remove the headers you don't import/export. + // [7242] remove the headers you don't import/export. unset($columns['asset_id']); unset($columns['checked_out']); unset($columns['checked_out_time']); @@ -431,7 +431,7 @@ class SermondistributorModelSermons extends JModelList */ protected function getStoreId($id = '') { - // [10152] Compile the store id. + // [10159] Compile the store id. $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); @@ -459,15 +459,15 @@ class SermondistributorModelSermons extends JModelList */ protected function checkInNow() { - // [10545] Get set check in time + // [10552] Get set check in time $time = JComponentHelper::getParams('com_sermondistributor')->get('check_in'); if ($time) { - // [10550] Get a db connection. + // [10557] Get a db connection. $db = JFactory::getDbo(); - // [10552] reset query + // [10559] reset query $query = $db->getQuery(true); $query->select('*'); $query->from($db->quoteName('#__sermondistributor_sermon')); @@ -475,24 +475,24 @@ class SermondistributorModelSermons extends JModelList $db->execute(); if ($db->getNumRows()) { - // [10560] Get Yesterdays date + // [10567] Get Yesterdays date $date = JFactory::getDate()->modify($time)->toSql(); - // [10562] reset query + // [10569] reset query $query = $db->getQuery(true); - // [10564] Fields to update. + // [10571] Fields to update. $fields = array( $db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'', $db->quoteName('checked_out') . '=0' ); - // [10569] Conditions for which records should be updated. + // [10576] Conditions for which records should be updated. $conditions = array( $db->quoteName('checked_out') . '!=0', $db->quoteName('checked_out_time') . '<\''.$date.'\'' ); - // [10574] Check table + // [10581] 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 eaef7da4..29eddae0 100644 --- a/admin/models/statistic.php +++ b/admin/models/statistic.php @@ -111,7 +111,7 @@ class SermondistributorModelStatistic extends JModelAdmin * @since 1.6 */ public function getForm($data = array(), $loadData = true) - { // [9559] Get the form. + { // [9566] Get the form. $form = $this->loadForm('com_sermondistributor.statistic', 'statistic', array('control' => 'jform', 'load_data' => $loadData)); if (empty($form)) @@ -121,12 +121,12 @@ class SermondistributorModelStatistic extends JModelAdmin $jinput = JFactory::getApplication()->input; - // [9644] The front end calls this model and uses a_id to avoid id clashes so we need to check for that first. + // [9651] 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'); } - // [9649] The back end uses id so we use that the rest of the time and set it to 0 by default. + // [9656] 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'); @@ -134,36 +134,36 @@ class SermondistributorModelStatistic extends JModelAdmin $user = JFactory::getUser(); - // [9655] Check for existing item. - // [9656] Modify the form based on Edit State access controls. + // [9662] Check for existing item. + // [9663] 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'))) { - // [9669] Disable fields for display. + // [9676] Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); $form->setFieldAttribute('published', 'disabled', 'true'); - // [9672] Disable fields while saving. + // [9679] Disable fields while saving. $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } - // [9677] Modify the form based on Edit Creaded By access controls. + // [9684] 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'))) { - // [9689] Disable fields for display. + // [9696] Disable fields for display. $form->setFieldAttribute('created_by', 'disabled', 'true'); - // [9691] Disable fields for display. + // [9698] Disable fields for display. $form->setFieldAttribute('created_by', 'readonly', 'true'); - // [9693] Disable fields while saving. + // [9700] Disable fields while saving. $form->setFieldAttribute('created_by', 'filter', 'unset'); } - // [9696] Modify the form based on Edit Creaded Date access controls. + // [9703] 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'))) { - // [9708] Disable fields for display. + // [9715] Disable fields for display. $form->setFieldAttribute('created', 'disabled', 'true'); - // [9710] Disable fields while saving. + // [9717] Disable fields while saving. $form->setFieldAttribute('created', 'filter', 'unset'); } @@ -199,7 +199,7 @@ class SermondistributorModelStatistic extends JModelAdmin } $user = JFactory::getUser(); - // [9860] The record has been set. Check the record permissions. + // [9867] The record has been set. Check the record permissions. return $user->authorise('statistic.delete', 'com_sermondistributor.statistic.' . (int) $record->id); } return false; @@ -221,14 +221,14 @@ class SermondistributorModelStatistic extends JModelAdmin if ($recordId) { - // [9947] The record has been set. Check the record permissions. + // [9954] 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; } } - // [9964] In the absense of better information, revert to the component permissions. + // [9971] In the absense of better information, revert to the component permissions. return $user->authorise('statistic.edit.state', 'com_sermondistributor'); } @@ -243,7 +243,7 @@ class SermondistributorModelStatistic extends JModelAdmin */ protected function allowEdit($data = array(), $key = 'id') { - // [9772] Check specific edit permission then general edit permission. + // [9779] 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'); @@ -450,7 +450,7 @@ class SermondistributorModelStatistic extends JModelAdmin { if (empty($this->batchSet)) { - // [4925] Set some needed variables. + // [4932] Set some needed variables. $this->user = JFactory::getUser(); $this->table = $this->getTable(); $this->tableClassName = get_class($this->table); @@ -464,12 +464,12 @@ class SermondistributorModelStatistic extends JModelAdmin return false; } - // [4945] get list of uniqe fields + // [4952] get list of uniqe fields $uniqeFields = $this->getUniqeFields(); - // [4947] remove move_copy from array + // [4954] remove move_copy from array unset($values['move_copy']); - // [4950] make sure published is set + // [4957] make sure published is set if (!isset($values['published'])) { $values['published'] = 0; @@ -481,21 +481,21 @@ class SermondistributorModelStatistic extends JModelAdmin $newIds = array(); - // [4987] Parent exists so let's proceed + // [4994] Parent exists so let's proceed while (!empty($pks)) { - // [4990] Pop the first ID off the stack + // [4997] Pop the first ID off the stack $pk = array_shift($pks); $this->table->reset(); - // [4995] only allow copy if user may edit this item. + // [5002] only allow copy if user may edit this item. if (!$this->user->authorise('statistic.edit', $contexts[$pk])) { - // [5005] Not fatal error + // [5012] Not fatal error $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk)); @@ -503,19 +503,19 @@ class SermondistributorModelStatistic extends JModelAdmin } - // [5010] Check that the row actually exists + // [5017] Check that the row actually exists if (!$this->table->load($pk)) { if ($error = $this->table->getError()) { - // [5015] Fatal error + // [5022] Fatal error $this->setError($error); return false; } else { - // [5022] Not fatal error + // [5029] Not fatal error $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk)); continue; } @@ -523,7 +523,7 @@ class SermondistributorModelStatistic extends JModelAdmin $this->table->filename = $this->generateUniqe('filename',$this->table->filename); - // [5058] insert all set values + // [5065] insert all set values if (SermondistributorHelper::checkArray($values)) { foreach ($values as $key => $value) @@ -535,7 +535,7 @@ class SermondistributorModelStatistic extends JModelAdmin } } - // [5070] update all uniqe fields + // [5077] update all uniqe fields if (SermondistributorHelper::checkArray($uniqeFields)) { foreach ($uniqeFields as $uniqeField) @@ -544,13 +544,13 @@ class SermondistributorModelStatistic extends JModelAdmin } } - // [5079] Reset the ID because we are making a copy + // [5086] Reset the ID because we are making a copy $this->table->id = 0; - // [5082] TODO: Deal with ordering? - // [5083] $this->table->ordering = 1; + // [5089] TODO: Deal with ordering? + // [5090] $this->table->ordering = 1; - // [5085] Check the row. + // [5092] Check the row. if (!$this->table->check()) { $this->setError($this->table->getError()); @@ -563,7 +563,7 @@ class SermondistributorModelStatistic extends JModelAdmin $this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table); } - // [5098] Store the row. + // [5105] Store the row. if (!$this->table->store()) { $this->setError($this->table->getError()); @@ -571,14 +571,14 @@ class SermondistributorModelStatistic extends JModelAdmin return false; } - // [5106] Get the new item ID + // [5113] Get the new item ID $newId = $this->table->get('id'); - // [5109] Add the new ID to the array + // [5116] Add the new ID to the array $newIds[$pk] = $newId; } - // [5113] Clean the cache + // [5120] Clean the cache $this->cleanCache(); return $newIds; @@ -599,7 +599,7 @@ class SermondistributorModelStatistic extends JModelAdmin { if (empty($this->batchSet)) { - // [4727] Set some needed variables. + // [4734] Set some needed variables. $this->user = JFactory::getUser(); $this->table = $this->getTable(); $this->tableClassName = get_class($this->table); @@ -614,15 +614,15 @@ class SermondistributorModelStatistic extends JModelAdmin return false; } - // [4749] make sure published only updates if user has the permission. + // [4756] make sure published only updates if user has the permission. if (isset($values['published']) && !$this->canDo->get('statistic.edit.state')) { unset($values['published']); } - // [4762] remove move_copy from array + // [4769] remove move_copy from array unset($values['move_copy']); - // [4783] Parent exists so we proceed + // [4790] Parent exists so we proceed foreach ($pks as $pk) { if (!$this->user->authorise('statistic.edit', $contexts[$pk])) @@ -632,30 +632,30 @@ class SermondistributorModelStatistic extends JModelAdmin return false; } - // [4800] Check that the row actually exists + // [4807] Check that the row actually exists if (!$this->table->load($pk)) { if ($error = $this->table->getError()) { - // [4805] Fatal error + // [4812] Fatal error $this->setError($error); return false; } else { - // [4812] Not fatal error + // [4819] Not fatal error $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk)); continue; } } - // [4818] insert all set values. + // [4825] insert all set values. if (SermondistributorHelper::checkArray($values)) { foreach ($values as $key => $value) { - // [4823] Do special action for access. + // [4830] Do special action for access. if ('access' == $key && strlen($value) > 0) { $this->table->$key = $value; @@ -668,7 +668,7 @@ class SermondistributorModelStatistic extends JModelAdmin } - // [4835] Check the row. + // [4842] Check the row. if (!$this->table->check()) { $this->setError($this->table->getError()); @@ -681,7 +681,7 @@ class SermondistributorModelStatistic extends JModelAdmin $this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table); } - // [4848] Store the row. + // [4855] Store the row. if (!$this->table->store()) { $this->setError($this->table->getError()); @@ -690,7 +690,7 @@ class SermondistributorModelStatistic extends JModelAdmin } } - // [4857] Clean the cache + // [4864] Clean the cache $this->cleanCache(); return true; @@ -728,10 +728,10 @@ class SermondistributorModelStatistic extends JModelAdmin $data['params'] = (string) $params; } - // [5205] Alter the uniqe field for save as copy + // [5212] Alter the uniqe field for save as copy if ($input->get('task') == 'save2copy') { - // [5208] Automatic handling of other uniqe fields + // [5215] Automatic handling of other uniqe fields $uniqeFields = $this->getUniqeFields(); if (SermondistributorHelper::checkArray($uniqeFields)) { @@ -784,7 +784,7 @@ class SermondistributorModelStatistic extends JModelAdmin protected function _generateNewTitle($title) { - // [5263] Alter the title + // [5270] Alter the title $table = $this->getTable(); while ($table->load(array('title' => $title))) diff --git a/admin/models/statistics.php b/admin/models/statistics.php index ebbb9732..40a7f68f 100644 --- a/admin/models/statistics.php +++ b/admin/models/statistics.php @@ -108,16 +108,16 @@ class SermondistributorModelStatistics extends JModelList */ public function getItems() { - // [10529] check in items + // [10536] check in items $this->checkInNow(); // load parent items $items = parent::getItems(); - // [10604] set values to display correctly. + // [10611] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [10607] get user object. + // [10614] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -142,31 +142,31 @@ class SermondistributorModelStatistics extends JModelList */ protected function getListQuery() { - // [7390] Get the user object. + // [7397] Get the user object. $user = JFactory::getUser(); - // [7392] Create a new query object. + // [7399] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [7395] Select some fields + // [7402] Select some fields $query->select('a.*'); - // [7402] From the sermondistributor_item table + // [7409] From the sermondistributor_item table $query->from($db->quoteName('#__sermondistributor_statistic', 'a')); - // [7543] From the sermondistributor_sermon table. + // [7550] 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') . ')'); - // [7543] From the sermondistributor_preacher table. + // [7550] 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') . ')'); - // [7543] From the sermondistributor_series table. + // [7550] 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') . ')'); - // [7416] Filter by published state + // [7423] Filter by published state $published = $this->getState('filter.published'); if (is_numeric($published)) { @@ -177,21 +177,21 @@ class SermondistributorModelStatistics extends JModelList $query->where('(a.published = 0 OR a.published = 1)'); } - // [7428] Join over the asset groups. + // [7435] Join over the asset groups. $query->select('ag.title AS access_level'); $query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access'); - // [7431] Filter by access level. + // [7438] Filter by access level. if ($access = $this->getState('filter.access')) { $query->where('a.access = ' . (int) $access); } - // [7436] Implement View Level Access + // [7443] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [7513] Filter by search. + // [7520] Filter by search. $search = $this->getState('filter.search'); if (!empty($search)) { @@ -206,23 +206,23 @@ class SermondistributorModelStatistics extends JModelList } } - // [7747] Filter by sermon. + // [7754] Filter by sermon. if ($sermon = $this->getState('filter.sermon')) { $query->where('a.sermon = ' . $db->quote($db->escape($sermon, true))); } - // [7747] Filter by preacher. + // [7754] Filter by preacher. if ($preacher = $this->getState('filter.preacher')) { $query->where('a.preacher = ' . $db->quote($db->escape($preacher, true))); } - // [7747] Filter by series. + // [7754] Filter by series. if ($series = $this->getState('filter.series')) { $query->where('a.series = ' . $db->quote($db->escape($series, true))); } - // [7472] Add the list ordering clause. + // [7479] Add the list ordering clause. $orderCol = $this->state->get('list.ordering', 'a.id'); $orderDirn = $this->state->get('list.direction', 'asc'); if ($orderCol != '') @@ -240,42 +240,42 @@ class SermondistributorModelStatistics extends JModelList */ public function getExportData($pks) { - // [7180] setup the query + // [7187] setup the query if (SermondistributorHelper::checkArray($pks)) { - // [7183] Get the user object. + // [7190] Get the user object. $user = JFactory::getUser(); - // [7185] Create a new query object. + // [7192] Create a new query object. $db = JFactory::getDBO(); $query = $db->getQuery(true); - // [7188] Select some fields + // [7195] Select some fields $query->select('a.*'); - // [7190] From the sermondistributor_statistic table + // [7197] From the sermondistributor_statistic table $query->from($db->quoteName('#__sermondistributor_statistic', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); - // [7200] Implement View Level Access + // [7207] Implement View Level Access if (!$user->authorise('core.options', 'com_sermondistributor')) { $groups = implode(',', $user->getAuthorisedViewLevels()); $query->where('a.access IN (' . $groups . ')'); } - // [7207] Order the results by ordering + // [7214] Order the results by ordering $query->order('a.ordering ASC'); - // [7209] Load the items + // [7216] Load the items $db->setQuery($query); $db->execute(); if ($db->getNumRows()) { $items = $db->loadObjectList(); - // [10604] set values to display correctly. + // [10611] set values to display correctly. if (SermondistributorHelper::checkArray($items)) { - // [10607] get user object. + // [10614] get user object. $user = JFactory::getUser(); foreach ($items as $nr => &$item) { @@ -286,13 +286,13 @@ class SermondistributorModelStatistics extends JModelList continue; } - // [10817] unset the values we don't want exported. + // [10824] unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); unset($item->checked_out_time); } } - // [10826] Add headers to items array. + // [10833] Add headers to items array. $headers = $this->getExImPortHeaders(); if (SermondistributorHelper::checkObject($headers)) { @@ -311,13 +311,13 @@ class SermondistributorModelStatistics extends JModelList */ public function getExImPortHeaders() { - // [7229] Get a db connection. + // [7236] Get a db connection. $db = JFactory::getDbo(); - // [7231] get the columns + // [7238] get the columns $columns = $db->getTableColumns("#__sermondistributor_statistic"); if (SermondistributorHelper::checkArray($columns)) { - // [7235] remove the headers you don't import/export. + // [7242] remove the headers you don't import/export. unset($columns['asset_id']); unset($columns['checked_out']); unset($columns['checked_out_time']); @@ -339,7 +339,7 @@ class SermondistributorModelStatistics extends JModelList */ protected function getStoreId($id = '') { - // [10152] Compile the store id. + // [10159] Compile the store id. $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); @@ -363,15 +363,15 @@ class SermondistributorModelStatistics extends JModelList */ protected function checkInNow() { - // [10545] Get set check in time + // [10552] Get set check in time $time = JComponentHelper::getParams('com_sermondistributor')->get('check_in'); if ($time) { - // [10550] Get a db connection. + // [10557] Get a db connection. $db = JFactory::getDbo(); - // [10552] reset query + // [10559] reset query $query = $db->getQuery(true); $query->select('*'); $query->from($db->quoteName('#__sermondistributor_statistic')); @@ -379,24 +379,24 @@ class SermondistributorModelStatistics extends JModelList $db->execute(); if ($db->getNumRows()) { - // [10560] Get Yesterdays date + // [10567] Get Yesterdays date $date = JFactory::getDate()->modify($time)->toSql(); - // [10562] reset query + // [10569] reset query $query = $db->getQuery(true); - // [10564] Fields to update. + // [10571] Fields to update. $fields = array( $db->quoteName('checked_out_time') . '=\'0000-00-00 00:00:00\'', $db->quoteName('checked_out') . '=0' ); - // [10569] Conditions for which records should be updated. + // [10576] Conditions for which records should be updated. $conditions = array( $db->quoteName('checked_out') . '!=0', $db->quoteName('checked_out_time') . '<\''.$date.'\'' ); - // [10574] Check table + // [10581] Check table $query->update($db->quoteName('#__sermondistributor_statistic'))->set($fields)->where($conditions); $db->setQuery($query); diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index 6856cee0..fbfd2765 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -48,7 +48,7 @@ class SermondistributorTableHelp_document extends JTable { parent::__construct('#__sermondistributor_help_document', 'id', $db); - // [4187] Adding History Options + // [4194] Adding History Options JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_sermondistributor.help_document')); } diff --git a/admin/tables/preacher.php b/admin/tables/preacher.php index 20b81cd7..5808444d 100644 --- a/admin/tables/preacher.php +++ b/admin/tables/preacher.php @@ -48,7 +48,7 @@ class SermondistributorTablePreacher extends JTable { parent::__construct('#__sermondistributor_preacher', 'id', $db); - // [4187] Adding History Options + // [4194] Adding History Options JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_sermondistributor.preacher')); } diff --git a/admin/tables/series.php b/admin/tables/series.php index 96f26c4d..8b769994 100644 --- a/admin/tables/series.php +++ b/admin/tables/series.php @@ -48,7 +48,7 @@ class SermondistributorTableSeries extends JTable { parent::__construct('#__sermondistributor_series', 'id', $db); - // [4187] Adding History Options + // [4194] Adding History Options JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_sermondistributor.series')); } diff --git a/admin/tables/sermon.php b/admin/tables/sermon.php index b197182e..4980cffe 100644 --- a/admin/tables/sermon.php +++ b/admin/tables/sermon.php @@ -48,10 +48,10 @@ class SermondistributorTableSermon extends JTable { parent::__construct('#__sermondistributor_sermon', 'id', $db); - // [4181] Adding Tag Options + // [4188] Adding Tag Options JTableObserverTags::createObserver($this, array('typeAlias' => 'com_sermondistributor.sermon')); - // [4187] Adding History Options + // [4194] Adding History Options JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_sermondistributor.sermon')); } diff --git a/admin/tables/statistic.php b/admin/tables/statistic.php index 8f5c4169..4e57f7f6 100644 --- a/admin/tables/statistic.php +++ b/admin/tables/statistic.php @@ -48,7 +48,7 @@ class SermondistributorTableStatistic extends JTable { parent::__construct('#__sermondistributor_statistic', 'id', $db); - // [4187] Adding History Options + // [4194] Adding History Options JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_sermondistributor.statistic')); } diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php index 326d4289..2d728eda 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -95,93 +95,93 @@ $componentParams = JComponentHelper::getParams('com_sermondistributor');