From 85297fa52a53742dd6c2219059a055bf69347187 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Mon, 11 Apr 2016 18:50:51 +0100 Subject: [PATCH] Insured that empty preacher, series, category are not loaded to the front. --- README.md | 4 +- admin/assets/css/admin.css | 2 +- admin/assets/css/dashboard.css | 2 +- admin/assets/css/help_document.css | 2 +- admin/assets/css/help_documents.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 | 8 +- admin/controller.php | 2 +- admin/controllers/ajax.json.php | 23 +- admin/controllers/help.php | 2 +- admin/controllers/help_document.php | 22 +- admin/controllers/help_documents.php | 32 +- admin/controllers/import.php | 2 +- admin/controllers/preacher.php | 22 +- admin/controllers/preachers.php | 32 +- admin/controllers/series.php | 22 +- admin/controllers/series_list.php | 32 +- admin/controllers/sermon.php | 28 +- admin/controllers/sermondistributor.php | 2 +- admin/controllers/sermons.php | 32 +- admin/controllers/statistic.php | 22 +- admin/controllers/statistics.php | 32 +- admin/helpers/html/batch_.php | 2 +- admin/helpers/sermondistributor.php | 68 ++-- .../en-GB/en-GB.com_sermondistributor.sys.ini | 2 +- admin/layouts/batchselection.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/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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- admin/models/fields/articles.php | 22 +- admin/models/fields/dropboxfiles.php | 22 +- admin/models/fields/localfiles.php | 22 +- admin/models/fields/preachers.php | 22 +- admin/models/fields/series.php | 22 +- admin/models/fields/sermon.php | 22 +- admin/models/forms/help_document.js | 20 +- admin/models/forms/help_document.xml | 6 +- admin/models/forms/preacher.js | 2 +- admin/models/forms/preacher.xml | 6 +- admin/models/forms/series.js | 2 +- admin/models/forms/series.xml | 6 +- admin/models/forms/sermon.js | 36 +- admin/models/forms/sermon.xml | 6 +- admin/models/forms/statistic.js | 2 +- admin/models/forms/statistic.xml | 6 +- admin/models/help_document.php | 140 +++---- admin/models/help_documents.php | 100 ++--- admin/models/import.php | 2 +- admin/models/preacher.php | 169 ++++---- admin/models/preachers.php | 76 ++-- admin/models/series.php | 169 ++++---- admin/models/series_list.php | 76 ++-- admin/models/sermon.php | 191 ++++----- admin/models/sermondistributor.php | 4 +- admin/models/sermons.php | 104 ++--- admin/models/statistic.php | 122 +++--- admin/models/statistics.php | 88 ++-- admin/sermondistributor.php | 2 +- admin/tables/help_document.php | 4 +- admin/tables/preacher.php | 4 +- admin/tables/series.php | 4 +- admin/tables/sermon.php | 6 +- admin/tables/statistic.php | 4 +- admin/views/help_document/submitbutton.js | 2 +- admin/views/help_document/tmpl/edit.php | 2 +- admin/views/help_document/view.html.php | 22 +- 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 | 74 ++-- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- admin/views/preacher/submitbutton.js | 2 +- admin/views/preacher/tmpl/edit.php | 2 +- admin/views/preacher/view.html.php | 32 +- 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 | 32 +- 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 | 32 +- .../views/sermondistributor/tmpl/default.php | 2 +- .../sermondistributor/tmpl/default_main.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 | 58 +-- admin/views/statistic/submitbutton.js | 2 +- admin/views/statistic/tmpl/edit.php | 2 +- admin/views/statistic/view.html.php | 22 +- 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 | 20 +- script.php | 384 +++++++++--------- 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 | 18 +- site/controllers/download.php | 2 +- site/controllers/help.php | 2 +- site/helpers/dropboxupdater.php | 2 +- site/helpers/headercheck.php | 2 +- site/helpers/route.php | 58 +-- site/helpers/sermondistributor.php | 67 ++- site/layouts/addtodropboxbutton.php | 2 +- site/layouts/addtodropboxicon.php | 2 +- site/layouts/audioplayer.php | 2 +- site/layouts/categorieslistitem.php | 2 +- site/layouts/categoriespanel.php | 2 +- site/layouts/categoriesrow.php | 2 +- site/layouts/downloadsermonbutton.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/models/ajax.php | 4 +- site/models/categories.php | 41 +- site/models/category.php | 82 ++-- site/models/preacher.php | 96 ++--- site/models/preachers.php | 45 +- site/models/series.php | 96 ++--- site/models/serieslist.php | 45 +- site/models/sermon.php | 44 +- site/router.php | 2 +- site/sermondistributor.php | 2 +- site/views/categories/tmpl/default.php | 2 +- site/views/categories/tmpl/default.xml | 16 +- .../tmpl/default_categories-grid.php | 2 +- .../tmpl/default_categories-list.php | 2 +- .../tmpl/default_categories-table.php | 2 +- site/views/categories/view.html.php | 58 +-- site/views/category/tmpl/default.php | 2 +- site/views/category/tmpl/default.xml | 40 +- .../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 | 64 +-- site/views/preacher/tmpl/default.php | 2 +- site/views/preacher/tmpl/default.xml | 44 +- .../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 | 64 +-- site/views/preachers/tmpl/default.php | 2 +- site/views/preachers/tmpl/default.xml | 20 +- .../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 | 60 +-- site/views/series/tmpl/default.php | 2 +- site/views/series/tmpl/default.xml | 40 +- 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 | 64 +-- site/views/serieslist/tmpl/default.php | 2 +- site/views/serieslist/tmpl/default.xml | 16 +- .../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 | 60 +-- 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 | 56 +-- 260 files changed, 2108 insertions(+), 2000 deletions(-) diff --git a/README.md b/README.md index 37ca05a6..ba8d3ae0 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The best way to see all your options is to install this component on you Joomla + *Author*: [Llewellyn van der Merwe] (mailto:llewellyn@vdm.io) + *Name*: [Sermon Distributor] (https://www.vdm.io/) + *First Build*: 22nd October, 2015 -+ *Last Build*: 19th March, 2016 ++ *Last Build*: 11th April, 2016 + *Version*: 1.3.2 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -36,7 +36,7 @@ due to [Automated Component Builder] (https://www.vdm.io/joomla-component-builde > (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*: **48065** ++ *Line count*: **48173** + *File count*: **351** + *Folder count*: **79** diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 240654db..2abd288d 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 19th March, 2016 + @build 11th April, 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 1dc1499b..38a29da7 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 19th March, 2016 + @build 11th April, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage dashboard.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index 25017356..2d398ada 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 19th March, 2016 + @build 11th April, 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 1454bf0b..d68a3a65 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 19th March, 2016 + @build 11th April, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage help_documents.css diff --git a/admin/assets/css/preacher.css b/admin/assets/css/preacher.css index 4833034f..bcc9b3cb 100644 --- a/admin/assets/css/preacher.css +++ b/admin/assets/css/preacher.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 19th March, 2016 + @build 11th April, 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 3400b59a..4c1d3ae0 100644 --- a/admin/assets/css/preachers.css +++ b/admin/assets/css/preachers.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 19th March, 2016 + @build 11th April, 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 2fd744f8..22db7d8d 100644 --- a/admin/assets/css/series.css +++ b/admin/assets/css/series.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 19th March, 2016 + @build 11th April, 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 d5e018c6..36ee2efd 100644 --- a/admin/assets/css/series_list.css +++ b/admin/assets/css/series_list.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 19th March, 2016 + @build 11th April, 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 15524018..9352be3d 100644 --- a/admin/assets/css/sermon.css +++ b/admin/assets/css/sermon.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 19th March, 2016 + @build 11th April, 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 80281346..fa594e87 100644 --- a/admin/assets/css/sermons.css +++ b/admin/assets/css/sermons.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 19th March, 2016 + @build 11th April, 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 01318df7..2dfd3dac 100644 --- a/admin/assets/css/statistic.css +++ b/admin/assets/css/statistic.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 19th March, 2016 + @build 11th April, 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 6c1cedb9..b95d2c4c 100644 --- a/admin/assets/css/statistics.css +++ b/admin/assets/css/statistics.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.3.2 - @build 19th March, 2016 + @build 11th April, 2016 @created 22nd October, 2015 @package Sermon Distributor @subpackage statistics.css diff --git a/admin/config.xml b/admin/config.xml index 14840e91..7a0bf7fe 100644 --- a/admin/config.xml +++ b/admin/config.xml @@ -1,6 +1,8 @@
@@ -355,7 +357,7 @@ description="COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_LOAD_DESC" class="btn-group btn-group-yesno" default=""> - + " " "