Upgraded to JCB v2.12.6

Llewellynvdm · Feb 7, 2021 · b72b3d5 · b72b3d5
1 parent 6ea9166
commit b72b3d5
Show file tree

Hide file tree

Showing 16 changed files with 66 additions and 113 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ The best way to see all your options is to install this component on you Joomla
 + *Author*: [Llewellyn van der Merwe](mailto:[email protected])
 + *Name*: [Sermon Distributor](https://www.vdm.io/)
 + *First Build*: 22nd October, 2015
-+ *Last Build*: 15th January, 2021
++ *Last Build*: 7th February, 2021
 + *Version*: 2.0.x
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
@@ -37,7 +37,7 @@ due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder
 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
 > never making one mistake or taking any coffee break.)
 
-+ *Line count*: **73062**
++ *Line count*: **73015**
 + *File count*: **460**
 + *Folder count*: **93**
 

diff --git a/admin/README.txt b/admin/README.txt
@@ -24,7 +24,7 @@ The best way to see all your options is to install this component on you Joomla
 + *Author*: [Llewellyn van der Merwe](mailto:[email protected])
 + *Name*: [Sermon Distributor](https://www.vdm.io/)
 + *First Build*: 22nd October, 2015
-+ *Last Build*: 15th January, 2021
++ *Last Build*: 7th February, 2021
 + *Version*: 2.0.x
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
@@ -37,7 +37,7 @@ due to [Automated Component Builder](https://www.vdm.io/joomla-component-builder
 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
 > never making one mistake or taking any coffee break.)
 
-+ *Line count*: **73062**
++ *Line count*: **73015**
 + *File count*: **460**
 + *Folder count*: **93**
 

diff --git a/admin/language/en-GB/en-GB.com_sermondistributor.ini b/admin/language/en-GB/en-GB.com_sermondistributor.ini
diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php
@@ -57,6 +57,10 @@ protected function getOptions()
 		// now check if there are files in the folder
 		if (JFolder::exists($localfolder) && $folders = JFolder::folders($localfolder))
 		{
+			if ($this->multiple === false)
+			{
+				$options[] = JHtml::_('select.option', '', JText::_('COM_SERMONDISTRIBUTOR_SELECT_AN_ADMIN_VIEW'));
+			}
 			foreach ($folders as $folder)
 			{
 				$options[] = JHtml::_('select.option', $folder, SermondistributorHelper::safeString($folder, 'W'));

diff --git a/admin/models/fields/externalsourcesfilterbuild.php b/admin/models/fields/externalsourcesfilterbuild.php
@@ -64,7 +64,7 @@ protected function getOptions()
 
 		$results = $db->loadColumn();
 		$_filter = array();
-		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_SERMONDISTRIBUTOR_FILTER_SELECT_BUILD') . ' -');
+		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_SERMONDISTRIBUTOR_FILTER_SELECT_BUILD_OPTION') . ' -');
 
 		if ($results)
 		{

diff --git a/admin/models/fields/externalsourcesfilterexternalsources.php b/admin/models/fields/externalsourcesfilterexternalsources.php
@@ -64,7 +64,7 @@ protected function getOptions()
 
 		$results = $db->loadColumn();
 		$_filter = array();
-		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_SERMONDISTRIBUTOR_FILTER_SELECT_EXTERNALSOURCES') . ' -');
+		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_SERMONDISTRIBUTOR_FILTER_SELECT_EXTERNAL_SOURCES') . ' -');
 
 		if ($results)
 		{

diff --git a/admin/models/fields/locallistingsfilterbuild.php b/admin/models/fields/locallistingsfilterbuild.php
@@ -64,7 +64,7 @@ protected function getOptions()
 
 		$results = $db->loadColumn();
 		$_filter = array();
-		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_SERMONDISTRIBUTOR_FILTER_SELECT_BUILD') . ' -');
+		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_SERMONDISTRIBUTOR_FILTER_SELECT_BUILD_OPTION') . ' -');
 
 		if ($results)
 		{

diff --git a/admin/models/fields/sermonsfilterlinktype.php b/admin/models/fields/sermonsfilterlinktype.php
@@ -64,7 +64,7 @@ protected function getOptions()
 
 		$results = $db->loadColumn();
 		$_filter = array();
-		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_SERMONDISTRIBUTOR_FILTER_SELECT_LINK_TYPE') . ' -');
+		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_SERMONDISTRIBUTOR_FILTER_SELECT_DOWNLOAD_LINK_OPTION') . ' -');
 
 		if ($results)
 		{

diff --git a/admin/models/fields/sermonsfiltersource.php b/admin/models/fields/sermonsfiltersource.php
@@ -64,7 +64,7 @@ protected function getOptions()
 
 		$results = $db->loadColumn();
 		$_filter = array();
-		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_SERMONDISTRIBUTOR_FILTER_SELECT_SOURCE') . ' -');
+		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_SERMONDISTRIBUTOR_FILTER_SELECT_FILE_SOURCE') . ' -');
 
 		if ($results)
 		{

diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php
@@ -57,6 +57,10 @@ protected function getOptions()
 		// now check if there are files in the folder
 		if (JFolder::exists($localfolder) && $folders = JFolder::folders($localfolder))
 		{
+			if ($this->multiple === false)
+			{
+				$options[] = JHtml::_('select.option', '', JText::_('COM_SERMONDISTRIBUTOR_SELECT_A_SITE_VIEW'));
+			}
 			foreach ($folders as $folder)
 			{
 				$options[] = JHtml::_('select.option', $folder, SermondistributorHelper::safeString($folder, 'W'));

diff --git a/admin/models/forms/filter_external_sources.xml b/admin/models/forms/filter_external_sources.xml
@@ -62,12 +62,12 @@
 			<option value="a.published DESC">JSTATUS_DESC</option>
 			<option value="a.description ASC">COM_SERMONDISTRIBUTOR_FILTER_DESCRIPTION_ASCENDING</option>
 			<option value="a.description DESC">COM_SERMONDISTRIBUTOR_FILTER_DESCRIPTION_DESCENDING</option>
-			<option value="a.externalsources ASC">COM_SERMONDISTRIBUTOR_FILTER_EXTERNALSOURCES_ASCENDING</option>
-			<option value="a.externalsources DESC">COM_SERMONDISTRIBUTOR_FILTER_EXTERNALSOURCES_DESCENDING</option>
+			<option value="a.externalsources ASC">COM_SERMONDISTRIBUTOR_FILTER_EXTERNAL_SOURCES_ASCENDING</option>
+			<option value="a.externalsources DESC">COM_SERMONDISTRIBUTOR_FILTER_EXTERNAL_SOURCES_DESCENDING</option>
 			<option value="a.update_method ASC">COM_SERMONDISTRIBUTOR_FILTER_UPDATE_METHOD_ASCENDING</option>
 			<option value="a.update_method DESC">COM_SERMONDISTRIBUTOR_FILTER_UPDATE_METHOD_DESCENDING</option>
-			<option value="a.build ASC">COM_SERMONDISTRIBUTOR_FILTER_BUILD_ASCENDING</option>
-			<option value="a.build DESC">COM_SERMONDISTRIBUTOR_FILTER_BUILD_DESCENDING</option>
+			<option value="a.build ASC">COM_SERMONDISTRIBUTOR_FILTER_BUILD_OPTION_ASCENDING</option>
+			<option value="a.build DESC">COM_SERMONDISTRIBUTOR_FILTER_BUILD_OPTION_DESCENDING</option>
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
 		</field>

diff --git a/admin/models/forms/filter_help_documents.xml b/admin/models/forms/filter_help_documents.xml
@@ -82,10 +82,10 @@
 			<option value="a.type DESC">COM_SERMONDISTRIBUTOR_FILTER_TYPE_DESCENDING</option>
 			<option value="a.location ASC">COM_SERMONDISTRIBUTOR_FILTER_LOCATION_ASCENDING</option>
 			<option value="a.location DESC">COM_SERMONDISTRIBUTOR_FILTER_LOCATION_DESCENDING</option>
-			<option value="g. ASC">COM_SERMONDISTRIBUTOR_FILTER_ADMIN_VIEW_ASCENDING</option>
-			<option value="g. DESC">COM_SERMONDISTRIBUTOR_FILTER_ADMIN_VIEW_DESCENDING</option>
-			<option value="h. ASC">COM_SERMONDISTRIBUTOR_FILTER_SITE_VIEW_ASCENDING</option>
-			<option value="h. DESC">COM_SERMONDISTRIBUTOR_FILTER_SITE_VIEW_DESCENDING</option>
+			<option value="g. ASC">COM_SERMONDISTRIBUTOR_FILTER_ADMIN_VIEWS_ASCENDING</option>
+			<option value="g. DESC">COM_SERMONDISTRIBUTOR_FILTER_ADMIN_VIEWS_DESCENDING</option>
+			<option value="h. ASC">COM_SERMONDISTRIBUTOR_FILTER_SITE_VIEWS_ASCENDING</option>
+			<option value="h. DESC">COM_SERMONDISTRIBUTOR_FILTER_SITE_VIEWS_DESCENDING</option>
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
 		</field>

diff --git a/admin/models/forms/filter_local_listings.xml b/admin/models/forms/filter_local_listings.xml
@@ -53,16 +53,16 @@
 			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
 			<option value="a.published ASC">JSTATUS_ASC</option>
 			<option value="a.published DESC">JSTATUS_DESC</option>
-			<option value="a.name ASC">COM_SERMONDISTRIBUTOR_FILTER_NAME_ASCENDING</option>
-			<option value="a.name DESC">COM_SERMONDISTRIBUTOR_FILTER_NAME_DESCENDING</option>
-			<option value="a.build ASC">COM_SERMONDISTRIBUTOR_FILTER_BUILD_ASCENDING</option>
-			<option value="a.build DESC">COM_SERMONDISTRIBUTOR_FILTER_BUILD_DESCENDING</option>
-			<option value="a.size ASC">COM_SERMONDISTRIBUTOR_FILTER_SIZE_ASCENDING</option>
-			<option value="a.size DESC">COM_SERMONDISTRIBUTOR_FILTER_SIZE_DESCENDING</option>
+			<option value="a.name ASC">COM_SERMONDISTRIBUTOR_FILTER_FILE_NAME_ASCENDING</option>
+			<option value="a.name DESC">COM_SERMONDISTRIBUTOR_FILTER_FILE_NAME_DESCENDING</option>
+			<option value="a.build ASC">COM_SERMONDISTRIBUTOR_FILTER_BUILD_OPTION_ASCENDING</option>
+			<option value="a.build DESC">COM_SERMONDISTRIBUTOR_FILTER_BUILD_OPTION_DESCENDING</option>
+			<option value="a.size ASC">COM_SERMONDISTRIBUTOR_FILTER_FILE_SIZE_ASCENDING</option>
+			<option value="a.size DESC">COM_SERMONDISTRIBUTOR_FILTER_FILE_SIZE_DESCENDING</option>
 			<option value="g.description ASC">COM_SERMONDISTRIBUTOR_FILTER_EXTERNAL_SOURCE_ASCENDING</option>
 			<option value="g.description DESC">COM_SERMONDISTRIBUTOR_FILTER_EXTERNAL_SOURCE_DESCENDING</option>
-			<option value="a.key ASC">COM_SERMONDISTRIBUTOR_FILTER_KEY_ASCENDING</option>
-			<option value="a.key DESC">COM_SERMONDISTRIBUTOR_FILTER_KEY_DESCENDING</option>
+			<option value="a.key ASC">COM_SERMONDISTRIBUTOR_FILTER_LISTING_KEY_ASCENDING</option>
+			<option value="a.key DESC">COM_SERMONDISTRIBUTOR_FILTER_LISTING_KEY_DESCENDING</option>
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
 		</field>

diff --git a/admin/models/forms/filter_sermons.xml b/admin/models/forms/filter_sermons.xml
@@ -99,10 +99,10 @@
 			<option value="a.short_description DESC">COM_SERMONDISTRIBUTOR_FILTER_SHORT_DESCRIPTION_DESCENDING</option>
 			<option value="category_title ASC">COM_SERMONDISTRIBUTOR_FILTER_SERMONS_CATEGORIES_ASCENDING</option>
 			<option value="category_title DESC">COM_SERMONDISTRIBUTOR_FILTER_SERMONS_CATEGORIES_DESCENDING</option>
-			<option value="a.link_type ASC">COM_SERMONDISTRIBUTOR_FILTER_LINK_TYPE_ASCENDING</option>
-			<option value="a.link_type DESC">COM_SERMONDISTRIBUTOR_FILTER_LINK_TYPE_DESCENDING</option>
-			<option value="a.source ASC">COM_SERMONDISTRIBUTOR_FILTER_SOURCE_ASCENDING</option>
-			<option value="a.source DESC">COM_SERMONDISTRIBUTOR_FILTER_SOURCE_DESCENDING</option>
+			<option value="a.link_type ASC">COM_SERMONDISTRIBUTOR_FILTER_DOWNLOAD_LINK_OPTION_ASCENDING</option>
+			<option value="a.link_type DESC">COM_SERMONDISTRIBUTOR_FILTER_DOWNLOAD_LINK_OPTION_DESCENDING</option>
+			<option value="a.source ASC">COM_SERMONDISTRIBUTOR_FILTER_FILE_SOURCE_ASCENDING</option>
+			<option value="a.source DESC">COM_SERMONDISTRIBUTOR_FILTER_FILE_SOURCE_DESCENDING</option>
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
 		</field>

diff --git a/admin/models/forms/filter_statistics.xml b/admin/models/forms/filter_statistics.xml
@@ -69,8 +69,8 @@
 			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
 			<option value="a.published ASC">JSTATUS_ASC</option>
 			<option value="a.published DESC">JSTATUS_DESC</option>
-			<option value="a.filename ASC">COM_SERMONDISTRIBUTOR_FILTER_FILENAME_ASCENDING</option>
-			<option value="a.filename DESC">COM_SERMONDISTRIBUTOR_FILTER_FILENAME_DESCENDING</option>
+			<option value="a.filename ASC">COM_SERMONDISTRIBUTOR_FILTER_FILE_NAME_ASCENDING</option>
+			<option value="a.filename DESC">COM_SERMONDISTRIBUTOR_FILTER_FILE_NAME_DESCENDING</option>
 			<option value="g.name ASC">COM_SERMONDISTRIBUTOR_FILTER_SERMON_ASCENDING</option>
 			<option value="g.name DESC">COM_SERMONDISTRIBUTOR_FILTER_SERMON_DESCENDING</option>
 			<option value="h.name ASC">COM_SERMONDISTRIBUTOR_FILTER_PREACHER_ASCENDING</option>

diff --git a/sermondistributor.xml b/sermondistributor.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_SERMONDISTRIBUTOR</name>
-	<creationDate>15th January, 2021</creationDate>
+	<creationDate>7th February, 2021</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.vdm.io/</authorUrl>