X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSystem.php;h=b41f520d7792c614414cda5701ab8e8ab3ee22ed;hb=be7bd106784ad4e45833b1649e8409ef48f0d19f;hp=2fcbee14f5eb543076c0bb0727c8bb8316c44e86;hpb=d1eeaeead913af5f0f4860405b75f9d6fad94270;p=friendica.git
diff --git a/src/Core/System.php b/src/Core/System.php
index 2fcbee14f5..b41f520d77 100644
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -65,7 +65,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 +85,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
@@ -175,6 +161,18 @@ 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
*
@@ -186,7 +184,7 @@ EOT;
{
if (is_bool($prefix) && !$prefix) {
$prefix = '';
- } elseif (!empty($prefix)) {
+ } elseif (empty($prefix)) {
$prefix = hash('crc32', self::getApp()->get_hostname());
}
@@ -203,6 +201,21 @@ EOT;
}
}
+ /**
+ * 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);
+ }
+
/// @todo Move the following functions from boot.php
/*
function killme()