API: Accept "redirect_uris" as both array and string

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

diff --git a/src/Core/System.php b/src/Core/System.php
index b2da78f1b3509d9a2ff5f16d147d1efd42c45e3e..42f5ab36aef2c85e001dfe60ddbf337405648d9a 100644 (file)
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,6 +21,8 @@
 
 namespace Friendica\Core;
 
+use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\DI;
 use Friendica\Module\Response;
@@ -249,14 +251,14 @@ class System
 
                                // Don't show multiple calls from the Database classes to show the essential parts of the callstack
                                $func['database'] = in_array($func['class'], ['Friendica\Database\DBA', 'Friendica\Database\Database']);
-                               if (!$previous['database'] || !$func['database']) {     
+                               if (!$previous['database'] || !$func['database']) {
                                        $classparts = explode("\\", $func['class']);
-                                       $callstack[] = array_pop($classparts).'::'.$func['function'];
+                                       $callstack[] = array_pop($classparts).'::'.$func['function'] . (isset($func['line']) ? ' (' . $func['line'] . ')' : '');
                                        $previous = $func;
                                }
                        } elseif (!in_array($func['function'], $ignore)) {
                                $func['database'] = ($func['function'] == 'q');
-                               $callstack[] = $func['function'];
+                               $callstack[] = $func['function'] . (isset($func['line']) ? ' (' . $func['line'] . ')' : '');
                                $func['class'] = '';
                                $previous = $func;
                        }
@@ -292,7 +294,7 @@ class System
                }
 
                DI::apiResponse()->setType(Response::TYPE_XML);
-               DI::apiResponse()->addContent(XML::fromArray(["result" => $result], $xml));
+               DI::apiResponse()->addContent(XML::fromArray(['result' => $result]));
                DI::page()->exit(DI::apiResponse()->generate());
 
                self::exit();
@@ -438,14 +440,15 @@ class System
        /**
         * Fetch the load and number of processes
         *
+        * @param bool $get_processes
         * @return array
         */
-       public static function getLoadAvg(): array
+       public static function getLoadAvg(bool $get_processes = true): array
        {
-               if (@is_readable('/proc/loadavg')) {
+               if ($get_processes && @is_readable('/proc/loadavg')) {
                        $content = @file_get_contents('/proc/loadavg');
                        if (empty($content)) {
-                               $content = shell_exec('cat /proc/loadavg');
+                               $content = shell_exec('uptime | sed "s/.*averages*: //" | sed "s/,//g"');
                        }
                }
 
@@ -659,4 +662,35 @@ class System
                // Reaching this point means that the operating system is configured badly.
                return "";
        }
+
+       /**
+        * Fetch the system rules
+        * @param bool $numeric_id If set to "true", the rules are returned with a numeric id as key.
+        *
+        * @return array
+        */
+       public static function getRules(bool $numeric_id = false): array
+       {
+               $rules = [];
+               $id    = 0;
+
+               if (DI::config()->get('system', 'tosdisplay')) {
+                       $rulelist = DI::config()->get('system', 'tosrules') ?: DI::config()->get('system', 'tostext');
+                       $html = BBCode::convert($rulelist, false, BBCode::EXTERNAL);
+
+                       $msg = HTML::toPlaintext($html, 0, true);
+                       foreach (explode("\n", trim($msg)) as $line) {
+                               $line = trim($line);
+                               if ($line) {
+                                       if ($numeric_id) {
+                                               $rules[++$id] = $line;
+                                       } else {
+                                               $rules[] = ['id' => (string)++$id, 'text' => $line];
+                                       }
+                               }
+                       }
+               }
+
+               return $rules;
+       }
 }