Cleanups: isResult() more used, readability improved (#5608)

[friendica.git] / src / Core / System.php
diff --git a/src/Core/System.php b/src/Core/System.php

index 058aca130dfc78b4a1bdf7d1878cf44bd868f198..88b89cda27ac60189375854ecca2a103439ff4d2 100644 (file)
--- 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
-<html>
-       <head><title>System Unavailable</title></head>
-       <body>Apologies but this site is unavailable at the moment. Please try again later.</body>
-</html>
-EOT;
-
-               killme();
-       }
-
         /**
          * Generic XML return
          * Outputs a basic dfrn XML status structure to STDOUT, with a <status> variable
@@ -186,7 +172,7 @@ EOT;
         {
                 if (is_bool($prefix) && !$prefix) {
                         $prefix = '';
-               } elseif (!isset($prefix)) {
+               } elseif (empty($prefix)) {
                         $prefix = hash('crc32', self::getApp()->get_hostname());
                 }
  
@@ -203,6 +189,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()