Use toConfigValue in case of serialized, legacy data

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

diff --git a/src/Core/System.php b/src/Core/System.php
index 65f70038801ce017da755a03e82c48b247714570..f94004a880ab10a047935c653432cb887cc25aab 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
  *
@@ -251,7 +251,7 @@ 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'];
                                        $previous = $func;
@@ -294,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();
@@ -440,11 +440,12 @@ 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('uptime | sed "s/.*averages*: //" | sed "s/,//g"');
@@ -664,10 +665,11 @@ class System
 
        /**
         * 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(): array
+       public static function getRules(bool $numeric_id = false): array
        {
                $rules = [];
                $id    = 0;
@@ -677,10 +679,14 @@ class System
                        $html = BBCode::convert($rulelist, false, BBCode::EXTERNAL);
 
                        $msg = HTML::toPlaintext($html, 0, true);
-                       foreach (explode("\n", $msg) as $line) {
+                       foreach (explode("\n", trim($msg)) as $line) {
                                $line = trim($line);
                                if ($line) {
-                                       $rules[] = ['id' => (string)++$id, 'text' => $line];
+                                       if ($numeric_id) {
+                                               $rules[++$id] = $line;
+                                       } else {
+                                               $rules[] = ['id' => (string)++$id, 'text' => $line];
+                                       }
                                }
                        }
                }