Changeset 1765

Timestamp:

03/12/2011 01:55:20 PM (2 years ago)

Author:

BrianKoontz

Message:

The following characters are not permitted as part of usernames or
pagenames:
[ ] { } % + | ? = < > ' " / 0x00-0x1f 0x7f ,
Refs #191, #843

Location:

branches/1.3.1

Files:

• lang/en/en.inc.php (modified) (1 diff)
• libs/Wakka.class.php (modified) (2 diffs)

branches/1.3.1/lang/en/en.inc.php

@@ -1052 +1052 @@
 if(!defined('EDIT_NOTE')) define('EDIT_NOTE', 'Edit note:');
 if(!defined('ERROR_ACL_READ')) define('ERROR_ACL_READ', 'You are not allowed to read the source of this page.');
-if(!defined('ERROR_INVALID_PAGENAME')) define('ERROR_INVALID_PAGENAME', 'This page name is invalid. Valid page names must not contain the characters | ? = < > / \' " % or &.');
+if(!defined('ERROR_INVALID_PAGENAME')) define('ERROR_INVALID_PAGENAME', 'This page name is invalid. Valid page names must not contain the characters: [ ] { } % + | ? = < > \' " / #x00-#x1f #x7f or ,');
 if(!defined('ERROR_PAGE_ALREADY_EXIST')) define('ERROR_PAGE_ALREADY_EXIST', 'Sorry, the destination page already exists');
 if(!defined('ERROR_PAGE_NOT_EXIST')) define('ERROR_PAGE_NOT_EXIST', ' Sorry, page %s does not exist.');

branches/1.3.1/libs/Wakka.class.php

@@ -2426 +2426 @@
          * Check if a given string contains prohibited characters.
          * Currently, these prohibited characters are:
-         *   | ? = < > ' " &
+         *   [ ] { } % + | ? = < > ' " / 0x00-0x1f 0x7f ,
          *
          * @param       string $text mandatory:
@@ -2435 +2435 @@
         function IsWikiName($text)
         {
-                $result = preg_match("/[\|\?=<>\'\"&\/%]/", $text);
+                $result = preg_match("/[\[\]\{\}%\+\|\?=<>\'\"\/\\x00-\\x1f\\x7f,]/", html_entity_decode($text));
                 return !$result;
         }