Update the componet with the improvements made to JCB v2.8.10

This commit is contained in:
Llewellyn van der Merwe 2018-07-20 06:39:01 +02:00
parent cec103ecd8
commit da72b43a11
No known key found for this signature in database
GPG Key ID: CAD7B16D27AF28C5
55 changed files with 661 additions and 689 deletions

View File

@ -23,7 +23,7 @@ The best way to see all your options is to install this component on you Joomla
+ *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
+ *Name*: [Sermon Distributor](https://www.vdm.io/) + *Name*: [Sermon Distributor](https://www.vdm.io/)
+ *First Build*: 22nd October, 2015 + *First Build*: 22nd October, 2015
+ *Last Build*: 5th May, 2018 + *Last Build*: 28th June, 2018
+ *Version*: 2.0.x + *Version*: 2.0.x
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
@ -36,7 +36,7 @@ due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
> never making one mistake or taking any coffee break.) > never making one mistake or taking any coffee break.)
+ *Line count*: **66759** + *Line count*: **66731**
+ *File count*: **445** + *File count*: **445**
+ *Folder count*: **93** + *Folder count*: **93**

View File

@ -23,7 +23,7 @@ The best way to see all your options is to install this component on you Joomla
+ *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
+ *Name*: [Sermon Distributor](https://www.vdm.io/) + *Name*: [Sermon Distributor](https://www.vdm.io/)
+ *First Build*: 22nd October, 2015 + *First Build*: 22nd October, 2015
+ *Last Build*: 5th May, 2018 + *Last Build*: 28th June, 2018
+ *Version*: 2.0.x + *Version*: 2.0.x
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
@ -36,7 +36,7 @@ due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
> never making one mistake or taking any coffee break.) > never making one mistake or taking any coffee break.)
+ *Line count*: **66759** + *Line count*: **66731**
+ *File count*: **445** + *File count*: **445**
+ *Folder count*: **93** + *Folder count*: **93**

View File

@ -224,9 +224,9 @@ class SermondistributorControllerExternal_source extends JControllerForm
protected function allowEdit($data = array(), $key = 'id') protected function allowEdit($data = array(), $key = 'id')
{ {
// get user object. // get user object.
$user = JFactory::getUser(); $user = JFactory::getUser();
// get record id. // get record id.
$recordId = (int) isset($data[$key]) ? $data[$key] : 0; $recordId = (int) isset($data[$key]) ? $data[$key] : 0;
// Access check. // Access check.

View File

@ -82,9 +82,9 @@ class SermondistributorControllerHelp_document extends JControllerForm
protected function allowEdit($data = array(), $key = 'id') protected function allowEdit($data = array(), $key = 'id')
{ {
// get user object. // get user object.
$user = JFactory::getUser(); $user = JFactory::getUser();
// get record id. // get record id.
$recordId = (int) isset($data[$key]) ? $data[$key] : 0; $recordId = (int) isset($data[$key]) ? $data[$key] : 0;
// Access check. // Access check.

View File

@ -82,9 +82,9 @@ class SermondistributorControllerLocal_listing extends JControllerForm
protected function allowEdit($data = array(), $key = 'id') protected function allowEdit($data = array(), $key = 'id')
{ {
// get user object. // get user object.
$user = JFactory::getUser(); $user = JFactory::getUser();
// get record id. // get record id.
$recordId = (int) isset($data[$key]) ? $data[$key] : 0; $recordId = (int) isset($data[$key]) ? $data[$key] : 0;
// Access check. // Access check.

View File

@ -82,9 +82,9 @@ class SermondistributorControllerPreacher extends JControllerForm
protected function allowEdit($data = array(), $key = 'id') protected function allowEdit($data = array(), $key = 'id')
{ {
// get user object. // get user object.
$user = JFactory::getUser(); $user = JFactory::getUser();
// get record id. // get record id.
$recordId = (int) isset($data[$key]) ? $data[$key] : 0; $recordId = (int) isset($data[$key]) ? $data[$key] : 0;
// Access check. // Access check.

View File

@ -82,9 +82,9 @@ class SermondistributorControllerSeries extends JControllerForm
protected function allowEdit($data = array(), $key = 'id') protected function allowEdit($data = array(), $key = 'id')
{ {
// get user object. // get user object.
$user = JFactory::getUser(); $user = JFactory::getUser();
// get record id. // get record id.
$recordId = (int) isset($data[$key]) ? $data[$key] : 0; $recordId = (int) isset($data[$key]) ? $data[$key] : 0;
// Access check. // Access check.

View File

@ -81,9 +81,9 @@ class SermondistributorControllerSermon extends JControllerForm
*/ */
protected function allowEdit($data = array(), $key = 'id') protected function allowEdit($data = array(), $key = 'id')
{ // get user object. { // get user object.
$user = JFactory::getUser(); $user = JFactory::getUser();
// get record id. // get record id.
$recordId = (int) isset($data[$key]) ? $data[$key] : 0; $recordId = (int) isset($data[$key]) ? $data[$key] : 0;
// Access check. // Access check.

View File

@ -82,9 +82,9 @@ class SermondistributorControllerStatistic extends JControllerForm
protected function allowEdit($data = array(), $key = 'id') protected function allowEdit($data = array(), $key = 'id')
{ {
// get user object. // get user object.
$user = JFactory::getUser(); $user = JFactory::getUser();
// get record id. // get record id.
$recordId = (int) isset($data[$key]) ? $data[$key] : 0; $recordId = (int) isset($data[$key]) ? $data[$key] : 0;
// Access check. // Access check.

View File

@ -2680,8 +2680,8 @@ abstract class SermondistributorHelper
} }
/** /**
* Load the Component Help URLs. * Load the Component Help URLs.
**/ **/
public static function getHelpUrl($view) public static function getHelpUrl($view)
{ {
$user = JFactory::getUser(); $user = JFactory::getUser();
@ -2718,15 +2718,15 @@ abstract class SermondistributorHelper
// set joomla article // set joomla article
case 1: case 1:
return self::loadArticleLink($help->article); return self::loadArticleLink($help->article);
break; break;
// set help text // set help text
case 2: case 2:
return self::loadHelpTextLink($help->id); return self::loadHelpTextLink($help->id);
break; break;
// set Link // set Link
case 3: case 3:
return $help->url; return $help->url;
break; break;
} }
} }
} }
@ -2735,16 +2735,16 @@ abstract class SermondistributorHelper
} }
/** /**
* Get the Article Link. * Get the Article Link.
**/ **/
protected static function loadArticleLink($id) protected static function loadArticleLink($id)
{ {
return JURI::root().'index.php?option=com_content&view=article&id='.$id.'&tmpl=component&layout=modal'; return JURI::root().'index.php?option=com_content&view=article&id='.$id.'&tmpl=component&layout=modal';
} }
/** /**
* Get the Help Text Link. * Get the Help Text Link.
**/ **/
protected static function loadHelpTextLink($id) protected static function loadHelpTextLink($id)
{ {
$token = JSession::getFormToken(); $token = JSession::getFormToken();
@ -2797,8 +2797,8 @@ abstract class SermondistributorHelper
} }
/** /**
* UIKIT Component Classes * UIKIT Component Classes
**/ **/
public static $uk_components = array( public static $uk_components = array(
'data-uk-grid' => array( 'data-uk-grid' => array(
'grid' ), 'grid' ),
@ -2852,15 +2852,15 @@ abstract class SermondistributorHelper
'upload-drop' => array( 'upload-drop' => array(
'upload', 'form-file' ) 'upload', 'form-file' )
); );
/** /**
* Add UIKIT Components * Add UIKIT Components
**/ **/
public static $uikit = false; public static $uikit = false;
/** /**
* Get UIKIT Components * Get UIKIT Components
**/ **/
public static function getUikitComp($content,$classes = array()) public static function getUikitComp($content,$classes = array())
{ {
if (strpos($content,'class="uk-') !== false) if (strpos($content,'class="uk-') !== false)
@ -2890,7 +2890,7 @@ abstract class SermondistributorHelper
} }
return $temp; return $temp;
} }
} }
if (self::checkArray($classes)) if (self::checkArray($classes))
{ {
return $classes; return $classes;
@ -2926,19 +2926,19 @@ abstract class SermondistributorHelper
{ {
$subjectTab = 'Sheet1'; $subjectTab = 'Sheet1';
} }
// make sure the file is loaded // make sure the file is loaded
JLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers'); JLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers');
// Create new PHPExcel object // Create new PHPExcel object
$objPHPExcel = new PHPExcel(); $objPHPExcel = new PHPExcel();
// Set document properties // Set document properties
$objPHPExcel->getProperties()->setCreator($creator) $objPHPExcel->getProperties()->setCreator($creator)
->setCompany('Vast Development Method') ->setCompany('Vast Development Method')
->setLastModifiedBy($modified) ->setLastModifiedBy($modified)
->setTitle($title) ->setTitle($title)
->setSubject($subjectTab); ->setSubject($subjectTab);
if (!$description) if (!$description)
{ {
$objPHPExcel->getProperties()->setDescription($description); $objPHPExcel->getProperties()->setDescription($description);
@ -2951,7 +2951,7 @@ abstract class SermondistributorHelper
{ {
$objPHPExcel->getProperties()->setCategory($category); $objPHPExcel->getProperties()->setCategory($category);
} }
// Some styles // Some styles
$headerStyles = array( $headerStyles = array(
'font' => array( 'font' => array(
@ -2973,7 +2973,7 @@ abstract class SermondistributorHelper
'size' => 11, 'size' => 11,
'name' => 'Verdana' 'name' => 'Verdana'
)); ));
// Add some data // Add some data
if (self::checkArray($rows)) if (self::checkArray($rows))
{ {
@ -3000,43 +3000,43 @@ abstract class SermondistributorHelper
{ {
return false; return false;
} }
// Rename worksheet // Rename worksheet
$objPHPExcel->getActiveSheet()->setTitle($subjectTab); $objPHPExcel->getActiveSheet()->setTitle($subjectTab);
// Set active sheet index to the first sheet, so Excel opens this as the first sheet // Set active sheet index to the first sheet, so Excel opens this as the first sheet
$objPHPExcel->setActiveSheetIndex(0); $objPHPExcel->setActiveSheetIndex(0);
// Redirect output to a client's web browser (Excel5) // Redirect output to a client's web browser (Excel5)
header('Content-Type: application/vnd.ms-excel'); header('Content-Type: application/vnd.ms-excel');
header('Content-Disposition: attachment;filename="'.$fileName.'.xls"'); header('Content-Disposition: attachment;filename="'.$fileName.'.xls"');
header('Cache-Control: max-age=0'); header('Cache-Control: max-age=0');
// If you're serving to IE 9, then the following may be needed // If you're serving to IE 9, then the following may be needed
header('Cache-Control: max-age=1'); header('Cache-Control: max-age=1');
// If you're serving to IE over SSL, then the following may be needed // If you're serving to IE over SSL, then the following may be needed
header ('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past header ('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past
header ('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); // always modified header ('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); // always modified
header ('Cache-Control: cache, must-revalidate'); // HTTP/1.1 header ('Cache-Control: cache, must-revalidate'); // HTTP/1.1
header ('Pragma: public'); // HTTP/1.0 header ('Pragma: public'); // HTTP/1.0
$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5'); $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');
$objWriter->save('php://output'); $objWriter->save('php://output');
jexit(); jexit();
} }
/** /**
* Get CSV Headers * Get CSV Headers
*/ */
public static function getFileHeaders($dataType) public static function getFileHeaders($dataType)
{ {
// make sure these files are loaded // make sure these files are loaded
JLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers'); JLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers');
JLoader::import('ChunkReadFilter', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/PHPExcel/Reader'); JLoader::import('ChunkReadFilter', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/PHPExcel/Reader');
// get session object // get session object
$session = JFactory::getSession(); $session = JFactory::getSession();
$package = $session->get('package', null); $package = $session->get('package', null);
$package = json_decode($package, true); $package = json_decode($package, true);
// set the headers // set the headers
if(isset($package['dir'])) if(isset($package['dir']))
{ {
@ -3613,7 +3613,7 @@ abstract class SermondistributorHelper
} }
} }
// check if there are any view values remaining // check if there are any view values remaining
if (count($_result)) if (count((array)$_result))
{ {
$_result = json_encode($_result); $_result = json_encode($_result);
$_result = array($_result); $_result = array($_result);
@ -3807,7 +3807,7 @@ abstract class SermondistributorHelper
**/ **/
public static function checkArray($array, $removeEmptyString = false) public static function checkArray($array, $removeEmptyString = false)
{ {
if (isset($array) && is_array($array) && count($array) > 0) if (isset($array) && is_array($array) && count((array)$array) > 0)
{ {
// also make sure the empty strings are removed // also make sure the empty strings are removed
if ($removeEmptyString) if ($removeEmptyString)
@ -3910,7 +3910,7 @@ abstract class SermondistributorHelper
{ {
$initial = strlen($string); $initial = strlen($string);
$words = preg_split('/([\s\n\r]+)/', $string, null, PREG_SPLIT_DELIM_CAPTURE); $words = preg_split('/([\s\n\r]+)/', $string, null, PREG_SPLIT_DELIM_CAPTURE);
$words_count = count($words); $words_count = count((array)$words);
$word_length = 0; $word_length = 0;
$last_word = 0; $last_word = 0;

View File

@ -1512,4 +1512,5 @@ COM_SERMONDISTRIBUTOR_VIEW_MORE_RELEASES_ON_GITHUB="View more releases on Github
COM_SERMONDISTRIBUTOR_VIEW_UPDATE_STATUS="View Update Status" COM_SERMONDISTRIBUTOR_VIEW_UPDATE_STATUS="View Update Status"
COM_SERMONDISTRIBUTOR_WEBSITE="Website" COM_SERMONDISTRIBUTOR_WEBSITE="Website"
COM_SERMONDISTRIBUTOR_YOU_DO_NOT_HAVE_PERMISSION_TO_CLEAR_LOCAL_LISTING="You do not have permission to clear local listing." COM_SERMONDISTRIBUTOR_YOU_DO_NOT_HAVE_PERMISSION_TO_CLEAR_LOCAL_LISTING="You do not have permission to clear local listing."
COM_SERMONDISTRIBUTOR_YOU_DO_NOT_HAVE_PERMISSION_TO_RESET_UPDATE_STATUS="You do not have permission to reset update status." COM_SERMONDISTRIBUTOR_YOU_DO_NOT_HAVE_PERMISSION_TO_RESET_UPDATE_STATUS="You do not have permission to reset update status."
PREACHERS_PREACHER_DETAILS="Preacher Details"

View File

@ -85,30 +85,30 @@ $can = SermondistributorHelper::getActions('sermon');
$canDo = SermondistributorHelper::getActions('sermon',$item,'sermons'); $canDo = SermondistributorHelper::getActions('sermon',$item,'sermons');
?> ?>
<tr> <tr>
<td class="nowrap"> <td>
<?php if ($canDo->get('sermon.edit')): ?> <?php if ($canDo->get('sermon.edit')): ?>
<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=preacher&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->name); ?></a> <a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=preacher&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->name); ?></a>
<?php if ($item->checked_out): ?> <?php if ($item->checked_out): ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'sermons.', $canCheckin); ?> <?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'sermons.', $canCheckin); ?>
<?php endif; ?> <?php endif; ?>
<?php else: ?> <?php else: ?>
<div class="name"><?php echo $displayData->escape($item->name); ?></div> <?php echo $displayData->escape($item->name); ?>
<?php endif; ?> <?php endif; ?>
</td> </td>
<td> <td>
<?php echo $displayData->escape($item->preacher_name); ?> <?php echo $displayData->escape($item->preacher_name); ?>
</td> </td>
<td class="nowrap"> <td>
<?php if ($user->authorise('series.edit', 'com_sermondistributor.series.' . (int)$item->series)): ?> <?php if ($user->authorise('series.edit', 'com_sermondistributor.series.' . (int)$item->series)): ?>
<a href="index.php?option=com_sermondistributor&view=all_series&task=series.edit&id=<?php echo $item->series; ?>&ref=preacher&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->series_name); ?></a> <a href="index.php?option=com_sermondistributor&view=all_series&task=series.edit&id=<?php echo $item->series; ?>&ref=preacher&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->series_name); ?></a>
<?php else: ?> <?php else: ?>
<div class="name"><?php echo $displayData->escape($item->series_name); ?></div> <?php echo $displayData->escape($item->series_name); ?>
<?php endif; ?> <?php endif; ?>
</td> </td>
<td> <td>
<?php echo $displayData->escape($item->short_description); ?> <?php echo $displayData->escape($item->short_description); ?>
</td> </td>
<td class="nowrap"> <td>
<?php if ($user->authorise('core.edit', 'com_sermondistributor.sermons.category.' . (int)$item->catid)): ?> <?php if ($user->authorise('core.edit', 'com_sermondistributor.sermons.category.' . (int)$item->catid)): ?>
<a href="index.php?option=com_categories&task=category.edit&id=<?php echo (int)$item->catid; ?>&extension=com_sermondistributor.sermons"><?php echo $displayData->escape($item->category_title); ?></a> <a href="index.php?option=com_categories&task=category.edit&id=<?php echo (int)$item->catid; ?>&extension=com_sermondistributor.sermons"><?php echo $displayData->escape($item->category_title); ?></a>
<?php else: ?> <?php else: ?>

View File

@ -81,21 +81,21 @@ $can = SermondistributorHelper::getActions('sermon');
$canDo = SermondistributorHelper::getActions('sermon',$item,'sermons'); $canDo = SermondistributorHelper::getActions('sermon',$item,'sermons');
?> ?>
<tr> <tr>
<td class="nowrap"> <td>
<?php if ($canDo->get('sermon.edit')): ?> <?php if ($canDo->get('sermon.edit')): ?>
<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=series&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->name); ?></a> <a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=series&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->name); ?></a>
<?php if ($item->checked_out): ?> <?php if ($item->checked_out): ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'sermons.', $canCheckin); ?> <?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'sermons.', $canCheckin); ?>
<?php endif; ?> <?php endif; ?>
<?php else: ?> <?php else: ?>
<div class="name"><?php echo $displayData->escape($item->name); ?></div> <?php echo $displayData->escape($item->name); ?>
<?php endif; ?> <?php endif; ?>
</td> </td>
<td class="nowrap"> <td>
<?php if ($user->authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int)$item->preacher)): ?> <?php if ($user->authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int)$item->preacher)): ?>
<a href="index.php?option=com_sermondistributor&view=preachers&task=preacher.edit&id=<?php echo $item->preacher; ?>&ref=series&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->preacher_name); ?></a> <a href="index.php?option=com_sermondistributor&view=preachers&task=preacher.edit&id=<?php echo $item->preacher; ?>&ref=series&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->preacher_name); ?></a>
<?php else: ?> <?php else: ?>
<div class="name"><?php echo $displayData->escape($item->preacher_name); ?></div> <?php echo $displayData->escape($item->preacher_name); ?>
<?php endif; ?> <?php endif; ?>
</td> </td>
<td> <td>
@ -104,7 +104,7 @@ $can = SermondistributorHelper::getActions('sermon');
<td> <td>
<?php echo $displayData->escape($item->short_description); ?> <?php echo $displayData->escape($item->short_description); ?>
</td> </td>
<td class="nowrap"> <td>
<?php if ($user->authorise('core.edit', 'com_sermondistributor.sermons.category.' . (int)$item->catid)): ?> <?php if ($user->authorise('core.edit', 'com_sermondistributor.sermons.category.' . (int)$item->catid)): ?>
<a href="index.php?option=com_categories&task=category.edit&id=<?php echo (int)$item->catid; ?>&extension=com_sermondistributor.sermons"><?php echo $displayData->escape($item->category_title); ?></a> <a href="index.php?option=com_categories&task=category.edit&id=<?php echo (int)$item->catid; ?>&extension=com_sermondistributor.sermons"><?php echo $displayData->escape($item->category_title); ?></a>
<?php else: ?> <?php else: ?>

View File

@ -69,31 +69,31 @@ $edit = "index.php?option=com_sermondistributor&view=statistics&task=statistic.e
$canDo = SermondistributorHelper::getActions('statistic',$item,'statistics'); $canDo = SermondistributorHelper::getActions('statistic',$item,'statistics');
?> ?>
<tr> <tr>
<td class="nowrap"> <td>
<?php if ($canDo->get('statistic.edit')): ?> <?php if ($canDo->get('statistic.edit')): ?>
<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=sermon&refid=<?php echo $id; ?>"><?php echo $item->filename; ?></a> <a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=sermon&refid=<?php echo $id; ?>"><?php echo $item->filename; ?></a>
<?php if ($item->checked_out): ?> <?php if ($item->checked_out): ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'statistics.', $canCheckin); ?> <?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'statistics.', $canCheckin); ?>
<?php endif; ?> <?php endif; ?>
<?php else: ?> <?php else: ?>
<div class="name"><?php echo $item->filename; ?></div> <?php echo $item->filename; ?>
<?php endif; ?> <?php endif; ?>
</td> </td>
<td> <td>
<?php echo $displayData->escape($item->sermon_name); ?> <?php echo $displayData->escape($item->sermon_name); ?>
</td> </td>
<td class="nowrap"> <td>
<?php if ($user->authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int)$item->preacher)): ?> <?php if ($user->authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int)$item->preacher)): ?>
<a href="index.php?option=com_sermondistributor&view=preachers&task=preacher.edit&id=<?php echo $item->preacher; ?>&ref=sermon&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->preacher_name); ?></a> <a href="index.php?option=com_sermondistributor&view=preachers&task=preacher.edit&id=<?php echo $item->preacher; ?>&ref=sermon&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->preacher_name); ?></a>
<?php else: ?> <?php else: ?>
<div class="name"><?php echo $displayData->escape($item->preacher_name); ?></div> <?php echo $displayData->escape($item->preacher_name); ?>
<?php endif; ?> <?php endif; ?>
</td> </td>
<td class="nowrap"> <td>
<?php if ($user->authorise('series.edit', 'com_sermondistributor.series.' . (int)$item->series)): ?> <?php if ($user->authorise('series.edit', 'com_sermondistributor.series.' . (int)$item->series)): ?>
<a href="index.php?option=com_sermondistributor&view=all_series&task=series.edit&id=<?php echo $item->series; ?>&ref=sermon&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->series_name); ?></a> <a href="index.php?option=com_sermondistributor&view=all_series&task=series.edit&id=<?php echo $item->series; ?>&ref=sermon&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->series_name); ?></a>
<?php else: ?> <?php else: ?>
<div class="name"><?php echo $displayData->escape($item->series_name); ?></div> <?php echo $displayData->escape($item->series_name); ?>
<?php endif; ?> <?php endif; ?>
</td> </td>
<td> <td>

View File

@ -332,7 +332,7 @@ class SermondistributorModelExternal_source extends JModelAdmin
protected function canEditState($record) protected function canEditState($record)
{ {
$user = JFactory::getUser(); $user = JFactory::getUser();
$recordId = (!empty($record->id)) ? $record->id : 0; $recordId = (!empty($record->id)) ? $record->id : 0;
if ($recordId) if ($recordId)
{ {
@ -443,18 +443,18 @@ class SermondistributorModelExternal_source extends JModelAdmin
} }
/** /**
* Method to validate the form data. * Method to validate the form data.
* *
* @param JForm $form The form to validate against. * @param JForm $form The form to validate against.
* @param array $data The data to validate. * @param array $data The data to validate.
* @param string $group The name of the field group to validate. * @param string $group The name of the field group to validate.
* *
* @return mixed Array of filtered data if valid, false otherwise. * @return mixed Array of filtered data if valid, false otherwise.
* *
* @see JFormRule * @see JFormRule
* @see JFilterInput * @see JFilterInput
* @since 12.2 * @since 12.2
*/ */
public function validate($form, $data, $group = null) public function validate($form, $data, $group = null)
{ {
// check if the not_required field is set // check if the not_required field is set
@ -634,7 +634,7 @@ class SermondistributorModelExternal_source extends JModelAdmin
* *
* @return mixed An array of new IDs on success, boolean false on failure. * @return mixed An array of new IDs on success, boolean false on failure.
* *
* @since 12.2 * @since 12.2
*/ */
protected function batchCopy($values, $pks, $contexts) protected function batchCopy($values, $pks, $contexts)
{ {
@ -732,7 +732,7 @@ class SermondistributorModelExternal_source extends JModelAdmin
$this->table->id = 0; $this->table->id = 0;
// TODO: Deal with ordering? // TODO: Deal with ordering?
// $this->table->ordering = 1; // $this->table->ordering = 1;
// Check the row. // Check the row.
if (!$this->table->check()) if (!$this->table->check())
@ -777,7 +777,7 @@ class SermondistributorModelExternal_source extends JModelAdmin
* *
* @return boolean True if successful, false otherwise and internal error is set. * @return boolean True if successful, false otherwise and internal error is set.
* *
* @since 12.2 * @since 12.2
*/ */
protected function batchMove($values, $pks, $contexts) protected function batchMove($values, $pks, $contexts)
{ {
@ -971,13 +971,13 @@ class SermondistributorModelExternal_source extends JModelAdmin
} }
/** /**
* Method to change the title * Method to change the title
* *
* @param string $title The title. * @param string $title The title.
* *
* @return array Contains the modified title and alias. * @return array Contains the modified title and alias.
* *
*/ */
protected function _generateNewTitle($title) protected function _generateNewTitle($title)
{ {

View File

@ -117,11 +117,9 @@ class SermondistributorModelExternal_sources extends JModelList
// set values to display correctly. // set values to display correctly.
if (SermondistributorHelper::checkArray($items)) if (SermondistributorHelper::checkArray($items))
{ {
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item) foreach ($items as $nr => &$item)
{ {
$access = ($user->authorise('external_source.access', 'com_sermondistributor.external_source.' . (int) $item->id) && $user->authorise('external_source.access', 'com_sermondistributor')); $access = (JFactory::getUser()->authorise('external_source.access', 'com_sermondistributor.external_source.' . (int) $item->id) && JFactory::getUser()->authorise('external_source.access', 'com_sermondistributor'));
if (!$access) if (!$access)
{ {
unset($items[$nr]); unset($items[$nr]);
@ -173,10 +171,10 @@ class SermondistributorModelExternal_sources extends JModelList
} }
/** /**
* Method to convert selection values to translatable string. * Method to convert selection values to translatable string.
* *
* @return translatable string * @return translatable string
*/ */
public function selectionTranslation($value,$name) public function selectionTranslation($value,$name)
{ {
// Array of externalsources language strings // Array of externalsources language strings
@ -333,10 +331,10 @@ class SermondistributorModelExternal_sources extends JModelList
} }
/** /**
* Method to get list export data. * Method to get list export data.
* *
* @return mixed An array of data items on success, false on failure. * @return mixed An array of data items on success, false on failure.
*/ */
public function getExportData($pks) public function getExportData($pks)
{ {
// setup the query // setup the query
@ -375,11 +373,9 @@ class SermondistributorModelExternal_sources extends JModelList
// set values to display correctly. // set values to display correctly.
if (SermondistributorHelper::checkArray($items)) if (SermondistributorHelper::checkArray($items))
{ {
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item) foreach ($items as $nr => &$item)
{ {
$access = ($user->authorise('external_source.access', 'com_sermondistributor.external_source.' . (int) $item->id) && $user->authorise('external_source.access', 'com_sermondistributor')); $access = (JFactory::getUser()->authorise('external_source.access', 'com_sermondistributor.external_source.' . (int) $item->id) && JFactory::getUser()->authorise('external_source.access', 'com_sermondistributor'));
if (!$access) if (!$access)
{ {
unset($items[$nr]); unset($items[$nr]);
@ -460,16 +456,16 @@ class SermondistributorModelExternal_sources extends JModelList
} }
/** /**
* Build an SQL query to checkin all items left checked out longer then a set time. * Build an SQL query to checkin all items left checked out longer then a set time.
* *
* @return a bool * @return a bool
* *
*/ */
protected function checkInNow() protected function checkInNow()
{ {
// Get set check in time // Get set check in time
$time = JComponentHelper::getParams('com_sermondistributor')->get('check_in'); $time = JComponentHelper::getParams('com_sermondistributor')->get('check_in');
if ($time) if ($time)
{ {

View File

@ -245,7 +245,7 @@ class SermondistributorModelHelp_document extends JModelAdmin
protected function canEditState($record) protected function canEditState($record)
{ {
$user = JFactory::getUser(); $user = JFactory::getUser();
$recordId = (!empty($record->id)) ? $record->id : 0; $recordId = (!empty($record->id)) ? $record->id : 0;
if ($recordId) if ($recordId)
{ {
@ -356,18 +356,18 @@ class SermondistributorModelHelp_document extends JModelAdmin
} }
/** /**
* Method to validate the form data. * Method to validate the form data.
* *
* @param JForm $form The form to validate against. * @param JForm $form The form to validate against.
* @param array $data The data to validate. * @param array $data The data to validate.
* @param string $group The name of the field group to validate. * @param string $group The name of the field group to validate.
* *
* @return mixed Array of filtered data if valid, false otherwise. * @return mixed Array of filtered data if valid, false otherwise.
* *
* @see JFormRule * @see JFormRule
* @see JFilterInput * @see JFilterInput
* @since 12.2 * @since 12.2
*/ */
public function validate($form, $data, $group = null) public function validate($form, $data, $group = null)
{ {
// check if the not_required field is set // check if the not_required field is set
@ -547,7 +547,7 @@ class SermondistributorModelHelp_document extends JModelAdmin
* *
* @return mixed An array of new IDs on success, boolean false on failure. * @return mixed An array of new IDs on success, boolean false on failure.
* *
* @since 12.2 * @since 12.2
*/ */
protected function batchCopy($values, $pks, $contexts) protected function batchCopy($values, $pks, $contexts)
{ {
@ -640,7 +640,7 @@ class SermondistributorModelHelp_document extends JModelAdmin
$this->table->id = 0; $this->table->id = 0;
// TODO: Deal with ordering? // TODO: Deal with ordering?
// $this->table->ordering = 1; // $this->table->ordering = 1;
// Check the row. // Check the row.
if (!$this->table->check()) if (!$this->table->check())
@ -685,7 +685,7 @@ class SermondistributorModelHelp_document extends JModelAdmin
* *
* @return boolean True if successful, false otherwise and internal error is set. * @return boolean True if successful, false otherwise and internal error is set.
* *
* @since 12.2 * @since 12.2
*/ */
protected function batchMove($values, $pks, $contexts) protected function batchMove($values, $pks, $contexts)
{ {
@ -921,14 +921,14 @@ class SermondistributorModelHelp_document extends JModelAdmin
} }
/** /**
* Method to change the title/s & alias. * Method to change the title/s & alias.
* *
* @param string $alias The alias. * @param string $alias The alias.
* @param string/array $title The title. * @param string/array $title The title.
* *
* @return array/string Contains the modified title/s and/or alias. * @return array/string Contains the modified title/s and/or alias.
* *
*/ */
protected function _generateNewTitle($alias, $title = null) protected function _generateNewTitle($alias, $title = null)
{ {

View File

@ -121,11 +121,9 @@ class SermondistributorModelHelp_documents extends JModelList
// set values to display correctly. // set values to display correctly.
if (SermondistributorHelper::checkArray($items)) if (SermondistributorHelper::checkArray($items))
{ {
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item) foreach ($items as $nr => &$item)
{ {
$access = ($user->authorise('help_document.access', 'com_sermondistributor.help_document.' . (int) $item->id) && $user->authorise('help_document.access', 'com_sermondistributor')); $access = (JFactory::getUser()->authorise('help_document.access', 'com_sermondistributor.help_document.' . (int) $item->id) && JFactory::getUser()->authorise('help_document.access', 'com_sermondistributor'));
if (!$access) if (!$access)
{ {
unset($items[$nr]); unset($items[$nr]);
@ -173,10 +171,10 @@ class SermondistributorModelHelp_documents extends JModelList
} }
/** /**
* Method to convert selection values to translatable string. * Method to convert selection values to translatable string.
* *
* @return translatable string * @return translatable string
*/ */
public function selectionTranslation($value,$name) public function selectionTranslation($value,$name)
{ {
// Array of type language strings // Array of type language strings
@ -302,10 +300,10 @@ class SermondistributorModelHelp_documents extends JModelList
} }
/** /**
* Method to get list export data. * Method to get list export data.
* *
* @return mixed An array of data items on success, false on failure. * @return mixed An array of data items on success, false on failure.
*/ */
public function getExportData($pks) public function getExportData($pks)
{ {
// setup the query // setup the query
@ -345,11 +343,9 @@ class SermondistributorModelHelp_documents extends JModelList
// set values to display correctly. // set values to display correctly.
if (SermondistributorHelper::checkArray($items)) if (SermondistributorHelper::checkArray($items))
{ {
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item) foreach ($items as $nr => &$item)
{ {
$access = ($user->authorise('help_document.access', 'com_sermondistributor.help_document.' . (int) $item->id) && $user->authorise('help_document.access', 'com_sermondistributor')); $access = (JFactory::getUser()->authorise('help_document.access', 'com_sermondistributor.help_document.' . (int) $item->id) && JFactory::getUser()->authorise('help_document.access', 'com_sermondistributor'));
if (!$access) if (!$access)
{ {
unset($items[$nr]); unset($items[$nr]);
@ -426,16 +422,16 @@ class SermondistributorModelHelp_documents extends JModelList
} }
/** /**
* Build an SQL query to checkin all items left checked out longer then a set time. * Build an SQL query to checkin all items left checked out longer then a set time.
* *
* @return a bool * @return a bool
* *
*/ */
protected function checkInNow() protected function checkInNow()
{ {
// Get set check in time // Get set check in time
$time = JComponentHelper::getParams('com_sermondistributor')->get('check_in'); $time = JComponentHelper::getParams('com_sermondistributor')->get('check_in');
if ($time) if ($time)
{ {

View File

@ -380,7 +380,7 @@ class SermondistributorModelLocal_listing extends JModelAdmin
protected function canEditState($record) protected function canEditState($record)
{ {
$user = JFactory::getUser(); $user = JFactory::getUser();
$recordId = (!empty($record->id)) ? $record->id : 0; $recordId = (!empty($record->id)) ? $record->id : 0;
if ($recordId) if ($recordId)
{ {
@ -646,7 +646,7 @@ class SermondistributorModelLocal_listing extends JModelAdmin
* *
* @return mixed An array of new IDs on success, boolean false on failure. * @return mixed An array of new IDs on success, boolean false on failure.
* *
* @since 12.2 * @since 12.2
*/ */
protected function batchCopy($values, $pks, $contexts) protected function batchCopy($values, $pks, $contexts)
{ {
@ -744,7 +744,7 @@ class SermondistributorModelLocal_listing extends JModelAdmin
$this->table->id = 0; $this->table->id = 0;
// TODO: Deal with ordering? // TODO: Deal with ordering?
// $this->table->ordering = 1; // $this->table->ordering = 1;
// Check the row. // Check the row.
if (!$this->table->check()) if (!$this->table->check())
@ -789,7 +789,7 @@ class SermondistributorModelLocal_listing extends JModelAdmin
* *
* @return boolean True if successful, false otherwise and internal error is set. * @return boolean True if successful, false otherwise and internal error is set.
* *
* @since 12.2 * @since 12.2
*/ */
protected function batchMove($values, $pks, $contexts) protected function batchMove($values, $pks, $contexts)
{ {
@ -977,13 +977,13 @@ class SermondistributorModelLocal_listing extends JModelAdmin
} }
/** /**
* Method to change the title * Method to change the title
* *
* @param string $title The title. * @param string $title The title.
* *
* @return array Contains the modified title and alias. * @return array Contains the modified title and alias.
* *
*/ */
protected function _generateNewTitle($title) protected function _generateNewTitle($title)
{ {

View File

@ -121,11 +121,9 @@ class SermondistributorModelLocal_listings extends JModelList
// set values to display correctly. // set values to display correctly.
if (SermondistributorHelper::checkArray($items)) if (SermondistributorHelper::checkArray($items))
{ {
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item) foreach ($items as $nr => &$item)
{ {
$access = ($user->authorise('local_listing.access', 'com_sermondistributor.local_listing.' . (int) $item->id) && $user->authorise('local_listing.access', 'com_sermondistributor')); $access = (JFactory::getUser()->authorise('local_listing.access', 'com_sermondistributor.local_listing.' . (int) $item->id) && JFactory::getUser()->authorise('local_listing.access', 'com_sermondistributor'));
if (!$access) if (!$access)
{ {
unset($items[$nr]); unset($items[$nr]);
@ -151,10 +149,10 @@ class SermondistributorModelLocal_listings extends JModelList
} }
/** /**
* Method to convert selection values to translatable string. * Method to convert selection values to translatable string.
* *
* @return translatable string * @return translatable string
*/ */
public function selectionTranslation($value,$name) public function selectionTranslation($value,$name)
{ {
// Array of build language strings // Array of build language strings
@ -245,10 +243,10 @@ class SermondistributorModelLocal_listings extends JModelList
} }
/** /**
* Method to get list export data. * Method to get list export data.
* *
* @return mixed An array of data items on success, false on failure. * @return mixed An array of data items on success, false on failure.
*/ */
public function getExportData($pks) public function getExportData($pks)
{ {
// setup the query // setup the query
@ -287,11 +285,9 @@ class SermondistributorModelLocal_listings extends JModelList
// set values to display correctly. // set values to display correctly.
if (SermondistributorHelper::checkArray($items)) if (SermondistributorHelper::checkArray($items))
{ {
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item) foreach ($items as $nr => &$item)
{ {
$access = ($user->authorise('local_listing.access', 'com_sermondistributor.local_listing.' . (int) $item->id) && $user->authorise('local_listing.access', 'com_sermondistributor')); $access = (JFactory::getUser()->authorise('local_listing.access', 'com_sermondistributor.local_listing.' . (int) $item->id) && JFactory::getUser()->authorise('local_listing.access', 'com_sermondistributor'));
if (!$access) if (!$access)
{ {
unset($items[$nr]); unset($items[$nr]);
@ -373,16 +369,16 @@ class SermondistributorModelLocal_listings extends JModelList
} }
/** /**
* Build an SQL query to checkin all items left checked out longer then a set time. * Build an SQL query to checkin all items left checked out longer then a set time.
* *
* @return a bool * @return a bool
* *
*/ */
protected function checkInNow() protected function checkInNow()
{ {
// Get set check in time // Get set check in time
$time = JComponentHelper::getParams('com_sermondistributor')->get('check_in'); $time = JComponentHelper::getParams('com_sermondistributor')->get('check_in');
if ($time) if ($time)
{ {

View File

@ -141,11 +141,11 @@ class SermondistributorModelManual_updater extends JModelList
/** /**
* Get the uikit needed components * Get the uikit needed components
* *
* @return mixed An array of objects on success. * @return mixed An array of objects on success.
* *
*/ */
public function getUikitComp() public function getUikitComp()
{ {
if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp)) if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp))

View File

@ -106,10 +106,10 @@ class SermondistributorModelPreacher extends JModelAdmin
} }
/** /**
* Method to get list data. * Method to get list data.
* *
* @return mixed An array of data items on success, false on failure. * @return mixed An array of data items on success, false on failure.
*/ */
public function getVvvsermons() public function getVvvsermons()
{ {
// Get the user object. // Get the user object.
@ -178,11 +178,9 @@ class SermondistributorModelPreacher extends JModelAdmin
// set values to display correctly. // set values to display correctly.
if (SermondistributorHelper::checkArray($items)) if (SermondistributorHelper::checkArray($items))
{ {
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item) foreach ($items as $nr => &$item)
{ {
$access = ($user->authorise('sermon.access', 'com_sermondistributor.sermon.' . (int) $item->id) && $user->authorise('sermon.access', 'com_sermondistributor')); $access = (JFactory::getUser()->authorise('sermon.access', 'com_sermondistributor.sermon.' . (int) $item->id) && JFactory::getUser()->authorise('sermon.access', 'com_sermondistributor'));
if (!$access) if (!$access)
{ {
unset($items[$nr]); unset($items[$nr]);
@ -210,10 +208,10 @@ class SermondistributorModelPreacher extends JModelAdmin
} }
/** /**
* Method to convert selection values to translatable string. * Method to convert selection values to translatable string.
* *
* @return translatable string * @return translatable string
*/ */
public function selectionTranslationVvvsermons($value,$name) public function selectionTranslationVvvsermons($value,$name)
{ {
// Array of link_type language strings // Array of link_type language strings
@ -384,7 +382,7 @@ class SermondistributorModelPreacher extends JModelAdmin
protected function canEditState($record) protected function canEditState($record)
{ {
$user = JFactory::getUser(); $user = JFactory::getUser();
$recordId = (!empty($record->id)) ? $record->id : 0; $recordId = (!empty($record->id)) ? $record->id : 0;
if ($recordId) if ($recordId)
{ {
@ -650,7 +648,7 @@ class SermondistributorModelPreacher extends JModelAdmin
* *
* @return mixed An array of new IDs on success, boolean false on failure. * @return mixed An array of new IDs on success, boolean false on failure.
* *
* @since 12.2 * @since 12.2
*/ */
protected function batchCopy($values, $pks, $contexts) protected function batchCopy($values, $pks, $contexts)
{ {
@ -743,7 +741,7 @@ class SermondistributorModelPreacher extends JModelAdmin
$this->table->id = 0; $this->table->id = 0;
// TODO: Deal with ordering? // TODO: Deal with ordering?
// $this->table->ordering = 1; // $this->table->ordering = 1;
// Check the row. // Check the row.
if (!$this->table->check()) if (!$this->table->check())
@ -788,7 +786,7 @@ class SermondistributorModelPreacher extends JModelAdmin
* *
* @return boolean True if successful, false otherwise and internal error is set. * @return boolean True if successful, false otherwise and internal error is set.
* *
* @since 12.2 * @since 12.2
*/ */
protected function batchMove($values, $pks, $contexts) protected function batchMove($values, $pks, $contexts)
{ {
@ -1018,14 +1016,14 @@ class SermondistributorModelPreacher extends JModelAdmin
} }
/** /**
* Method to change the title/s & alias. * Method to change the title/s & alias.
* *
* @param string $alias The alias. * @param string $alias The alias.
* @param string/array $title The title. * @param string/array $title The title.
* *
* @return array/string Contains the modified title/s and/or alias. * @return array/string Contains the modified title/s and/or alias.
* *
*/ */
protected function _generateNewTitle($alias, $title = null) protected function _generateNewTitle($alias, $title = null)
{ {

View File

@ -109,11 +109,9 @@ class SermondistributorModelPreachers extends JModelList
// set values to display correctly. // set values to display correctly.
if (SermondistributorHelper::checkArray($items)) if (SermondistributorHelper::checkArray($items))
{ {
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item) foreach ($items as $nr => &$item)
{ {
$access = ($user->authorise('preacher.access', 'com_sermondistributor.preacher.' . (int) $item->id) && $user->authorise('preacher.access', 'com_sermondistributor')); $access = (JFactory::getUser()->authorise('preacher.access', 'com_sermondistributor.preacher.' . (int) $item->id) && JFactory::getUser()->authorise('preacher.access', 'com_sermondistributor'));
if (!$access) if (!$access)
{ {
unset($items[$nr]); unset($items[$nr]);
@ -199,10 +197,10 @@ class SermondistributorModelPreachers extends JModelList
} }
/** /**
* Method to get list export data. * Method to get list export data.
* *
* @return mixed An array of data items on success, false on failure. * @return mixed An array of data items on success, false on failure.
*/ */
public function getExportData($pks) public function getExportData($pks)
{ {
// setup the query // setup the query
@ -242,11 +240,9 @@ class SermondistributorModelPreachers extends JModelList
// set values to display correctly. // set values to display correctly.
if (SermondistributorHelper::checkArray($items)) if (SermondistributorHelper::checkArray($items))
{ {
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item) foreach ($items as $nr => &$item)
{ {
$access = ($user->authorise('preacher.access', 'com_sermondistributor.preacher.' . (int) $item->id) && $user->authorise('preacher.access', 'com_sermondistributor')); $access = (JFactory::getUser()->authorise('preacher.access', 'com_sermondistributor.preacher.' . (int) $item->id) && JFactory::getUser()->authorise('preacher.access', 'com_sermondistributor'));
if (!$access) if (!$access)
{ {
unset($items[$nr]); unset($items[$nr]);
@ -320,16 +316,16 @@ class SermondistributorModelPreachers extends JModelList
} }
/** /**
* Build an SQL query to checkin all items left checked out longer then a set time. * Build an SQL query to checkin all items left checked out longer then a set time.
* *
* @return a bool * @return a bool
* *
*/ */
protected function checkInNow() protected function checkInNow()
{ {
// Get set check in time // Get set check in time
$time = JComponentHelper::getParams('com_sermondistributor')->get('check_in'); $time = JComponentHelper::getParams('com_sermondistributor')->get('check_in');
if ($time) if ($time)
{ {

View File

@ -106,10 +106,10 @@ class SermondistributorModelSeries extends JModelAdmin
} }
/** /**
* Method to get list data. * Method to get list data.
* *
* @return mixed An array of data items on success, false on failure. * @return mixed An array of data items on success, false on failure.
*/ */
public function getVwcsermons() public function getVwcsermons()
{ {
// Get the user object. // Get the user object.
@ -178,11 +178,9 @@ class SermondistributorModelSeries extends JModelAdmin
// set values to display correctly. // set values to display correctly.
if (SermondistributorHelper::checkArray($items)) if (SermondistributorHelper::checkArray($items))
{ {
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item) foreach ($items as $nr => &$item)
{ {
$access = ($user->authorise('sermon.access', 'com_sermondistributor.sermon.' . (int) $item->id) && $user->authorise('sermon.access', 'com_sermondistributor')); $access = (JFactory::getUser()->authorise('sermon.access', 'com_sermondistributor.sermon.' . (int) $item->id) && JFactory::getUser()->authorise('sermon.access', 'com_sermondistributor'));
if (!$access) if (!$access)
{ {
unset($items[$nr]); unset($items[$nr]);
@ -210,10 +208,10 @@ class SermondistributorModelSeries extends JModelAdmin
} }
/** /**
* Method to convert selection values to translatable string. * Method to convert selection values to translatable string.
* *
* @return translatable string * @return translatable string
*/ */
public function selectionTranslationVwcsermons($value,$name) public function selectionTranslationVwcsermons($value,$name)
{ {
// Array of link_type language strings // Array of link_type language strings
@ -384,7 +382,7 @@ class SermondistributorModelSeries extends JModelAdmin
protected function canEditState($record) protected function canEditState($record)
{ {
$user = JFactory::getUser(); $user = JFactory::getUser();
$recordId = (!empty($record->id)) ? $record->id : 0; $recordId = (!empty($record->id)) ? $record->id : 0;
if ($recordId) if ($recordId)
{ {
@ -650,7 +648,7 @@ class SermondistributorModelSeries extends JModelAdmin
* *
* @return mixed An array of new IDs on success, boolean false on failure. * @return mixed An array of new IDs on success, boolean false on failure.
* *
* @since 12.2 * @since 12.2
*/ */
protected function batchCopy($values, $pks, $contexts) protected function batchCopy($values, $pks, $contexts)
{ {
@ -743,7 +741,7 @@ class SermondistributorModelSeries extends JModelAdmin
$this->table->id = 0; $this->table->id = 0;
// TODO: Deal with ordering? // TODO: Deal with ordering?
// $this->table->ordering = 1; // $this->table->ordering = 1;
// Check the row. // Check the row.
if (!$this->table->check()) if (!$this->table->check())
@ -788,7 +786,7 @@ class SermondistributorModelSeries extends JModelAdmin
* *
* @return boolean True if successful, false otherwise and internal error is set. * @return boolean True if successful, false otherwise and internal error is set.
* *
* @since 12.2 * @since 12.2
*/ */
protected function batchMove($values, $pks, $contexts) protected function batchMove($values, $pks, $contexts)
{ {
@ -1018,14 +1016,14 @@ class SermondistributorModelSeries extends JModelAdmin
} }
/** /**
* Method to change the title/s & alias. * Method to change the title/s & alias.
* *
* @param string $alias The alias. * @param string $alias The alias.
* @param string/array $title The title. * @param string/array $title The title.
* *
* @return array/string Contains the modified title/s and/or alias. * @return array/string Contains the modified title/s and/or alias.
* *
*/ */
protected function _generateNewTitle($alias, $title = null) protected function _generateNewTitle($alias, $title = null)
{ {

View File

@ -105,11 +105,9 @@ class SermondistributorModelSeries_list extends JModelList
// set values to display correctly. // set values to display correctly.
if (SermondistributorHelper::checkArray($items)) if (SermondistributorHelper::checkArray($items))
{ {
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item) foreach ($items as $nr => &$item)
{ {
$access = ($user->authorise('series.access', 'com_sermondistributor.series.' . (int) $item->id) && $user->authorise('series.access', 'com_sermondistributor')); $access = (JFactory::getUser()->authorise('series.access', 'com_sermondistributor.series.' . (int) $item->id) && JFactory::getUser()->authorise('series.access', 'com_sermondistributor'));
if (!$access) if (!$access)
{ {
unset($items[$nr]); unset($items[$nr]);
@ -195,10 +193,10 @@ class SermondistributorModelSeries_list extends JModelList
} }
/** /**
* Method to get list export data. * Method to get list export data.
* *
* @return mixed An array of data items on success, false on failure. * @return mixed An array of data items on success, false on failure.
*/ */
public function getExportData($pks) public function getExportData($pks)
{ {
// setup the query // setup the query
@ -238,11 +236,9 @@ class SermondistributorModelSeries_list extends JModelList
// set values to display correctly. // set values to display correctly.
if (SermondistributorHelper::checkArray($items)) if (SermondistributorHelper::checkArray($items))
{ {
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item) foreach ($items as $nr => &$item)
{ {
$access = ($user->authorise('series.access', 'com_sermondistributor.series.' . (int) $item->id) && $user->authorise('series.access', 'com_sermondistributor')); $access = (JFactory::getUser()->authorise('series.access', 'com_sermondistributor.series.' . (int) $item->id) && JFactory::getUser()->authorise('series.access', 'com_sermondistributor'));
if (!$access) if (!$access)
{ {
unset($items[$nr]); unset($items[$nr]);
@ -315,16 +311,16 @@ class SermondistributorModelSeries_list extends JModelList
} }
/** /**
* Build an SQL query to checkin all items left checked out longer then a set time. * Build an SQL query to checkin all items left checked out longer then a set time.
* *
* @return a bool * @return a bool
* *
*/ */
protected function checkInNow() protected function checkInNow()
{ {
// Get set check in time // Get set check in time
$time = JComponentHelper::getParams('com_sermondistributor')->get('check_in'); $time = JComponentHelper::getParams('com_sermondistributor')->get('check_in');
if ($time) if ($time)
{ {

View File

@ -118,10 +118,10 @@ class SermondistributorModelSermon extends JModelAdmin
} }
/** /**
* Method to get list data. * Method to get list data.
* *
* @return mixed An array of data items on success, false on failure. * @return mixed An array of data items on success, false on failure.
*/ */
public function getVwbstastics() public function getVwbstastics()
{ {
// Get the user object. // Get the user object.
@ -192,11 +192,9 @@ class SermondistributorModelSermon extends JModelAdmin
// set values to display correctly. // set values to display correctly.
if (SermondistributorHelper::checkArray($items)) if (SermondistributorHelper::checkArray($items))
{ {
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item) foreach ($items as $nr => &$item)
{ {
$access = ($user->authorise('statistic.access', 'com_sermondistributor.statistic.' . (int) $item->id) && $user->authorise('statistic.access', 'com_sermondistributor')); $access = (JFactory::getUser()->authorise('statistic.access', 'com_sermondistributor.statistic.' . (int) $item->id) && JFactory::getUser()->authorise('statistic.access', 'com_sermondistributor'));
if (!$access) if (!$access)
{ {
unset($items[$nr]); unset($items[$nr]);
@ -347,7 +345,7 @@ class SermondistributorModelSermon extends JModelAdmin
protected function canEditState($record) protected function canEditState($record)
{ {
$user = JFactory::getUser(); $user = JFactory::getUser();
$recordId = (!empty($record->id)) ? $record->id : 0; $recordId = (!empty($record->id)) ? $record->id : 0;
if ($recordId) if ($recordId)
{ {
@ -458,18 +456,18 @@ class SermondistributorModelSermon extends JModelAdmin
} }
/** /**
* Method to validate the form data. * Method to validate the form data.
* *
* @param JForm $form The form to validate against. * @param JForm $form The form to validate against.
* @param array $data The data to validate. * @param array $data The data to validate.
* @param string $group The name of the field group to validate. * @param string $group The name of the field group to validate.
* *
* @return mixed Array of filtered data if valid, false otherwise. * @return mixed Array of filtered data if valid, false otherwise.
* *
* @see JFormRule * @see JFormRule
* @see JFilterInput * @see JFilterInput
* @since 12.2 * @since 12.2
*/ */
public function validate($form, $data, $group = null) public function validate($form, $data, $group = null)
{ {
// check if the not_required field is set // check if the not_required field is set
@ -649,7 +647,7 @@ class SermondistributorModelSermon extends JModelAdmin
* *
* @return mixed An array of new IDs on success, boolean false on failure. * @return mixed An array of new IDs on success, boolean false on failure.
* *
* @since 12.2 * @since 12.2
*/ */
protected function batchCopy($values, $pks, $contexts) protected function batchCopy($values, $pks, $contexts)
{ {
@ -765,7 +763,7 @@ class SermondistributorModelSermon extends JModelAdmin
$this->table->id = 0; $this->table->id = 0;
// TODO: Deal with ordering? // TODO: Deal with ordering?
// $this->table->ordering = 1; // $this->table->ordering = 1;
// Check the row. // Check the row.
if (!$this->table->check()) if (!$this->table->check())
@ -810,7 +808,7 @@ class SermondistributorModelSermon extends JModelAdmin
* *
* @return boolean True if successful, false otherwise and internal error is set. * @return boolean True if successful, false otherwise and internal error is set.
* *
* @since 12.2 * @since 12.2
*/ */
protected function batchMove($values, $pks, $contexts) protected function batchMove($values, $pks, $contexts)
{ {
@ -1069,14 +1067,14 @@ class SermondistributorModelSermon extends JModelAdmin
} }
/** /**
* Method to change the title/s & alias. * Method to change the title/s & alias.
* *
* @param string $alias The alias. * @param string $alias The alias.
* @param string/array $title The title. * @param string/array $title The title.
* *
* @return array/string Contains the modified title/s and/or alias. * @return array/string Contains the modified title/s and/or alias.
* *
*/ */
protected function _generateNewTitle($alias, $title = null) protected function _generateNewTitle($alias, $title = null)
{ {

View File

@ -137,11 +137,9 @@ class SermondistributorModelSermons extends JModelList
// set values to display correctly. // set values to display correctly.
if (SermondistributorHelper::checkArray($items)) if (SermondistributorHelper::checkArray($items))
{ {
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item) foreach ($items as $nr => &$item)
{ {
$access = ($user->authorise('sermon.access', 'com_sermondistributor.sermon.' . (int) $item->id) && $user->authorise('sermon.access', 'com_sermondistributor')); $access = (JFactory::getUser()->authorise('sermon.access', 'com_sermondistributor.sermon.' . (int) $item->id) && JFactory::getUser()->authorise('sermon.access', 'com_sermondistributor'));
if (!$access) if (!$access)
{ {
unset($items[$nr]); unset($items[$nr]);
@ -169,10 +167,10 @@ class SermondistributorModelSermons extends JModelList
} }
/** /**
* Method to convert selection values to translatable string. * Method to convert selection values to translatable string.
* *
* @return translatable string * @return translatable string
*/ */
public function selectionTranslation($value,$name) public function selectionTranslation($value,$name)
{ {
// Array of link_type language strings // Array of link_type language strings
@ -330,10 +328,10 @@ class SermondistributorModelSermons extends JModelList
} }
/** /**
* Method to get list export data. * Method to get list export data.
* *
* @return mixed An array of data items on success, false on failure. * @return mixed An array of data items on success, false on failure.
*/ */
public function getExportData($pks) public function getExportData($pks)
{ {
// setup the query // setup the query
@ -373,11 +371,9 @@ class SermondistributorModelSermons extends JModelList
// set values to display correctly. // set values to display correctly.
if (SermondistributorHelper::checkArray($items)) if (SermondistributorHelper::checkArray($items))
{ {
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item) foreach ($items as $nr => &$item)
{ {
$access = ($user->authorise('sermon.access', 'com_sermondistributor.sermon.' . (int) $item->id) && $user->authorise('sermon.access', 'com_sermondistributor')); $access = (JFactory::getUser()->authorise('sermon.access', 'com_sermondistributor.sermon.' . (int) $item->id) && JFactory::getUser()->authorise('sermon.access', 'com_sermondistributor'));
if (!$access) if (!$access)
{ {
unset($items[$nr]); unset($items[$nr]);
@ -458,16 +454,16 @@ class SermondistributorModelSermons extends JModelList
} }
/** /**
* Build an SQL query to checkin all items left checked out longer then a set time. * Build an SQL query to checkin all items left checked out longer then a set time.
* *
* @return a bool * @return a bool
* *
*/ */
protected function checkInNow() protected function checkInNow()
{ {
// Get set check in time // Get set check in time
$time = JComponentHelper::getParams('com_sermondistributor')->get('check_in'); $time = JComponentHelper::getParams('com_sermondistributor')->get('check_in');
if ($time) if ($time)
{ {

View File

@ -241,7 +241,7 @@ class SermondistributorModelStatistic extends JModelAdmin
protected function canEditState($record) protected function canEditState($record)
{ {
$user = JFactory::getUser(); $user = JFactory::getUser();
$recordId = (!empty($record->id)) ? $record->id : 0; $recordId = (!empty($record->id)) ? $record->id : 0;
if ($recordId) if ($recordId)
{ {
@ -507,7 +507,7 @@ class SermondistributorModelStatistic extends JModelAdmin
* *
* @return mixed An array of new IDs on success, boolean false on failure. * @return mixed An array of new IDs on success, boolean false on failure.
* *
* @since 12.2 * @since 12.2
*/ */
protected function batchCopy($values, $pks, $contexts) protected function batchCopy($values, $pks, $contexts)
{ {
@ -605,7 +605,7 @@ class SermondistributorModelStatistic extends JModelAdmin
$this->table->id = 0; $this->table->id = 0;
// TODO: Deal with ordering? // TODO: Deal with ordering?
// $this->table->ordering = 1; // $this->table->ordering = 1;
// Check the row. // Check the row.
if (!$this->table->check()) if (!$this->table->check())
@ -650,7 +650,7 @@ class SermondistributorModelStatistic extends JModelAdmin
* *
* @return boolean True if successful, false otherwise and internal error is set. * @return boolean True if successful, false otherwise and internal error is set.
* *
* @since 12.2 * @since 12.2
*/ */
protected function batchMove($values, $pks, $contexts) protected function batchMove($values, $pks, $contexts)
{ {
@ -827,13 +827,13 @@ class SermondistributorModelStatistic extends JModelAdmin
} }
/** /**
* Method to change the title * Method to change the title
* *
* @param string $title The title. * @param string $title The title.
* *
* @return array Contains the modified title and alias. * @return array Contains the modified title and alias.
* *
*/ */
protected function _generateNewTitle($title) protected function _generateNewTitle($title)
{ {

View File

@ -121,11 +121,9 @@ class SermondistributorModelStatistics extends JModelList
// set values to display correctly. // set values to display correctly.
if (SermondistributorHelper::checkArray($items)) if (SermondistributorHelper::checkArray($items))
{ {
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item) foreach ($items as $nr => &$item)
{ {
$access = ($user->authorise('statistic.access', 'com_sermondistributor.statistic.' . (int) $item->id) && $user->authorise('statistic.access', 'com_sermondistributor')); $access = (JFactory::getUser()->authorise('statistic.access', 'com_sermondistributor.statistic.' . (int) $item->id) && JFactory::getUser()->authorise('statistic.access', 'com_sermondistributor'));
if (!$access) if (!$access)
{ {
unset($items[$nr]); unset($items[$nr]);
@ -238,10 +236,10 @@ class SermondistributorModelStatistics extends JModelList
} }
/** /**
* Method to get list export data. * Method to get list export data.
* *
* @return mixed An array of data items on success, false on failure. * @return mixed An array of data items on success, false on failure.
*/ */
public function getExportData($pks) public function getExportData($pks)
{ {
// setup the query // setup the query
@ -281,11 +279,9 @@ class SermondistributorModelStatistics extends JModelList
// set values to display correctly. // set values to display correctly.
if (SermondistributorHelper::checkArray($items)) if (SermondistributorHelper::checkArray($items))
{ {
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item) foreach ($items as $nr => &$item)
{ {
$access = ($user->authorise('statistic.access', 'com_sermondistributor.statistic.' . (int) $item->id) && $user->authorise('statistic.access', 'com_sermondistributor')); $access = (JFactory::getUser()->authorise('statistic.access', 'com_sermondistributor.statistic.' . (int) $item->id) && JFactory::getUser()->authorise('statistic.access', 'com_sermondistributor'));
if (!$access) if (!$access)
{ {
unset($items[$nr]); unset($items[$nr]);
@ -362,16 +358,16 @@ class SermondistributorModelStatistics extends JModelList
} }
/** /**
* Build an SQL query to checkin all items left checked out longer then a set time. * Build an SQL query to checkin all items left checked out longer then a set time.
* *
* @return a bool * @return a bool
* *
*/ */
protected function checkInNow() protected function checkInNow()
{ {
// Get set check in time // Get set check in time
$time = JComponentHelper::getParams('com_sermondistributor')->get('check_in'); $time = JComponentHelper::getParams('com_sermondistributor')->get('check_in');
if ($time) if ($time)
{ {

View File

@ -325,10 +325,10 @@ class SermondistributorTableExternal_source extends JTable
} }
/** /**
* This view does not actually have an alias * This view does not actually have an alias
* *
* @return bool * @return bool
*/ */
public function generateAlias() public function generateAlias()
{ {
return false; return false;

View File

@ -325,11 +325,11 @@ class SermondistributorTableHelp_document extends JTable
} }
/** /**
* Generate a valid alias from title / date. * Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving * Remains public to be able to check for duplicated alias before saving
* *
* @return string * @return string
*/ */
public function generateAlias() public function generateAlias()
{ {
if (empty($this->alias)) if (empty($this->alias))

View File

@ -325,10 +325,10 @@ class SermondistributorTableLocal_listing extends JTable
} }
/** /**
* This view does not actually have an alias * This view does not actually have an alias
* *
* @return bool * @return bool
*/ */
public function generateAlias() public function generateAlias()
{ {
return false; return false;

View File

@ -325,11 +325,11 @@ class SermondistributorTablePreacher extends JTable
} }
/** /**
* Generate a valid alias from title / date. * Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving * Remains public to be able to check for duplicated alias before saving
* *
* @return string * @return string
*/ */
public function generateAlias() public function generateAlias()
{ {
if (empty($this->alias)) if (empty($this->alias))

View File

@ -325,11 +325,11 @@ class SermondistributorTableSeries extends JTable
} }
/** /**
* Generate a valid alias from title / date. * Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving * Remains public to be able to check for duplicated alias before saving
* *
* @return string * @return string
*/ */
public function generateAlias() public function generateAlias()
{ {
if (empty($this->alias)) if (empty($this->alias))

View File

@ -328,11 +328,11 @@ class SermondistributorTableSermon extends JTable
} }
/** /**
* Generate a valid alias from title / date. * Generate a valid alias from title / date.
* Remains public to be able to check for duplicated alias before saving * Remains public to be able to check for duplicated alias before saving
* *
* @return string * @return string
*/ */
public function generateAlias() public function generateAlias()
{ {
if (empty($this->alias)) if (empty($this->alias))

View File

@ -325,10 +325,10 @@ class SermondistributorTableStatistic extends JTable
} }
/** /**
* This view does not actually have an alias * This view does not actually have an alias
* *
* @return bool * @return bool
*/ */
public function generateAlias() public function generateAlias()
{ {
return false; return false;

View File

@ -74,16 +74,16 @@ $edit = "index.php?option=com_sermondistributor&view=external_sources&task=exter
<?php endif; ?> <?php endif; ?>
</td> </td>
<td class="nowrap"> <td class="nowrap">
<?php if ($canDo->get('external_source.edit')): ?> <div class="name">
<div class="name"> <?php if ($canDo->get('external_source.edit')): ?>
<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->description); ?></a> <a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->description); ?></a>
<?php if ($item->checked_out): ?> <?php if ($item->checked_out): ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'external_sources.', $canCheckin); ?> <?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'external_sources.', $canCheckin); ?>
<?php endif; ?> <?php endif; ?>
</div> <?php else: ?>
<?php else: ?> <?php echo $this->escape($item->description); ?>
<div class="name"><?php echo $this->escape($item->description); ?></div> <?php endif; ?>
<?php endif; ?> </div>
</td> </td>
<td class="hidden-phone"> <td class="hidden-phone">
<?php echo JText::_($item->externalsources); ?> <?php echo JText::_($item->externalsources); ?>

View File

@ -74,16 +74,16 @@ $edit = "index.php?option=com_sermondistributor&view=help_documents&task=help_do
<?php endif; ?> <?php endif; ?>
</td> </td>
<td class="nowrap"> <td class="nowrap">
<?php if ($canDo->get('help_document.edit')): ?> <div class="name">
<div class="name"> <?php if ($canDo->get('help_document.edit')): ?>
<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->title); ?></a> <a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->title); ?></a>
<?php if ($item->checked_out): ?> <?php if ($item->checked_out): ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'help_documents.', $canCheckin); ?> <?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'help_documents.', $canCheckin); ?>
<?php endif; ?> <?php endif; ?>
</div> <?php else: ?>
<?php else: ?> <?php echo $this->escape($item->title); ?>
<div class="name"><?php echo $this->escape($item->title); ?></div> <?php endif; ?>
<?php endif; ?> </div>
</td> </td>
<td class="hidden-phone"> <td class="hidden-phone">
<?php echo JText::_($item->type); ?> <?php echo JText::_($item->type); ?>

View File

@ -74,16 +74,16 @@ $edit = "index.php?option=com_sermondistributor&view=local_listings&task=local_l
<?php endif; ?> <?php endif; ?>
</td> </td>
<td class="nowrap"> <td class="nowrap">
<?php if ($canDo->get('local_listing.edit')): ?> <div class="name">
<div class="name"> <?php if ($canDo->get('local_listing.edit')): ?>
<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a> <a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
<?php if ($item->checked_out): ?> <?php if ($item->checked_out): ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'local_listings.', $canCheckin); ?> <?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'local_listings.', $canCheckin); ?>
<?php endif; ?> <?php endif; ?>
</div> <?php else: ?>
<?php else: ?> <?php echo $this->escape($item->name); ?>
<div class="name"><?php echo $this->escape($item->name); ?></div> <?php endif; ?>
<?php endif; ?> </div>
</td> </td>
<td class="hidden-phone"> <td class="hidden-phone">
<?php echo JText::_($item->build); ?> <?php echo JText::_($item->build); ?>
@ -92,13 +92,13 @@ $edit = "index.php?option=com_sermondistributor&view=local_listings&task=local_l
<?php echo $this->escape($item->size); ?> <?php echo $this->escape($item->size); ?>
</td> </td>
<td class="nowrap"> <td class="nowrap">
<?php if ($this->user->authorise('external_source.edit', 'com_sermondistributor.external_source.' . (int)$item->external_source)): ?> <div class="name">
<div class="name"> <?php if ($this->user->authorise('external_source.edit', 'com_sermondistributor.external_source.' . (int)$item->external_source)): ?>
<a href="index.php?option=com_sermondistributor&view=external_sources&task=external_source.edit&id=<?php echo $item->external_source; ?>&ref=local_listings"><?php echo $this->escape($item->external_source_description); ?></a> <a href="index.php?option=com_sermondistributor&view=external_sources&task=external_source.edit&id=<?php echo $item->external_source; ?>&ref=local_listings"><?php echo $this->escape($item->external_source_description); ?></a>
</div> <?php else: ?>
<?php else: ?> <?php echo $this->escape($item->external_source_description); ?>
<div class="name"><?php echo $this->escape($item->external_source_description); ?></div> <?php endif; ?>
<?php endif; ?> </div>
</td> </td>
<td class="hidden-phone"> <td class="hidden-phone">
<?php echo $this->escape($item->key); ?> <?php echo $this->escape($item->key); ?>

View File

@ -74,19 +74,22 @@ $edit = "index.php?option=com_sermondistributor&view=preachers&task=preacher.edi
<?php endif; ?> <?php endif; ?>
</td> </td>
<td class="nowrap"> <td class="nowrap">
<?php if ($canDo->get('preacher.edit')): ?> <div class="name">
<div class="name"> <?php if ($canDo->get('preacher.edit')): ?>
<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a> <a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
<?php if ($item->checked_out): ?> <?php if ($item->checked_out): ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'preachers.', $canCheckin); ?> <?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'preachers.', $canCheckin); ?>
<?php endif; ?> <?php endif; ?>
</div> <?php else: ?>
<?php else: ?> <?php echo $this->escape($item->name); ?>
<div class="name"><?php echo $this->escape($item->name); ?></div> <?php endif; ?>
<?php endif; ?> </div>
</td> </td>
<td class="hidden-phone"> <td class="hidden-phone">
<?php echo $this->escape($item->description); ?> <div>
<?php echo $this->escape($item->description); ?><br />
<?php echo $this->escape($item->email); ?>
</div>
</td> </td>
<td class="center"> <td class="center">
<?php if ($canDo->get('preacher.edit.state')) : ?> <?php if ($canDo->get('preacher.edit.state')) : ?>

View File

@ -46,7 +46,7 @@ defined('_JEXEC') or die('Restricted access');
<?php echo JHtml::_('grid.sort', 'COM_SERMONDISTRIBUTOR_PREACHER_NAME_LABEL', 'name', $this->listDirn, $this->listOrder); ?> <?php echo JHtml::_('grid.sort', 'COM_SERMONDISTRIBUTOR_PREACHER_NAME_LABEL', 'name', $this->listDirn, $this->listOrder); ?>
</th> </th>
<th class="nowrap hidden-phone" > <th class="nowrap hidden-phone" >
<?php echo JHtml::_('grid.sort', 'COM_SERMONDISTRIBUTOR_PREACHER_DESCRIPTION_LABEL', 'description', $this->listDirn, $this->listOrder); ?> <?php echo JHtml::_('grid.sort', 'PREACHERS_PREACHER_DETAILS', 'description', $this->listDirn, $this->listOrder); ?>
</th> </th>
<?php if ($this->canState): ?> <?php if ($this->canState): ?>
<th width="10" class="nowrap center" > <th width="10" class="nowrap center" >

View File

@ -74,16 +74,16 @@ $edit = "index.php?option=com_sermondistributor&view=series_list&task=series.edi
<?php endif; ?> <?php endif; ?>
</td> </td>
<td class="nowrap"> <td class="nowrap">
<?php if ($canDo->get('series.edit')): ?> <div class="name">
<div class="name"> <?php if ($canDo->get('series.edit')): ?>
<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a> <a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
<?php if ($item->checked_out): ?> <?php if ($item->checked_out): ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'series_list.', $canCheckin); ?> <?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'series_list.', $canCheckin); ?>
<?php endif; ?> <?php endif; ?>
</div> <?php else: ?>
<?php else: ?> <?php echo $this->escape($item->name); ?>
<div class="name"><?php echo $this->escape($item->name); ?></div> <?php endif; ?>
<?php endif; ?> </div>
</td> </td>
<td class="hidden-phone"> <td class="hidden-phone">
<?php echo $this->escape($item->description); ?> <?php echo $this->escape($item->description); ?>

View File

@ -74,44 +74,46 @@ $edit = "index.php?option=com_sermondistributor&view=sermons&task=sermon.edit";
<?php endif; ?> <?php endif; ?>
</td> </td>
<td class="nowrap"> <td class="nowrap">
<?php if ($canDo->get('sermon.edit')): ?> <div class="name">
<div class="name"> <?php if ($canDo->get('sermon.edit')): ?>
<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a> <a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
<?php if ($item->checked_out): ?> <?php if ($item->checked_out): ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'sermons.', $canCheckin); ?> <?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'sermons.', $canCheckin); ?>
<?php endif; ?> <?php endif; ?>
</div> <?php else: ?>
<?php else: ?> <?php echo $this->escape($item->name); ?>
<div class="name"><?php echo $this->escape($item->name); ?></div> <?php endif; ?>
<?php endif; ?> </div>
</td> </td>
<td class="nowrap"> <td class="nowrap">
<?php if ($this->user->authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int)$item->preacher)): ?> <div class="name">
<div class="name"> <?php if ($this->user->authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int)$item->preacher)): ?>
<a href="index.php?option=com_sermondistributor&view=preachers&task=preacher.edit&id=<?php echo $item->preacher; ?>&ref=sermons"><?php echo $this->escape($item->preacher_name); ?></a> <a href="index.php?option=com_sermondistributor&view=preachers&task=preacher.edit&id=<?php echo $item->preacher; ?>&ref=sermons"><?php echo $this->escape($item->preacher_name); ?></a>
</div> <?php else: ?>
<?php else: ?> <?php echo $this->escape($item->preacher_name); ?>
<div class="name"><?php echo $this->escape($item->preacher_name); ?></div> <?php endif; ?>
<?php endif; ?> </div>
</td> </td>
<td class="nowrap"> <td class="nowrap">
<?php if ($this->user->authorise('series.edit', 'com_sermondistributor.series.' . (int)$item->series)): ?> <div class="name">
<div class="name"> <?php if ($this->user->authorise('series.edit', 'com_sermondistributor.series.' . (int)$item->series)): ?>
<a href="index.php?option=com_sermondistributor&view=all_series&task=series.edit&id=<?php echo $item->series; ?>&ref=sermons"><?php echo $this->escape($item->series_name); ?></a> <a href="index.php?option=com_sermondistributor&view=all_series&task=series.edit&id=<?php echo $item->series; ?>&ref=sermons"><?php echo $this->escape($item->series_name); ?></a>
</div> <?php else: ?>
<?php else: ?> <?php echo $this->escape($item->series_name); ?>
<div class="name"><?php echo $this->escape($item->series_name); ?></div> <?php endif; ?>
<?php endif; ?> </div>
</td> </td>
<td class="hidden-phone"> <td class="hidden-phone">
<?php echo $this->escape($item->short_description); ?> <?php echo $this->escape($item->short_description); ?>
</td> </td>
<td class="nowrap"> <td class="nowrap">
<?php if ($this->user->authorise('core.edit', 'com_sermondistributor.sermons.category.' . (int)$item->catid)): ?> <div class="name">
<a href="index.php?option=com_categories&task=category.edit&id=<?php echo (int)$item->catid; ?>&extension=com_sermondistributor.sermons"><?php echo $this->escape($item->category_title); ?></a> <?php if ($this->user->authorise('core.edit', 'com_sermondistributor.sermons.category.' . (int)$item->catid)): ?>
<?php else: ?> <a href="index.php?option=com_categories&task=category.edit&id=<?php echo (int)$item->catid; ?>&extension=com_sermondistributor.sermons"><?php echo $this->escape($item->category_title); ?></a>
<?php echo $this->escape($item->category_title); ?> <?php else: ?>
<?php endif; ?> <?php echo $this->escape($item->category_title); ?>
<?php endif; ?>
</div>
</td> </td>
<td class="hidden-phone"> <td class="hidden-phone">
<?php echo JText::_($item->link_type); ?> <?php echo JText::_($item->link_type); ?>

View File

@ -74,43 +74,43 @@ $edit = "index.php?option=com_sermondistributor&view=statistics&task=statistic.e
<?php endif; ?> <?php endif; ?>
</td> </td>
<td class="nowrap"> <td class="nowrap">
<?php if ($canDo->get('statistic.edit')): ?> <div class="name">
<div class="name"> <?php if ($canDo->get('statistic.edit')): ?>
<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $item->filename; ?></a> <a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $item->filename; ?></a>
<?php if ($item->checked_out): ?> <?php if ($item->checked_out): ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'statistics.', $canCheckin); ?> <?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'statistics.', $canCheckin); ?>
<?php endif; ?> <?php endif; ?>
</div> <?php else: ?>
<?php else: ?> <?php echo $item->filename; ?>
<div class="name"><?php echo $item->filename; ?></div> <?php endif; ?>
<?php endif; ?> </div>
</td> </td>
<td class="nowrap"> <td class="nowrap">
<?php if ($this->user->authorise('sermon.edit', 'com_sermondistributor.sermon.' . (int)$item->sermon)): ?> <div class="name">
<div class="name"> <?php if ($this->user->authorise('sermon.edit', 'com_sermondistributor.sermon.' . (int)$item->sermon)): ?>
<a href="index.php?option=com_sermondistributor&view=sermons&task=sermon.edit&id=<?php echo $item->sermon; ?>&ref=statistics"><?php echo $this->escape($item->sermon_name); ?></a> <a href="index.php?option=com_sermondistributor&view=sermons&task=sermon.edit&id=<?php echo $item->sermon; ?>&ref=statistics"><?php echo $this->escape($item->sermon_name); ?></a>
</div> <?php else: ?>
<?php else: ?> <?php echo $this->escape($item->sermon_name); ?>
<div class="name"><?php echo $this->escape($item->sermon_name); ?></div> <?php endif; ?>
<?php endif; ?> </div>
</td> </td>
<td class="nowrap"> <td class="nowrap">
<?php if ($this->user->authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int)$item->preacher)): ?> <div class="name">
<div class="name"> <?php if ($this->user->authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int)$item->preacher)): ?>
<a href="index.php?option=com_sermondistributor&view=preachers&task=preacher.edit&id=<?php echo $item->preacher; ?>&ref=statistics"><?php echo $this->escape($item->preacher_name); ?></a> <a href="index.php?option=com_sermondistributor&view=preachers&task=preacher.edit&id=<?php echo $item->preacher; ?>&ref=statistics"><?php echo $this->escape($item->preacher_name); ?></a>
</div> <?php else: ?>
<?php else: ?> <?php echo $this->escape($item->preacher_name); ?>
<div class="name"><?php echo $this->escape($item->preacher_name); ?></div> <?php endif; ?>
<?php endif; ?> </div>
</td> </td>
<td class="nowrap"> <td class="nowrap">
<?php if ($this->user->authorise('series.edit', 'com_sermondistributor.series.' . (int)$item->series)): ?> <div class="name">
<div class="name"> <?php if ($this->user->authorise('series.edit', 'com_sermondistributor.series.' . (int)$item->series)): ?>
<a href="index.php?option=com_sermondistributor&view=all_series&task=series.edit&id=<?php echo $item->series; ?>&ref=statistics"><?php echo $this->escape($item->series_name); ?></a> <a href="index.php?option=com_sermondistributor&view=all_series&task=series.edit&id=<?php echo $item->series; ?>&ref=statistics"><?php echo $this->escape($item->series_name); ?></a>
</div> <?php else: ?>
<?php else: ?> <?php echo $this->escape($item->series_name); ?>
<div class="name"><?php echo $this->escape($item->series_name); ?></div> <?php endif; ?>
<?php endif; ?> </div>
</td> </td>
<td class="hidden-phone"> <td class="hidden-phone">
<?php echo $this->escape($item->counter); ?> <?php echo $this->escape($item->counter); ?>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="3.2" method="upgrade"> <extension type="component" version="3.2" method="upgrade">
<name>COM_SERMONDISTRIBUTOR</name> <name>COM_SERMONDISTRIBUTOR</name>
<creationDate>5th May, 2018</creationDate> <creationDate>28th June, 2018</creationDate>
<author>Llewellyn van der Merwe</author> <author>Llewellyn van der Merwe</author>
<authorEmail>joomla@vdm.io</authorEmail> <authorEmail>joomla@vdm.io</authorEmail>
<authorUrl>https://www.vdm.io/</authorUrl> <authorUrl>https://www.vdm.io/</authorUrl>

View File

@ -37,8 +37,8 @@ abstract class SermondistributorHelperRoute
protected static $lookup; protected static $lookup;
/** /**
* @param int The route of the Sermon * @param int The route of the Sermon
*/ */
public static function getSermonRoute($id = 0, $catid = 0) public static function getSermonRoute($id = 0, $catid = 0)
{ {
if ($id > 0) if ($id > 0)
@ -78,8 +78,8 @@ abstract class SermondistributorHelperRoute
} }
/** /**
* @param int The route of the Preachers * @param int The route of the Preachers
*/ */
public static function getPreachersRoute($id = 0, $catid = 0) public static function getPreachersRoute($id = 0, $catid = 0)
{ {
if ($id > 0) if ($id > 0)
@ -119,8 +119,8 @@ abstract class SermondistributorHelperRoute
} }
/** /**
* @param int The route of the Preacher * @param int The route of the Preacher
*/ */
public static function getPreacherRoute($id = 0, $catid = 0) public static function getPreacherRoute($id = 0, $catid = 0)
{ {
if ($id > 0) if ($id > 0)
@ -160,8 +160,8 @@ abstract class SermondistributorHelperRoute
} }
/** /**
* @param int The route of the Categories * @param int The route of the Categories
*/ */
public static function getCategoriesRoute($id = 0) public static function getCategoriesRoute($id = 0)
{ {
if ($id > 0) if ($id > 0)
@ -190,8 +190,8 @@ abstract class SermondistributorHelperRoute
} }
/** /**
* @param int The route of the Category * @param int The route of the Category
*/ */
public static function getCategoryRoute($id = 0) public static function getCategoryRoute($id = 0)
{ {
if ($id > 0) if ($id > 0)
@ -220,8 +220,8 @@ abstract class SermondistributorHelperRoute
} }
/** /**
* @param int The route of the Serieslist * @param int The route of the Serieslist
*/ */
public static function getSerieslistRoute($id = 0, $catid = 0) public static function getSerieslistRoute($id = 0, $catid = 0)
{ {
if ($id > 0) if ($id > 0)
@ -261,8 +261,8 @@ abstract class SermondistributorHelperRoute
} }
/** /**
* @param int The route of the Series * @param int The route of the Series
*/ */
public static function getSeriesRoute($id = 0, $catid = 0) public static function getSeriesRoute($id = 0, $catid = 0)
{ {
if ($id > 0) if ($id > 0)
@ -302,8 +302,8 @@ abstract class SermondistributorHelperRoute
} }
/** /**
* @param int The route of the Api * @param int The route of the Api
*/ */
public static function getApiRoute($id = 0, $catid = 0) public static function getApiRoute($id = 0, $catid = 0)
{ {
if ($id > 0) if ($id > 0)

View File

@ -2729,8 +2729,8 @@ abstract class SermondistributorHelper
} }
/** /**
* Load the Component Help URLs. * Load the Component Help URLs.
**/ **/
public static function getHelpUrl($view) public static function getHelpUrl($view)
{ {
$user = JFactory::getUser(); $user = JFactory::getUser();
@ -2767,15 +2767,15 @@ abstract class SermondistributorHelper
// set joomla article // set joomla article
case 1: case 1:
return self::loadArticleLink($help->article); return self::loadArticleLink($help->article);
break; break;
// set help text // set help text
case 2: case 2:
return self::loadHelpTextLink($help->id); return self::loadHelpTextLink($help->id);
break; break;
// set Link // set Link
case 3: case 3:
return $help->url; return $help->url;
break; break;
} }
} }
} }
@ -2784,16 +2784,16 @@ abstract class SermondistributorHelper
} }
/** /**
* Get the Article Link. * Get the Article Link.
**/ **/
protected static function loadArticleLink($id) protected static function loadArticleLink($id)
{ {
return JURI::root().'index.php?option=com_content&view=article&id='.$id.'&tmpl=component&layout=modal'; return JURI::root().'index.php?option=com_content&view=article&id='.$id.'&tmpl=component&layout=modal';
} }
/** /**
* Get the Help Text Link. * Get the Help Text Link.
**/ **/
protected static function loadHelpTextLink($id) protected static function loadHelpTextLink($id)
{ {
$token = JSession::getFormToken(); $token = JSession::getFormToken();
@ -2945,7 +2945,7 @@ abstract class SermondistributorHelper
} }
} }
// check if there are any view values remaining // check if there are any view values remaining
if (count($_result)) if (count((array)$_result))
{ {
$_result = json_encode($_result); $_result = json_encode($_result);
$_result = array($_result); $_result = array($_result);
@ -3098,8 +3098,8 @@ abstract class SermondistributorHelper
} }
/** /**
* UIKIT Component Classes * UIKIT Component Classes
**/ **/
public static $uk_components = array( public static $uk_components = array(
'data-uk-grid' => array( 'data-uk-grid' => array(
'grid' ), 'grid' ),
@ -3153,15 +3153,15 @@ abstract class SermondistributorHelper
'upload-drop' => array( 'upload-drop' => array(
'upload', 'form-file' ) 'upload', 'form-file' )
); );
/** /**
* Add UIKIT Components * Add UIKIT Components
**/ **/
public static $uikit = false; public static $uikit = false;
/** /**
* Get UIKIT Components * Get UIKIT Components
**/ **/
public static function getUikitComp($content,$classes = array()) public static function getUikitComp($content,$classes = array())
{ {
if (strpos($content,'class="uk-') !== false) if (strpos($content,'class="uk-') !== false)
@ -3191,7 +3191,7 @@ abstract class SermondistributorHelper
} }
return $temp; return $temp;
} }
} }
if (self::checkArray($classes)) if (self::checkArray($classes))
{ {
return $classes; return $classes;
@ -3587,7 +3587,7 @@ abstract class SermondistributorHelper
**/ **/
public static function checkArray($array, $removeEmptyString = false) public static function checkArray($array, $removeEmptyString = false)
{ {
if (isset($array) && is_array($array) && count($array) > 0) if (isset($array) && is_array($array) && count((array)$array) > 0)
{ {
// also make sure the empty strings are removed // also make sure the empty strings are removed
if ($removeEmptyString) if ($removeEmptyString)
@ -3690,7 +3690,7 @@ abstract class SermondistributorHelper
{ {
$initial = strlen($string); $initial = strlen($string);
$words = preg_split('/([\s\n\r]+)/', $string, null, PREG_SPLIT_DELIM_CAPTURE); $words = preg_split('/([\s\n\r]+)/', $string, null, PREG_SPLIT_DELIM_CAPTURE);
$words_count = count($words); $words_count = count((array)$words);
$word_length = 0; $word_length = 0;
$last_word = 0; $last_word = 0;

View File

@ -117,11 +117,11 @@ class SermondistributorModelApi extends JModelList
/** /**
* Get the uikit needed components * Get the uikit needed components
* *
* @return mixed An array of objects on success. * @return mixed An array of objects on success.
* *
*/ */
public function getUikitComp() public function getUikitComp()
{ {
if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp)) if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp))

View File

@ -151,11 +151,11 @@ class SermondistributorModelCategories extends JModelList
} }
/** /**
* Method to get an array of Sermon Objects. * Method to get an array of Sermon Objects.
* *
* @return mixed An array of Sermon Objects on success, false on failure. * @return mixed An array of Sermon Objects on success, false on failure.
* *
*/ */
public function getIdCatidSermonEfee_B($id) public function getIdCatidSermonEfee_B($id)
{ {
// Get a db connection. // Get a db connection.
@ -191,11 +191,11 @@ class SermondistributorModelCategories extends JModelList
/** /**
* Get the uikit needed components * Get the uikit needed components
* *
* @return mixed An array of objects on success. * @return mixed An array of objects on success.
* *
*/ */
public function getUikitComp() public function getUikitComp()
{ {
if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp)) if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp))

View File

@ -221,11 +221,11 @@ class SermondistributorModelCategory extends JModelList
} }
/** /**
* Method to get an array of Statistic Objects. * Method to get an array of Statistic Objects.
* *
* @return mixed An array of Statistic Objects on success, false on failure. * @return mixed An array of Statistic Objects on success, false on failure.
* *
*/ */
public function getIdSermonStatisticBcea_E($id) public function getIdSermonStatisticBcea_E($id)
{ {
// Get a db connection. // Get a db connection.
@ -258,23 +258,23 @@ class SermondistributorModelCategory extends JModelList
/** /**
* Custom Method * Custom Method
* *
* @return mixed item data object on success, false on failure. * @return mixed item data object on success, false on failure.
* *
*/ */
public function getCategory() public function getCategory()
{ {
if (!isset($this->initSet) || !$this->initSet) if (!isset($this->initSet) || !$this->initSet)
{ {
$this->user = JFactory::getUser(); $this->user = JFactory::getUser();
$this->userId = $this->user->get('id'); $this->userId = $this->user->get('id');
$this->guest = $this->user->get('guest'); $this->guest = $this->user->get('guest');
$this->groups = $this->user->get('groups'); $this->groups = $this->user->get('groups');
$this->authorisedGroups = $this->user->getAuthorisedGroups(); $this->authorisedGroups = $this->user->getAuthorisedGroups();
$this->levels = $this->user->getAuthorisedViewLevels(); $this->levels = $this->user->getAuthorisedViewLevels();
$this->initSet = true; $this->initSet = true;
} }
// Get a db connection. // Get a db connection.
$db = JFactory::getDbo(); $db = JFactory::getDbo();
@ -325,11 +325,11 @@ class SermondistributorModelCategory extends JModelList
} }
/** /**
* Method to get an array of Sermon Objects. * Method to get an array of Sermon Objects.
* *
* @return mixed An array of Sermon Objects on success, false on failure. * @return mixed An array of Sermon Objects on success, false on failure.
* *
*/ */
public function getIdCatidSermonFbdf_B($id) public function getIdCatidSermonFbdf_B($id)
{ {
// Get a db connection. // Get a db connection.
@ -369,11 +369,11 @@ class SermondistributorModelCategory extends JModelList
} }
/** /**
* Method to get an array of Statistic Objects. * Method to get an array of Statistic Objects.
* *
* @return mixed An array of Statistic Objects on success, false on failure. * @return mixed An array of Statistic Objects on success, false on failure.
* *
*/ */
public function getIdSermonStatisticFbdf_C($id) public function getIdSermonStatisticFbdf_C($id)
{ {
// Get a db connection. // Get a db connection.
@ -406,11 +406,11 @@ class SermondistributorModelCategory extends JModelList
/** /**
* Get the uikit needed components * Get the uikit needed components
* *
* @return mixed An array of objects on success. * @return mixed An array of objects on success.
* *
*/ */
public function getUikitComp() public function getUikitComp()
{ {
if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp)) if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp))

View File

@ -221,11 +221,11 @@ class SermondistributorModelPreacher extends JModelList
} }
/** /**
* Method to get an array of Statistic Objects. * Method to get an array of Statistic Objects.
* *
* @return mixed An array of Statistic Objects on success, false on failure. * @return mixed An array of Statistic Objects on success, false on failure.
* *
*/ */
public function getIdSermonStatisticFcff_E($id) public function getIdSermonStatisticFcff_E($id)
{ {
// Get a db connection. // Get a db connection.
@ -258,23 +258,23 @@ class SermondistributorModelPreacher extends JModelList
/** /**
* Custom Method * Custom Method
* *
* @return mixed item data object on success, false on failure. * @return mixed item data object on success, false on failure.
* *
*/ */
public function getPreacher() public function getPreacher()
{ {
if (!isset($this->initSet) || !$this->initSet) if (!isset($this->initSet) || !$this->initSet)
{ {
$this->user = JFactory::getUser(); $this->user = JFactory::getUser();
$this->userId = $this->user->get('id'); $this->userId = $this->user->get('id');
$this->guest = $this->user->get('guest'); $this->guest = $this->user->get('guest');
$this->groups = $this->user->get('groups'); $this->groups = $this->user->get('groups');
$this->authorisedGroups = $this->user->getAuthorisedGroups(); $this->authorisedGroups = $this->user->getAuthorisedGroups();
$this->levels = $this->user->getAuthorisedViewLevels(); $this->levels = $this->user->getAuthorisedViewLevels();
$this->initSet = true; $this->initSet = true;
} }
// Get a db connection. // Get a db connection.
$db = JFactory::getDbo(); $db = JFactory::getDbo();
@ -332,23 +332,23 @@ class SermondistributorModelPreacher extends JModelList
/** /**
* Custom Method * Custom Method
* *
* @return mixed An array of objects on success, false on failure. * @return mixed An array of objects on success, false on failure.
* *
*/ */
public function getNumberDownloads() public function getNumberDownloads()
{ {
if (!isset($this->initSet) || !$this->initSet) if (!isset($this->initSet) || !$this->initSet)
{ {
$this->user = JFactory::getUser(); $this->user = JFactory::getUser();
$this->userId = $this->user->get('id'); $this->userId = $this->user->get('id');
$this->guest = $this->user->get('guest'); $this->guest = $this->user->get('guest');
$this->groups = $this->user->get('groups'); $this->groups = $this->user->get('groups');
$this->authorisedGroups = $this->user->getAuthorisedGroups(); $this->authorisedGroups = $this->user->getAuthorisedGroups();
$this->levels = $this->user->getAuthorisedViewLevels(); $this->levels = $this->user->getAuthorisedViewLevels();
$this->initSet = true; $this->initSet = true;
} }
// Get the global params // Get the global params
@ -409,23 +409,23 @@ class SermondistributorModelPreacher extends JModelList
/** /**
* Custom Method * Custom Method
* *
* @return mixed An array of objects on success, false on failure. * @return mixed An array of objects on success, false on failure.
* *
*/ */
public function getNumberSermons() public function getNumberSermons()
{ {
if (!isset($this->initSet) || !$this->initSet) if (!isset($this->initSet) || !$this->initSet)
{ {
$this->user = JFactory::getUser(); $this->user = JFactory::getUser();
$this->userId = $this->user->get('id'); $this->userId = $this->user->get('id');
$this->guest = $this->user->get('guest'); $this->guest = $this->user->get('guest');
$this->groups = $this->user->get('groups'); $this->groups = $this->user->get('groups');
$this->authorisedGroups = $this->user->getAuthorisedGroups(); $this->authorisedGroups = $this->user->getAuthorisedGroups();
$this->levels = $this->user->getAuthorisedViewLevels(); $this->levels = $this->user->getAuthorisedViewLevels();
$this->initSet = true; $this->initSet = true;
} }
// Get the global params // Get the global params
@ -487,11 +487,11 @@ class SermondistributorModelPreacher extends JModelList
/** /**
* Get the uikit needed components * Get the uikit needed components
* *
* @return mixed An array of objects on success. * @return mixed An array of objects on success.
* *
*/ */
public function getUikitComp() public function getUikitComp()
{ {
if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp)) if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp))

View File

@ -147,11 +147,11 @@ class SermondistributorModelPreachers extends JModelList
} }
/** /**
* Method to get an array of Sermon Objects. * Method to get an array of Sermon Objects.
* *
* @return mixed An array of Sermon Objects on success, false on failure. * @return mixed An array of Sermon Objects on success, false on failure.
* *
*/ */
public function getIdPreacherSermonDcaa_B($id) public function getIdPreacherSermonDcaa_B($id)
{ {
// Get a db connection. // Get a db connection.
@ -187,11 +187,11 @@ class SermondistributorModelPreachers extends JModelList
/** /**
* Get the uikit needed components * Get the uikit needed components
* *
* @return mixed An array of objects on success. * @return mixed An array of objects on success.
* *
*/ */
public function getUikitComp() public function getUikitComp()
{ {
if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp)) if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp))

View File

@ -221,11 +221,11 @@ class SermondistributorModelSeries extends JModelList
} }
/** /**
* Method to get an array of Statistic Objects. * Method to get an array of Statistic Objects.
* *
* @return mixed An array of Statistic Objects on success, false on failure. * @return mixed An array of Statistic Objects on success, false on failure.
* *
*/ */
public function getIdSermonStatisticEfeb_E($id) public function getIdSermonStatisticEfeb_E($id)
{ {
// Get a db connection. // Get a db connection.
@ -258,23 +258,23 @@ class SermondistributorModelSeries extends JModelList
/** /**
* Custom Method * Custom Method
* *
* @return mixed item data object on success, false on failure. * @return mixed item data object on success, false on failure.
* *
*/ */
public function getSeries() public function getSeries()
{ {
if (!isset($this->initSet) || !$this->initSet) if (!isset($this->initSet) || !$this->initSet)
{ {
$this->user = JFactory::getUser(); $this->user = JFactory::getUser();
$this->userId = $this->user->get('id'); $this->userId = $this->user->get('id');
$this->guest = $this->user->get('guest'); $this->guest = $this->user->get('guest');
$this->groups = $this->user->get('groups'); $this->groups = $this->user->get('groups');
$this->authorisedGroups = $this->user->getAuthorisedGroups(); $this->authorisedGroups = $this->user->getAuthorisedGroups();
$this->levels = $this->user->getAuthorisedViewLevels(); $this->levels = $this->user->getAuthorisedViewLevels();
$this->initSet = true; $this->initSet = true;
} }
// Get a db connection. // Get a db connection.
$db = JFactory::getDbo(); $db = JFactory::getDbo();
@ -332,23 +332,23 @@ class SermondistributorModelSeries extends JModelList
/** /**
* Custom Method * Custom Method
* *
* @return mixed An array of objects on success, false on failure. * @return mixed An array of objects on success, false on failure.
* *
*/ */
public function getNumberDownloads() public function getNumberDownloads()
{ {
if (!isset($this->initSet) || !$this->initSet) if (!isset($this->initSet) || !$this->initSet)
{ {
$this->user = JFactory::getUser(); $this->user = JFactory::getUser();
$this->userId = $this->user->get('id'); $this->userId = $this->user->get('id');
$this->guest = $this->user->get('guest'); $this->guest = $this->user->get('guest');
$this->groups = $this->user->get('groups'); $this->groups = $this->user->get('groups');
$this->authorisedGroups = $this->user->getAuthorisedGroups(); $this->authorisedGroups = $this->user->getAuthorisedGroups();
$this->levels = $this->user->getAuthorisedViewLevels(); $this->levels = $this->user->getAuthorisedViewLevels();
$this->initSet = true; $this->initSet = true;
} }
// Get the global params // Get the global params
@ -409,23 +409,23 @@ class SermondistributorModelSeries extends JModelList
/** /**
* Custom Method * Custom Method
* *
* @return mixed An array of objects on success, false on failure. * @return mixed An array of objects on success, false on failure.
* *
*/ */
public function getNumberSermons() public function getNumberSermons()
{ {
if (!isset($this->initSet) || !$this->initSet) if (!isset($this->initSet) || !$this->initSet)
{ {
$this->user = JFactory::getUser(); $this->user = JFactory::getUser();
$this->userId = $this->user->get('id'); $this->userId = $this->user->get('id');
$this->guest = $this->user->get('guest'); $this->guest = $this->user->get('guest');
$this->groups = $this->user->get('groups'); $this->groups = $this->user->get('groups');
$this->authorisedGroups = $this->user->getAuthorisedGroups(); $this->authorisedGroups = $this->user->getAuthorisedGroups();
$this->levels = $this->user->getAuthorisedViewLevels(); $this->levels = $this->user->getAuthorisedViewLevels();
$this->initSet = true; $this->initSet = true;
} }
// Get the global params // Get the global params
@ -487,11 +487,11 @@ class SermondistributorModelSeries extends JModelList
/** /**
* Get the uikit needed components * Get the uikit needed components
* *
* @return mixed An array of objects on success. * @return mixed An array of objects on success.
* *
*/ */
public function getUikitComp() public function getUikitComp()
{ {
if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp)) if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp))

View File

@ -147,11 +147,11 @@ class SermondistributorModelSerieslist extends JModelList
} }
/** /**
* Method to get an array of Sermon Objects. * Method to get an array of Sermon Objects.
* *
* @return mixed An array of Sermon Objects on success, false on failure. * @return mixed An array of Sermon Objects on success, false on failure.
* *
*/ */
public function getIdSeriesSermonBcae_B($id) public function getIdSeriesSermonBcae_B($id)
{ {
// Get a db connection. // Get a db connection.
@ -187,11 +187,11 @@ class SermondistributorModelSerieslist extends JModelList
/** /**
* Get the uikit needed components * Get the uikit needed components
* *
* @return mixed An array of objects on success. * @return mixed An array of objects on success.
* *
*/ */
public function getUikitComp() public function getUikitComp()
{ {
if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp)) if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp))

View File

@ -266,11 +266,11 @@ class SermondistributorModelSermon extends JModelItem
} }
/** /**
* Method to get an array of Statistic Objects. * Method to get an array of Statistic Objects.
* *
* @return mixed An array of Statistic Objects on success, false on failure. * @return mixed An array of Statistic Objects on success, false on failure.
* *
*/ */
public function getIdSermonStatisticEbbd_D($id) public function getIdSermonStatisticEbbd_D($id)
{ {
// Get a db connection. // Get a db connection.
@ -303,11 +303,11 @@ class SermondistributorModelSermon extends JModelItem
/** /**
* Get the uikit needed components * Get the uikit needed components
* *
* @return mixed An array of objects on success. * @return mixed An array of objects on success.
* *
*/ */
public function getUikitComp() public function getUikitComp()
{ {
if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp)) if (isset($this->uikitComp) && SermondistributorHelper::checkArray($this->uikitComp))