Changeset 724 for trunk/lib/Utilities.inc.php

Timestamp:

May 4, 2020 2:25:31 AM (4 years ago)

Author:

anonymous

Message:

Use the /u regex modifier only when using UTF-8. Disable indexed array key removal from URL query args.

File:

• trunk/lib/Utilities.inc.php (modified) (15 diffs)

trunk/lib/Utilities.inc.php

@@ -118 +118 @@
 function getDump($var, $serialize=false)
 {
+    $app =& App::getInstance();
+
     ob_start();
     print_r($var);
     $d = ob_get_contents();
     ob_end_clean();
-    return $serialize ? preg_replace('/\s+/mu', ' ', $d) : $d;
+    return $serialize ? preg_replace('/\s+/m' . $app->getParam('preg_u'), ' ', $d) : $d;
 }
 
@@ -140 +142 @@
 function fancyDump($var, $indent='- ', $depth=1)
 {
+    $app =& App::getInstance();
+
     $indent_str = str_repeat($indent, $depth);
     $output = '';
@@ -154 +158 @@
         $output .= sprintf("%s%s\n", $indent_str, $var);
     }
-    return preg_replace(['/^[ \t]+$/u', '/\n\n+/u', '/^(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(\S )/mu'], ['', "\n", '$1$1$2$2$3$3$4$4$5$5$6$6$7$7$8$8$9'], $output);
+    return preg_replace(['/^[ \t]+$/' . $app->getParam('preg_u'), '/\n\n+/' . $app->getParam('preg_u'), '/^(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(\S )/m' . $app->getParam('preg_u')], ['', "\n", '$1$1$2$2$3$3$4$4$5$5$6$6$7$7$8$8$9'], $output);
 }
 
@@ -330 +334 @@
 function highlightWords($text, $search, $class='sc-highlightwords')
 {
+    $app =& App::getInstance();
+
     $words = preg_split('/[^\w]/', $search, -1, PREG_SPLIT_NO_EMPTY);
 
@@ -337 +343 @@
     foreach ($words as $w) {
         if ('' != trim($w)) {
-            $search[] = '/\b(' . preg_quote($w) . ')\b/iu';
+            $search[] = '/\b(' . preg_quote($w) . ')\b/i' . $app->getParam('preg_u');
             $replace[] = '<span class="' . $class . '">$1</span>';
         }
@@ -414 +420 @@
 function encodeEmail($email, $at=' at ', $dot=' dot ')
 {
-    $search = array('/@/u', '/\./u');
+    $app =& App::getInstance();
+
+    $search = array('/@/' . $app->getParam('preg_u'), '/\./' . $app->getParam('preg_u'));
     $replace = array($at, $dot);
     return preg_replace($search, $replace, $email);
@@ -438 +446 @@
 function truncate($str, $len=50, $where='end', $delim='
')
 {
+    $app =& App::getInstance();
+
     $dlen = mb_strlen($delim);
     if ($len <= $dlen || mb_strlen($str) <= $dlen) {
@@ -453 +463 @@
     switch ($where) {
     case 'start' :
-        return preg_replace(array(sprintf('/^.{%s,}(.{%s})$/su', $dlen + 1, $part1 + $part2), sprintf('/\s*%s{%s,}\s*/su', preg_quote($delim), $dlen)), array($delim . '$1', $delim), $str);
+        return preg_replace(array(sprintf('/^.{%s,}(.{%s})$/s' . $app->getParam('preg_u'), $dlen + 1, $part1 + $part2), sprintf('/\s*%s{%s,}\s*/s' . $app->getParam('preg_u'), preg_quote($delim), $dlen)), array($delim . '$1', $delim), $str);
 
     case 'middle' :
-        return preg_replace(array(sprintf('/^(.{%s}).{%s,}(.{%s})$/su', $part1, $dlen + 1, $part2), sprintf('/\s*%s{%s,}\s*/su', preg_quote($delim), $dlen)), array('$1' . $delim . '$2', $delim), $str);
+        return preg_replace(array(sprintf('/^(.{%s}).{%s,}(.{%s})$/s' . $app->getParam('preg_u'), $part1, $dlen + 1, $part2), sprintf('/\s*%s{%s,}\s*/s' . $app->getParam('preg_u'), preg_quote($delim), $dlen)), array('$1' . $delim . '$2', $delim), $str);
 
     case 'end' :
     default :
-        return preg_replace(array(sprintf('/^(.{%s}).{%s,}$/su', $part1 + $part2, $dlen + 1), sprintf('/\s*%s{%s,}\s*/su', preg_quote($delim), $dlen)), array('$1' . $delim, $delim), $str);
+        return preg_replace(array(sprintf('/^(.{%s}).{%s,}$/s' . $app->getParam('preg_u'), $part1 + $part2, $dlen + 1), sprintf('/\s*%s{%s,}\s*/s' . $app->getParam('preg_u'), preg_quote($delim), $dlen)), array('$1' . $delim, $delim), $str);
     }
 }
@@ -620 +630 @@
 
     return preg_replace([
-        '/&amp;(?=[\w\d#]{1,10};)/ui',
-        '/&([a-z]{1,2})(?:acute|cedil|circ|grave|lig|orn|ring|slash|th|tilde|uml|caron);/ui',
-        '/&(?:ndash|mdash|horbar);/ui',
-        '/&(?:nbsp);/ui',
-        '/&(?:bdquo|ldquo|ldquor|lsquo|lsquor|rdquo|rdquor|rsquo|rsquor|sbquo|lsaquo|rsaquo);/ui',
-        '/&(?:amp);/ui', // This replacement must come after matching all other entities.
-        '/[&;]+/u',
+        '/&amp;(?=[\w\d#]{1,10};)/i' . $app->getParam('preg_u'),
+        '/&([a-z]{1,2})(?:acute|cedil|circ|grave|lig|orn|ring|slash|th|tilde|uml|caron);/i' . $app->getParam('preg_u'),
+        '/&(?:ndash|mdash|horbar);/i' . $app->getParam('preg_u'),
+        '/&(?:nbsp);/i' . $app->getParam('preg_u'),
+        '/&(?:bdquo|ldquo|ldquor|lsquo|lsquor|rdquo|rdquor|rsquo|rsquor|sbquo|lsaquo|rsaquo);/i' . $app->getParam('preg_u'),
+        '/&(?:amp);/i' . $app->getParam('preg_u'), // This replacement must come after matching all other entities.
+        '/[&;]+/' . $app->getParam('preg_u'),
     ], [
         '&',
@@ -650 +660 @@
 function URLSlug($str)
 {
-    return strtolower(urlencode(preg_replace(['/[-\s–—.:;?!@#=+_\/\\\]+|(?:&nbsp;|&#160;|&ndash;|&#8211;|&mdash;|&#8212;|%c2%a0|%e2%80%93|%e2%80%9)+/u', '/-+/u', '/[^\w-]+/u', '/^-+|-+$/u'], ['-', '-', '', ''], simplifyAccents($str))));
+    $app =& App::getInstance();
+
+    return strtolower(urlencode(preg_replace(['/[-\s–—.:;?!@#=+_\/\\\]+|(?:&nbsp;|&#160;|&ndash;|&#8211;|&mdash;|&#8212;|%c2%a0|%e2%80%93|%e2%80%9)+/' . $app->getParam('preg_u'), '/-+/' . $app->getParam('preg_u'), '/[^\w-]+/' . $app->getParam('preg_u'), '/^-+|-+$/' . $app->getParam('preg_u')], ['-', '-', '', ''], simplifyAccents($str))));
 }
 
@@ -664 +676 @@
     $app =& App::getInstance();
 
-    $file_name = preg_replace(['/[^a-zA-Z0-9()@._=+-]+/u', '/^_+|_+$/u'], ['_', ''], simplifyAccents($file_name));
+    $file_name = preg_replace(['/[^a-zA-Z0-9()@._=+-]+/' . $app->getParam('preg_u'), '/^_+|_+$/' . $app->getParam('preg_u')], ['_', ''], simplifyAccents($file_name));
     return mb_substr($file_name, 0, 250);
 }
@@ -1182 +1194 @@
 function hash64($string, $length=18)
 {
-    return mb_substr(preg_replace('/[^\w]/u', '', base64_encode(hash('sha512', $string, true))), 0, $length);
+    $app =& App::getInstance();
+
+    return mb_substr(preg_replace('/[^\w]/' . $app->getParam('preg_u'), '', base64_encode(hash('sha512', $string, true))), 0, $length);
 }
 
@@ -1212 +1226 @@
     switch ($app->getParam('signing_method')) {
     case 'sha512+base64':
-        return $val . '-' . mb_substr(preg_replace('/[^\w]/u', '', base64_encode(hash('sha512', $val . $salt, true))), 0, $length);
+        return $val . '-' . mb_substr(preg_replace('/[^\w]/' . $app->getParam('preg_u'), '', base64_encode(hash('sha512', $val . $salt, true))), 0, $length);
 
     case 'md5':
@@ -1448 +1462 @@
 function stripQuery($url)
 {
-    return preg_replace('/[?#].*$/u', '', $url);
+    $app =& App::getInstance();
+
+    return preg_replace('/[?#].*$/' . $app->getParam('preg_u'), '', $url);
 }
 
@@ -1458 +1474 @@
 function absoluteMe()
 {
-    $safe_http_host = preg_replace('/[^a-z\d.:-]/u', '', getenv('HTTP_HOST'));
+    $app =& App::getInstance();
+
+    $safe_http_host = preg_replace('/[^a-z\d.:-]/' . $app->getParam('preg_u'), '', getenv('HTTP_HOST'));
     return sprintf('%s://%s%s', (getenv('HTTPS') ? 'https' : 'http'), $safe_http_host, getenv('REQUEST_URI'));
 }