From 58de3631ab3c0ea10f68acf60bffe7cd43be4c71 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Mon, 5 Dec 2016 09:40:19 +0200 Subject: [PATCH] Trying to fix the Ajax issue gh-26 we removed the multiple calls and restructure the ajax call. --- README.md | 14 +- admin/README.txt | 14 +- admin/access.xml | 8 +- admin/assets/css/admin.css | 2 +- admin/assets/css/dashboard.css | 2 +- admin/assets/css/external_source.css | 2 +- admin/assets/css/external_sources.css | 2 +- admin/assets/css/help_document.css | 2 +- admin/assets/css/help_documents.css | 2 +- admin/assets/css/local_listing.css | 2 +- admin/assets/css/local_listings.css | 2 +- admin/assets/css/manual_updater.css | 2 +- admin/assets/css/preacher.css | 2 +- admin/assets/css/preachers.css | 2 +- admin/assets/css/series.css | 2 +- admin/assets/css/series_list.css | 2 +- admin/assets/css/sermon.css | 2 +- admin/assets/css/sermons.css | 2 +- admin/assets/css/statistic.css | 2 +- admin/assets/css/statistics.css | 2 +- admin/config.xml | 16 ++ admin/controller.php | 2 +- admin/controllers/ajax.json.php | 49 +++- admin/controllers/external_source.php | 144 +++++++++++- admin/controllers/external_sources.php | 2 +- admin/controllers/help.php | 2 +- admin/controllers/help_document.php | 2 +- admin/controllers/help_documents.php | 2 +- admin/controllers/import.php | 2 +- admin/controllers/local_listing.php | 2 +- admin/controllers/local_listings.php | 2 +- admin/controllers/manual_updater.php | 2 +- admin/controllers/preacher.php | 2 +- admin/controllers/preachers.php | 2 +- admin/controllers/series.php | 2 +- admin/controllers/series_list.php | 2 +- admin/controllers/sermon.php | 2 +- admin/controllers/sermondistributor.php | 2 +- admin/controllers/sermons.php | 2 +- admin/controllers/statistic.php | 2 +- admin/controllers/statistics.php | 2 +- admin/helpers/html/batch_.php | 2 +- admin/helpers/sermondistributor.php | 220 +++++++++++++++-- .../en-GB/en-GB.com_sermondistributor.ini | 60 +++-- admin/layouts/batchselection.php | 2 +- ...llwidth.php => build_option_fullwidth.php} | 9 +- .../layouts/external_source/details_above.php | 2 +- .../external_source/details_fullwidth.php | 2 +- .../layouts/external_source/details_left.php | 2 +- .../layouts/external_source/details_right.php | 4 +- .../layouts/external_source/details_under.php | 2 +- admin/layouts/external_source/publishing.php | 2 +- admin/layouts/external_source/publlshing.php | 2 +- admin/layouts/help_document/details_above.php | 2 +- .../help_document/details_fullwidth.php | 2 +- admin/layouts/help_document/details_left.php | 2 +- admin/layouts/help_document/details_right.php | 2 +- admin/layouts/help_document/details_under.php | 2 +- admin/layouts/help_document/metadata.php | 2 +- admin/layouts/help_document/publishing.php | 2 +- admin/layouts/local_listing/details_above.php | 2 +- .../local_listing/details_fullwidth.php | 2 +- admin/layouts/local_listing/details_left.php | 2 +- admin/layouts/local_listing/details_right.php | 2 +- admin/layouts/local_listing/publishing.php | 2 +- admin/layouts/local_listing/publlshing.php | 2 +- admin/layouts/preacher/details_above.php | 2 +- admin/layouts/preacher/details_fullwidth.php | 2 +- admin/layouts/preacher/details_left.php | 2 +- admin/layouts/preacher/details_right.php | 2 +- admin/layouts/preacher/metadata.php | 2 +- admin/layouts/preacher/publishing.php | 2 +- admin/layouts/preacher/sermons_fullwidth.php | 2 +- admin/layouts/series/details_above.php | 2 +- admin/layouts/series/details_fullwidth.php | 2 +- admin/layouts/series/details_left.php | 2 +- admin/layouts/series/details_right.php | 2 +- admin/layouts/series/metadata.php | 2 +- admin/layouts/series/publishing.php | 2 +- admin/layouts/series/sermons_fullwidth.php | 2 +- admin/layouts/sermon/details_above.php | 2 +- admin/layouts/sermon/details_fullwidth.php | 2 +- admin/layouts/sermon/details_left.php | 2 +- admin/layouts/sermon/details_right.php | 2 +- admin/layouts/sermon/details_under.php | 2 +- admin/layouts/sermon/files_fullwidth.php | 2 +- admin/layouts/sermon/metadata.php | 2 +- admin/layouts/sermon/publishing.php | 2 +- admin/layouts/sermon/stastics_fullwidth.php | 2 +- admin/layouts/statistic/details_above.php | 2 +- admin/layouts/statistic/details_left.php | 2 +- admin/layouts/statistic/details_right.php | 2 +- admin/layouts/statistic/metadata.php | 2 +- admin/layouts/statistic/publishing.php | 2 +- admin/models/ajax.php | 7 +- admin/models/external_source.php | 150 +++++++++--- admin/models/external_sources.php | 2 +- admin/models/fields/adminviewfolderlist.php | 2 +- admin/models/fields/articles.php | 2 +- admin/models/fields/externalsource.php | 2 +- admin/models/fields/externalsourcefiles.php | 2 +- admin/models/fields/localfiles.php | 2 +- admin/models/fields/preachers.php | 2 +- admin/models/fields/series.php | 2 +- admin/models/fields/sermon.php | 2 +- admin/models/fields/siteviewfolderlist.php | 2 +- admin/models/forms/external_source.js | 70 +++++- admin/models/forms/external_source.xml | 91 ++++--- admin/models/forms/help_document.js | 62 ++--- admin/models/forms/local_listing.js | 2 +- admin/models/forms/preacher.js | 2 +- admin/models/forms/series.js | 2 +- admin/models/forms/sermon.js | 2 +- admin/models/forms/statistic.js | 2 +- admin/models/help_document.php | 2 +- admin/models/help_documents.php | 2 +- admin/models/import.php | 2 +- admin/models/local_listing.php | 2 +- admin/models/local_listings.php | 2 +- admin/models/manual_updater.php | 2 +- admin/models/preacher.php | 2 +- admin/models/preachers.php | 2 +- admin/models/series.php | 2 +- admin/models/series_list.php | 2 +- admin/models/sermon.php | 2 +- admin/models/sermondistributor.php | 2 +- admin/models/sermons.php | 2 +- admin/models/statistic.php | 2 +- admin/models/statistics.php | 2 +- admin/sermondistributor.php | 2 +- admin/sql/install.mysql.utf8.sql | 4 +- admin/tables/external_source.php | 2 +- admin/tables/help_document.php | 2 +- admin/tables/local_listing.php | 2 +- admin/tables/preacher.php | 2 +- admin/tables/series.php | 2 +- admin/tables/sermon.php | 2 +- admin/tables/statistic.php | 2 +- admin/views/external_source/submitbutton.js | 2 +- admin/views/external_source/tmpl/edit.php | 6 +- admin/views/external_source/view.html.php | 18 +- admin/views/external_sources/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../external_sources/tmpl/default_body.php | 15 +- .../external_sources/tmpl/default_foot.php | 2 +- .../external_sources/tmpl/default_head.php | 4 +- .../external_sources/tmpl/default_toolbar.php | 2 +- admin/views/external_sources/view.html.php | 2 +- admin/views/help_document/submitbutton.js | 2 +- admin/views/help_document/tmpl/edit.php | 2 +- admin/views/help_document/view.html.php | 2 +- admin/views/help_documents/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../help_documents/tmpl/default_body.php | 2 +- .../help_documents/tmpl/default_foot.php | 2 +- .../help_documents/tmpl/default_head.php | 2 +- .../help_documents/tmpl/default_toolbar.php | 2 +- admin/views/help_documents/view.html.php | 2 +- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- admin/views/local_listing/submitbutton.js | 2 +- admin/views/local_listing/tmpl/edit.php | 2 +- admin/views/local_listing/view.html.php | 2 +- admin/views/local_listings/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../local_listings/tmpl/default_body.php | 12 +- .../local_listings/tmpl/default_foot.php | 2 +- .../local_listings/tmpl/default_head.php | 4 +- .../local_listings/tmpl/default_toolbar.php | 2 +- admin/views/local_listings/view.html.php | 2 +- admin/views/manual_updater/tmpl/default.php | 5 +- admin/views/manual_updater/view.html.php | 2 +- admin/views/preacher/submitbutton.js | 2 +- admin/views/preacher/tmpl/edit.php | 2 +- admin/views/preacher/view.html.php | 2 +- admin/views/preachers/tmpl/default.php | 2 +- .../preachers/tmpl/default_batch_body.php | 2 +- .../preachers/tmpl/default_batch_footer.php | 2 +- admin/views/preachers/tmpl/default_body.php | 2 +- admin/views/preachers/tmpl/default_foot.php | 2 +- admin/views/preachers/tmpl/default_head.php | 2 +- .../views/preachers/tmpl/default_toolbar.php | 2 +- admin/views/preachers/view.html.php | 2 +- admin/views/series/submitbutton.js | 2 +- admin/views/series/tmpl/edit.php | 2 +- admin/views/series/view.html.php | 2 +- admin/views/series_list/tmpl/default.php | 2 +- .../series_list/tmpl/default_batch_body.php | 2 +- .../series_list/tmpl/default_batch_footer.php | 2 +- admin/views/series_list/tmpl/default_body.php | 2 +- admin/views/series_list/tmpl/default_foot.php | 2 +- admin/views/series_list/tmpl/default_head.php | 2 +- .../series_list/tmpl/default_toolbar.php | 2 +- admin/views/series_list/view.html.php | 2 +- admin/views/sermon/submitbutton.js | 2 +- admin/views/sermon/tmpl/edit.php | 2 +- admin/views/sermon/view.html.php | 2 +- .../views/sermondistributor/tmpl/default.php | 2 +- ...sed_issues_the_closed_issues_on_github.php | 2 +- .../sermondistributor/tmpl/default_main.php | 2 +- ..._open_issues_the_open_issues_on_github.php | 2 +- .../tmpl/default_readme_information.php | 2 +- ...t_vast_development_method_notice_board.php | 2 +- .../sermondistributor/tmpl/default_vdm.php | 2 +- admin/views/sermondistributor/view.html.php | 2 +- admin/views/sermons/tmpl/default.php | 2 +- .../views/sermons/tmpl/default_batch_body.php | 2 +- .../sermons/tmpl/default_batch_footer.php | 2 +- admin/views/sermons/tmpl/default_body.php | 2 +- admin/views/sermons/tmpl/default_foot.php | 2 +- admin/views/sermons/tmpl/default_head.php | 2 +- admin/views/sermons/tmpl/default_toolbar.php | 2 +- admin/views/sermons/view.html.php | 2 +- admin/views/statistic/submitbutton.js | 2 +- admin/views/statistic/tmpl/edit.php | 2 +- admin/views/statistic/view.html.php | 2 +- admin/views/statistics/tmpl/default.php | 2 +- .../statistics/tmpl/default_batch_body.php | 2 +- .../statistics/tmpl/default_batch_footer.php | 2 +- admin/views/statistics/tmpl/default_body.php | 2 +- admin/views/statistics/tmpl/default_foot.php | 2 +- admin/views/statistics/tmpl/default_head.php | 2 +- .../views/statistics/tmpl/default_toolbar.php | 2 +- admin/views/statistics/view.html.php | 2 +- script.php | 16 +- sermondistributor.xml | 2 +- site/assets/css/categories.css | 2 +- site/assets/css/category.css | 2 +- site/assets/css/preacher.css | 2 +- site/assets/css/preachers.css | 2 +- site/assets/css/series.css | 2 +- site/assets/css/serieslist.css | 2 +- site/assets/css/sermon.css | 2 +- site/assets/css/site.css | 2 +- site/controller.php | 2 +- site/controllers/ajax.json.php | 8 +- site/controllers/download.php | 2 +- site/controllers/help.php | 2 +- site/helpers/dropboxupdater.php | 11 +- site/helpers/headercheck.php | 2 +- site/helpers/route.php | 2 +- site/helpers/sermondistributor.php | 222 ++++++++++++++++-- .../en-GB/en-GB.com_sermondistributor.ini | 60 +++-- site/layouts/addtodropboxbutton.php | 2 +- site/layouts/addtodropboxicon.php | 2 +- site/layouts/categorieslistitem.php | 2 +- site/layouts/categoriespanel.php | 2 +- site/layouts/categoriesrow.php | 2 +- site/layouts/downloadsermonbutton.php | 2 +- site/layouts/isnew.php | 2 +- site/layouts/jplayerbluemonday.php | 2 +- site/layouts/jplayerbluemondaylist.php | 2 +- site/layouts/mediaplayer.php | 2 +- site/layouts/opensermonbutton.php | 2 +- site/layouts/preacherslistitem.php | 2 +- site/layouts/preacherspanel.php | 2 +- site/layouts/preachersrow.php | 2 +- site/layouts/serieslistitem.php | 2 +- site/layouts/seriespanel.php | 2 +- site/layouts/seriesrow.php | 2 +- site/layouts/sermonslistitem.php | 2 +- site/layouts/sermonspanel.php | 2 +- site/layouts/sermonsrow.php | 2 +- site/layouts/soundmanagerthreesixty.php | 2 +- site/models/ajax.php | 2 +- site/models/categories.php | 19 +- site/models/category.php | 2 +- site/models/preacher.php | 2 +- site/models/preachers.php | 2 +- site/models/series.php | 2 +- site/models/serieslist.php | 2 +- site/models/sermon.php | 2 +- site/router.php | 18 +- site/sermondistributor.php | 2 +- site/views/categories/tmpl/default.php | 2 +- .../tmpl/default_categories-grid.php | 2 +- .../tmpl/default_categories-list.php | 2 +- .../tmpl/default_categories-table.php | 2 +- site/views/categories/view.html.php | 2 +- site/views/category/tmpl/default.php | 2 +- .../category/tmpl/default_categorybox.php | 2 +- .../category/tmpl/default_categorypanel.php | 2 +- .../category/tmpl/default_categorysmall.php | 2 +- .../category/tmpl/default_sermons-grid.php | 2 +- .../category/tmpl/default_sermons-list.php | 2 +- .../category/tmpl/default_sermons-table.php | 2 +- site/views/category/view.html.php | 2 +- site/views/preacher/tmpl/default.php | 2 +- .../preacher/tmpl/default_preacherbox.php | 2 +- .../preacher/tmpl/default_preacherpanel.php | 2 +- .../preacher/tmpl/default_preachersmall.php | 2 +- .../preacher/tmpl/default_sermons-grid.php | 2 +- .../preacher/tmpl/default_sermons-list.php | 2 +- .../preacher/tmpl/default_sermons-table.php | 2 +- site/views/preacher/view.html.php | 2 +- site/views/preachers/tmpl/default.php | 2 +- .../preachers/tmpl/default_preachers-grid.php | 2 +- .../preachers/tmpl/default_preachers-list.php | 2 +- .../tmpl/default_preachers-table.php | 2 +- site/views/preachers/view.html.php | 2 +- site/views/series/tmpl/default.php | 2 +- site/views/series/tmpl/default_seriesbox.php | 2 +- .../views/series/tmpl/default_seriespanel.php | 2 +- .../views/series/tmpl/default_seriessmall.php | 2 +- .../series/tmpl/default_sermons-grid.php | 2 +- .../series/tmpl/default_sermons-list.php | 2 +- .../series/tmpl/default_sermons-table.php | 2 +- site/views/series/view.html.php | 2 +- site/views/serieslist/tmpl/default.php | 2 +- .../serieslist/tmpl/default_series-grid.php | 2 +- .../serieslist/tmpl/default_series-list.php | 2 +- .../serieslist/tmpl/default_series-table.php | 2 +- site/views/serieslist/view.html.php | 2 +- site/views/sermon/tmpl/default.php | 2 +- site/views/sermon/tmpl/default_sermonbig.php | 2 +- site/views/sermon/tmpl/default_sermonbox.php | 2 +- .../views/sermon/tmpl/default_sermonpanel.php | 2 +- site/views/sermon/view.html.php | 2 +- 321 files changed, 1339 insertions(+), 583 deletions(-) rename admin/layouts/external_source/{wiki_fullwidth.php => build_option_fullwidth.php} (92%) diff --git a/README.md b/README.md index 1eb8c694..49eee7cf 100644 --- a/README.md +++ b/README.md @@ -23,32 +23,32 @@ The best way to see all your options is to install this component on you Joomla + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@vdm.io) + *Name*: [Sermon Distributor](https://www.vdm.io/) + *First Build*: 22nd October, 2015 -+ *Last Build*: 27th November, 2016 ++ *Last Build*: 4th December, 2016 + *Version*: 1.4.0 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html ## Build Time :hourglass: -**178 Hours** or **22 Eight Hour Days** (actual time the author saved - +**180 Hours** or **23 Eight Hour Days** (actual time the author saved - due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder)) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > never making one mistake or taking any coffee break.) -+ *Line count*: **63763** ++ *Line count*: **64519** + *File count*: **436** + *Folder count*: **90** -**117 Hours** or **15 Eight Hour Days** (the actual time the author spent) +**119 Hours** or **14 Eight Hour Days** (the actual time the author spent) > (with the following break down: -> **debugging @44hours** = codingtime / 4; -> **planning @25hours** = codingtime / 7; +> **debugging @45hours** = codingtime / 4; +> **planning @26hours** = codingtime / 7; > **mapping @18hours** = codingtime / 10; > **office @30hours** = codingtime / 6;) -**295 Hours** or **37 Eight Hour Days** +**299 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 1eb8c694..49eee7cf 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -23,32 +23,32 @@ The best way to see all your options is to install this component on you Joomla + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@vdm.io) + *Name*: [Sermon Distributor](https://www.vdm.io/) + *First Build*: 22nd October, 2015 -+ *Last Build*: 27th November, 2016 ++ *Last Build*: 4th December, 2016 + *Version*: 1.4.0 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html ## Build Time :hourglass: -**178 Hours** or **22 Eight Hour Days** (actual time the author saved - +**180 Hours** or **23 Eight Hour Days** (actual time the author saved - due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder)) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > never making one mistake or taking any coffee break.) -+ *Line count*: **63763** ++ *Line count*: **64519** + *File count*: **436** + *Folder count*: **90** -**117 Hours** or **15 Eight Hour Days** (the actual time the author spent) +**119 Hours** or **14 Eight Hour Days** (the actual time the author spent) > (with the following break down: -> **debugging @44hours** = codingtime / 4; -> **planning @25hours** = codingtime / 7; +> **debugging @45hours** = codingtime / 4; +> **planning @26hours** = codingtime / 7; > **mapping @18hours** = codingtime / 10; > **office @30hours** = codingtime / 6;) -**295 Hours** or **37 Eight Hour Days** +**299 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/access.xml b/admin/access.xml index f14168b8..a6a8f318 100644 --- a/admin/access.xml +++ b/admin/access.xml @@ -17,6 +17,8 @@ + + @@ -202,10 +204,10 @@ - - - + + + diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 95bd3f04..da1c6a13 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage admin.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index e2013df6..b462aac8 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage dashboard.css diff --git a/admin/assets/css/external_source.css b/admin/assets/css/external_source.css index f91b64d7..c472059a 100644 --- a/admin/assets/css/external_source.css +++ b/admin/assets/css/external_source.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage external_source.css diff --git a/admin/assets/css/external_sources.css b/admin/assets/css/external_sources.css index aa51d2d0..c066e9d1 100644 --- a/admin/assets/css/external_sources.css +++ b/admin/assets/css/external_sources.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage external_sources.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index cd472390..a0eca8b0 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help_document.css diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index 686a60b3..4a1f0693 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help_documents.css diff --git a/admin/assets/css/local_listing.css b/admin/assets/css/local_listing.css index df5fb7e6..92a465a5 100644 --- a/admin/assets/css/local_listing.css +++ b/admin/assets/css/local_listing.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage local_listing.css diff --git a/admin/assets/css/local_listings.css b/admin/assets/css/local_listings.css index 9dc73123..f0dbbbed 100644 --- a/admin/assets/css/local_listings.css +++ b/admin/assets/css/local_listings.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage local_listings.css diff --git a/admin/assets/css/manual_updater.css b/admin/assets/css/manual_updater.css index bff37266..4084aad8 100644 --- a/admin/assets/css/manual_updater.css +++ b/admin/assets/css/manual_updater.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage manual_updater.css diff --git a/admin/assets/css/preacher.css b/admin/assets/css/preacher.css index bcd7da75..b688ad25 100644 --- a/admin/assets/css/preacher.css +++ b/admin/assets/css/preacher.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.css diff --git a/admin/assets/css/preachers.css b/admin/assets/css/preachers.css index 87fadc06..cfa76191 100644 --- a/admin/assets/css/preachers.css +++ b/admin/assets/css/preachers.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.css diff --git a/admin/assets/css/series.css b/admin/assets/css/series.css index 90e7da93..c7ef72cd 100644 --- a/admin/assets/css/series.css +++ b/admin/assets/css/series.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series.css diff --git a/admin/assets/css/series_list.css b/admin/assets/css/series_list.css index 955258ad..b097e723 100644 --- a/admin/assets/css/series_list.css +++ b/admin/assets/css/series_list.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series_list.css diff --git a/admin/assets/css/sermon.css b/admin/assets/css/sermon.css index 10e271a2..40526b9a 100644 --- a/admin/assets/css/sermon.css +++ b/admin/assets/css/sermon.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.css diff --git a/admin/assets/css/sermons.css b/admin/assets/css/sermons.css index 2170b905..5aa4ec2e 100644 --- a/admin/assets/css/sermons.css +++ b/admin/assets/css/sermons.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons.css diff --git a/admin/assets/css/statistic.css b/admin/assets/css/statistic.css index 3855a2fe..3f8aa43f 100644 --- a/admin/assets/css/statistic.css +++ b/admin/assets/css/statistic.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage statistic.css diff --git a/admin/assets/css/statistics.css b/admin/assets/css/statistics.css index cd991f11..baf2a94a 100644 --- a/admin/assets/css/statistics.css +++ b/admin/assets/css/statistics.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage statistics.css diff --git a/admin/config.xml b/admin/config.xml index dccf5af1..4ffe2e4a 100644 --- a/admin/config.xml +++ b/admin/config.xml @@ -46,6 +46,22 @@ default="10" /> + + + + + registerTask('updateLocalListingExternal', 'ajax'); $this->registerTask('isNew', 'ajax'); $this->registerTask('isRead', 'ajax'); - $this->registerTask('getBuildTable', 'ajax'); + $this->registerTask('getBuildTable', 'ajax'); + $this->registerTask('getSourceStatus', 'ajax'); } public function ajax() @@ -65,12 +66,12 @@ class SermondistributorControllerAjax extends JControllerLegacy try { $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); - $idValue = $jinput->get('id', NULL, 'INT'); + $listingValue = $jinput->get('listing', NULL, 'INT'); $targetValue = $jinput->get('target', NULL, 'INT'); $typeValue = $jinput->get('type', NULL, 'INT'); - if($idValue && $targetValue && $typeValue) + if($listingValue && $targetValue && $typeValue) { - $result = $this->getModel('ajax')->autoUpdateLocalListingExternal($idValue, $targetValue, $typeValue); + $result = $this->getModel('ajax')->autoUpdateLocalListingExternal($listingValue, $targetValue, $typeValue); } else { @@ -256,6 +257,44 @@ class SermondistributorControllerAjax extends JControllerLegacy echo "(".json_encode($e).");"; } } + break; + case 'getSourceStatus': + try + { + $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); + $idValue = $jinput->get('id', NULL, 'INT'); + if($idValue && $user->id != 0) + { + $result = $this->getModel('ajax')->getSourceStatus($idValue); + } + else + { + $result = false; + } + if($callback = $jinput->get('callback', null, 'CMD')) + { + echo $callback . "(".json_encode($result).");"; + } + elseif($returnRaw) + { + echo json_encode($result); + } + else + { + echo "(".json_encode($result).");"; + } + } + catch(Exception $e) + { + if($callback = $jinput->get('callback', null, 'CMD')) + { + echo $callback."(".json_encode($e).");"; + } + else + { + echo "(".json_encode($e).");"; + } + } break; } } diff --git a/admin/controllers/external_source.php b/admin/controllers/external_source.php index 07113995..246b5237 100644 --- a/admin/controllers/external_source.php +++ b/admin/controllers/external_source.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage external_source.php @@ -47,6 +47,148 @@ class SermondistributorControllerExternal_source extends JControllerForm { $this->view_list = 'External_sources'; // safeguard for setting the return view listing to the main view. parent::__construct($config); + } + + public function clearLocalListing() + { + // Check for request forgeries. + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + // get the data + $originalData = $this->input->post->get('jform', array(), 'array'); + if (isset($originalData['id']) && $originalData['id'] > 0) + { + // get the needed + $app = JFactory::getApplication(); + $lang = JFactory::getLanguage(); + $model = $this->getModel(); + $user = JFactory::getUser(); + $context = "$this->option.edit.$this->context"; + if (!$user->authorise('external_source.clear_local_listing', 'com_sermondistributor')) + { + // force production is not permitted + $app->enqueueMessage(JText::_('COM_SERMONDISTRIBUTOR_YOU_DO_NOT_HAVE_PERMISSION_TO_CLEAR_LOCAL_LISTING'), 'error'); + // Save the data in the session. + $app->setUserState($context . '.data', $originalData); + // Redirect back to the edit screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . '&view=' . $this->view_item + . $this->getRedirectToItemAppend($originalData['id'], 'id'), false + ) + ); + return false; + } + // clear the listing + $cleared = $model->clearLocalListing($originalData['id']); + if (!$cleared) + { + // force production is not permitted + $app->enqueueMessage(JText::_('COM_SERMONDISTRIBUTOR_LOCAL_LISTING_WAS_NOT_CLEARED'), 'error'); + // Save the data in the session. + $app->setUserState($context . '.data', $originalData); + // Redirect back to the edit screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . '&view=' . $this->view_item + . $this->getRedirectToItemAppend($originalData['id'], 'id'), false + ) + ); + return false; + } + // force production is not permitted + $app->enqueueMessage(JText::_('COM_SERMONDISTRIBUTOR_LOCAL_LISTING_WAS_CLEARED_SUCCESSFULLY'), 'success'); + // Save the data in the session. + $app->setUserState($context . '.data', $originalData); + // Redirect back to the edit screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . '&view=' . $this->view_item + . $this->getRedirectToItemAppend($originalData['id'], 'id'), false + ) + ); + return true; + } + $this->setError(JText::_('COM_SERMONDISTRIBUTOR_CLEARING_LOCAL_LISTING_CAN_NOT_BE_DONE')); + $this->setMessage($this->getError(), 'error'); + // Redirect back to the list screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . '&view=' . $this->view_list + . $this->getRedirectToListAppend(), false + ) + ); + return false; + } + + public function resetUpdateStatus() + { + // Check for request forgeries. + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + // get the data + $originalData = $this->input->post->get('jform', array(), 'array'); + if (isset($originalData['id']) && $originalData['id'] > 0) + { + // get the needed + $app = JFactory::getApplication(); + $lang = JFactory::getLanguage(); + $model = $this->getModel(); + $user = JFactory::getUser(); + $context = "$this->option.edit.$this->context"; + if (!$user->authorise('external_source.reset_update_status', 'com_sermondistributor')) + { + // force production is not permitted + $app->enqueueMessage(JText::_('COM_SERMONDISTRIBUTOR_YOU_DO_NOT_HAVE_PERMISSION_TO_RESET_UPDATE_STATUS'), 'error'); + // Save the data in the session. + $app->setUserState($context . '.data', $originalData); + // Redirect back to the edit screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . '&view=' . $this->view_item + . $this->getRedirectToItemAppend($originalData['id'], 'id'), false + ) + ); + return false; + } + // reset update status + $reset = $model->resetUpdateStatus($originalData['id']); + if (isset($reset['error'])) + { + // reset update status did not happen + $app->enqueueMessage($reset['error'], 'error'); + // Save the data in the session. + $app->setUserState($context . '.data', $originalData); + // Redirect back to the edit screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . '&view=' . $this->view_item + . $this->getRedirectToItemAppend($originalData['id'], 'id'), false + ) + ); + return false; + } + // reset update status success + $app->enqueueMessage(JText::_('COM_SERMONDISTRIBUTOR_RESETTING_THE_UPDATE_STATUS_WAS_SUCCESSFUL'), 'success'); + // Save the data in the session. + $app->setUserState($context . '.data', $originalData); + // Redirect back to the edit screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . '&view=' . $this->view_item + . $this->getRedirectToItemAppend($originalData['id'], 'id'), false + ) + ); + return true; + } + $this->setError(JText::_('COM_SERMONDISTRIBUTOR_RESET_UPDATE_STATUS_CAN_NOT_BE_DONE')); + $this->setMessage($this->getError(), 'error'); + // Redirect back to the list screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . '&view=' . $this->view_list + . $this->getRedirectToListAppend(), false + ) + ); + return false; } /** diff --git a/admin/controllers/external_sources.php b/admin/controllers/external_sources.php index 06460162..9096e4e6 100644 --- a/admin/controllers/external_sources.php +++ b/admin/controllers/external_sources.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage external_sources.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index ff0e5de8..58acd4d0 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help.php diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index 69077898..93a5b869 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help_document.php diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index 87c507ef..892b0876 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help_documents.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index ce29edc9..f4af4245 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage import.php diff --git a/admin/controllers/local_listing.php b/admin/controllers/local_listing.php index e9534753..a971c491 100644 --- a/admin/controllers/local_listing.php +++ b/admin/controllers/local_listing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage local_listing.php diff --git a/admin/controllers/local_listings.php b/admin/controllers/local_listings.php index 77aa7a5e..8f73db23 100644 --- a/admin/controllers/local_listings.php +++ b/admin/controllers/local_listings.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage local_listings.php diff --git a/admin/controllers/manual_updater.php b/admin/controllers/manual_updater.php index 7efae2fc..265eb0d5 100644 --- a/admin/controllers/manual_updater.php +++ b/admin/controllers/manual_updater.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage manual_updater.php diff --git a/admin/controllers/preacher.php b/admin/controllers/preacher.php index 9a8f5a58..25635b8f 100644 --- a/admin/controllers/preacher.php +++ b/admin/controllers/preacher.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.php diff --git a/admin/controllers/preachers.php b/admin/controllers/preachers.php index 6926bcbf..d7a70279 100644 --- a/admin/controllers/preachers.php +++ b/admin/controllers/preachers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.php diff --git a/admin/controllers/series.php b/admin/controllers/series.php index 8c50ff92..23b4a444 100644 --- a/admin/controllers/series.php +++ b/admin/controllers/series.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php diff --git a/admin/controllers/series_list.php b/admin/controllers/series_list.php index cc869788..d509da30 100644 --- a/admin/controllers/series_list.php +++ b/admin/controllers/series_list.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series_list.php diff --git a/admin/controllers/sermon.php b/admin/controllers/sermon.php index 12a16bb7..c4625064 100644 --- a/admin/controllers/sermon.php +++ b/admin/controllers/sermon.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php diff --git a/admin/controllers/sermondistributor.php b/admin/controllers/sermondistributor.php index 4b1c231c..8f186f48 100644 --- a/admin/controllers/sermondistributor.php +++ b/admin/controllers/sermondistributor.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php diff --git a/admin/controllers/sermons.php b/admin/controllers/sermons.php index 1987adfd..f6c2162a 100644 --- a/admin/controllers/sermons.php +++ b/admin/controllers/sermons.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons.php diff --git a/admin/controllers/statistic.php b/admin/controllers/statistic.php index c1b13013..10fea745 100644 --- a/admin/controllers/statistic.php +++ b/admin/controllers/statistic.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage statistic.php diff --git a/admin/controllers/statistics.php b/admin/controllers/statistics.php index 05b14b07..71661332 100644 --- a/admin/controllers/statistics.php +++ b/admin/controllers/statistics.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage statistics.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index e5f5e2a5..3fb9d927 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage batch_.php diff --git a/admin/helpers/sermondistributor.php b/admin/helpers/sermondistributor.php index e362f942..5f9e57b9 100644 --- a/admin/helpers/sermondistributor.php +++ b/admin/helpers/sermondistributor.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php @@ -45,18 +45,24 @@ abstract class SermondistributorHelper **/ public static function loadExternalUpdateAjax($document) { - $updates = self::getExternalListingUpdateKeys(); // id, target, type - if (self::checkArray($updates)) + $update = self::getNextUpdateValues(); // id, target, type + if ($update) { $document->addScriptDeclaration(" jQuery(window).load(function() { - checkExternalListing(".implode('); checkExternalListing(', $updates)."); + checkExternalListing(".$update."); }); function checkExternalListing(id, target, type) { + checkExternalListing_server(id, target, type).done(function(result) { + // good it is done + }); + } + + function checkExternalListing_server(id, target, type) { var getUrl = '".JURI::root()."administrator/index.php?option=com_sermondistributor&task=ajax.autoUpdateLocalListingExternal&format=json'; if(target > 0 && type > 0 && id > 0){ - var request = 'token=".JSession::getFormToken()."&target='+target+'&id='+id+'&type='+type; + var request = 'token=".JSession::getFormToken()."&target='+target+'&listing='+id+'&type='+type; } return jQuery.ajax({ type: 'GET', @@ -99,6 +105,11 @@ abstract class SermondistributorHelper **/ protected static $updateerror = false; + /** + * The update last File path + **/ + protected static $updatelast = false; + /** * The update errors **/ @@ -329,6 +340,49 @@ abstract class SermondistributorHelper return true; } + protected static function getNextUpdateValues() + { + // get actual update values + $updates = self::getExternalListingUpdateKeys(); + // get last update + $updatePath = self::getFilePath('update', 'last', 'vDm', '.txt', JPATH_COMPONENT_ADMINISTRATOR); + if (($lastUpdate = @file_get_contents($updatePath)) !== FALSE && self::checkArray($updates)) + { + // now check what is next + $lastKey = array_search($lastUpdate, $updates); + if (!is_null($lastKey)) + { + $nextKey = $lastKey + 1; + if (isset($updates[$nextKey])) + { + self::saveFile($updates[$nextKey],$updatePath); + return $updates[$nextKey]; + } + } + } + // rest and start with the first key + if (self::checkArray($updates)) + { + // save the first set + $start = reset($updates); + self::saveFile($start,$updatePath); + return $start; + } + return false; + } + + protected static function saveFile($data,$path_filename) + { + if (self::checkString($data)) + { + $fp = fopen($path_filename, 'w'); + fwrite($fp, $data); + fclose($fp); + return true; + } + return false; + } + public static function getExternalListingUpdateKeys($id = null, $updateMethod = 2, $returnType = 1) { // first check if this file already has statistics @@ -336,7 +390,10 @@ abstract class SermondistributorHelper $query = $db->getQuery(true); $query->select($db->quoteName(array('id','sharedurl','folder','permissiontype','dropboxoptions','build'))); $query->from($db->quoteName('#__sermondistributor_external_source')); - $query->where($db->quoteName('update_method') . ' = '. (int) $updateMethod); + if ($updateMethod && is_numeric($updateMethod)) + { + $query->where($db->quoteName('update_method') . ' = '. (int) $updateMethod); + } if ($id && is_numeric($id)) { $query->where($db->quoteName('id') . ' = '. (int) $id); @@ -574,19 +631,29 @@ abstract class SermondistributorHelper return false; } - public static function getFilePath($type, $name = 'listing', $key = '', $fileType = '.json', $PATH = JPATH_COMPONENT_SITE) + public static function getFilePath($type, $name = 'listing', $key = 'vDm', $fileType = '.json', $PATH = JPATH_COMPONENT_SITE) { - if (!self::checkString(self::${$type.$name})) + 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.$key); + $fileName = md5($type.$name.$localkey.$keyMD5); // set file path - self::${$type.$name} = $PATH.'/helpers/'.$fileName.$fileType; + self::${$type.$name}[$key] = $PATH.'/helpers/'.$fileName.$fileType; } - // return the path - return self::${$type.$name}; + if (isset(self::${$type.$name}[$key]) && self::checkString(self::${$type.$name}[$key])) + { + // return the path + return self::${$type.$name}[$key]; + } + return ''; } /** @@ -628,6 +695,85 @@ abstract class SermondistributorHelper self::setUpdateError($id, array(JText::_('COM_SERMONDISTRIBUTOR_THE_EXTERNAL_SOURCE_COULD_NOT_BE_FOUND'))); return false; } + + public static function getSourceStatus($id) + { + // fist get errors if any is found + $errors = array(); + if ($targets = self::getExternalListingUpdateKeys($id, null, 1)) + { + foreach ($targets as $target) + { + $key = preg_replace('/[ ,]+/', '', trim($target)); + if ($error = self::getUpdateError(0, $key)) + { + $errors[] = $error; + } + } + } + // check when was the last update + $updateInfo = self::updateInfo($id); + if (!$updateInfo) + { + $errors[] = JText::_('COM_SERMONDISTRIBUTOR_THIS_SOURCE_HAS_NO_LOCAL_LISTING_SET'); + } + // build the return string + if (isset($updateInfo['last']) || self::checkArray($errors)) + { + $body = array(); + // great we have source status + if (isset($updateInfo['last'])) + { + $body[] = '

'. JText::_('COM_SERMONDISTRIBUTOR_LISTING_INFO') . '

'; + $body[] = '

'. JText::_('COM_SERMONDISTRIBUTOR_LAST_UPDATE') . ': '.$updateInfo['last']; + $body[] = '
'. JText::_('COM_SERMONDISTRIBUTOR_NUMBER_OF_FILES_LISTED') . ': '.$updateInfo['qty']; + $body[] = '

'; + } + // now set any errors found + if (self::checkArray($errors)) + { + $body[] = '

'. JText::_('COM_SERMONDISTRIBUTOR_NOTICE') . '

'; + $body[] = implode('', $errors); + } + return ''.JText::_('COM_SERMONDISTRIBUTOR_VIEW_UPDATE_STATUS').'' + . JHtml::_('bootstrap.renderModal', 'source-status'.$id, array('title' => JText::_('COM_SERMONDISTRIBUTOR_SOURCE_STATUS_REPORT')), implode('', $body)); + } + // no status found + return false; + } + + public static function updateInfo($id) + { + $db = JFactory::getDbo(); + // Create a new query object. + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.created','a.modified'))); + $query->from($db->quoteName('#__sermondistributor_local_listing', 'a')); + $query->where($db->quoteName('a.external_source') . ' = ' . (int) $id); + // Reset the query using our newly populated query object. + $db->setQuery($query); + $db->execute(); + if ($qty = $db->getNumRows()) + { + $data = $db->loadRowList(); + $last = 0; + foreach ($data as $dates) + { + foreach ($dates as $date) + { + $time = strtotime($date); + if ($time > $last) + { + $last = $time; + } + } + } + $info['qty'] = (int) $qty; + $info['last'] = self::fancyDate($last); + return $info; + } + return false; + } public static function getUpdateError($id, $fileKey = null) { @@ -646,9 +792,9 @@ abstract class SermondistributorHelper } return false; } - if (isset(self::$updateErrors[$id]) && self::checkArray(self::$updateErrors[$id])) + elseif (isset(self::$updateErrors[$id]) && self::checkArray(self::$updateErrors[$id])) { - return '
  • '.implode('
  • ', self::$updateErrors[$id]).'
      • '; + return '
      • '.implode('
      • ', self::$updateErrors[$id]).'
      '; } return JText::_('COM_SERMONDISTRIBUTOR_UNKNOWN_ERROR_HAS_OCCURRED'); } @@ -667,6 +813,52 @@ abstract class SermondistributorHelper } } } + + /** + * Change to nice fancy date + */ + public static function fancyDate($date) + { + if (!self::isValidTimeStamp($date)) + { + $date = strtotime($date); + } + return date('jS \o\f F Y',$date); + } + + /** + * Change to nice fancy time and date + */ + public static function fancyDateTime($time) + { + if (!self::isValidTimeStamp($time)) + { + $time = strtotime($time); + } + return date('(G:i) jS \o\f F Y',$time); + } + + /** + * Change to nice hour:minutes time + */ + public static function fancyTime($time) + { + if (!self::isValidTimeStamp($time)) + { + $time = strtotime($time); + } + return date('G:i',$time); + } + + /** + * Check if string is a valid time stamp + */ + public static function isValidTimeStamp($timestamp) + { + return ((int) $timestamp === $timestamp) + && ($timestamp <= PHP_INT_MAX) + && ($timestamp >= ~PHP_INT_MAX); + } /** * Load the Component xml manifest. **/ diff --git a/admin/language/en-GB/en-GB.com_sermondistributor.ini b/admin/language/en-GB/en-GB.com_sermondistributor.ini index 0e042333..c13cb5dc 100644 --- a/admin/language/en-GB/en-GB.com_sermondistributor.ini +++ b/admin/language/en-GB/en-GB.com_sermondistributor.ini @@ -14,6 +14,8 @@ COM_SERMONDISTRIBUTOR_CATEGORIES_ACCESS_SITE="Categories (Site) Access" COM_SERMONDISTRIBUTOR_CATEGORIES_ACCESS_SITE_DESC=" Allows the users in this group to access site categories." COM_SERMONDISTRIBUTOR_CATEGORY_ACCESS_SITE="Category (Site) Access" COM_SERMONDISTRIBUTOR_CATEGORY_ACCESS_SITE_DESC=" Allows the users in this group to access site category." +COM_SERMONDISTRIBUTOR_CLEARING_LOCAL_LISTING_CAN_NOT_BE_DONE="Clearing local listing can not be done." +COM_SERMONDISTRIBUTOR_CLEAR_LOCAL_LISTING="Clear Local Listing" COM_SERMONDISTRIBUTOR_CONFIG_ADD_TO_BUTTON_DESCRIPTION="Allow add to external source button to show, this will expose the external source links." COM_SERMONDISTRIBUTOR_CONFIG_ADD_TO_BUTTON_LABEL="External Source Button" COM_SERMONDISTRIBUTOR_CONFIG_ALMOST_FLAT_LOAD="Almost Flat" @@ -152,6 +154,8 @@ COM_SERMONDISTRIBUTOR_CONFIG_LIST_SERIES_TABLE_COLOR_LABEL="Table Color" COM_SERMONDISTRIBUTOR_CONFIG_LOCALFOLDER_DESCRIPTION="Enter the full path to the local folder where your files are found." COM_SERMONDISTRIBUTOR_CONFIG_LOCALFOLDER_HINT="/home/username/localfolder/" COM_SERMONDISTRIBUTOR_CONFIG_LOCALFOLDER_LABEL="Local Folder Path (File Source)" +COM_SERMONDISTRIBUTOR_CONFIG_MAX_EXECUTION_TIME_DESCRIPTION="Set in minutes the max execution time of the PHP script during updating to local listing." +COM_SERMONDISTRIBUTOR_CONFIG_MAX_EXECUTION_TIME_LABEL="Max Execution Time" COM_SERMONDISTRIBUTOR_CONFIG_NO="No" COM_SERMONDISTRIBUTOR_CONFIG_NONE="None" COM_SERMONDISTRIBUTOR_CONFIG_ONLY_EXTRA="Only Extra" @@ -420,12 +424,15 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_N_ITEMS_UNPUBLISHED_1="%s External Source COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_SUBMENU="External Sources Submenu" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_SUBMENU_DESC="Allows the users in this group to update the submenu of the external source" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_APP_FOLDER="App folder" -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_APP_LIMITATION_NOTE_DESCRIPTION="Please Note: There is a limitation of 2000 files app/folder" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_APP_LIMITATION_NOTE_DESCRIPTION="Please Note: There is a limitation of 500 files per app/folder" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_AUTOMATIC="Automatic" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_AVI=".avi" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_BUILD="Build" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_BUILD_DESCRIPTION="Set the method used to add files." COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_BUILD_LABEL="Build Option" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_BUILD_OPTION="Build Option" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_CLEAR_LOCAL_LISTING_BUTTON_ACCESS="External Source Clear Local Listing Button Access" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_CLEAR_LOCAL_LISTING_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear local listing button." COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_CREATED_BY_DESC="The user that created this External Source." COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_CREATED_BY_LABEL="Created By" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_CREATED_DATE_DESC="The date this External Source was created." @@ -452,7 +459,7 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FILETYPES_DESCRIPTION="Select the file typ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FILETYPES_LABEL="File Types" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FOLDER="Folder" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FOLDER_DESCRIPTION="Enter the folders to target. The folders must be in the account where you generated the access token." -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FOLDER_LABEL="Target Folders
      Please note: limitation of 2000 files per/folder" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FOLDER_LABEL="Target Folders
      Please note: limitation of 500 files per/folder" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FOLDER_PATH="Folder Path" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FOLDER_SELECT="Add/Remove" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FULL_DROPBOX="Full Dropbox" @@ -475,8 +482,8 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_MPFOUR=".mp4" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_MPG=".mpg" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_MPTHREE=".mp3" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NEW="A New External Source" -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_AUTO_DROPBOX_DESCRIPTION="
        -
      • Create main/first auto folder in Dropbox. This will be where you create the folders with the preacher's name. Using the preacher's alias from the system as the folder name will insure no mismatch, if the preacher already exist on the system.
        • +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_AUTO_EXTERNALSOURCE_DESCRIPTION="To integrate auto External Source with your system you need to do the following:
          +
        • Create main/first auto folder in External Source. This will be where you create the folders with the preacher's name. Using the preacher's alias from the system as the folder name will insure no mismatch, if the preacher already exist on the system.
        • You can add files directly to the preacher folder if it is not linked to a series.
        • If you would like the sermon linked to a series, you simply create a folder inside the preacher's folder with the series' name, and place the sermon file inside that series' folder. Using the series' alias from the system as the folder name will insure no mismatch, if the series already exist on the system.
        • Adding other preachers to the same series will only require creating a folder inside that preacher's folder with the same series' name and placing his sermons inside that new folder. Using the series' alias from the system as the folder name will insure no mismatch, if the series already exist on the system.
          • @@ -535,15 +542,16 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_AUTO_DROPBOX_DESCRIPTION="
          • Adding folders and sermons will automatically load them to your sermon distributor on your website, or update the already existing sermons with the new files.
          -
        The links that are required below should be the direct Dropbox shared links to the auto folder. They should not be the same folder, and not be inside one another. Always totally separate folders! Leave blank to deactivate." -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_AUTO_DROPBOX_LABEL="Want to use Dropbox Auto links with your system, then you need to do the following:" -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_MANUAL_DROPBOX_DESCRIPTION="
          -
        • Create main/first manual folder in Dropbox. This will be where all files are placed. No sub folders, just one huge folder with all the files!
          • -
        • You will place the file on Dropbox in that main folder first.
          • +
        " +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_AUTO_EXTERNALSOURCE_LABEL="External Source Integration" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_MANUAL_EXTERNALSOURCE_DESCRIPTION="To integrate manual External Source option with your system you need to do the following: +
          +
        • Create main/first manual folder in External Source. This will be where all files are placed. No sub folders, just one huge folder with all the files!
          • +
        • You will place the file on External Source in that main folder first.
        • Then the next step will be to come to Sermon Distributor and create the preacher and series if they do not already exist.
          • -
        • Please allow enough time (as set above +) for the local listing of files to update.
          • -
        • Then you should create the sermon the file belongs to and select 'Dropbox' as the source of your file.
          • -
        • Next select 'Manual' as the build option. This will load a drop-down with the file names in the Manual Folder on Dropbox. Should the new file not be seen give it a little more time to update the local listing of files.
          • +
        • Please allow enough time (as set in Sermon Distributor Options) for the local listing of files to update.
          • +
        • Then you should create the sermon the file belongs to and select 'External Source' as the source of your file.
          • +
        • Next select 'Manual' as the build option. This will load a drop-down with the file names in the Manual Folder on External Source. Should the new file not be seen give it a little more time to update the local listing of files.
        • If the List is very long, you can in the select box type the name of the file and it will shorten the list. Then select your file and continue with the setup of the sermon as usual.
        • To ensure that all downloads work well, we need to hold to the following file naming convention:
            @@ -551,8 +559,8 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_MANUAL_DROPBOX_DESCRIPTION="
            • No strange characters in the file name only A-z 0-9 underscore and hyphen.
            -
          The links that are required below should be the direct Dropbox shared links to the main manual folder. They should not be the same folder, and not be inside one another. Always totally separate folders! Leave blank to deactivate." -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_MANUAL_DROPBOX_LABEL="Want to use Dropbox Manual links with your system, then you need to do the following:" +
        " +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_MANUAL_EXTERNALSOURCE_LABEL="External Source Integration" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOT_REQUIRED="Not Required" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_OAUTHTOKEN="Oauthtoken" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_OAUTHTOKEN_DESCRIPTION="By using an access token, the system will be able to make automatic API calls to your app without going through the authorization flow.
        This field is being kept encrypted in the database.
        Yet Joomla back-end must be access with SSL in-place when saving this page. This will help avoid a man in the middle attach on your access token." @@ -574,11 +582,13 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_PPT=".ppt" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_PPTX=".pptx" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_PUBLISHING="Publishing" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_RELATION="External Source Relation" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_RESET_UPDATE_STATUS_BUTTON_ACCESS="External Source Reset Update Status Button Access" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_RESET_UPDATE_STATUS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the reset update status button." COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the External Source to customise the alias." COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SELECT_AN_OPTION="Select an option" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHAREDURL="Sharedurl" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHAREDURL_DESCRIPTION="Enter the shared-urls of the main folders to target. The shared-urls must be from the account where you generated the access token." -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHAREDURL_LABEL="Target Shared-urls
        Please note: limitation of 2000 files per/shared-url" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHAREDURL_LABEL="Target Shared-urls
        Please note: limitation of 500 files per/shared-url" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHAREDURL_SELECT="Add/Remove" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHARED_URL="Shared URL" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_STATUS="Status" @@ -599,9 +609,6 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_UPDATE_TIMER_LABEL="Update Timer" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_VERSION_DESC="A count of the number of times this External Source has been revised." COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_VERSION_LABEL="Revision" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_WAV=".wav" -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_WIKI="Wiki" -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_WIKI_CHECK_NOTE_DESCRIPTION="It will give instructions on how to setup the external source in relation to the Build Option you have chosen." -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_WIKI_CHECK_NOTE_LABEL="Please check the Wiki tab above." COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_WMV=".wmv" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_XLS=".xls" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_XLSX=".xlsx" @@ -758,7 +765,9 @@ COM_SERMONDISTRIBUTOR_IMPORT_UPLOAD_BOTTON="Upload File" 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_UPDATE="Last Update" COM_SERMONDISTRIBUTOR_LICENSE="License" +COM_SERMONDISTRIBUTOR_LISTING_INFO="Listing Info" COM_SERMONDISTRIBUTOR_LOCAL_LISTING="Local Listing" COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS="Local Listings" COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_ACCESS="Local Listings Access" @@ -865,6 +874,8 @@ COM_SERMONDISTRIBUTOR_LOCAL_LISTING_URL_HINT="shared URL" COM_SERMONDISTRIBUTOR_LOCAL_LISTING_URL_LABEL="Shared-URL" COM_SERMONDISTRIBUTOR_LOCAL_LISTING_VERSION_DESC="A count of the number of times this Local Listing has been revised." COM_SERMONDISTRIBUTOR_LOCAL_LISTING_VERSION_LABEL="Revision" +COM_SERMONDISTRIBUTOR_LOCAL_LISTING_WAS_CLEARED_SUCCESSFULLY="Local listing was cleared successfully." +COM_SERMONDISTRIBUTOR_LOCAL_LISTING_WAS_NOT_CLEARED="Local listing was not cleared." COM_SERMONDISTRIBUTOR_MANUAL_UPDATER="Manual Updater" COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_ACCESS="Manual Updater Access" COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_ACCESS_DESC="Allows the users in this group to access Manual Updater" @@ -877,10 +888,13 @@ COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_SUBMENU="Manual Updater Submenu" COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_SUBMENU_DESC="Allows the users in this group to update the submenu of the Manual Updater" COM_SERMONDISTRIBUTOR_NEW="New" COM_SERMONDISTRIBUTOR_NEW_ISSUE="New Issue" +COM_SERMONDISTRIBUTOR_NOTICE="Notice!" COM_SERMONDISTRIBUTOR_NOT_FOUND_OR_ACCESS_DENIED="Not found, or access denied." COM_SERMONDISTRIBUTOR_NO_ACCESS_GRANTED="No Access Granted!" 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_PLEASE_CHECK_AGAIN_LATTER="Please check again latter." COM_SERMONDISTRIBUTOR_PREACHER="Preacher" @@ -979,6 +993,9 @@ 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_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." COM_SERMONDISTRIBUTOR_RESPOND_TO_THIS_ISSUE_ON_GITHUB="Respond to this issue on Github" COM_SERMONDISTRIBUTOR_REVIEW_THIS_ISSUE_ON_GITHUB="Review this issue on Github" COM_SERMONDISTRIBUTOR_SAVE_SUCCESS="Great! Item successfully saved." @@ -1296,6 +1313,7 @@ COM_SERMONDISTRIBUTOR_SERMON_URL_LABEL="File URL" COM_SERMONDISTRIBUTOR_SERMON_VERSION_DESC="A count of the number of times this Sermon has been revised." COM_SERMONDISTRIBUTOR_SERMON_VERSION_LABEL="Revision" COM_SERMONDISTRIBUTOR_SHAREDURL="Shared-url" +COM_SERMONDISTRIBUTOR_SOURCE_STATUS_REPORT="Source Status Report." COM_SERMONDISTRIBUTOR_STATISTIC="Statistic" COM_SERMONDISTRIBUTOR_STATISTICS="Statistics" COM_SERMONDISTRIBUTOR_STATISTICS_ACCESS="Statistics Access" @@ -1391,8 +1409,10 @@ COM_SERMONDISTRIBUTOR_SUBMENU_PREACHERS="Preachers" COM_SERMONDISTRIBUTOR_SUBMENU_SERIES_LIST="Series List" COM_SERMONDISTRIBUTOR_SUBMENU_SERMONS="Sermons" COM_SERMONDISTRIBUTOR_SUBMENU_STATISTICS="Statistics" +COM_SERMONDISTRIBUTOR_S_COULD_NOT_BE_REMOVE="%s could not be remove" COM_SERMONDISTRIBUTOR_TARGETED_FOLDER="Targeted Folder" COM_SERMONDISTRIBUTOR_THERE_HAS_NO_TARGETS_BEEN_SET_PLEASE_MAKE_SURE_TO_ADD_TARGETS_TO_THIS_EXTERNAL_SOURCE="There has no targets been set, please make sure to add targets to this external source" +COM_SERMONDISTRIBUTOR_THERE_IS_NO_TARGETS_SET_FOR_THIS_SOURCE_CAN_NOT_RESET_THE_UPDATE_STATUS="There is no targets set for this source, can not reset the update status!" COM_SERMONDISTRIBUTOR_THERE_WAS_AN_ERROR_DURING_THE_LAST_UPDATE_ATTEMPT="There was an error during the last update attempt." COM_SERMONDISTRIBUTOR_THE_EXTERNAL_SOURCE_COULD_NOT_BE_FOUND="The external source could not be found." COM_SERMONDISTRIBUTOR_THE_FILES_LINKED_FROM_EXTERNAL_SOURCE="The Files Linked from External Source" @@ -1400,6 +1420,7 @@ COM_SERMONDISTRIBUTOR_THE_NOTICE_BOARD_IS_LOADING="The notice board is loading" COM_SERMONDISTRIBUTOR_THE_README_IS_LOADING="The readme is loading" COM_SERMONDISTRIBUTOR_THE_UPDATE_IS_RUNNING="The update is running." 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_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_USE_BATCH="Use Batch" @@ -1407,4 +1428,7 @@ COM_SERMONDISTRIBUTOR_USE_BATCH_DESC=" Allows users in this group to use batch c 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_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." +COM_SERMONDISTRIBUTOR_YOU_DO_NOT_HAVE_PERMISSION_TO_RESET_UPDATE_STATUS="You do not have permission to reset update status." diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index a079129a..a35bd26b 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage batchselection.php diff --git a/admin/layouts/external_source/wiki_fullwidth.php b/admin/layouts/external_source/build_option_fullwidth.php similarity index 92% rename from admin/layouts/external_source/wiki_fullwidth.php rename to admin/layouts/external_source/build_option_fullwidth.php index 9f3451e3..0f48712b 100644 --- a/admin/layouts/external_source/wiki_fullwidth.php +++ b/admin/layouts/external_source/build_option_fullwidth.php @@ -11,10 +11,10 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor - @subpackage wiki_fullwidth.php + @subpackage build_option_fullwidth.php @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -30,8 +30,9 @@ defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( - 'note_manual_dropbox', - 'note_auto_dropbox' + 'build', + 'note_manual_externalsource', + 'note_auto_externalsource' ); ?> diff --git a/admin/layouts/external_source/details_above.php b/admin/layouts/external_source/details_above.php index 9bd502eb..83e4afdd 100644 --- a/admin/layouts/external_source/details_above.php +++ b/admin/layouts/external_source/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 d83f7f03..06700e1c 100644 --- a/admin/layouts/external_source/details_fullwidth.php +++ b/admin/layouts/external_source/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 1eefa3f0..790073e5 100644 --- a/admin/layouts/external_source/details_left.php +++ b/admin/layouts/external_source/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 aa9fa285..c7bf6c42 100644 --- a/admin/layouts/external_source/details_right.php +++ b/admin/layouts/external_source/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php @@ -30,8 +30,6 @@ defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( - 'build', - 'wiki_check_note', 'update_method', 'update_timer', 'filetypes' diff --git a/admin/layouts/external_source/details_under.php b/admin/layouts/external_source/details_under.php index 7190834b..3b1f684f 100644 --- a/admin/layouts/external_source/details_under.php +++ b/admin/layouts/external_source/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 5ddd979a..30e27531 100644 --- a/admin/layouts/external_source/publishing.php +++ b/admin/layouts/external_source/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 eaa0f3a6..0cb2cc6b 100644 --- a/admin/layouts/external_source/publlshing.php +++ b/admin/layouts/external_source/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 e3c0527b..19720481 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 74c1c486..5a5b3b09 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index 8ab7ed43..57151526 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index ff62d54b..6f56d947 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index 7190834b..3b1f684f 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_under.php diff --git a/admin/layouts/help_document/metadata.php b/admin/layouts/help_document/metadata.php index dbfdb0f3..952f76e1 100644 --- a/admin/layouts/help_document/metadata.php +++ b/admin/layouts/help_document/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage metadata.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 69b281e2..b6631241 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 01843f43..53d2bedb 100644 --- a/admin/layouts/local_listing/details_above.php +++ b/admin/layouts/local_listing/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 8a90f45d..ab4f5e70 100644 --- a/admin/layouts/local_listing/details_fullwidth.php +++ b/admin/layouts/local_listing/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 6148e5a3..9a0592b8 100644 --- a/admin/layouts/local_listing/details_left.php +++ b/admin/layouts/local_listing/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 ed4e56bc..5ba2612b 100644 --- a/admin/layouts/local_listing/details_right.php +++ b/admin/layouts/local_listing/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 5ddd979a..30e27531 100644 --- a/admin/layouts/local_listing/publishing.php +++ b/admin/layouts/local_listing/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 eaa0f3a6..0cb2cc6b 100644 --- a/admin/layouts/local_listing/publlshing.php +++ b/admin/layouts/local_listing/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 0e5022dd..65790aed 100644 --- a/admin/layouts/preacher/details_above.php +++ b/admin/layouts/preacher/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/preacher/details_fullwidth.php b/admin/layouts/preacher/details_fullwidth.php index 1761f30f..e1c38980 100644 --- a/admin/layouts/preacher/details_fullwidth.php +++ b/admin/layouts/preacher/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_fullwidth.php diff --git a/admin/layouts/preacher/details_left.php b/admin/layouts/preacher/details_left.php index 7cb8ec55..bde441d4 100644 --- a/admin/layouts/preacher/details_left.php +++ b/admin/layouts/preacher/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/preacher/details_right.php b/admin/layouts/preacher/details_right.php index f9bdd2f0..afaf94a7 100644 --- a/admin/layouts/preacher/details_right.php +++ b/admin/layouts/preacher/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/preacher/metadata.php b/admin/layouts/preacher/metadata.php index dbfdb0f3..952f76e1 100644 --- a/admin/layouts/preacher/metadata.php +++ b/admin/layouts/preacher/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage metadata.php diff --git a/admin/layouts/preacher/publishing.php b/admin/layouts/preacher/publishing.php index 69b281e2..b6631241 100644 --- a/admin/layouts/preacher/publishing.php +++ b/admin/layouts/preacher/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/layouts/preacher/sermons_fullwidth.php b/admin/layouts/preacher/sermons_fullwidth.php index 198e1ab6..0f5ec42e 100644 --- a/admin/layouts/preacher/sermons_fullwidth.php +++ b/admin/layouts/preacher/sermons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons_fullwidth.php diff --git a/admin/layouts/series/details_above.php b/admin/layouts/series/details_above.php index 0e5022dd..65790aed 100644 --- a/admin/layouts/series/details_above.php +++ b/admin/layouts/series/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/series/details_fullwidth.php b/admin/layouts/series/details_fullwidth.php index 1761f30f..e1c38980 100644 --- a/admin/layouts/series/details_fullwidth.php +++ b/admin/layouts/series/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_fullwidth.php diff --git a/admin/layouts/series/details_left.php b/admin/layouts/series/details_left.php index 7cb8ec55..bde441d4 100644 --- a/admin/layouts/series/details_left.php +++ b/admin/layouts/series/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/series/details_right.php b/admin/layouts/series/details_right.php index b60b6af7..50470001 100644 --- a/admin/layouts/series/details_right.php +++ b/admin/layouts/series/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/series/metadata.php b/admin/layouts/series/metadata.php index dbfdb0f3..952f76e1 100644 --- a/admin/layouts/series/metadata.php +++ b/admin/layouts/series/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage metadata.php diff --git a/admin/layouts/series/publishing.php b/admin/layouts/series/publishing.php index 69b281e2..b6631241 100644 --- a/admin/layouts/series/publishing.php +++ b/admin/layouts/series/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/layouts/series/sermons_fullwidth.php b/admin/layouts/series/sermons_fullwidth.php index ffdc8bdd..77e93451 100644 --- a/admin/layouts/series/sermons_fullwidth.php +++ b/admin/layouts/series/sermons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons_fullwidth.php diff --git a/admin/layouts/sermon/details_above.php b/admin/layouts/sermon/details_above.php index df1e026a..6b6cf5c7 100644 --- a/admin/layouts/sermon/details_above.php +++ b/admin/layouts/sermon/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/sermon/details_fullwidth.php b/admin/layouts/sermon/details_fullwidth.php index 1761f30f..e1c38980 100644 --- a/admin/layouts/sermon/details_fullwidth.php +++ b/admin/layouts/sermon/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_fullwidth.php diff --git a/admin/layouts/sermon/details_left.php b/admin/layouts/sermon/details_left.php index 33d2ad24..4ab5cac4 100644 --- a/admin/layouts/sermon/details_left.php +++ b/admin/layouts/sermon/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/sermon/details_right.php b/admin/layouts/sermon/details_right.php index 2a604336..71ea2565 100644 --- a/admin/layouts/sermon/details_right.php +++ b/admin/layouts/sermon/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/sermon/details_under.php b/admin/layouts/sermon/details_under.php index 1f861227..dd49ec07 100644 --- a/admin/layouts/sermon/details_under.php +++ b/admin/layouts/sermon/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_under.php diff --git a/admin/layouts/sermon/files_fullwidth.php b/admin/layouts/sermon/files_fullwidth.php index e53562df..8a4b118e 100644 --- a/admin/layouts/sermon/files_fullwidth.php +++ b/admin/layouts/sermon/files_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage files_fullwidth.php diff --git a/admin/layouts/sermon/metadata.php b/admin/layouts/sermon/metadata.php index dbfdb0f3..952f76e1 100644 --- a/admin/layouts/sermon/metadata.php +++ b/admin/layouts/sermon/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage metadata.php diff --git a/admin/layouts/sermon/publishing.php b/admin/layouts/sermon/publishing.php index 69b281e2..b6631241 100644 --- a/admin/layouts/sermon/publishing.php +++ b/admin/layouts/sermon/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/layouts/sermon/stastics_fullwidth.php b/admin/layouts/sermon/stastics_fullwidth.php index e474ee17..853d72ad 100644 --- a/admin/layouts/sermon/stastics_fullwidth.php +++ b/admin/layouts/sermon/stastics_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage stastics_fullwidth.php diff --git a/admin/layouts/statistic/details_above.php b/admin/layouts/statistic/details_above.php index 5a44c8c5..16fcac41 100644 --- a/admin/layouts/statistic/details_above.php +++ b/admin/layouts/statistic/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_above.php diff --git a/admin/layouts/statistic/details_left.php b/admin/layouts/statistic/details_left.php index 6b5d325c..1ab2b302 100644 --- a/admin/layouts/statistic/details_left.php +++ b/admin/layouts/statistic/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_left.php diff --git a/admin/layouts/statistic/details_right.php b/admin/layouts/statistic/details_right.php index 53a77dab..a1a04e79 100644 --- a/admin/layouts/statistic/details_right.php +++ b/admin/layouts/statistic/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage details_right.php diff --git a/admin/layouts/statistic/metadata.php b/admin/layouts/statistic/metadata.php index dbfdb0f3..952f76e1 100644 --- a/admin/layouts/statistic/metadata.php +++ b/admin/layouts/statistic/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage metadata.php diff --git a/admin/layouts/statistic/publishing.php b/admin/layouts/statistic/publishing.php index 69b281e2..b6631241 100644 --- a/admin/layouts/statistic/publishing.php +++ b/admin/layouts/statistic/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage publishing.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index b38fbc10..c930b611 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage ajax.php @@ -780,4 +780,9 @@ class SermondistributorModelAjax extends JModelList $rows[$nr] .= ''.$value.''; } } + + public function getSourceStatus($id) + { + return SermondistributorHelper::getSourceStatus($id); + } } diff --git a/admin/models/external_source.php b/admin/models/external_source.php index 3381a84d..ad51b294 100644 --- a/admin/models/external_source.php +++ b/admin/models/external_source.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage external_source.php @@ -64,6 +64,80 @@ class SermondistributorModelExternal_source extends JModelAdmin public function getTable($type = 'external_source', $prefix = 'SermondistributorTable', $config = array()) { return JTable::getInstance($type, $prefix, $config); + } + + public function clearLocalListing($id) + { + // clear local listing + if ($id > 0) + { + $db = JFactory::getDbo(); + $query = $db->getQuery(true); + + $conditions = array( + $db->quoteName('external_source') . ' = ' . (int) $id + ); + + $query->delete($db->quoteName('#__sermondistributor_local_listing')); + $query->where($conditions); + + $db->setQuery($query); + + return $db->execute(); + } + return false; + } + + public function resetUpdateStatus($id) + { + // reset the update status + if ($id > 0) + { + if ($targets = SermondistributorHelper::getExternalListingUpdateKeys($id, null)) + { + // import the Joomla librarys + jimport('joomla.filesystem.file'); + $errors = array(); + foreach ($targets as $target) + { + // build info file key + $targetArray = explode(', ', $target); + $targetArray[2] = ($targetArray[2] == 2) ? 'auto' : 'manual'; + $infoFileKey = SermondistributorHelper::safeString(implode('', $targetArray)); + $infoFileName = md5($infoFileKey.'info').'.json'; + // info on update path + $infoFilePath = JPATH_COMPONENT_SITE.'/helpers/'.$infoFileName; + // now remove file if found + if (JFile::exists($infoFilePath)) + { + if (!JFile::delete($infoFilePath)) + { + $errors[] = JText::sprintf('COM_SERMONDISTRIBUTOR_S_COULD_NOT_BE_REMOVE', $infoFileName); + } + } + // remove any notice on update errors + $key = preg_replace('/[ ,]+/', '', trim($target)); + $noticeFilePath = SermondistributorHelper::getFilePath('update', 'error', $key, '.txt', JPATH_COMPONENT_ADMINISTRATOR); + // now remove file if found + if (JFile::exists($noticeFilePath)) + { + if (!JFile::delete($noticeFilePath)) + { + $noticeFileName = basename($noticeFilePath); + $errors[] = JText::sprintf('COM_SERMONDISTRIBUTOR_S_COULD_NOT_BE_REMOVE', $noticeFileName); + } + } + } + // check if there was an error + if (SermondistributorHelper::checkArray($errors)) + { + return array('error' => '
        • '.implode('
        • ', $errors).'
        '); + } + return true; + } + return array('error' => JText::_('COM_SERMONDISTRIBUTOR_THERE_IS_NO_TARGETS_SET_FOR_THIS_SOURCE_CAN_NOT_RESET_THE_UPDATE_STATUS')); + } + return array('error' => JText::_('COM_SERMONDISTRIBUTOR_NO_ID_FOUND_CAN_NOT_RESET_THE_UPDATE_STATUS')); } /** @@ -278,39 +352,23 @@ class SermondistributorModelExternal_source extends JModelAdmin $form->setFieldAttribute('build', 'required', 'false'); } } - // Modify the form based on Edit Permissiontype access controls. - if ($id != 0 && (!$user->authorise('external_source.edit.permissiontype', 'com_sermondistributor.external_source.' . (int) $id)) - || ($id == 0 && !$user->authorise('external_source.edit.permissiontype', 'com_sermondistributor'))) + // Modify the form based on Edit Folder access controls. + if ($id != 0 && (!$user->authorise('external_source.edit.folder', 'com_sermondistributor.external_source.' . (int) $id)) + || ($id == 0 && !$user->authorise('external_source.edit.folder', 'com_sermondistributor'))) { // Disable fields for display. - $form->setFieldAttribute('permissiontype', 'disabled', 'true'); + $form->setFieldAttribute('folder', 'disabled', 'true'); // Disable fields for display. - $form->setFieldAttribute('permissiontype', 'readonly', 'true'); + $form->setFieldAttribute('folder', 'readonly', 'true'); // Disable radio button for display. - $class = $form->getFieldAttribute('permissiontype', 'class', ''); - $form->setFieldAttribute('permissiontype', 'class', $class.' disabled no-click'); - if (!$form->getValue('permissiontype')) + $class = $form->getFieldAttribute('folder', 'class', ''); + $form->setFieldAttribute('folder', 'class', $class.' disabled no-click'); + if (!$form->getValue('folder')) { // Disable fields while saving. - $form->setFieldAttribute('permissiontype', 'filter', 'unset'); + $form->setFieldAttribute('folder', 'filter', 'unset'); // Disable fields while saving. - $form->setFieldAttribute('permissiontype', 'required', 'false'); - } - } - // Modify the form based on Edit Update Timer access controls. - if ($id != 0 && (!$user->authorise('external_source.edit.update_timer', 'com_sermondistributor.external_source.' . (int) $id)) - || ($id == 0 && !$user->authorise('external_source.edit.update_timer', 'com_sermondistributor'))) - { - // Disable fields for display. - $form->setFieldAttribute('update_timer', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('update_timer', 'readonly', 'true'); - if (!$form->getValue('update_timer')) - { - // Disable fields while saving. - $form->setFieldAttribute('update_timer', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('update_timer', 'required', 'false'); + $form->setFieldAttribute('folder', 'required', 'false'); } } // Modify the form based on Edit Dropboxoptions access controls. @@ -332,23 +390,39 @@ class SermondistributorModelExternal_source extends JModelAdmin $form->setFieldAttribute('dropboxoptions', 'required', 'false'); } } - // Modify the form based on Edit Folder access controls. - if ($id != 0 && (!$user->authorise('external_source.edit.folder', 'com_sermondistributor.external_source.' . (int) $id)) - || ($id == 0 && !$user->authorise('external_source.edit.folder', 'com_sermondistributor'))) + // Modify the form based on Edit Update Timer access controls. + if ($id != 0 && (!$user->authorise('external_source.edit.update_timer', 'com_sermondistributor.external_source.' . (int) $id)) + || ($id == 0 && !$user->authorise('external_source.edit.update_timer', 'com_sermondistributor'))) { // Disable fields for display. - $form->setFieldAttribute('folder', 'disabled', 'true'); + $form->setFieldAttribute('update_timer', 'disabled', 'true'); // Disable fields for display. - $form->setFieldAttribute('folder', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('folder', 'class', ''); - $form->setFieldAttribute('folder', 'class', $class.' disabled no-click'); - if (!$form->getValue('folder')) + $form->setFieldAttribute('update_timer', 'readonly', 'true'); + if (!$form->getValue('update_timer')) { // Disable fields while saving. - $form->setFieldAttribute('folder', 'filter', 'unset'); + $form->setFieldAttribute('update_timer', 'filter', 'unset'); // Disable fields while saving. - $form->setFieldAttribute('folder', 'required', 'false'); + $form->setFieldAttribute('update_timer', 'required', 'false'); + } + } + // Modify the form based on Edit Permissiontype access controls. + if ($id != 0 && (!$user->authorise('external_source.edit.permissiontype', 'com_sermondistributor.external_source.' . (int) $id)) + || ($id == 0 && !$user->authorise('external_source.edit.permissiontype', 'com_sermondistributor'))) + { + // Disable fields for display. + $form->setFieldAttribute('permissiontype', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('permissiontype', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('permissiontype', 'class', ''); + $form->setFieldAttribute('permissiontype', 'class', $class.' disabled no-click'); + if (!$form->getValue('permissiontype')) + { + // Disable fields while saving. + $form->setFieldAttribute('permissiontype', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('permissiontype', 'required', 'false'); } } // Modify the form based on Edit Sharedurl access controls. diff --git a/admin/models/external_sources.php b/admin/models/external_sources.php index d43586b1..4b33f6db 100644 --- a/admin/models/external_sources.php +++ b/admin/models/external_sources.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage external_sources.php diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 565cecd4..740b768f 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 fe6a2ae7..fc01c998 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 7ed1cb5e..de172112 100644 --- a/admin/models/fields/externalsource.php +++ b/admin/models/fields/externalsource.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 1c4e3369..395fd180 100644 --- a/admin/models/fields/externalsourcefiles.php +++ b/admin/models/fields/externalsourcefiles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 9747df78..57bc4865 100644 --- a/admin/models/fields/localfiles.php +++ b/admin/models/fields/localfiles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 ffd48fdc..8c53964b 100644 --- a/admin/models/fields/preachers.php +++ b/admin/models/fields/preachers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 d8729d86..6ecb3617 100644 --- a/admin/models/fields/series.php +++ b/admin/models/fields/series.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 7a5b9edd..576564ed 100644 --- a/admin/models/fields/sermon.php +++ b/admin/models/fields/sermon.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 4ca1a268..98c4e559 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage siteviewfolderlist.php diff --git a/admin/models/forms/external_source.js b/admin/models/forms/external_source.js index 86cf2092..0ddfb4bc 100644 --- a/admin/models/forms/external_source.js +++ b/admin/models/forms/external_source.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage external_source.js @@ -23,7 +23,8 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvwmvwd_required = false; +jform_vvvvvwjvwd_required = false; +jform_vvvvvwmvwe_required = false; // Initial Script jQuery(document).ready(function() @@ -257,10 +258,27 @@ function vvvvvwj(update_method_vvvvvwj) if (update_method_vvvvvwj == 2) { jQuery('#jform_update_timer').closest('.control-group').show(); + if (jform_vvvvvwjvwd_required) + { + updateFieldRequired('update_timer',0); + jQuery('#jform_update_timer').prop('required','required'); + jQuery('#jform_update_timer').attr('aria-required',true); + jQuery('#jform_update_timer').addClass('required'); + jform_vvvvvwjvwd_required = false; + } + } else { jQuery('#jform_update_timer').closest('.control-group').hide(); + if (!jform_vvvvvwjvwd_required) + { + updateFieldRequired('update_timer',1); + jQuery('#jform_update_timer').removeAttr('required'); + jQuery('#jform_update_timer').removeAttr('aria-required'); + jQuery('#jform_update_timer').removeClass('required'); + jform_vvvvvwjvwd_required = true; + } } } @@ -283,11 +301,11 @@ function vvvvvwk(build_vvvvvwk) // set this function logic if (build) { - jQuery('.note_auto_dropbox').closest('.control-group').show(); + jQuery('.note_auto_externalsource').closest('.control-group').show(); } else { - jQuery('.note_auto_dropbox').closest('.control-group').hide(); + jQuery('.note_auto_externalsource').closest('.control-group').hide(); } } @@ -321,11 +339,11 @@ function vvvvvwl(build_vvvvvwl) // set this function logic if (build) { - jQuery('.note_manual_dropbox').closest('.control-group').show(); + jQuery('.note_manual_externalsource').closest('.control-group').show(); } else { - jQuery('.note_manual_dropbox').closest('.control-group').hide(); + jQuery('.note_manual_externalsource').closest('.control-group').hide(); } } @@ -372,26 +390,26 @@ function vvvvvwm(externalsources_vvvvvwm,update_method_vvvvvwm) if (externalsources && update_method) { jQuery('#jform_oauthtoken').closest('.control-group').show(); - if (jform_vvvvvwmvwd_required) + if (jform_vvvvvwmvwe_required) { updateFieldRequired('oauthtoken',0); jQuery('#jform_oauthtoken').prop('required','required'); jQuery('#jform_oauthtoken').attr('aria-required',true); jQuery('#jform_oauthtoken').addClass('required'); - jform_vvvvvwmvwd_required = false; + jform_vvvvvwmvwe_required = false; } } else { jQuery('#jform_oauthtoken').closest('.control-group').hide(); - if (!jform_vvvvvwmvwd_required) + if (!jform_vvvvvwmvwe_required) { updateFieldRequired('oauthtoken',1); jQuery('#jform_oauthtoken').removeAttr('required'); jQuery('#jform_oauthtoken').removeAttr('aria-required'); jQuery('#jform_oauthtoken').removeClass('required'); - jform_vvvvvwmvwd_required = true; + jform_vvvvvwmvwe_required = true; } } } @@ -1002,11 +1020,9 @@ function vvvvvww(build_vvvvvww) // set this function logic if (build) { - jQuery('.wiki_check_note').closest('.control-group').show(); } else { - jQuery('.wiki_check_note').closest('.control-group').hide(); } } @@ -1067,8 +1083,38 @@ jQuery(document).ready(function() if (folders) { getBuildTable(folders,'jform_folder'); } + var source_id = jQuery('#jform_id').val(); + if (source_id) { + getSourceStatus(source_id); + } jQuery('.save-modal-data').text('Done'); }); +function getSourceStatus_server(sourceID){ + var getUrl = "index.php?option=com_sermondistributor&task=ajax.getSourceStatus&format=json"; + if(token.length > 0 && sourceID > 0){ + var request = 'token='+token+'&id='+sourceID; + } + return jQuery.ajax({ + type: 'GET', + url: getUrl, + dataType: 'jsonp', + data: request, + jsonp: 'callback' + }); +} +function getSourceStatus(sourceID){ + getSourceStatus_server(sourceID).done(function(result) { + if(result){ + setSourceStatus(result); + } else { + jQuery('#sourceStatus').remove(); + } + }) +} +function setSourceStatus(result){ + jQuery('#sourceStatus').remove(); + jQuery('#jform_update_method').closest('.control-group').append('

        '+result+'
        '); +} function getBuildTable_server(string,idName){ var getUrl = "index.php?option=com_sermondistributor&task=ajax.getBuildTable&format=json"; if(token.length > 0 && string.length > 0 && idName.length > 0){ diff --git a/admin/models/forms/external_source.xml b/admin/models/forms/external_source.xml index 99069063..64758335 100644 --- a/admin/models/forms/external_source.xml +++ b/admin/models/forms/external_source.xml @@ -215,46 +215,6 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + - - + + + + + + - - + + diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index f0f428d1..93895f35 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help_document.js @@ -23,12 +23,12 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvxavwe_required = false; -jform_vvvvvxbvwf_required = false; -jform_vvvvvxcvwg_required = false; -jform_vvvvvxdvwh_required = false; -jform_vvvvvxevwi_required = false; -jform_vvvvvxfvwj_required = false; +jform_vvvvvxavwf_required = false; +jform_vvvvvxbvwg_required = false; +jform_vvvvvxcvwh_required = false; +jform_vvvvvxdvwi_required = false; +jform_vvvvvxevwj_required = false; +jform_vvvvvxfvwk_required = false; // Initial Script jQuery(document).ready(function() @@ -59,26 +59,26 @@ function vvvvvxa(location_vvvvvxa) if (location_vvvvvxa == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); - if (jform_vvvvvxavwe_required) + if (jform_vvvvvxavwf_required) { updateFieldRequired('admin_view',0); jQuery('#jform_admin_view').prop('required','required'); jQuery('#jform_admin_view').attr('aria-required',true); jQuery('#jform_admin_view').addClass('required'); - jform_vvvvvxavwe_required = false; + jform_vvvvvxavwf_required = false; } } else { jQuery('#jform_admin_view').closest('.control-group').hide(); - if (!jform_vvvvvxavwe_required) + if (!jform_vvvvvxavwf_required) { updateFieldRequired('admin_view',1); jQuery('#jform_admin_view').removeAttr('required'); jQuery('#jform_admin_view').removeAttr('aria-required'); jQuery('#jform_admin_view').removeClass('required'); - jform_vvvvvxavwe_required = true; + jform_vvvvvxavwf_required = true; } } } @@ -90,26 +90,26 @@ function vvvvvxb(location_vvvvvxb) if (location_vvvvvxb == 2) { jQuery('#jform_site_view').closest('.control-group').show(); - if (jform_vvvvvxbvwf_required) + if (jform_vvvvvxbvwg_required) { updateFieldRequired('site_view',0); jQuery('#jform_site_view').prop('required','required'); jQuery('#jform_site_view').attr('aria-required',true); jQuery('#jform_site_view').addClass('required'); - jform_vvvvvxbvwf_required = false; + jform_vvvvvxbvwg_required = false; } } else { jQuery('#jform_site_view').closest('.control-group').hide(); - if (!jform_vvvvvxbvwf_required) + if (!jform_vvvvvxbvwg_required) { updateFieldRequired('site_view',1); jQuery('#jform_site_view').removeAttr('required'); jQuery('#jform_site_view').removeAttr('aria-required'); jQuery('#jform_site_view').removeClass('required'); - jform_vvvvvxbvwf_required = true; + jform_vvvvvxbvwg_required = true; } } } @@ -134,26 +134,26 @@ function vvvvvxc(type_vvvvvxc) if (type) { jQuery('#jform_url').closest('.control-group').show(); - if (jform_vvvvvxcvwg_required) + if (jform_vvvvvxcvwh_required) { updateFieldRequired('url',0); jQuery('#jform_url').prop('required','required'); jQuery('#jform_url').attr('aria-required',true); jQuery('#jform_url').addClass('required'); - jform_vvvvvxcvwg_required = false; + jform_vvvvvxcvwh_required = false; } } else { jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_vvvvvxcvwg_required) + if (!jform_vvvvvxcvwh_required) { updateFieldRequired('url',1); jQuery('#jform_url').removeAttr('required'); jQuery('#jform_url').removeAttr('aria-required'); jQuery('#jform_url').removeClass('required'); - jform_vvvvvxcvwg_required = true; + jform_vvvvvxcvwh_required = true; } } } @@ -189,26 +189,26 @@ function vvvvvxd(type_vvvvvxd) if (type) { jQuery('#jform_article').closest('.control-group').show(); - if (jform_vvvvvxdvwh_required) + if (jform_vvvvvxdvwi_required) { updateFieldRequired('article',0); jQuery('#jform_article').prop('required','required'); jQuery('#jform_article').attr('aria-required',true); jQuery('#jform_article').addClass('required'); - jform_vvvvvxdvwh_required = false; + jform_vvvvvxdvwi_required = false; } } else { jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_vvvvvxdvwh_required) + if (!jform_vvvvvxdvwi_required) { updateFieldRequired('article',1); jQuery('#jform_article').removeAttr('required'); jQuery('#jform_article').removeAttr('aria-required'); jQuery('#jform_article').removeClass('required'); - jform_vvvvvxdvwh_required = true; + jform_vvvvvxdvwi_required = true; } } } @@ -244,26 +244,26 @@ function vvvvvxe(type_vvvvvxe) if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_vvvvvxevwi_required) + if (jform_vvvvvxevwj_required) { updateFieldRequired('content',0); jQuery('#jform_content').prop('required','required'); jQuery('#jform_content').attr('aria-required',true); jQuery('#jform_content').addClass('required'); - jform_vvvvvxevwi_required = false; + jform_vvvvvxevwj_required = false; } } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_vvvvvxevwi_required) + if (!jform_vvvvvxevwj_required) { updateFieldRequired('content',1); jQuery('#jform_content').removeAttr('required'); jQuery('#jform_content').removeAttr('aria-required'); jQuery('#jform_content').removeClass('required'); - jform_vvvvvxevwi_required = true; + jform_vvvvvxevwj_required = true; } } } @@ -286,26 +286,26 @@ function vvvvvxf(target_vvvvvxf) if (target_vvvvvxf == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_vvvvvxfvwj_required) + if (jform_vvvvvxfvwk_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_vvvvvxfvwj_required = false; + jform_vvvvvxfvwk_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_vvvvvxfvwj_required) + if (!jform_vvvvvxfvwk_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_vvvvvxfvwj_required = true; + jform_vvvvvxfvwk_required = true; } } } diff --git a/admin/models/forms/local_listing.js b/admin/models/forms/local_listing.js index c973ce70..0ab9d0a9 100644 --- a/admin/models/forms/local_listing.js +++ b/admin/models/forms/local_listing.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage local_listing.js diff --git a/admin/models/forms/preacher.js b/admin/models/forms/preacher.js index ad4c715c..89df1f3d 100644 --- a/admin/models/forms/preacher.js +++ b/admin/models/forms/preacher.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.js diff --git a/admin/models/forms/series.js b/admin/models/forms/series.js index 1b734849..42d331f3 100644 --- a/admin/models/forms/series.js +++ b/admin/models/forms/series.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series.js diff --git a/admin/models/forms/sermon.js b/admin/models/forms/sermon.js index a22a73b8..d97f4491 100644 --- a/admin/models/forms/sermon.js +++ b/admin/models/forms/sermon.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.js diff --git a/admin/models/forms/statistic.js b/admin/models/forms/statistic.js index f4bc0677..d86e12da 100644 --- a/admin/models/forms/statistic.js +++ b/admin/models/forms/statistic.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage statistic.js diff --git a/admin/models/help_document.php b/admin/models/help_document.php index 5c840961..0739ce49 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help_document.php diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index b315aba9..ecd40c58 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help_documents.php diff --git a/admin/models/import.php b/admin/models/import.php index f00d7d00..04e935f4 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage import.php diff --git a/admin/models/local_listing.php b/admin/models/local_listing.php index 2487dbdd..39f32682 100644 --- a/admin/models/local_listing.php +++ b/admin/models/local_listing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage local_listing.php diff --git a/admin/models/local_listings.php b/admin/models/local_listings.php index 0d499c67..5f39b7bd 100644 --- a/admin/models/local_listings.php +++ b/admin/models/local_listings.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage local_listings.php diff --git a/admin/models/manual_updater.php b/admin/models/manual_updater.php index 262dd0f2..2d95597d 100644 --- a/admin/models/manual_updater.php +++ b/admin/models/manual_updater.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage manual_updater.php diff --git a/admin/models/preacher.php b/admin/models/preacher.php index b677cc84..ee3bea54 100644 --- a/admin/models/preacher.php +++ b/admin/models/preacher.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.php diff --git a/admin/models/preachers.php b/admin/models/preachers.php index e87f4a90..dfe4922d 100644 --- a/admin/models/preachers.php +++ b/admin/models/preachers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.php diff --git a/admin/models/series.php b/admin/models/series.php index 26442d01..e8d10979 100644 --- a/admin/models/series.php +++ b/admin/models/series.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php diff --git a/admin/models/series_list.php b/admin/models/series_list.php index 1e6cd915..68f4c03f 100644 --- a/admin/models/series_list.php +++ b/admin/models/series_list.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series_list.php diff --git a/admin/models/sermon.php b/admin/models/sermon.php index 07ba98f0..1d094e07 100644 --- a/admin/models/sermon.php +++ b/admin/models/sermon.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php diff --git a/admin/models/sermondistributor.php b/admin/models/sermondistributor.php index e1cf39a9..625f6cab 100644 --- a/admin/models/sermondistributor.php +++ b/admin/models/sermondistributor.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php diff --git a/admin/models/sermons.php b/admin/models/sermons.php index 682f3e65..0f593cfc 100644 --- a/admin/models/sermons.php +++ b/admin/models/sermons.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermons.php diff --git a/admin/models/statistic.php b/admin/models/statistic.php index 1d1d2c96..1273daec 100644 --- a/admin/models/statistic.php +++ b/admin/models/statistic.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage statistic.php diff --git a/admin/models/statistics.php b/admin/models/statistics.php index 0726695d..69df7377 100644 --- a/admin/models/statistics.php +++ b/admin/models/statistics.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage statistics.php diff --git a/admin/sermondistributor.php b/admin/sermondistributor.php index 21760869..f8c854d4 100644 --- a/admin/sermondistributor.php +++ b/admin/sermondistributor.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index b15885f9..e5edbf5b 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -185,8 +185,8 @@ CREATE TABLE IF NOT EXISTS `#__sermondistributor_external_source` ( KEY `idx_externalsources` (`externalsources`), KEY `idx_update_method` (`update_method`), KEY `idx_build` (`build`), - KEY `idx_permissiontype` (`permissiontype`), - KEY `idx_dropboxoptions` (`dropboxoptions`) + KEY `idx_dropboxoptions` (`dropboxoptions`), + KEY `idx_permissiontype` (`permissiontype`) ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__sermondistributor_local_listing` ( diff --git a/admin/tables/external_source.php b/admin/tables/external_source.php index 2ce9c424..67f2984c 100644 --- a/admin/tables/external_source.php +++ b/admin/tables/external_source.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage external_source.php diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index 4b1ad1d8..6cb5aef8 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help_document.php diff --git a/admin/tables/local_listing.php b/admin/tables/local_listing.php index ddb504b4..b872b8d0 100644 --- a/admin/tables/local_listing.php +++ b/admin/tables/local_listing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage local_listing.php diff --git a/admin/tables/preacher.php b/admin/tables/preacher.php index b41f10da..04c5537f 100644 --- a/admin/tables/preacher.php +++ b/admin/tables/preacher.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.php diff --git a/admin/tables/series.php b/admin/tables/series.php index 5f3db2fa..7e031b8c 100644 --- a/admin/tables/series.php +++ b/admin/tables/series.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php diff --git a/admin/tables/sermon.php b/admin/tables/sermon.php index 733350a8..04e7dcd9 100644 --- a/admin/tables/sermon.php +++ b/admin/tables/sermon.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php diff --git a/admin/tables/statistic.php b/admin/tables/statistic.php index 10c9f233..86d927af 100644 --- a/admin/tables/statistic.php +++ b/admin/tables/statistic.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage statistic.php diff --git a/admin/views/external_source/submitbutton.js b/admin/views/external_source/submitbutton.js index c27f2ee7..1ff3ca25 100644 --- a/admin/views/external_source/submitbutton.js +++ b/admin/views/external_source/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage submitbutton.js diff --git a/admin/views/external_source/tmpl/edit.php b/admin/views/external_source/tmpl/edit.php index c81ee3eb..5e87fcdc 100644 --- a/admin/views/external_source/tmpl/edit.php +++ b/admin/views/external_source/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage edit.php @@ -78,12 +78,12 @@ $componentParams = JComponentHelper::getParams('com_sermondistributor'); - +
        - +
        diff --git a/admin/views/external_source/view.html.php b/admin/views/external_source/view.html.php index 891fab37..a73fc652 100644 --- a/admin/views/external_source/view.html.php +++ b/admin/views/external_source/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php @@ -152,6 +152,16 @@ class SermondistributorViewExternal_source extends JViewLegacy { JToolBarHelper::custom('external_source.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false); } + if ($this->canDo->get('external_source.clear_local_listing')) + { + // add Clear Local Listing button. + JToolBarHelper::custom('external_source.clearLocalListing', 'delete', '', 'COM_SERMONDISTRIBUTOR_CLEAR_LOCAL_LISTING', false); + } + if ($this->canDo->get('external_source.reset_update_status')) + { + // add Reset Update Status button. + JToolBarHelper::custom('external_source.resetUpdateStatus', 'undo-2', '', 'COM_SERMONDISTRIBUTOR_RESET_UPDATE_STATUS', false); + } JToolBarHelper::cancel('external_source.cancel', 'JTOOLBAR_CLOSE'); } } @@ -196,11 +206,7 @@ class SermondistributorViewExternal_source extends JViewLegacy // Add Ajax Token $document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); $document->addScript(JURI::root() . $this->script); - $document->addScript(JURI::root() . "administrator/components/com_sermondistributor/views/external_source/submitbutton.js"); - // add JavaScripts - $document->addScript( JURI::root(true) .'/media/com_sermondistributor/uikit/js/uikit.min.js' ); - // add the style sheets - $document->addStyleSheet( JURI::root(true) .'/media/com_sermondistributor/uikit/css/uikit.gradient.min.css' ); + $document->addScript(JURI::root() . "administrator/components/com_sermondistributor/views/external_source/submitbutton.js"); JText::script('view not acceptable. Error'); } } diff --git a/admin/views/external_sources/tmpl/default.php b/admin/views/external_sources/tmpl/default.php index 714825f7..d4f33d03 100644 --- a/admin/views/external_sources/tmpl/default.php +++ b/admin/views/external_sources/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/external_sources/tmpl/default_batch_body.php b/admin/views/external_sources/tmpl/default_batch_body.php index 3473b5ee..3d939d3d 100644 --- a/admin/views/external_sources/tmpl/default_batch_body.php +++ b/admin/views/external_sources/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_body.php diff --git a/admin/views/external_sources/tmpl/default_batch_footer.php b/admin/views/external_sources/tmpl/default_batch_footer.php index 72bdbc73..aebd77fe 100644 --- a/admin/views/external_sources/tmpl/default_batch_footer.php +++ b/admin/views/external_sources/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_footer.php diff --git a/admin/views/external_sources/tmpl/default_body.php b/admin/views/external_sources/tmpl/default_body.php index 19a741f0..d7cb38a7 100644 --- a/admin/views/external_sources/tmpl/default_body.php +++ b/admin/views/external_sources/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_body.php @@ -89,17 +89,8 @@ $edit = "index.php?option=com_sermondistributor&view=external_sources&task=exter externalsources); ?> - - get('external_source.edit')): ?> -
        - update_method); ?> - checked_out): ?> - name, $item->checked_out_time, 'external_sources.', $canCheckin); ?> - -
        - -
        update_method); ?>
        - + + update_method); ?> filetypes); ?> diff --git a/admin/views/external_sources/tmpl/default_foot.php b/admin/views/external_sources/tmpl/default_foot.php index 209c8c55..04351172 100644 --- a/admin/views/external_sources/tmpl/default_foot.php +++ b/admin/views/external_sources/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_foot.php diff --git a/admin/views/external_sources/tmpl/default_head.php b/admin/views/external_sources/tmpl/default_head.php index 8b2065b4..8b6f3549 100644 --- a/admin/views/external_sources/tmpl/default_head.php +++ b/admin/views/external_sources/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_head.php @@ -49,7 +49,7 @@ defined('_JEXEC') or die('Restricted access'); listDirn, $this->listOrder); ?> - + listDirn, $this->listOrder); ?> diff --git a/admin/views/external_sources/tmpl/default_toolbar.php b/admin/views/external_sources/tmpl/default_toolbar.php index 117708aa..d380b470 100644 --- a/admin/views/external_sources/tmpl/default_toolbar.php +++ b/admin/views/external_sources/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_toolbar.php diff --git a/admin/views/external_sources/view.html.php b/admin/views/external_sources/view.html.php index 2910e86d..a5eee7a2 100644 --- a/admin/views/external_sources/view.html.php +++ b/admin/views/external_sources/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js index 77f458f1..acef21cf 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage submitbutton.js diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php index 2940995c..667e1137 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage edit.php diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index 525a2671..97f08b03 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php index 25373c44..9078bf59 100644 --- a/admin/views/help_documents/tmpl/default.php +++ b/admin/views/help_documents/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php index 61998bdd..17158550 100644 --- a/admin/views/help_documents/tmpl/default_batch_body.php +++ b/admin/views/help_documents/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_body.php diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php index f7119f83..9e41b08c 100644 --- a/admin/views/help_documents/tmpl/default_batch_footer.php +++ b/admin/views/help_documents/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_footer.php diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php index 2d624e75..0215af6f 100644 --- a/admin/views/help_documents/tmpl/default_body.php +++ b/admin/views/help_documents/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_body.php diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php index 594a8ee5..3bbcbbbd 100644 --- a/admin/views/help_documents/tmpl/default_foot.php +++ b/admin/views/help_documents/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_foot.php diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php index c9976482..b153f1b3 100644 --- a/admin/views/help_documents/tmpl/default_head.php +++ b/admin/views/help_documents/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_head.php diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php index a7469f66..1caa83c2 100644 --- a/admin/views/help_documents/tmpl/default_toolbar.php +++ b/admin/views/help_documents/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_toolbar.php diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index 2a5699c5..127e8227 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index 916c9575..4488452a 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 02cf587a..8167f800 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/admin/views/local_listing/submitbutton.js b/admin/views/local_listing/submitbutton.js index dc2836e9..eb81b0c2 100644 --- a/admin/views/local_listing/submitbutton.js +++ b/admin/views/local_listing/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage submitbutton.js diff --git a/admin/views/local_listing/tmpl/edit.php b/admin/views/local_listing/tmpl/edit.php index 1ab3e1f9..87b37e29 100644 --- a/admin/views/local_listing/tmpl/edit.php +++ b/admin/views/local_listing/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage edit.php diff --git a/admin/views/local_listing/view.html.php b/admin/views/local_listing/view.html.php index 489f2543..6bda090f 100644 --- a/admin/views/local_listing/view.html.php +++ b/admin/views/local_listing/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/admin/views/local_listings/tmpl/default.php b/admin/views/local_listings/tmpl/default.php index 31276566..81b26424 100644 --- a/admin/views/local_listings/tmpl/default.php +++ b/admin/views/local_listings/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/local_listings/tmpl/default_batch_body.php b/admin/views/local_listings/tmpl/default_batch_body.php index 1304bee7..4f236b19 100644 --- a/admin/views/local_listings/tmpl/default_batch_body.php +++ b/admin/views/local_listings/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_body.php diff --git a/admin/views/local_listings/tmpl/default_batch_footer.php b/admin/views/local_listings/tmpl/default_batch_footer.php index 8847abfd..367e9fb0 100644 --- a/admin/views/local_listings/tmpl/default_batch_footer.php +++ b/admin/views/local_listings/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_footer.php diff --git a/admin/views/local_listings/tmpl/default_body.php b/admin/views/local_listings/tmpl/default_body.php index ba684f95..bc991b08 100644 --- a/admin/views/local_listings/tmpl/default_body.php +++ b/admin/views/local_listings/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_body.php @@ -92,8 +92,14 @@ $edit = "index.php?option=com_sermondistributor&view=local_listings&task=local_l escape($item->size); ?> - - escape($item->external_source_description); ?> + + user->authorise('external_source.edit', 'com_sermondistributor.external_source.' . (int)$item->external_source)): ?> +
        + escape($item->external_source_description); ?> +
        + +
        escape($item->external_source_description); ?>
        + escape($item->key); ?> diff --git a/admin/views/local_listings/tmpl/default_foot.php b/admin/views/local_listings/tmpl/default_foot.php index 209c8c55..04351172 100644 --- a/admin/views/local_listings/tmpl/default_foot.php +++ b/admin/views/local_listings/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_foot.php diff --git a/admin/views/local_listings/tmpl/default_head.php b/admin/views/local_listings/tmpl/default_head.php index b9e36b91..e1ec2624 100644 --- a/admin/views/local_listings/tmpl/default_head.php +++ b/admin/views/local_listings/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_head.php @@ -52,7 +52,7 @@ defined('_JEXEC') or die('Restricted access'); listDirn, $this->listOrder); ?> - + listDirn, $this->listOrder); ?> diff --git a/admin/views/local_listings/tmpl/default_toolbar.php b/admin/views/local_listings/tmpl/default_toolbar.php index 4373cecb..18ff79eb 100644 --- a/admin/views/local_listings/tmpl/default_toolbar.php +++ b/admin/views/local_listings/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_toolbar.php diff --git a/admin/views/local_listings/view.html.php b/admin/views/local_listings/view.html.php index 4dc73b3e..9ffd9e46 100644 --- a/admin/views/local_listings/view.html.php +++ b/admin/views/local_listings/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/admin/views/manual_updater/tmpl/default.php b/admin/views/manual_updater/tmpl/default.php index bf6f5a59..94c63102 100644 --- a/admin/views/manual_updater/tmpl/default.php +++ b/admin/views/manual_updater/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php @@ -101,7 +101,8 @@ jQuery(document).ready(function($) { id, 1, 2); ?> - id, $item->id.$target.$item->build)): ?> + id.$target.$item->build); ?> + id.$target.$item->build); ?> JText::_('COM_SERMONDISTRIBUTOR_THERE_WAS_AN_ERROR_DURING_THE_LAST_UPDATE_ATTEMPT')), $error); ?> diff --git a/admin/views/manual_updater/view.html.php b/admin/views/manual_updater/view.html.php index 70f8cf84..8d561ed6 100644 --- a/admin/views/manual_updater/view.html.php +++ b/admin/views/manual_updater/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/admin/views/preacher/submitbutton.js b/admin/views/preacher/submitbutton.js index 4f970f49..5cfa346b 100644 --- a/admin/views/preacher/submitbutton.js +++ b/admin/views/preacher/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage submitbutton.js diff --git a/admin/views/preacher/tmpl/edit.php b/admin/views/preacher/tmpl/edit.php index 19c98960..45bf3192 100644 --- a/admin/views/preacher/tmpl/edit.php +++ b/admin/views/preacher/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage edit.php diff --git a/admin/views/preacher/view.html.php b/admin/views/preacher/view.html.php index 39810e01..9ea030a8 100644 --- a/admin/views/preacher/view.html.php +++ b/admin/views/preacher/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/admin/views/preachers/tmpl/default.php b/admin/views/preachers/tmpl/default.php index f19b6f97..93bd8229 100644 --- a/admin/views/preachers/tmpl/default.php +++ b/admin/views/preachers/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/preachers/tmpl/default_batch_body.php b/admin/views/preachers/tmpl/default_batch_body.php index 35ae8df3..4db32f3a 100644 --- a/admin/views/preachers/tmpl/default_batch_body.php +++ b/admin/views/preachers/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_body.php diff --git a/admin/views/preachers/tmpl/default_batch_footer.php b/admin/views/preachers/tmpl/default_batch_footer.php index a157ac99..02325c83 100644 --- a/admin/views/preachers/tmpl/default_batch_footer.php +++ b/admin/views/preachers/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_footer.php diff --git a/admin/views/preachers/tmpl/default_body.php b/admin/views/preachers/tmpl/default_body.php index 332ee820..b6430657 100644 --- a/admin/views/preachers/tmpl/default_body.php +++ b/admin/views/preachers/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_body.php diff --git a/admin/views/preachers/tmpl/default_foot.php b/admin/views/preachers/tmpl/default_foot.php index 0fcb4a40..0d06476b 100644 --- a/admin/views/preachers/tmpl/default_foot.php +++ b/admin/views/preachers/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_foot.php diff --git a/admin/views/preachers/tmpl/default_head.php b/admin/views/preachers/tmpl/default_head.php index 4b8c22fe..1c6db7ff 100644 --- a/admin/views/preachers/tmpl/default_head.php +++ b/admin/views/preachers/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_head.php diff --git a/admin/views/preachers/tmpl/default_toolbar.php b/admin/views/preachers/tmpl/default_toolbar.php index 7ae7b2d3..f3e0934f 100644 --- a/admin/views/preachers/tmpl/default_toolbar.php +++ b/admin/views/preachers/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_toolbar.php diff --git a/admin/views/preachers/view.html.php b/admin/views/preachers/view.html.php index b88ea73b..921aa781 100644 --- a/admin/views/preachers/view.html.php +++ b/admin/views/preachers/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/admin/views/series/submitbutton.js b/admin/views/series/submitbutton.js index ef4df81a..6fe28041 100644 --- a/admin/views/series/submitbutton.js +++ b/admin/views/series/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage submitbutton.js diff --git a/admin/views/series/tmpl/edit.php b/admin/views/series/tmpl/edit.php index 923dd78a..2e636f65 100644 --- a/admin/views/series/tmpl/edit.php +++ b/admin/views/series/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage edit.php diff --git a/admin/views/series/view.html.php b/admin/views/series/view.html.php index 49e6f546..99a574d9 100644 --- a/admin/views/series/view.html.php +++ b/admin/views/series/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/admin/views/series_list/tmpl/default.php b/admin/views/series_list/tmpl/default.php index 88b1e727..d5a9c4e5 100644 --- a/admin/views/series_list/tmpl/default.php +++ b/admin/views/series_list/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/series_list/tmpl/default_batch_body.php b/admin/views/series_list/tmpl/default_batch_body.php index b3314452..ae2a932c 100644 --- a/admin/views/series_list/tmpl/default_batch_body.php +++ b/admin/views/series_list/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_body.php diff --git a/admin/views/series_list/tmpl/default_batch_footer.php b/admin/views/series_list/tmpl/default_batch_footer.php index fe4758d1..30cb79bb 100644 --- a/admin/views/series_list/tmpl/default_batch_footer.php +++ b/admin/views/series_list/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_footer.php diff --git a/admin/views/series_list/tmpl/default_body.php b/admin/views/series_list/tmpl/default_body.php index aa485a2a..6381376e 100644 --- a/admin/views/series_list/tmpl/default_body.php +++ b/admin/views/series_list/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_body.php diff --git a/admin/views/series_list/tmpl/default_foot.php b/admin/views/series_list/tmpl/default_foot.php index 0fcb4a40..0d06476b 100644 --- a/admin/views/series_list/tmpl/default_foot.php +++ b/admin/views/series_list/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_foot.php diff --git a/admin/views/series_list/tmpl/default_head.php b/admin/views/series_list/tmpl/default_head.php index 7325b104..61a0304c 100644 --- a/admin/views/series_list/tmpl/default_head.php +++ b/admin/views/series_list/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_head.php diff --git a/admin/views/series_list/tmpl/default_toolbar.php b/admin/views/series_list/tmpl/default_toolbar.php index 5d444e32..3650b7b8 100644 --- a/admin/views/series_list/tmpl/default_toolbar.php +++ b/admin/views/series_list/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_toolbar.php diff --git a/admin/views/series_list/view.html.php b/admin/views/series_list/view.html.php index 8057960e..987faee1 100644 --- a/admin/views/series_list/view.html.php +++ b/admin/views/series_list/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 232f2bf6..34a1a05c 100644 --- a/admin/views/sermon/submitbutton.js +++ b/admin/views/sermon/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 a260ee1c..ded95bf9 100644 --- a/admin/views/sermon/tmpl/edit.php +++ b/admin/views/sermon/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 22575ec7..33eb76bf 100644 --- a/admin/views/sermon/view.html.php +++ b/admin/views/sermon/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 295dafbc..6d21f15b 100644 --- a/admin/views/sermondistributor/tmpl/default.php +++ b/admin/views/sermondistributor/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php 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 70930eb6..c04dd94d 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.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 cd03f63c..547f13a4 100644 --- a/admin/views/sermondistributor/tmpl/default_main.php +++ b/admin/views/sermondistributor/tmpl/default_main.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 38df2e6b..ada37310 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.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 bd661509..97b7c22b 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.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_readme_information.php 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 8b2165d3..e6cb955a 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.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 9d8d8864..8f66451e 100644 --- a/admin/views/sermondistributor/tmpl/default_vdm.php +++ b/admin/views/sermondistributor/tmpl/default_vdm.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 59c260f7..863e95ec 100644 --- a/admin/views/sermondistributor/view.html.php +++ b/admin/views/sermondistributor/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/admin/views/sermons/tmpl/default.php b/admin/views/sermons/tmpl/default.php index 46a1bacd..8d72e6be 100644 --- a/admin/views/sermons/tmpl/default.php +++ b/admin/views/sermons/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 e70c8b1c..6b01b47e 100644 --- a/admin/views/sermons/tmpl/default_batch_body.php +++ b/admin/views/sermons/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 b2e0c73e..3e5a22e6 100644 --- a/admin/views/sermons/tmpl/default_batch_footer.php +++ b/admin/views/sermons/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 6f0c4e6e..7fc19e46 100644 --- a/admin/views/sermons/tmpl/default_body.php +++ b/admin/views/sermons/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 01ff2acf..efa0a00d 100644 --- a/admin/views/sermons/tmpl/default_foot.php +++ b/admin/views/sermons/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 ea14a31d..e0419aca 100644 --- a/admin/views/sermons/tmpl/default_head.php +++ b/admin/views/sermons/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 529aab27..51ccc7c3 100644 --- a/admin/views/sermons/tmpl/default_toolbar.php +++ b/admin/views/sermons/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 3ac05baa..05f2d378 100644 --- a/admin/views/sermons/view.html.php +++ b/admin/views/sermons/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/admin/views/statistic/submitbutton.js b/admin/views/statistic/submitbutton.js index aeede713..493f8e97 100644 --- a/admin/views/statistic/submitbutton.js +++ b/admin/views/statistic/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage submitbutton.js diff --git a/admin/views/statistic/tmpl/edit.php b/admin/views/statistic/tmpl/edit.php index 60e69568..57e8191e 100644 --- a/admin/views/statistic/tmpl/edit.php +++ b/admin/views/statistic/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage edit.php diff --git a/admin/views/statistic/view.html.php b/admin/views/statistic/view.html.php index fb778a25..8da32328 100644 --- a/admin/views/statistic/view.html.php +++ b/admin/views/statistic/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/admin/views/statistics/tmpl/default.php b/admin/views/statistics/tmpl/default.php index b757b933..82ad888e 100644 --- a/admin/views/statistics/tmpl/default.php +++ b/admin/views/statistics/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/admin/views/statistics/tmpl/default_batch_body.php b/admin/views/statistics/tmpl/default_batch_body.php index b9aa8a06..2ebb25b7 100644 --- a/admin/views/statistics/tmpl/default_batch_body.php +++ b/admin/views/statistics/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_body.php diff --git a/admin/views/statistics/tmpl/default_batch_footer.php b/admin/views/statistics/tmpl/default_batch_footer.php index d28bb78a..69e9f0e2 100644 --- a/admin/views/statistics/tmpl/default_batch_footer.php +++ b/admin/views/statistics/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_batch_footer.php diff --git a/admin/views/statistics/tmpl/default_body.php b/admin/views/statistics/tmpl/default_body.php index 5766a1dc..60545133 100644 --- a/admin/views/statistics/tmpl/default_body.php +++ b/admin/views/statistics/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_body.php diff --git a/admin/views/statistics/tmpl/default_foot.php b/admin/views/statistics/tmpl/default_foot.php index 209c8c55..04351172 100644 --- a/admin/views/statistics/tmpl/default_foot.php +++ b/admin/views/statistics/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_foot.php diff --git a/admin/views/statistics/tmpl/default_head.php b/admin/views/statistics/tmpl/default_head.php index 9417e44e..745f239a 100644 --- a/admin/views/statistics/tmpl/default_head.php +++ b/admin/views/statistics/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_head.php diff --git a/admin/views/statistics/tmpl/default_toolbar.php b/admin/views/statistics/tmpl/default_toolbar.php index 4efb8102..1e799838 100644 --- a/admin/views/statistics/tmpl/default_toolbar.php +++ b/admin/views/statistics/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_toolbar.php diff --git a/admin/views/statistics/view.html.php b/admin/views/statistics/view.html.php index b6c399ba..e076f1f1 100644 --- a/admin/views/statistics/view.html.php +++ b/admin/views/statistics/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/script.php b/script.php index bdac452e..d1414bc1 100644 --- a/script.php +++ b/script.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage script.php @@ -986,9 +986,9 @@ class com_sermondistributorInstallerScript $external_source->type_title = 'Sermondistributor External_source'; $external_source->type_alias = 'com_sermondistributor.external_source'; $external_source->table = '{"special": {"dbtable": "#__sermondistributor_external_source","key": "id","type": "External_source","prefix": "sermondistributorTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $external_source->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "description","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"description":"description","externalsources":"externalsources","update_method":"update_method","filetypes":"filetypes","build":"build","permissiontype":"permissiontype","update_timer":"update_timer","dropboxoptions":"dropboxoptions","oauthtoken":"oauthtoken","not_required":"not_required"}}'; + $external_source->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "description","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"description":"description","externalsources":"externalsources","update_method":"update_method","filetypes":"filetypes","build":"build","dropboxoptions":"dropboxoptions","update_timer":"update_timer","permissiontype":"permissiontype","oauthtoken":"oauthtoken","not_required":"not_required"}}'; $external_source->router = 'SermondistributorHelperRoute::getExternal_sourceRoute'; - $external_source->content_history_options = '{"formFile": "administrator/components/com_sermondistributor/models/forms/external_source.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","externalsources","update_method","build","update_timer","dropboxoptions","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $external_source->content_history_options = '{"formFile": "administrator/components/com_sermondistributor/models/forms/external_source.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","externalsources","update_method","build","dropboxoptions","update_timer","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $external_source_Inserted = $db->insertObject('#__content_types', $external_source); @@ -1023,7 +1023,7 @@ class com_sermondistributorInstallerScript // Field to update. $fields = array( - $db->quoteName('params') . ' = ' . $db->quote('{"autorName":"Llewellyn van der Merwe","autorEmail":"llewellyn@vdm.io","player":"1","add_to_button":"zero","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":"zero","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":"zero","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":"one","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","check_in":"-1 day","save_history":"1","history_limit":"10","uikit_load":"1","uikit_min":"","uikit_style":""}'), + $db->quoteName('params') . ' = ' . $db->quote('{"autorName":"Llewellyn van der Merwe","autorEmail":"llewellyn@vdm.io","player":"1","add_to_button":"zero","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":"zero","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":"zero","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":"one","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. @@ -1195,9 +1195,9 @@ class com_sermondistributorInstallerScript $external_source->type_title = 'Sermondistributor External_source'; $external_source->type_alias = 'com_sermondistributor.external_source'; $external_source->table = '{"special": {"dbtable": "#__sermondistributor_external_source","key": "id","type": "External_source","prefix": "sermondistributorTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $external_source->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "description","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"description":"description","externalsources":"externalsources","update_method":"update_method","filetypes":"filetypes","build":"build","permissiontype":"permissiontype","update_timer":"update_timer","dropboxoptions":"dropboxoptions","oauthtoken":"oauthtoken","not_required":"not_required"}}'; + $external_source->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "description","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"description":"description","externalsources":"externalsources","update_method":"update_method","filetypes":"filetypes","build":"build","dropboxoptions":"dropboxoptions","update_timer":"update_timer","permissiontype":"permissiontype","oauthtoken":"oauthtoken","not_required":"not_required"}}'; $external_source->router = 'SermondistributorHelperRoute::getExternal_sourceRoute'; - $external_source->content_history_options = '{"formFile": "administrator/components/com_sermondistributor/models/forms/external_source.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","externalsources","update_method","build","update_timer","dropboxoptions","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $external_source->content_history_options = '{"formFile": "administrator/components/com_sermondistributor/models/forms/external_source.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","externalsources","update_method","build","dropboxoptions","update_timer","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Check if external_source type is already in content_type DB. $external_source_id = null; @@ -1317,7 +1317,7 @@ class com_sermondistributorInstallerScript $data->permissiontype = 'full'; $data->created = $todayDate; $data->created_by = $user->id; - $data->sharedurl = '{"sharedurl":['.$urls.']}'; + $data->sharedurl = '{"tsharedurl":['.$urls.']}'; // add to database if ($db->insertObject('#__sermondistributor_external_source', $data)) { @@ -1351,7 +1351,7 @@ class com_sermondistributorInstallerScript $data->permissiontype = 'full'; $data->created = $todayDate; $data->created_by = $user->id; - $data->folder = '{"folder":['.$folder.']}'; + $data->folder = '{"tfolder":['.$folder.']}'; // add to database if ($db->insertObject('#__sermondistributor_external_source', $data)) { diff --git a/sermondistributor.xml b/sermondistributor.xml index dffe3b6d..73719722 100644 --- a/sermondistributor.xml +++ b/sermondistributor.xml @@ -1,7 +1,7 @@ COM_SERMONDISTRIBUTOR - 27th November, 2016 + 4th December, 2016 Llewellyn van der Merwe llewellyn@vdm.io https://www.vdm.io/ diff --git a/site/assets/css/categories.css b/site/assets/css/categories.css index e8a062a7..2f8cb389 100644 --- a/site/assets/css/categories.css +++ b/site/assets/css/categories.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage categories.css diff --git a/site/assets/css/category.css b/site/assets/css/category.css index 309c1745..301e1b0b 100644 --- a/site/assets/css/category.css +++ b/site/assets/css/category.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage category.css diff --git a/site/assets/css/preacher.css b/site/assets/css/preacher.css index bcd7da75..b688ad25 100644 --- a/site/assets/css/preacher.css +++ b/site/assets/css/preacher.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.css diff --git a/site/assets/css/preachers.css b/site/assets/css/preachers.css index 87fadc06..cfa76191 100644 --- a/site/assets/css/preachers.css +++ b/site/assets/css/preachers.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.css diff --git a/site/assets/css/series.css b/site/assets/css/series.css index 90e7da93..c7ef72cd 100644 --- a/site/assets/css/series.css +++ b/site/assets/css/series.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series.css diff --git a/site/assets/css/serieslist.css b/site/assets/css/serieslist.css index 1798628d..a4abef87 100644 --- a/site/assets/css/serieslist.css +++ b/site/assets/css/serieslist.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage serieslist.css diff --git a/site/assets/css/sermon.css b/site/assets/css/sermon.css index 10e271a2..40526b9a 100644 --- a/site/assets/css/sermon.css +++ b/site/assets/css/sermon.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.css diff --git a/site/assets/css/site.css b/site/assets/css/site.css index 05e4242e..1d96ccef 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage site.css diff --git a/site/controller.php b/site/controller.php index 2d779ac1..579f2da9 100644 --- a/site/controller.php +++ b/site/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @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 71b5cab0..bbd3876e 100644 --- a/site/controllers/ajax.json.php +++ b/site/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage ajax.json.php @@ -62,12 +62,12 @@ class SermondistributorControllerAjax extends JControllerLegacy try { $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); - $idValue = $jinput->get('id', NULL, 'INT'); + $listingValue = $jinput->get('listing', NULL, 'INT'); $targetValue = $jinput->get('target', NULL, 'INT'); $typeValue = $jinput->get('type', NULL, 'INT'); - if($idValue && $targetValue && $typeValue) + if($listingValue && $targetValue && $typeValue) { - $result = $this->getModel('ajax')->autoUpdateLocalListingExternal($idValue, $targetValue, $typeValue); + $result = $this->getModel('ajax')->autoUpdateLocalListingExternal($listingValue, $targetValue, $typeValue); } else { diff --git a/site/controllers/download.php b/site/controllers/download.php index e633c3a9..450ca6e9 100644 --- a/site/controllers/download.php +++ b/site/controllers/download.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage download.php diff --git a/site/controllers/help.php b/site/controllers/help.php index 441952bf..2350a61b 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help.php diff --git a/site/helpers/dropboxupdater.php b/site/helpers/dropboxupdater.php index 32738558..4ba44b03 100644 --- a/site/helpers/dropboxupdater.php +++ b/site/helpers/dropboxupdater.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage dropboxupdater.php @@ -78,11 +78,6 @@ class Dropboxupdater protected $updateInfo; protected $infoFilePath; - /** - * get the localkey - **/ - protected $localkey = false; - /** * Main dropbox class **/ @@ -359,7 +354,7 @@ class Dropboxupdater protected function setUpdateInfoData() { // set the info file name - $fileName = md5($this->fileKey.'info'.$this->localkey); + $fileName = md5($this->fileKey.'info'); // set file path $this->infoFilePath = JPATH_COMPONENT_SITE.'/helpers/'.$fileName.'.json'; @@ -413,7 +408,7 @@ class Dropboxupdater protected function doUpdate() { // we need more then the normal time to run this script 5 minutes at least. - ini_set('max_execution_time', 500); + ini_set('max_execution_time', $this->app_params->get('max_execution_time', 500)); // get data of all the shared links of all target items if (!$this->dropbox->getFiles($this->data->oauthtoken, $this->data->permissiontype, $this->detailsConfig)) { diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index f4905f68..62876b22 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index 8cf37c0a..7c0b24e7 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage route.php diff --git a/site/helpers/sermondistributor.php b/site/helpers/sermondistributor.php index 25d21ec6..7b82b054 100644 --- a/site/helpers/sermondistributor.php +++ b/site/helpers/sermondistributor.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php @@ -45,19 +45,25 @@ abstract class SermondistributorHelper **/ public static function loadExternalUpdateAjax($document) { - $updates = self::getExternalListingUpdateKeys(); // id, target, type - if (self::checkArray($updates)) + $update = self::getNextUpdateValues(); // id, target, type + if ($update) { $document->addScriptDeclaration(" jQuery(window).load(function() { - checkExternalListing(".implode('); checkExternalListing(', $updates)."); + checkExternalListing(".$update."); }); function checkExternalListing(id, target, type) { + checkExternalListing_server(id, target, type).done(function(result) { + // good it is done + }); + } + + function checkExternalListing_server(id, target, type) { var getUrl = '".JURI::root()."index.php?option=com_sermondistributor&task=ajax.autoUpdateLocalListingExternal&format=json'; if(target > 0 && type > 0 && id > 0){ - var request = 'token=".JSession::getFormToken()."&target='+target+'&id='+id+'&type='+type; - } + var request = 'token=".JSession::getFormToken()."&target='+target+'&listing='+id+'&type='+type; + } return jQuery.ajax({ type: 'GET', url: getUrl, @@ -99,6 +105,11 @@ abstract class SermondistributorHelper **/ protected static $updateerror = false; + /** + * The update last File path + **/ + protected static $updatelast = false; + /** * The update errors **/ @@ -329,6 +340,49 @@ abstract class SermondistributorHelper return true; } + protected static function getNextUpdateValues() + { + // get actual update values + $updates = self::getExternalListingUpdateKeys(); + // get last update + $updatePath = self::getFilePath('update', 'last', 'vDm', '.txt', JPATH_COMPONENT_ADMINISTRATOR); + if (($lastUpdate = @file_get_contents($updatePath)) !== FALSE && self::checkArray($updates)) + { + // now check what is next + $lastKey = array_search($lastUpdate, $updates); + if (!is_null($lastKey)) + { + $nextKey = $lastKey + 1; + if (isset($updates[$nextKey])) + { + self::saveFile($updates[$nextKey],$updatePath); + return $updates[$nextKey]; + } + } + } + // rest and start with the first key + if (self::checkArray($updates)) + { + // save the first set + $start = reset($updates); + self::saveFile($start,$updatePath); + return $start; + } + return false; + } + + protected static function saveFile($data,$path_filename) + { + if (self::checkString($data)) + { + $fp = fopen($path_filename, 'w'); + fwrite($fp, $data); + fclose($fp); + return true; + } + return false; + } + public static function getExternalListingUpdateKeys($id = null, $updateMethod = 2, $returnType = 1) { // first check if this file already has statistics @@ -336,7 +390,10 @@ abstract class SermondistributorHelper $query = $db->getQuery(true); $query->select($db->quoteName(array('id','sharedurl','folder','permissiontype','dropboxoptions','build'))); $query->from($db->quoteName('#__sermondistributor_external_source')); - $query->where($db->quoteName('update_method') . ' = '. (int) $updateMethod); + if ($updateMethod && is_numeric($updateMethod)) + { + $query->where($db->quoteName('update_method') . ' = '. (int) $updateMethod); + } if ($id && is_numeric($id)) { $query->where($db->quoteName('id') . ' = '. (int) $id); @@ -574,19 +631,29 @@ abstract class SermondistributorHelper return false; } - public static function getFilePath($type, $name = 'listing', $key = '', $fileType = '.json', $PATH = JPATH_COMPONENT_SITE) + public static function getFilePath($type, $name = 'listing', $key = 'vDm', $fileType = '.json', $PATH = JPATH_COMPONENT_SITE) { - if (!self::checkString(self::${$type.$name})) + 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.$key); + $fileName = md5($type.$name.$localkey.$keyMD5); // set file path - self::${$type.$name} = $PATH.'/helpers/'.$fileName.$fileType; + self::${$type.$name}[$key] = $PATH.'/helpers/'.$fileName.$fileType; } - // return the path - return self::${$type.$name}; + if (isset(self::${$type.$name}[$key]) && self::checkString(self::${$type.$name}[$key])) + { + // return the path + return self::${$type.$name}[$key]; + } + return ''; } /** @@ -628,6 +695,85 @@ abstract class SermondistributorHelper self::setUpdateError($id, array(JText::_('COM_SERMONDISTRIBUTOR_THE_EXTERNAL_SOURCE_COULD_NOT_BE_FOUND'))); return false; } + + public static function getSourceStatus($id) + { + // fist get errors if any is found + $errors = array(); + if ($targets = self::getExternalListingUpdateKeys($id, null, 1)) + { + foreach ($targets as $target) + { + $key = preg_replace('/[ ,]+/', '', trim($target)); + if ($error = self::getUpdateError(0, $key)) + { + $errors[] = $error; + } + } + } + // check when was the last update + $updateInfo = self::updateInfo($id); + if (!$updateInfo) + { + $errors[] = JText::_('COM_SERMONDISTRIBUTOR_THIS_SOURCE_HAS_NO_LOCAL_LISTING_SET'); + } + // build the return string + if (isset($updateInfo['last']) || self::checkArray($errors)) + { + $body = array(); + // great we have source status + if (isset($updateInfo['last'])) + { + $body[] = '

        '. JText::_('COM_SERMONDISTRIBUTOR_LISTING_INFO') . '

        '; + $body[] = '

        '. JText::_('COM_SERMONDISTRIBUTOR_LAST_UPDATE') . ': '.$updateInfo['last']; + $body[] = '
        '. JText::_('COM_SERMONDISTRIBUTOR_NUMBER_OF_FILES_LISTED') . ': '.$updateInfo['qty']; + $body[] = '

        '; + } + // now set any errors found + if (self::checkArray($errors)) + { + $body[] = '

        '. JText::_('COM_SERMONDISTRIBUTOR_NOTICE') . '

        '; + $body[] = implode('', $errors); + } + return ''.JText::_('COM_SERMONDISTRIBUTOR_VIEW_UPDATE_STATUS').'' + . JHtml::_('bootstrap.renderModal', 'source-status'.$id, array('title' => JText::_('COM_SERMONDISTRIBUTOR_SOURCE_STATUS_REPORT')), implode('', $body)); + } + // no status found + return false; + } + + public static function updateInfo($id) + { + $db = JFactory::getDbo(); + // Create a new query object. + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.created','a.modified'))); + $query->from($db->quoteName('#__sermondistributor_local_listing', 'a')); + $query->where($db->quoteName('a.external_source') . ' = ' . (int) $id); + // Reset the query using our newly populated query object. + $db->setQuery($query); + $db->execute(); + if ($qty = $db->getNumRows()) + { + $data = $db->loadRowList(); + $last = 0; + foreach ($data as $dates) + { + foreach ($dates as $date) + { + $time = strtotime($date); + if ($time > $last) + { + $last = $time; + } + } + } + $info['qty'] = (int) $qty; + $info['last'] = self::fancyDate($last); + return $info; + } + return false; + } public static function getUpdateError($id, $fileKey = null) { @@ -646,9 +792,9 @@ abstract class SermondistributorHelper } return false; } - if (isset(self::$updateErrors[$id]) && self::checkArray(self::$updateErrors[$id])) + elseif (isset(self::$updateErrors[$id]) && self::checkArray(self::$updateErrors[$id])) { - return '
        • '.implode('
        • ', self::$updateErrors[$id]).'
            • '; + return '
            • '.implode('
            • ', self::$updateErrors[$id]).'
            '; } return JText::_('COM_SERMONDISTRIBUTOR_UNKNOWN_ERROR_HAS_OCCURRED'); } @@ -667,6 +813,52 @@ abstract class SermondistributorHelper } } } + + /** + * Change to nice fancy date + */ + public static function fancyDate($date) + { + if (!self::isValidTimeStamp($date)) + { + $date = strtotime($date); + } + return date('jS \o\f F Y',$date); + } + + /** + * Change to nice fancy time and date + */ + public static function fancyDateTime($time) + { + if (!self::isValidTimeStamp($time)) + { + $time = strtotime($time); + } + return date('(G:i) jS \o\f F Y',$time); + } + + /** + * Change to nice hour:minutes time + */ + public static function fancyTime($time) + { + if (!self::isValidTimeStamp($time)) + { + $time = strtotime($time); + } + return date('G:i',$time); + } + + /** + * Check if string is a valid time stamp + */ + public static function isValidTimeStamp($timestamp) + { + return ((int) $timestamp === $timestamp) + && ($timestamp <= PHP_INT_MAX) + && ($timestamp >= ~PHP_INT_MAX); + } public static function jsonToString($value, $sperator = ", ", $table = null) { diff --git a/site/language/en-GB/en-GB.com_sermondistributor.ini b/site/language/en-GB/en-GB.com_sermondistributor.ini index d584366b..858b42fd 100644 --- a/site/language/en-GB/en-GB.com_sermondistributor.ini +++ b/site/language/en-GB/en-GB.com_sermondistributor.ini @@ -21,6 +21,8 @@ COM_SERMONDISTRIBUTOR_CATEGORY_ACCESS_SITE="Category (Site) Access" COM_SERMONDISTRIBUTOR_CATEGORY_ACCESS_SITE_DESC=" Allows the users in this group to access site category." COM_SERMONDISTRIBUTOR_CATEGORY_ASC="Category (Asc)" COM_SERMONDISTRIBUTOR_CATEGORY_DESC="Category (Desc)" +COM_SERMONDISTRIBUTOR_CLEARING_LOCAL_LISTING_CAN_NOT_BE_DONE="Clearing local listing can not be done." +COM_SERMONDISTRIBUTOR_CLEAR_LOCAL_LISTING="Clear Local Listing" COM_SERMONDISTRIBUTOR_CONFIG_ADD_TO_BUTTON_DESCRIPTION="Allow add to external source button to show, this will expose the external source links." COM_SERMONDISTRIBUTOR_CONFIG_ADD_TO_BUTTON_LABEL="External Source Button" COM_SERMONDISTRIBUTOR_CONFIG_ALMOST_FLAT_LOAD="Almost Flat" @@ -159,6 +161,8 @@ COM_SERMONDISTRIBUTOR_CONFIG_LIST_SERIES_TABLE_COLOR_LABEL="Table Color" COM_SERMONDISTRIBUTOR_CONFIG_LOCALFOLDER_DESCRIPTION="Enter the full path to the local folder where your files are found." COM_SERMONDISTRIBUTOR_CONFIG_LOCALFOLDER_HINT="/home/username/localfolder/" COM_SERMONDISTRIBUTOR_CONFIG_LOCALFOLDER_LABEL="Local Folder Path (File Source)" +COM_SERMONDISTRIBUTOR_CONFIG_MAX_EXECUTION_TIME_DESCRIPTION="Set in minutes the max execution time of the PHP script during updating to local listing." +COM_SERMONDISTRIBUTOR_CONFIG_MAX_EXECUTION_TIME_LABEL="Max Execution Time" COM_SERMONDISTRIBUTOR_CONFIG_NO="No" COM_SERMONDISTRIBUTOR_CONFIG_NONE="None" COM_SERMONDISTRIBUTOR_CONFIG_ONLY_EXTRA="Only Extra" @@ -435,12 +439,15 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_N_ITEMS_UNPUBLISHED_1="%s External Source COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_SUBMENU="External Sources Submenu" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_SUBMENU_DESC="Allows the users in this group to update the submenu of the external source" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_APP_FOLDER="App folder" -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_APP_LIMITATION_NOTE_DESCRIPTION="Please Note: There is a limitation of 2000 files app/folder" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_APP_LIMITATION_NOTE_DESCRIPTION="Please Note: There is a limitation of 500 files per app/folder" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_AUTOMATIC="Automatic" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_AVI=".avi" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_BUILD="Build" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_BUILD_DESCRIPTION="Set the method used to add files." COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_BUILD_LABEL="Build Option" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_BUILD_OPTION="Build Option" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_CLEAR_LOCAL_LISTING_BUTTON_ACCESS="External Source Clear Local Listing Button Access" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_CLEAR_LOCAL_LISTING_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear local listing button." COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_CREATED_BY_DESC="The user that created this External Source." COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_CREATED_BY_LABEL="Created By" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_CREATED_DATE_DESC="The date this External Source was created." @@ -467,7 +474,7 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FILETYPES_DESCRIPTION="Select the file typ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FILETYPES_LABEL="File Types" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FOLDER="Folder" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FOLDER_DESCRIPTION="Enter the folders to target. The folders must be in the account where you generated the access token." -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FOLDER_LABEL="Target Folders
            Please note: limitation of 2000 files per/folder" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FOLDER_LABEL="Target Folders
            Please note: limitation of 500 files per/folder" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FOLDER_PATH="Folder Path" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FOLDER_SELECT="Add/Remove" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FULL_DROPBOX="Full Dropbox" @@ -490,8 +497,8 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_MPFOUR=".mp4" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_MPG=".mpg" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_MPTHREE=".mp3" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NEW="A New External Source" -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_AUTO_DROPBOX_DESCRIPTION="
              -
            • Create main/first auto folder in Dropbox. This will be where you create the folders with the preacher's name. Using the preacher's alias from the system as the folder name will insure no mismatch, if the preacher already exist on the system.
              • +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_AUTO_EXTERNALSOURCE_DESCRIPTION="To integrate auto External Source with your system you need to do the following:
                +
              • Create main/first auto folder in External Source. This will be where you create the folders with the preacher's name. Using the preacher's alias from the system as the folder name will insure no mismatch, if the preacher already exist on the system.
              • You can add files directly to the preacher folder if it is not linked to a series.
              • If you would like the sermon linked to a series, you simply create a folder inside the preacher's folder with the series' name, and place the sermon file inside that series' folder. Using the series' alias from the system as the folder name will insure no mismatch, if the series already exist on the system.
              • Adding other preachers to the same series will only require creating a folder inside that preacher's folder with the same series' name and placing his sermons inside that new folder. Using the series' alias from the system as the folder name will insure no mismatch, if the series already exist on the system.
                • @@ -550,15 +557,16 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_AUTO_DROPBOX_DESCRIPTION="
                • Adding folders and sermons will automatically load them to your sermon distributor on your website, or update the already existing sermons with the new files.
                -
              The links that are required below should be the direct Dropbox shared links to the auto folder. They should not be the same folder, and not be inside one another. Always totally separate folders! Leave blank to deactivate." -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_AUTO_DROPBOX_LABEL="Want to use Dropbox Auto links with your system, then you need to do the following:" -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_MANUAL_DROPBOX_DESCRIPTION="
                -
              • Create main/first manual folder in Dropbox. This will be where all files are placed. No sub folders, just one huge folder with all the files!
                • -
              • You will place the file on Dropbox in that main folder first.
                • +
              " +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_AUTO_EXTERNALSOURCE_LABEL="External Source Integration" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_MANUAL_EXTERNALSOURCE_DESCRIPTION="To integrate manual External Source option with your system you need to do the following: +
                +
              • Create main/first manual folder in External Source. This will be where all files are placed. No sub folders, just one huge folder with all the files!
                • +
              • You will place the file on External Source in that main folder first.
              • Then the next step will be to come to Sermon Distributor and create the preacher and series if they do not already exist.
                • -
              • Please allow enough time (as set above +) for the local listing of files to update.
                • -
              • Then you should create the sermon the file belongs to and select 'Dropbox' as the source of your file.
                • -
              • Next select 'Manual' as the build option. This will load a drop-down with the file names in the Manual Folder on Dropbox. Should the new file not be seen give it a little more time to update the local listing of files.
                • +
              • Please allow enough time (as set in Sermon Distributor Options) for the local listing of files to update.
                • +
              • Then you should create the sermon the file belongs to and select 'External Source' as the source of your file.
                • +
              • Next select 'Manual' as the build option. This will load a drop-down with the file names in the Manual Folder on External Source. Should the new file not be seen give it a little more time to update the local listing of files.
              • If the List is very long, you can in the select box type the name of the file and it will shorten the list. Then select your file and continue with the setup of the sermon as usual.
              • To ensure that all downloads work well, we need to hold to the following file naming convention:
                  @@ -566,8 +574,8 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_MANUAL_DROPBOX_DESCRIPTION="
                  • No strange characters in the file name only A-z 0-9 underscore and hyphen.
                  -
                The links that are required below should be the direct Dropbox shared links to the main manual folder. They should not be the same folder, and not be inside one another. Always totally separate folders! Leave blank to deactivate." -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_MANUAL_DROPBOX_LABEL="Want to use Dropbox Manual links with your system, then you need to do the following:" +
              " +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOTE_MANUAL_EXTERNALSOURCE_LABEL="External Source Integration" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_NOT_REQUIRED="Not Required" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_OAUTHTOKEN="Oauthtoken" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_OAUTHTOKEN_DESCRIPTION="By using an access token, the system will be able to make automatic API calls to your app without going through the authorization flow.
              This field is being kept encrypted in the database.
              Yet Joomla back-end must be access with SSL in-place when saving this page. This will help avoid a man in the middle attach on your access token." @@ -589,11 +597,13 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_PPT=".ppt" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_PPTX=".pptx" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_PUBLISHING="Publishing" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_RELATION="External Source Relation" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_RESET_UPDATE_STATUS_BUTTON_ACCESS="External Source Reset Update Status Button Access" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_RESET_UPDATE_STATUS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the reset update status button." COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the External Source to customise the alias." COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SELECT_AN_OPTION="Select an option" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHAREDURL="Sharedurl" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHAREDURL_DESCRIPTION="Enter the shared-urls of the main folders to target. The shared-urls must be from the account where you generated the access token." -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHAREDURL_LABEL="Target Shared-urls
              Please note: limitation of 2000 files per/shared-url" +COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHAREDURL_LABEL="Target Shared-urls
              Please note: limitation of 500 files per/shared-url" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHAREDURL_SELECT="Add/Remove" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_SHARED_URL="Shared URL" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_STATUS="Status" @@ -614,9 +624,6 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_UPDATE_TIMER_LABEL="Update Timer" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_VERSION_DESC="A count of the number of times this External Source has been revised." COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_VERSION_LABEL="Revision" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_WAV=".wav" -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_WIKI="Wiki" -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_WIKI_CHECK_NOTE_DESCRIPTION="It will give instructions on how to setup the external source in relation to the Build Option you have chosen." -COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_WIKI_CHECK_NOTE_LABEL="Please check the Wiki tab above." COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_WMV=".wmv" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_XLS=".xls" COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_XLSX=".xlsx" @@ -779,7 +786,9 @@ COM_SERMONDISTRIBUTOR_IMPORT_UPLOAD_BOTTON="Upload File" 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_UPDATE="Last Update" COM_SERMONDISTRIBUTOR_LICENSE="License" +COM_SERMONDISTRIBUTOR_LISTING_INFO="Listing Info" COM_SERMONDISTRIBUTOR_LOCAL_LISTING="Local Listing" COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS="Local Listings" COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_ACCESS="Local Listings Access" @@ -886,6 +895,8 @@ COM_SERMONDISTRIBUTOR_LOCAL_LISTING_URL_HINT="shared URL" COM_SERMONDISTRIBUTOR_LOCAL_LISTING_URL_LABEL="Shared-URL" COM_SERMONDISTRIBUTOR_LOCAL_LISTING_VERSION_DESC="A count of the number of times this Local Listing has been revised." COM_SERMONDISTRIBUTOR_LOCAL_LISTING_VERSION_LABEL="Revision" +COM_SERMONDISTRIBUTOR_LOCAL_LISTING_WAS_CLEARED_SUCCESSFULLY="Local listing was cleared successfully." +COM_SERMONDISTRIBUTOR_LOCAL_LISTING_WAS_NOT_CLEARED="Local listing was not cleared." COM_SERMONDISTRIBUTOR_MANUAL_UPDATER="Manual Updater" COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_ACCESS="Manual Updater Access" COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_ACCESS_DESC="Allows the users in this group to access Manual Updater" @@ -904,11 +915,13 @@ COM_SERMONDISTRIBUTOR_NAME_DESC="Name (Desc)" COM_SERMONDISTRIBUTOR_NEW="New" COM_SERMONDISTRIBUTOR_NEW_ISSUE="New Issue" COM_SERMONDISTRIBUTOR_NEXT="next" +COM_SERMONDISTRIBUTOR_NOTICE="Notice!" COM_SERMONDISTRIBUTOR_NOT_FOUND_OR_ACCESS_DENIED="Not found, or access denied." COM_SERMONDISTRIBUTOR_NO_ACCESS_GRANTED="No Access Granted!" COM_SERMONDISTRIBUTOR_NO_CATEGORIES_WERE_FOUND="No categories were found." COM_SERMONDISTRIBUTOR_NO_CATEGORY_WAS_FOUND="No category was found." 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_NO_PREACHERS_WERE_FOUND="No preachers were found." COM_SERMONDISTRIBUTOR_NO_PREACHER_WAS_FOUND="No preacher was found." @@ -916,6 +929,7 @@ COM_SERMONDISTRIBUTOR_NO_SERIES_WAS_FOUND="No series was found." COM_SERMONDISTRIBUTOR_NO_SERIES_WERE_FOUND="No Series were found." COM_SERMONDISTRIBUTOR_NO_SERMONS_WERE_FOUND="No sermons were found." COM_SERMONDISTRIBUTOR_NO_SERMON_WAS_FOUND="No sermon was found." +COM_SERMONDISTRIBUTOR_NUMBER_OF_FILES_LISTED="Number of Files Listed" COM_SERMONDISTRIBUTOR_OPEN="Open" COM_SERMONDISTRIBUTOR_OPENED_BY="opened by" COM_SERMONDISTRIBUTOR_OPEN_SERMON="Open Sermon" @@ -1023,6 +1037,9 @@ COM_SERMONDISTRIBUTOR_PREACHER_WEBSITE_HINT="http://www.example.com" COM_SERMONDISTRIBUTOR_PREACHER_WEBSITE_LABEL="Website" COM_SERMONDISTRIBUTOR_PREVIOUS="previous" COM_SERMONDISTRIBUTOR_REPEAT="repeat" +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." COM_SERMONDISTRIBUTOR_RESPOND_TO_THIS_ISSUE_ON_GITHUB="Respond to this issue on Github" COM_SERMONDISTRIBUTOR_REVIEW_THIS_ISSUE_ON_GITHUB="Review this issue on Github" COM_SERMONDISTRIBUTOR_SAVE_SUCCESS="Great! Item successfully saved." @@ -1354,6 +1371,7 @@ COM_SERMONDISTRIBUTOR_SERMON_VERSION_DESC="A count of the number of times this S COM_SERMONDISTRIBUTOR_SERMON_VERSION_LABEL="Revision" COM_SERMONDISTRIBUTOR_SHAREDURL="Shared-url" COM_SERMONDISTRIBUTOR_SHUFFLE="shuffle" +COM_SERMONDISTRIBUTOR_SOURCE_STATUS_REPORT="Source Status Report." COM_SERMONDISTRIBUTOR_STATISTIC="Statistic" COM_SERMONDISTRIBUTOR_STATISTICS="Statistics" COM_SERMONDISTRIBUTOR_STATISTICS_ACCESS="Statistics Access" @@ -1450,8 +1468,10 @@ COM_SERMONDISTRIBUTOR_SUBMENU_PREACHERS="Preachers" COM_SERMONDISTRIBUTOR_SUBMENU_SERIES_LIST="Series List" COM_SERMONDISTRIBUTOR_SUBMENU_SERMONS="Sermons" COM_SERMONDISTRIBUTOR_SUBMENU_STATISTICS="Statistics" +COM_SERMONDISTRIBUTOR_S_COULD_NOT_BE_REMOVE="%s could not be remove" COM_SERMONDISTRIBUTOR_TARGETED_FOLDER="Targeted Folder" COM_SERMONDISTRIBUTOR_THERE_HAS_NO_TARGETS_BEEN_SET_PLEASE_MAKE_SURE_TO_ADD_TARGETS_TO_THIS_EXTERNAL_SOURCE="There has no targets been set, please make sure to add targets to this external source" +COM_SERMONDISTRIBUTOR_THERE_IS_NO_TARGETS_SET_FOR_THIS_SOURCE_CAN_NOT_RESET_THE_UPDATE_STATUS="There is no targets set for this source, can not reset the update status!" COM_SERMONDISTRIBUTOR_THERE_WAS_AN_ERROR_DURING_THE_LAST_UPDATE_ATTEMPT="There was an error during the last update attempt." COM_SERMONDISTRIBUTOR_THE_EXTERNAL_SOURCE_COULD_NOT_BE_FOUND="The external source could not be found." COM_SERMONDISTRIBUTOR_THE_FILES_LINKED_FROM_EXTERNAL_SOURCE="The Files Linked from External Source" @@ -1459,6 +1479,7 @@ COM_SERMONDISTRIBUTOR_THE_NOTICE_BOARD_IS_LOADING="The notice board is loading" COM_SERMONDISTRIBUTOR_THE_README_IS_LOADING="The readme is loading" COM_SERMONDISTRIBUTOR_THE_UPDATE_IS_RUNNING="The update is running." 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_TO_PLAY_THE_MEDIA_YOU_WILL_NEED_TO_EITHER_UPDATE_YOUR_BROWSER_TO_A_RECENT_VERSION_OR_UPDATE_YOUR="To play the media you will need to either update your browser to a recent version or update your" COM_SERMONDISTRIBUTOR_UNKNOWN_ERROR_HAS_OCCURRED="Unknown error has occurred." @@ -1469,7 +1490,10 @@ COM_SERMONDISTRIBUTOR_USE_BATCH_DESC=" Allows users in this group to use batch c 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_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." +COM_SERMONDISTRIBUTOR_YOU_DO_NOT_HAVE_PERMISSION_TO_RESET_UPDATE_STATUS="You do not have permission to reset update status." JGLOBAL_FIELD_ID_DESC="Record number in the database." JGLOBAL_FIELD_ID_LABEL="ID" JGLOBAL_FIELD_MODIFIED_BY_DESC="The user who did the last modification." diff --git a/site/layouts/addtodropboxbutton.php b/site/layouts/addtodropboxbutton.php index 41c8be00..9fac0b9f 100644 --- a/site/layouts/addtodropboxbutton.php +++ b/site/layouts/addtodropboxbutton.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage addtodropboxbutton.php diff --git a/site/layouts/addtodropboxicon.php b/site/layouts/addtodropboxicon.php index d43136b9..0cc1c06c 100644 --- a/site/layouts/addtodropboxicon.php +++ b/site/layouts/addtodropboxicon.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage addtodropboxicon.php diff --git a/site/layouts/categorieslistitem.php b/site/layouts/categorieslistitem.php index 0b10a5e6..637d378a 100644 --- a/site/layouts/categorieslistitem.php +++ b/site/layouts/categorieslistitem.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage categorieslistitem.php diff --git a/site/layouts/categoriespanel.php b/site/layouts/categoriespanel.php index 364c2e5c..313ee8b5 100644 --- a/site/layouts/categoriespanel.php +++ b/site/layouts/categoriespanel.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage categoriespanel.php diff --git a/site/layouts/categoriesrow.php b/site/layouts/categoriesrow.php index ba674513..89da815b 100644 --- a/site/layouts/categoriesrow.php +++ b/site/layouts/categoriesrow.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage categoriesrow.php diff --git a/site/layouts/downloadsermonbutton.php b/site/layouts/downloadsermonbutton.php index 4cd669cb..377c0660 100644 --- a/site/layouts/downloadsermonbutton.php +++ b/site/layouts/downloadsermonbutton.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage downloadsermonbutton.php diff --git a/site/layouts/isnew.php b/site/layouts/isnew.php index a479be7b..506f4c3e 100644 --- a/site/layouts/isnew.php +++ b/site/layouts/isnew.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage isnew.php diff --git a/site/layouts/jplayerbluemonday.php b/site/layouts/jplayerbluemonday.php index a5c9d9b1..667332df 100644 --- a/site/layouts/jplayerbluemonday.php +++ b/site/layouts/jplayerbluemonday.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage jplayerbluemonday.php diff --git a/site/layouts/jplayerbluemondaylist.php b/site/layouts/jplayerbluemondaylist.php index 50ce7989..2a81c18a 100644 --- a/site/layouts/jplayerbluemondaylist.php +++ b/site/layouts/jplayerbluemondaylist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage jplayerbluemondaylist.php diff --git a/site/layouts/mediaplayer.php b/site/layouts/mediaplayer.php index fc6b3721..59701165 100644 --- a/site/layouts/mediaplayer.php +++ b/site/layouts/mediaplayer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage mediaplayer.php diff --git a/site/layouts/opensermonbutton.php b/site/layouts/opensermonbutton.php index abd672ff..dbdeb6d6 100644 --- a/site/layouts/opensermonbutton.php +++ b/site/layouts/opensermonbutton.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage opensermonbutton.php diff --git a/site/layouts/preacherslistitem.php b/site/layouts/preacherslistitem.php index 3fdec442..96799629 100644 --- a/site/layouts/preacherslistitem.php +++ b/site/layouts/preacherslistitem.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacherslistitem.php diff --git a/site/layouts/preacherspanel.php b/site/layouts/preacherspanel.php index 87346ea0..895df4be 100644 --- a/site/layouts/preacherspanel.php +++ b/site/layouts/preacherspanel.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacherspanel.php diff --git a/site/layouts/preachersrow.php b/site/layouts/preachersrow.php index f4f0e48e..56416ce6 100644 --- a/site/layouts/preachersrow.php +++ b/site/layouts/preachersrow.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preachersrow.php diff --git a/site/layouts/serieslistitem.php b/site/layouts/serieslistitem.php index be061bd0..2e6907e4 100644 --- a/site/layouts/serieslistitem.php +++ b/site/layouts/serieslistitem.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage serieslistitem.php diff --git a/site/layouts/seriespanel.php b/site/layouts/seriespanel.php index cbb6bb30..4693f656 100644 --- a/site/layouts/seriespanel.php +++ b/site/layouts/seriespanel.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage seriespanel.php diff --git a/site/layouts/seriesrow.php b/site/layouts/seriesrow.php index b5d1f7de..6fb95499 100644 --- a/site/layouts/seriesrow.php +++ b/site/layouts/seriesrow.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage seriesrow.php diff --git a/site/layouts/sermonslistitem.php b/site/layouts/sermonslistitem.php index 8145c14a..0f3ef17a 100644 --- a/site/layouts/sermonslistitem.php +++ b/site/layouts/sermonslistitem.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermonslistitem.php diff --git a/site/layouts/sermonspanel.php b/site/layouts/sermonspanel.php index 89487466..6b1562c2 100644 --- a/site/layouts/sermonspanel.php +++ b/site/layouts/sermonspanel.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermonspanel.php diff --git a/site/layouts/sermonsrow.php b/site/layouts/sermonsrow.php index 1fea1924..09e527b9 100644 --- a/site/layouts/sermonsrow.php +++ b/site/layouts/sermonsrow.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermonsrow.php diff --git a/site/layouts/soundmanagerthreesixty.php b/site/layouts/soundmanagerthreesixty.php index bcebf35a..c54b5b39 100644 --- a/site/layouts/soundmanagerthreesixty.php +++ b/site/layouts/soundmanagerthreesixty.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage soundmanagerthreesixty.php diff --git a/site/models/ajax.php b/site/models/ajax.php index bb7ee463..91348e01 100644 --- a/site/models/ajax.php +++ b/site/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage ajax.php diff --git a/site/models/categories.php b/site/models/categories.php index f567f068..d18e86d2 100644 --- a/site/models/categories.php +++ b/site/models/categories.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage categories.php @@ -73,8 +73,8 @@ class SermondistributorModelCategories extends JModelList // Get from #__categories as a $query->select($db->quoteName( - array('a.id','a.title','a.alias','a.description','a.hits','a.language'), - array('id','name','alias','description','hits','language'))); + array('a.id','a.title','a.alias','a.description','a.hits','a.language','a.params'), + array('id','name','alias','description','hits','language','params'))); $query->from($db->quoteName('#__categories', 'a')); $query->where('a.access IN (' . implode(',', $this->levels) . ')'); $query->where('a.published = 1'); @@ -114,7 +114,7 @@ class SermondistributorModelCategories extends JModelList // Always create a slug for sef URL's $item->slug = (isset($item->alias)) ? $item->id.':'.$item->alias : $item->id; // set idCatidSermonB to the $item object. - $item->idCatidSermonB = $this->getIdCatidSermonBced_B($item->id); + $item->idCatidSermonB = $this->getIdCatidSermonEfee_B($item->id); } @@ -127,6 +127,15 @@ class SermondistributorModelCategories extends JModelList // remove empty category unset($items[$nr]); } + // set the icon if found + if (SermondistributorHelper::checkJson($item->params)) + { + $params = json_decode($item->params, true); + if (isset($params['image']) && SermondistributorHelper::checkString($params['image'])) + { + $item->icon = $params['image']; + } + } } } @@ -140,7 +149,7 @@ class SermondistributorModelCategories extends JModelList * @return mixed An array of Sermon Objects on success, false on failure. * */ - public function getIdCatidSermonBced_B($id) + public function getIdCatidSermonEfee_B($id) { // Get a db connection. $db = JFactory::getDbo(); diff --git a/site/models/category.php b/site/models/category.php index 090bd31f..bfc4c288 100644 --- a/site/models/category.php +++ b/site/models/category.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage category.php diff --git a/site/models/preacher.php b/site/models/preacher.php index fe3f4e25..07dfff75 100644 --- a/site/models/preacher.php +++ b/site/models/preacher.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preacher.php diff --git a/site/models/preachers.php b/site/models/preachers.php index 3501605f..4821170e 100644 --- a/site/models/preachers.php +++ b/site/models/preachers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage preachers.php diff --git a/site/models/series.php b/site/models/series.php index c57648de..c34c99cf 100644 --- a/site/models/series.php +++ b/site/models/series.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage series.php diff --git a/site/models/serieslist.php b/site/models/serieslist.php index 46d21fbc..a1484da6 100644 --- a/site/models/serieslist.php +++ b/site/models/serieslist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage serieslist.php diff --git a/site/models/sermon.php b/site/models/sermon.php index 7ea6cfe7..264f0ffe 100644 --- a/site/models/sermon.php +++ b/site/models/sermon.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermon.php diff --git a/site/router.php b/site/router.php index 4970b433..7be956dc 100644 --- a/site/router.php +++ b/site/router.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage router.php @@ -124,16 +124,10 @@ class SermondistributorRouter extends JComponentRouterBase * @since 3.3 */ public function parse(&$segments) - { - //var_dump($segments); - //$app = JFactory::getApplication(); - //$menu = $app->getMenu(); - //$item = $menu->getActive(); - + { $count = count($segments); $vars = array(); - - //var_dump($item->query['view']); + //Handle View and Identifier switch($segments[0]) { @@ -175,7 +169,7 @@ class SermondistributorRouter extends JComponentRouterBase } else { - $id = $this->getVar('categories', $segments[$count-1], 'alias', 'id'); + $id = $this->getVar('categories', $segments[$count-1], 'alias', 'id', true); if($id) { $vars['id'] = $id; @@ -247,7 +241,7 @@ class SermondistributorRouter extends JComponentRouterBase return $vars; } - protected function getVar($table, $where = null, $whereString = 'user', $what = 'id', $operator = '=', $main = 'sermondistributor') + protected function getVar($table, $where = null, $whereString = 'user', $what = 'id', $category = false, $operator = '=', $main = 'sermondistributor') { if(!$where) { @@ -259,7 +253,7 @@ class SermondistributorRouter extends JComponentRouterBase $query = $db->getQuery(true); $query->select($db->quoteName(array($what))); - if ('categories' == $table || 'category' == $table) + if ('categories' == $table || 'category' == $table || $category) { $query->from($db->quoteName('#__categories')); } diff --git a/site/sermondistributor.php b/site/sermondistributor.php index 63a815fa..16b66ebd 100644 --- a/site/sermondistributor.php +++ b/site/sermondistributor.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage sermondistributor.php diff --git a/site/views/categories/tmpl/default.php b/site/views/categories/tmpl/default.php index 51961f72..70f3324b 100644 --- a/site/views/categories/tmpl/default.php +++ b/site/views/categories/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/site/views/categories/tmpl/default_categories-grid.php b/site/views/categories/tmpl/default_categories-grid.php index d7de0c42..6043a811 100644 --- a/site/views/categories/tmpl/default_categories-grid.php +++ b/site/views/categories/tmpl/default_categories-grid.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_categories-grid.php diff --git a/site/views/categories/tmpl/default_categories-list.php b/site/views/categories/tmpl/default_categories-list.php index 66821289..ef3b85a8 100644 --- a/site/views/categories/tmpl/default_categories-list.php +++ b/site/views/categories/tmpl/default_categories-list.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_categories-list.php diff --git a/site/views/categories/tmpl/default_categories-table.php b/site/views/categories/tmpl/default_categories-table.php index 21bb617f..2774a0e4 100644 --- a/site/views/categories/tmpl/default_categories-table.php +++ b/site/views/categories/tmpl/default_categories-table.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_categories-table.php diff --git a/site/views/categories/view.html.php b/site/views/categories/view.html.php index 1787edc6..770f0745 100644 --- a/site/views/categories/view.html.php +++ b/site/views/categories/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/site/views/category/tmpl/default.php b/site/views/category/tmpl/default.php index 117a2124..435b293f 100644 --- a/site/views/category/tmpl/default.php +++ b/site/views/category/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/site/views/category/tmpl/default_categorybox.php b/site/views/category/tmpl/default_categorybox.php index ec878b10..5405fd56 100644 --- a/site/views/category/tmpl/default_categorybox.php +++ b/site/views/category/tmpl/default_categorybox.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_categorybox.php diff --git a/site/views/category/tmpl/default_categorypanel.php b/site/views/category/tmpl/default_categorypanel.php index 1b765d78..e453cec5 100644 --- a/site/views/category/tmpl/default_categorypanel.php +++ b/site/views/category/tmpl/default_categorypanel.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_categorypanel.php diff --git a/site/views/category/tmpl/default_categorysmall.php b/site/views/category/tmpl/default_categorysmall.php index bf7aac94..2ef0b282 100644 --- a/site/views/category/tmpl/default_categorysmall.php +++ b/site/views/category/tmpl/default_categorysmall.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_categorysmall.php diff --git a/site/views/category/tmpl/default_sermons-grid.php b/site/views/category/tmpl/default_sermons-grid.php index 8950bfcb..bf3f52d7 100644 --- a/site/views/category/tmpl/default_sermons-grid.php +++ b/site/views/category/tmpl/default_sermons-grid.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-grid.php diff --git a/site/views/category/tmpl/default_sermons-list.php b/site/views/category/tmpl/default_sermons-list.php index 242429f3..361bbf41 100644 --- a/site/views/category/tmpl/default_sermons-list.php +++ b/site/views/category/tmpl/default_sermons-list.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-list.php diff --git a/site/views/category/tmpl/default_sermons-table.php b/site/views/category/tmpl/default_sermons-table.php index b675fc72..1387bafc 100644 --- a/site/views/category/tmpl/default_sermons-table.php +++ b/site/views/category/tmpl/default_sermons-table.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-table.php diff --git a/site/views/category/view.html.php b/site/views/category/view.html.php index ad9e2411..50661190 100644 --- a/site/views/category/view.html.php +++ b/site/views/category/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/site/views/preacher/tmpl/default.php b/site/views/preacher/tmpl/default.php index ef918b01..5bcd5c24 100644 --- a/site/views/preacher/tmpl/default.php +++ b/site/views/preacher/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/site/views/preacher/tmpl/default_preacherbox.php b/site/views/preacher/tmpl/default_preacherbox.php index e0673d21..d7689808 100644 --- a/site/views/preacher/tmpl/default_preacherbox.php +++ b/site/views/preacher/tmpl/default_preacherbox.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_preacherbox.php diff --git a/site/views/preacher/tmpl/default_preacherpanel.php b/site/views/preacher/tmpl/default_preacherpanel.php index 78159fa3..63be862b 100644 --- a/site/views/preacher/tmpl/default_preacherpanel.php +++ b/site/views/preacher/tmpl/default_preacherpanel.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_preacherpanel.php diff --git a/site/views/preacher/tmpl/default_preachersmall.php b/site/views/preacher/tmpl/default_preachersmall.php index 08c21518..99abe704 100644 --- a/site/views/preacher/tmpl/default_preachersmall.php +++ b/site/views/preacher/tmpl/default_preachersmall.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_preachersmall.php diff --git a/site/views/preacher/tmpl/default_sermons-grid.php b/site/views/preacher/tmpl/default_sermons-grid.php index ad0ae466..a6c06ccc 100644 --- a/site/views/preacher/tmpl/default_sermons-grid.php +++ b/site/views/preacher/tmpl/default_sermons-grid.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-grid.php diff --git a/site/views/preacher/tmpl/default_sermons-list.php b/site/views/preacher/tmpl/default_sermons-list.php index 8e4c0f09..6df3e73d 100644 --- a/site/views/preacher/tmpl/default_sermons-list.php +++ b/site/views/preacher/tmpl/default_sermons-list.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-list.php diff --git a/site/views/preacher/tmpl/default_sermons-table.php b/site/views/preacher/tmpl/default_sermons-table.php index 30603811..b354de2f 100644 --- a/site/views/preacher/tmpl/default_sermons-table.php +++ b/site/views/preacher/tmpl/default_sermons-table.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-table.php diff --git a/site/views/preacher/view.html.php b/site/views/preacher/view.html.php index 82d6aed2..2082f0dd 100644 --- a/site/views/preacher/view.html.php +++ b/site/views/preacher/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/site/views/preachers/tmpl/default.php b/site/views/preachers/tmpl/default.php index 4a1f1215..c2db4739 100644 --- a/site/views/preachers/tmpl/default.php +++ b/site/views/preachers/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/site/views/preachers/tmpl/default_preachers-grid.php b/site/views/preachers/tmpl/default_preachers-grid.php index aea32388..b74e7031 100644 --- a/site/views/preachers/tmpl/default_preachers-grid.php +++ b/site/views/preachers/tmpl/default_preachers-grid.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_preachers-grid.php diff --git a/site/views/preachers/tmpl/default_preachers-list.php b/site/views/preachers/tmpl/default_preachers-list.php index ed75730b..bce89f90 100644 --- a/site/views/preachers/tmpl/default_preachers-list.php +++ b/site/views/preachers/tmpl/default_preachers-list.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_preachers-list.php diff --git a/site/views/preachers/tmpl/default_preachers-table.php b/site/views/preachers/tmpl/default_preachers-table.php index 9478a208..366901d5 100644 --- a/site/views/preachers/tmpl/default_preachers-table.php +++ b/site/views/preachers/tmpl/default_preachers-table.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_preachers-table.php diff --git a/site/views/preachers/view.html.php b/site/views/preachers/view.html.php index 340f54cb..92494711 100644 --- a/site/views/preachers/view.html.php +++ b/site/views/preachers/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/site/views/series/tmpl/default.php b/site/views/series/tmpl/default.php index 1de38cf3..72821013 100644 --- a/site/views/series/tmpl/default.php +++ b/site/views/series/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/site/views/series/tmpl/default_seriesbox.php b/site/views/series/tmpl/default_seriesbox.php index 8007803a..5ec71060 100644 --- a/site/views/series/tmpl/default_seriesbox.php +++ b/site/views/series/tmpl/default_seriesbox.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_seriesbox.php diff --git a/site/views/series/tmpl/default_seriespanel.php b/site/views/series/tmpl/default_seriespanel.php index 45d1175a..7744b519 100644 --- a/site/views/series/tmpl/default_seriespanel.php +++ b/site/views/series/tmpl/default_seriespanel.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_seriespanel.php diff --git a/site/views/series/tmpl/default_seriessmall.php b/site/views/series/tmpl/default_seriessmall.php index be758f07..525b3f76 100644 --- a/site/views/series/tmpl/default_seriessmall.php +++ b/site/views/series/tmpl/default_seriessmall.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_seriessmall.php diff --git a/site/views/series/tmpl/default_sermons-grid.php b/site/views/series/tmpl/default_sermons-grid.php index 080b86a2..f0961874 100644 --- a/site/views/series/tmpl/default_sermons-grid.php +++ b/site/views/series/tmpl/default_sermons-grid.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-grid.php diff --git a/site/views/series/tmpl/default_sermons-list.php b/site/views/series/tmpl/default_sermons-list.php index 683bafdf..7d993dcc 100644 --- a/site/views/series/tmpl/default_sermons-list.php +++ b/site/views/series/tmpl/default_sermons-list.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-list.php diff --git a/site/views/series/tmpl/default_sermons-table.php b/site/views/series/tmpl/default_sermons-table.php index 8b82616d..dcddd3ac 100644 --- a/site/views/series/tmpl/default_sermons-table.php +++ b/site/views/series/tmpl/default_sermons-table.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermons-table.php diff --git a/site/views/series/view.html.php b/site/views/series/view.html.php index bf8e872a..0a87b856 100644 --- a/site/views/series/view.html.php +++ b/site/views/series/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/site/views/serieslist/tmpl/default.php b/site/views/serieslist/tmpl/default.php index ea54a35a..6ca1147d 100644 --- a/site/views/serieslist/tmpl/default.php +++ b/site/views/serieslist/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/site/views/serieslist/tmpl/default_series-grid.php b/site/views/serieslist/tmpl/default_series-grid.php index 795fea24..9406de9a 100644 --- a/site/views/serieslist/tmpl/default_series-grid.php +++ b/site/views/serieslist/tmpl/default_series-grid.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_series-grid.php diff --git a/site/views/serieslist/tmpl/default_series-list.php b/site/views/serieslist/tmpl/default_series-list.php index 1689fd87..0eaf4faf 100644 --- a/site/views/serieslist/tmpl/default_series-list.php +++ b/site/views/serieslist/tmpl/default_series-list.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_series-list.php diff --git a/site/views/serieslist/tmpl/default_series-table.php b/site/views/serieslist/tmpl/default_series-table.php index d559b54e..20a4fe04 100644 --- a/site/views/serieslist/tmpl/default_series-table.php +++ b/site/views/serieslist/tmpl/default_series-table.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_series-table.php diff --git a/site/views/serieslist/view.html.php b/site/views/serieslist/view.html.php index 287bc3ee..44908c7c 100644 --- a/site/views/serieslist/view.html.php +++ b/site/views/serieslist/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php diff --git a/site/views/sermon/tmpl/default.php b/site/views/sermon/tmpl/default.php index 6f2aacda..b79f1bc4 100644 --- a/site/views/sermon/tmpl/default.php +++ b/site/views/sermon/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default.php diff --git a/site/views/sermon/tmpl/default_sermonbig.php b/site/views/sermon/tmpl/default_sermonbig.php index 29d16a85..945fb6de 100644 --- a/site/views/sermon/tmpl/default_sermonbig.php +++ b/site/views/sermon/tmpl/default_sermonbig.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermonbig.php diff --git a/site/views/sermon/tmpl/default_sermonbox.php b/site/views/sermon/tmpl/default_sermonbox.php index e1aa8829..2ba765c3 100644 --- a/site/views/sermon/tmpl/default_sermonbox.php +++ b/site/views/sermon/tmpl/default_sermonbox.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermonbox.php diff --git a/site/views/sermon/tmpl/default_sermonpanel.php b/site/views/sermon/tmpl/default_sermonpanel.php index a9548a08..64598524 100644 --- a/site/views/sermon/tmpl/default_sermonpanel.php +++ b/site/views/sermon/tmpl/default_sermonpanel.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage default_sermonpanel.php diff --git a/site/views/sermon/view.html.php b/site/views/sermon/view.html.php index de3312f9..6b02c561 100644 --- a/site/views/sermon/view.html.php +++ b/site/views/sermon/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.4.0 - @build 27th November, 2016 + @build 4th December, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage view.html.php