X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSystem.php;h=f1554834632b3fbcb764e336593b93b4ce4faaa8;hb=911ed3d6ba98149ed6d400d554e7a0e10bd1c273;hp=107303d6a6c6b3a6bf8f9b41562663e590f3073d;hpb=7560939d75c6bdc19f4179e0644373ddce0bf915;p=friendica.git

diff --git a/src/Core/System.php b/src/Core/System.php
index 107303d6a6..f155483463 100644
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -25,6 +25,7 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\DI;
+use Friendica\Model\User;
 use Friendica\Module\Response;
 use Friendica\Network\HTTPException\FoundException;
 use Friendica\Network\HTTPException\MovedPermanentlyException;
@@ -226,9 +227,10 @@ class System
 	 * @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
 	 * @return string
 	 */
-	public static function callstack(int $depth = 4, int $offset = 0): string
+	public static function callstack(int $depth = 4, int $offset = 0, bool $full = false): string
 	{
 		$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 
@@ -243,7 +245,7 @@ class System
 
 		while ($func = array_pop($trace)) {
 			if (!empty($func['class'])) {
-				if (in_array($previous['function'], ['insert', 'fetch', 'toArray', 'exists', 'count', 'selectFirst', 'selectToArray',
+				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')) {
 					continue;
@@ -251,7 +253,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 ($full || !$previous['database'] || !$func['database']) {
 					$classparts = explode("\\", $func['class']);
 					$callstack[] = array_pop($classparts).'::'.$func['function'] . (isset($func['line']) ? ' (' . $func['line'] . ')' : '');
 					$previous = $func;
@@ -321,7 +323,7 @@ class System
 	}
 
 	/**
-	 * This function adds the content and a content-teype HTTP header to the output.
+	 * This function adds the content and a content-type HTTP header to the output.
 	 * After finishing the process is getting killed.
 	 *
 	 * @param string $content
@@ -445,34 +447,28 @@ class System
 	 */
 	public static function getLoadAvg(bool $get_processes = true): array
 	{
+		$load_arr = sys_getloadavg();
+		if (empty($load_arr)) {
+			return [];
+		}
+
+		$load = [
+			'average1'  => $load_arr[0],
+			'average5'  => $load_arr[1],
+			'average15' => $load_arr[2],
+			'runnable'  => 0,
+			'scheduled' => 0
+		];
+
 		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['runnable']  = (float)$matches[4];
+				$load['scheduled'] = (float)$matches[5];
 			}
 		}
 
-		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]
-		];
+		return $load;
 	}
 
 	/**
@@ -529,19 +525,18 @@ class System
 	 * Checks if a given directory is usable for the system
 	 *
 	 * @param      $directory
-	 * @param bool $check_writable
 	 *
 	 * @return boolean the directory is usable
 	 */
-	private static function isDirectoryUsable($directory, $check_writable = true)
+	private static function isDirectoryUsable(string $directory): bool
 	{
-		if ($directory == '') {
+		if (empty($directory)) {
 			Logger::warning('Directory is empty. This shouldn\'t happen.');
 			return false;
 		}
 
 		if (!file_exists($directory)) {
-			Logger::warning('Path does not exist', ['directory' => $directory, 'user' => static::getUser()]);
+			Logger::info('Path does not exist', ['directory' => $directory, 'user' => static::getUser()]);
 			return false;
 		}
 
@@ -555,7 +550,7 @@ class System
 			return false;
 		}
 
-		if ($check_writable && !is_writable($directory)) {
+		if (!is_writable($directory)) {
 			Logger::warning('Path is not writable', ['directory' => $directory, 'user' => static::getUser()]);
 			return false;
 		}
@@ -607,7 +602,7 @@ class System
 			$new_temppath = $temppath . "/" . DI::baseUrl()->getHost();
 			if (!is_dir($new_temppath)) {
 				/// @TODO There is a mkdir()+chmod() upwards, maybe generalize this (+ configurable) into a function/method?
-				mkdir($new_temppath);
+				@mkdir($new_temppath);
 			}
 
 			if (self::isDirectoryUsable($new_temppath)) {
@@ -676,9 +671,7 @@ class System
 
 		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);
+			$msg = BBCode::toPlaintext($rulelist, false);
 			foreach (explode("\n", trim($msg)) as $line) {
 				$line = trim($line);
 				if ($line) {