Updated the update path of the update server zip download.

Llewellynvdm · Jan 15, 2021 · 5c79ef2 · 5c79ef2
1 parent 1b5191d
commit 5c79ef2
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 20 deletions.
diff --git 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:[email protected])
 + *Name*: [Sermon Distributor](https://www.vdm.io/)
 + *First Build*: 22nd October, 2015
-+ *Last Build*: 31st December, 2020
++ *Last Build*: 15th January, 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
@@ -36,7 +36,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*: **73050**
++ *Line count*: **73060**
 + *File count*: **460**
 + *Folder count*: **93**
 

diff --git a/admin/README.txt b/admin/README.txt
@@ -23,7 +23,7 @@ The best way to see all your options is to install this component on you Joomla
 + *Author*: [Llewellyn van der Merwe](mailto:[email protected])
 + *Name*: [Sermon Distributor](https://www.vdm.io/)
 + *First Build*: 22nd October, 2015
-+ *Last Build*: 31st December, 2020
++ *Last Build*: 15th January, 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
@@ -36,7 +36,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*: **73050**
++ *Line count*: **73060**
 + *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
@@ -1595,6 +1595,7 @@ COM_SERMONDISTRIBUTOR_THIS_SOURCE_HAS_NO_LOCAL_LISTING_SET="This source has no l
 COM_SERMONDISTRIBUTOR_TOTAL_DOWNLOADS="total downloads"
 COM_SERMONDISTRIBUTOR_TRASHED="Trashed"
 COM_SERMONDISTRIBUTOR_TRASHED_ITEMS="Trashed items"
+COM_SERMONDISTRIBUTOR_TRASH_AREA="Trash Area"
 COM_SERMONDISTRIBUTOR_TYPE_EXTERNAL_SOURCE="External Source"
 COM_SERMONDISTRIBUTOR_TYPE_HELP_DOCUMENT="Help Document"
 COM_SERMONDISTRIBUTOR_TYPE_LOCAL_LISTING="Local Listing"
@@ -1614,5 +1615,6 @@ COM_SERMONDISTRIBUTOR_VIEW_MORE_RELEASES_ON_GITHUB="View more releases on Github
 COM_SERMONDISTRIBUTOR_VIEW_UPDATE_STATUS="View Update Status"
 COM_SERMONDISTRIBUTOR_WEBSITE="Website"
 COM_SERMONDISTRIBUTOR_YOU_ARE_CURRENTLY_VIEWING_THE_TRASHED_ITEMS="You are currently viewing the trashed items."
+COM_SERMONDISTRIBUTOR_YOU_ARE_CURRENTLY_VIEWING_THE_TRASH_AREA_AND_YOU_DONT_HAVE_ANY_ITEMS_IN_TRASH_AT_THE_MOMENT="You are currently viewing the trash area, and you don't have any items in trash at the moment!"
 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/trashhelper.php b/admin/layouts/trashhelper.php
@@ -61,15 +61,23 @@ function exitTrash() {
 		}
 	</script>
 	<div class="alert alert-error">
-		<h4 class="alert-heading">
-			<span class="icon-trash"></span>
-			<?= JText::_("COM_SERMONDISTRIBUTOR_TRASHED_ITEMS") ?>
-		</h4>
-		<p><?= JText::_("COM_SERMONDISTRIBUTOR_YOU_ARE_CURRENTLY_VIEWING_THE_TRASHED_ITEMS") ?></p>
-		<button onclick="emptyTrash();" class="btn btn-small btn-danger">
-			<span class="icon-delete" aria-hidden="true"></span>
-			<?= JText::_("COM_SERMONDISTRIBUTOR_EMPTY_TRASH") ?>
-		</button>
+		<?php if (empty($displayData->items)): ?>
+			<h4 class="alert-heading">
+				<span class="icon-trash"></span>
+				<?= JText::_("COM_SERMONDISTRIBUTOR_TRASH_AREA") ?>
+			</h4>
+			<p><?= JText::_("COM_SERMONDISTRIBUTOR_YOU_ARE_CURRENTLY_VIEWING_THE_TRASH_AREA_AND_YOU_DONT_HAVE_ANY_ITEMS_IN_TRASH_AT_THE_MOMENT") ?></p>
+		<?php else: ?>
+			<h4 class="alert-heading">
+				<span class="icon-trash"></span>
+				<?= JText::_("COM_SERMONDISTRIBUTOR_TRASHED_ITEMS") ?>
+			</h4>
+			<p><?= JText::_("COM_SERMONDISTRIBUTOR_YOU_ARE_CURRENTLY_VIEWING_THE_TRASHED_ITEMS") ?></p>
+			<button onclick="emptyTrash();" class="btn btn-small btn-danger">
+				<span class="icon-delete" aria-hidden="true"></span>
+				<?= JText::_("COM_SERMONDISTRIBUTOR_EMPTY_TRASH") ?>
+			</button>
+		<?php endif; ?>
 		<button onclick="exitTrash();" class="btn btn-small">
 			<span class="icon-back" aria-hidden="true"></span>
 			<?= JText::_("COM_SERMONDISTRIBUTOR_EXIT_TRASH") ?>

diff --git a/admin/sql/updates/mysql/2.0.3.sql b/admin/sql/updates/mysql/2.0.3.sql
@@ -1,3 +1,3 @@
-ALTER TABLE `#__sermondistributor_sermon` ENGINE = InnoDB;
-
+ALTER TABLE `#__sermondistributor_sermon` ENGINE = InnoDB;
+
 ALTER TABLE `#__sermondistributor_sermon` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
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>31st December, 2020</creationDate>
+	<creationDate>15th January, 2021</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.vdm.io/</authorUrl>

diff --git a/sermondistributor_update_server.xml b/sermondistributor_update_server.xml
@@ -7,7 +7,7 @@
 		<version>1.0.0</version>
 		<infourl title="Sermon Distributor!">https://www.vdm.io/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/SermonDistributor/Joomla-3-Component/archive/V1.2.9.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/Llewellynvdm/Joomla-Sermon-Distributor/archive/V1.2.9.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -24,7 +24,7 @@
 		<version>1.3.8</version>
 		<infourl title="Sermon Distributor!">https://www.vdm.io/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/SermonDistributor/Joomla-3-Component/releases/download/v1.3.8/SD_v1.3.8.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/Llewellynvdm/Joomla-Sermon-Distributor/releases/download/v1.3.8/SD_v1.3.8.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -41,7 +41,7 @@
 		<version>2.0.3</version>
 		<infourl title="Sermon Distributor!">https://www.vdm.io/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/SermonDistributor/Joomla-3-Component/releases/download/v2.0.3/SD_v2.0.3.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/Llewellynvdm/Joomla-Sermon-Distributor/releases/download/v2.0.3/SD_v2.0.3.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -58,7 +58,7 @@
 		<version>2.0.4</version>
 		<infourl title="Sermon Distributor!">https://www.vdm.io/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">http://domain.com/demo.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/Llewellynvdm/Joomla-Sermon-Distributor/releases/download/v2.0.4/SD_v2.0.4.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>