<?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
*
$func['database'] = in_array($func['class'], ['Friendica\Database\DBA', 'Friendica\Database\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;
}
}
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();
/**
* 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;
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];
+ }
}
}
}