Malachi/Joomla-Sermon-Distributor-Fork
1
0
Fork 0
forked from christian/Joomla-Sermon-Distributor
Code Pull Requests Activity

added html5 audio player

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2017-02-17 22:21:37 +02:00
parent 58de3631ab
commit 252820e8c0
No known key found for this signature in database
GPG Key ID: CAD7B16D27AF28C5
323 changed files with 1615 additions and 1388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
README.md
View File

@ -1,4 +1,4 @@
# Sermon Distributor (1.4.0)
# Sermon Distributor (1.4.1)
![Sermon Distributor image](https://raw.githubusercontent.com/SermonDistributor/Joomla-3-Component/master/admin/assets/images/component-300.jpg "The Sermon Distributor")
@ -20,27 +20,27 @@ The best way to see all your options is to install this component on you Joomla
# Build Details
+ *Company*: [Vast Development Method](https://www.vdm.io/)
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@vdm.io)
+ *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
+ *Name*: [Sermon Distributor](https://www.vdm.io/)
+ *First Build*: 22nd October, 2015
+ *Last Build*: 4th December, 2016
+ *Version*: 1.4.0
+ *Last Build*: 17th February, 2017
+ *Version*: 1.4.1
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
## Build Time :hourglass:
**180 Hours** or **23 Eight Hour Days** (actual time the author saved -
**181 Hours** or **23 Eight Hour Days** (actual time the author saved -
due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder))
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
> never making one mistake or taking any coffee break.)
+ *Line count*: **64519**
+ *File count*: **436**
+ *Line count*: **64745**
+ *File count*: **439**
+ *Folder count*: **90**
**119 Hours** or **14 Eight Hour Days** (the actual time the author spent)
**119 Hours** or **15 Eight Hour Days** (the actual time the author spent)
> (with the following break down:
> **debugging @45hours** = codingtime / 4;
@ -48,13 +48,13 @@ due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder
> **mapping @18hours** = codingtime / 10;
> **office @30hours** = codingtime / 6;)
**299 Hours** or **37 Eight Hour Days**
**300 Hours** or **38 Eight Hour Days**
(a total of the realistic time frame for this project)
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
> with the normal everyday realities at the office, that includes the component planning, mapping & debugging.)
Project duration: **7.4 weeks** or **1.5 months**
Project duration: **7.6 weeks** or **1.6 months**
> This **component** was build with a Joomla [Automated Component Builder](https://www.vdm.io/joomla-component-builder).
> Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)

20
admin/README.txt
View File

@ -1,4 +1,4 @@
# Sermon Distributor (1.4.0)
# Sermon Distributor (1.4.1)
![Sermon Distributor image](https://raw.githubusercontent.com/SermonDistributor/Joomla-3-Component/master/admin/assets/images/component-300.jpg "The Sermon Distributor")
@ -20,27 +20,27 @@ The best way to see all your options is to install this component on you Joomla
# Build Details
+ *Company*: [Vast Development Method](https://www.vdm.io/)
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@vdm.io)
+ *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
+ *Name*: [Sermon Distributor](https://www.vdm.io/)
+ *First Build*: 22nd October, 2015
+ *Last Build*: 4th December, 2016
+ *Version*: 1.4.0
+ *Last Build*: 17th February, 2017
+ *Version*: 1.4.1
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
## Build Time :hourglass:
**180 Hours** or **23 Eight Hour Days** (actual time the author saved -
**181 Hours** or **23 Eight Hour Days** (actual time the author saved -
due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder))
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
> never making one mistake or taking any coffee break.)
+ *Line count*: **64519**
+ *File count*: **436**
+ *Line count*: **64745**
+ *File count*: **439**
+ *Folder count*: **90**
**119 Hours** or **14 Eight Hour Days** (the actual time the author spent)
**119 Hours** or **15 Eight Hour Days** (the actual time the author spent)
> (with the following break down:
> **debugging @45hours** = codingtime / 4;
@ -48,13 +48,13 @@ due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder
> **mapping @18hours** = codingtime / 10;
> **office @30hours** = codingtime / 6;)
**299 Hours** or **37 Eight Hour Days**
**300 Hours** or **38 Eight Hour Days**
(a total of the realistic time frame for this project)
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
> with the normal everyday realities at the office, that includes the component planning, mapping & debugging.)
Project duration: **7.4 weeks** or **1.5 months**
Project duration: **7.6 weeks** or **1.6 months**
> This **component** was build with a Joomla [Automated Component Builder](https://www.vdm.io/joomla-component-builder).
> Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)

4
admin/assets/css/admin.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage admin.css

4
admin/assets/css/dashboard.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage dashboard.css

6
admin/assets/css/external_source.css
View File

@ -9,9 +9,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 53 of this MVC
@build 27th November, 2016
@created 3rd November, 2016
@package Sermon Distributor
@subpackage external_source.css
@author Llewellyn van der Merwe <https://www.vdm.io/>

6
admin/assets/css/external_sources.css
View File

@ -9,9 +9,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 53 of this MVC
@build 27th November, 2016
@created 3rd November, 2016
@package Sermon Distributor
@subpackage external_sources.css
@author Llewellyn van der Merwe <https://www.vdm.io/>

6
admin/assets/css/help_document.css
View File

@ -9,9 +9,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 20 of this MVC
@build 17th October, 2016
@created 13th July, 2015
@package Sermon Distributor
@subpackage help_document.css
@author Llewellyn van der Merwe <https://www.vdm.io/>

6
admin/assets/css/help_documents.css
View File

@ -9,9 +9,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 20 of this MVC
@build 17th October, 2016
@created 13th July, 2015
@package Sermon Distributor
@subpackage help_documents.css
@author Llewellyn van der Merwe <https://www.vdm.io/>

6
admin/assets/css/local_listing.css
View File

@ -9,9 +9,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 10 of this MVC
@build 27th November, 2016
@created 20th November, 2016
@package Sermon Distributor
@subpackage local_listing.css
@author Llewellyn van der Merwe <https://www.vdm.io/>

6
admin/assets/css/local_listings.css
View File

@ -9,9 +9,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 10 of this MVC
@build 27th November, 2016
@created 20th November, 2016
@package Sermon Distributor
@subpackage local_listings.css
@author Llewellyn van der Merwe <https://www.vdm.io/>

6
admin/assets/css/manual_updater.css
View File

@ -9,9 +9,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 44 of this MVC
@build 27th November, 2016
@created 4th November, 2016
@package Sermon Distributor
@subpackage manual_updater.css
@author Llewellyn van der Merwe <https://www.vdm.io/>

4
admin/assets/css/preacher.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version @update number 16 of this MVC
@build 4th November, 2016
@created 22nd October, 2015
@package Sermon Distributor
@subpackage preacher.css

4
admin/assets/css/preachers.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version @update number 16 of this MVC
@build 4th November, 2016
@created 22nd October, 2015
@package Sermon Distributor
@subpackage preachers.css

4
admin/assets/css/series.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version @update number 16 of this MVC
@build 4th November, 2016
@created 22nd October, 2015
@package Sermon Distributor
@subpackage series.css

4
admin/assets/css/series_list.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version @update number 16 of this MVC
@build 4th November, 2016
@created 22nd October, 2015
@package Sermon Distributor
@subpackage series_list.css

4
admin/assets/css/sermon.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version @update number 89 of this MVC
@build 16th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage sermon.css

4
admin/assets/css/sermons.css
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version @update number 89 of this MVC
@build 16th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage sermons.css

6
admin/assets/css/statistic.css
View File

@ -9,9 +9,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 8 of this MVC
@build 18th November, 2015
@created 29th October, 2015
@package Sermon Distributor
@subpackage statistic.css
@author Llewellyn van der Merwe <https://www.vdm.io/>

6
admin/assets/css/statistics.css
View File

@ -9,9 +9,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 8 of this MVC
@build 18th November, 2015
@created 29th October, 2015
@package Sermon Distributor
@subpackage statistics.css
@author Llewellyn van der Merwe <https://www.vdm.io/>

4
admin/config.xml
View File

@ -80,7 +80,7 @@
label="COM_SERMONDISTRIBUTOR_CONFIG_AUTHOR_EMAIL_LABEL"
description="COM_SERMONDISTRIBUTOR_CONFIG_AUTHOR_EMAIL_DESC"
size="60"
default="llewellyn@vdm.io"
default="joomla@vdm.io"
readonly="true"
class="readonly"
/>
@ -379,6 +379,8 @@
COM_SERMONDISTRIBUTOR_CONFIG_SOUNDMANAGER</option>
<option value="2">
COM_SERMONDISTRIBUTOR_CONFIG_JPLAYER</option>
<option value="3">
COM_SERMONDISTRIBUTOR_CONFIG_HTML_FIVE_BASIC</option>
</field>
</fieldset>
<fieldset

4
admin/controller.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage controller.php

16
admin/controllers/ajax.json.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage ajax.json.php
@ -42,7 +42,7 @@ class SermondistributorControllerAjax extends JControllerLegacy
JResponse::setHeader('Content-Disposition','attachment;filename="getajax.json"');
JResponse::setHeader("Access-Control-Allow-Origin", "*");
// load the tasks
$this->registerTask('autoUpdateLocalListingExternal', 'ajax');
$this->registerTask('theQueue', 'ajax');
$this->registerTask('updateLocalListingExternal', 'ajax');
$this->registerTask('isNew', 'ajax');
$this->registerTask('isRead', 'ajax');
@ -62,16 +62,16 @@ class SermondistributorControllerAjax extends JControllerLegacy
$task = $this->getTask();
switch($task)
{
case 'autoUpdateLocalListingExternal':
case 'theQueue':
try
{
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$listingValue = $jinput->get('listing', NULL, 'INT');
$targetValue = $jinput->get('target', NULL, 'INT');
$listValue = $jinput->get('list', NULL, 'INT');
$tarValue = $jinput->get('tar', NULL, 'INT');
$typeValue = $jinput->get('type', NULL, 'INT');
if($listingValue && $targetValue && $typeValue)
if($listValue && $tarValue && $typeValue)
{
$result = $this->getModel('ajax')->autoUpdateLocalListingExternal($listingValue, $targetValue, $typeValue);
$result = $this->getModel('ajax')->theQueue($listValue, $tarValue, $typeValue);
}
else
{

8
admin/controllers/external_source.php
View File

@ -10,9 +10,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 53 of this MVC
@build 27th November, 2016
@created 3rd November, 2016
@package Sermon Distributor
@subpackage external_source.php
@author Llewellyn van der Merwe <https://www.vdm.io/>
@ -241,7 +241,7 @@ class SermondistributorControllerExternal_source extends JControllerForm
{
// The record has been set. Check the record permissions.
$permission = $user->authorise('external_source.edit', 'com_sermondistributor.external_source.' . (int) $recordId);
if (!$permission && !is_null($permission))
if (!$permission)
{
if ($user->authorise('external_source.edit.own', 'com_sermondistributor.external_source.' . $recordId))
{

6
admin/controllers/external_sources.php
View File

@ -10,9 +10,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 53 of this MVC
@build 27th November, 2016
@created 3rd November, 2016
@package Sermon Distributor
@subpackage external_sources.php
@author Llewellyn van der Merwe <https://www.vdm.io/>

4
admin/controllers/help.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage help.php

8
admin/controllers/help_document.php
View File

@ -10,9 +10,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 20 of this MVC
@build 17th October, 2016
@created 13th July, 2015
@package Sermon Distributor
@subpackage help_document.php
@author Llewellyn van der Merwe <https://www.vdm.io/>
@ -99,7 +99,7 @@ class SermondistributorControllerHelp_document extends JControllerForm
{
// The record has been set. Check the record permissions.
$permission = $user->authorise('help_document.edit', 'com_sermondistributor.help_document.' . (int) $recordId);
if (!$permission && !is_null($permission))
if (!$permission)
{
if ($user->authorise('help_document.edit.own', 'com_sermondistributor.help_document.' . $recordId))
{

6
admin/controllers/help_documents.php
View File

@ -10,9 +10,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 20 of this MVC
@build 17th October, 2016
@created 13th July, 2015
@package Sermon Distributor
@subpackage help_documents.php
@author Llewellyn van der Merwe <https://www.vdm.io/>

4
admin/controllers/import.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage import.php

8
admin/controllers/local_listing.php
View File

@ -10,9 +10,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 10 of this MVC
@build 27th November, 2016
@created 20th November, 2016
@package Sermon Distributor
@subpackage local_listing.php
@author Llewellyn van der Merwe <https://www.vdm.io/>
@ -99,7 +99,7 @@ class SermondistributorControllerLocal_listing extends JControllerForm
{
// The record has been set. Check the record permissions.
$permission = $user->authorise('local_listing.edit', 'com_sermondistributor.local_listing.' . (int) $recordId);
if (!$permission && !is_null($permission))
if (!$permission)
{
if ($user->authorise('local_listing.edit.own', 'com_sermondistributor.local_listing.' . $recordId))
{

6
admin/controllers/local_listings.php
View File

@ -10,9 +10,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 10 of this MVC
@build 27th November, 2016
@created 20th November, 2016
@package Sermon Distributor
@subpackage local_listings.php
@author Llewellyn van der Merwe <https://www.vdm.io/>

6
admin/controllers/manual_updater.php
View File

@ -10,9 +10,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 44 of this MVC
@build 27th November, 2016
@created 4th November, 2016
@package Sermon Distributor
@subpackage manual_updater.php
@author Llewellyn van der Merwe <https://www.vdm.io/>

6
admin/controllers/preacher.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version @update number 16 of this MVC
@build 4th November, 2016
@created 22nd October, 2015
@package Sermon Distributor
@subpackage preacher.php
@ -99,7 +99,7 @@ class SermondistributorControllerPreacher extends JControllerForm
{
// The record has been set. Check the record permissions.
$permission = $user->authorise('preacher.edit', 'com_sermondistributor.preacher.' . (int) $recordId);
if (!$permission && !is_null($permission))
if (!$permission)
{
if ($user->authorise('preacher.edit.own', 'com_sermondistributor.preacher.' . $recordId))
{

4
admin/controllers/preachers.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version @update number 16 of this MVC
@build 4th November, 2016
@created 22nd October, 2015
@package Sermon Distributor
@subpackage preachers.php

6
admin/controllers/series.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version @update number 16 of this MVC
@build 4th November, 2016
@created 22nd October, 2015
@package Sermon Distributor
@subpackage series.php
@ -99,7 +99,7 @@ class SermondistributorControllerSeries extends JControllerForm
{
// The record has been set. Check the record permissions.
$permission = $user->authorise('series.edit', 'com_sermondistributor.series.' . (int) $recordId);
if (!$permission && !is_null($permission))
if (!$permission)
{
if ($user->authorise('series.edit.own', 'com_sermondistributor.series.' . $recordId))
{

4
admin/controllers/series_list.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version @update number 16 of this MVC
@build 4th November, 2016
@created 22nd October, 2015
@package Sermon Distributor
@subpackage series_list.php

43
admin/controllers/sermon.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version @update number 89 of this MVC
@build 16th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage sermon.php
@ -60,33 +60,14 @@ class SermondistributorControllerSermon extends JControllerForm
*/
protected function allowAdd($data = array())
{
// get the user object
$user = JFactory::getUser();
// Access check.
$access = $user->authorise('sermon.access', 'com_sermondistributor');
$access = JFactory::getUser()->authorise('sermon.access', 'com_sermondistributor');
if (!$access)
{
return false;
}
$categoryId = JArrayHelper::getValue($data, 'catid', $this->input->getInt('filter_category_id'), 'int');
$allow = null;
if ($categoryId)
{
// If the category has been passed in the URL check it.
$allow = $user->authorise('core.create', $this->option . '.sermons.category.' . $categoryId);
}
if ($allow === null)
{
// In the absense of better information, revert to the component permissions.
return $user->authorise('sermon.create', $this->option);
}
else
{
return $allow;
}
// In the absense of better information, revert to the component permissions.
return JFactory::getUser()->authorise('sermon.create', $this->option);
}
/**
@ -117,7 +98,7 @@ class SermondistributorControllerSermon extends JControllerForm
{
// The record has been set. Check the record permissions.
$permission = $user->authorise('sermon.edit', 'com_sermondistributor.sermon.' . (int) $recordId);
if (!$permission && !is_null($permission))
if (!$permission)
{
if ($user->authorise('sermon.edit.own', 'com_sermondistributor.sermon.' . $recordId))
{
@ -146,18 +127,6 @@ class SermondistributorControllerSermon extends JControllerForm
}
return false;
}
$categoryId = (int) isset($data['catid']) ? $data['catid']: $this->getModel()->getItem($recordId)->catid;
if ($categoryId)
{
// The category has been set. Check the category permissions.
$catpermission = $user->authorise('core.edit', $this->option . '.sermons.category.' . $categoryId);
if (!$catpermission && !is_null($catpermission))
{
return false;
}
}
}
// Since there is no permission, revert to the component permissions.
return $user->authorise('sermon.edit', $this->option);

4
admin/controllers/sermondistributor.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage sermondistributor.php

4
admin/controllers/sermons.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version @update number 89 of this MVC
@build 16th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage sermons.php

8
admin/controllers/statistic.php
View File

@ -10,9 +10,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 8 of this MVC
@build 18th November, 2015
@created 29th October, 2015
@package Sermon Distributor
@subpackage statistic.php
@author Llewellyn van der Merwe <https://www.vdm.io/>
@ -99,7 +99,7 @@ class SermondistributorControllerStatistic extends JControllerForm
{
// The record has been set. Check the record permissions.
$permission = $user->authorise('statistic.edit', 'com_sermondistributor.statistic.' . (int) $recordId);
if (!$permission && !is_null($permission))
if (!$permission)
{
if ($user->authorise('statistic.edit.own', 'com_sermondistributor.statistic.' . $recordId))
{

6
admin/controllers/statistics.php
View File

@ -10,9 +10,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 8 of this MVC
@build 18th November, 2015
@created 29th October, 2015
@package Sermon Distributor
@subpackage statistics.php
@author Llewellyn van der Merwe <https://www.vdm.io/>

85
admin/helpers/headercheck.php Normal file
View File

@ -0,0 +1,85 @@
<?php
/*--------------------------------------------------------------------------------------------------------| www.vdm.io |------/
__ __ _ _____ _ _ __ __ _ _ _
\ \ / / | | | __ \ | | | | | \/ | | | | | | |
\ \ / /_ _ ___| |_ | | | | _____ _____| | ___ _ __ _ __ ___ ___ _ __ | |_ | \ / | ___| |_| |__ ___ __| |
\ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
\ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| |
\/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_|
| |
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage headercheck.php
@author Llewellyn van der Merwe <https://www.vdm.io/>
@copyright Copyright (C) 2015. All Rights Reserved
@license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
A sermon distributor that links to Dropbox.
/-----------------------------------------------------------------------------------------------------------------------------*/
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
class HeaderCheck
{
function js_loaded($script_name)
{
// UIkit check point
if (strpos($script_name,'uikit') !== false)
{
$app = JFactory::getApplication();
$getTemplateName = $app->getTemplate('template')->template;
if (strpos($getTemplateName,'yoo') !== false)
{
return true;
}
}
$document = JFactory::getDocument();
$head_data = $document->getHeadData();
foreach (array_keys($head_data['scripts']) as $script)
{
if (stristr($script, $script_name))
{
return true;
}
}
return false;
}
function css_loaded($script_name)
{
// UIkit check point
if (strpos($script_name,'uikit') !== false)
{
$app = JFactory::getApplication();
$getTemplateName = $app->getTemplate('template')->template;
if (strpos($getTemplateName,'yoo') !== false)
{
return true;
}
}
$document = JFactory::getDocument();
$head_data = $document->getHeadData();
foreach (array_keys($head_data['styleSheets']) as $script)
{
if (stristr($script, $script_name))
{
return true;
}
}
return false;
}
}

4
admin/helpers/html/batch_.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage batch_.php

169
admin/helpers/sermondistributor.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage sermondistributor.php
@ -50,19 +50,13 @@ abstract class SermondistributorHelper
{
$document->addScriptDeclaration("
jQuery(window).load(function() {
checkExternalListing(".$update.");
theQueue(".$update.");
});
function checkExternalListing(id, target, type) {
checkExternalListing_server(id, target, type).done(function(result) {
// good it is done
});
}
function checkExternalListing_server(id, target, type) {
var getUrl = '".JURI::root()."administrator/index.php?option=com_sermondistributor&task=ajax.autoUpdateLocalListingExternal&format=json';
function theQueue(id, target, type) {
var getUrl = '".JURI::root()."administrator/index.php?option=com_sermondistributor&task=ajax.theQueue&format=json';
if(target > 0 && type > 0 && id > 0){
var request = 'token=".JSession::getFormToken()."&target='+target+'&listing='+id+'&type='+type;
var request = 'token=".JSession::getFormToken()."&tar='+target+'&list='+id+'&type='+type;
}
return jQuery.ajax({
type: 'GET',
@ -114,7 +108,7 @@ abstract class SermondistributorHelper
* The update errors
**/
protected static $updateErrors = array();
/**
* prepare base64 string for url
**/
@ -139,7 +133,7 @@ abstract class SermondistributorHelper
}
return $string;
}
/**
* get Download links of a sermon
**/
@ -813,7 +807,7 @@ abstract class SermondistributorHelper
}
}
}
/**
* Change to nice fancy date
*/
@ -826,6 +820,18 @@ abstract class SermondistributorHelper
return date('jS \o\f F Y',$date);
}
/**
* Change to nice fancy day time and date
*/
public static function fancyDayTimeDate($time)
{
if (!self::isValidTimeStamp($time))
{
$time = strtotime($time);
}
return date('D ga jS \o\f F Y',$time);
}
/**
* Change to nice fancy time and date
*/
@ -859,6 +865,7 @@ abstract class SermondistributorHelper
&& ($timestamp <= PHP_INT_MAX)
&& ($timestamp >= ~PHP_INT_MAX);
}
/**
* Load the Component xml manifest.
**/
@ -986,40 +993,40 @@ abstract class SermondistributorHelper
// load user for access menus
$user = JFactory::getUser();
// load the submenus to sidebar
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_DASHBOARD'), 'index.php?option=com_sermondistributor&view=sermondistributor', $submenu == 'sermondistributor');
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_DASHBOARD'), 'index.php?option=com_sermondistributor&view=sermondistributor', $submenu === 'sermondistributor');
if ($user->authorise('preacher.access', 'com_sermondistributor') && $user->authorise('preacher.submenu', 'com_sermondistributor'))
{
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_PREACHERS'), 'index.php?option=com_sermondistributor&view=preachers', $submenu == 'preachers');
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_PREACHERS'), 'index.php?option=com_sermondistributor&view=preachers', $submenu === 'preachers');
}
if ($user->authorise('sermon.access', 'com_sermondistributor') && $user->authorise('sermon.submenu', 'com_sermondistributor'))
{
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_SERMONS'), 'index.php?option=com_sermondistributor&view=sermons', $submenu == 'sermons');
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SERMON_SERMON_CATEGORY'), 'index.php?option=com_categories&view=categories&extension=com_sermondistributor.sermons', $submenu == 'categories.sermons');
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_SERMONS'), 'index.php?option=com_sermondistributor&view=sermons', $submenu === 'sermons');
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SERMON_SERMON_CATEGORY'), 'index.php?option=com_categories&view=categories&extension=com_sermondistributor.sermons', $submenu === 'categories.sermons');
}
if ($user->authorise('series.access', 'com_sermondistributor') && $user->authorise('series.submenu', 'com_sermondistributor'))
{
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_SERIES_LIST'), 'index.php?option=com_sermondistributor&view=series_list', $submenu == 'series_list');
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_SERIES_LIST'), 'index.php?option=com_sermondistributor&view=series_list', $submenu === 'series_list');
}
if ($user->authorise('statistic.access', 'com_sermondistributor') && $user->authorise('statistic.submenu', 'com_sermondistributor'))
{
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_STATISTICS'), 'index.php?option=com_sermondistributor&view=statistics', $submenu == 'statistics');
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_STATISTICS'), 'index.php?option=com_sermondistributor&view=statistics', $submenu === 'statistics');
}
if ($user->authorise('external_source.access', 'com_sermondistributor') && $user->authorise('external_source.submenu', 'com_sermondistributor'))
{
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_EXTERNAL_SOURCES'), 'index.php?option=com_sermondistributor&view=external_sources', $submenu == 'external_sources');
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_EXTERNAL_SOURCES'), 'index.php?option=com_sermondistributor&view=external_sources', $submenu === 'external_sources');
}
// Access control (manual_updater.access && manual_updater.submenu).
if ($user->authorise('manual_updater.access', 'com_sermondistributor') && $user->authorise('manual_updater.submenu', 'com_sermondistributor'))
{
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_MANUAL_UPDATER'), 'index.php?option=com_sermondistributor&view=manual_updater', $submenu == 'manual_updater');
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_MANUAL_UPDATER'), 'index.php?option=com_sermondistributor&view=manual_updater', $submenu === 'manual_updater');
}
if ($user->authorise('local_listing.access', 'com_sermondistributor') && $user->authorise('local_listing.submenu', 'com_sermondistributor'))
{
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_LOCAL_LISTINGS'), 'index.php?option=com_sermondistributor&view=local_listings', $submenu == 'local_listings');
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_LOCAL_LISTINGS'), 'index.php?option=com_sermondistributor&view=local_listings', $submenu === 'local_listings');
}
if ($user->authorise('help_document.access', 'com_sermondistributor') && $user->authorise('help_document.submenu', 'com_sermondistributor'))
{
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_HELP_DOCUMENTS'), 'index.php?option=com_sermondistributor&view=help_documents', $submenu == 'help_documents');
JHtmlSidebar::addEntry(JText::_('COM_SERMONDISTRIBUTOR_SUBMENU_HELP_DOCUMENTS'), 'index.php?option=com_sermondistributor&view=help_documents', $submenu === 'help_documents');
}
}
@ -1213,7 +1220,7 @@ abstract class SermondistributorHelper
$objPHPExcel->getActiveSheet()->getColumnDimension($a)->setAutoSize(true);
$objPHPExcel->getActiveSheet()->getStyle($a.$i)->applyFromArray($headerStyles);
$objPHPExcel->getActiveSheet()->getStyle($a.$i)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
} elseif ($a == 'A'){
} elseif ($a === 'A'){
$objPHPExcel->getActiveSheet()->getStyle($a.$i)->applyFromArray($sideStyles);
} else {
$objPHPExcel->getActiveSheet()->getStyle($a.$i)->applyFromArray($normalStyles);
@ -1476,7 +1483,7 @@ abstract class SermondistributorHelper
{
// The record has been set. Check the record permissions.
$permission = $user->authorise($action->name, 'com_sermondistributor.'.$view.'.' . (int) $record->id);
if (!$permission && !is_null($permission))
if (!$permission) // TODO removed && !is_null($permission)
{
if ($action->name == 'core.edit' || $action->name == $view.'.edit')
{
@ -1811,10 +1818,22 @@ abstract class SermondistributorHelper
return false;
}
public static function checkArray($array)
public static function checkArray($array, $removeEmptyString = false)
{
if (isset($array) && is_array($array) && count($array) > 0)
{
// also make sure the empty strings are removed
if ($removeEmptyString)
{
foreach ($array as $key => $string)
{
if (empty($string))
{
unset($array[$key]);
}
}
return self::checkArray($array, false);
}
return true;
}
return false;
@ -1882,55 +1901,67 @@ abstract class SermondistributorHelper
public static function safeString($string, $type = 'L', $spacer = '_')
{
// remove all numbers and replace with english text version (works well only up to a thousand)
// remove all numbers and replace with english text version (works well only up to millions)
$string = self::replaceNumbers($string);
// 0nly continue if we have a string
if (self::checkString($string))
{
// remove all other characters
$string = trim($string);
$string = preg_replace('/'.$spacer.'+/', ' ', $string);
$string = preg_replace('/\s+/', ' ', $string);
$string = preg_replace("/[^A-Za-z ]/", '', $string);
// return a string with all first letter of each word uppercase(no undersocre)
if ($type == 'W')
{
return ucwords(strtolower($string));
}
elseif ($type == 'w')
{
return strtolower($string);
}
elseif ($type == 'Ww')
{
return ucfirst(strtolower($string));
}
elseif ($type == 'WW')
{
return strtoupper($string);
}
elseif ($type == 'U')
{
// replace white space with underscore
$string = preg_replace('/\s+/', $spacer, $string);
// return all upper
return strtoupper($string);
}
elseif ($type == 'F')
{
// replace white space with underscore
$string = preg_replace('/\s+/', $spacer, $string);
// return with first caracter to upper
return ucfirst(strtolower($string));
}
elseif ($type == 'L')
// remove all other characters
$string = trim($string);
$string = preg_replace('/'.$spacer.'+/', ' ', $string);
$string = preg_replace('/\s+/', ' ', $string);
$string = preg_replace("/[^A-Za-z ]/", '', $string);
// select final adaptations
if ($type === 'L' || $type === 'strtolower')
{
// replace white space with underscore
$string = preg_replace('/\s+/', $spacer, $string);
// default is to return lower
return strtolower($string);
}
elseif ($type === 'W')
{
// return a string with all first letter of each word uppercase(no undersocre)
return ucwords(strtolower($string));
}
elseif ($type === 'w' || $type === 'word')
{
// return a string with all lowercase(no undersocre)
return strtolower($string);
}
elseif ($type === 'Ww' || $type === 'Word')
{
// return a string with first letter of the first word uppercase and all the rest lowercase(no undersocre)
return ucfirst(strtolower($string));
}
elseif ($type === 'WW' || $type === 'WORD')
{
// return a string with all the uppercase(no undersocre)
return strtoupper($string);
}
elseif ($type === 'U' || $type === 'strtoupper')
{
// replace white space with underscore
$string = preg_replace('/\s+/', $spacer, $string);
// return all upper
return strtoupper($string);
}
elseif ($type === 'F' || $type === 'ucfirst')
{
// replace white space with underscore
$string = preg_replace('/\s+/', $spacer, $string);
// return with first caracter to upper
return ucfirst(strtolower($string));
}
elseif ($type === 'cA' || $type === 'cAmel' || $type === 'camelcase')
{
// convert all words to first letter uppercase
$string = ucwords(strtolower($string));
// remove white space
$string = preg_replace('/\s+/', '', $string);
// now return first letter lowercase
return lcfirst($string);
}
// return string
return $string;
}
@ -2089,7 +2120,7 @@ abstract class SermondistributorHelper
public static function getCryptKey($type, $default = null)
{
if ('basic' == $type)
if ('basic' === $type)
{
// Get the global params
$params = JComponentHelper::getParams('com_sermondistributor', true);

3
admin/language/en-GB/en-GB.com_sermondistributor.ini
View File

@ -133,6 +133,7 @@ COM_SERMONDISTRIBUTOR_CONFIG_GLOBAL_LABEL="Global"
COM_SERMONDISTRIBUTOR_CONFIG_GRADIANT_LOAD="Gradient"
COM_SERMONDISTRIBUTOR_CONFIG_GREEN="Green"
COM_SERMONDISTRIBUTOR_CONFIG_GRID="Grid"
COM_SERMONDISTRIBUTOR_CONFIG_HTML_FIVE_BASIC="HTML 5 (basic)"
COM_SERMONDISTRIBUTOR_CONFIG_JPLAYER="jPlayer"
COM_SERMONDISTRIBUTOR_CONFIG_LEGACY="Legacy"
COM_SERMONDISTRIBUTOR_CONFIG_LINES="Lines"
@ -896,6 +897,7 @@ COM_SERMONDISTRIBUTOR_NO_ID_FOUND_CAN_NOT_RESET_THE_UPDATE_STATUS="No id found,
COM_SERMONDISTRIBUTOR_NO_MANUAL_UPDATES_AVAILABLE="No Manual Updates Available"
COM_SERMONDISTRIBUTOR_NUMBER_OF_FILES_LISTED="Number of Files Listed"
COM_SERMONDISTRIBUTOR_OPENED_BY="opened by"
COM_SERMONDISTRIBUTOR_PLEASE_ADD_FILES_TO_S="Please add files to (%s)"
COM_SERMONDISTRIBUTOR_PLEASE_CHECK_AGAIN_LATTER="Please check again latter."
COM_SERMONDISTRIBUTOR_PREACHER="Preacher"
COM_SERMONDISTRIBUTOR_PREACHERS="Preachers"
@ -1416,6 +1418,7 @@ COM_SERMONDISTRIBUTOR_THERE_IS_NO_TARGETS_SET_FOR_THIS_SOURCE_CAN_NOT_RESET_THE_
COM_SERMONDISTRIBUTOR_THERE_WAS_AN_ERROR_DURING_THE_LAST_UPDATE_ATTEMPT="There was an error during the last update attempt."
COM_SERMONDISTRIBUTOR_THE_EXTERNAL_SOURCE_COULD_NOT_BE_FOUND="The external source could not be found."
COM_SERMONDISTRIBUTOR_THE_FILES_LINKED_FROM_EXTERNAL_SOURCE="The Files Linked from External Source"
COM_SERMONDISTRIBUTOR_THE_LOCAL_LISTING_OF_THE_MANUAL_EXTERNAL_SOURCE_FOLDERS_IS_EMPTY="The local listing of the Manual External Source folder/s is empty."
COM_SERMONDISTRIBUTOR_THE_NOTICE_BOARD_IS_LOADING="The notice board is loading"
COM_SERMONDISTRIBUTOR_THE_README_IS_LOADING="The readme is loading"
COM_SERMONDISTRIBUTOR_THE_UPDATE_IS_RUNNING="The update is running."

4
admin/layouts/batchselection.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage batchselection.php

4
admin/layouts/external_source/build_option_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage build_option_fullwidth.php

4
admin/layouts/external_source/details_above.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_above.php

4
admin/layouts/external_source/details_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_fullwidth.php

4
admin/layouts/external_source/details_left.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_left.php

4
admin/layouts/external_source/details_right.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_right.php

4
admin/layouts/external_source/details_under.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_under.php

4
admin/layouts/external_source/publishing.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage publishing.php

4
admin/layouts/external_source/publlshing.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage publlshing.php

4
admin/layouts/help_document/details_above.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_above.php

4
admin/layouts/help_document/details_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_fullwidth.php

4
admin/layouts/help_document/details_left.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_left.php

4
admin/layouts/help_document/details_right.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_right.php

4
admin/layouts/help_document/details_under.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_under.php

4
admin/layouts/help_document/metadata.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage metadata.php

4
admin/layouts/help_document/publishing.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage publishing.php

4
admin/layouts/local_listing/details_above.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_above.php

4
admin/layouts/local_listing/details_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_fullwidth.php

4
admin/layouts/local_listing/details_left.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_left.php

4
admin/layouts/local_listing/details_right.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_right.php

4
admin/layouts/local_listing/publishing.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage publishing.php

4
admin/layouts/local_listing/publlshing.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage publlshing.php

4
admin/layouts/preacher/details_above.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_above.php

4
admin/layouts/preacher/details_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_fullwidth.php

4
admin/layouts/preacher/details_left.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_left.php

4
admin/layouts/preacher/details_right.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_right.php

4
admin/layouts/preacher/metadata.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage metadata.php

4
admin/layouts/preacher/publishing.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage publishing.php

4
admin/layouts/preacher/sermons_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage sermons_fullwidth.php

4
admin/layouts/series/details_above.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_above.php

4
admin/layouts/series/details_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_fullwidth.php

4
admin/layouts/series/details_left.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_left.php

4
admin/layouts/series/details_right.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_right.php

4
admin/layouts/series/metadata.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage metadata.php

4
admin/layouts/series/publishing.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage publishing.php

4
admin/layouts/series/sermons_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage sermons_fullwidth.php

4
admin/layouts/sermon/details_above.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_above.php

4
admin/layouts/sermon/details_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_fullwidth.php

4
admin/layouts/sermon/details_left.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_left.php

4
admin/layouts/sermon/details_right.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_right.php

4
admin/layouts/sermon/details_under.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_under.php

4
admin/layouts/sermon/files_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage files_fullwidth.php

4
admin/layouts/sermon/metadata.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage metadata.php

4
admin/layouts/sermon/publishing.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage publishing.php

4
admin/layouts/sermon/stastics_fullwidth.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage stastics_fullwidth.php

4
admin/layouts/statistic/details_above.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_above.php

4
admin/layouts/statistic/details_left.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_left.php

4
admin/layouts/statistic/details_right.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage details_right.php

4
admin/layouts/statistic/metadata.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage metadata.php

4
admin/layouts/statistic/publishing.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage publishing.php

16
admin/models/ajax.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage ajax.php
@ -44,13 +44,14 @@ class SermondistributorModelAjax extends JModelList
}
// Used in sermon
/**
* Check and if a vdm notice is new (per/user)
**/
public function isNew($notice)
{
// first get the file path
$path_filename = SermondistributorHelper::getFilePath('user', 'notice', JFactory::getUser()->username, '.md', JPATH_COMPONENT_ADMINISTRATOR);
$path_filename = SermondistributorHelper::getFilePath('user', 'notice', JFactory::getUser()->username, $fileType = '.md', JPATH_COMPONENT_ADMINISTRATOR);
// check if the file is set
if (($content = @file_get_contents($path_filename)) !== FALSE)
{
@ -68,7 +69,7 @@ class SermondistributorModelAjax extends JModelList
public function isRead($notice)
{
// first get the file path
$path_filename = SermondistributorHelper::getFilePath('user', 'notice', JFactory::getUser()->username, '.md', JPATH_COMPONENT_ADMINISTRATOR);
$path_filename = SermondistributorHelper::getFilePath('user', 'notice', JFactory::getUser()->username, $fileType = '.md', JPATH_COMPONENT_ADMINISTRATOR);
// set as read if not already set
if (($content = @file_get_contents($path_filename)) !== FALSE)
{
@ -90,12 +91,11 @@ class SermondistributorModelAjax extends JModelList
return true;
}
return false;
}
}
/**
* Auto Update Local Listing External
* The Queue to Update Local Listing of External Source
**/
public function autoUpdateLocalListingExternal($id, $target, $typeID)
public function theQueue($id, $target, $typeID)
{
if (1 == $typeID)
{

10
admin/models/external_source.php
View File

@ -10,9 +10,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 53 of this MVC
@build 27th November, 2016
@created 3rd November, 2016
@package Sermon Distributor
@subpackage external_source.php
@author Llewellyn van der Merwe <https://www.vdm.io/>
@ -1038,7 +1038,7 @@ class SermondistributorModelExternal_source extends JModelAdmin
foreach ($values as $key => $value)
{
// Do special action for access.
if ('access' == $key && strlen($value) > 0)
if ('access' === $key && strlen($value) > 0)
{
$this->table->$key = $value;
}
@ -1128,7 +1128,7 @@ class SermondistributorModelExternal_source extends JModelAdmin
}
// Alter the uniqe field for save as copy
if ($input->get('task') == 'save2copy')
if ($input->get('task') === 'save2copy')
{
// Automatic handling of other uniqe fields
$uniqeFields = $this->getUniqeFields();

14
admin/models/external_sources.php
View File

@ -10,9 +10,9 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@created 22nd October, 2015
@version @update number 53 of this MVC
@build 27th November, 2016
@created 3rd November, 2016
@package Sermon Distributor
@subpackage external_sources.php
@author Llewellyn van der Merwe <https://www.vdm.io/>
@ -181,7 +181,7 @@ class SermondistributorModelExternal_sources extends JModelList
public function selectionTranslation($value,$name)
{
// Array of externalsources language strings
if ($name == 'externalsources')
if ($name === 'externalsources')
{
$externalsourcesArray = array(
0 => 'COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SELECT_AN_OPTION',
@ -194,7 +194,7 @@ class SermondistributorModelExternal_sources extends JModelList
}
}
// Array of update_method language strings
if ($name == 'update_method')
if ($name === 'update_method')
{
$update_methodArray = array(
1 => 'COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_MANUAL',
@ -207,7 +207,7 @@ class SermondistributorModelExternal_sources extends JModelList
}
}
// Array of filetypes language strings
if ($name == 'filetypes')
if ($name === 'filetypes')
{
$filetypesArray = array(
'.mp3' => 'COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_MPTHREE',
@ -246,7 +246,7 @@ class SermondistributorModelExternal_sources extends JModelList
}
}
// Array of build language strings
if ($name == 'build')
if ($name === 'build')
{
$buildArray = array(
0 => 'COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SELECT_AN_OPTION',

11
admin/models/fields/adminviewfolderlist.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage adminviewfolderlist.php
@ -61,7 +61,8 @@ class JFormFieldAdminviewfolderlist extends JFormFieldList
$script = array();
$buttonName = $this->getAttribute('name');
// get the input from url
$jinput = JFactory::getApplication()->input;
$app = JFactory::getApplication();
$jinput = $app->input;
// get the view name & id
$values = $jinput->getArray(array(
'id' => 'int',
@ -78,7 +79,7 @@ class JFormFieldAdminviewfolderlist extends JFormFieldList
}
$user = JFactory::getUser();
// only add if user allowed to create
if ($user->authorise('core.create', 'com_sermondistributor'))
if ($user->authorise('core.create', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area.
{
// build Create button
$buttonNamee = trim($buttonName);
@ -91,7 +92,7 @@ class JFormFieldAdminviewfolderlist extends JFormFieldList
<span class="icon-new icon-white"></span></a>';
}
// only add if user allowed to edit
if (($buttonName == '' || $buttonName == '') && $user->authorise('core.edit', 'com_sermondistributor'))
if (($buttonName === '' || $buttonName === '') && $user->authorise('core.edit', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area.
{
// build edit button
$buttonNamee = trim($buttonName);

11
admin/models/fields/articles.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage articles.php
@ -61,7 +61,8 @@ class JFormFieldArticles extends JFormFieldList
$script = array();
$buttonName = $this->getAttribute('name');
// get the input from url
$jinput = JFactory::getApplication()->input;
$app = JFactory::getApplication();
$jinput = $app->input;
// get the view name & id
$values = $jinput->getArray(array(
'id' => 'int',
@ -78,7 +79,7 @@ class JFormFieldArticles extends JFormFieldList
}
$user = JFactory::getUser();
// only add if user allowed to create article
if ($user->authorise('core.create', 'com_sermondistributor'))
if ($user->authorise('core.create', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area.
{
// build Create button
$buttonNamee = trim($buttonName);
@ -91,7 +92,7 @@ class JFormFieldArticles extends JFormFieldList
<span class="icon-new icon-white"></span></a>';
}
// only add if user allowed to edit article
if (($buttonName == 'article' || $buttonName == 'articles') && $user->authorise('core.edit', 'com_sermondistributor'))
if (($buttonName === 'article' || $buttonName === 'articles') && $user->authorise('core.edit', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area.
{
// build edit button
$buttonNamee = trim($buttonName);

11
admin/models/fields/externalsource.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 1.4.0
@build 4th December, 2016
@version 1.4.1
@build 17th February, 2017
@created 22nd October, 2015
@package Sermon Distributor
@subpackage externalsource.php
@ -61,7 +61,8 @@ class JFormFieldExternalsource extends JFormFieldList
$script = array();
$buttonName = $this->getAttribute('name');
// get the input from url
$jinput = JFactory::getApplication()->input;
$app = JFactory::getApplication();
$jinput = $app->input;
// get the view name & id
$values = $jinput->getArray(array(
'id' => 'int',
@ -78,7 +79,7 @@ class JFormFieldExternalsource extends JFormFieldList
}
$user = JFactory::getUser();
// only add if user allowed to create external_source
if ($user->authorise('external_source.create', 'com_sermondistributor'))
if ($user->authorise('external_source.create', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area.
{
// build Create button
$buttonNamee = trim($buttonName);
@ -91,7 +92,7 @@ class JFormFieldExternalsource extends JFormFieldList
<span class="icon-new icon-white"></span></a>';
}
// only add if user allowed to edit external_source
if (($buttonName == 'external_source' || $buttonName == 'external_sources') && $user->authorise('external_source.edit', 'com_sermondistributor'))
if (($buttonName === 'external_source' || $buttonName === 'external_sources') && $user->authorise('external_source.edit', 'com_sermondistributor') && $app->isAdmin()) // TODO for now only in admin area.
{
// build edit button
$buttonNamee = trim($buttonName);

Some files were not shown because too many files have changed in this diff Show More