#7432 Allow breaks in editorial contact signature variable (#9103)

pkp · Jun 27, 2023 · 5cad3a1 · 5cad3a1
1 parent f146a6d
commit 5cad3a1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/classes/core/PKPApplication.inc.php b/classes/core/PKPApplication.inc.php
@@ -914,6 +914,7 @@ public static function getMetadataFields() {
 
 /* TextArea insert tag variable types used to change their display when selected */
 define('INSERT_TAG_VARIABLE_TYPE_PLAIN_TEXT', 'PLAIN_TEXT');
+define('INSERT_TAG_VARIABLE_TYPE_SAFE_HTML', 'SAFE_HTML');
 
 // To expose LISTBUILDER_SOURCE_TYPE_... constants via JS
 import('lib.pkp.classes.controllers.listbuilder.ListbuilderHandler');

diff --git a/classes/template/PKPTemplateManager.inc.php b/classes/template/PKPTemplateManager.inc.php
@@ -761,6 +761,7 @@ function setupBackendPage() {
 			'WORKFLOW_STAGE_ID_EDITING',
 			'WORKFLOW_STAGE_ID_PRODUCTION',
 			'INSERT_TAG_VARIABLE_TYPE_PLAIN_TEXT',
+			'INSERT_TAG_VARIABLE_TYPE_SAFE_HTML',
 			'ROLE_ID_MANAGER',
 			'ROLE_ID_SITE_ADMIN',
 			'ROLE_ID_AUTHOR',

diff --git a/controllers/modals/editorDecision/form/EditorDecisionWithEmailForm.inc.php b/controllers/modals/editorDecision/form/EditorDecisionWithEmailForm.inc.php
@@ -320,7 +320,7 @@ function _sendReviewMailToAuthor($submission, $emailKey, $request) {
 				'submissionUrl' => $dispatcher->url($request, ROUTE_PAGE, null, 'authorDashboard', 'submission', $submission->getId()),
 				'contextName' => htmlspecialchars($context->getLocalizedName()),
 				'authorName' => htmlspecialchars($submission->getAuthorString()),
-				'editorialContactSignature' => $user->getContactSignature(),
+				'editorialContactSignature' => strip_tags($user->getContactSignature(), "<br>"),
 			]);
 			if (!$email->send($request)) {
 				import('classes.notification.NotificationManager');
@@ -357,7 +357,7 @@ function _getAllowedVariables($request) {
 	function _getAllowedVariablesType() {
 		return [
 			'contextName' => INSERT_TAG_VARIABLE_TYPE_PLAIN_TEXT,
-			'editorialContactSignature' => INSERT_TAG_VARIABLE_TYPE_PLAIN_TEXT,
+			'editorialContactSignature' => INSERT_TAG_VARIABLE_TYPE_SAFE_HTML,
 			'submissionTitle' => INSERT_TAG_VARIABLE_TYPE_PLAIN_TEXT,
 			'authorName' => INSERT_TAG_VARIABLE_TYPE_PLAIN_TEXT,
 		];

diff --git a/js/classes/TinyMCEHelper.js b/js/classes/TinyMCEHelper.js
@@ -88,6 +88,8 @@
 			variableType = variableTypes[variableSymbolic];
 			if (variableType == $.pkp.cons.INSERT_TAG_VARIABLE_TYPE_PLAIN_TEXT) {
 				return $('<div/>').append($('<span/>').text(variableName));
+			} else if (variableType == $.pkp.cons.INSERT_TAG_VARIABLE_TYPE_SAFE_HTML) {
+				return $('<div/>').append($('<span/>').append(variableName));
 			}
 		}
 

diff --git a/tools/closure-externs.js b/tools/closure-externs.js
@@ -287,7 +287,8 @@ $.pkp.cons = {
 	LISTBUILDER_OPTGROUP_LABEL: 0,
 	ORDER_CATEGORY_GRID_CATEGORIES_ROWS_ONLY: 0,
 	UPLOAD_MAX_FILESIZE: 0,
-	INSERT_TAG_VARIABLE_TYPE_PLAIN_TEXT: 0
+	INSERT_TAG_VARIABLE_TYPE_PLAIN_TEXT: 0,
+	INSERT_TAG_VARIABLE_TYPE_SAFE_HTML: 0
 };
 
 /**