From 462a3baef9f20293c42fb8e34cd233ff98f92aa8 Mon Sep 17 00:00:00 2001
From: Phy <git@phy25.com>
Date: Mon, 13 Apr 2020 22:43:02 -0400
Subject: [PATCH] fix slash regression in toolbar signature #3045

---
 _test/tests/inc/toolbar.test.php | 20 ++++++++++++++++++++
 inc/toolbar.php                  |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 _test/tests/inc/toolbar.test.php

diff --git a/_test/tests/inc/toolbar.test.php b/_test/tests/inc/toolbar.test.php
new file mode 100644
index 000000000..0116687dc
--- /dev/null
+++ b/_test/tests/inc/toolbar.test.php
@@ -0,0 +1,20 @@
+<?php
+
+class toolbar_test extends DokuWikiTest {
+
+    function test_encode_toolbar_signature() {
+        global $conf, $INFO, $INPUT;
+
+        $conf['signature'] = '" --- \\\\n //[[@MAIL@|@NAME@]] (@USER@) @DATE@//"';
+        $_SERVER['REMOTE_USER'] = 'john';
+        $INFO['userinfo']['name'] = '/*!]]>*/</script><script>alert("\123\")</script>';
+        $INFO['userinfo']['mail'] = 'example@example.org';
+
+        $date = str_replace('/', '\/', dformat());
+
+        $expected = '"\" --- \\\n \/\/[[example@example.org|\/*!]]>*\/<\/script><script>'.
+                    'alert(\"\\\\123\\\\\\")<\/script>]] (john) '.$date.'\/\/\""';
+
+        $this->assertEquals($expected, toolbar_signature());
+    }
+}
diff --git a/inc/toolbar.php b/inc/toolbar.php
index eaa85a99b..7151202f2 100644
--- a/inc/toolbar.php
+++ b/inc/toolbar.php
@@ -270,7 +270,7 @@ function toolbar_signature(){
     $sig = str_replace('@NAME@',$INFO['userinfo']['name'],$sig);
     $sig = str_replace('@MAIL@',$INFO['userinfo']['mail'],$sig);
     $sig = str_replace('@DATE@',dformat(),$sig);
-    $sig = str_replace('\\\\n','\\n',addslashes($sig));
+    $sig = str_replace('\\\\n','\\n',$sig);
     return json_encode($sig);
 }
 
-- 
2.11.4.GIT