Release 2.1.0 (#158)

jdarwood007 · web-flow · commit 8d7c9361e6f5 · 2022-05-27T16:16:20.000-07:00
* Release 2.1.0

* Fix buildTools
diff --git a/buildTools b/buildTools
@@ -1 +1 @@
-Subproject commit 2d59db5bb4e7cc0b3024003181d36048bcccde63
+Subproject commit ec395af8128c6f0c66b2979aa7f445429832db8d
diff --git a/install-sd.php b/install-sd.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: install.php                                      *
 **************************************************************/
 
@@ -181,7 +181,7 @@ function sd_get_install_modSettings($getAll = false)
 function sd_get_install_rows()
 {
 	global $smcFunc;
-	static $current_package_server_url = 'https://www.simpledesk.net/download/plugins/2.0';
+	static $current_package_server_url = 'https://www.simpledesk.net/download/plugins/2.1';
 
 	$rows = array();
 	$rows[] = array(
diff --git a/language-readme/readme.english.txt b/language-readme/readme.english.txt
@@ -6,7 +6,7 @@ Thank you for downloading SimpleDesk :)
 
 Yes, we know, you don't want the boring formality of a license, but to protect us - and you - we have a license in the code. Clicking the install button after this constitutes acceptance of the following terms.
 
-[code]Copyright (c) 2010-2015, SimpleDesk Team
+[code]Copyright (c) 2010-2022, SimpleDesk Team
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/package-info.xml b/package-info.xml
@@ -3,7 +3,7 @@
 <package-info xmlns="http://www.simplemachines.org/xml/package-info" xmlns:smf="http://www.simplemachines.org/">
 	<id>SimpleDeskTeam:SimpleDesk</id>
 	<name>SimpleDesk - Integrated Helpdesk for Simple Machines Forum</name>
-	<version>2.1 RC2</version>
+	<version>2.1.0</version>
 	<type>modification</type>
 
 	<install for="2.1 RC4, 2.1.0-2.1.99">
@@ -78,6 +78,7 @@
 		<hook hook="integrate_display_buttons" function="shd_display_btn_mvtopic" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
 
 			<!-- ShowAttachments -->
+		<hook hook="integrate_pre_download_request" function="shd_pre_download_request" file="$sourcedir/sd_source/Subs-SimpleDeskDisplay.php" />
 		<hook hook="integrate_download_request" function="shd_download_request" file="$sourcedir/sd_source/Subs-SimpleDeskDisplay.php" />
 
 			<!-- BoardIndex -->
@@ -142,6 +143,7 @@
 		<hook reverse="true" hook="integrate_display_buttons" function="shd_display_btn_mvtopic" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
 
 			<!-- ShowAttachments -->
+		<hook reverse="true" hook="integrate_pre_download_request" function="shd_pre_download_request" file="$sourcedir/sd_source/Subs-SimpleDeskDisplay.php" />
 		<hook reverse="true" hook="integrate_download_request" function="shd_download_request" file="$sourcedir/sd_source/Subs-SimpleDeskDisplay.php" />
 
 			<!-- BoardIndex -->
diff --git a/sd_language/SimpleDesk.english.php b/sd_language/SimpleDesk.english.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk.english.php                           *
 **************************************************************/
 // Version: 2.1; SimpleDesk main language file
diff --git a/sd_language/SimpleDeskAdmin.english.php b/sd_language/SimpleDeskAdmin.english.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDeskAdmin.english.php                      *
 **************************************************************/
 // Version: 2.1; SimpleDesk administration options
diff --git a/sd_language/SimpleDeskLogAction.english.php b/sd_language/SimpleDeskLogAction.english.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDeskLogAction.english.php                  *
 **************************************************************/
 // Version: 2.1; SimpleDesk action log
diff --git a/sd_language/SimpleDeskNotifications.english.php b/sd_language/SimpleDeskNotifications.english.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDeskNotifications.english.php              *
 **************************************************************/
 // Version: 2.1; SimpleDesk Notifications language file
diff --git a/sd_language/SimpleDeskPermissions.english.php b/sd_language/SimpleDeskPermissions.english.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDeskPermissions.english.php                *
 **************************************************************/
 // Version: 2.1; SimpleDesk permissions
diff --git a/sd_language/SimpleDeskProfile.english.php b/sd_language/SimpleDeskProfile.english.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDeskProfile.english.php                    *
 **************************************************************/
 // Version: 2.1; SimpleDesk Profile language file
diff --git a/sd_language/SimpleDeskWho.english.php b/sd_language/SimpleDeskWho.english.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDeskWho.english.php                        *
 **************************************************************/
 // Version: 2.1; SimpleDesk who's online
diff --git a/sd_plugins_lang/SDPluginFrontPage.english.php b/sd_plugins_lang/SDPluginFrontPage.english.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SDPluginFrontPage.english.php                    *
 **************************************************************/
 // Version: 2.1; SimpleDesk main language file
diff --git a/sd_plugins_lang/SDPluginStats.english.php b/sd_plugins_lang/SDPluginStats.english.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SDPluginStats.english.php                        *
 **************************************************************/
 // Version: 2.1; SimpleDesk main language file
diff --git a/sd_plugins_source/front_page/SDPluginFrontPage.php b/sd_plugins_source/front_page/SDPluginFrontPage.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SDPluginFrontPage.php                            *
 **************************************************************/
 
diff --git a/sd_plugins_source/front_page/index.php b/sd_plugins_source/front_page/index.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: index.php                                        *
 **************************************************************/
 
diff --git a/sd_plugins_source/stats/SDPluginStats.php b/sd_plugins_source/stats/SDPluginStats.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SDPluginStats.php                                *
 **************************************************************/
 
diff --git a/sd_plugins_source/stats/index.php b/sd_plugins_source/stats/index.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: index.php                                        *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-Admin.php b/sd_source/SimpleDesk-Admin.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-Admin.php                             *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-AdminCannedReplies.php b/sd_source/SimpleDesk-AdminCannedReplies.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-AdminDepartments.php                  *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-AdminCustomField.php b/sd_source/SimpleDesk-AdminCustomField.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-AdminCustomField.php                  *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-AdminDepartments.php b/sd_source/SimpleDesk-AdminDepartments.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-AdminDepartments.php                  *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-AdminMaint.php b/sd_source/SimpleDesk-AdminMaint.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-AdminMaint.php                        *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-AdminPermissions.php b/sd_source/SimpleDesk-AdminPermissions.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-AdminPermissions.php                  *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-AdminPlugins.php b/sd_source/SimpleDesk-AdminPlugins.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-AdminPlugins.php                      *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-AjaxHandler.php b/sd_source/SimpleDesk-AjaxHandler.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-AjaxHandler.php                       *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-Assign.php b/sd_source/SimpleDesk-Assign.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-Assign.php                            *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-Delete.php b/sd_source/SimpleDesk-Delete.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-Delete.php                            *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-Display.php b/sd_source/SimpleDesk-Display.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-Display.php                           *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-MiscActions.php b/sd_source/SimpleDesk-MiscActions.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-MiscActions.php                       *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-MoveDept.php b/sd_source/SimpleDesk-MoveDept.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-MoveDept.php                          *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-Notifications.php b/sd_source/SimpleDesk-Notifications.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-Notifications.php                     *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-Post.php b/sd_source/SimpleDesk-Post.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-Post.php                              *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-Profile.php b/sd_source/SimpleDesk-Profile.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-Profile.php                           *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-SSI.php b/sd_source/SimpleDesk-SSI.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-SSI.php                               *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-Scheduled.php b/sd_source/SimpleDesk-Scheduled.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-Scheduled.php                         *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-Search.php b/sd_source/SimpleDesk-Search.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-Search.php                            *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-TicketTopicMove.php b/sd_source/SimpleDesk-TicketTopicMove.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-TicketTopicMove.php                   *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk-Unread.php b/sd_source/SimpleDesk-Unread.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk-Unread.php                            *
 **************************************************************/
 
diff --git a/sd_source/SimpleDesk.php b/sd_source/SimpleDesk.php
@@ -13,7 +13,7 @@
 *   Any questions, please contact SimpleDesk.net              *
 *                                                             *
 ***************************************************************
-* SimpleDesk Version: 2.1 RC1                                 *
+* SimpleDesk Version: 2.1.0                                   *
 * File Info: SimpleDesk.php                                   *
 **************************************************************/
 
diff --git a/sd_source/Subs-SimpleDesk.php b/sd_source/Subs-SimpleDesk.php
diff --git a/sd_source/Subs-SimpleDeskAdmin.php b/sd_source/Subs-SimpleDeskAdmin.php
diff --git a/sd_source/Subs-SimpleDeskBoardIndex.php b/sd_source/Subs-SimpleDeskBoardIndex.php
diff --git a/sd_source/Subs-SimpleDeskDisplay.php b/sd_source/Subs-SimpleDeskDisplay.php
diff --git a/sd_source/Subs-SimpleDeskManageAttachments.php b/sd_source/Subs-SimpleDeskManageAttachments.php
diff --git a/sd_source/Subs-SimpleDeskPackages.php b/sd_source/Subs-SimpleDeskPackages.php
diff --git a/sd_source/Subs-SimpleDeskPermissions.php b/sd_source/Subs-SimpleDeskPermissions.php
diff --git a/sd_source/Subs-SimpleDeskPost.php b/sd_source/Subs-SimpleDeskPost.php
diff --git a/sd_source/Subs-SimpleDeskProfile.php b/sd_source/Subs-SimpleDeskProfile.php
diff --git a/sd_source/Subs-SimpleDeskSearch.php b/sd_source/Subs-SimpleDeskSearch.php
diff --git a/uninstall-sd-optional.php b/uninstall-sd-optional.php
diff --git a/uninstall-sd-required.php b/uninstall-sd-required.php
