Fixed max value check, improved request value fetching

[friendica.git] / src / Util / Strings.php

diff --git a/src/Util/Strings.php b/src/Util/Strings.php
index 35e7ebe1510c732ccd793e2837297acdbbf666b0..3870074e1a7be84cfc3e6b1f4f17ab37fb4ee202 100644 (file)
--- a/src/Util/Strings.php
+++ b/src/Util/Strings.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -59,21 +59,6 @@ class Strings
                return !empty($hexCode) ? @preg_match("/^[a-f0-9]{2,}$/i", $hexCode) && !(strlen($hexCode) & 1) : false;
        }
 
-       /**
-        * This is our primary input filter.
-        *
-        * Use this on any text input where angle chars are not valid or permitted
-        * They will be replaced with safer brackets. This may be filtered further
-        * if these are not allowed either.
-        *
-        * @param string $string Input string
-        * @return string Filtered string
-        */
-       public static function escapeTags($string)
-       {
-               return str_replace(["<", ">"], ['[', ']'], $string);
-       }
-
        /**
         * Use this on "body" or "content" input where angle chars shouldn't be removed,
         * and allow them to be safely displayed.
@@ -283,7 +268,7 @@ class Strings
        public static function base64UrlDecode($s)
        {
                if (is_array($s)) {
-                       Logger::log('base64url_decode: illegal input: ' . print_r(debug_backtrace(), true));
+                       Logger::notice('base64url_decode: illegal input: ', ['backtrace' => debug_backtrace()]);
                        return $s;
                }
 
@@ -379,6 +364,7 @@ class Strings
        /**
         * Check if the first string starts with the second
         *
+        * @see http://maettig.com/code/php/php-performance-benchmarks.php#startswith
         * @param string $string
         * @param string $start
         * @return bool
@@ -390,6 +376,21 @@ class Strings
                return $return;
        }
 
+       /**
+        * Checks if the first string ends with the second
+        *
+        * @see http://maettig.com/code/php/php-performance-benchmarks.php#endswith
+        * @param string $string
+        * @param string $end
+        * @return bool
+        */
+       public static function endsWith(string $string, string $end)
+       {
+               $return = substr_compare($string, $end, -strlen($end)) === 0;
+
+               return $return;
+       }
+
        /**
         * Returns the regular expression string to match URLs in a given text
         *