diff options
| -rw-r--r-- | Auth/OpenID/URINorm.php | 3 | ||||
| -rw-r--r-- | Services/Yadis/Misc.php | 54 | ||||
| -rw-r--r-- | Services/Yadis/XRI.php | 3 |
3 files changed, 34 insertions, 26 deletions
diff --git a/Auth/OpenID/URINorm.php b/Auth/OpenID/URINorm.php index 8e6de4d..13a728e 100644 --- a/Auth/OpenID/URINorm.php +++ b/Auth/OpenID/URINorm.php @@ -39,7 +39,8 @@ $_unreserved[ord('_')] = true; $_unreserved[ord('~')] = true; $parts = array(); -foreach (array_merge($__UCSCHAR, $__IPRIVATE) as $pair) { +foreach (array_merge(Services_Yadis_getUCSChars(), + Services_Yadis_getIPrivateChars()) as $pair) { list($m, $n) = $pair; $parts[] = sprintf("%s-%s", chr($m), chr($n)); } diff --git a/Services/Yadis/Misc.php b/Services/Yadis/Misc.php index 9d0a20b..a719058 100644 --- a/Services/Yadis/Misc.php +++ b/Services/Yadis/Misc.php @@ -9,31 +9,37 @@ * @license http://www.gnu.org/copyleft/lesser.html LGPL */ -$__UCSCHAR = array( - array(0xA0, 0xD7FF), - array(0xF900, 0xFDCF), - array(0xFDF0, 0xFFEF), - array(0x10000, 0x1FFFD), - array(0x20000, 0x2FFFD), - array(0x30000, 0x3FFFD), - array(0x40000, 0x4FFFD), - array(0x50000, 0x5FFFD), - array(0x60000, 0x6FFFD), - array(0x70000, 0x7FFFD), - array(0x80000, 0x8FFFD), - array(0x90000, 0x9FFFD), - array(0xA0000, 0xAFFFD), - array(0xB0000, 0xBFFFD), - array(0xC0000, 0xCFFFD), - array(0xD0000, 0xDFFFD), - array(0xE1000, 0xEFFFD) - ); +function Services_Yadis_getUCSChars() +{ + return array( + array(0xA0, 0xD7FF), + array(0xF900, 0xFDCF), + array(0xFDF0, 0xFFEF), + array(0x10000, 0x1FFFD), + array(0x20000, 0x2FFFD), + array(0x30000, 0x3FFFD), + array(0x40000, 0x4FFFD), + array(0x50000, 0x5FFFD), + array(0x60000, 0x6FFFD), + array(0x70000, 0x7FFFD), + array(0x80000, 0x8FFFD), + array(0x90000, 0x9FFFD), + array(0xA0000, 0xAFFFD), + array(0xB0000, 0xBFFFD), + array(0xC0000, 0xCFFFD), + array(0xD0000, 0xDFFFD), + array(0xE1000, 0xEFFFD) + ); +} -$__IPRIVATE = array( - array(0xE000, 0xF8FF), - array(0xF0000, 0xFFFFD), - array(0x100000, 0x10FFFD) - ); +function Services_Yadis_getIPrivateChars() +{ + return array( + array(0xE000, 0xF8FF), + array(0xF0000, 0xFFFFD), + array(0x100000, 0x10FFFD) + ); +} function _pct_escape_unicode($char_match) { diff --git a/Services/Yadis/XRI.php b/Services/Yadis/XRI.php index a3c335a..ef456ce 100644 --- a/Services/Yadis/XRI.php +++ b/Services/Yadis/XRI.php @@ -26,7 +26,8 @@ function Services_Yadis_getXRIAuthorities() function Services_Yadis_getEscapeRE() { $parts = array(); - foreach (array_merge($__UCSCHAR, $__IPRIVATE) as $pair) { + foreach (array_merge(Services_Yadis_getUCSChars(), + Services_Yadis_getIPrivateChars()) as $pair) { list($m, $n) = $pair; $parts[] = sprintf("%s-%s", chr($m), chr($n)); } |