X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSystem.php;h=f94004a880ab10a047935c653432cb887cc25aab;hb=88b3effc180c5477bc8002b9d9ea8f3f628588dd;hp=8712b6ca5965f1a5820bd6544957ef6508df7a7e;hpb=8b7cb5d9efeab580c2592e0fbe301f7142b73a3d;p=friendica.git diff --git a/src/Core/System.php b/src/Core/System.php index 8712b6ca59..f94004a880 100644 --- a/src/Core/System.php +++ b/src/Core/System.php @@ -1,6 +1,6 @@ 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(); @@ -323,12 +325,12 @@ class System * After finishing the process is getting killed. * * @param string $content - * @param [type] $responce + * @param string $type * @param string|null $content_type * @return void */ - public static function httpExit(string $content, string $responce = Response::TYPE_HTML, ?string $content_type = null) { - DI::apiResponse()->setType($responce, $content_type); + public static function httpExit(string $content, string $type = Response::TYPE_HTML, ?string $content_type = null) { + DI::apiResponse()->setType($type, $content_type); DI::apiResponse()->addContent($content); DI::page()->exit(DI::apiResponse()->generate()); @@ -435,6 +437,44 @@ class System return max($load_arr[0], $load_arr[1]); } + /** + * Fetch the load and number of processes + * + * @param bool $get_processes + * @return array + */ + public static function getLoadAvg(bool $get_processes = true): array + { + 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"'); + } + } + + if (empty($content) || !preg_match("#([.\d]+)\s([.\d]+)\s([.\d]+)\s(\d+)/(\d+)#", $content, $matches)) { + $load_arr = sys_getloadavg(); + if (empty($load_arr)) { + return []; + } + return [ + 'average1' => $load_arr[0], + 'average5' => $load_arr[1], + 'average15' => $load_arr[2], + 'runnable' => 0, + 'scheduled' => 0 + ]; + } + + return [ + 'average1' => (float)$matches[1], + 'average5' => (float)$matches[2], + 'average15' => (float)$matches[3], + 'runnable' => (float)$matches[4], + 'scheduled' => (float)$matches[5] + ]; + } + /** * Redirects to an external URL (fully qualified URL) * If you want to route relative to the current Friendica base, use App->internalRedirect() @@ -493,30 +533,30 @@ class System * * @return boolean the directory is usable */ - public static function isDirectoryUsable($directory, $check_writable = true) + private static function isDirectoryUsable($directory, $check_writable = true) { if ($directory == '') { - Logger::info('Directory is empty. This shouldn\'t happen.'); + Logger::warning('Directory is empty. This shouldn\'t happen.'); return false; } if (!file_exists($directory)) { - Logger::info('Path "' . $directory . '" does not exist for user ' . static::getUser()); + Logger::warning('Path does not exist', ['directory' => $directory, 'user' => static::getUser()]); return false; } if (is_file($directory)) { - Logger::info('Path "' . $directory . '" is a file for user ' . static::getUser()); + Logger::warning('Path is a file', ['directory' => $directory, 'user' => static::getUser()]); return false; } if (!is_dir($directory)) { - Logger::info('Path "' . $directory . '" is not a directory for user ' . static::getUser()); + Logger::warning('Path is not a directory', ['directory' => $directory, 'user' => static::getUser()]); return false; } if ($check_writable && !is_writable($directory)) { - Logger::info('Path "' . $directory . '" is not writable for user ' . static::getUser()); + Logger::warning('Path is not writable', ['directory' => $directory, 'user' => static::getUser()]); return false; } @@ -550,7 +590,7 @@ class System { $temppath = DI::config()->get("system", "temppath"); - if (($temppath != "") && System::isDirectoryUsable($temppath)) { + if (($temppath != "") && self::isDirectoryUsable($temppath)) { // We have a temp path and it is usable return BasePath::getRealPath($temppath); } @@ -559,7 +599,7 @@ class System $temppath = sys_get_temp_dir(); // Check if it is usable - if (($temppath != "") && System::isDirectoryUsable($temppath)) { + if (($temppath != "") && self::isDirectoryUsable($temppath)) { // Always store the real path, not the path through symlinks $temppath = BasePath::getRealPath($temppath); @@ -570,7 +610,7 @@ class System mkdir($new_temppath); } - if (System::isDirectoryUsable($new_temppath)) { + if (self::isDirectoryUsable($new_temppath)) { // The new path is usable, we are happy DI::config()->set("system", "temppath", $new_temppath); return $new_temppath; @@ -593,7 +633,7 @@ class System public static function getSpoolPath() { $spoolpath = DI::config()->get('system', 'spoolpath'); - if (($spoolpath != "") && System::isDirectoryUsable($spoolpath)) { + if (($spoolpath != "") && self::isDirectoryUsable($spoolpath)) { // We have a spool path and it is usable return $spoolpath; } @@ -608,7 +648,7 @@ class System mkdir($spoolpath); } - if (System::isDirectoryUsable($spoolpath)) { + if (self::isDirectoryUsable($spoolpath)) { // The new path is usable, we are happy DI::config()->set("system", "spoolpath", $spoolpath); return $spoolpath; @@ -622,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; + } }