Merge pull request #5907 from nupplaphil/goaway_to_redirectto

[friendica.git] / src / Core / System.php

diff --git a/src/Core/System.php b/src/Core/System.php
index 88b89cda27ac60189375854ecca2a103439ff4d2..e071866ee9bb54845ca0c1d2a2107cd11634777a 100644 (file)
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -5,6 +5,7 @@
 namespace Friendica\Core;
 
 use Friendica\BaseObject;
+use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\XML;
 
 /**
@@ -27,7 +28,7 @@ class System extends BaseObject
         */
        public static function baseUrl($ssl = false)
        {
-               return self::getApp()->get_baseurl($ssl);
+               return self::getApp()->getBaseURL($ssl);
        }
 
        /**
@@ -39,7 +40,7 @@ class System extends BaseObject
         */
        public static function removedBaseUrl($orig_url)
        {
-               return self::getApp()->remove_baseurl($orig_url);
+               return self::getApp()->removeBaseURL($orig_url);
        }
 
        /**
@@ -142,7 +143,7 @@ class System extends BaseObject
                                '$description' => defaults($description, 'description', '')]);
                }
 
-               killme();
+               exit();
        }
 
        /**
@@ -161,6 +162,18 @@ class System extends BaseObject
                killme();
        }
 
+       /**
+        * Generates a random string in the UUID format
+        *
+        * @param bool|string  $prefix   A given prefix (default is empty)
+        * @return string a generated UUID
+        */
+       public static function createUUID($prefix = '')
+       {
+               $guid = System::createGUID(32, $prefix);
+               return substr($guid, 0, 8). '-' . substr($guid, 8, 4) . '-' . substr($guid, 12, 4) . '-' . substr($guid, 16, 4) . '-' . substr($guid, 20, 12);
+       }
+
        /**
         * Generates a GUID with the given parameters
         *
@@ -173,7 +186,7 @@ class System extends BaseObject
                if (is_bool($prefix) && !$prefix) {
                        $prefix = '';
                } elseif (empty($prefix)) {
-                       $prefix = hash('crc32', self::getApp()->get_hostname());
+                       $prefix = hash('crc32', self::getApp()->getHostName());
                }
 
                while (strlen($prefix) < ($size - 13)) {
@@ -204,10 +217,46 @@ class System extends BaseObject
                return substr($trailer . uniqid('') . mt_rand(), 0, 26);
        }
 
+       /**
+        * Returns the current Load of the System
+        *
+        * @return integer
+        */
+       public static function currentLoad()
+       {
+               if (!function_exists('sys_getloadavg')) {
+                       return false;
+               }
+
+               $load_arr = sys_getloadavg();
+
+               if (!is_array($load_arr)) {
+                       return false;
+               }
+
+               return max($load_arr[0], $load_arr[1]);
+       }
+
+       /**
+        * Redirects to an external URL (fully qualified URL)
+        * If you want to route relative to the current Friendica base, use App->internalRedirect()
+        *
+        * @param string $url The new Location to redirect
+        * @throws InternalServerErrorException If the URL is not fully qualified
+        */
+       public static function externalRedirect($url)
+       {
+               if (!filter_var($url, FILTER_VALIDATE_URL)) {
+                       throw new InternalServerErrorException('URL is not a fully qualified URL, please use App->internalRedirect() instead');
+               }
+
+               header("Location: $url");
+               exit();
+       }
+
        /// @todo Move the following functions from boot.php
        /*
        function killme()
-       function goaway($s)
        function local_user()
        function public_contact()
        function remote_user()
@@ -220,6 +269,5 @@ class System extends BaseObject
        function get_cachefile($file, $writemode = true)
        function get_itemcachepath()
        function get_spoolpath()
-       function current_load()
        */
 }