Merge pull request #11672 from nanaya/http-str

Create helper to check http(s) string

app/Models/NewsPost.php

@@ -255,7 +255,7 @@ public function firstImage($absolute = false)
             return;
         }
 
-        if ($absolute && !starts_with($url, ['https://', 'http://'])) {
+        if ($absolute && !is_http($url)) {
             if ($url[0] === '/') {
                 $url = $GLOBALS['cfg']['app']['url'].$url;
             } else {

app/Models/User.php

@@ -707,7 +707,7 @@ public function setUserWebsiteAttribute($value)
 
         // FIXME: this can probably be removed after old site is deactivated
         //        as there's same check in getter function.
-        if (present($value) && !starts_with($value, ['http://', 'https://'])) {
+        if (present($value) && !is_http($value)) {
             $value = "https://{$value}";
         }
 
@@ -2473,14 +2473,11 @@ private function getUserWebsite()
     {
         $value = presence(trim($this->getRawAttribute('user_website')));
 
-        if ($value === null) {
-            return null;
-        }
-
-        if (starts_with($value, ['http://', 'https://'])) {
-            return $value;
-        }
-
-        return "https://{$value}";
+        return $value === null
+            ? null
+            : (is_http($value)
+                ? $value
+                : "https://{$value}"
+            );
     }
 }

app/helpers.php

@@ -848,6 +848,12 @@ function is_api_request(): bool
     return str_starts_with(rawurldecode(Request::getPathInfo()), '/api/');
 }
 
+function is_http(string $url): bool
+{
+    return str_starts_with($url, 'http://')
+        || str_starts_with($url, 'https://');
+}
+
 function is_json_request(): bool
 {
     return is_api_request() || Request::expectsJson();