Peter M. Groen / knowledgetree

Commit b65eacb044d41f9d62785ad08a2c165de5cd9b40

Authored by Megan Watson
1 parent 3c732e18

KTS-2591 

"When updating folder permissions for a folder with an & in its name the progresstext appears as '&amp'"
Fixed. The message is being htmlentitied for cross-scripting, added a str_replace for the &.

Reviewed by: Conrad Vermeulen
Committed by: Megan Watson



git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7586 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 12 additions and 10 deletions
lib/documentmanagement/observers.inc.php
  View file @b65eacb
... ... @@ -5,32 +5,32 @@
5 5 * KnowledgeTree Open Source Edition
6 6 * Document Management Made Simple
7 7 * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
8   - *
  8 + *
9 9 * This program is free software; you can redistribute it and/or modify it under
10 10 * the terms of the GNU General Public License version 3 as published by the
11 11 * Free Software Foundation.
12   - *
  12 + *
13 13 * This program is distributed in the hope that it will be useful, but WITHOUT
14 14 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
15 15 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
16 16 * details.
17   - *
  17 + *
18 18 * You should have received a copy of the GNU General Public License
19 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20   - *
  20 + *
21 21 * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
22 22 * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
23   - *
  23 + *
24 24 * The interactive user interfaces in modified source and object code versions
25 25 * of this program must display Appropriate Legal Notices, as required under
26 26 * Section 5 of the GNU General Public License version 3.
27   - *
  27 + *
28 28 * In accordance with Section 7(b) of the GNU General Public License version 3,
29 29 * these Appropriate Legal Notices must retain the display of the "Powered by
30   - * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  30 + * KnowledgeTree" logo and retain the original copyright notice. If the display of the
31 31 * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
32   - * must display the words "Powered by KnowledgeTree" and retain the original
33   - * copyright notice.
  32 + * must display the words "Powered by KnowledgeTree" and retain the original
  33 + * copyright notice.
34 34 * Contributor( s): ______________________________________
35 35 *
36 36 */
... ... @@ -83,7 +83,9 @@ class JavascriptObserver {
83 83 printf('<script language="javascript">kt_add_document_newFile("%s")</script>', $msg->getString());
84 84 return;
85 85 }
86   - printf('<script language="javascript">kt_add_document_addMessage("%s")</script>', htmlentities($msg->getString(),ENT_QUOTES,'UTF-8'));
  86 + $message = htmlentities($msg->getString(),ENT_QUOTES,'UTF-8');
  87 + $message = str_replace('&amp;', '&', $message);
  88 + printf('<script language="javascript">kt_add_document_addMessage("%s")</script>', $message);
87 89 }
88 90  
89 91 function redirectToDocument($id) {
... ...