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

Timestamp:

Aug 8, 2019 10:03:59 PM (5 years ago)

Author:

anonymous

Message:

Add unicode flag (/u) to preg_* patterns. Remove usage of create_function().

File:

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

trunk/lib/Utilities.inc.php

@@ -122 +122 @@
     $d = ob_get_contents();
     ob_end_clean();
-    return $serialize ? preg_replace('/\s+/m', ' ', $d) : $d;
+    return $serialize ? preg_replace('/\s+/mu', ' ', $d) : $d;
 }
 
@@ -154 +154 @@
         $output .= sprintf("%s%s\n", $indent_str, $var);
     }
-    return preg_replace(['/^[ \t]+$/', '/\n\n+/', '/^(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(?:\S( ))?(\S )/m'], ['', "\n", '$1$1$2$2$3$3$4$4$5$5$6$6$7$7$8$8$9'], $output);
+    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);
 }
 
@@ -189 +189 @@
 
     // Make converted ampersand entities into normal ampersands (they will be done manually later) to retain HTML entities.
-    $search['retain_ampersand']     = '/&/';
+    $search['retain_ampersand']     = '/&/u';
     $replace['retain_ampersand']    = '&';
 
     if ($preserve_html) {
         // Convert characters that must remain non-entities for displaying HTML.
-        $search['retain_left_angle']       = '/</';
+        $search['retain_left_angle']       = '/</u';
         $replace['retain_left_angle']      = '<';
 
-        $search['retain_right_angle']      = '/&gt;/';
+        $search['retain_right_angle']      = '/&gt;/u';
         $replace['retain_right_angle']     = '>';
 
-        $search['retain_single_quote']     = '/&#039;/';
+        $search['retain_single_quote']     = '/&#039;/u';
         $replace['retain_single_quote']    = "'";
 
-        $search['retain_double_quote']     = '/&quot;/';
+        $search['retain_double_quote']     = '/&quot;/u';
         $replace['retain_double_quote']    = '"';
     }
@@ -309 +309 @@
             // If not truncating, or URL was not truncated.
             // Remove http schemas, and any single trailing / to make the display URL.
-            $display_url = preg_replace(['!^https?://!', '!^([^/]+)/$!'], ['', '$1'], $url);
+            $display_url = preg_replace(['!^https?://!u', '!^([^/]+)/$!u'], ['', '$1'], $url);
             return sprintf('<a href="%s">%s</a>', oTxt($absolute_url), $display_url);
         } else {
             // Truncated URL.
             // Remove http schemas, and any single trailing / to make the display URL.
-            $display_url = preg_replace(['!^https?://!', '!^([^/]+)/$!'], ['', '$1'], trim($truncated_url));
+            $display_url = preg_replace(['!^https?://!u', '!^([^/]+)/$!u'], ['', '$1'], trim($truncated_url));
             return sprintf('<a href="%s">%s%s</a>', oTxt($absolute_url), $display_url, $delim);
         }
@@ -337 +337 @@
     foreach ($words as $w) {
         if ('' != trim($w)) {
-            $search[] = '/\b(' . preg_quote($w) . ')\b/i';
+            $search[] = '/\b(' . preg_quote($w) . ')\b/iu';
             $replace[] = '<span class="' . $class . '">$1</span>';
         }
@@ -368 +368 @@
     default :
         // Reduce all hex values slightly to avoid all white.
-        array_walk($rgb, create_function('&$v', "\$v = dechex(round(hexdec(\$v) * $n));"));
+        array_walk($rgb, function (&$v) use ($n) {
+            $v = dechex(round(hexdec($v) * $n));
+        });
         break;
+
     case 2 :
         foreach ($rgb as $i => $v) {
@@ -411 +414 @@
 function encodeEmail($email, $at=' at ', $dot=' dot ')
 {
-    $search = array('/@/', '/\./');
+    $search = array('/@/u', '/\./u');
     $replace = array($at, $dot);
     return preg_replace($search, $replace, $email);
@@ -529 +532 @@
 function URLSlug($str)
 {
-    $slug = preg_replace(array('/\W+/u', '/^-+|-+$/'), array('-', ''), $str);
+    $slug = preg_replace(array('/\W+/u', '/^-+|-+$/u'), array('-', ''), $str);
     $slug = strtolower($slug);
     return $slug;
@@ -1138 +1141 @@
 function hash64($string, $length=18)
 {
-    return mb_substr(preg_replace('/[^\w]/', '', base64_encode(hash('sha512', $string, true))), 0, $length);
+    return mb_substr(preg_replace('/[^\w]/u', '', base64_encode(hash('sha512', $string, true))), 0, $length);
 }
 
@@ -1168 +1171 @@
     switch ($app->getParam('signing_method')) {
     case 'sha512+base64':
-        return $val . '-' . mb_substr(preg_replace('/[^\w]/', '', base64_encode(hash('sha512', $val . $salt, true))), 0, $length);
+        return $val . '-' . mb_substr(preg_replace('/[^\w]/u', '', base64_encode(hash('sha512', $val . $salt, true))), 0, $length);
 
     case 'md5':
@@ -1395 +1398 @@
 function stripQuery($url)
 {
-    return preg_replace('/[?#].*$/', '', $url);
+    return preg_replace('/[?#].*$/u', '', $url);
 }
 
@@ -1405 +1408 @@
 function absoluteMe()
 {
-    $safe_http_host = preg_replace('/[^a-z\d.:-]/', '', getenv('HTTP_HOST'));
+    $safe_http_host = preg_replace('/[^a-z\d.:-]/u', '', getenv('HTTP_HOST'));
     return sprintf('%s://%s%s', (getenv('HTTPS') ? 'https' : 'http'), $safe_http_host, getenv('REQUEST_URI'));
 }
@@ -1422 +1425 @@
     // If one of the hostnames is an IP address, compare only the path of both.
     if (preg_match('/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/', parse_url($current_url, PHP_URL_HOST)) || preg_match('/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/', parse_url($referrer_url, PHP_URL_HOST))) {
-        $current_url = preg_replace('@^https?://[^/]+@', '', $current_url);
-        $referrer_url = preg_replace('@^https?://[^/]+@', '', $referrer_url);
+        $current_url = preg_replace('@^https?://[^/]+@u', '', $current_url);
+        $referrer_url = preg_replace('@^https?://[^/]+@u', '', $referrer_url);
     }