diff --git a/README.md b/README.md index 508cafba..8b23a680 100644 --- a/README.md +++ b/README.md @@ -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) + *Name*: [Sermon Distributor](https://www.vdm.io/) + *First Build*: 22nd October, 2015 -+ *Last Build*: 21st August, 2017 ++ *Last Build*: 24th August, 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 @@ -36,19 +36,19 @@ 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*: **63324** -+ *File count*: **441** ++ *Line count*: **63481** ++ *File count*: **443** + *Folder count*: **90** -**116 Hours** or **15 Eight Hour Days** (the actual time the author spent) +**117 Hours** or **15 Eight Hour Days** (the actual time the author spent) > (with the following break down: > **debugging @44hours** = codingtime / 4; > **planning @25hours** = codingtime / 7; > **mapping @18hours** = codingtime / 10; -> **office @29hours** = codingtime / 6;) +> **office @30hours** = codingtime / 6;) -**293 Hours** or **37 Eight Hour Days** +**294 Hours** or **37 Eight Hour Days** (a total of the realistic time frame for this project) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, diff --git a/admin/README.txt b/admin/README.txt index 508cafba..8b23a680 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -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) + *Name*: [Sermon Distributor](https://www.vdm.io/) + *First Build*: 22nd October, 2015 -+ *Last Build*: 21st August, 2017 ++ *Last Build*: 24th August, 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 @@ -36,19 +36,19 @@ 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*: **63324** -+ *File count*: **441** ++ *Line count*: **63481** ++ *File count*: **443** + *Folder count*: **90** -**116 Hours** or **15 Eight Hour Days** (the actual time the author spent) +**117 Hours** or **15 Eight Hour Days** (the actual time the author spent) > (with the following break down: > **debugging @44hours** = codingtime / 4; > **planning @25hours** = codingtime / 7; > **mapping @18hours** = codingtime / 10; -> **office @29hours** = codingtime / 6;) +> **office @30hours** = codingtime / 6;) -**293 Hours** or **37 Eight Hour Days** +**294 Hours** or **37 Eight Hour Days** (a total of the realistic time frame for this project) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 51e1b3c3..2d67580b 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage admin.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index c228b636..be0403d0 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage dashboard.css diff --git a/admin/assets/css/sermon.css b/admin/assets/css/sermon.css index e0b72d9f..dc0f062e 100644 --- a/admin/assets/css/sermon.css +++ b/admin/assets/css/sermon.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.css diff --git a/admin/assets/css/sermons.css b/admin/assets/css/sermons.css index 5b30a075..dd677c29 100644 --- a/admin/assets/css/sermons.css +++ b/admin/assets/css/sermons.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons.css diff --git a/admin/controller.php b/admin/controller.php index efeb044d..37e7e5aa 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage controller.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index a8ad1756..61681751 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage ajax.json.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 08646123..baaf5d66 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage help.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index d1ce1490..e3b20c47 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage import.php diff --git a/admin/controllers/sermon.php b/admin/controllers/sermon.php index 89d481f5..1ac4ee35 100644 --- a/admin/controllers/sermon.php +++ b/admin/controllers/sermon.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php diff --git a/admin/controllers/sermondistributor.php b/admin/controllers/sermondistributor.php index b915d276..7ae80a4a 100644 --- a/admin/controllers/sermondistributor.php +++ b/admin/controllers/sermondistributor.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php diff --git a/admin/controllers/sermons.php b/admin/controllers/sermons.php index dcc3dfe4..2372a889 100644 --- a/admin/controllers/sermons.php +++ b/admin/controllers/sermons.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons.php diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index 89a94d87..4b35e9b0 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 2fdf6884..acb82d8c 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage batch_.php diff --git a/admin/helpers/sermondistributor.php b/admin/helpers/sermondistributor.php index 5ba19074..4cb74a00 100644 --- a/admin/helpers/sermondistributor.php +++ b/admin/helpers/sermondistributor.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php @@ -69,6 +69,11 @@ abstract class SermondistributorHelper } } + /** + * The global params + **/ + protected static $params = false; + /** * The external source links auto **/ @@ -89,21 +94,6 @@ abstract class SermondistributorHelper **/ protected static $select_externalsource_manual; - /** - * The user notice info File Name - **/ - protected static $usernotice = false; - - /** - * The update error info File Name - **/ - protected static $updateerror = false; - - /** - * The update last File path - **/ - protected static $updatelast = false; - /** * The update errors **/ @@ -339,7 +329,7 @@ abstract class SermondistributorHelper // get actual update values $updates = self::getExternalListingUpdateKeys(); // get last update - $updatePath = self::getFilePath('update', 'last', 'vDm', '.txt', JPATH_COMPONENT_ADMINISTRATOR); + $updatePath = self::getFilePath('path', 'updatelast', 'txt', 'vDm', JPATH_COMPONENT_ADMINISTRATOR); if (($lastUpdate = @file_get_contents($updatePath)) !== FALSE && self::checkArray($updates)) { // now check what is next @@ -364,6 +354,71 @@ abstract class SermondistributorHelper } return false; } + + /** + * Get the file path or url + * + * @param string $type The (url/path) type to return + * @param string $target The Params Target name (if set) + * @param string $fileType The kind of filename to generate (if not set no file name is generated) + * @param string $key The key to adjust the filename (if not set ignored) + * @param string $default The default path if not set in Params (fallback path) + * @param bool $createIfNotSet The switch to create the folder if not found + * + * @return string On success the path or url is returned based on the type requested + * + */ + public static function getFilePath($type = 'path', $target = 'filepath', $fileType = null, $key = '', $default = JPATH_SITE . '/images/', $createIfNotSet = true) + { + // get the global settings + if (!self::checkObject(self::$params)) + { + self::$params = JComponentHelper::getParams('com_sermondistributor'); + } + $filePath = self::$params->get($target, $default); + // check the file path (revert to default only of not a hidden file path) + if ('hiddenfilepath' !== $target && strpos($filePath, JPATH_SITE) === false) + { + $filePath = JPATH_SITE . '/images/'; + } + jimport('joomla.filesystem.folder'); + // create the folder if it does not exist + if ($createIfNotSet && !JFolder::exists($filePath)) + { + JFolder::create($filePath); + } + // setup the file name + $fileName = ''; + if (self::checkString($fileType)) + { + // Get basic key + $basickey = 'Th!s_iS_n0t_sAfe_buT_b3tter_then_n0thiug'; + if (method_exists(get_called_class(), "getCryptKey")) + { + $basickey = self::getCryptKey('basic', $basickey); + } + // check the key + if (self::checkString($key)) + { + $key = 'vDm'; + } + // set the name + $fileName = trim(md5($type.$target.$basickey.$key) . '.' . trim($fileType, '.')); + } + // return the url + if ($type === 'url') + { + if (strpos($filePath, JPATH_SITE) !== false) + { + $filePath = trim( str_replace( JPATH_SITE, '', $filePath), '/'); + return JURI::root() . $filePath . '/' . $fileName; + } + // since the path is behind the root folder of the site, return only the root url (may be used to build the link) + return JURI::root(); + } + // sanitize the path + return '/' . trim( $filePath, '/' ) . '/' . $fileName; + } protected static function saveFile($data,$path_filename) { @@ -624,31 +679,6 @@ abstract class SermondistributorHelper } return false; } - - public static function getFilePath($type, $name = 'listing', $key = 'vDm', $fileType = '.json', $PATH = JPATH_COMPONENT_SITE) - { - if (!isset(self::${$type.$name}[$key]) || !self::checkString(self::${$type.$name}[$key])) - { - // Get local key - $localkey = self::getLocalKey(); - // check the key - $keyMD5 = ''; - if ('vDm' != $key) - { - $keyMD5 = $key; - } - // set the name - $fileName = md5($type.$name.$localkey.$keyMD5); - // set file path - self::${$type.$name}[$key] = $PATH.'/helpers/'.$fileName.$fileType; - } - if (isset(self::${$type.$name}[$key]) && self::checkString(self::${$type.$name}[$key])) - { - // return the path - return self::${$type.$name}[$key]; - } - return ''; - } /** * get the localkey @@ -774,7 +804,7 @@ abstract class SermondistributorHelper // get update error from file if ($fileKey) { - $file_path = self::getFilePath('update', 'error', $fileKey, '.txt', JPATH_COMPONENT_ADMINISTRATOR); + $file_path = self::getFilePath('path', 'updateerror', 'txt', $fileKey, JPATH_COMPONENT_ADMINISTRATOR); // check if it is set if (($text = @file_get_contents($file_path)) !== FALSE) { diff --git a/admin/language/en-GB/en-GB.com_sermondistributor.ini b/admin/language/en-GB/en-GB.com_sermondistributor.ini index 3e94b753..f8e6e8ea 100644 --- a/admin/language/en-GB/en-GB.com_sermondistributor.ini +++ b/admin/language/en-GB/en-GB.com_sermondistributor.ini @@ -340,6 +340,7 @@ COM_SERMONDISTRIBUTOR_DASHBOARD_SERMONS_CATID="Category  For
Sermons" COM_SERMONDISTRIBUTOR_DASHBOARD_SERMON_ADD="Add Sermon

" COM_SERMONDISTRIBUTOR_DASHBOARD_STATISTICS="Statistics

" COM_SERMONDISTRIBUTOR_DATE="Date" +COM_SERMONDISTRIBUTOR_DOWNLOAD="download" COM_SERMONDISTRIBUTOR_DOWNLOAD_NAME="Download Name" COM_SERMONDISTRIBUTOR_EDIT_CREATED_BY="Edit Created By" COM_SERMONDISTRIBUTOR_EDIT_CREATED_BY_DESC=" Allows users in this group to edit created by." @@ -763,10 +764,13 @@ COM_SERMONDISTRIBUTOR_IMPORT_TITLE="Data Importer" COM_SERMONDISTRIBUTOR_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE="Package to import not found." COM_SERMONDISTRIBUTOR_IMPORT_UPDATE_DATA="Import Data" COM_SERMONDISTRIBUTOR_IMPORT_UPLOAD_BOTTON="Upload File" +COM_SERMONDISTRIBUTOR_ISSUE="issue" COM_SERMONDISTRIBUTOR_KEEP_ORIGINAL_ACCESS="- Keep Original Access -" COM_SERMONDISTRIBUTOR_KEEP_ORIGINAL_CATEGORY="- Keep Original Category -" COM_SERMONDISTRIBUTOR_KEEP_ORIGINAL_STATE="- Keep Original State -" +COM_SERMONDISTRIBUTOR_LAST_FEW_RELEASES_FROM_GITHUB_IS_LOADING="Last few releases from Github is loading" COM_SERMONDISTRIBUTOR_LAST_UPDATE="Last Update" +COM_SERMONDISTRIBUTOR_LATEST_RELEASE="Latest Release" COM_SERMONDISTRIBUTOR_LICENSE="License" COM_SERMONDISTRIBUTOR_LISTING_INFO="Listing Info" COM_SERMONDISTRIBUTOR_LOCAL_LISTING="Local Listing" @@ -896,7 +900,12 @@ COM_SERMONDISTRIBUTOR_NO_FILES_LINKED_YET="No Files Linked Yet" COM_SERMONDISTRIBUTOR_NO_ID_FOUND_CAN_NOT_RESET_THE_UPDATE_STATUS="No id found, can not reset the update status!" 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_ON_GITHUB="on Github" +COM_SERMONDISTRIBUTOR_OPEN="Open" +COM_SERMONDISTRIBUTOR_OPENED="opened" +COM_SERMONDISTRIBUTOR_OPENED_THIS="opened this" +COM_SERMONDISTRIBUTOR_OPEN_ON_GITHUB="Open on Github" +COM_SERMONDISTRIBUTOR_OUT_OF_DATE="Out of date" 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" @@ -993,6 +1002,7 @@ COM_SERMONDISTRIBUTOR_PREACHER_WEBSITE="Website" COM_SERMONDISTRIBUTOR_PREACHER_WEBSITE_DESCRIPTION="Enter website address" COM_SERMONDISTRIBUTOR_PREACHER_WEBSITE_HINT="http://www.example.com" COM_SERMONDISTRIBUTOR_PREACHER_WEBSITE_LABEL="Website" +COM_SERMONDISTRIBUTOR_RELEASED_THIS="released this" COM_SERMONDISTRIBUTOR_RESETTING_THE_UPDATE_STATUS_WAS_SUCCESSFUL="Resetting the update status was successful!" COM_SERMONDISTRIBUTOR_RESET_UPDATE_STATUS="Reset Update Status" COM_SERMONDISTRIBUTOR_RESET_UPDATE_STATUS_CAN_NOT_BE_DONE="Reset update status can not be done." @@ -1422,13 +1432,16 @@ COM_SERMONDISTRIBUTOR_THE_README_IS_LOADING="The readme is loading" COM_SERMONDISTRIBUTOR_THE_UPDATE_IS_RUNNING="The update is running." COM_SERMONDISTRIBUTOR_THE_WIKI_IS_LOADING="The wiki is loading" COM_SERMONDISTRIBUTOR_THIS_SOURCE_HAS_NO_LOCAL_LISTING_SET="This source has no local listing set." +COM_SERMONDISTRIBUTOR_TOTAL_DOWNLOADS="total downloads" COM_SERMONDISTRIBUTOR_UNKNOWN_ERROR_HAS_OCCURRED="Unknown error has occurred." COM_SERMONDISTRIBUTOR_UPDATE_LOCAL_LINKS_OF_TARGET_S_EXTERNAL_SOURCE="Update Local Links of (target %s) External Source" +COM_SERMONDISTRIBUTOR_UP_TO_DATE="Up to date" COM_SERMONDISTRIBUTOR_USE_BATCH="Use Batch" COM_SERMONDISTRIBUTOR_USE_BATCH_DESC=" Allows users in this group to use batch copy/update method." COM_SERMONDISTRIBUTOR_VERSION="Version" COM_SERMONDISTRIBUTOR_VIEW_ERROR="View Error!" COM_SERMONDISTRIBUTOR_VIEW_MORE_ISSUES_ON_GITHUB="View more issues on Github" +COM_SERMONDISTRIBUTOR_VIEW_MORE_RELEASES_ON_GITHUB="View more releases on Github" COM_SERMONDISTRIBUTOR_VIEW_UPDATE_STATUS="View Update Status" COM_SERMONDISTRIBUTOR_WEBSITE="Website" COM_SERMONDISTRIBUTOR_YOU_DO_NOT_HAVE_PERMISSION_TO_CLEAR_LOCAL_LISTING="You do not have permission to clear local listing." diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 38c825b8..69b1923e 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage batchselection.php diff --git a/admin/layouts/external_source/build_option_fullwidth.php b/admin/layouts/external_source/build_option_fullwidth.php index c3865eb6..d08ce6fc 100644 --- a/admin/layouts/external_source/build_option_fullwidth.php +++ b/admin/layouts/external_source/build_option_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage build_option_fullwidth.php diff --git a/admin/layouts/external_source/details_above.php b/admin/layouts/external_source/details_above.php index 754673d1..3142a11f 100644 --- a/admin/layouts/external_source/details_above.php +++ b/admin/layouts/external_source/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/external_source/details_fullwidth.php b/admin/layouts/external_source/details_fullwidth.php index 3a3766c4..83dd4c80 100644 --- a/admin/layouts/external_source/details_fullwidth.php +++ b/admin/layouts/external_source/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_fullwidth.php diff --git a/admin/layouts/external_source/details_left.php b/admin/layouts/external_source/details_left.php index 25f0c325..861419e5 100644 --- a/admin/layouts/external_source/details_left.php +++ b/admin/layouts/external_source/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/external_source/details_right.php b/admin/layouts/external_source/details_right.php index e76ba514..975d1d97 100644 --- a/admin/layouts/external_source/details_right.php +++ b/admin/layouts/external_source/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/external_source/details_under.php b/admin/layouts/external_source/details_under.php index f208c804..7fff0692 100644 --- a/admin/layouts/external_source/details_under.php +++ b/admin/layouts/external_source/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_under.php diff --git a/admin/layouts/external_source/publishing.php b/admin/layouts/external_source/publishing.php index a895506a..0b7d3437 100644 --- a/admin/layouts/external_source/publishing.php +++ b/admin/layouts/external_source/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/layouts/external_source/publlshing.php b/admin/layouts/external_source/publlshing.php index c36ef3cb..13aa6675 100644 --- a/admin/layouts/external_source/publlshing.php +++ b/admin/layouts/external_source/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index db498dd0..9d67a49f 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index f40ee7eb..4d4fc25a 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index f0e8b9b5..4d20b3ac 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index b5727bae..492ab01d 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index f208c804..7fff0692 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_under.php diff --git a/admin/layouts/help_document/metadata.php b/admin/layouts/help_document/metadata.php index 6d251315..6798cee2 100644 --- a/admin/layouts/help_document/metadata.php +++ b/admin/layouts/help_document/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage metadata.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index b4be8ef0..7380fb91 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/layouts/local_listing/details_above.php b/admin/layouts/local_listing/details_above.php index cb2822e1..86e3d972 100644 --- a/admin/layouts/local_listing/details_above.php +++ b/admin/layouts/local_listing/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/local_listing/details_fullwidth.php b/admin/layouts/local_listing/details_fullwidth.php index c9b9253b..30022a6c 100644 --- a/admin/layouts/local_listing/details_fullwidth.php +++ b/admin/layouts/local_listing/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_fullwidth.php diff --git a/admin/layouts/local_listing/details_left.php b/admin/layouts/local_listing/details_left.php index ee802832..0da11d1d 100644 --- a/admin/layouts/local_listing/details_left.php +++ b/admin/layouts/local_listing/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/local_listing/details_right.php b/admin/layouts/local_listing/details_right.php index 83d71a89..fb1c23a6 100644 --- a/admin/layouts/local_listing/details_right.php +++ b/admin/layouts/local_listing/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/local_listing/publishing.php b/admin/layouts/local_listing/publishing.php index a895506a..0b7d3437 100644 --- a/admin/layouts/local_listing/publishing.php +++ b/admin/layouts/local_listing/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/layouts/local_listing/publlshing.php b/admin/layouts/local_listing/publlshing.php index c36ef3cb..13aa6675 100644 --- a/admin/layouts/local_listing/publlshing.php +++ b/admin/layouts/local_listing/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage publlshing.php diff --git a/admin/layouts/preacher/details_above.php b/admin/layouts/preacher/details_above.php index 0dd90c9e..cd4a7034 100644 --- a/admin/layouts/preacher/details_above.php +++ b/admin/layouts/preacher/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/preacher/details_fullwidth.php b/admin/layouts/preacher/details_fullwidth.php index fdb4c74e..4474636b 100644 --- a/admin/layouts/preacher/details_fullwidth.php +++ b/admin/layouts/preacher/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_fullwidth.php diff --git a/admin/layouts/preacher/details_left.php b/admin/layouts/preacher/details_left.php index 920520c6..2de14a1e 100644 --- a/admin/layouts/preacher/details_left.php +++ b/admin/layouts/preacher/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/preacher/details_right.php b/admin/layouts/preacher/details_right.php index 69197291..5a0dbd71 100644 --- a/admin/layouts/preacher/details_right.php +++ b/admin/layouts/preacher/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/preacher/metadata.php b/admin/layouts/preacher/metadata.php index 6d251315..6798cee2 100644 --- a/admin/layouts/preacher/metadata.php +++ b/admin/layouts/preacher/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage metadata.php diff --git a/admin/layouts/preacher/publishing.php b/admin/layouts/preacher/publishing.php index b4be8ef0..7380fb91 100644 --- a/admin/layouts/preacher/publishing.php +++ b/admin/layouts/preacher/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/layouts/preacher/sermons_fullwidth.php b/admin/layouts/preacher/sermons_fullwidth.php index b86cf992..a789d696 100644 --- a/admin/layouts/preacher/sermons_fullwidth.php +++ b/admin/layouts/preacher/sermons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons_fullwidth.php diff --git a/admin/layouts/series/details_above.php b/admin/layouts/series/details_above.php index 0dd90c9e..cd4a7034 100644 --- a/admin/layouts/series/details_above.php +++ b/admin/layouts/series/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/series/details_fullwidth.php b/admin/layouts/series/details_fullwidth.php index fdb4c74e..4474636b 100644 --- a/admin/layouts/series/details_fullwidth.php +++ b/admin/layouts/series/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_fullwidth.php diff --git a/admin/layouts/series/details_left.php b/admin/layouts/series/details_left.php index 920520c6..2de14a1e 100644 --- a/admin/layouts/series/details_left.php +++ b/admin/layouts/series/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/series/details_right.php b/admin/layouts/series/details_right.php index 800225c4..2e59a4af 100644 --- a/admin/layouts/series/details_right.php +++ b/admin/layouts/series/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/series/metadata.php b/admin/layouts/series/metadata.php index 6d251315..6798cee2 100644 --- a/admin/layouts/series/metadata.php +++ b/admin/layouts/series/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage metadata.php diff --git a/admin/layouts/series/publishing.php b/admin/layouts/series/publishing.php index b4be8ef0..7380fb91 100644 --- a/admin/layouts/series/publishing.php +++ b/admin/layouts/series/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/layouts/series/sermons_fullwidth.php b/admin/layouts/series/sermons_fullwidth.php index 77200fcb..edfaf617 100644 --- a/admin/layouts/series/sermons_fullwidth.php +++ b/admin/layouts/series/sermons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons_fullwidth.php diff --git a/admin/layouts/sermon/details_above.php b/admin/layouts/sermon/details_above.php index f2c48841..af0195a3 100644 --- a/admin/layouts/sermon/details_above.php +++ b/admin/layouts/sermon/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/sermon/details_fullwidth.php b/admin/layouts/sermon/details_fullwidth.php index fdb4c74e..4474636b 100644 --- a/admin/layouts/sermon/details_fullwidth.php +++ b/admin/layouts/sermon/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_fullwidth.php diff --git a/admin/layouts/sermon/details_left.php b/admin/layouts/sermon/details_left.php index 9592ac9c..cb1d1abd 100644 --- a/admin/layouts/sermon/details_left.php +++ b/admin/layouts/sermon/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/sermon/details_right.php b/admin/layouts/sermon/details_right.php index 6da23d20..dedcac22 100644 --- a/admin/layouts/sermon/details_right.php +++ b/admin/layouts/sermon/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/sermon/details_under.php b/admin/layouts/sermon/details_under.php index e86f7f9f..ca575367 100644 --- a/admin/layouts/sermon/details_under.php +++ b/admin/layouts/sermon/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_under.php diff --git a/admin/layouts/sermon/files_fullwidth.php b/admin/layouts/sermon/files_fullwidth.php index 92a1a343..13a9aa36 100644 --- a/admin/layouts/sermon/files_fullwidth.php +++ b/admin/layouts/sermon/files_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage files_fullwidth.php diff --git a/admin/layouts/sermon/metadata.php b/admin/layouts/sermon/metadata.php index 6d251315..6798cee2 100644 --- a/admin/layouts/sermon/metadata.php +++ b/admin/layouts/sermon/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage metadata.php diff --git a/admin/layouts/sermon/publishing.php b/admin/layouts/sermon/publishing.php index b4be8ef0..7380fb91 100644 --- a/admin/layouts/sermon/publishing.php +++ b/admin/layouts/sermon/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/layouts/sermon/stastics_fullwidth.php b/admin/layouts/sermon/stastics_fullwidth.php index 71e06a10..f21f5a3a 100644 --- a/admin/layouts/sermon/stastics_fullwidth.php +++ b/admin/layouts/sermon/stastics_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage stastics_fullwidth.php diff --git a/admin/layouts/statistic/details_above.php b/admin/layouts/statistic/details_above.php index 347199b6..9afa42ff 100644 --- a/admin/layouts/statistic/details_above.php +++ b/admin/layouts/statistic/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/statistic/details_left.php b/admin/layouts/statistic/details_left.php index 9b81cec9..deeb0165 100644 --- a/admin/layouts/statistic/details_left.php +++ b/admin/layouts/statistic/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/statistic/details_right.php b/admin/layouts/statistic/details_right.php index 5de305b2..fe161f03 100644 --- a/admin/layouts/statistic/details_right.php +++ b/admin/layouts/statistic/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/statistic/metadata.php b/admin/layouts/statistic/metadata.php index 6d251315..6798cee2 100644 --- a/admin/layouts/statistic/metadata.php +++ b/admin/layouts/statistic/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage metadata.php diff --git a/admin/layouts/statistic/publishing.php b/admin/layouts/statistic/publishing.php index b4be8ef0..7380fb91 100644 --- a/admin/layouts/statistic/publishing.php +++ b/admin/layouts/statistic/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 6575e0e8..a0bf4963 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage ajax.php @@ -51,7 +51,7 @@ class SermondistributorModelAjax extends JModelList public function isNew($notice) { // first get the file path - $path_filename = SermondistributorHelper::getFilePath('user', 'notice', JFactory::getUser()->username, $fileType = '.md', JPATH_COMPONENT_ADMINISTRATOR); + $path_filename = SermondistributorHelper::getFilePath('path', 'usernotice', 'md', JFactory::getUser()->username, JPATH_COMPONENT_ADMINISTRATOR); // check if the file is set if (($content = @file_get_contents($path_filename)) !== FALSE) { @@ -69,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, $fileType = '.md', JPATH_COMPONENT_ADMINISTRATOR); + $path_filename = SermondistributorHelper::getFilePath('path', 'usernotice', 'md', JFactory::getUser()->username, JPATH_COMPONENT_ADMINISTRATOR); // set as read if not already set if (($content = @file_get_contents($path_filename)) !== FALSE) { diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 8a24e8d0..1c835c20 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 86e46699..9226cc06 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage articles.php diff --git a/admin/models/fields/externalsource.php b/admin/models/fields/externalsource.php index 76d85dce..cbfc4c22 100644 --- a/admin/models/fields/externalsource.php +++ b/admin/models/fields/externalsource.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage externalsource.php diff --git a/admin/models/fields/externalsourcefiles.php b/admin/models/fields/externalsourcefiles.php index 69c19deb..080a6ce8 100644 --- a/admin/models/fields/externalsourcefiles.php +++ b/admin/models/fields/externalsourcefiles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage externalsourcefiles.php diff --git a/admin/models/fields/localfiles.php b/admin/models/fields/localfiles.php index 7b931280..9fa69a26 100644 --- a/admin/models/fields/localfiles.php +++ b/admin/models/fields/localfiles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage localfiles.php diff --git a/admin/models/fields/preachers.php b/admin/models/fields/preachers.php index 3c4948f3..360a6877 100644 --- a/admin/models/fields/preachers.php +++ b/admin/models/fields/preachers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.php diff --git a/admin/models/fields/series.php b/admin/models/fields/series.php index e585bf92..313711ec 100644 --- a/admin/models/fields/series.php +++ b/admin/models/fields/series.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php diff --git a/admin/models/fields/sermon.php b/admin/models/fields/sermon.php index d6589790..0456be79 100644 --- a/admin/models/fields/sermon.php +++ b/admin/models/fields/sermon.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index 2be1ac20..550d4877 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage siteviewfolderlist.php diff --git a/admin/models/forms/sermon.js b/admin/models/forms/sermon.js index e00ed430..2b8024c7 100644 --- a/admin/models/forms/sermon.js +++ b/admin/models/forms/sermon.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.js diff --git a/admin/models/forms/sermon.xml b/admin/models/forms/sermon.xml index f0a97983..115239cb 100644 --- a/admin/models/forms/sermon.xml +++ b/admin/models/forms/sermon.xml @@ -205,36 +205,13 @@ - + + + - - - - + + - + - - - - - - - - - - - - - - COM_SERMONDISTRIBUTOR_SERMON_DYNAMIC_AUTOMATIC_BUILD - + + + + + + + + + + + + + + + diff --git a/admin/models/import.php b/admin/models/import.php index d47817dd..2f0227d9 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage import.php diff --git a/admin/models/sermon.php b/admin/models/sermon.php index 35d1ef64..1f452140 100644 --- a/admin/models/sermon.php +++ b/admin/models/sermon.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php diff --git a/admin/models/sermondistributor.php b/admin/models/sermondistributor.php index 1ed34657..ee0bad0f 100644 --- a/admin/models/sermondistributor.php +++ b/admin/models/sermondistributor.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php @@ -249,97 +249,88 @@ class SermondistributorModelSermondistributor extends JModelList return $icons; } + public function getGithub() { + // load jquery (not sure why... but else the timeago breaks) + JHtml::_('jquery.framework'); + // get the document to load the scripts $document = JFactory::getDocument(); - $document->addScript(JURI::root() . "media/com_sermondistributor/js/marked.js"); + $document->addScript(JURI::root() . "media/com_sermondistributor/js/timeago.js"); $document->addScriptDeclaration(' - var token = "'.JSession::getFormToken().'"; var urlToGetAllOpenIssues = "https://api.github.com/repos/SermonDistributor/Joomla-3-Component/issues?state=open&page=1&per_page=5"; var urlToGetAllClosedIssues = "https://api.github.com/repos/SermonDistributor/Joomla-3-Component/issues?state=closed&page=1&per_page=5"; + var urlToGetAllReleases = "https://api.github.com/repos/SermonDistributor/Joomla-3-Component/releases?page=1&per_page=5"; jQuery(document).ready(function () { jQuery.getJSON(urlToGetAllOpenIssues, function (openissues) { jQuery("#openissues").html(""); jQuery.each(openissues, function (i, issue) { + // set time ago + var timeago = jQuery.timeago(new Date(issue.created_at)); jQuery("#openissues") .append("

" + issue.title + "

") - .append("#" + issue.number + " '.JText::_('COM_SERMONDISTRIBUTOR_OPENED_BY').' " + issue.user.login + "") + .append("\"@" ") + .append("" + issue.user.login + " '.JText::_('COM_SERMONDISTRIBUTOR_OPENED_THIS').' '.JText::_('COM_SERMONDISTRIBUTOR_ISSUE').'-" + issue.number + " (" + timeago + ")") .append(marked(issue.body)) - .append("'.JText::_('COM_SERMONDISTRIBUTOR_RESPOND_TO_THIS_ISSUE_ON_GITHUB').'...
"); + .append("'.JText::_('COM_SERMONDISTRIBUTOR_RESPOND_TO_THIS_ISSUE_ON_GITHUB').'...
"); }); }); jQuery.getJSON(urlToGetAllClosedIssues, function (closedissues) { jQuery("#closedissues").html(""); jQuery.each(closedissues, function (i, issue) { + // set time ago + var timeago = jQuery.timeago(new Date(issue.created_at)); jQuery("#closedissues") .append("

" + issue.title + "

") - .append("#" + issue.number + " '.JText::_('COM_SERMONDISTRIBUTOR_OPENED_BY').' " + issue.user.login + "") + .append("\"@" ") + .append("" + issue.user.login + " '.JText::_('COM_SERMONDISTRIBUTOR_OPENED').' '.JText::_('COM_SERMONDISTRIBUTOR_ISSUE').'-" + issue.number + " (" + timeago + ")") .append(marked(issue.body)) - .append("'.JText::_('COM_SERMONDISTRIBUTOR_REVIEW_THIS_ISSUE_ON_GITHUB').'...
"); + .append("'.JText::_('COM_SERMONDISTRIBUTOR_REVIEW_THIS_ISSUE_ON_GITHUB').'...
"); }); }); - }); - // to check is READ/NEW - function getIS(type,notice){ - if(type == 1){ - var getUrl = "index.php?option=com_sermondistributor&task=ajax.isNew&format=json"; - } else if (type == 2) { - var getUrl = "index.php?option=com_sermondistributor&task=ajax.isRead&format=json"; - } - if(token.length > 0 && notice.length){ - var request = "token="+token+"¬ice="+notice; - } - return jQuery.ajax({ - type: "POST", - url: getUrl, - dataType: "jsonp", - data: request, - jsonp: "callback" - }); - } - - // nice little dot trick :) - jQuery(document).ready( function($) { - var x=0; - setInterval(function() { - var dots = ""; - x++; - for (var y=0; y < x%8; y++) { - dots+="."; + jQuery.getJSON(urlToGetAllReleases, function (tagreleases) { + // set the update notice while we are at it + var activeVersion = tagreleases[0].tag_name.substring(1); + if (activeVersion === manifest.version) { + jQuery(".update-notice").html("'.JText::_('COM_SERMONDISTRIBUTOR_UP_TO_DATE').'"); + } else { + jQuery(".update-notice").html("'.JText::_('COM_SERMONDISTRIBUTOR_OUT_OF_DATE').'"); } - $(".loading-dots").text(dots); - } , 500); + // set the taged releases + jQuery("#tagreleases").html(""); + jQuery.each(tagreleases, function (i, tagrelease) { + // set active release + var activeNotice = ""; + if (i === 0) { + var activeNotice = " '.JText::_('COM_SERMONDISTRIBUTOR_LATEST_RELEASE').'

"; + } + // set time ago + var timeago = jQuery.timeago(new Date(tagrelease.published_at)); + jQuery("#tagreleases") + .append("

" + tagrelease.name + "

") + .append(activeNotice) + .append("\"@" ") + .append("" + tagrelease.author.login + " '.JText::_('COM_SERMONDISTRIBUTOR_RELEASED_THIS').' " + tagrelease.tag_name+ " (" + timeago + ")") + .append(marked(tagrelease.body)) + .append(" " + tagrelease.assets[0].name + " (" + tagrelease.assets[0].download_count + ") ") + .append("| '.JText::_('COM_SERMONDISTRIBUTOR_OPEN_ON_GITHUB').'...
"); + }); + }); });'); $create = '
'.JText::_('COM_SERMONDISTRIBUTOR_NEW_ISSUE').'

'; - $moreopen = ''.JText::_('COM_SERMONDISTRIBUTOR_VIEW_MORE_ISSUES_ON_GITHUB').'...'; - $moreclosed = ''.JText::_('COM_SERMONDISTRIBUTOR_VIEW_MORE_ISSUES_ON_GITHUB').'...'; + $moreopen = ''.JText::_('COM_SERMONDISTRIBUTOR_VIEW_MORE_ISSUES_ON_GITHUB').'... '; + $moreclosed = ''.JText::_('COM_SERMONDISTRIBUTOR_VIEW_MORE_ISSUES_ON_GITHUB').'... '; + $viewissues = ''.JText::_('COM_SERMONDISTRIBUTOR_VIEW_MORE_RELEASES_ON_GITHUB').'... '; return (object) array( 'openissues' => $create.'
'.JText::_('COM_SERMONDISTRIBUTOR_A_FEW_OPEN_ISSUES_FROM_GITHUB_IS_LOADING').'..
'.$moreopen, - 'closedissues' => $create.'
'.JText::_('COM_SERMONDISTRIBUTOR_A_FEW_CLOSED_ISSUES_FROM_GITHUB_IS_LOADING').'..
'.$moreclosed + 'closedissues' => $create.'
'.JText::_('COM_SERMONDISTRIBUTOR_A_FEW_CLOSED_ISSUES_FROM_GITHUB_IS_LOADING').'..
'.$moreclosed, + 'tagreleases' => '
'.JText::_('COM_SERMONDISTRIBUTOR_LAST_FEW_RELEASES_FROM_GITHUB_IS_LOADING').'..
'.$viewissues ); - } - - public function getReadme() - { - $document = JFactory::getDocument(); - $document->addScriptDeclaration(' - var getreadme = "'. JURI::root() . 'administrator/components/com_sermondistributor/README.txt"; - jQuery(document).ready(function () { - jQuery.get(getreadme) - .success(function(readme) { - jQuery("#readme-md").html(marked(readme)); - }) - .error(function(jqXHR, textStatus, errorThrown) { - jQuery("#readme-md").html("'.JText::_('COM_SERMONDISTRIBUTOR_PLEASE_CHECK_AGAIN_LATTER').'"); - }); - });'); - - return '
'.JText::_('COM_SERMONDISTRIBUTOR_THE_README_IS_LOADING').'..
'; - } - + } + public function getWiki() { $document = JFactory::getDocument(); @@ -355,13 +346,18 @@ class SermondistributorModelSermondistributor extends JModelList }); });'); - return '
'.JText::_('COM_SERMONDISTRIBUTOR_THE_WIKI_IS_LOADING').'..
'; + return '
'.JText::_('COM_SERMONDISTRIBUTOR_THE_WIKI_IS_LOADING').'..
'; } + + public function getNoticeboard() { + // get the document to load the scripts $document = JFactory::getDocument(); + $document->addScript(JURI::root() . "media/com_sermondistributor/js/marked.js"); $document->addScriptDeclaration(' + var token = "'.JSession::getFormToken().'"; var noticeboard = "https://www.vdm.io/sermondistributor-noticeboard-md"; jQuery(document).ready(function () { jQuery.get(noticeboard) @@ -393,8 +389,56 @@ class SermondistributorModelSermondistributor extends JModelList .error(function(jqXHR, textStatus, errorThrown) { jQuery("#noticeboard-md").html("'.JText::_('COM_SERMONDISTRIBUTOR_ALL_IS_GOOD_PLEASE_CHECK_AGAIN_LATTER').'"); }); + }); + // to check is READ/NEW + function getIS(type,notice){ + if(type == 1){ + var getUrl = "index.php?option=com_sermondistributor&task=ajax.isNew&format=json"; + } else if (type == 2) { + var getUrl = "index.php?option=com_sermondistributor&task=ajax.isRead&format=json"; + } + if(token.length > 0 && notice.length){ + var request = "token="+token+"¬ice="+notice; + } + return jQuery.ajax({ + type: "POST", + url: getUrl, + dataType: "jsonp", + data: request, + jsonp: "callback" + }); + } + // nice little dot trick :) + jQuery(document).ready( function($) { + var x=0; + setInterval(function() { + var dots = ""; + x++; + for (var y=0; y < x%8; y++) { + dots+="."; + } + $(".loading-dots").text(dots); + } , 500); });'); return '
'.JText::_('COM_SERMONDISTRIBUTOR_THE_NOTICE_BOARD_IS_LOADING').'..
'; - } + } + + public function getReadme() + { + $document = JFactory::getDocument(); + $document->addScriptDeclaration(' + var getreadme = "'. JURI::root() . 'administrator/components/com_sermondistributor/README.txt"; + jQuery(document).ready(function () { + jQuery.get(getreadme) + .success(function(readme) { + jQuery("#readme-md").html(marked(readme)); + }) + .error(function(jqXHR, textStatus, errorThrown) { + jQuery("#readme-md").html("'.JText::_('COM_SERMONDISTRIBUTOR_PLEASE_CHECK_AGAIN_LATTER').'"); + }); + });'); + + return '
'.JText::_('COM_SERMONDISTRIBUTOR_THE_README_IS_LOADING').'..
'; + } } diff --git a/admin/models/sermons.php b/admin/models/sermons.php index 7f80d29c..7e7e8b8e 100644 --- a/admin/models/sermons.php +++ b/admin/models/sermons.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons.php diff --git a/admin/sermondistributor.php b/admin/sermondistributor.php index dfce2e53..b3318150 100644 --- a/admin/sermondistributor.php +++ b/admin/sermondistributor.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 1e65e191..1f461eaa 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -78,8 +78,8 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_sermon` ( KEY `idx_series` (`series`), KEY `idx_catid` (`catid`), KEY `idx_link_type` (`link_type`), - KEY `idx_alias` (`alias`), - KEY `idx_build` (`build`) + KEY `idx_build` (`build`), + KEY `idx_alias` (`alias`) ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__sermondistributor_series` ( diff --git a/admin/tables/sermon.php b/admin/tables/sermon.php index 03bf9e39..dfb007cc 100644 --- a/admin/tables/sermon.php +++ b/admin/tables/sermon.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index 12ca7fc8..012ad68b 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index c0fc1518..203e2d94 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/admin/views/sermon/submitbutton.js b/admin/views/sermon/submitbutton.js index 06cd1b81..efca6daa 100644 --- a/admin/views/sermon/submitbutton.js +++ b/admin/views/sermon/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage submitbutton.js diff --git a/admin/views/sermon/tmpl/edit.php b/admin/views/sermon/tmpl/edit.php index 48638656..252a53af 100644 --- a/admin/views/sermon/tmpl/edit.php +++ b/admin/views/sermon/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage edit.php diff --git a/admin/views/sermon/view.html.php b/admin/views/sermon/view.html.php index e75222ed..5ad06cee 100644 --- a/admin/views/sermon/view.html.php +++ b/admin/views/sermon/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/admin/views/sermondistributor/tmpl/default.php b/admin/views/sermondistributor/tmpl/default.php index bde103f4..b61b399f 100644 --- a/admin/views/sermondistributor/tmpl/default.php +++ b/admin/views/sermondistributor/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php @@ -76,12 +76,12 @@ JHtml::_('behavior.tooltip'); - +
- 'one')); ?> - - loadTemplate('readme_information');?> + 'one')); ?> + + loadTemplate('releases_information');?>
@@ -100,6 +100,18 @@ JHtml::_('behavior.tooltip');
+ +
+
+ 'one')); ?> + + loadTemplate('readme_information');?> + + +
+
+ + \ No newline at end of file diff --git a/admin/views/sermondistributor/tmpl/default_closed_issues_the_closed_issues_on_github.php b/admin/views/sermondistributor/tmpl/default_closed_issues_the_closed_issues_on_github.php index 1f398d8a..73a2eb7b 100644 --- a/admin/views/sermondistributor/tmpl/default_closed_issues_the_closed_issues_on_github.php +++ b/admin/views/sermondistributor/tmpl/default_closed_issues_the_closed_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_closed_issues_the_closed_issues_on_github.php diff --git a/admin/views/sermondistributor/tmpl/default_main.php b/admin/views/sermondistributor/tmpl/default_main.php index e92e731e..5787c154 100644 --- a/admin/views/sermondistributor/tmpl/default_main.php +++ b/admin/views/sermondistributor/tmpl/default_main.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_main.php diff --git a/admin/views/sermondistributor/tmpl/default_open_issues_the_open_issues_on_github.php b/admin/views/sermondistributor/tmpl/default_open_issues_the_open_issues_on_github.php index 9792bb19..cd1767eb 100644 --- a/admin/views/sermondistributor/tmpl/default_open_issues_the_open_issues_on_github.php +++ b/admin/views/sermondistributor/tmpl/default_open_issues_the_open_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_open_issues_the_open_issues_on_github.php diff --git a/admin/views/sermondistributor/tmpl/default_readme_information.php b/admin/views/sermondistributor/tmpl/default_readme_information.php index 10cc7fbb..3eb40f0f 100644 --- a/admin/views/sermondistributor/tmpl/default_readme_information.php +++ b/admin/views/sermondistributor/tmpl/default_readme_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_readme_information.php diff --git a/admin/views/sermondistributor/tmpl/default_releases_information.php b/admin/views/sermondistributor/tmpl/default_releases_information.php new file mode 100644 index 00000000..0d54972a --- /dev/null +++ b/admin/views/sermondistributor/tmpl/default_releases_information.php @@ -0,0 +1,30 @@ + + @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'); + +?> +github->tagreleases; ?> diff --git a/admin/views/sermondistributor/tmpl/default_vast_development_method_notice_board.php b/admin/views/sermondistributor/tmpl/default_vast_development_method_notice_board.php index cecbfcf6..072093cf 100644 --- a/admin/views/sermondistributor/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/sermondistributor/tmpl/default_vast_development_method_notice_board.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_vast_development_method_notice_board.php diff --git a/admin/views/sermondistributor/tmpl/default_vdm.php b/admin/views/sermondistributor/tmpl/default_vdm.php index 8205c992..a744019b 100644 --- a/admin/views/sermondistributor/tmpl/default_vdm.php +++ b/admin/views/sermondistributor/tmpl/default_vdm.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_vdm.php diff --git a/admin/views/sermondistributor/view.html.php b/admin/views/sermondistributor/view.html.php index 805570cb..7c8d279a 100644 --- a/admin/views/sermondistributor/view.html.php +++ b/admin/views/sermondistributor/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -50,9 +50,9 @@ class SermondistributorViewSermondistributor extends JViewLegacy $this->icons = $this->get('Icons'); $this->contributors = SermondistributorHelper::getContributors(); $this->github = $this->get('Github'); - $this->readme = $this->get('Readme'); $this->wiki = $this->get('Wiki'); - $this->noticeboard = $this->get('Noticeboard'); + $this->noticeboard = $this->get('Noticeboard'); + $this->readme = $this->get('Readme'); // get the manifest details of the component $this->manifest = SermondistributorHelper::manifest(); diff --git a/admin/views/sermons/tmpl/default.php b/admin/views/sermons/tmpl/default.php index cf98a68f..925ba749 100644 --- a/admin/views/sermons/tmpl/default.php +++ b/admin/views/sermons/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/sermons/tmpl/default_batch_body.php b/admin/views/sermons/tmpl/default_batch_body.php index df44b463..e8f25857 100644 --- a/admin/views/sermons/tmpl/default_batch_body.php +++ b/admin/views/sermons/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_body.php diff --git a/admin/views/sermons/tmpl/default_batch_footer.php b/admin/views/sermons/tmpl/default_batch_footer.php index 86e1659f..9b64d2c3 100644 --- a/admin/views/sermons/tmpl/default_batch_footer.php +++ b/admin/views/sermons/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_footer.php diff --git a/admin/views/sermons/tmpl/default_body.php b/admin/views/sermons/tmpl/default_body.php index 7669324c..e3258dda 100644 --- a/admin/views/sermons/tmpl/default_body.php +++ b/admin/views/sermons/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_body.php diff --git a/admin/views/sermons/tmpl/default_foot.php b/admin/views/sermons/tmpl/default_foot.php index 60402eb5..b83a6b6d 100644 --- a/admin/views/sermons/tmpl/default_foot.php +++ b/admin/views/sermons/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_foot.php diff --git a/admin/views/sermons/tmpl/default_head.php b/admin/views/sermons/tmpl/default_head.php index 497ce343..d46286e0 100644 --- a/admin/views/sermons/tmpl/default_head.php +++ b/admin/views/sermons/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_head.php diff --git a/admin/views/sermons/tmpl/default_toolbar.php b/admin/views/sermons/tmpl/default_toolbar.php index 85106bc7..74f1cd6c 100644 --- a/admin/views/sermons/tmpl/default_toolbar.php +++ b/admin/views/sermons/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_toolbar.php diff --git a/admin/views/sermons/view.html.php b/admin/views/sermons/view.html.php index 84a4ce8b..b90c4805 100644 --- a/admin/views/sermons/view.html.php +++ b/admin/views/sermons/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 89 of this MVC - @build 16th February, 2017 + @version @update number 90 of this MVC + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/media/js/timeago.js b/media/js/timeago.js new file mode 100644 index 00000000..0c2c219f --- /dev/null +++ b/media/js/timeago.js @@ -0,0 +1,232 @@ +/** + * Timeago is a jQuery plugin that makes it easy to support automatically + * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago"). + * + * @name timeago + * @version 1.5.4 + * @requires jQuery v1.2.3+ + * @author Ryan McGeary + * @license MIT License - http://www.opensource.org/licenses/mit-license.php + * + * For usage and examples, visit: + * http://timeago.yarp.com/ + * + * Copyright (c) 2008-2017, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org) + */ + +(function (factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define(['jquery'], factory); + } else if (typeof module === 'object' && typeof module.exports === 'object') { + factory(require('jquery')); + } else { + // Browser globals + factory(jQuery); + } +}(function ($) { + $.timeago = function(timestamp) { + if (timestamp instanceof Date) { + return inWords(timestamp); + } else if (typeof timestamp === "string") { + return inWords($.timeago.parse(timestamp)); + } else if (typeof timestamp === "number") { + return inWords(new Date(timestamp)); + } else { + return inWords($.timeago.datetime(timestamp)); + } + }; + var $t = $.timeago; + + $.extend($.timeago, { + settings: { + refreshMillis: 60000, + allowPast: true, + allowFuture: false, + localeTitle: false, + cutoff: 0, + autoDispose: true, + strings: { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: "ago", + suffixFromNow: "from now", + inPast: 'any moment now', + seconds: "less than a minute", + minute: "about a minute", + minutes: "%d minutes", + hour: "about an hour", + hours: "about %d hours", + day: "a day", + days: "%d days", + month: "about a month", + months: "%d months", + year: "about a year", + years: "%d years", + wordSeparator: " ", + numbers: [] + } + }, + + inWords: function(distanceMillis) { + if (!this.settings.allowPast && ! this.settings.allowFuture) { + throw 'timeago allowPast and allowFuture settings can not both be set to false.'; + } + + var $l = this.settings.strings; + var prefix = $l.prefixAgo; + var suffix = $l.suffixAgo; + if (this.settings.allowFuture) { + if (distanceMillis < 0) { + prefix = $l.prefixFromNow; + suffix = $l.suffixFromNow; + } + } + + if (!this.settings.allowPast && distanceMillis >= 0) { + return this.settings.strings.inPast; + } + + var seconds = Math.abs(distanceMillis) / 1000; + var minutes = seconds / 60; + var hours = minutes / 60; + var days = hours / 24; + var years = days / 365; + + function substitute(stringOrFunction, number) { + var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction; + var value = ($l.numbers && $l.numbers[number]) || number; + return string.replace(/%d/i, value); + } + + var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) || + seconds < 90 && substitute($l.minute, 1) || + minutes < 45 && substitute($l.minutes, Math.round(minutes)) || + minutes < 90 && substitute($l.hour, 1) || + hours < 24 && substitute($l.hours, Math.round(hours)) || + hours < 42 && substitute($l.day, 1) || + days < 30 && substitute($l.days, Math.round(days)) || + days < 45 && substitute($l.month, 1) || + days < 365 && substitute($l.months, Math.round(days / 30)) || + years < 1.5 && substitute($l.year, 1) || + substitute($l.years, Math.round(years)); + + var separator = $l.wordSeparator || ""; + if ($l.wordSeparator === undefined) { separator = " "; } + return $.trim([prefix, words, suffix].join(separator)); + }, + + parse: function(iso8601) { + var s = $.trim(iso8601); + s = s.replace(/\.\d+/,""); // remove milliseconds + s = s.replace(/-/,"/").replace(/-/,"/"); + s = s.replace(/T/," ").replace(/Z/," UTC"); + s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400 + s = s.replace(/([\+\-]\d\d)$/," $100"); // +09 -> +0900 + return new Date(s); + }, + datetime: function(elem) { + var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title"); + return $t.parse(iso8601); + }, + isTime: function(elem) { + // jQuery's `is()` doesn't play well with HTML5 in IE + return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time"); + } + }); + + // functions that can be called via $(el).timeago('action') + // init is default when no action is given + // functions are called with context of a single element + var functions = { + init: function() { + functions.dispose.call(this); + var refresh_el = $.proxy(refresh, this); + refresh_el(); + var $s = $t.settings; + if ($s.refreshMillis > 0) { + this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis); + } + }, + update: function(timestamp) { + var date = (timestamp instanceof Date) ? timestamp : $t.parse(timestamp); + $(this).data('timeago', { datetime: date }); + if ($t.settings.localeTitle) { + $(this).attr("title", date.toLocaleString()); + } + refresh.apply(this); + }, + updateFromDOM: function() { + $(this).data('timeago', { datetime: $t.parse( $t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title") ) }); + refresh.apply(this); + }, + dispose: function () { + if (this._timeagoInterval) { + window.clearInterval(this._timeagoInterval); + this._timeagoInterval = null; + } + } + }; + + $.fn.timeago = function(action, options) { + var fn = action ? functions[action] : functions.init; + if (!fn) { + throw new Error("Unknown function name '"+ action +"' for timeago"); + } + // each over objects here and call the requested function + this.each(function() { + fn.call(this, options); + }); + return this; + }; + + function refresh() { + var $s = $t.settings; + + //check if it's still visible + if ($s.autoDispose && !$.contains(document.documentElement,this)) { + //stop if it has been removed + $(this).timeago("dispose"); + return this; + } + + var data = prepareData(this); + + if (!isNaN(data.datetime)) { + if ( $s.cutoff === 0 || Math.abs(distance(data.datetime)) < $s.cutoff) { + $(this).text(inWords(data.datetime)); + } else { + if ($(this).attr('title').length > 0) { + $(this).text($(this).attr('title')); + } + } + } + return this; + } + + function prepareData(element) { + element = $(element); + if (!element.data("timeago")) { + element.data("timeago", { datetime: $t.datetime(element) }); + var text = $.trim(element.text()); + if ($t.settings.localeTitle) { + element.attr("title", element.data('timeago').datetime.toLocaleString()); + } else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) { + element.attr("title", text); + } + } + return element.data("timeago"); + } + + function inWords(date) { + return $t.inWords(distance(date)); + } + + function distance(date) { + return (new Date().getTime() - date.getTime()); + } + + // fix for IE6 suckage + document.createElement("abbr"); + document.createElement("time"); +})); diff --git a/script.php b/script.php index aefdaf96..fcc20e81 100644 --- a/script.php +++ b/script.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage script.php @@ -938,9 +938,9 @@ class com_sermondistributorInstallerScript $sermon->type_title = 'Sermondistributor Sermon'; $sermon->type_alias = 'com_sermondistributor.sermon'; $sermon->table = '{"special": {"dbtable": "#__sermondistributor_sermon","key": "id","type": "Sermon","prefix": "sermondistributorTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $sermon->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "description","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","preacher":"preacher","series":"series","short_description":"short_description","link_type":"link_type","source":"source","icon":"icon","tags":"tags","local_files":"local_files","description":"description","alias":"alias","not_required":"not_required","manual_files":"manual_files","scripture":"scripture","url":"url","build":"build","auto_sermons":"auto_sermons"}}'; + $sermon->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "description","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","preacher":"preacher","series":"series","short_description":"short_description","link_type":"link_type","source":"source","auto_sermons":"auto_sermons","description":"description","icon":"icon","tags":"tags","build":"build","alias":"alias","local_files":"local_files","scripture":"scripture","manual_files":"manual_files","not_required":"not_required","url":"url"}}'; $sermon->router = 'SermondistributorHelperRoute::getSermonRoute'; - $sermon->content_history_options = '{"formFile": "administrator/components/com_sermondistributor/models/forms/sermon.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","auto_sermons"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","preacher","series","catid","link_type","source","not_required","build"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "preacher","targetTable": "#__sermondistributor_preacher","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "series","targetTable": "#__sermondistributor_series","targetColumn": "id","displayColumn": "name"}]}'; + $sermon->content_history_options = '{"formFile": "administrator/components/com_sermondistributor/models/forms/sermon.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","auto_sermons","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","preacher","series","catid","link_type","source","build","not_required"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "preacher","targetTable": "#__sermondistributor_preacher","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "series","targetTable": "#__sermondistributor_series","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $sermon_Inserted = $db->insertObject('#__content_types', $sermon); @@ -1020,20 +1020,18 @@ class com_sermondistributorInstallerScript // Install the global extenstion params. $query = $db->getQuery(true); - // Field to update. $fields = array( $db->quoteName('params') . ' = ' . $db->quote('{"autorName":"Llewellyn van der Merwe","autorEmail":"joomla@vdm.io","player":"1","add_to_button":"0","preachers_display":"2","preachers_list_style":"2","preachers_table_color":"0","preachers_icon":"1","preachers_desc":"1","preachers_sermon_count":"1","preachers_hits":"1","preachers_website":"1","preachers_email":"1","preacher_request_id":"0","preacher_display":"3","preacher_box_contrast":"1","preacher_list_style":"3","preacher_icon":"1","preacher_desc":"1","preacher_sermon_count":"1","preacher_hits":"1","preacher_email":"1","preacher_website":"1","preacher_sermons_display":"2","preacher_sermons_list_style":"2","preacher_sermons_table_color":"0","preacher_sermons_icon":"1","preacher_sermons_desc":"1","preacher_sermons_series":"1","preacher_sermons_category":"1","preacher_sermons_download_counter":"1","preacher_sermons_hits":"1","preacher_sermons_downloads":"1","preacher_sermons_open":"1","categories_display":"2","categories_list_style":"2","categories_table_color":"0","categories_icon":"1","categories_desc":"1","categories_sermon_count":"1","categories_hits":"1","category_display":"3","category_box_contrast":"1","category_list_style":"3","category_icon":"1","category_desc":"1","category_sermon_count":"1","category_hits":"1","category_sermons_display":"2","category_sermons_list_style":"1","category_sermons_table_color":"1","category_sermons_icon":"1","category_sermons_desc":"1","category_sermons_preacher":"1","category_sermons_series":"1","category_sermons_download_counter":"1","category_sermons_hits":"1","category_sermons_downloads":"1","category_sermons_open":"1","list_series_display":"2","list_series_list_style":"2","list_series_table_color":"0","list_series_icon":"1","list_series_desc":"1","list_series_sermon_count":"1","list_series_hits":"1","series_request_id":"0","series_display":"3","series_box_contrast":"1","series_list_style":"3","series_icon":"1","series_desc":"1","series_sermon_count":"1","series_hits":"1","series_sermons_display":"2","series_sermons_list_style":"1","series_sermons_table_color":"1","series_sermons_icon":"1","series_sermons_desc":"1","series_sermons_preacher":"1","series_sermons_category":"1","series_sermons_download_counter":"1","series_sermons_hits":"1","series_sermons_downloads":"1","series_sermons_open":"1","sermon_display":"1","sermon_box_contrast":"1","sermon_list_style":"1","sermon_icon":"1","sermon_desc":"1","sermon_preacher":"1","sermon_series":"1","sermon_series":"1","sermon_category":"1","sermon_download_counter":"1","sermon_hits":"1","sermon_downloads":"1","max_execution_time":"500","check_in":"-1 day","save_history":"1","history_limit":"10","uikit_load":"1","uikit_min":"","uikit_style":""}'), ); - // Condition. $conditions = array( $db->quoteName('element') . ' = ' . $db->quote('com_sermondistributor') ); - $query->update($db->quoteName('#__extensions'))->set($fields)->where($conditions); $db->setQuery($query); $allDone = $db->execute(); + echo ' '; @@ -1079,9 +1077,9 @@ class com_sermondistributorInstallerScript $sermon->type_title = 'Sermondistributor Sermon'; $sermon->type_alias = 'com_sermondistributor.sermon'; $sermon->table = '{"special": {"dbtable": "#__sermondistributor_sermon","key": "id","type": "Sermon","prefix": "sermondistributorTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $sermon->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "description","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","preacher":"preacher","series":"series","short_description":"short_description","link_type":"link_type","source":"source","icon":"icon","tags":"tags","local_files":"local_files","description":"description","alias":"alias","not_required":"not_required","manual_files":"manual_files","scripture":"scripture","url":"url","build":"build","auto_sermons":"auto_sermons"}}'; + $sermon->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "description","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "metadata","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "metakey","core_metadesc": "metadesc","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","preacher":"preacher","series":"series","short_description":"short_description","link_type":"link_type","source":"source","auto_sermons":"auto_sermons","description":"description","icon":"icon","tags":"tags","build":"build","alias":"alias","local_files":"local_files","scripture":"scripture","manual_files":"manual_files","not_required":"not_required","url":"url"}}'; $sermon->router = 'SermondistributorHelperRoute::getSermonRoute'; - $sermon->content_history_options = '{"formFile": "administrator/components/com_sermondistributor/models/forms/sermon.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","auto_sermons"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","preacher","series","catid","link_type","source","not_required","build"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "preacher","targetTable": "#__sermondistributor_preacher","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "series","targetTable": "#__sermondistributor_series","targetColumn": "id","displayColumn": "name"}]}'; + $sermon->content_history_options = '{"formFile": "administrator/components/com_sermondistributor/models/forms/sermon.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","auto_sermons","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","preacher","series","catid","link_type","source","build","not_required"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "preacher","targetTable": "#__sermondistributor_preacher","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "series","targetTable": "#__sermondistributor_series","targetColumn": "id","displayColumn": "name"}]}'; // Check if sermon type is already in content_type DB. $sermon_id = null; diff --git a/sermondistributor.xml b/sermondistributor.xml index ea2fddb4..1d63f42b 100644 --- a/sermondistributor.xml +++ b/sermondistributor.xml @@ -1,7 +1,7 @@ COM_SERMONDISTRIBUTOR - 21st August, 2017 + 24th August, 2017 Llewellyn van der Merwe joomla@vdm.io https://www.vdm.io/ diff --git a/site/assets/css/site.css b/site/assets/css/site.css index cb7fdb4a..b33d2eca 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage site.css diff --git a/site/controller.php b/site/controller.php index d63b79a6..ca284c31 100644 --- a/site/controller.php +++ b/site/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage controller.php diff --git a/site/controllers/ajax.json.php b/site/controllers/ajax.json.php index 07d90de2..64c6a2da 100644 --- a/site/controllers/ajax.json.php +++ b/site/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage ajax.json.php diff --git a/site/controllers/download.php b/site/controllers/download.php index 2528106e..f744d9ff 100644 --- a/site/controllers/download.php +++ b/site/controllers/download.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage download.php diff --git a/site/controllers/help.php b/site/controllers/help.php index 993589cd..47d66b04 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage help.php diff --git a/site/helpers/category.php b/site/helpers/category.php index b78b7977..3b8162af 100644 --- a/site/helpers/category.php +++ b/site/helpers/category.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage category.php diff --git a/site/helpers/categorysermons.php b/site/helpers/categorysermons.php index ed608e3b..59c85200 100644 --- a/site/helpers/categorysermons.php +++ b/site/helpers/categorysermons.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage categorysermons.php diff --git a/site/helpers/dropboxupdater.php b/site/helpers/dropboxupdater.php index cc56053c..3839eebb 100644 --- a/site/helpers/dropboxupdater.php +++ b/site/helpers/dropboxupdater.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage dropboxupdater.php diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index 89a94d87..4b35e9b0 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index 9aaef46d..62ce5abb 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage route.php diff --git a/site/helpers/sermondistributor.php b/site/helpers/sermondistributor.php index 8154da20..c08464d8 100644 --- a/site/helpers/sermondistributor.php +++ b/site/helpers/sermondistributor.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php @@ -69,6 +69,11 @@ abstract class SermondistributorHelper } } + /** + * The global params + **/ + protected static $params = false; + /** * The external source links auto **/ @@ -89,21 +94,6 @@ abstract class SermondistributorHelper **/ protected static $select_externalsource_manual; - /** - * The user notice info File Name - **/ - protected static $usernotice = false; - - /** - * The update error info File Name - **/ - protected static $updateerror = false; - - /** - * The update last File path - **/ - protected static $updatelast = false; - /** * The update errors **/ @@ -339,7 +329,7 @@ abstract class SermondistributorHelper // get actual update values $updates = self::getExternalListingUpdateKeys(); // get last update - $updatePath = self::getFilePath('update', 'last', 'vDm', '.txt', JPATH_COMPONENT_ADMINISTRATOR); + $updatePath = self::getFilePath('path', 'updatelast', 'txt', 'vDm', JPATH_COMPONENT_ADMINISTRATOR); if (($lastUpdate = @file_get_contents($updatePath)) !== FALSE && self::checkArray($updates)) { // now check what is next @@ -364,6 +354,71 @@ abstract class SermondistributorHelper } return false; } + + /** + * Get the file path or url + * + * @param string $type The (url/path) type to return + * @param string $target The Params Target name (if set) + * @param string $fileType The kind of filename to generate (if not set no file name is generated) + * @param string $key The key to adjust the filename (if not set ignored) + * @param string $default The default path if not set in Params (fallback path) + * @param bool $createIfNotSet The switch to create the folder if not found + * + * @return string On success the path or url is returned based on the type requested + * + */ + public static function getFilePath($type = 'path', $target = 'filepath', $fileType = null, $key = '', $default = JPATH_SITE . '/images/', $createIfNotSet = true) + { + // get the global settings + if (!self::checkObject(self::$params)) + { + self::$params = JComponentHelper::getParams('com_sermondistributor'); + } + $filePath = self::$params->get($target, $default); + // check the file path (revert to default only of not a hidden file path) + if ('hiddenfilepath' !== $target && strpos($filePath, JPATH_SITE) === false) + { + $filePath = JPATH_SITE . '/images/'; + } + jimport('joomla.filesystem.folder'); + // create the folder if it does not exist + if ($createIfNotSet && !JFolder::exists($filePath)) + { + JFolder::create($filePath); + } + // setup the file name + $fileName = ''; + if (self::checkString($fileType)) + { + // Get basic key + $basickey = 'Th!s_iS_n0t_sAfe_buT_b3tter_then_n0thiug'; + if (method_exists(get_called_class(), "getCryptKey")) + { + $basickey = self::getCryptKey('basic', $basickey); + } + // check the key + if (self::checkString($key)) + { + $key = 'vDm'; + } + // set the name + $fileName = trim(md5($type.$target.$basickey.$key) . '.' . trim($fileType, '.')); + } + // return the url + if ($type === 'url') + { + if (strpos($filePath, JPATH_SITE) !== false) + { + $filePath = trim( str_replace( JPATH_SITE, '', $filePath), '/'); + return JURI::root() . $filePath . '/' . $fileName; + } + // since the path is behind the root folder of the site, return only the root url (may be used to build the link) + return JURI::root(); + } + // sanitize the path + return '/' . trim( $filePath, '/' ) . '/' . $fileName; + } protected static function saveFile($data,$path_filename) { @@ -624,31 +679,6 @@ abstract class SermondistributorHelper } return false; } - - public static function getFilePath($type, $name = 'listing', $key = 'vDm', $fileType = '.json', $PATH = JPATH_COMPONENT_SITE) - { - if (!isset(self::${$type.$name}[$key]) || !self::checkString(self::${$type.$name}[$key])) - { - // Get local key - $localkey = self::getLocalKey(); - // check the key - $keyMD5 = ''; - if ('vDm' != $key) - { - $keyMD5 = $key; - } - // set the name - $fileName = md5($type.$name.$localkey.$keyMD5); - // set file path - self::${$type.$name}[$key] = $PATH.'/helpers/'.$fileName.$fileType; - } - if (isset(self::${$type.$name}[$key]) && self::checkString(self::${$type.$name}[$key])) - { - // return the path - return self::${$type.$name}[$key]; - } - return ''; - } /** * get the localkey @@ -774,7 +804,7 @@ abstract class SermondistributorHelper // get update error from file if ($fileKey) { - $file_path = self::getFilePath('update', 'error', $fileKey, '.txt', JPATH_COMPONENT_ADMINISTRATOR); + $file_path = self::getFilePath('path', 'updateerror', 'txt', $fileKey, JPATH_COMPONENT_ADMINISTRATOR); // check if it is set if (($text = @file_get_contents($file_path)) !== FALSE) { diff --git a/site/layouts/addtodropboxbutton.php b/site/layouts/addtodropboxbutton.php index 9b6782c4..8de97e9a 100644 --- a/site/layouts/addtodropboxbutton.php +++ b/site/layouts/addtodropboxbutton.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage addtodropboxbutton.php diff --git a/site/layouts/addtodropboxicon.php b/site/layouts/addtodropboxicon.php index 763cfa5c..cca9b54e 100644 --- a/site/layouts/addtodropboxicon.php +++ b/site/layouts/addtodropboxicon.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage addtodropboxicon.php diff --git a/site/layouts/categorieslistitem.php b/site/layouts/categorieslistitem.php index fd771fbc..1ff572c7 100644 --- a/site/layouts/categorieslistitem.php +++ b/site/layouts/categorieslistitem.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage categorieslistitem.php diff --git a/site/layouts/categoriespanel.php b/site/layouts/categoriespanel.php index de02922c..3de9a250 100644 --- a/site/layouts/categoriespanel.php +++ b/site/layouts/categoriespanel.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage categoriespanel.php diff --git a/site/layouts/categoriesrow.php b/site/layouts/categoriesrow.php index 2befe099..607004d2 100644 --- a/site/layouts/categoriesrow.php +++ b/site/layouts/categoriesrow.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage categoriesrow.php diff --git a/site/layouts/downloadsermonbutton.php b/site/layouts/downloadsermonbutton.php index bae6c9fa..85ed818e 100644 --- a/site/layouts/downloadsermonbutton.php +++ b/site/layouts/downloadsermonbutton.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage downloadsermonbutton.php diff --git a/site/layouts/htmlfive.php b/site/layouts/htmlfive.php index 2fa04fba..cb406356 100644 --- a/site/layouts/htmlfive.php +++ b/site/layouts/htmlfive.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage htmlfive.php diff --git a/site/layouts/isnew.php b/site/layouts/isnew.php index 249dce32..d71749ac 100644 --- a/site/layouts/isnew.php +++ b/site/layouts/isnew.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage isnew.php diff --git a/site/layouts/jplayerbluemonday.php b/site/layouts/jplayerbluemonday.php index 8aa3d11d..e3264112 100644 --- a/site/layouts/jplayerbluemonday.php +++ b/site/layouts/jplayerbluemonday.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage jplayerbluemonday.php diff --git a/site/layouts/jplayerbluemondaylist.php b/site/layouts/jplayerbluemondaylist.php index ec56f008..4aa73c5b 100644 --- a/site/layouts/jplayerbluemondaylist.php +++ b/site/layouts/jplayerbluemondaylist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage jplayerbluemondaylist.php diff --git a/site/layouts/mediaplayer.php b/site/layouts/mediaplayer.php index 28ba030a..82704293 100644 --- a/site/layouts/mediaplayer.php +++ b/site/layouts/mediaplayer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage mediaplayer.php diff --git a/site/layouts/opensermonbutton.php b/site/layouts/opensermonbutton.php index 072930fa..63b18038 100644 --- a/site/layouts/opensermonbutton.php +++ b/site/layouts/opensermonbutton.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage opensermonbutton.php diff --git a/site/layouts/preacherslistitem.php b/site/layouts/preacherslistitem.php index 9b65d70a..d0d1733a 100644 --- a/site/layouts/preacherslistitem.php +++ b/site/layouts/preacherslistitem.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacherslistitem.php diff --git a/site/layouts/preacherspanel.php b/site/layouts/preacherspanel.php index 682a47f0..27f457d1 100644 --- a/site/layouts/preacherspanel.php +++ b/site/layouts/preacherspanel.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacherspanel.php diff --git a/site/layouts/preachersrow.php b/site/layouts/preachersrow.php index 6ee61d2e..0fc89dce 100644 --- a/site/layouts/preachersrow.php +++ b/site/layouts/preachersrow.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage preachersrow.php diff --git a/site/layouts/serieslistitem.php b/site/layouts/serieslistitem.php index 80b9199e..f0f6f193 100644 --- a/site/layouts/serieslistitem.php +++ b/site/layouts/serieslistitem.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage serieslistitem.php diff --git a/site/layouts/seriespanel.php b/site/layouts/seriespanel.php index e24cd076..ed2ae6ac 100644 --- a/site/layouts/seriespanel.php +++ b/site/layouts/seriespanel.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage seriespanel.php diff --git a/site/layouts/seriesrow.php b/site/layouts/seriesrow.php index 8b92c1d1..d05551f0 100644 --- a/site/layouts/seriesrow.php +++ b/site/layouts/seriesrow.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage seriesrow.php diff --git a/site/layouts/sermonslistitem.php b/site/layouts/sermonslistitem.php index b64a2ee2..3404d88d 100644 --- a/site/layouts/sermonslistitem.php +++ b/site/layouts/sermonslistitem.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermonslistitem.php diff --git a/site/layouts/sermonspanel.php b/site/layouts/sermonspanel.php index 9e68c643..662c5ad7 100644 --- a/site/layouts/sermonspanel.php +++ b/site/layouts/sermonspanel.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermonspanel.php diff --git a/site/layouts/sermonsrow.php b/site/layouts/sermonsrow.php index b904cd01..c30f5460 100644 --- a/site/layouts/sermonsrow.php +++ b/site/layouts/sermonsrow.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermonsrow.php diff --git a/site/layouts/soundmanagerthreesixty.php b/site/layouts/soundmanagerthreesixty.php index f279b308..71b4f37f 100644 --- a/site/layouts/soundmanagerthreesixty.php +++ b/site/layouts/soundmanagerthreesixty.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage soundmanagerthreesixty.php diff --git a/site/models/ajax.php b/site/models/ajax.php index f404b21e..e7d4a3cf 100644 --- a/site/models/ajax.php +++ b/site/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage ajax.php diff --git a/site/router.php b/site/router.php index 80008809..9dc94243 100644 --- a/site/router.php +++ b/site/router.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage router.php diff --git a/site/sermondistributor.php b/site/sermondistributor.php index 61ab06cb..ff44bdf9 100644 --- a/site/sermondistributor.php +++ b/site/sermondistributor.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.1 - @build 21st August, 2017 + @build 24th August, 2017 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php