X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSystem.php;h=e071866ee9bb54845ca0c1d2a2107cd11634777a;hb=2a881cc2e71b1677cc9ce98001ae3f157743e542;hp=84a64ab9a8f4ee0d24d842eeb25d586c12bb49d1;hpb=7211fc4f1ac33819ed0543ac65f9a075250c3190;p=friendica.git
diff --git a/src/Core/System.php b/src/Core/System.php
index 84a64ab9a8..e071866ee9 100644
--- 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);
}
/**
@@ -65,7 +66,7 @@ class System extends BaseObject
while ($func = array_pop($trace)) {
if (!empty($func['class'])) {
// Don't show multiple calls from the "dba" class to show the essential parts of the callstack
- if ((($previous['class'] != $func['class']) || ($func['class'] != 'dba')) && ($previous['function'] != 'q')) {
+ if ((($previous['class'] != $func['class']) || ($func['class'] != 'Friendica\Database\DBA')) && ($previous['function'] != 'q')) {
$classparts = explode("\\", $func['class']);
$callstack[] = array_pop($classparts).'::'.$func['function'];
$previous = $func;
@@ -85,20 +86,6 @@ class System extends BaseObject
return implode(', ', $callstack2);
}
- /**
- * @brief Called from db initialisation when db is dead.
- */
- static public function unavailable() {
-echo <<< EOT
-
- System Unavailable
- Apologies but this site is unavailable at the moment. Please try again later.
-
-EOT;
-
- killme();
- }
-
/**
* Generic XML return
* Outputs a basic dfrn XML status structure to STDOUT, with a variable
@@ -156,7 +143,7 @@ EOT;
'$description' => defaults($description, 'description', '')]);
}
- killme();
+ exit();
}
/**
@@ -175,11 +162,101 @@ EOT;
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
+ *
+ * @param int $size The size of the GUID (default is 16)
+ * @param bool|string $prefix A given prefix (default is empty)
+ * @return string a generated GUID
+ */
+ public static function createGUID($size = 16, $prefix = '')
+ {
+ if (is_bool($prefix) && !$prefix) {
+ $prefix = '';
+ } elseif (empty($prefix)) {
+ $prefix = hash('crc32', self::getApp()->getHostName());
+ }
+
+ while (strlen($prefix) < ($size - 13)) {
+ $prefix .= mt_rand();
+ }
+
+ if ($size >= 24) {
+ $prefix = substr($prefix, 0, $size - 22);
+ return str_replace('.', '', uniqid($prefix, true));
+ } else {
+ $prefix = substr($prefix, 0, max($size - 13, 0));
+ return uniqid($prefix);
+ }
+ }
+
+ /**
+ * Generates a process identifier for the logging
+ *
+ * @param string $prefix A given prefix
+ *
+ * @return string a generated process identifier
+ */
+ public static function processID($prefix)
+ {
+ // We aren't calling any other function here.
+ // Doing so could easily create an endless loop
+ $trailer = $prefix . ':' . getmypid() . ':';
+ 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 get_guid($size = 16, $prefix = "")
function killme()
- function goaway($s)
function local_user()
function public_contact()
function remote_user()
@@ -192,6 +269,5 @@ EOT;
function get_cachefile($file, $writemode = true)
function get_itemcachepath()
function get_spoolpath()
- function current_load()
*/
}