Sync smf21 to master (#144) (c4a356a) - SD-SimpleDesk

Sync smf21 to master (#144)

Jeremy D commited on 2021-08-18 13:58:28
Showing 55 changed files, with 170 additions and 86 deletions.

* Ensure Build Tools are updated (#135)

Signed-off-by: jdarwood007 <unmonitored+github@sleepycode.com>

* Fix some Javascript errors and update build tools for eslint (#137)

* Fix some Javascript errors and update build tools for eslint

* Try again

* Need Submodules

* Fix the software year
Try eslint another way.

* Move to only supporting SMF 2.1 RC4 or later. (#141)

* Sync master (#142)

* Ensure Build Tools are updated

Signed-off-by: jdarwood007 <unmonitored+github@sleepycode.com>

* Move to only supporting SMF 2.1 RC4 or later.

* eslint files

* Fixes profile menu links (#143)

Fixes #139

* Profile menu (#145)

* Fixes profile menu links

Fixes #139

* Oops

* Sync issues

.eslintrc.yml 0000000..d00ba29
.github/workflows/Javascript-Check.yml 8c93a4c..87a4801
.gitignore 3e53cf3..faaf614
css/helpdesk_icons.css f9f0494..f6ada7f
install-sd.php 2954069..722da57
package-info.xml 836914a..6d4766f
scripts/helpdesk.js a0f7837..52347a9
scripts/helpdesk_admin.js 039206a..272ddef
sd_language/SimpleDesk.english.php 25d4551..35f3b93
sd_language/SimpleDeskAdmin.english.php 91347c1..deeee7f
sd_language/SimpleDeskLogAction.english.php 61d3a2f..c7b0bf5
sd_language/SimpleDeskNotifications.english.php 7df4c06..851791d
sd_language/SimpleDeskPermissions.english.php 80b9a1e..c591447
sd_language/SimpleDeskProfile.english.php f15017f..d82c9a1
sd_language/SimpleDeskWho.english.php 215c8b8..157abfe
sd_plugins_lang/SDPluginFrontPage.english.php 3eb98b5..097d376
sd_plugins_lang/SDPluginStats.english.php 84f84b4..3e4771f
sd_plugins_source/front_page/SDPluginFrontPage.php 4def4bf..41dd6a0
sd_plugins_source/front_page/index.php f03edf1..847005d
sd_plugins_source/stats/SDPluginStats.php 35ee45c..d69e5bf
sd_plugins_source/stats/index.php 7b256c4..fa2a4c9
sd_source/SimpleDesk-Admin.php c861ac4..39e2208
sd_source/SimpleDesk-AdminCannedReplies.php e53bdf5..3fb3d86
sd_source/SimpleDesk-AdminCustomField.php 8d69a21..21400fb
sd_source/SimpleDesk-AdminDepartments.php 4aca013..27d6242
sd_source/SimpleDesk-AdminMaint.php f9b9fda..d103253
sd_source/SimpleDesk-AdminPermissions.php 645a54d..7a54adc
sd_source/SimpleDesk-AdminPlugins.php 40ebff8..21268cd
sd_source/SimpleDesk-AjaxHandler.php 7d7dbb5..3edcfde
sd_source/SimpleDesk-Assign.php f5a2338..225495a
sd_source/SimpleDesk-Delete.php 9b815aa..4bd13b7
sd_source/SimpleDesk-Display.php 795a71a..fcc8e81
sd_source/SimpleDesk-MiscActions.php 3366822..b7bbb7e
sd_source/SimpleDesk-MoveDept.php c994da2..dd4aa7c
sd_source/SimpleDesk-Notifications.php 8353cd1..347b959
sd_source/SimpleDesk-Post.php 121b36f..b2b47b3
sd_source/SimpleDesk-Profile.php dd35aba..30e9998
sd_source/SimpleDesk-SSI.php 2ab1b94..b0919eb
sd_source/SimpleDesk-Scheduled.php 2ac286e..ec93511
sd_source/SimpleDesk-Search.php 0c78aed..7cee7ed
sd_source/SimpleDesk-TicketTopicMove.php 524b64b..1985a9a
sd_source/SimpleDesk-Unread.php 07d9634..6c94fd2
sd_source/SimpleDesk.php 52a0ada..6a0b896
sd_source/Subs-SimpleDesk.php 40a6f8d..1029cef
sd_source/Subs-SimpleDeskAdmin.php 937fd3d..8c5064b
sd_source/Subs-SimpleDeskBoardIndex.php 64e389b..0494282
sd_source/Subs-SimpleDeskDisplay.php 480fffd..aa5140d
sd_source/Subs-SimpleDeskManageAttachments.php eca6381..70c3d83
sd_source/Subs-SimpleDeskPackages.php d8c5021..a7e2238
sd_source/Subs-SimpleDeskPermissions.php 8b5c89e..7162db1
sd_source/Subs-SimpleDeskPost.php 4e732e0..66f3a7f
sd_source/Subs-SimpleDeskProfile.php 990e225..a260d04
sd_source/Subs-SimpleDeskSearch.php d4c7804..ba6ce7a
uninstall-sd-optional.php 24ebdf3..a3d52a5
uninstall-sd-required.php bbae009..4a56baf

.eslintrc.yml

View file @ c4a356a

...	...	@@ -0,0 +1,34 @@
	1	+module.exports = {
	2	+ 'env': {
	3	+ 'browser': true,
	4	+ 'es2021': true,
	5	+ 'jquery': true
	6	+ },
	7	+ 'extends': 'eslint:recommended',
	8	+ 'parserOptions': {
	9	+ 'ecmaVersion': 12,
	10	+ 'sourceType': 'module'
	11	+ },
	12	+ 'rules': {
	13	+ 'indent': [
	14	+ 'error',
	15	+ 'tab',
	16	+ {"SwitchCase": 1}
	17	+ ],
	18	+ 'linebreak-style': [
	19	+ 'error',
	20	+ 'unix'
	21	+ ],
	22	+ 'quotes': [
	23	+ 'error',
	24	+ 'single'
	25	+ ],
	26	+ 'no-unused-vars': [
	27	+ 'error',
	28	+ {
	29	+ 'vars': 'local',
	30	+ 'args' : 'none'
	31	+ }
	32	+ ]
	33	+ }
	34	+};

.github/workflows/Javascript-Check.yml

View file @ c4a356a

@@ -13,7 +13,11 @@ jobs:
     name: LINT Checks
     steps:
       - uses: actions/checkout@master
+        with:
+          submodules: true
+      - name: Update Build Tools
+        run: git submodule foreach git pull origin master
       - name: Javascript LINT
         uses: tj-actions/eslint-changed-files@v4
         with:
-          config-path: buildTools/eslintrc
\ No newline at end of file
+          config-path: buildTools/eslintrc.js
\ No newline at end of file

.gitignore

View file @ c4a356a

...	...	@@ -6,3 +6,7 @@
6	6	sd_plugins_lang/SDPlugin*.php
7	7	sd_plugins_source/*
8	8	css/helpdesk_custom.css
	9	+node_modules
	10	+package.json
	11	+yarn.lock
	12	+.eslintrc.js

css/helpdesk_icons.css

View file @ c4a356a

@@ -56,7 +56,7 @@
 }
 
 /* Main Menu */
-#main_menu .main_icons.helpdesk::before {
+#main_menu .main_icons.helpdesk::before, .profile_user_links .main_icons.hd_profile::before{
 	background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat;
 	background-position: -65px -116px;
 }

install-sd.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

package-info.xml

View file @ c4a356a

@@ -10,7 +10,7 @@
 		<readme lang="english" parsebbc="true" type="inline">This mod is [b]not compatible[/b] with your version of SMF, it requires 2.1 RC3 or later.</readme>
 	</install>
 
-	<install for="2.1 RC3, 2.1 RC4, 2.1.0-2.1.99">
+	<install for="2.1 RC4, 2.1.0-2.1.99">
 		<!-- readme files -->
 		<readme lang="english" parsebbc="true" type="file">language-readme/readme.english.txt</readme>
 
@@ -54,6 +54,7 @@
 		<hook hook="integrate_error_types" function="shd_error_types" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
 		<hook hook="integrate_bbc_codes" function="shd_bbc_codes" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
 		<hook hook="integrate_post_parsebbc" function="shd_parse_wikilinks" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
+		<hook hook="integrate_profile_popup" function="shd_profile_menu" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
 
 			<!-- Admin Section: Core -->
 		<hook hook="integrate_admin_include" function="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" />
@@ -100,7 +101,7 @@
 		<credits url="https://www.simpledesk.net" license="BSD 3-Clause" licenseurl="https://github.com/SimpleMachines/SimpleDesk/blob/master/license.txt" copyright="2010-2020">Simple Desk</credits>
 	</install>
 
-	<uninstall for="2.1 RC3, 2.1 RC4, 2.1.0-2.1.99">
+	<uninstall for="2.1 RC4, 2.1.0-2.1.99">
 		<!-- database changes, undone -->
 		<database>uninstall-sd-optional.php</database>
 		<code type="file">uninstall-sd-required.php</code>
@@ -116,6 +117,7 @@
 		<hook reverse="true" hook="integrate_error_types" function="shd_error_types" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
 		<hook reverse="true" hook="integrate_bbc_codes" function="shd_bbc_codes" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
 		<hook reverse="true" hook="integrate_post_parsebbc" function="shd_parse_wikilinks" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
+		<hook reverse="true" hook="integrate_profile_popup" function="shd_profile_menu" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
 
 			<!-- Admin Section: Core -->
 		<hook reverse="true" hook="integrate_admin_include" function="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" />

scripts/helpdesk.js

View file @ c4a356a

@@ -1,4 +1,5 @@
 /* Javascript for the main Helpdesk */
+/*global ajax_indicator smf_prepareScriptUrl smf_scripturl sceditor shd_sendJSONDocument in_array shd_quickTicketJump shd_ajax_problem shd_quickTicketJump oEditorHandle_shd_message*/
 
 /* Implant a JSON handler for Ajax */
 function shd_getJSONDocument(sUrl, funcCallback, sMethod)
@@ -26,6 +27,7 @@ function shd_getJSONDocument(sUrl, funcCallback, sMethod)
 	return oMyDoc;
 }
 
+// eslint-disable-next-line no-unused-vars
 function shd_sendJSONDocument(sUrl, oData, funcCallback)
 {
 	ajax_indicator(true);
@@ -74,8 +76,7 @@ shd_privacyControl.prototype.callback = function (oRecvd)
 		alert(oRecvd.error);
 	else if (oRecvd && oRecvd.message)
 		$('#' + this.opt.sDestSpan).html(oRecvd.message);
-	else
-		if (confirm(shd_ajax_problem))
+	else if (confirm(shd_ajax_problem))
 		window.location = smf_scripturl + '?action=helpdesk;sa=privacychange;ticket=' + this.opt.ticket + ';' + this.opt.sSession;
 
 	return false;
@@ -92,7 +93,7 @@ shd_urgencyControl.prototype.init = function ()
 {
 	for (var i in this.opt.aButtonOps)
 	{
-		if (!this.opt.aButtonOps.hasOwnProperty(i))
+		if (!Object.prototype.hasOwnProperty.call(this.opt.aButtonOps, i))
 			continue;
 
 		var oDiv = $('#urglink_' + this.opt.aButtonOps[i]);
@@ -141,7 +142,7 @@ shd_urgencyControl.prototype.callback = function (oRecvd)
 		var btn_set = ['increase', 'decrease'];
 		for (var i in btn_set)
 		{
-			if (!btn_set.hasOwnProperty(i))
+			if (!Object.prototype.hasOwnProperty.call(btn_set, i))
 				continue;
 
 			var oBtn = oRecvd[btn_set[i]];
@@ -151,8 +152,7 @@ shd_urgencyControl.prototype.callback = function (oRecvd)
 		// Attach JS events to new links
 		this.init();
 	}
-	else
-		if (confirm(shd_ajax_problem))
+	else if (confirm(shd_ajax_problem))
 		window.location = smf_scripturl + '?action=helpdesk;sa=urgencychange;ticket=' + this.opt.iTicketId + ';change=' + this.opt.aButtonOps[this.direction] + ';' + this.opt.sSession;
 
 	return false;
@@ -169,7 +169,6 @@ shd_urgencyControl.prototype.clickList = function ()
 shd_urgencyControl.prototype.expandList = function ()
 {
 	this.bCollapsed = false;
-console.log('shd_urgencyControl.prototype.expandList:', this.opt.sSelectButtonId, $('#' + this.opt.sSelectButtonId), this.opt.sImageExpanded);
 	$('#urgency_' + this.opt.sSelf).attr('src', this.opt.sImageExpanded);
 
 	// Fetch the list of items
@@ -188,11 +187,11 @@ shd_urgencyControl.prototype.expandList_callback = function (oRecvd)
 		var cur = 0;
 		for (var i in oRecvd.urgencies)
 		{
-			if (!oRecvd.urgencies.hasOwnProperty(i))
+			if (!Object.prototype.hasOwnProperty.call(oRecvd.urgencies, i))
 				continue;
 
 			cur = oRecvd.urgencies[i];
-			selected = cur.selected ? ' selected="selected"' : '';
+			var selected = cur.selected ? ' selected="selected"' : '';
 			newhtml += '<option class="shd_urgencies" data-id="' + cur.id + '"' + selected + '>' + cur.name + '</option>';
 		}
 
@@ -239,7 +238,7 @@ function shd_attach_select(oOptions)
 	shd_attach_select.prototype.id = 0;
 	shd_attach_select.prototype.max = (oOptions.max) ? oOptions.max : -1;
 	shd_attach_select.prototype.addElement(document.getElementById(shd_attach_select.prototype.opts.file_item));
-};
+}
 
 shd_attach_select.prototype.addElement = function (element)
 {
@@ -293,7 +292,7 @@ shd_attach_select.prototype.checkExtension = function (filename)
 		return false; // pfft, didn't specify anything
 	}
 
-	var dot = filename.lastIndexOf(".");
+	var dot = filename.lastIndexOf('.');
 	if (dot == -1)
 	{
 		shd_attach_select.prototype.opts.message_ext_error_final = shd_attach_select.prototype.opts.message_ext_error.replace(' ({ext})', '');
@@ -346,7 +345,7 @@ shd_attach_select.prototype.checkActive = function()
 	var session_attach = 0;
 	for (var i in elements)
 	{
-		if (!elements.hasOwnProperty(i))
+		if (!Object.prototype.hasOwnProperty.call(elements, i))
 			continue;
 
 		if (elements[i] && elements[i].type == 'checkbox' && elements[i].name == 'attach_del[]' && elements[i].checked === true)
@@ -411,6 +410,7 @@ CannedReply.prototype.onReplyReceived = function (oRecvd)
 }
 
 // The quick jump function
+// eslint-disable-next-line no-unused-vars
 function shd_quickTicketJump(id_ticket)
 {
 	window.location.href = smf_prepareScriptUrl(smf_scripturl) + '?action=helpdesk;sa=ticket;ticket=' + id_ticket;
@@ -459,7 +459,7 @@ AjaxAssign.prototype.expand_callback = function (oRecvd)
 		var cur = 0;
 		for (var i in oRecvd.members)
 		{
-			if (!oRecvd.members.hasOwnProperty(i))
+			if (!Object.prototype.hasOwnProperty.call(oRecvd.members, i))
 				continue;
 
 			cur = oRecvd.members[i];
@@ -514,7 +514,7 @@ shd_notifications.prototype.init = function ()
 
 shd_notifications.prototype.receiveNotifications = function ()
 {
-	shd_getJSONDocument(smf_prepareScriptUrl(smf_scripturl) + "action=helpdesk;sa=ajax;op=notify;ticket=" + this.ticketId + ";" + this.opt.sSessionVar + '=' + this.opt.sSessionId + (this.opt.sPinglist ? ";" + this.opt.sPinglist : ''), this.onReceiveNotifications.bind(this));
+	shd_getJSONDocument(smf_prepareScriptUrl(smf_scripturl) + 'action=helpdesk;sa=ajax;op=notify;ticket=' + this.ticketId + ';' + this.opt.sSessionVar + '=' + this.opt.sSessionId + (this.opt.sPinglist ? ';' + this.opt.sPinglist : ''), this.onReceiveNotifications.bind(this));
 	return false;
 }
 
@@ -537,7 +537,7 @@ shd_notifications.prototype.onReceiveNotifications = function (oRecvd)
 		temphtml = '';
 		for (i in oRecvd.being_notified)
 		{
-			if (!oRecvd.being_notified.hasOwnProperty(i))
+			if (!Object.prototype.hasOwnProperty.call(oRecvd.being_notified, i))
 				continue;
 
 			cur = oRecvd.being_notified[i];
@@ -554,9 +554,9 @@ shd_notifications.prototype.onReceiveNotifications = function (oRecvd)
 		subtemplate = this.opt.oOptionalTemplate;
 
 		temphtml = '';
-		for (var i in oRecvd.optional)
+		for (i in oRecvd.optional)
 		{
-			if (!oRecvd.optional.hasOwnProperty(i))
+			if (!Object.prototype.hasOwnProperty.call(oRecvd.optional, i))
 				continue;
 
 			cur = oRecvd.optional[i];
@@ -584,7 +584,7 @@ shd_notifications.prototype.onReceiveNotifications = function (oRecvd)
 		temphtml = '';
 		for (i in oRecvd.optional_butoff)
 		{
-			if (!oRecvd.optional_butoff.hasOwnProperty(i))
+			if (!Object.prototype.hasOwnProperty.call(oRecvd.optional_butoff, i))
 				continue;
 
 			cur = oRecvd.optional_butoff[i];

scripts/helpdesk_admin.js

View file @ c4a356a

@@ -1,4 +1,5 @@
 /* Javascript for the main Helpdesk Admin */
+/*global shd_sendJSONDocument sceditor reqOverlayDiv submitonce submitThisOnce */
 
 // Handle the JavaScript surrounding the admin center.
 $(document).ready(function(){
@@ -215,7 +216,7 @@ shd_custom_field_order.prototype.move = function (clickedKey, clickedOrder, move
 		return;
 
 	// Put this into the right place.
-	newOrder = this.cloneArray(currentOrder);
+	var newOrder = this.cloneArray(currentOrder);
 	newOrder.splice(clickedOrder, 1);
 	newOrder.splice(movedOrder, 0, clickedKey);
 
@@ -293,6 +294,9 @@ shd_AttributeValidate.prototype.init = function ()
 
 	/* After typing a key */
 	$('#' + this.opt.sEmailContainerId + ', #' + this.opt.sStarterContainerId + ', #' + this.opt.sFromContainerId + ', #' + this.opt.sToContainerId).keyup(this.validator.bind(this));
+
+	/* Do the actual thing */
+	$('#' + this.opt.sDoAttributeContainerId).on('click', this.click.bind(this));
 }
 
 /* Reattribute Posts: Does a radio change and processes the validator */
@@ -319,30 +323,41 @@ shd_AttributeValidate.prototype.validator = function ()
 	if (!$('#' + this.opt.sToContainerId).val())
 		this.valid = false;
 
-	warningMessage = this.origText.replace(/%member_to%/, $('#' + this.opt.sToContainerId).value);
+	this.warningMessage = this.origText.replace(/%member_to%/, $('#' + this.opt.sToContainerId).val());
 
-	if ($('#' + this.opt.sTypeEmailContainerId).is(":checked"))
+	if (this.valid && $('#' + this.opt.sTypeEmailContainerId).is(':checked'))
 	{
-		$('#' + this.opt.sStarterContainerId + ', #' + this.opt.sFromContainerId).val("");
+		$('#' + this.opt.sStarterContainerId + ', #' + this.opt.sFromContainerId).val('');
 		this.valid = $('#' + this.opt.sEmailContainerId).val() != '';
-		warningMessage = warningMessage.replace(/%type%/, this.opt.sEmailConfirmText).replace(/%find%/, $('#' + this.opt.sEmailContainerId).val());
+		this.warningMessage = this.warningMessage.replace(/%type%/, this.opt.sEmailConfirmText).replace(/%find%/, $('#' + this.opt.sEmailContainerId).val());
 	}
-	else if ($('#' + this.opt.sTypeStarterContainerId).is(":checked"))
+	else if (this.valid && $('#' + this.opt.sTypeStarterContainerId).is(':checked'))
 	{
-		$('#' + this.opt.sEmailContainerId + ' #' + this.opt.sFromContainerId).val("");
+		$('#' + this.opt.sEmailContainerId + ' #' + this.opt.sFromContainerId).val('');
 
 		this.valid = $('#' + this.opt.sStarterContainerId).val() != '';
-		warningMessage = this.origTextStarter.replace(/%member_to%/, $('#' + this.opt.sToContainerId).val()).replace(/%find%/, $('#' + this.opt.sStarterContainerId).val());			
+		this.warningMessage = this.origTextStarter.replace(/%member_to%/, $('#' + this.opt.sToContainerId).val()).replace(/%find%/, $('#' + this.opt.sStarterContainerId).val());			
 	}
-	else
+	else if (this.valid)
 	{
-		$('#' + this.opt.sEmailContainerId + ' #' + this.opt.sStarterContainerId).val("");
+		$('#' + this.opt.sEmailContainerId + ' #' + this.opt.sStarterContainerId).val('');
 
 		this.valid = $('#' + this.opt.sFromContainerId).val() != '';
-		warningMessage = warningMessage.replace(/%type%/, this.opt.sFromConfirmText).replace(/%find%/, $('#' + this.opt.sFromContainerId).val());
+		this.warningMessage = this.warningMessage.replace(/%type%/, this.opt.sFromConfirmText).replace(/%find%/, $('#' + this.opt.sFromContainerId).val());
 	}
 
-	$('#' + this.opt.sDoAttributeContainerId).prop("disabled", this.valid ? false : true);
+	$('#' + this.opt.sDoAttributeContainerId).prop('disabled', this.valid ? false : true);
+}
+
+/* Reattribute Posts: When they click */
+shd_AttributeValidate.prototype.click = function (event)
+{
+	event.preventDefault();
+
+	if (this.valid)
+		return confirm(this.warningMessage);
+	else
+		return false;
 }
 
 /* Roles Management */
@@ -415,7 +430,7 @@ shd_role.prototype.toggleBlock = function (e, block)
 	$('#' + this.opt.sBlockIcon.replace('%block%', block)).css('display', '');
 }
 
-shd_role.prototype.formConfirm = function (e)
+shd_role.prototype.formConfirm = function ()
 {
 	return confirm(this.opt.sDeleteConfirmText);
 }
@@ -429,8 +444,6 @@ function shd_cannedReplies(oOpts)
 	// Build our URL.
 	this.opt.sUrl = this.opt.sUrlBase +
 		';' + this.opt.sSessionVar + '=' + this.opt.sSessionId;
-
-console.log('shd_cannedReplies:', this.opt.sUrl);
 }
 
 shd_cannedReplies.prototype.init = function ()

sd_language/SimpleDesk.english.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_language/SimpleDeskAdmin.english.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
@@ -153,6 +153,8 @@ $txt['shd_theme_note'] = 'Normally the helpdesk will inherit the theme a user ha
 $txt['shd_theme_use_default'] = 'Use the forum default theme';
 $txt['shd_hidemenuitem'] = 'Hide the Helpdesk menu item?';
 $txt['shd_hidemenuitem_note'] = 'This is most useful if helpdesk departments are presented on the board index.';
+$txt['shd_hideprofilemenuitem'] = 'Hide the Helpdesk Profile menu item?';
+$txt['shd_hideprofilemenuitem_note'] = 'If you are using the user menu, this is useful to hide.';
 $txt['shd_disable_unread'] = 'Disable integration with Unread Posts/Unread Replies';
 $txt['shd_disable_unread_note'] = 'Normally, SimpleDesk adds a list of topics to the unread posts/unread replies page but sometimes (e.g. certain mobile themes) this does not always work so well.';
 $txt['shd_zerofill'] = 'Smallest number of digits to use';

sd_language/SimpleDeskLogAction.english.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_language/SimpleDeskNotifications.english.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_language/SimpleDeskPermissions.english.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_language/SimpleDeskProfile.english.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_language/SimpleDeskWho.english.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_plugins_lang/SDPluginFrontPage.english.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_plugins_lang/SDPluginStats.english.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_plugins_source/front_page/SDPluginFrontPage.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_plugins_source/front_page/index.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_plugins_source/stats/SDPluginStats.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_plugins_source/stats/index.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-Admin.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
@@ -397,6 +397,7 @@ function shd_modify_display_options($return_config)
 		array('int', 'shd_zerofill', 'subtext' => $txt['shd_zerofill_note']),
 		'',
 		array('check', 'shd_hidemenuitem', 'subtext' => $txt['shd_hidemenuitem_note']),
+		array('check', 'shd_hideprofilemenuitem', 'subtext' => $txt['shd_hideprofilemenuitem_note']),
 		'',
 		array('check', 'shd_disable_unread', 'subtext' => $txt['shd_disable_unread_note']),
 		array('check', 'shd_disable_boardint', 'subtext' => $txt['shd_disable_boardint_note']),

sd_source/SimpleDesk-AdminCannedReplies.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-AdminCustomField.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-AdminDepartments.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-AdminMaint.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-AdminPermissions.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-AdminPlugins.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-AjaxHandler.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-Assign.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-Delete.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-Display.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-MiscActions.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-MoveDept.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-Notifications.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-Post.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-Profile.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-SSI.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-Scheduled.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-Search.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-TicketTopicMove.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk-Unread.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/SimpleDesk.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/Subs-SimpleDesk.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *
@@ -1837,7 +1837,7 @@ function shd_main_menu(&$menu_buttons)
 		);
 	}
 
-	if (shd_allowed_to(array('shd_view_profile_own', 'shd_view_profile_any'), 0))
+	if (shd_allowed_to(array('shd_view_profile_own', 'shd_view_profile_any'), 0) && empty($modSettings['shd_hideprofilemenuitem']))
 	{
 		// Hmm, this could be tricky. It's possible the main menu has been eaten by permissions at this point, so just in case, reconstruct what's missing.
 		if (empty($menu_buttons['profile']))
@@ -2019,6 +2019,30 @@ function shd_main_menu_admin($helpdesk_admin)
 }
 // Cause IE is being mean to meeee again...!
 
+/**
+ *	Add the SimpleDesk options to the profile popup menu.
+ *
+ *	@param array &$menu_buttons The main menu buttons as provided by Subs.php.
+ *	@since 2.1
+*/
+function shd_profile_menu(&$profile_items)
+{
+	global $modSettings, $txt, $scripturl;
+
+	if (empty($modSettings['helpdesk_active']))
+		return;
+
+	if (!shd_allowed_to(array('shd_view_profile_own', 'shd_view_profile_any'), 0) || !empty($modSettings['shd_hidemenuitem']))
+		return;
+
+	$profile_items[] = array(
+		'menu' => 'helpdesk',
+		'area' => 'hd_profile',		
+		'title' => $txt['shd_helpdesk_profile'],
+		'url' => $scripturl . '?action=profile;area=hd_profile',
+	);
+}
+
 /**
  *	Detect a SHD error and move it to the proper error type.
  *

sd_source/Subs-SimpleDeskAdmin.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/Subs-SimpleDeskBoardIndex.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/Subs-SimpleDeskDisplay.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/Subs-SimpleDeskManageAttachments.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/Subs-SimpleDeskPackages.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/Subs-SimpleDeskPermissions.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/Subs-SimpleDeskPost.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/Subs-SimpleDeskProfile.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

sd_source/Subs-SimpleDeskSearch.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

uninstall-sd-optional.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *

uninstall-sd-required.php

View file @ c4a356a

@@ -5,7 +5,7 @@
 *       An advanced help desk modification built on SMF       *
 ***************************************************************
 *                                                             *
-*         * Copyright 2020 - SimpleDesk.net                   *
+*         * Copyright 2021 - SimpleDesk.net                   *
 *                                                             *
 *   This file and its contents are subject to the license     *
 *   included with this distribution, license.txt, which       *


...	...	@@ -13,7 +13,11 @@ jobs:
13	13	name: LINT Checks
14	14	steps:
15	15	- uses: actions/checkout@master
	16	+ with:
	17	+ submodules: true
	18	+ - name: Update Build Tools
	19	+ run: git submodule foreach git pull origin master
16	20	- name: Javascript LINT
17	21	uses: tj-actions/eslint-changed-files@v4
18	22	with:
19		- config-path: buildTools/eslintrc
20	23	\ No newline at end of file
	24	+ config-path: buildTools/eslintrc.js
21	25	\ No newline at end of file

...	...	@@ -56,7 +56,7 @@
56	56	}
57	57
58	58	/* Main Menu */
59		-#main_menu .main_icons.helpdesk::before {
	59	+#main_menu .main_icons.helpdesk::before, .profile_user_links .main_icons.hd_profile::before{
60	60	background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat;
61	61	background-position: -65px -116px;
62	62	}

...	...	@@ -5,7 +5,7 @@
5	5	* An advanced help desk modification built on SMF *
6	6	***************************************************************
7	7	* *
8		-* * Copyright 2020 - SimpleDesk.net *
	8	+* * Copyright 2021 - SimpleDesk.net *
9	9	* *
10	10	* This file and its contents are subject to the license *
11	11	* included with this distribution, license.txt, which *

...	...	@@ -10,7 +10,7 @@
10	10	<readme lang="english" parsebbc="true" type="inline">This mod is [b]not compatible[/b] with your version of SMF, it requires 2.1 RC3 or later.</readme>
11	11	</install>
12	12
13		- <install for="2.1 RC3, 2.1 RC4, 2.1.0-2.1.99">
	13	+ <install for="2.1 RC4, 2.1.0-2.1.99">
14	14	<!-- readme files -->
15	15	<readme lang="english" parsebbc="true" type="file">language-readme/readme.english.txt</readme>
16	16
...	...	@@ -54,6 +54,7 @@
54	54	<hook hook="integrate_error_types" function="shd_error_types" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
55	55	<hook hook="integrate_bbc_codes" function="shd_bbc_codes" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
56	56	<hook hook="integrate_post_parsebbc" function="shd_parse_wikilinks" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
	57	+ <hook hook="integrate_profile_popup" function="shd_profile_menu" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
57	58
58	59	<!-- Admin Section: Core -->
59	60	<hook hook="integrate_admin_include" function="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" />
...	...	@@ -100,7 +101,7 @@
100	101	<credits url="https://www.simpledesk.net" license="BSD 3-Clause" licenseurl="https://github.com/SimpleMachines/SimpleDesk/blob/master/license.txt" copyright="2010-2020">Simple Desk</credits>
101	102	</install>
102	103
103		- <uninstall for="2.1 RC3, 2.1 RC4, 2.1.0-2.1.99">
	104	+ <uninstall for="2.1 RC4, 2.1.0-2.1.99">
104	105	<!-- database changes, undone -->
105	106	<database>uninstall-sd-optional.php</database>
106	107	<code type="file">uninstall-sd-required.php</code>
...	...	@@ -116,6 +117,7 @@
116	117	<hook reverse="true" hook="integrate_error_types" function="shd_error_types" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
117	118	<hook reverse="true" hook="integrate_bbc_codes" function="shd_bbc_codes" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
118	119	<hook reverse="true" hook="integrate_post_parsebbc" function="shd_parse_wikilinks" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
	120	+ <hook reverse="true" hook="integrate_profile_popup" function="shd_profile_menu" file="$sourcedir/sd_source/Subs-SimpleDesk.php" />
119	121
120	122	<!-- Admin Section: Core -->
121	123	<hook reverse="true" hook="integrate_admin_include" function="$sourcedir/sd_source/Subs-SimpleDeskAdmin.php" />

...	...	@@ -1,4 +1,5 @@
1	1	/* Javascript for the main Helpdesk */
	2	+/global ajax_indicator smf_prepareScriptUrl smf_scripturl sceditor shd_sendJSONDocument in_array shd_quickTicketJump shd_ajax_problem shd_quickTicketJump oEditorHandle_shd_message/
2	3
3	4	/* Implant a JSON handler for Ajax */
4	5	function shd_getJSONDocument(sUrl, funcCallback, sMethod)
...	...	@@ -26,6 +27,7 @@ function shd_getJSONDocument(sUrl, funcCallback, sMethod)
26	27	return oMyDoc;
27	28	}
28	29
	30	+// eslint-disable-next-line no-unused-vars
29	31	function shd_sendJSONDocument(sUrl, oData, funcCallback)
30	32	{
31	33	ajax_indicator(true);
...	...	@@ -74,8 +76,7 @@ shd_privacyControl.prototype.callback = function (oRecvd)
74	76	alert(oRecvd.error);
75	77	else if (oRecvd && oRecvd.message)
76	78	$('#' + this.opt.sDestSpan).html(oRecvd.message);
77		- else
78		- if (confirm(shd_ajax_problem))
	79	+ else if (confirm(shd_ajax_problem))
79	80	window.location = smf_scripturl + '?action=helpdesk;sa=privacychange;ticket=' + this.opt.ticket + ';' + this.opt.sSession;
80	81
81	82	return false;
...	...	@@ -92,7 +93,7 @@ shd_urgencyControl.prototype.init = function ()
92	93	{
93	94	for (var i in this.opt.aButtonOps)
94	95	{
95		- if (!this.opt.aButtonOps.hasOwnProperty(i))
	96	+ if (!Object.prototype.hasOwnProperty.call(this.opt.aButtonOps, i))
96	97	continue;
97	98
98	99	var oDiv = $('#urglink_' + this.opt.aButtonOps[i]);
...	...	@@ -141,7 +142,7 @@ shd_urgencyControl.prototype.callback = function (oRecvd)
141	142	var btn_set = ['increase', 'decrease'];
142	143	for (var i in btn_set)
143	144	{
144		- if (!btn_set.hasOwnProperty(i))
	145	+ if (!Object.prototype.hasOwnProperty.call(btn_set, i))
145	146	continue;
146	147
147	148	var oBtn = oRecvd[btn_set[i]];
...	...	@@ -151,8 +152,7 @@ shd_urgencyControl.prototype.callback = function (oRecvd)
151	152	// Attach JS events to new links
152	153	this.init();
153	154	}
154		- else
155		- if (confirm(shd_ajax_problem))
	155	+ else if (confirm(shd_ajax_problem))
156	156	window.location = smf_scripturl + '?action=helpdesk;sa=urgencychange;ticket=' + this.opt.iTicketId + ';change=' + this.opt.aButtonOps[this.direction] + ';' + this.opt.sSession;
157	157
158	158	return false;
...	...	@@ -169,7 +169,6 @@ shd_urgencyControl.prototype.clickList = function ()
169	169	shd_urgencyControl.prototype.expandList = function ()
170	170	{
171	171	this.bCollapsed = false;
172		-console.log('shd_urgencyControl.prototype.expandList:', this.opt.sSelectButtonId, $('#' + this.opt.sSelectButtonId), this.opt.sImageExpanded);
173	172	$('#urgency_' + this.opt.sSelf).attr('src', this.opt.sImageExpanded);
174	173
175	174	// Fetch the list of items
...	...	@@ -188,11 +187,11 @@ shd_urgencyControl.prototype.expandList_callback = function (oRecvd)
188	187	var cur = 0;
189	188	for (var i in oRecvd.urgencies)
190	189	{
191		- if (!oRecvd.urgencies.hasOwnProperty(i))
	190	+ if (!Object.prototype.hasOwnProperty.call(oRecvd.urgencies, i))
192	191	continue;
193	192
194	193	cur = oRecvd.urgencies[i];
195		- selected = cur.selected ? ' selected="selected"' : '';
	194	+ var selected = cur.selected ? ' selected="selected"' : '';
196	195	newhtml += '<option class="shd_urgencies" data-id="' + cur.id + '"' + selected + '>' + cur.name + '</option>';
197	196	}
198	197
...	...	@@ -239,7 +238,7 @@ function shd_attach_select(oOptions)
239	238	shd_attach_select.prototype.id = 0;
240	239	shd_attach_select.prototype.max = (oOptions.max) ? oOptions.max : -1;
241	240	shd_attach_select.prototype.addElement(document.getElementById(shd_attach_select.prototype.opts.file_item));
242		-};
	241	+}
243	242
244	243	shd_attach_select.prototype.addElement = function (element)
245	244	{
...	...	@@ -293,7 +292,7 @@ shd_attach_select.prototype.checkExtension = function (filename)
293	292	return false; // pfft, didn't specify anything
294	293	}
295	294
296		- var dot = filename.lastIndexOf(".");
	295	+ var dot = filename.lastIndexOf('.');
297	296	if (dot == -1)
298	297	{
299	298	shd_attach_select.prototype.opts.message_ext_error_final = shd_attach_select.prototype.opts.message_ext_error.replace(' ({ext})', '');
...	...	@@ -346,7 +345,7 @@ shd_attach_select.prototype.checkActive = function()
346	345	var session_attach = 0;
347	346	for (var i in elements)
348	347	{
349		- if (!elements.hasOwnProperty(i))
	348	+ if (!Object.prototype.hasOwnProperty.call(elements, i))
350	349	continue;
351	350
352	351	if (elements[i] && elements[i].type == 'checkbox' && elements[i].name == 'attach_del[]' && elements[i].checked === true)
...	...	@@ -411,6 +410,7 @@ CannedReply.prototype.onReplyReceived = function (oRecvd)
411	410	}
412	411
413	412	// The quick jump function
	413	+// eslint-disable-next-line no-unused-vars
414	414	function shd_quickTicketJump(id_ticket)
415	415	{
416	416	window.location.href = smf_prepareScriptUrl(smf_scripturl) + '?action=helpdesk;sa=ticket;ticket=' + id_ticket;
...	...	@@ -459,7 +459,7 @@ AjaxAssign.prototype.expand_callback = function (oRecvd)
459	459	var cur = 0;
460	460	for (var i in oRecvd.members)
461	461	{
462		- if (!oRecvd.members.hasOwnProperty(i))
	462	+ if (!Object.prototype.hasOwnProperty.call(oRecvd.members, i))
463	463	continue;
464	464
465	465	cur = oRecvd.members[i];
...	...	@@ -514,7 +514,7 @@ shd_notifications.prototype.init = function ()
514	514
515	515	shd_notifications.prototype.receiveNotifications = function ()
516	516	{
517		- shd_getJSONDocument(smf_prepareScriptUrl(smf_scripturl) + "action=helpdesk;sa=ajax;op=notify;ticket=" + this.ticketId + ";" + this.opt.sSessionVar + '=' + this.opt.sSessionId + (this.opt.sPinglist ? ";" + this.opt.sPinglist : ''), this.onReceiveNotifications.bind(this));
	517	+ shd_getJSONDocument(smf_prepareScriptUrl(smf_scripturl) + 'action=helpdesk;sa=ajax;op=notify;ticket=' + this.ticketId + ';' + this.opt.sSessionVar + '=' + this.opt.sSessionId + (this.opt.sPinglist ? ';' + this.opt.sPinglist : ''), this.onReceiveNotifications.bind(this));
518	518	return false;
519	519	}
520	520
...	...	@@ -537,7 +537,7 @@ shd_notifications.prototype.onReceiveNotifications = function (oRecvd)
537	537	temphtml = '';
538	538	for (i in oRecvd.being_notified)
539	539	{
540		- if (!oRecvd.being_notified.hasOwnProperty(i))
	540	+ if (!Object.prototype.hasOwnProperty.call(oRecvd.being_notified, i))
541	541	continue;
542	542
543	543	cur = oRecvd.being_notified[i];
...	...	@@ -554,9 +554,9 @@ shd_notifications.prototype.onReceiveNotifications = function (oRecvd)
554	554	subtemplate = this.opt.oOptionalTemplate;
555	555
556	556	temphtml = '';
557		- for (var i in oRecvd.optional)
	557	+ for (i in oRecvd.optional)
558	558	{
559		- if (!oRecvd.optional.hasOwnProperty(i))
	559	+ if (!Object.prototype.hasOwnProperty.call(oRecvd.optional, i))
560	560	continue;
561	561
562	562	cur = oRecvd.optional[i];
...	...	@@ -584,7 +584,7 @@ shd_notifications.prototype.onReceiveNotifications = function (oRecvd)
584	584	temphtml = '';
585	585	for (i in oRecvd.optional_butoff)
586	586	{
587		- if (!oRecvd.optional_butoff.hasOwnProperty(i))
	587	+ if (!Object.prototype.hasOwnProperty.call(oRecvd.optional_butoff, i))
588	588	continue;
589	589
590	590	cur = oRecvd.optional_butoff[i];

...	...	@@ -1,4 +1,5 @@
1	1	/* Javascript for the main Helpdesk Admin */
	2	+/global shd_sendJSONDocument sceditor reqOverlayDiv submitonce submitThisOnce /
2	3
3	4	// Handle the JavaScript surrounding the admin center.
4	5	$(document).ready(function(){
...	...	@@ -215,7 +216,7 @@ shd_custom_field_order.prototype.move = function (clickedKey, clickedOrder, move
215	216	return;
216	217
217	218	// Put this into the right place.
218		- newOrder = this.cloneArray(currentOrder);
	219	+ var newOrder = this.cloneArray(currentOrder);
219	220	newOrder.splice(clickedOrder, 1);
220	221	newOrder.splice(movedOrder, 0, clickedKey);
221	222
...	...	@@ -293,6 +294,9 @@ shd_AttributeValidate.prototype.init = function ()
293	294
294	295	/* After typing a key */
295	296	$('#' + this.opt.sEmailContainerId + ', #' + this.opt.sStarterContainerId + ', #' + this.opt.sFromContainerId + ', #' + this.opt.sToContainerId).keyup(this.validator.bind(this));
	297	+
	298	+ /* Do the actual thing */
	299	+ $('#' + this.opt.sDoAttributeContainerId).on('click', this.click.bind(this));
296	300	}
297	301
298	302	/* Reattribute Posts: Does a radio change and processes the validator */
...	...	@@ -319,30 +323,41 @@ shd_AttributeValidate.prototype.validator = function ()
319	323	if (!$('#' + this.opt.sToContainerId).val())
320	324	this.valid = false;
321	325
322		- warningMessage = this.origText.replace(/%member_to%/, $('#' + this.opt.sToContainerId).value);
	326	+ this.warningMessage = this.origText.replace(/%member_to%/, $('#' + this.opt.sToContainerId).val());
323	327
324		- if ($('#' + this.opt.sTypeEmailContainerId).is(":checked"))
	328	+ if (this.valid && $('#' + this.opt.sTypeEmailContainerId).is(':checked'))
325	329	{
326		- $('#' + this.opt.sStarterContainerId + ', #' + this.opt.sFromContainerId).val("");
	330	+ $('#' + this.opt.sStarterContainerId + ', #' + this.opt.sFromContainerId).val('');
327	331	this.valid = $('#' + this.opt.sEmailContainerId).val() != '';
328		- warningMessage = warningMessage.replace(/%type%/, this.opt.sEmailConfirmText).replace(/%find%/, $('#' + this.opt.sEmailContainerId).val());
	332	+ this.warningMessage = this.warningMessage.replace(/%type%/, this.opt.sEmailConfirmText).replace(/%find%/, $('#' + this.opt.sEmailContainerId).val());
329	333	}
330		- else if ($('#' + this.opt.sTypeStarterContainerId).is(":checked"))
	334	+ else if (this.valid && $('#' + this.opt.sTypeStarterContainerId).is(':checked'))
331	335	{
332		- $('#' + this.opt.sEmailContainerId + ' #' + this.opt.sFromContainerId).val("");
	336	+ $('#' + this.opt.sEmailContainerId + ' #' + this.opt.sFromContainerId).val('');
333	337
334	338	this.valid = $('#' + this.opt.sStarterContainerId).val() != '';
335		- warningMessage = this.origTextStarter.replace(/%member_to%/, $('#' + this.opt.sToContainerId).val()).replace(/%find%/, $('#' + this.opt.sStarterContainerId).val());
	339	+ this.warningMessage = this.origTextStarter.replace(/%member_to%/, $('#' + this.opt.sToContainerId).val()).replace(/%find%/, $('#' + this.opt.sStarterContainerId).val());
336	340	}
337		- else
	341	+ else if (this.valid)
338	342	{
339		- $('#' + this.opt.sEmailContainerId + ' #' + this.opt.sStarterContainerId).val("");
	343	+ $('#' + this.opt.sEmailContainerId + ' #' + this.opt.sStarterContainerId).val('');
340	344
341	345	this.valid = $('#' + this.opt.sFromContainerId).val() != '';
342		- warningMessage = warningMessage.replace(/%type%/, this.opt.sFromConfirmText).replace(/%find%/, $('#' + this.opt.sFromContainerId).val());
	346	+ this.warningMessage = this.warningMessage.replace(/%type%/, this.opt.sFromConfirmText).replace(/%find%/, $('#' + this.opt.sFromContainerId).val());
343	347	}
344	348
345		- $('#' + this.opt.sDoAttributeContainerId).prop("disabled", this.valid ? false : true);
	349	+ $('#' + this.opt.sDoAttributeContainerId).prop('disabled', this.valid ? false : true);
	350	+}
	351	+
	352	+/* Reattribute Posts: When they click */
	353	+shd_AttributeValidate.prototype.click = function (event)
	354	+{
	355	+ event.preventDefault();
	356	+
	357	+ if (this.valid)
	358	+ return confirm(this.warningMessage);
	359	+ else
	360	+ return false;
346	361	}
347	362
348	363	/* Roles Management */
...	...	@@ -415,7 +430,7 @@ shd_role.prototype.toggleBlock = function (e, block)
415	430	$('#' + this.opt.sBlockIcon.replace('%block%', block)).css('display', '');
416	431	}
417	432
418		-shd_role.prototype.formConfirm = function (e)
	433	+shd_role.prototype.formConfirm = function ()
419	434	{
420	435	return confirm(this.opt.sDeleteConfirmText);
421	436	}
...	...	@@ -429,8 +444,6 @@ function shd_cannedReplies(oOpts)
429	444	// Build our URL.
430	445	this.opt.sUrl = this.opt.sUrlBase +
431	446	';' + this.opt.sSessionVar + '=' + this.opt.sSessionId;
432		-
433		-console.log('shd_cannedReplies:', this.opt.sUrl);
434	447	}
435	448
436	449	shd_cannedReplies.prototype.init = function ()