X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSystem.php;h=f0ed08357359f5cc75f1d3a77652085e35ca657e;hb=f68b3c7c4ec9c7c98054035957db178d5071542c;hp=3bd06bc1919524e48c1c63fb0fdfab3244caa578;hpb=fb68b501395dad79f20777de0573e387f8f01820;p=friendica.git

diff --git a/src/Core/System.php b/src/Core/System.php
index 3bd06bc191..f0ed083573 100644
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -5,8 +5,6 @@
 namespace Friendica\Core;
 
 use Friendica\BaseObject;
-use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\XML;
 
@@ -27,6 +25,7 @@ class System extends BaseObject
 	 *
 	 * @param bool $ssl Whether to append http or https under SSL_POLICY_SELFSIGN
 	 * @return string Friendica server base URL
+	 * @throws InternalServerErrorException
 	 */
 	public static function baseUrl($ssl = false)
 	{
@@ -39,6 +38,7 @@ class System extends BaseObject
 	 * @param string $orig_url The url to be cleaned
 	 *
 	 * @return string The cleaned url
+	 * @throws \Exception
 	 */
 	public static function removedBaseUrl($orig_url)
 	{
@@ -59,7 +59,6 @@ class System extends BaseObject
 		array_shift($trace);
 
 		$callstack = [];
-		$counter = 0;
 		$previous = ['class' => '', 'function' => ''];
 
 		// The ignore list contains all functions that are only wrapper functions
@@ -92,6 +91,10 @@ class System extends BaseObject
 	 * Generic XML return
 	 * Outputs a basic dfrn XML status structure to STDOUT, with a <status> variable
 	 * of $st and an optional text <message> of $message and terminates the current process.
+	 *
+	 * @param        $st
+	 * @param string $message
+	 * @throws \Exception
 	 */
 	public static function xmlExit($st, $message = '')
 	{
@@ -111,7 +114,7 @@ class System extends BaseObject
 
 		echo XML::fromArray($xmldata, $xml);
 
-		killme();
+		exit();
 	}
 
 	/**
@@ -121,6 +124,7 @@ class System extends BaseObject
 	 * @param array   $description optional message
 	 *                             'title' => header title
 	 *                             'description' => optional message
+	 * @throws InternalServerErrorException
 	 */
 	public static function httpExit($val, $description = [])
 	{
@@ -185,27 +189,29 @@ class System extends BaseObject
 	public static function jsonExit($x, $content_type = 'application/json') {
 		header("Content-type: $content_type");
 		echo json_encode($x);
-		killme();
+		exit();
 	}
 
 	/**
 	 * Generates a random string in the UUID format
 	 *
-	 * @param bool|string  $prefix   A given prefix (default is empty)
+	 * @param bool|string $prefix A given prefix (default is empty)
 	 * @return string a generated UUID
+	 * @throws \Exception
 	 */
 	public static function createUUID($prefix = '')
 	{
 		$guid = System::createGUID(32, $prefix);
-		return substr($guid, 0, 8). '-' . substr($guid, 8, 4) . '-' . substr($guid, 12, 4) . '-' . substr($guid, 16, 4) . '-' . substr($guid, 20, 12);
+		return substr($guid, 0, 8) . '-' . substr($guid, 8, 4) . '-' . substr($guid, 12, 4) . '-' . substr($guid, 16, 4) . '-' . substr($guid, 20, 12);
 	}
 
 	/**
 	 * Generates a GUID with the given parameters
 	 *
-	 * @param int          $size     The size of the GUID (default is 16)
-	 * @param bool|string  $prefix   A given prefix (default is empty)
+	 * @param int         $size   The size of the GUID (default is 16)
+	 * @param bool|string $prefix A given prefix (default is empty)
 	 * @return string a generated GUID
+	 * @throws \Exception
 	 */
 	public static function createGUID($size = 16, $prefix = '')
 	{
@@ -280,6 +286,61 @@ class System extends BaseObject
 		exit();
 	}
 
+	/**
+	 * @brief Returns the system user that is executing the script
+	 *
+	 * This mostly returns something like "www-data".
+	 *
+	 * @return string system username
+	 */
+	public static function getUser()
+	{
+		if (!function_exists('posix_getpwuid') || !function_exists('posix_geteuid')) {
+			return '';
+		}
+
+		$processUser = posix_getpwuid(posix_geteuid());
+		return $processUser['name'];
+	}
+
+	/**
+	 * @brief Checks if a given directory is usable for the system
+	 *
+	 * @param      $directory
+	 * @param bool $check_writable
+	 *
+	 * @return boolean the directory is usable
+	 */
+	public static function isDirectoryUsable($directory, $check_writable = true)
+	{
+		if ($directory == '') {
+			Logger::log('Directory is empty. This shouldn\'t happen.', Logger::DEBUG);
+			return false;
+		}
+
+		if (!file_exists($directory)) {
+			Logger::log('Path "' . $directory . '" does not exist for user ' . static::getUser(), Logger::DEBUG);
+			return false;
+		}
+
+		if (is_file($directory)) {
+			Logger::log('Path "' . $directory . '" is a file for user ' . static::getUser(), Logger::DEBUG);
+			return false;
+		}
+
+		if (!is_dir($directory)) {
+			Logger::log('Path "' . $directory . '" is not a directory for user ' . static::getUser(), Logger::DEBUG);
+			return false;
+		}
+
+		if ($check_writable && !is_writable($directory)) {
+			Logger::log('Path "' . $directory . '" is not writable for user ' . static::getUser(), Logger::DEBUG);
+			return false;
+		}
+
+		return true;
+	}
+
 	/// @todo Move the following functions from boot.php
 	/*
 	function killme()