Various Fixes (#156)

jdarwood007 · web-flow · commit c080004d3259 · 2022-01-23T17:29:15.000-08:00
* Sprintf and un_htmlspecialchars Fixes #155 * 2022 Copyright year * Fixes #152
diff --git a/buildTools b/buildTools
@@ -1 +1 @@
-Subproject commit 7009afc5c6264a45b86828551c59158c19c2d5f8
+Subproject commit 2d59db5bb4e7cc0b3024003181d36048bcccde63
diff --git a/css/helpdesk.css b/css/helpdesk.css
@@ -553,27 +553,34 @@ dl.stats dd span, dl.stats dt span {
 }
 
 /* Unread */
-.sd_unread_title,
-.sd_unread_content {
+.sd_unread_title {
 	display: flex;
 	min-height: 35px;
 	flex-wrap: wrap;
 	align-items: center;
 	padding: 0 4px;
 }
+.sd_unread_content div.sd_unread_row {
+	display: flex;
+	min-height: 35px;
+	flex-wrap: wrap;
+	align-items: center;
+	padding: 0 4px;
+}
+
 .sd_unread_title span {
 	flex-basis: auto;
 	flex-grow: 1;
 }
-.sd_unread_content span {
+.sd_unread_content div.sd_unread_row span {
 	flex-basis: auto;
 	flex-shrink: 0;
 	flex-grow: 1;
 }
 
 @media screen and (max-width: 991px) {
 	.sd_unread_title span:not(:nth-child(1), :nth-child(2), :nth-child(5)),
-	.sd_unread_content span:not(:nth-child(1), :nth-child(2), :nth-child(5)) {
+	.sd_unread_content div.sd_unread_row span:not(:nth-child(1), :nth-child(2), :nth-child(5)) {
 		display: none;
 	}
 }
diff --git a/install-sd.php b/install-sd.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/license.txt b/license.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2019, SimpleDesk Team
+Copyright (c) 2010-2022, SimpleDesk Team
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/sd_language/SimpleDesk.english.php b/sd_language/SimpleDesk.english.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_language/SimpleDeskAdmin.english.php b/sd_language/SimpleDeskAdmin.english.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_language/SimpleDeskLogAction.english.php b/sd_language/SimpleDeskLogAction.english.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_language/SimpleDeskNotifications.english.php b/sd_language/SimpleDeskNotifications.english.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_language/SimpleDeskPermissions.english.php b/sd_language/SimpleDeskPermissions.english.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_language/SimpleDeskProfile.english.php b/sd_language/SimpleDeskProfile.english.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_language/SimpleDeskWho.english.php b/sd_language/SimpleDeskWho.english.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_plugins_lang/SDPluginFrontPage.english.php b/sd_plugins_lang/SDPluginFrontPage.english.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_plugins_lang/SDPluginStats.english.php b/sd_plugins_lang/SDPluginStats.english.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_plugins_source/front_page/SDPluginFrontPage.php b/sd_plugins_source/front_page/SDPluginFrontPage.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_plugins_source/front_page/index.php b/sd_plugins_source/front_page/index.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_plugins_source/stats/SDPluginStats.php b/sd_plugins_source/stats/SDPluginStats.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_plugins_source/stats/index.php b/sd_plugins_source/stats/index.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-Admin.php b/sd_source/SimpleDesk-Admin.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-AdminCannedReplies.php b/sd_source/SimpleDesk-AdminCannedReplies.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-AdminCustomField.php b/sd_source/SimpleDesk-AdminCustomField.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-AdminDepartments.php b/sd_source/SimpleDesk-AdminDepartments.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-AdminMaint.php b/sd_source/SimpleDesk-AdminMaint.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-AdminPermissions.php b/sd_source/SimpleDesk-AdminPermissions.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-AdminPlugins.php b/sd_source/SimpleDesk-AdminPlugins.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-AjaxHandler.php b/sd_source/SimpleDesk-AjaxHandler.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-Assign.php b/sd_source/SimpleDesk-Assign.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-Delete.php b/sd_source/SimpleDesk-Delete.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-Display.php b/sd_source/SimpleDesk-Display.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-MiscActions.php b/sd_source/SimpleDesk-MiscActions.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-MoveDept.php b/sd_source/SimpleDesk-MoveDept.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-Notifications.php b/sd_source/SimpleDesk-Notifications.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
@@ -134,7 +134,7 @@ function shd_notifications_notify_newreply(&$msgOptions, &$ticketOptions, &$post
 		'ticket' => $ticketOptions['id'],
 		'msg' => $msgOptions['id'],
 		'body' => $msgOptions['body'],
-		'poster_name' => $posterOptions['name'],
+		'poster_name' => un_htmlspecialchars($posterOptions['name']), // Fixes &quote; from being in emails.
 	);
 
 	$members = array(); // who should get what type of notification, preferences depending
@@ -433,7 +433,7 @@ function shd_notify_users($notify_data)
 
 			$subject = str_replace(array_keys($replacements), array_values($replacements), $txt['template_subject_notify_' . $email_type]);
 
-			$body = $txt['template_' . $withbody . '_notify_' . $email_type] . "\n\n" . $txt['regards_team'];
+			$body = $txt['template_' . $withbody . '_notify_' . $email_type] . "\n\n" . sprintf($txt['regards_team'], $context['forum_name']);
 			$body = str_replace(array_keys($replacements), array_values($replacements), $body);
 
 			if (!isset($log['emails'][$email_type]))
diff --git a/sd_source/SimpleDesk-Post.php b/sd_source/SimpleDesk-Post.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-Profile.php b/sd_source/SimpleDesk-Profile.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-SSI.php b/sd_source/SimpleDesk-SSI.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-Scheduled.php b/sd_source/SimpleDesk-Scheduled.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-Search.php b/sd_source/SimpleDesk-Search.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-TicketTopicMove.php b/sd_source/SimpleDesk-TicketTopicMove.php
@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2021 - SimpleDesk.net                   *
+*         * Copyright 2022 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
diff --git a/sd_source/SimpleDesk-Unread.php b/sd_source/SimpleDesk-Unread.php
diff --git a/sd_source/SimpleDesk.php b/sd_source/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/sd_template/SimpleDesk-Unread.template.php b/sd_template/SimpleDesk-Unread.template.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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2010-2019, SimpleDesk Team`
	`1`	`+Copyright (c) 2010-2022, SimpleDesk Team`
`2`	`2`	`All rights reserved.`
`3`	`3`
`4`	`4`	`Redistribution and use in source and binary forms, with or without`