Fix receiving of reshared posts

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

diff --git a/src/Core/System.php b/src/Core/System.php
index 6f1bb618842a07e52c9c2ecf178a3d31338a5628..dbff4bf3f5cb5f5d21c2bd537a230b315c30bbfe 100644 (file)
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -369,7 +369,7 @@ class System
         */
        public static function exit()
        {
-               DI::page()->logRuntime(DI::config());
+               DI::page()->logRuntime(DI::config(), 'exit');
                exit();
        }
 
@@ -441,6 +441,12 @@ class System
         *
         * @param string $url  The new Location to redirect
         * @param int    $code The redirection code, which is used (Default is 302)
+        *
+        * @throws FoundException
+        * @throws MovedPermanentlyException
+        * @throws TemporaryRedirectException
+        *
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function externalRedirect($url, $code = 302)
        {
@@ -487,30 +493,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;
                }
 
@@ -544,7 +550,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);
                }
@@ -553,7 +559,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);
 
@@ -564,7 +570,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;
@@ -587,7 +593,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;
                }
@@ -602,7 +608,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;