X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FStrings.php;h=55751d8d8274a901fca6a76b75171a89e886a1e7;hb=fb371e10486f535ffcb52569a55e185b5a78c015;hp=473774b71dba283c7cbecf28e9a99d8f2a25cd5d;hpb=c07fa5d0695b438fd6a0c2263191139e059ef827;p=friendica.git

diff --git a/src/Util/Strings.php b/src/Util/Strings.php
index 473774b71d..55751d8d82 100644
--- a/src/Util/Strings.php
+++ b/src/Util/Strings.php
@@ -13,12 +13,13 @@ use Friendica\Core\Logger;
  */
 class Strings
 {
-    /**
-     * @brief Generates a pseudo-random string of hexadecimal characters
-     *
-     * @param int $size
-     * @return string
-     */
+	/**
+	 * @brief Generates a pseudo-random string of hexadecimal characters
+	 *
+	 * @param int $size
+	 * @return string
+	 * @throws \Exception
+	 */
     public static function getRandomHex($size = 64)
     {
         $byte_size = ceil($size / 2);
@@ -139,14 +140,15 @@ class Strings
         return $word;
     }
 
-    /**
-     * @brief Translate and format the network name of a contact
-     *
-     * @param string $network Network name of the contact (e.g. dfrn, rss and so on)
-     * @param string $url     The contact url
-     * 
-     * @return string Formatted network name
-     */
+	/**
+	 * Translate and format the network name of a contact
+	 *
+	 * @param string $network Network name of the contact (e.g. dfrn, rss and so on)
+	 * @param string $url     The contact url
+	 *
+	 * @return string Formatted network name
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 */
     public static function formatNetworkName($network, $url = '')
     {
         if ($network != '') {
@@ -240,12 +242,13 @@ class Strings
         return $s;
     }
 
-    /**
-     * @brief Decode Base64 Encoded URL and translate -_ to +/
-     * @param string $s URL to decode
-     * 
-     * @return string   Decoded URL
-     */
+	/**
+	 * @brief Decode Base64 Encoded URL and translate -_ to +/
+	 * @param string $s URL to decode
+	 *
+	 * @return string   Decoded URL
+	 * @throws \Exception
+	 */
     public static function base64UrlDecode($s)
     {
         if (is_array($s)) {
@@ -292,7 +295,7 @@ class Strings
      * 
      * @return string   normalized OpenId Identity
      */
-    function normaliseOpenID($s)
+    public static function normaliseOpenID($s)
     {
         return trim(str_replace(['http://', 'https://'], ['', ''], $s), '/');
     }
@@ -312,4 +315,35 @@ class Strings
     {
         return (strcasecmp(self::normaliseLink($a), self::normaliseLink($b)) === 0);
     }
+
+
+	/**
+	 * Ensures the provided URI has its query string punctuation in order.
+	 *
+	 * @param string $uri
+	 * @return string
+	 */
+	public static function ensureQueryParameter($uri)
+	{
+		if (strpos($uri, '?') === false && ($pos = strpos($uri, '&')) !== false) {
+			$uri = substr($uri, 0, $pos) . '?' . substr($uri, $pos + 1);
+		}
+
+		return $uri;
+	}
+
+
+	/**
+	 * Check if the trimmed provided string is starting with one of the provided characters
+	 *
+	 * @param string $string
+	 * @param array  $chars
+	 * @return bool
+	 */
+	public static function startsWith($string, array $chars)
+	{
+		$return = in_array(substr(trim($string), 0, 1), $chars);
+
+		return $return;
+	}
 }