bump version 2023.12

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

diff --git a/src/Core/System.php b/src/Core/System.php
index 6af4186a37ae0f3ae51188ebcb97f99615de6ea4..8869cebbef735b7a9aeea0ea851d71763cc30c9a 100644 (file)
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -220,19 +220,20 @@ class System
 
                proc_close($resource);
 
-               $this->logger->info('Executed "proc_open"', ['command' => $cmdline, 'callstack' => System::callstack(10)]);
+               $this->logger->info('Executed "proc_open"', ['command' => $cmdline]);
        }
 
        /**
         * Returns a string with a callstack. Can be used for logging.
         *
-        * @param integer $depth  How many calls to include in the stacks after filtering
-        * @param int     $offset How many calls to shave off the top of the stack, for example if
-        *                        this is called from a centralized method that isn't relevant to the callstack
-        * @param bool    $full   If enabled, the callstack is not compacted
+        * @param integer $depth   How many calls to include in the stacks after filtering
+        * @param int     $offset  How many calls to shave off the top of the stack, for example if
+        *                         this is called from a centralized method that isn't relevant to the callstack
+        * @param bool    $full    If enabled, the callstack is not compacted
+        * @param array   $exclude 
         * @return string
         */
-       public static function callstack(int $depth = 4, int $offset = 0, bool $full = false): string
+       public static function callstack(int $depth = 4, int $offset = 0, bool $full = false, array $exclude = []): string
        {
                $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 
@@ -247,6 +248,10 @@ class System
 
                while ($func = array_pop($trace)) {
                        if (!empty($func['class'])) {
+                               if (in_array($func['class'], $exclude)) {
+                                       continue;
+                               }
+
                                if (!$full && in_array($previous['function'], ['insert', 'fetch', 'toArray', 'exists', 'count', 'selectFirst', 'selectToArray',
                                        'select', 'update', 'delete', 'selectFirstForUser', 'selectForUser'])
                                        && (substr($previous['class'], 0, 15) === 'Friendica\Model')) {
@@ -311,27 +316,24 @@ class System
         * Outputs a basic dfrn XML status structure to STDOUT, with a <status> variable
         * of $st and an optional text <message> of $message and terminates the current process.
         *
-        * @param        $st
+        * @param mixed  $status
         * @param string $message
         * @throws \Exception
+        * @deprecated since 2023.09 Use BaseModule->httpExit() instead
         */
-       public static function xmlExit($st, $message = '')
+       public static function xmlExit($status, string $message = '')
        {
-               $result = ['status' => $st];
+               $result = ['status' => $status];
 
                if ($message != '') {
                        $result['message'] = $message;
                }
 
-               if ($st) {
-                       Logger::notice('xml_status returning non_zero: ' . $st . " message=" . $message);
+               if ($status) {
+                       Logger::notice('xml_status returning non_zero: ' . $status . " message=" . $message);
                }
 
-               DI::apiResponse()->setType(Response::TYPE_XML);
-               DI::apiResponse()->addContent(XML::fromArray(['result' => $result]));
-               self::echoResponse(DI::apiResponse()->generate());
-
-               self::exit();
+               self::httpExit(XML::fromArray(['result' => $result]), Response::TYPE_XML);
        }
 
        /**
@@ -346,7 +348,7 @@ class System
        public static function httpError($httpCode, $message = '', $content = '')
        {
                if ($httpCode >= 400) {
-                       Logger::debug('Exit with error', ['code' => $httpCode, 'message' => $message, 'callstack' => System::callstack(20), 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
+                       Logger::debug('Exit with error', ['code' => $httpCode, 'message' => $message, 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
                }
                DI::apiResponse()->setStatus($httpCode, $message);
 
@@ -373,10 +375,13 @@ class System
                self::exit();
        }
 
+       /**
+        * @deprecated since 2023.09 Use BaseModule->jsonError instead
+        */
        public static function jsonError($httpCode, $content, $content_type = 'application/json')
        {
                if ($httpCode >= 400) {
-                       Logger::debug('Exit with error', ['code' => $httpCode, 'content_type' => $content_type, 'callstack' => System::callstack(20), 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
+                       Logger::debug('Exit with error', ['code' => $httpCode, 'content_type' => $content_type, 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
                }
                DI::apiResponse()->setStatus($httpCode);
                self::jsonExit($content, $content_type);
@@ -519,7 +524,7 @@ class System
        public static function externalRedirect($url, $code = 302)
        {
                if (empty(parse_url($url, PHP_URL_SCHEME))) {
-                       Logger::warning('No fully qualified URL provided', ['url' => $url, 'callstack' => self::callstack(20)]);
+                       Logger::warning('No fully qualified URL provided', ['url' => $url]);
                        DI::baseUrl()->redirect($url);
                }