grommunio / grommunio-web

plugins/files/php/Files/Core/Util/class.logger.php

Indentation +15 added lines, -15 removed lines

@@ -4,21 +4,21 @@
 
 // TODO: implement logging levels
 class Logger {
-	public static function log($context, $msg) {
-		if (PLUGIN_FILESBROWSER_LOGLEVEL === "DEBUG" || PLUGIN_FILESBROWSER_LOGLEVEL === "NORMAL") {
-			error_log("[INFO][{$context}] " . print_r($msg, true));
-		}
-	}
+    public static function log($context, $msg) {
+        if (PLUGIN_FILESBROWSER_LOGLEVEL === "DEBUG" || PLUGIN_FILESBROWSER_LOGLEVEL === "NORMAL") {
+            error_log("[INFO][{$context}] " . print_r($msg, true));
+        }
+    }
 
-	public static function error($context, $msg) {
-		if (PLUGIN_FILESBROWSER_LOGLEVEL === "ERROR" || PLUGIN_FILESBROWSER_LOGLEVEL === "DEBUG" || PLUGIN_FILESBROWSER_LOGLEVEL === "NORMAL") {
-			error_log("[ERROR][{$context}] " . print_r($msg, true));
-		}
-	}
+    public static function error($context, $msg) {
+        if (PLUGIN_FILESBROWSER_LOGLEVEL === "ERROR" || PLUGIN_FILESBROWSER_LOGLEVEL === "DEBUG" || PLUGIN_FILESBROWSER_LOGLEVEL === "NORMAL") {
+            error_log("[ERROR][{$context}] " . print_r($msg, true));
+        }
+    }
 
-	public static function debug($context, $msg) {
-		if (PLUGIN_FILESBROWSER_LOGLEVEL === "DEBUG") {
-			error_log("[DBG][{$context}] " . print_r($msg, true));
-		}
-	}
+    public static function debug($context, $msg) {
+        if (PLUGIN_FILESBROWSER_LOGLEVEL === "DEBUG") {
+            error_log("[DBG][{$context}] " . print_r($msg, true));
+        }
+    }
 }

plugins/files/php/Files/Core/Util/class.pathutil.php

Indentation +162 added lines, -162 removed lines

@@ -9,166 +9,166 @@
 namespace Files\Core\Util;
 
 class PathUtil {
-	/**
-	 * get_mime.
-	 *
-	 * Returns the mimetype for the specified file
-	 *
-	 * @static
-	 *
-	 * @param string $filename Filename to get the mime type from
-	 * @param int    $mode     0 = full check, 1 = extension check only
-	 *
-	 * @return string the found mimetype or 'application/octet-stream' as fallback
-	 */
-	public static function get_mime($filename, $mode = 0) {
-		// mode 0 = full check
-		// mode 1 = extension check only
-
-		$mime_types = [
-			'txt' => 'text/plain',
-			'htm' => 'text/html',
-			'html' => 'text/html',
-			'php' => 'text/html',
-			'css' => 'text/css',
-			'js' => 'application/javascript',
-			'json' => 'application/json',
-			'xml' => 'application/xml',
-			'swf' => 'application/x-shockwave-flash',
-			'flv' => 'video/x-flv',
-
-			// images
-			'png' => 'image/png',
-			'jpe' => 'image/jpeg',
-			'jpeg' => 'image/jpeg',
-			'jpg' => 'image/jpeg',
-			'gif' => 'image/gif',
-			'bmp' => 'image/bmp',
-			'ico' => 'image/vnd.microsoft.icon',
-			'tiff' => 'image/tiff',
-			'tif' => 'image/tiff',
-			'svg' => 'image/svg+xml',
-			'svgz' => 'image/svg+xml',
-
-			// archives
-			'zip' => 'application/zip',
-			'rar' => 'application/x-rar-compressed',
-			'exe' => 'application/x-msdownload',
-			'msi' => 'application/x-msdownload',
-			'cab' => 'application/vnd.ms-cab-compressed',
-
-			// audio/video
-			'mp3' => 'audio/mpeg',
-			'qt' => 'video/quicktime',
-			'mov' => 'video/quicktime',
-			'mp4' => 'video/mp4',
-			'webm' => 'video/webm',
-
-			// adobe
-			'pdf' => 'application/pdf',
-			'psd' => 'image/vnd.adobe.photoshop',
-			'ai' => 'application/postscript',
-			'eps' => 'application/postscript',
-			'ps' => 'application/postscript',
-
-			// ms office
-			'doc' => 'application/msword',
-			'rtf' => 'application/rtf',
-			'xls' => 'application/vnd.ms-excel',
-			'ppt' => 'application/vnd.ms-powerpoint',
-			'docx' => 'application/msword',
-			'xlsx' => 'application/vnd.ms-excel',
-			'pptx' => 'application/vnd.ms-powerpoint',
-
-			// open office
-			'odt' => 'application/vnd.oasis.opendocument.text',
-			'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
-			'odp' => 'application/vnd.oasis.opendocument.presentation',
-		];
-
-		$exploded = explode('.', $filename);
-		$last = array_pop($exploded);
-		$ext = strtolower($last);
-
-		if (function_exists('mime_content_type') && is_file($filename) && $mode == 0) {
-			return mime_content_type($filename);
-		}
-		if (function_exists('finfo_open') && is_file($filename) && $mode == 0) {
-			$finfo = finfo_open(FILEINFO_MIME);
-			$mimetype = finfo_file($finfo, $filename);
-			finfo_close($finfo);
-
-			return $mimetype;
-		}
-		if (array_key_exists($ext, $mime_types)) {
-			return $mime_types[$ext];
-		}
-
-		return 'application/octet-stream';
-	}
-
-	/**
-	 * Splits the filename from the given path.
-	 *
-	 * @static
-	 *
-	 * @param string $path a filesystem path, use / as path separator
-	 *
-	 * @return string the last part of the path, mostly this is the filename
-	 */
-	public static function getFilenameFromPath($path) {
-		$pathParts = explode('/', $path);
-
-		return end($pathParts);
-	}
-
-	/**
-	 * Splits the foldername/path from the given path.
-	 *
-	 * @static
-	 *
-	 * @param string $path
-	 *
-	 * @return string foldername
-	 */
-	public static function getFolderNameFromPath($path) {
-		$tmp = explode("/", $path);
-		array_pop($tmp);
-		$folder = implode("/", $tmp);
-
-		return $folder == "" ? "/" : $folder;
-	}
-
-	/**
-	 * creates a security file, which is checked before downloading a file.
-	 *
-	 * @static
-	 *
-	 * @param string secid A random id
-	 * @param mixed $basepath
-	 * @param mixed $secid
-	 */
-	public static function createSecIDFile($basepath, $secid) {
-		$lockFile = $basepath . DIRECTORY_SEPARATOR . "secid." . $secid;
-		$fh = fopen($lockFile, 'w') or exit("can't open secid file");
-		$stringData = date(DATE_RFC822);
-		fwrite($fh, $stringData);
-		fclose($fh);
-	}
-
-	/**
-	 * Sanitize a filename.
-	 * Currently removes all html tags
-	 * and replaces \, /, :, ", |, !, ?, <, > and *.
-	 *
-	 * @param string $string
-	 *
-	 * @return string
-	 */
-	public static function sanitizeFilename($string) {
-		$cleanerString = preg_replace('/[:\|\"!\*\?\\\\\/]+/i', '', $string);
-		$cleanerString = strip_tags($cleanerString);
-
-		return preg_replace('/[><]+/i', '', $cleanerString);
-	}
+    /**
+     * get_mime.
+     *
+     * Returns the mimetype for the specified file
+     *
+     * @static
+     *
+     * @param string $filename Filename to get the mime type from
+     * @param int    $mode     0 = full check, 1 = extension check only
+     *
+     * @return string the found mimetype or 'application/octet-stream' as fallback
+     */
+    public static function get_mime($filename, $mode = 0) {
+        // mode 0 = full check
+        // mode 1 = extension check only
+
+        $mime_types = [
+            'txt' => 'text/plain',
+            'htm' => 'text/html',
+            'html' => 'text/html',
+            'php' => 'text/html',
+            'css' => 'text/css',
+            'js' => 'application/javascript',
+            'json' => 'application/json',
+            'xml' => 'application/xml',
+            'swf' => 'application/x-shockwave-flash',
+            'flv' => 'video/x-flv',
+
+            // images
+            'png' => 'image/png',
+            'jpe' => 'image/jpeg',
+            'jpeg' => 'image/jpeg',
+            'jpg' => 'image/jpeg',
+            'gif' => 'image/gif',
+            'bmp' => 'image/bmp',
+            'ico' => 'image/vnd.microsoft.icon',
+            'tiff' => 'image/tiff',
+            'tif' => 'image/tiff',
+            'svg' => 'image/svg+xml',
+            'svgz' => 'image/svg+xml',
+
+            // archives
+            'zip' => 'application/zip',
+            'rar' => 'application/x-rar-compressed',
+            'exe' => 'application/x-msdownload',
+            'msi' => 'application/x-msdownload',
+            'cab' => 'application/vnd.ms-cab-compressed',
+
+            // audio/video
+            'mp3' => 'audio/mpeg',
+            'qt' => 'video/quicktime',
+            'mov' => 'video/quicktime',
+            'mp4' => 'video/mp4',
+            'webm' => 'video/webm',
+
+            // adobe
+            'pdf' => 'application/pdf',
+            'psd' => 'image/vnd.adobe.photoshop',
+            'ai' => 'application/postscript',
+            'eps' => 'application/postscript',
+            'ps' => 'application/postscript',
+
+            // ms office
+            'doc' => 'application/msword',
+            'rtf' => 'application/rtf',
+            'xls' => 'application/vnd.ms-excel',
+            'ppt' => 'application/vnd.ms-powerpoint',
+            'docx' => 'application/msword',
+            'xlsx' => 'application/vnd.ms-excel',
+            'pptx' => 'application/vnd.ms-powerpoint',
+
+            // open office
+            'odt' => 'application/vnd.oasis.opendocument.text',
+            'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+            'odp' => 'application/vnd.oasis.opendocument.presentation',
+        ];
+
+        $exploded = explode('.', $filename);
+        $last = array_pop($exploded);
+        $ext = strtolower($last);
+
+        if (function_exists('mime_content_type') && is_file($filename) && $mode == 0) {
+            return mime_content_type($filename);
+        }
+        if (function_exists('finfo_open') && is_file($filename) && $mode == 0) {
+            $finfo = finfo_open(FILEINFO_MIME);
+            $mimetype = finfo_file($finfo, $filename);
+            finfo_close($finfo);
+
+            return $mimetype;
+        }
+        if (array_key_exists($ext, $mime_types)) {
+            return $mime_types[$ext];
+        }
+
+        return 'application/octet-stream';
+    }
+
+    /**
+     * Splits the filename from the given path.
+     *
+     * @static
+     *
+     * @param string $path a filesystem path, use / as path separator
+     *
+     * @return string the last part of the path, mostly this is the filename
+     */
+    public static function getFilenameFromPath($path) {
+        $pathParts = explode('/', $path);
+
+        return end($pathParts);
+    }
+
+    /**
+     * Splits the foldername/path from the given path.
+     *
+     * @static
+     *
+     * @param string $path
+     *
+     * @return string foldername
+     */
+    public static function getFolderNameFromPath($path) {
+        $tmp = explode("/", $path);
+        array_pop($tmp);
+        $folder = implode("/", $tmp);
+
+        return $folder == "" ? "/" : $folder;
+    }
+
+    /**
+     * creates a security file, which is checked before downloading a file.
+     *
+     * @static
+     *
+     * @param string secid A random id
+     * @param mixed $basepath
+     * @param mixed $secid
+     */
+    public static function createSecIDFile($basepath, $secid) {
+        $lockFile = $basepath . DIRECTORY_SEPARATOR . "secid." . $secid;
+        $fh = fopen($lockFile, 'w') or exit("can't open secid file");
+        $stringData = date(DATE_RFC822);
+        fwrite($fh, $stringData);
+        fclose($fh);
+    }
+
+    /**
+     * Sanitize a filename.
+     * Currently removes all html tags
+     * and replaces \, /, :, ", |, !, ?, <, > and *.
+     *
+     * @param string $string
+     *
+     * @return string
+     */
+    public static function sanitizeFilename($string) {
+        $cleanerString = preg_replace('/[:\|\"!\*\?\\\\\/]+/i', '', $string);
+        $cleanerString = strip_tags($cleanerString);
+
+        return preg_replace('/[><]+/i', '', $cleanerString);
+    }
 }

plugins/files/php/Files/Core/Util/util.php

Indentation +1 added lines, -1 removed lines

@@ -11,5 +11,5 @@
 //	if (!mb_detect_encoding($str, "UTF-8", true)) {
 //		$str = utf8_encode($str);
 //	}
-	return $str;
+    return $str;
 }

plugins/files/php/Files/Core/class.accountstore.php

Indentation +365 added lines, -365 removed lines

@@ -17,369 +17,369 @@
 use Files\Core\Util\Logger;
 
 class AccountStore {
-	public const LOG_CONTEXT = "AccountStore"; // Context for the Logger
-	public const ACCOUNT_STORAGE_PATH = "zarafa/v1/plugins/files/accounts";
-	public const ACCOUNT_VERSION = 1;
-
-	/**
-	 * @var Account[] Account array
-	 */
-	private $accounts = [];
-
-	public function __construct() {
-		$this->initialiseAccounts();
-	}
-
-	/**
-	 * @param $name
-	 * @param $backend
-	 * @param array $backendConfig Backend specific account settings
-	 *                             like username, password, serveraddress, ...
-	 *
-	 * @return Account
-	 */
-	public function createAccount($name, $backend, $backendConfig) {
-		$newID = $this->createNewId($backendConfig); // create id out of the configuration
-
-		// create instance of backend to get features
-		$backendStore = BackendStore::getInstance();
-		$backendInstance = $backendStore->getInstanceOfBackend($backend);
-		$features = $backendInstance->getAvailableFeatures();
-
-		// check backend_config for validity
-		$status = $this->checkBackendConfig($backendInstance, $backendConfig);
-
-		// get sequence number
-		$sequence = $this->getNewSequenceNumber();
-
-		$newAccount = new Account($newID, strip_tags($name), $status[0], $status[1], strip_tags($backend), $backendConfig, $features, $sequence, false);
-
-		// now store all the values to the user settings
-		$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/id", $newAccount->getId());
-		$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/name", $newAccount->getName());
-		$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/status", $newAccount->getStatus());
-		$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/status_description", $newAccount->getStatusDescription());
-		$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/backend", $newAccount->getBackend());
-		$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/account_sequence", $newAccount->getSequence());
-		// User defined accounts are never administrative. So set cannot_change to false.
-		$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/cannot_change", false);
-		$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/backend_config/version", self::ACCOUNT_VERSION);
-		// store all backend configurations
-		foreach ($newAccount->getBackendConfig() as $key => $value) {
-			if ($key !== "version") {
-				$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/backend_config/" . $key, $this->encryptBackendConfigProperty($value, self::ACCOUNT_VERSION));
-			}
-		}
-
-		// store all features
-		foreach ($newAccount->getFeatures() as $feature) {
-			$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/backend_features/" . $feature, true);
-		}
-
-		$GLOBALS["settings"]->saveSettings(); // save to MAPI storage
-
-		// add account to our local store after it was saved to the zarafa-settings
-		$this->accounts[$newID] = $newAccount;
-
-		return $newAccount;
-	}
-
-	/**
-	 * @param Account $account
-	 *
-	 * @return Account
-	 */
-	public function updateAccount($account) {
-		$accId = $account->getId();
-		$isAdministrativeAccount = $account->getCannotChangeFlag();
-
-		// create instance of backend to get features
-		$backendStore = BackendStore::getInstance();
-		$backendInstance = $backendStore->getInstanceOfBackend($account->getBackend());
-		$features = $backendInstance->getAvailableFeatures();
-		$account->setFeatures($features);
-
-		// check backend_config for validity
-		$status = $this->checkBackendConfig($backendInstance, $account->getBackendConfig());
-		$account->setStatus($status[0]); // update status
-		$account->setStatusDescription($status[1]); // update status description
-
-		// add account to local store
-		$this->accounts[$accId] = $account;
-
-		// save values to MAPI settings
-		// now store all the values to the user settings
-		// but if we have an administrative account only save the account sequence
-		if (!$isAdministrativeAccount) {
-			$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $accId . "/name", $account->getName());
-			$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $accId . "/status", $account->getStatus());
-			$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $accId . "/status_description", $account->getStatusDescription());
-			$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $accId . "/backend", $account->getBackend());
-
-			$acc = $account->getBackendConfig();
-			$version = 0;
-			if (isset($acc["version"])) {
-				$version = $acc["version"];
-			}
-
-			// Unable to decrypt, don't update
-			if ($version == 0 && !defined('FILES_PASSWORD_IV') && !defined('FILES_PASSWORD_KEY')) {
-				Logger::error(self::LOG_CONTEXT, "Unable to update the account to as FILES_PASSWORD_IV/FILES_PASSWORD_KEY is not set");
-			}
-			else {
-				// store all backend configurations
-				foreach ($account->getBackendConfig() as $key => $value) {
-					if ($key !== "version") {
-						$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $accId . "/backend_config/" . $key, $this->encryptBackendConfigProperty($value, self::ACCOUNT_VERSION));
-					}
-				}
-
-				$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $accId . "/backend_config/version", self::ACCOUNT_VERSION);
-			}
-
-			// store all features
-			foreach ($account->getFeatures() as $feature) {
-				$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $accId . "/backend_features/" . $feature, true);
-			}
-		}
-		// when getSequence returns 0, there is no account_sequence setting yet. So create one.
-		$account_sequence = ($account->getSequence() === 0 ? $this->getNewSequenceNumber() : $account->getSequence());
-		$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $accId . "/account_sequence", $account_sequence);
-
-		$GLOBALS["settings"]->saveSettings(); // save to MAPI storage
-
-		return $account;
-	}
-
-	/**
-	 * Delete account from local store and from the MAPI settings.
-	 *
-	 * @param $accountId
-	 *
-	 * @return bool
-	 */
-	public function deleteAccount($accountId) {
-		$account = $this->getAccount($accountId);
-		// Do not allow deleting administrative accounts, but fail silently.
-		if (!$account->getCannotChangeFlag()) {
-			$GLOBALS["settings"]->delete(self::ACCOUNT_STORAGE_PATH . "/" . $accountId);
-			$GLOBALS["settings"]->saveSettings(); // save to MAPI storage
-		}
-
-		return true;
-	}
-
-	/**
-	 * Return the instance of the local account.
-	 *
-	 * @param $accountId
-	 *
-	 * @return Account
-	 */
-	public function getAccount($accountId) {
-		return $this->accounts[$accountId];
-	}
-
-	/**
-	 * @return Account[] all Accounts
-	 */
-	public function getAllAccounts() {
-		return $this->accounts;
-	}
-
-	/**
-	 * Initialize the accountstore. Reads all accountinformation from the MAPI settings.
-	 */
-	private function initialiseAccounts() {
-		// Parse accounts from the Settings
-		$tmpAccs = $GLOBALS["settings"]->get(self::ACCOUNT_STORAGE_PATH);
-
-		if (is_array($tmpAccs)) {
-			$this->accounts = [];
-
-			foreach ($tmpAccs as $acc) {
-				// set backend_features if it is not set to prevent warning
-				if (!isset($acc["backend_features"])) {
-					$acc["backend_features"] = [];
-				}
-				// account_sequence was introduced later. So set and save it if missing.
-				if (!isset($acc["account_sequence"])) {
-					$acc["account_sequence"] = $this->getNewSequenceNumber();
-					Logger::debug(self::LOG_CONTEXT, "Account sequence missing. New seq: " . $acc["account_sequence"]);
-					$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $acc["id"] . "/account_sequence", $acc["account_sequence"]);
-					$GLOBALS["settings"]->saveSettings();
-				}
-				// cannot_change flag was introduced later. So set it to false and save it if missing.
-				if (!isset($acc["cannot_change"])) {
-					$acc["cannot_change"] = false;
-					Logger::debug(self::LOG_CONTEXT, "Cannot change flag missing. Setting to false.");
-					$GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $acc["id"] . "/cannot_change", false);
-					$GLOBALS["settings"]->saveSettings();
-				}
-
-				$backend_config = $acc["backend_config"];
-				$version = 0;
-
-				if (isset($acc["backend_config"], $acc["backend_config"]["version"])) {
-					$version = $acc["backend_config"]["version"];
-				}
-
-				if (($version === 0 && defined('FILES_PASSWORD_IV') && defined('FILES_PASSWORD_KEY')) || $version === self::ACCOUNT_VERSION) {
-					$backend_config = $this->decryptBackendConfig($acc["backend_config"], $version);
-					// version is lost after decryption, add it again
-					$backend_config["version"] = $version;
-				}
-				elseif ($version === 0) {
-					Logger::error(self::LOG_CONTEXT, "FILES_PASSWORD_IV or FILES_PASSWORD_KEY not set, unable to decrypt backend configuration");
-				}
-				else {
-					Logger::error(self::LOG_CONTEXT, "Unsupported account version {$version}, unable to decrypt backend configuration");
-				}
-
-				$this->accounts[$acc["id"]] = new Account(
-					$acc["id"],
-					$acc["name"],
-					$acc["status"],
-					$acc["status_description"],
-					$acc["backend"],
-					$backend_config,
-					array_keys($acc["backend_features"]),
-					$acc["account_sequence"],
-					$acc["cannot_change"]
-				);
-			}
-		}
-		Logger::debug(self::LOG_CONTEXT, "Found " . count($this->accounts) . " accounts.");
-	}
-
-	/**
-	 * @param AbstractBackend $backendInstance
-	 * @param array           $backendConfig   Backend specific account settings
-	 *                                         like username, password, serveraddress, ...
-	 *
-	 * @return array
-	 */
-	private function checkBackendConfig($backendInstance, $backendConfig) {
-		$status = Account::STATUS_NEW;
-		$description = _('Account is ready to use.');
-
-		try {
-			$backendInstance->init_backend($backendConfig);
-			$backendInstance->open();
-			$backendInstance->ls("/");
-			$status = Account::STATUS_OK;
-		}
-		catch (BackendException $e) {
-			$status = Account::STATUS_ERROR;
-			$description = $e->getMessage();
-
-			Logger::error(self::LOG_CONTEXT, "Account check failed: " . $description);
-		}
-
-		return [$status, $description];
-	}
-
-	/**
-	 * @param array $backendConfig Backend specific account settings
-	 *                             like username, password, serveraddress, ...
-	 *
-	 * @return an unique id
-	 */
-	private function createNewId($backendConfig) {
-		// lets create a hash
-		return md5(json_encode($backendConfig) . time()); // json_encode is faster than serialize
-	}
-
-	/**
-	 * Generate a new sequence number. It will always be the highest used sequence number +1.
-	 *
-	 * @return int
-	 */
-	private function getNewSequenceNumber() {
-		$seq = 0;
-		foreach ($this->accounts as $acc) {
-			if ($acc->getSequence() > $seq) {
-				$seq = $acc->getSequence();
-			}
-		}
-
-		return $seq + 1;
-	}
-
-	/**
-	 * Decrypt the backend configuration using the standard grommunio Web key.
-	 *
-	 * @param array $backendConfig Backend specific account settings
-	 *                             like username, password, serveraddress, ...
-	 * @param mixed $version
-	 *
-	 * @return array
-	 */
-	private function decryptBackendConfig($backendConfig, $version = 0) {
-		$decBackendConfig = [];
-
-		foreach ($backendConfig as $key => $value) {
-			if ($key !== "version") {
-				try {
-					$decBackendConfig[$key] = $this->decryptBackendConfigProperty($value, $version);
-				}
-				catch (Exception $e) {
-					Logger::error(self::LOG_CONTEXT, sprintf("Unable to decrypt backend configuration: '%s'", $e->getMessage()));
-				}
-			}
-		}
-
-		return $decBackendConfig;
-	}
-
-	/**
-	 * Encrypt the given string.
-	 *
-	 * @param $value
-	 * @param $version the storage version used to identify what encryption to use
-	 *
-	 * @return string
-	 */
-	private function encryptBackendConfigProperty($value, $version = 0) {
-		if ($version == self::ACCOUNT_VERSION && !is_bool($value)) {
-			$nonce = random_bytes(SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
-			$key = $GLOBALS["operations"]->getFilesEncryptionKey();
-			$encrypted = sodium_crypto_secretbox($value, $nonce, $key);
-			$value = bin2hex($nonce) . bin2hex($encrypted);
-		}
-		elseif ($version !== self::ACCOUNT_VERSION) {
-			throw Exception("Unable to encrypt backend configuration unsupported version {$version}");
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Decrypt the given string.
-	 *
-	 * @param $value
-	 * @param $version the storage version used to identify what encryption to use
-	 *
-	 * @return string
-	 */
-	private function decryptBackendConfigProperty($value, $version = 0) {
-		if (is_bool($value)) {
-			return $value;
-		}
-
-		if ($version == self::ACCOUNT_VERSION) {
-			$value = hex2bin($value);
-			$nonce = substr($value, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
-			$encrypted = substr($value, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, strlen($value));
-			$key = $GLOBALS["operations"]->getFilesEncryptionKey();
-			$value = sodium_crypto_secretbox_open($encrypted, $nonce, $key);
-
-			// Decryption failed, password might have changed
-			if ($value === false) {
-				throw new Exception("invalid password");
-			}
-		}
-
-		return $value;
-	}
+    public const LOG_CONTEXT = "AccountStore"; // Context for the Logger
+    public const ACCOUNT_STORAGE_PATH = "zarafa/v1/plugins/files/accounts";
+    public const ACCOUNT_VERSION = 1;
+
+    /**
+     * @var Account[] Account array
+     */
+    private $accounts = [];
+
+    public function __construct() {
+        $this->initialiseAccounts();
+    }
+
+    /**
+     * @param $name
+     * @param $backend
+     * @param array $backendConfig Backend specific account settings
+     *                             like username, password, serveraddress, ...
+     *
+     * @return Account
+     */
+    public function createAccount($name, $backend, $backendConfig) {
+        $newID = $this->createNewId($backendConfig); // create id out of the configuration
+
+        // create instance of backend to get features
+        $backendStore = BackendStore::getInstance();
+        $backendInstance = $backendStore->getInstanceOfBackend($backend);
+        $features = $backendInstance->getAvailableFeatures();
+
+        // check backend_config for validity
+        $status = $this->checkBackendConfig($backendInstance, $backendConfig);
+
+        // get sequence number
+        $sequence = $this->getNewSequenceNumber();
+
+        $newAccount = new Account($newID, strip_tags($name), $status[0], $status[1], strip_tags($backend), $backendConfig, $features, $sequence, false);
+
+        // now store all the values to the user settings
+        $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/id", $newAccount->getId());
+        $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/name", $newAccount->getName());
+        $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/status", $newAccount->getStatus());
+        $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/status_description", $newAccount->getStatusDescription());
+        $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/backend", $newAccount->getBackend());
+        $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/account_sequence", $newAccount->getSequence());
+        // User defined accounts are never administrative. So set cannot_change to false.
+        $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/cannot_change", false);
+        $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/backend_config/version", self::ACCOUNT_VERSION);
+        // store all backend configurations
+        foreach ($newAccount->getBackendConfig() as $key => $value) {
+            if ($key !== "version") {
+                $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/backend_config/" . $key, $this->encryptBackendConfigProperty($value, self::ACCOUNT_VERSION));
+            }
+        }
+
+        // store all features
+        foreach ($newAccount->getFeatures() as $feature) {
+            $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $newID . "/backend_features/" . $feature, true);
+        }
+
+        $GLOBALS["settings"]->saveSettings(); // save to MAPI storage
+
+        // add account to our local store after it was saved to the zarafa-settings
+        $this->accounts[$newID] = $newAccount;
+
+        return $newAccount;
+    }
+
+    /**
+     * @param Account $account
+     *
+     * @return Account
+     */
+    public function updateAccount($account) {
+        $accId = $account->getId();
+        $isAdministrativeAccount = $account->getCannotChangeFlag();
+
+        // create instance of backend to get features
+        $backendStore = BackendStore::getInstance();
+        $backendInstance = $backendStore->getInstanceOfBackend($account->getBackend());
+        $features = $backendInstance->getAvailableFeatures();
+        $account->setFeatures($features);
+
+        // check backend_config for validity
+        $status = $this->checkBackendConfig($backendInstance, $account->getBackendConfig());
+        $account->setStatus($status[0]); // update status
+        $account->setStatusDescription($status[1]); // update status description
+
+        // add account to local store
+        $this->accounts[$accId] = $account;
+
+        // save values to MAPI settings
+        // now store all the values to the user settings
+        // but if we have an administrative account only save the account sequence
+        if (!$isAdministrativeAccount) {
+            $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $accId . "/name", $account->getName());
+            $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $accId . "/status", $account->getStatus());
+            $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $accId . "/status_description", $account->getStatusDescription());
+            $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $accId . "/backend", $account->getBackend());
+
+            $acc = $account->getBackendConfig();
+            $version = 0;
+            if (isset($acc["version"])) {
+                $version = $acc["version"];
+            }
+
+            // Unable to decrypt, don't update
+            if ($version == 0 && !defined('FILES_PASSWORD_IV') && !defined('FILES_PASSWORD_KEY')) {
+                Logger::error(self::LOG_CONTEXT, "Unable to update the account to as FILES_PASSWORD_IV/FILES_PASSWORD_KEY is not set");
+            }
+            else {
+                // store all backend configurations
+                foreach ($account->getBackendConfig() as $key => $value) {
+                    if ($key !== "version") {
+                        $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $accId . "/backend_config/" . $key, $this->encryptBackendConfigProperty($value, self::ACCOUNT_VERSION));
+                    }
+                }
+
+                $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $accId . "/backend_config/version", self::ACCOUNT_VERSION);
+            }
+
+            // store all features
+            foreach ($account->getFeatures() as $feature) {
+                $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $accId . "/backend_features/" . $feature, true);
+            }
+        }
+        // when getSequence returns 0, there is no account_sequence setting yet. So create one.
+        $account_sequence = ($account->getSequence() === 0 ? $this->getNewSequenceNumber() : $account->getSequence());
+        $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $accId . "/account_sequence", $account_sequence);
+
+        $GLOBALS["settings"]->saveSettings(); // save to MAPI storage
+
+        return $account;
+    }
+
+    /**
+     * Delete account from local store and from the MAPI settings.
+     *
+     * @param $accountId
+     *
+     * @return bool
+     */
+    public function deleteAccount($accountId) {
+        $account = $this->getAccount($accountId);
+        // Do not allow deleting administrative accounts, but fail silently.
+        if (!$account->getCannotChangeFlag()) {
+            $GLOBALS["settings"]->delete(self::ACCOUNT_STORAGE_PATH . "/" . $accountId);
+            $GLOBALS["settings"]->saveSettings(); // save to MAPI storage
+        }
+
+        return true;
+    }
+
+    /**
+     * Return the instance of the local account.
+     *
+     * @param $accountId
+     *
+     * @return Account
+     */
+    public function getAccount($accountId) {
+        return $this->accounts[$accountId];
+    }
+
+    /**
+     * @return Account[] all Accounts
+     */
+    public function getAllAccounts() {
+        return $this->accounts;
+    }
+
+    /**
+     * Initialize the accountstore. Reads all accountinformation from the MAPI settings.
+     */
+    private function initialiseAccounts() {
+        // Parse accounts from the Settings
+        $tmpAccs = $GLOBALS["settings"]->get(self::ACCOUNT_STORAGE_PATH);
+
+        if (is_array($tmpAccs)) {
+            $this->accounts = [];
+
+            foreach ($tmpAccs as $acc) {
+                // set backend_features if it is not set to prevent warning
+                if (!isset($acc["backend_features"])) {
+                    $acc["backend_features"] = [];
+                }
+                // account_sequence was introduced later. So set and save it if missing.
+                if (!isset($acc["account_sequence"])) {
+                    $acc["account_sequence"] = $this->getNewSequenceNumber();
+                    Logger::debug(self::LOG_CONTEXT, "Account sequence missing. New seq: " . $acc["account_sequence"]);
+                    $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $acc["id"] . "/account_sequence", $acc["account_sequence"]);
+                    $GLOBALS["settings"]->saveSettings();
+                }
+                // cannot_change flag was introduced later. So set it to false and save it if missing.
+                if (!isset($acc["cannot_change"])) {
+                    $acc["cannot_change"] = false;
+                    Logger::debug(self::LOG_CONTEXT, "Cannot change flag missing. Setting to false.");
+                    $GLOBALS["settings"]->set(self::ACCOUNT_STORAGE_PATH . "/" . $acc["id"] . "/cannot_change", false);
+                    $GLOBALS["settings"]->saveSettings();
+                }
+
+                $backend_config = $acc["backend_config"];
+                $version = 0;
+
+                if (isset($acc["backend_config"], $acc["backend_config"]["version"])) {
+                    $version = $acc["backend_config"]["version"];
+                }
+
+                if (($version === 0 && defined('FILES_PASSWORD_IV') && defined('FILES_PASSWORD_KEY')) || $version === self::ACCOUNT_VERSION) {
+                    $backend_config = $this->decryptBackendConfig($acc["backend_config"], $version);
+                    // version is lost after decryption, add it again
+                    $backend_config["version"] = $version;
+                }
+                elseif ($version === 0) {
+                    Logger::error(self::LOG_CONTEXT, "FILES_PASSWORD_IV or FILES_PASSWORD_KEY not set, unable to decrypt backend configuration");
+                }
+                else {
+                    Logger::error(self::LOG_CONTEXT, "Unsupported account version {$version}, unable to decrypt backend configuration");
+                }
+
+                $this->accounts[$acc["id"]] = new Account(
+                    $acc["id"],
+                    $acc["name"],
+                    $acc["status"],
+                    $acc["status_description"],
+                    $acc["backend"],
+                    $backend_config,
+                    array_keys($acc["backend_features"]),
+                    $acc["account_sequence"],
+                    $acc["cannot_change"]
+                );
+            }
+        }
+        Logger::debug(self::LOG_CONTEXT, "Found " . count($this->accounts) . " accounts.");
+    }
+
+    /**
+     * @param AbstractBackend $backendInstance
+     * @param array           $backendConfig   Backend specific account settings
+     *                                         like username, password, serveraddress, ...
+     *
+     * @return array
+     */
+    private function checkBackendConfig($backendInstance, $backendConfig) {
+        $status = Account::STATUS_NEW;
+        $description = _('Account is ready to use.');
+
+        try {
+            $backendInstance->init_backend($backendConfig);
+            $backendInstance->open();
+            $backendInstance->ls("/");
+            $status = Account::STATUS_OK;
+        }
+        catch (BackendException $e) {
+            $status = Account::STATUS_ERROR;
+            $description = $e->getMessage();
+
+            Logger::error(self::LOG_CONTEXT, "Account check failed: " . $description);
+        }
+
+        return [$status, $description];
+    }
+
+    /**
+     * @param array $backendConfig Backend specific account settings
+     *                             like username, password, serveraddress, ...
+     *
+     * @return an unique id
+     */
+    private function createNewId($backendConfig) {
+        // lets create a hash
+        return md5(json_encode($backendConfig) . time()); // json_encode is faster than serialize
+    }
+
+    /**
+     * Generate a new sequence number. It will always be the highest used sequence number +1.
+     *
+     * @return int
+     */
+    private function getNewSequenceNumber() {
+        $seq = 0;
+        foreach ($this->accounts as $acc) {
+            if ($acc->getSequence() > $seq) {
+                $seq = $acc->getSequence();
+            }
+        }
+
+        return $seq + 1;
+    }
+
+    /**
+     * Decrypt the backend configuration using the standard grommunio Web key.
+     *
+     * @param array $backendConfig Backend specific account settings
+     *                             like username, password, serveraddress, ...
+     * @param mixed $version
+     *
+     * @return array
+     */
+    private function decryptBackendConfig($backendConfig, $version = 0) {
+        $decBackendConfig = [];
+
+        foreach ($backendConfig as $key => $value) {
+            if ($key !== "version") {
+                try {
+                    $decBackendConfig[$key] = $this->decryptBackendConfigProperty($value, $version);
+                }
+                catch (Exception $e) {
+                    Logger::error(self::LOG_CONTEXT, sprintf("Unable to decrypt backend configuration: '%s'", $e->getMessage()));
+                }
+            }
+        }
+
+        return $decBackendConfig;
+    }
+
+    /**
+     * Encrypt the given string.
+     *
+     * @param $value
+     * @param $version the storage version used to identify what encryption to use
+     *
+     * @return string
+     */
+    private function encryptBackendConfigProperty($value, $version = 0) {
+        if ($version == self::ACCOUNT_VERSION && !is_bool($value)) {
+            $nonce = random_bytes(SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
+            $key = $GLOBALS["operations"]->getFilesEncryptionKey();
+            $encrypted = sodium_crypto_secretbox($value, $nonce, $key);
+            $value = bin2hex($nonce) . bin2hex($encrypted);
+        }
+        elseif ($version !== self::ACCOUNT_VERSION) {
+            throw Exception("Unable to encrypt backend configuration unsupported version {$version}");
+        }
+
+        return $value;
+    }
+
+    /**
+     * Decrypt the given string.
+     *
+     * @param $value
+     * @param $version the storage version used to identify what encryption to use
+     *
+     * @return string
+     */
+    private function decryptBackendConfigProperty($value, $version = 0) {
+        if (is_bool($value)) {
+            return $value;
+        }
+
+        if ($version == self::ACCOUNT_VERSION) {
+            $value = hex2bin($value);
+            $nonce = substr($value, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
+            $encrypted = substr($value, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, strlen($value));
+            $key = $GLOBALS["operations"]->getFilesEncryptionKey();
+            $value = sodium_crypto_secretbox_open($encrypted, $nonce, $key);
+
+            // Decryption failed, password might have changed
+            if ($value === false) {
+                throw new Exception("invalid password");
+            }
+        }
+
+        return $value;
+    }
 }

Braces +6 added lines, -12 removed lines

@@ -125,8 +125,7 @@ 
 			// Unable to decrypt, don't update
 			if ($version == 0 && !defined('FILES_PASSWORD_IV') && !defined('FILES_PASSWORD_KEY')) {
 				Logger::error(self::LOG_CONTEXT, "Unable to update the account to as FILES_PASSWORD_IV/FILES_PASSWORD_KEY is not set");
-			}
-			else {
+			} else {
 				// store all backend configurations
 				foreach ($account->getBackendConfig() as $key => $value) {
 					if ($key !== "version") {
@@ -228,11 +227,9 @@ 
 					$backend_config = $this->decryptBackendConfig($acc["backend_config"], $version);
 					// version is lost after decryption, add it again
 					$backend_config["version"] = $version;
-				}
-				elseif ($version === 0) {
+				} elseif ($version === 0) {
 					Logger::error(self::LOG_CONTEXT, "FILES_PASSWORD_IV or FILES_PASSWORD_KEY not set, unable to decrypt backend configuration");
-				}
-				else {
+				} else {
 					Logger::error(self::LOG_CONTEXT, "Unsupported account version {$version}, unable to decrypt backend configuration");
 				}
 
@@ -268,8 +265,7 @@ 
 			$backendInstance->open();
 			$backendInstance->ls("/");
 			$status = Account::STATUS_OK;
-		}
-		catch (BackendException $e) {
+		} catch (BackendException $e) {
 			$status = Account::STATUS_ERROR;
 			$description = $e->getMessage();
 
@@ -322,8 +318,7 @@ 
 			if ($key !== "version") {
 				try {
 					$decBackendConfig[$key] = $this->decryptBackendConfigProperty($value, $version);
-				}
-				catch (Exception $e) {
+				} catch (Exception $e) {
 					Logger::error(self::LOG_CONTEXT, sprintf("Unable to decrypt backend configuration: '%s'", $e->getMessage()));
 				}
 			}
@@ -346,8 +341,7 @@ 
 			$key = $GLOBALS["operations"]->getFilesEncryptionKey();
 			$encrypted = sodium_crypto_secretbox($value, $nonce, $key);
 			$value = bin2hex($nonce) . bin2hex($encrypted);
-		}
-		elseif ($version !== self::ACCOUNT_VERSION) {
+		} elseif ($version !== self::ACCOUNT_VERSION) {
 			throw Exception("Unable to encrypt backend configuration unsupported version {$version}");
 		}
 

plugins/files/php/Files/Core/class.uploadhandler.php

Indentation +167 added lines, -167 removed lines

@@ -17,171 +17,171 @@
 use Files\Core\Util\Logger;
 
 class UploadHandler {
-	public const LOG_CONTEXT = "UploadHandler"; // Context for the Logger
-
-	public static function doUpload() {
-		// parse account id.
-		if (isset($_POST["parentID"])) { // will be set if a standard upload is used.
-			$dstID = $_POST["parentID"];
-		}
-		else {
-			if (isset($_SERVER['HTTP_X_FILE_DESTINATION'])) { // will be set if the upload is a ajax upload.
-				$dstID = $_SERVER['HTTP_X_FILE_DESTINATION'];
-			}
-			else {
-				Logger::error(self::LOG_CONTEXT, "upload failed: No destination given");
-				echo json_encode(['success' => false, 'response' => 'No destination given', 'message' => 'No destination given']);
-
-				exit();
-			}
-		}
-
-		$accountID = substr($dstID, 3, (strpos($dstID, '/') - 3));
-
-		// relative node ID. We need to trim off the #R# and account ID
-		$relNodeId = substr($dstID, strpos($dstID, '/'));
-
-		// Initialize the account and backendstore
-		$accountStore = new \Files\Core\AccountStore();
-		$backendStore = \Files\Backend\BackendStore::getInstance();
-
-		$account = $accountStore->getAccount($accountID);
-
-		// initialize the backend
-		$initializedBackend = $backendStore->getInstanceOfBackend($account->getBackend());
-		$initializedBackend->init_backend($account->getBackendConfig());
-
-		try {
-			$initializedBackend->open();
-		}
-		catch (\Files\Backend\Exception $e) {
-			Logger::error(self::LOG_CONTEXT, "backend initialization failed: " . $e->getMessage());
-			echo json_encode(['success' => false, 'response' => $e->getCode(), 'message' => $e->getMessage()]);
-
-			exit();
-		}
-
-		// check if we are getting the file via the "new" method (ajax - XMLHttpRequest) or the standard way
-		if (isset($_SERVER['HTTP_X_FILE_NAME'], $_SERVER['HTTP_X_FILE_SIZE'])) { // use the ajax method
-			$targetPath = stringToUTF8Encode($relNodeId . $_SERVER['HTTP_X_FILE_NAME']);
-			// check if backend supports streaming - this is the preferred way to upload files!
-			if ($initializedBackend->supports(\Files\Backend\BackendStore::FEATURE_STREAMING)) {
-				$fileReader = fopen('php://input', "r");
-				$targetPath = UploadHandler::checkFilesNameConflict($targetPath, $initializedBackend, $relNodeId);
-				$fileWriter = $initializedBackend->getStreamwriter($targetPath);
-
-				while (true) {
-					set_time_limit(0);
-					$buffer = fgets($fileReader, 4096);
-					if (strlen($buffer) == 0) {
-						fclose($fileReader);
-						fclose($fileWriter);
-						break;
-					}
-
-					fwrite($fileWriter, $buffer);
-				}
-			}
-			else { // fallback to tmp files
-				$targetPath = UploadHandler::checkFilesNameConflict($targetPath, $initializedBackend, $relNodeId);
-				$targetPath = rawurldecode($targetPath);
-				$temp_file = tempnam(TMP_PATH, "{$targetPath}");
-				$fileReader = fopen('php://input', "r");
-				$fileWriter = fopen($temp_file, "w");
-
-				// store post data to tmp file
-				while (true) {
-					set_time_limit(0);
-					$buffer = fgets($fileReader, 4096);
-					if (strlen($buffer) == 0) {
-						fclose($fileReader);
-						fclose($fileWriter);
-						break;
-					}
-
-					fwrite($fileWriter, $buffer);
-				}
-
-				// upload tmp file to backend
-				$initializedBackend->put_file($targetPath, $temp_file);
-				// clean up tmp file
-				unlink($temp_file);
-			}
-			echo json_encode(['success' => true, 'parent' => $dstID, 'item' => $targetPath]);
-
-			exit();
-		}   // upload the standard way with $_FILES
-		$items = [];
-
-		try {
-			for ($i = 0; $i < count($_FILES['attachments']['name']); ++$i) {
-				$targetPath = stringToUTF8Encode($relNodeId . $_FILES['attachments']['name'][$i]);
-
-				// upload the file
-				// check if backend supports streaming - this is the preferred way to upload files!
-				if ($initializedBackend->supports(\Files\Backend\BackendStore::FEATURE_STREAMING)) {
-					$fileReader = fopen($_FILES['attachments']['tmp_name'][$i], "r");
-					$fileWriter = $initializedBackend->getStreamwriter($targetPath);
-
-					while (true) {
-						set_time_limit(0);
-						$buffer = fgets($fileReader, 4096);
-						if (strlen($buffer) == 0) {
-							fclose($fileReader);
-							fclose($fileWriter);
-							break;
-						}
-
-						fwrite($fileWriter, $buffer);
-					}
-				}
-				else { // use the normal way - might have a high memory footprint
-					$initializedBackend->put_file($targetPath, $_FILES['attachments']['tmp_name'][$i]);
-				}
-
-				$items[] = ['tmp_name' => $_FILES['attachments']['tmp_name'][$i], 'name' => $_FILES['attachments']['name'][$i]];
-			}
-			echo json_encode(['success' => true, 'parent' => $dstID, 'items' => $items]);
-
-			exit();
-		}
-		catch (\Files\Backend\Exception $e) {
-			Logger::error(self::LOG_CONTEXT, "upload failed: " . $e->getMessage());
-			echo json_encode(['success' => false, 'response' => $e->getCode(), 'message' => $e->getMessage()]);
-
-			exit();
-		}
-	}
-
-	/**
-	 * Create a unique file name if file is already exist in backend and user
-	 * wants to keep both on server.
-	 *
-	 * @param string $targetPath         targeted files path
-	 * @param object $initializedBackend Supported abstract backend object (i.e fpt,smb,owncloud etc.. )
-	 * @param string $relNodeId          relay node id
-	 *
-	 * @return string target file path
-	 */
-	public static function checkFilesNameConflict($targetPath, $initializedBackend, $relNodeId) {
-		$keepBoth = isset($_REQUEST["keep_both"]) ? $_REQUEST["keep_both"] : false;
-		// Check if file was already exist in directory and $keepBoth is true
-		// then append the counter in files name.
-		if (strtolower($keepBoth) === 'true') {
-			$lsNodes = $initializedBackend->ls($relNodeId);
-			$nodeExist = array_key_exists(rawurldecode($targetPath), $lsNodes);
-			if ($nodeExist) {
-				$i = 1;
-				$targetPathInfo = pathinfo($targetPath);
-				do {
-					$targetPath = $targetPathInfo["dirname"] . "/" . $targetPathInfo["filename"] . " (" . $i . ")." . $targetPathInfo["extension"];
-					$targetPath = str_replace('//', '/', $targetPath);
-					++$i;
-				}
-				while (array_key_exists(rawurldecode($targetPath), $lsNodes));
-			}
-		}
-
-		return $targetPath;
-	}
+    public const LOG_CONTEXT = "UploadHandler"; // Context for the Logger
+
+    public static function doUpload() {
+        // parse account id.
+        if (isset($_POST["parentID"])) { // will be set if a standard upload is used.
+            $dstID = $_POST["parentID"];
+        }
+        else {
+            if (isset($_SERVER['HTTP_X_FILE_DESTINATION'])) { // will be set if the upload is a ajax upload.
+                $dstID = $_SERVER['HTTP_X_FILE_DESTINATION'];
+            }
+            else {
+                Logger::error(self::LOG_CONTEXT, "upload failed: No destination given");
+                echo json_encode(['success' => false, 'response' => 'No destination given', 'message' => 'No destination given']);
+
+                exit();
+            }
+        }
+
+        $accountID = substr($dstID, 3, (strpos($dstID, '/') - 3));
+
+        // relative node ID. We need to trim off the #R# and account ID
+        $relNodeId = substr($dstID, strpos($dstID, '/'));
+
+        // Initialize the account and backendstore
+        $accountStore = new \Files\Core\AccountStore();
+        $backendStore = \Files\Backend\BackendStore::getInstance();
+
+        $account = $accountStore->getAccount($accountID);
+
+        // initialize the backend
+        $initializedBackend = $backendStore->getInstanceOfBackend($account->getBackend());
+        $initializedBackend->init_backend($account->getBackendConfig());
+
+        try {
+            $initializedBackend->open();
+        }
+        catch (\Files\Backend\Exception $e) {
+            Logger::error(self::LOG_CONTEXT, "backend initialization failed: " . $e->getMessage());
+            echo json_encode(['success' => false, 'response' => $e->getCode(), 'message' => $e->getMessage()]);
+
+            exit();
+        }
+
+        // check if we are getting the file via the "new" method (ajax - XMLHttpRequest) or the standard way
+        if (isset($_SERVER['HTTP_X_FILE_NAME'], $_SERVER['HTTP_X_FILE_SIZE'])) { // use the ajax method
+            $targetPath = stringToUTF8Encode($relNodeId . $_SERVER['HTTP_X_FILE_NAME']);
+            // check if backend supports streaming - this is the preferred way to upload files!
+            if ($initializedBackend->supports(\Files\Backend\BackendStore::FEATURE_STREAMING)) {
+                $fileReader = fopen('php://input', "r");
+                $targetPath = UploadHandler::checkFilesNameConflict($targetPath, $initializedBackend, $relNodeId);
+                $fileWriter = $initializedBackend->getStreamwriter($targetPath);
+
+                while (true) {
+                    set_time_limit(0);
+                    $buffer = fgets($fileReader, 4096);
+                    if (strlen($buffer) == 0) {
+                        fclose($fileReader);
+                        fclose($fileWriter);
+                        break;
+                    }
+
+                    fwrite($fileWriter, $buffer);
+                }
+            }
+            else { // fallback to tmp files
+                $targetPath = UploadHandler::checkFilesNameConflict($targetPath, $initializedBackend, $relNodeId);
+                $targetPath = rawurldecode($targetPath);
+                $temp_file = tempnam(TMP_PATH, "{$targetPath}");
+                $fileReader = fopen('php://input', "r");
+                $fileWriter = fopen($temp_file, "w");
+
+                // store post data to tmp file
+                while (true) {
+                    set_time_limit(0);
+                    $buffer = fgets($fileReader, 4096);
+                    if (strlen($buffer) == 0) {
+                        fclose($fileReader);
+                        fclose($fileWriter);
+                        break;
+                    }
+
+                    fwrite($fileWriter, $buffer);
+                }
+
+                // upload tmp file to backend
+                $initializedBackend->put_file($targetPath, $temp_file);
+                // clean up tmp file
+                unlink($temp_file);
+            }
+            echo json_encode(['success' => true, 'parent' => $dstID, 'item' => $targetPath]);
+
+            exit();
+        }   // upload the standard way with $_FILES
+        $items = [];
+
+        try {
+            for ($i = 0; $i < count($_FILES['attachments']['name']); ++$i) {
+                $targetPath = stringToUTF8Encode($relNodeId . $_FILES['attachments']['name'][$i]);
+
+                // upload the file
+                // check if backend supports streaming - this is the preferred way to upload files!
+                if ($initializedBackend->supports(\Files\Backend\BackendStore::FEATURE_STREAMING)) {
+                    $fileReader = fopen($_FILES['attachments']['tmp_name'][$i], "r");
+                    $fileWriter = $initializedBackend->getStreamwriter($targetPath);
+
+                    while (true) {
+                        set_time_limit(0);
+                        $buffer = fgets($fileReader, 4096);
+                        if (strlen($buffer) == 0) {
+                            fclose($fileReader);
+                            fclose($fileWriter);
+                            break;
+                        }
+
+                        fwrite($fileWriter, $buffer);
+                    }
+                }
+                else { // use the normal way - might have a high memory footprint
+                    $initializedBackend->put_file($targetPath, $_FILES['attachments']['tmp_name'][$i]);
+                }
+
+                $items[] = ['tmp_name' => $_FILES['attachments']['tmp_name'][$i], 'name' => $_FILES['attachments']['name'][$i]];
+            }
+            echo json_encode(['success' => true, 'parent' => $dstID, 'items' => $items]);
+
+            exit();
+        }
+        catch (\Files\Backend\Exception $e) {
+            Logger::error(self::LOG_CONTEXT, "upload failed: " . $e->getMessage());
+            echo json_encode(['success' => false, 'response' => $e->getCode(), 'message' => $e->getMessage()]);
+
+            exit();
+        }
+    }
+
+    /**
+     * Create a unique file name if file is already exist in backend and user
+     * wants to keep both on server.
+     *
+     * @param string $targetPath         targeted files path
+     * @param object $initializedBackend Supported abstract backend object (i.e fpt,smb,owncloud etc.. )
+     * @param string $relNodeId          relay node id
+     *
+     * @return string target file path
+     */
+    public static function checkFilesNameConflict($targetPath, $initializedBackend, $relNodeId) {
+        $keepBoth = isset($_REQUEST["keep_both"]) ? $_REQUEST["keep_both"] : false;
+        // Check if file was already exist in directory and $keepBoth is true
+        // then append the counter in files name.
+        if (strtolower($keepBoth) === 'true') {
+            $lsNodes = $initializedBackend->ls($relNodeId);
+            $nodeExist = array_key_exists(rawurldecode($targetPath), $lsNodes);
+            if ($nodeExist) {
+                $i = 1;
+                $targetPathInfo = pathinfo($targetPath);
+                do {
+                    $targetPath = $targetPathInfo["dirname"] . "/" . $targetPathInfo["filename"] . " (" . $i . ")." . $targetPathInfo["extension"];
+                    $targetPath = str_replace('//', '/', $targetPath);
+                    ++$i;
+                }
+                while (array_key_exists(rawurldecode($targetPath), $lsNodes));
+            }
+        }
+
+        return $targetPath;
+    }
 }

Braces +6 added lines, -12 removed lines

@@ -23,12 +23,10 @@ 
 		// parse account id.
 		if (isset($_POST["parentID"])) { // will be set if a standard upload is used.
 			$dstID = $_POST["parentID"];
-		}
-		else {
+		} else {
 			if (isset($_SERVER['HTTP_X_FILE_DESTINATION'])) { // will be set if the upload is a ajax upload.
 				$dstID = $_SERVER['HTTP_X_FILE_DESTINATION'];
-			}
-			else {
+			} else {
 				Logger::error(self::LOG_CONTEXT, "upload failed: No destination given");
 				echo json_encode(['success' => false, 'response' => 'No destination given', 'message' => 'No destination given']);
 
@@ -53,8 +51,7 @@ 
 
 		try {
 			$initializedBackend->open();
-		}
-		catch (\Files\Backend\Exception $e) {
+		} catch (\Files\Backend\Exception $e) {
 			Logger::error(self::LOG_CONTEXT, "backend initialization failed: " . $e->getMessage());
 			echo json_encode(['success' => false, 'response' => $e->getCode(), 'message' => $e->getMessage()]);
 
@@ -81,8 +78,7 @@ 
 
 					fwrite($fileWriter, $buffer);
 				}
-			}
-			else { // fallback to tmp files
+			} else { // fallback to tmp files
 				$targetPath = UploadHandler::checkFilesNameConflict($targetPath, $initializedBackend, $relNodeId);
 				$targetPath = rawurldecode($targetPath);
 				$temp_file = tempnam(TMP_PATH, "{$targetPath}");
@@ -134,8 +130,7 @@ 
 
 						fwrite($fileWriter, $buffer);
 					}
-				}
-				else { // use the normal way - might have a high memory footprint
+				} else { // use the normal way - might have a high memory footprint
 					$initializedBackend->put_file($targetPath, $_FILES['attachments']['tmp_name'][$i]);
 				}
 
@@ -144,8 +139,7 @@ 
 			echo json_encode(['success' => true, 'parent' => $dstID, 'items' => $items]);
 
 			exit();
-		}
-		catch (\Files\Backend\Exception $e) {
+		} catch (\Files\Backend\Exception $e) {
 			Logger::error(self::LOG_CONTEXT, "upload failed: " . $e->getMessage());
 			echo json_encode(['success' => false, 'response' => $e->getCode(), 'message' => $e->getMessage()]);
 

plugins/files/php/Files/Core/class.downloadhandler.php

Indentation +152 added lines, -152 removed lines

@@ -17,156 +17,156 @@
 use Files\Core\Util\PathUtil;
 
 class DownloadHandler {
-	public const LOG_CONTEXT = "DownloadHandler"; // Context for the Logger
-
-	public static function doDownload() {
-		// parse account id.
-		// wo only need to parse one string because it is
-		// only possible to download files from one backend at a time.
-		if (isset($_GET["ids"])) {
-			$tmpId = $_GET["ids"][0];
-		}
-		else {
-			$tmpId = $_GET["id"];
-		}
-		$accountID = substr($tmpId, 3, (strpos($tmpId, '/') - 3));
-
-		// Initialize the account and backendstore
-		$accountStore = new \Files\Core\AccountStore();
-		$backendStore = \Files\Backend\BackendStore::getInstance();
-
-		$account = $accountStore->getAccount($accountID);
-
-		// initialize the backend
-		$initializedBackend = $backendStore->getInstanceOfBackend($account->getBackend());
-		$initializedBackend->init_backend($account->getBackendConfig());
-
-		try {
-			$initializedBackend->open();
-		}
-		catch (\Files\Backend\Exception $e) {
-			Logger::error(self::LOG_CONTEXT, "Could not open the backend: " . $e->getMessage());
-
-			if ((isset($_GET["inline"]) && $_GET["inline"] == "false") || (isset($_GET["contentDispositionType"]) && $_GET["contentDispositionType"] == "attachment")) {
-				// Javascript error message
-				echo "<script>alert('" . _('File backend not responding. Please try again later.') . "');</script>";
-			}
-			else {
-				// Text error message that is shown in the preview box
-				echo _('File backend not responding. Please try again later.');
-			}
-
-			exit();
-		}
-
-		try {
-			if (isset($_GET["ids"])) {
-				$zip = new \ZipArchive();
-				$zipname = TMP_PATH . '/files_' . date("dmY_Hi") . '.zip';
-				Logger::debug(self::LOG_CONTEXT, "Download file tmp path: " . $zipname);
-				$res = $zip->open($zipname, \ZipArchive::CREATE);
-				if ($res !== true) {
-					Logger::error(self::LOG_CONTEXT, "Zip creation failed: " . $res);
-					echo "<script>alert('" . _('Zip file generation failed. Please inform the administrator.') . "');</script>";
-
-					exit();
-				}
-				$i = 0;
-				$tmpfiles = [];
-				foreach ($_GET["ids"] as $id) {
-					// relative node ID. We need to trim off the #R# and account ID
-					$relNodeId = substr($id, strpos($id, '/'));
-
-					$tmpfiles[$i] = tempnam(TMP_PATH, stripslashes(base64_encode($relNodeId)));
-					$initializedBackend->get_file($relNodeId, $tmpfiles[$i]);
-
-					$res = $zip->addFile($tmpfiles[$i], PathUtil::getFilenameFromPath($relNodeId));
-					++$i;
-					if ($res !== true) {
-						Logger::error(self::LOG_CONTEXT, "Zip addFile failed: " . $res . " file: " . $tmpfiles[$i] . " id: " . $relNodeId);
-						echo "<script>alert('" . _('Zip file generation failed. Please inform the administrator.') . "');</script>";
-
-						exit();
-					}
-				}
-				$zip->close();
-
-				// no caching
-				header('Content-Disposition: attachment; filename="' . basename($zipname) . '"');
-				header("Expires: 0"); // set expiration time
-				header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-				header('Content-Length: ' . filesize($zipname));
-				header('Content-Type: application/zip');
-				readfile($zipname);
-				unlink($zipname);
-				foreach ($tmpfiles as $tmpfile) {
-					unlink($tmpfile);
-				}
-
-				exit();
-			}
-			// relative node ID. We need to trim off the #R# and account ID
-			$relNodeId = substr($_GET["id"], strpos($_GET["id"], '/'));
-			$stream = false;
-
-			if (!$initializedBackend->supports(\Files\Backend\BackendStore::FEATURE_STREAMING)) {
-				$tmpfile = tempnam(TMP_PATH, stripslashes(base64_encode($relNodeId)));
-				$initializedBackend->get_file($relNodeId, $tmpfile);
-				$filesize = filesize($tmpfile);
-			}
-			else {
-				$gpi = $initializedBackend->gpi($relNodeId);
-				$stream = true;
-				$filesize = $gpi["getcontentlength"];
-			}
-
-			$mime = PathUtil::get_mime($relNodeId);
-
-			// set headers here
-			if ((isset($_GET["inline"]) && $_GET["inline"] == "false") || (isset($_GET["contentDispositionType"]) && $_GET["contentDispositionType"] == "attachment")) {
-				header('Content-Disposition: attachment; filename="' . PathUtil::getFilenameFromPath($relNodeId) . '"');
-			}
-
-			// no caching
-				header("Expires: 0"); // set expiration time
-				header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-			header('Content-Length: ' . $filesize);
-			header('Content-Type: ' . $mime);
-			flush();
-
-			if (!$stream) {
-				// print the downloaded file
-				readfile($tmpfile);
-				ignore_user_abort(true);
-				unlink($tmpfile);
-			}
-			else {
-				// stream the file directly from the backend - much faster
-				$fh = $initializedBackend->getStreamReader($relNodeId);
-				while (!feof($fh)) {
-					set_time_limit(0);
-					echo fread($fh, 4096);
-					ob_flush();
-					flush();
-				}
-				fclose($fh);
-			}
-
-			exit();
-		}
-		catch (\Files\Backend\Exception $e) {
-			Logger::error(self::LOG_CONTEXT, "Downloading failed: " . $e->getMessage());
-
-			if (isset($_GET["inline"]) && $_GET["inline"] == "false") {
-				// Javascript error message
-				echo "<script>alert('" . _('This file is no longer available. Please reload the folder.') . "');</script>";
-			}
-			else {
-				// Text error message that is shown in the preview box
-				echo _('This file is no longer available. Please reload the folder.');
-			}
-
-			exit();
-		}
-	}
+    public const LOG_CONTEXT = "DownloadHandler"; // Context for the Logger
+
+    public static function doDownload() {
+        // parse account id.
+        // wo only need to parse one string because it is
+        // only possible to download files from one backend at a time.
+        if (isset($_GET["ids"])) {
+            $tmpId = $_GET["ids"][0];
+        }
+        else {
+            $tmpId = $_GET["id"];
+        }
+        $accountID = substr($tmpId, 3, (strpos($tmpId, '/') - 3));
+
+        // Initialize the account and backendstore
+        $accountStore = new \Files\Core\AccountStore();
+        $backendStore = \Files\Backend\BackendStore::getInstance();
+
+        $account = $accountStore->getAccount($accountID);
+
+        // initialize the backend
+        $initializedBackend = $backendStore->getInstanceOfBackend($account->getBackend());
+        $initializedBackend->init_backend($account->getBackendConfig());
+
+        try {
+            $initializedBackend->open();
+        }
+        catch (\Files\Backend\Exception $e) {
+            Logger::error(self::LOG_CONTEXT, "Could not open the backend: " . $e->getMessage());
+
+            if ((isset($_GET["inline"]) && $_GET["inline"] == "false") || (isset($_GET["contentDispositionType"]) && $_GET["contentDispositionType"] == "attachment")) {
+                // Javascript error message
+                echo "<script>alert('" . _('File backend not responding. Please try again later.') . "');</script>";
+            }
+            else {
+                // Text error message that is shown in the preview box
+                echo _('File backend not responding. Please try again later.');
+            }
+
+            exit();
+        }
+
+        try {
+            if (isset($_GET["ids"])) {
+                $zip = new \ZipArchive();
+                $zipname = TMP_PATH . '/files_' . date("dmY_Hi") . '.zip';
+                Logger::debug(self::LOG_CONTEXT, "Download file tmp path: " . $zipname);
+                $res = $zip->open($zipname, \ZipArchive::CREATE);
+                if ($res !== true) {
+                    Logger::error(self::LOG_CONTEXT, "Zip creation failed: " . $res);
+                    echo "<script>alert('" . _('Zip file generation failed. Please inform the administrator.') . "');</script>";
+
+                    exit();
+                }
+                $i = 0;
+                $tmpfiles = [];
+                foreach ($_GET["ids"] as $id) {
+                    // relative node ID. We need to trim off the #R# and account ID
+                    $relNodeId = substr($id, strpos($id, '/'));
+
+                    $tmpfiles[$i] = tempnam(TMP_PATH, stripslashes(base64_encode($relNodeId)));
+                    $initializedBackend->get_file($relNodeId, $tmpfiles[$i]);
+
+                    $res = $zip->addFile($tmpfiles[$i], PathUtil::getFilenameFromPath($relNodeId));
+                    ++$i;
+                    if ($res !== true) {
+                        Logger::error(self::LOG_CONTEXT, "Zip addFile failed: " . $res . " file: " . $tmpfiles[$i] . " id: " . $relNodeId);
+                        echo "<script>alert('" . _('Zip file generation failed. Please inform the administrator.') . "');</script>";
+
+                        exit();
+                    }
+                }
+                $zip->close();
+
+                // no caching
+                header('Content-Disposition: attachment; filename="' . basename($zipname) . '"');
+                header("Expires: 0"); // set expiration time
+                header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+                header('Content-Length: ' . filesize($zipname));
+                header('Content-Type: application/zip');
+                readfile($zipname);
+                unlink($zipname);
+                foreach ($tmpfiles as $tmpfile) {
+                    unlink($tmpfile);
+                }
+
+                exit();
+            }
+            // relative node ID. We need to trim off the #R# and account ID
+            $relNodeId = substr($_GET["id"], strpos($_GET["id"], '/'));
+            $stream = false;
+
+            if (!$initializedBackend->supports(\Files\Backend\BackendStore::FEATURE_STREAMING)) {
+                $tmpfile = tempnam(TMP_PATH, stripslashes(base64_encode($relNodeId)));
+                $initializedBackend->get_file($relNodeId, $tmpfile);
+                $filesize = filesize($tmpfile);
+            }
+            else {
+                $gpi = $initializedBackend->gpi($relNodeId);
+                $stream = true;
+                $filesize = $gpi["getcontentlength"];
+            }
+
+            $mime = PathUtil::get_mime($relNodeId);
+
+            // set headers here
+            if ((isset($_GET["inline"]) && $_GET["inline"] == "false") || (isset($_GET["contentDispositionType"]) && $_GET["contentDispositionType"] == "attachment")) {
+                header('Content-Disposition: attachment; filename="' . PathUtil::getFilenameFromPath($relNodeId) . '"');
+            }
+
+            // no caching
+                header("Expires: 0"); // set expiration time
+                header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+            header('Content-Length: ' . $filesize);
+            header('Content-Type: ' . $mime);
+            flush();
+
+            if (!$stream) {
+                // print the downloaded file
+                readfile($tmpfile);
+                ignore_user_abort(true);
+                unlink($tmpfile);
+            }
+            else {
+                // stream the file directly from the backend - much faster
+                $fh = $initializedBackend->getStreamReader($relNodeId);
+                while (!feof($fh)) {
+                    set_time_limit(0);
+                    echo fread($fh, 4096);
+                    ob_flush();
+                    flush();
+                }
+                fclose($fh);
+            }
+
+            exit();
+        }
+        catch (\Files\Backend\Exception $e) {
+            Logger::error(self::LOG_CONTEXT, "Downloading failed: " . $e->getMessage());
+
+            if (isset($_GET["inline"]) && $_GET["inline"] == "false") {
+                // Javascript error message
+                echo "<script>alert('" . _('This file is no longer available. Please reload the folder.') . "');</script>";
+            }
+            else {
+                // Text error message that is shown in the preview box
+                echo _('This file is no longer available. Please reload the folder.');
+            }
+
+            exit();
+        }
+    }
 }

Braces +7 added lines, -14 removed lines

@@ -25,8 +25,7 @@ 
 		// only possible to download files from one backend at a time.
 		if (isset($_GET["ids"])) {
 			$tmpId = $_GET["ids"][0];
-		}
-		else {
+		} else {
 			$tmpId = $_GET["id"];
 		}
 		$accountID = substr($tmpId, 3, (strpos($tmpId, '/') - 3));
@@ -43,15 +42,13 @@ 
 
 		try {
 			$initializedBackend->open();
-		}
-		catch (\Files\Backend\Exception $e) {
+		} catch (\Files\Backend\Exception $e) {
 			Logger::error(self::LOG_CONTEXT, "Could not open the backend: " . $e->getMessage());
 
 			if ((isset($_GET["inline"]) && $_GET["inline"] == "false") || (isset($_GET["contentDispositionType"]) && $_GET["contentDispositionType"] == "attachment")) {
 				// Javascript error message
 				echo "<script>alert('" . _('File backend not responding. Please try again later.') . "');</script>";
-			}
-			else {
+			} else {
 				// Text error message that is shown in the preview box
 				echo _('File backend not responding. Please try again later.');
 			}
@@ -113,8 +110,7 @@ 
 				$tmpfile = tempnam(TMP_PATH, stripslashes(base64_encode($relNodeId)));
 				$initializedBackend->get_file($relNodeId, $tmpfile);
 				$filesize = filesize($tmpfile);
-			}
-			else {
+			} else {
 				$gpi = $initializedBackend->gpi($relNodeId);
 				$stream = true;
 				$filesize = $gpi["getcontentlength"];
@@ -139,8 +135,7 @@ 
 				readfile($tmpfile);
 				ignore_user_abort(true);
 				unlink($tmpfile);
-			}
-			else {
+			} else {
 				// stream the file directly from the backend - much faster
 				$fh = $initializedBackend->getStreamReader($relNodeId);
 				while (!feof($fh)) {
@@ -153,15 +148,13 @@ 
 			}
 
 			exit();
-		}
-		catch (\Files\Backend\Exception $e) {
+		} catch (\Files\Backend\Exception $e) {
 			Logger::error(self::LOG_CONTEXT, "Downloading failed: " . $e->getMessage());
 
 			if (isset($_GET["inline"]) && $_GET["inline"] == "false") {
 				// Javascript error message
 				echo "<script>alert('" . _('This file is no longer available. Please reload the folder.') . "');</script>";
-			}
-			else {
+			} else {
 				// Text error message that is shown in the preview box
 				echo _('This file is no longer available. Please reload the folder.');
 			}

plugins/files/php/Files/Core/class.account.php

Indentation +201 added lines, -201 removed lines

@@ -10,205 +10,205 @@
 use Files\Backend\BackendStore;
 
 class Account {
-	private $id;
-	private $name; // account name - for better usability
-	private $status;
-	private $statusDescription;
-	private $backend;
-	private $backendConfig; // This array will hold the backend configuration variables
-	private $features;
-	private $sequence; // for ordering
-	private $cannot_change; // for locking accounts
-
-	/**
-	 * Status variables.
-	 */
-	public const STATUS_NEW = "new";
-	public const STATUS_OK = "ok";
-	public const STATUS_ERROR = "err";
-	public const STATUS_UNKNOWN = "unk";
-
-	/**
-	 * @param       $id
-	 * @param       $name
-	 * @param       $status
-	 * @param       $statusDescription
-	 * @param       $backend
-	 * @param       $backendConfig
-	 * @param array $features
-	 * @param mixed $sequence
-	 * @param mixed $cannot_change
-	 */
-	public function __construct($id, $name, $status, $statusDescription, $backend, $backendConfig, $features = [], $sequence, $cannot_change) {
-		$this->id = $id;
-		$this->name = $name;
-		$this->status = $status;
-		$this->statusDescription = $statusDescription;
-		$this->backend = $backend;
-		$this->backendConfig = $backendConfig;
-		$this->features = $features;
-		$this->sequence = $sequence;
-		$this->cannot_change = $cannot_change;
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getBackend() {
-		return $this->backend;
-	}
-
-	/**
-	 * @param mixed $backend
-	 */
-	public function setBackend($backend) {
-		$this->backend = $backend;
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getId() {
-		return $this->id;
-	}
-
-	/**
-	 * @param mixed $id
-	 */
-	public function setId($id) {
-		$this->id = $id;
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getName() {
-		return $this->name;
-	}
-
-	/**
-	 * @param mixed $name
-	 */
-	public function setName($name) {
-		$this->name = $name;
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getStatus() {
-		return $this->status;
-	}
-
-	/**
-	 * @param mixed $status
-	 */
-	public function setStatus($status) {
-		$this->status = $status;
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getBackendConfig() {
-		// always add the accountID to the backendConfig
-		$this->backendConfig["current_account_id"] = $this->getId();
-
-		return $this->backendConfig;
-	}
-
-	/**
-	 * @param mixed $backendConfig
-	 */
-	public function setBackendConfig($backendConfig) {
-		$this->backendConfig = $backendConfig;
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getFeatures() {
-		return $this->features;
-	}
-
-	/**
-	 * @param mixed $features
-	 */
-	public function setFeatures($features) {
-		$this->features = $features;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getStatusDescription() {
-		return $this->statusDescription;
-	}
-
-	/**
-	 * @param string $statusDescription
-	 */
-	public function setStatusDescription($statusDescription) {
-		$this->statusDescription = $statusDescription;
-	}
-
-	/**
-	 * @param $property
-	 *
-	 * @return mixed
-	 */
-	public function getConfigValue($property) {
-		if (is_array($this->backendConfig) && in_array($property, $this->backendConfig)) {
-			return $this->backendConfig[$property];
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param $property
-	 * @param $value
-	 */
-	public function setConfigValue($property, $value) {
-		if (!is_array($this->backendConfig)) {
-			$this->backendConfig = [];
-		}
-		$this->backendConfig[$property] = $value;
-	}
-
-	/**
-	 * This function is executed before the account gets deleted.
-	 */
-	public function beforeDelete() {
-		$backendstore = BackendStore::getInstance();
-		$backendinstance = $backendstore->getInstanceOfBackend($this->backend);
-		$backendinstance->init_backend($this->backendConfig);
-		$backendinstance->open();
-		$backendinstance->beforeDeleteAccount($this);
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getSequence() {
-		if (!$this->sequence) {
-			$this->sequence = 0;
-		}
-
-		return $this->sequence;
-	}
-
-	/**
-	 * @param int $sequence
-	 */
-	public function setSequence($sequence) {
-		$this->sequence = $sequence;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function getCannotChangeFlag() {
-		return isset($this->cannot_change) ? $this->cannot_change : false;
-	}
+    private $id;
+    private $name; // account name - for better usability
+    private $status;
+    private $statusDescription;
+    private $backend;
+    private $backendConfig; // This array will hold the backend configuration variables
+    private $features;
+    private $sequence; // for ordering
+    private $cannot_change; // for locking accounts
+
+    /**
+     * Status variables.
+     */
+    public const STATUS_NEW = "new";
+    public const STATUS_OK = "ok";
+    public const STATUS_ERROR = "err";
+    public const STATUS_UNKNOWN = "unk";
+
+    /**
+     * @param       $id
+     * @param       $name
+     * @param       $status
+     * @param       $statusDescription
+     * @param       $backend
+     * @param       $backendConfig
+     * @param array $features
+     * @param mixed $sequence
+     * @param mixed $cannot_change
+     */
+    public function __construct($id, $name, $status, $statusDescription, $backend, $backendConfig, $features = [], $sequence, $cannot_change) {
+        $this->id = $id;
+        $this->name = $name;
+        $this->status = $status;
+        $this->statusDescription = $statusDescription;
+        $this->backend = $backend;
+        $this->backendConfig = $backendConfig;
+        $this->features = $features;
+        $this->sequence = $sequence;
+        $this->cannot_change = $cannot_change;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getBackend() {
+        return $this->backend;
+    }
+
+    /**
+     * @param mixed $backend
+     */
+    public function setBackend($backend) {
+        $this->backend = $backend;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getId() {
+        return $this->id;
+    }
+
+    /**
+     * @param mixed $id
+     */
+    public function setId($id) {
+        $this->id = $id;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getName() {
+        return $this->name;
+    }
+
+    /**
+     * @param mixed $name
+     */
+    public function setName($name) {
+        $this->name = $name;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getStatus() {
+        return $this->status;
+    }
+
+    /**
+     * @param mixed $status
+     */
+    public function setStatus($status) {
+        $this->status = $status;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getBackendConfig() {
+        // always add the accountID to the backendConfig
+        $this->backendConfig["current_account_id"] = $this->getId();
+
+        return $this->backendConfig;
+    }
+
+    /**
+     * @param mixed $backendConfig
+     */
+    public function setBackendConfig($backendConfig) {
+        $this->backendConfig = $backendConfig;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getFeatures() {
+        return $this->features;
+    }
+
+    /**
+     * @param mixed $features
+     */
+    public function setFeatures($features) {
+        $this->features = $features;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStatusDescription() {
+        return $this->statusDescription;
+    }
+
+    /**
+     * @param string $statusDescription
+     */
+    public function setStatusDescription($statusDescription) {
+        $this->statusDescription = $statusDescription;
+    }
+
+    /**
+     * @param $property
+     *
+     * @return mixed
+     */
+    public function getConfigValue($property) {
+        if (is_array($this->backendConfig) && in_array($property, $this->backendConfig)) {
+            return $this->backendConfig[$property];
+        }
+
+        return false;
+    }
+
+    /**
+     * @param $property
+     * @param $value
+     */
+    public function setConfigValue($property, $value) {
+        if (!is_array($this->backendConfig)) {
+            $this->backendConfig = [];
+        }
+        $this->backendConfig[$property] = $value;
+    }
+
+    /**
+     * This function is executed before the account gets deleted.
+     */
+    public function beforeDelete() {
+        $backendstore = BackendStore::getInstance();
+        $backendinstance = $backendstore->getInstanceOfBackend($this->backend);
+        $backendinstance->init_backend($this->backendConfig);
+        $backendinstance->open();
+        $backendinstance->beforeDeleteAccount($this);
+    }
+
+    /**
+     * @return int
+     */
+    public function getSequence() {
+        if (!$this->sequence) {
+            $this->sequence = 0;
+        }
+
+        return $this->sequence;
+    }
+
+    /**
+     * @param int $sequence
+     */
+    public function setSequence($sequence) {
+        $this->sequence = $sequence;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getCannotChangeFlag() {
+        return isset($this->cannot_change) ? $this->cannot_change : false;
+    }
 }

plugins/files/php/Files/Core/class.recipienthandler.php

Indentation +37 added lines, -37 removed lines

@@ -10,41 +10,41 @@
 use Files\Core\Util\Logger;
 
 class RecipientHandler {
-	public const LOG_CONTEXT = "RecipientHandler"; // Context for the Logger
-
-	public static function doGetRecipients() {
-		// parse account id.
-		// wo only need to parse one string because it is
-		// only possible to download files from one backend at a time.
-		if (isset($_GET["ids"])) {
-			$tmpId = $_GET["ids"][0];
-		}
-		else {
-			$tmpId = $_GET["id"];
-		}
-		$accountID = substr($tmpId, 3, (strpos($tmpId, '/') - 3));
-
-		// Initialize the account and backendstore
-		$accountStore = new \Files\Core\AccountStore();
-		$backendStore = \Files\Backend\BackendStore::getInstance();
-
-		$account = $accountStore->getAccount($accountID);
-
-		// initialize the backend
-		$initializedBackend = $backendStore->getInstanceOfBackend($account->getBackend());
-		$initializedBackend->init_backend($account->getBackendConfig());
-
-		try {
-			$initializedBackend->open();
-		}
-		catch (\Files\Backend\Exception $e) {
-			Logger::error(self::LOG_CONTEXT, "Could not open the backend: " . $e->getMessage());
-			echo json_encode(['success' => false, 'response' => $e->getCode(), 'message' => $e->getMessage()]);
-
-			exit();
-		}
-		$responsedata = $initializedBackend->getRecipients($_GET["query"]);
-		header('Content-Type: application/json');
-		echo json_encode($responsedata);
-	}
+    public const LOG_CONTEXT = "RecipientHandler"; // Context for the Logger
+
+    public static function doGetRecipients() {
+        // parse account id.
+        // wo only need to parse one string because it is
+        // only possible to download files from one backend at a time.
+        if (isset($_GET["ids"])) {
+            $tmpId = $_GET["ids"][0];
+        }
+        else {
+            $tmpId = $_GET["id"];
+        }
+        $accountID = substr($tmpId, 3, (strpos($tmpId, '/') - 3));
+
+        // Initialize the account and backendstore
+        $accountStore = new \Files\Core\AccountStore();
+        $backendStore = \Files\Backend\BackendStore::getInstance();
+
+        $account = $accountStore->getAccount($accountID);
+
+        // initialize the backend
+        $initializedBackend = $backendStore->getInstanceOfBackend($account->getBackend());
+        $initializedBackend->init_backend($account->getBackendConfig());
+
+        try {
+            $initializedBackend->open();
+        }
+        catch (\Files\Backend\Exception $e) {
+            Logger::error(self::LOG_CONTEXT, "Could not open the backend: " . $e->getMessage());
+            echo json_encode(['success' => false, 'response' => $e->getCode(), 'message' => $e->getMessage()]);
+
+            exit();
+        }
+        $responsedata = $initializedBackend->getRecipients($_GET["query"]);
+        header('Content-Type: application/json');
+        echo json_encode($responsedata);
+    }
 }

Braces +2 added lines, -4 removed lines

@@ -18,8 +18,7 @@ 
 		// only possible to download files from one backend at a time.
 		if (isset($_GET["ids"])) {
 			$tmpId = $_GET["ids"][0];
-		}
-		else {
+		} else {
 			$tmpId = $_GET["id"];
 		}
 		$accountID = substr($tmpId, 3, (strpos($tmpId, '/') - 3));
@@ -36,8 +35,7 @@ 
 
 		try {
 			$initializedBackend->open();
-		}
-		catch (\Files\Backend\Exception $e) {
+		} catch (\Files\Backend\Exception $e) {
 			Logger::error(self::LOG_CONTEXT, "Could not open the backend: " . $e->getMessage());
 			echo json_encode(['success' => false, 'response' => $e->getCode(), 'message' => $e->getMessage()]);
 

plugins/files/php/class.filesaccountmodule.php

Indentation +451 added lines, -451 removed lines

@@ -15,455 +15,455 @@
 use Files\Core\Util\Logger;
 
 class FilesAccountModule extends ListModule {
-	public const LOG_CONTEXT = "FilesAccountModule"; // Context for the Logger
-
-	/**
-	 * @constructor
-	 *
-	 * @param $id
-	 * @param $data
-	 */
-	public function __construct($id, $data) {
-		parent::__construct($id, $data);
-	}
-
-	/**
-	 * Executes all the actions in the $data variable.
-	 * Exception part is used for authentication errors also.
-	 *
-	 * @return bool true on success or false on failure
-	 */
-	public function execute() {
-		$result = false;
-
-		foreach ($this->data as $actionType => $actionData) {
-			if (isset($actionType)) {
-				try {
-					switch ($actionType) {
-						case "save":
-							// check if we should create a new account or edit an existing one
-							if (isset($actionData["entryid"])) {
-								$result = $this->accountUpdate($actionData);
-							}
-							else {
-								$result = $this->accountCreate($actionData);
-							}
-							break;
-
-						case "delete":
-							$result = $this->accountDelete($actionType, $actionData);
-							break;
-
-						case "list":
-							if (isset($actionData["list_backend"]) && $actionData["list_backend"]) {
-								$result = $this->backendInformation($actionType);
-							}
-							else {
-								$result = $this->accountList($actionType, $actionData);
-							}
-							break;
-
-						case "getquota":
-							$result = $this->getQuotaInformation($actionType, $actionData);
-							break;
-
-						case "getversion":
-							$result = $this->getVersionInformation($actionType, $actionData);
-							break;
-
-						case "updatetoken":
-							$result = $this->updateOauthToken($actionType, $actionData);
-							break;
-
-						default:
-							$this->handleUnknownActionType($actionType);
-					}
-				}
-				catch (MAPIException $e) {
-					$this->sendFeedback(false, $this->errorDetailsFromException($e));
-				}
-				catch (AccountException $e) {
-					$this->sendFeedback(false, [
-						'type' => ERROR_GENERAL,
-						'info' => [
-							'title' => $e->getTitle(),
-							'original_message' => $e->getMessage(),
-							'display_message' => $e->getMessage(),
-						],
-					]);
-				}
-				catch (BackendException $e) {
-					$this->sendFeedback(false, [
-						'type' => ERROR_GENERAL,
-						'info' => [
-							'title' => $e->getTitle(),
-							'original_message' => $e->getMessage(),
-							'display_message' => $e->getMessage(),
-						],
-					]);
-				}
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @param {Array} $actionData
-	 */
-	public function accountCreate($actionData) {
-		$response = [];
-		$requestProperties = $actionData["props"];
-
-		// create a new account in our backend
-		$accountStore = new \Files\Core\AccountStore();
-		$newAccount = $accountStore->createAccount($requestProperties["name"], $requestProperties["backend"], $requestProperties["backend_config"]);
-
-		// create the response account object
-		$account = [];
-		$account[$newAccount->getId()] = [
-			'props' => [
-				'id' => $newAccount->getId(),
-				'status' => $newAccount->getStatus(),
-				'status_description' => $newAccount->getStatusDescription(),
-				'name' => $newAccount->getName(),
-				'backend' => $newAccount->getBackend(),
-				'backend_config' => $newAccount->getBackendConfig(),
-				'backend_features' => $newAccount->getFeatures(),
-				'account_sequence' => $newAccount->getSequence(),
-			],
-			'entryid' => $newAccount->getId(),
-			'store_entryid' => 'filesaccount',
-			'parent_entryid' => 'accountstoreroot',
-		];
-		$response['item'] = array_values($account);
-
-		$this->addActionData("update", $response);
-		$GLOBALS["bus"]->addData($this->getResponseData());
-
-		return true;
-	}
-
-	/**
-	 * remove an account from the store and the MAPI settings.
-	 *
-	 * @param {String} $actionType
-	 * @param {Array} $actionData
-	 */
-	public function accountDelete($actionType, $actionData) {
-		$response = [];
-
-		// check if account needs to clean things up before it gets deleted
-		try {
-			$accountStore = new \Files\Core\AccountStore();
-			$accountStore->getAccount($actionData['entryid'])->beforeDelete();
-		}
-		catch (\Files\Backend\Exception $e) {
-			// ignore errors here
-		}
-
-		$response['status'] = $accountStore->deleteAccount($actionData['entryid']);
-
-		$this->addActionData($actionType, $response);
-		$GLOBALS["bus"]->addData($this->getResponseData());
-
-		return $response['status'];
-	}
-
-	/**
-	 * loads content of current folder - list of folders and files from the Files backend.
-	 *
-	 * @param {String} $actionType
-	 * @param {Array} $actionData
-	 */
-	public function accountList($actionType, $actionData) {
-		$response = [];
-
-		// get a list of all accounts
-		$accountStore = new \Files\Core\AccountStore();
-		$accounts = $accountStore->getAllAccounts();
-		$accountList = [];
-
-		if (is_array($accounts)) {
-			foreach ($accounts as $account) {
-				$account = $accountStore->updateAccount($account);
-				$accountList[$account->getId()] = [
-					"props" => [
-						"id" => $account->getId(),
-						"name" => $account->getName(),
-						"type" => "account", // to prevent warning while sorting
-						"status" => $account->getStatus(),
-						"status_description" => $account->getStatusDescription(),
-						"backend" => $account->getBackend(),
-						"backend_config" => $account->getBackendConfig(),
-						'backend_features' => $account->getFeatures(),
-						'account_sequence' => $account->getSequence(),
-						'cannot_change' => $account->getCannotChangeFlag(),
-					],
-					'entryid' => $account->getId(),
-					'store_entryid' => 'filesaccount',
-					'parent_entryid' => 'accountstoreroot',
-				];
-			}
-		}
-
-		// sort the accounts
-		$sortKey = "account_sequence";
-		$sortDir = "ASC";
-
-		if (isset($data['sort'])) {
-			$sortKey = $data['sort'][0]['field'];
-			$sortDir = $data['sort'][0]['direction'];
-		}
-
-		Logger::debug(self::LOG_CONTEXT, "Sorting by " . $sortKey . " in direction: " . $sortDir);
-
-		$accountList = ArrayUtil::sort_props_by_key($accountList, $sortKey, $sortDir);
-
-		$response["item"] = array_values($accountList);
-		$response['page'] = ["start" => 0, "rowcount" => 50, "totalrowcount" => count($response["item"])];
-		$response['folder'] = ["content_count" => count($response["item"]), "content_unread" => 0];
-
-		$this->addActionData($actionType, $response);
-		$GLOBALS["bus"]->addData($this->getResponseData());
-
-		return true;
-	}
-
-	/**
-	 * update some values of an account.
-	 *
-	 * @param {Array} $actionData
-	 */
-	public function accountUpdate($actionData) {
-		$response = [];
-
-		// create a new account in our backend
-		$accountStore = new \Files\Core\AccountStore();
-		$currentAccount = $accountStore->getAccount($actionData['entryid']);
-
-		// apply changes to the account object
-		if (isset($actionData['props']['name'])) {
-			$currentAccount->setName(strip_tags($actionData['props']['name']));
-		}
-		if (isset($actionData['props']['backend'])) {
-			$currentAccount->setBackend(strip_tags($actionData['props']['backend']));
-		}
-		if (isset($actionData['props']['backend_config'])) { // we always get the whole backend config
-			$currentAccount->setBackendConfig($actionData['props']['backend_config']);
-		}
-		if (isset($actionData['props']['account_sequence'])) {
-			$currentAccount->setSequence($actionData['props']['account_sequence']);
-		}
-
-		// save changes
-		$accountStore->updateAccount($currentAccount);
-
-		// create the response object
-		$updatedAccount = [];
-		$updatedAccount[$currentAccount->getId()] = [
-			"props" => [
-				"id" => $currentAccount->getId(),
-				"name" => $currentAccount->getName(),
-				"status" => $currentAccount->getStatus(),
-				"status_description" => $currentAccount->getStatusDescription(),
-				"backend" => $currentAccount->getBackend(),
-				"backend_config" => $currentAccount->getBackendConfig(),
-				'backend_features' => $currentAccount->getFeatures(),
-				'account_sequence' => $currentAccount->getSequence(),
-			],
-			'entryid' => $currentAccount->getId(),
-			'store_entryid' => 'filesaccount',
-			'parent_entryid' => 'accountstoreroot',
-		];
-
-		$response['item'] = array_values($updatedAccount);
-		$this->addActionData("update", $response);
-		$GLOBALS["bus"]->addData($this->getResponseData());
-
-		return true;
-	}
-
-	/**
-	 * Return all Information about the existing backends.
-	 *
-	 * @param {String} $actionType
-	 */
-	public function backendInformation($actionType) {
-		// find all registered backends
-		$backendStore = \Files\Backend\BackendStore::getInstance();
-		$backendNames = $backendStore->getRegisteredBackendNames();
-
-		$data = [];
-		$items = [];
-		foreach ($backendNames as $backendName) {
-			$backendInstance = $backendStore->getInstanceOfBackend($backendName);
-			if ($backendInstance !== false) {
-				array_push($items, ['props' => [
-					"name" => $backendName,
-					"message_class" => "IPM.FilesBackend",
-					"displayName" => $backendInstance->getDisplayName(),
-				]]);
-			}
-		}
-
-		$data = array_merge($data, ['item' => $items]);
-
-		$this->addActionData($actionType, $data);
-		$GLOBALS["bus"]->addData($this->getResponseData());
-
-		return true;
-	}
-
-	/**
-	 * Return all quota information from specified account.
-	 *
-	 * @param {String} $actionType
-	 * @param {String} $actionData
-	 */
-	public function getQuotaInformation($actionType, $actionData) {
-		$response = [];
-
-		$accountId = $actionData["accountId"];
-		$rootPath = $actionData["folder"];
-
-		// load the accountstore
-		$accountStore = new \Files\Core\AccountStore();
-		$currentAccount = $accountStore->getAccount($accountId);
-
-		// check if ID was valid, if not respond with error.
-		if ($currentAccount === null || $currentAccount === false) {
-			throw new AccountException(_("Unknown account ID"));
-		}
-
-		$backendStore = \Files\Backend\BackendStore::getInstance();
-		$backendInstance = $backendStore->getInstanceOfBackend($currentAccount->getBackend());
-
-		// check if backend really supports this feature
-		if (!$backendInstance->supports(\Files\Backend\BackendStore::FEATURE_QUOTA)) {
-			throw new AccountException(_('Feature "Quota Information" is not supported by this backend!'));
-		}
-
-		// init backend instance
-		$backendInstance->init_backend($currentAccount->getBackendConfig());
-
-		// get quota info
-		$backendInstance->open();
-		$qUsed = $backendInstance->getQuotaBytesUsed($rootPath);
-		$qAvailable = $backendInstance->getQuotaBytesAvailable($rootPath);
-
-		$response['status'] = true;
-		$response['quota'] = [
-			["state" => _('Used'), "amount" => $qUsed],
-			["state" => _('Free'), "amount" => $qAvailable],
-		];
-
-		$this->addActionData($actionType, $response);
-		$GLOBALS["bus"]->addData($this->getResponseData());
-
-		return $response['status'];
-	}
-
-	/**
-	 * Return all quota information from specified account.
-	 *
-	 * @param {String} $actionType
-	 * @param {String} $actionData
-	 */
-	public function getVersionInformation($actionType, $actionData) {
-		$response = [];
-
-		$accountId = $actionData["accountId"];
-
-		// load the accountstore
-		$accountStore = new \Files\Core\AccountStore();
-		$currentAccount = $accountStore->getAccount($accountId);
-
-		// check if ID was valid, if not respond with error.
-		if ($currentAccount === null || $currentAccount === false) {
-			throw new AccountException(_("Unknown account ID"));
-		}
-
-		$backendStore = \Files\Backend\BackendStore::getInstance();
-		$backendInstance = $backendStore->getInstanceOfBackend($currentAccount->getBackend());
-
-		// check if backend really supports this feature
-		if (!$backendInstance->supports(\Files\Backend\BackendStore::FEATURE_VERSION)) {
-			throw new AccountException(_('Feature "Version Information" is not supported by this backend!'));
-		}
-
-		// init backend instance
-		$backendInstance->init_backend($currentAccount->getBackendConfig());
-
-		// get quota info
-		$backendInstance->open();
-		$serverVersion = $backendInstance->getServerVersion();
-		$backendVersion = $backendInstance->getBackendVersion();
-
-		$response['status'] = true;
-		$response['version'] = [
-			"backend" => $backendVersion,
-			"server" => $serverVersion,
-		];
-
-		$this->addActionData($actionType, $response);
-		$GLOBALS["bus"]->addData($this->getResponseData());
-
-		return $response['status'];
-	}
-
-	/**
-	 * Return all quota information from specified account.
-	 *
-	 * @param {String} $actionType
-	 * @param {String} $actionData
-	 */
-	public function updateOauthToken($actionType, $actionData) {
-		$response = [];
-
-		$accountId = $actionData["accountId"];
-
-		// load the accountstore
-		$accountStore = new \Files\Core\AccountStore();
-		$currentAccount = $accountStore->getAccount($accountId);
-
-		// check if ID was valid, if not respond with error.
-		if ($currentAccount === null || $currentAccount === false) {
-			throw new AccountException(_("Unknown account ID"));
-		}
-
-		$backendStore = \Files\Backend\BackendStore::getInstance();
-		$backendInstance = $backendStore->getInstanceOfBackend($currentAccount->getBackend());
-
-		// check if backend really supports this feature
-		if (!$backendInstance->supports(\Files\Backend\BackendStore::FEATURE_OAUTH)) {
-			throw new AccountException(_('Feature "OAUTH" is not supported by this backend!'));
-		}
-
-		// init backend instance
-		$backendInstance->init_backend($currentAccount->getBackendConfig());
-		$backendInstance->changeAccessToken($actionData["access_token"]);
-
-		$response['status'] = true;
-		$response['access_token'] = $actionData["access_token"];
-
-		$this->addActionData($actionType, $response);
-		$GLOBALS["bus"]->addData($this->getResponseData());
-
-		return $response['status'];
-	}
-
-	/**
-	 * Function will retrieve error details from exception object based on exception type.
-	 * it should also send type of exception with the data. so client can know which type
-	 * of exception is generated.
-	 *
-	 * @param object $exception the exception object which is generated
-	 *
-	 * @return array error data
-	 * @overwrite
-	 */
-	public function errorDetailsFromException($exception) {
-		parent::errorDetailsFromException($exception);
-	}
+    public const LOG_CONTEXT = "FilesAccountModule"; // Context for the Logger
+
+    /**
+     * @constructor
+     *
+     * @param $id
+     * @param $data
+     */
+    public function __construct($id, $data) {
+        parent::__construct($id, $data);
+    }
+
+    /**
+     * Executes all the actions in the $data variable.
+     * Exception part is used for authentication errors also.
+     *
+     * @return bool true on success or false on failure
+     */
+    public function execute() {
+        $result = false;
+
+        foreach ($this->data as $actionType => $actionData) {
+            if (isset($actionType)) {
+                try {
+                    switch ($actionType) {
+                        case "save":
+                            // check if we should create a new account or edit an existing one
+                            if (isset($actionData["entryid"])) {
+                                $result = $this->accountUpdate($actionData);
+                            }
+                            else {
+                                $result = $this->accountCreate($actionData);
+                            }
+                            break;
+
+                        case "delete":
+                            $result = $this->accountDelete($actionType, $actionData);
+                            break;
+
+                        case "list":
+                            if (isset($actionData["list_backend"]) && $actionData["list_backend"]) {
+                                $result = $this->backendInformation($actionType);
+                            }
+                            else {
+                                $result = $this->accountList($actionType, $actionData);
+                            }
+                            break;
+
+                        case "getquota":
+                            $result = $this->getQuotaInformation($actionType, $actionData);
+                            break;
+
+                        case "getversion":
+                            $result = $this->getVersionInformation($actionType, $actionData);
+                            break;
+
+                        case "updatetoken":
+                            $result = $this->updateOauthToken($actionType, $actionData);
+                            break;
+
+                        default:
+                            $this->handleUnknownActionType($actionType);
+                    }
+                }
+                catch (MAPIException $e) {
+                    $this->sendFeedback(false, $this->errorDetailsFromException($e));
+                }
+                catch (AccountException $e) {
+                    $this->sendFeedback(false, [
+                        'type' => ERROR_GENERAL,
+                        'info' => [
+                            'title' => $e->getTitle(),
+                            'original_message' => $e->getMessage(),
+                            'display_message' => $e->getMessage(),
+                        ],
+                    ]);
+                }
+                catch (BackendException $e) {
+                    $this->sendFeedback(false, [
+                        'type' => ERROR_GENERAL,
+                        'info' => [
+                            'title' => $e->getTitle(),
+                            'original_message' => $e->getMessage(),
+                            'display_message' => $e->getMessage(),
+                        ],
+                    ]);
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param {Array} $actionData
+     */
+    public function accountCreate($actionData) {
+        $response = [];
+        $requestProperties = $actionData["props"];
+
+        // create a new account in our backend
+        $accountStore = new \Files\Core\AccountStore();
+        $newAccount = $accountStore->createAccount($requestProperties["name"], $requestProperties["backend"], $requestProperties["backend_config"]);
+
+        // create the response account object
+        $account = [];
+        $account[$newAccount->getId()] = [
+            'props' => [
+                'id' => $newAccount->getId(),
+                'status' => $newAccount->getStatus(),
+                'status_description' => $newAccount->getStatusDescription(),
+                'name' => $newAccount->getName(),
+                'backend' => $newAccount->getBackend(),
+                'backend_config' => $newAccount->getBackendConfig(),
+                'backend_features' => $newAccount->getFeatures(),
+                'account_sequence' => $newAccount->getSequence(),
+            ],
+            'entryid' => $newAccount->getId(),
+            'store_entryid' => 'filesaccount',
+            'parent_entryid' => 'accountstoreroot',
+        ];
+        $response['item'] = array_values($account);
+
+        $this->addActionData("update", $response);
+        $GLOBALS["bus"]->addData($this->getResponseData());
+
+        return true;
+    }
+
+    /**
+     * remove an account from the store and the MAPI settings.
+     *
+     * @param {String} $actionType
+     * @param {Array} $actionData
+     */
+    public function accountDelete($actionType, $actionData) {
+        $response = [];
+
+        // check if account needs to clean things up before it gets deleted
+        try {
+            $accountStore = new \Files\Core\AccountStore();
+            $accountStore->getAccount($actionData['entryid'])->beforeDelete();
+        }
+        catch (\Files\Backend\Exception $e) {
+            // ignore errors here
+        }
+
+        $response['status'] = $accountStore->deleteAccount($actionData['entryid']);
+
+        $this->addActionData($actionType, $response);
+        $GLOBALS["bus"]->addData($this->getResponseData());
+
+        return $response['status'];
+    }
+
+    /**
+     * loads content of current folder - list of folders and files from the Files backend.
+     *
+     * @param {String} $actionType
+     * @param {Array} $actionData
+     */
+    public function accountList($actionType, $actionData) {
+        $response = [];
+
+        // get a list of all accounts
+        $accountStore = new \Files\Core\AccountStore();
+        $accounts = $accountStore->getAllAccounts();
+        $accountList = [];
+
+        if (is_array($accounts)) {
+            foreach ($accounts as $account) {
+                $account = $accountStore->updateAccount($account);
+                $accountList[$account->getId()] = [
+                    "props" => [
+                        "id" => $account->getId(),
+                        "name" => $account->getName(),
+                        "type" => "account", // to prevent warning while sorting
+                        "status" => $account->getStatus(),
+                        "status_description" => $account->getStatusDescription(),
+                        "backend" => $account->getBackend(),
+                        "backend_config" => $account->getBackendConfig(),
+                        'backend_features' => $account->getFeatures(),
+                        'account_sequence' => $account->getSequence(),
+                        'cannot_change' => $account->getCannotChangeFlag(),
+                    ],
+                    'entryid' => $account->getId(),
+                    'store_entryid' => 'filesaccount',
+                    'parent_entryid' => 'accountstoreroot',
+                ];
+            }
+        }
+
+        // sort the accounts
+        $sortKey = "account_sequence";
+        $sortDir = "ASC";
+
+        if (isset($data['sort'])) {
+            $sortKey = $data['sort'][0]['field'];
+            $sortDir = $data['sort'][0]['direction'];
+        }
+
+        Logger::debug(self::LOG_CONTEXT, "Sorting by " . $sortKey . " in direction: " . $sortDir);
+
+        $accountList = ArrayUtil::sort_props_by_key($accountList, $sortKey, $sortDir);
+
+        $response["item"] = array_values($accountList);
+        $response['page'] = ["start" => 0, "rowcount" => 50, "totalrowcount" => count($response["item"])];
+        $response['folder'] = ["content_count" => count($response["item"]), "content_unread" => 0];
+
+        $this->addActionData($actionType, $response);
+        $GLOBALS["bus"]->addData($this->getResponseData());
+
+        return true;
+    }
+
+    /**
+     * update some values of an account.
+     *
+     * @param {Array} $actionData
+     */
+    public function accountUpdate($actionData) {
+        $response = [];
+
+        // create a new account in our backend
+        $accountStore = new \Files\Core\AccountStore();
+        $currentAccount = $accountStore->getAccount($actionData['entryid']);
+
+        // apply changes to the account object
+        if (isset($actionData['props']['name'])) {
+            $currentAccount->setName(strip_tags($actionData['props']['name']));
+        }
+        if (isset($actionData['props']['backend'])) {
+            $currentAccount->setBackend(strip_tags($actionData['props']['backend']));
+        }
+        if (isset($actionData['props']['backend_config'])) { // we always get the whole backend config
+            $currentAccount->setBackendConfig($actionData['props']['backend_config']);
+        }
+        if (isset($actionData['props']['account_sequence'])) {
+            $currentAccount->setSequence($actionData['props']['account_sequence']);
+        }
+
+        // save changes
+        $accountStore->updateAccount($currentAccount);
+
+        // create the response object
+        $updatedAccount = [];
+        $updatedAccount[$currentAccount->getId()] = [
+            "props" => [
+                "id" => $currentAccount->getId(),
+                "name" => $currentAccount->getName(),
+                "status" => $currentAccount->getStatus(),
+                "status_description" => $currentAccount->getStatusDescription(),
+                "backend" => $currentAccount->getBackend(),
+                "backend_config" => $currentAccount->getBackendConfig(),
+                'backend_features' => $currentAccount->getFeatures(),
+                'account_sequence' => $currentAccount->getSequence(),
+            ],
+            'entryid' => $currentAccount->getId(),
+            'store_entryid' => 'filesaccount',
+            'parent_entryid' => 'accountstoreroot',
+        ];
+
+        $response['item'] = array_values($updatedAccount);
+        $this->addActionData("update", $response);
+        $GLOBALS["bus"]->addData($this->getResponseData());
+
+        return true;
+    }
+
+    /**
+     * Return all Information about the existing backends.
+     *
+     * @param {String} $actionType
+     */
+    public function backendInformation($actionType) {
+        // find all registered backends
+        $backendStore = \Files\Backend\BackendStore::getInstance();
+        $backendNames = $backendStore->getRegisteredBackendNames();
+
+        $data = [];
+        $items = [];
+        foreach ($backendNames as $backendName) {
+            $backendInstance = $backendStore->getInstanceOfBackend($backendName);
+            if ($backendInstance !== false) {
+                array_push($items, ['props' => [
+                    "name" => $backendName,
+                    "message_class" => "IPM.FilesBackend",
+                    "displayName" => $backendInstance->getDisplayName(),
+                ]]);
+            }
+        }
+
+        $data = array_merge($data, ['item' => $items]);
+
+        $this->addActionData($actionType, $data);
+        $GLOBALS["bus"]->addData($this->getResponseData());
+
+        return true;
+    }
+
+    /**
+     * Return all quota information from specified account.
+     *
+     * @param {String} $actionType
+     * @param {String} $actionData
+     */
+    public function getQuotaInformation($actionType, $actionData) {
+        $response = [];
+
+        $accountId = $actionData["accountId"];
+        $rootPath = $actionData["folder"];
+
+        // load the accountstore
+        $accountStore = new \Files\Core\AccountStore();
+        $currentAccount = $accountStore->getAccount($accountId);
+
+        // check if ID was valid, if not respond with error.
+        if ($currentAccount === null || $currentAccount === false) {
+            throw new AccountException(_("Unknown account ID"));
+        }
+
+        $backendStore = \Files\Backend\BackendStore::getInstance();
+        $backendInstance = $backendStore->getInstanceOfBackend($currentAccount->getBackend());
+
+        // check if backend really supports this feature
+        if (!$backendInstance->supports(\Files\Backend\BackendStore::FEATURE_QUOTA)) {
+            throw new AccountException(_('Feature "Quota Information" is not supported by this backend!'));
+        }
+
+        // init backend instance
+        $backendInstance->init_backend($currentAccount->getBackendConfig());
+
+        // get quota info
+        $backendInstance->open();
+        $qUsed = $backendInstance->getQuotaBytesUsed($rootPath);
+        $qAvailable = $backendInstance->getQuotaBytesAvailable($rootPath);
+
+        $response['status'] = true;
+        $response['quota'] = [
+            ["state" => _('Used'), "amount" => $qUsed],
+            ["state" => _('Free'), "amount" => $qAvailable],
+        ];
+
+        $this->addActionData($actionType, $response);
+        $GLOBALS["bus"]->addData($this->getResponseData());
+
+        return $response['status'];
+    }
+
+    /**
+     * Return all quota information from specified account.
+     *
+     * @param {String} $actionType
+     * @param {String} $actionData
+     */
+    public function getVersionInformation($actionType, $actionData) {
+        $response = [];
+
+        $accountId = $actionData["accountId"];
+
+        // load the accountstore
+        $accountStore = new \Files\Core\AccountStore();
+        $currentAccount = $accountStore->getAccount($accountId);
+
+        // check if ID was valid, if not respond with error.
+        if ($currentAccount === null || $currentAccount === false) {
+            throw new AccountException(_("Unknown account ID"));
+        }
+
+        $backendStore = \Files\Backend\BackendStore::getInstance();
+        $backendInstance = $backendStore->getInstanceOfBackend($currentAccount->getBackend());
+
+        // check if backend really supports this feature
+        if (!$backendInstance->supports(\Files\Backend\BackendStore::FEATURE_VERSION)) {
+            throw new AccountException(_('Feature "Version Information" is not supported by this backend!'));
+        }
+
+        // init backend instance
+        $backendInstance->init_backend($currentAccount->getBackendConfig());
+
+        // get quota info
+        $backendInstance->open();
+        $serverVersion = $backendInstance->getServerVersion();
+        $backendVersion = $backendInstance->getBackendVersion();
+
+        $response['status'] = true;
+        $response['version'] = [
+            "backend" => $backendVersion,
+            "server" => $serverVersion,
+        ];
+
+        $this->addActionData($actionType, $response);
+        $GLOBALS["bus"]->addData($this->getResponseData());
+
+        return $response['status'];
+    }
+
+    /**
+     * Return all quota information from specified account.
+     *
+     * @param {String} $actionType
+     * @param {String} $actionData
+     */
+    public function updateOauthToken($actionType, $actionData) {
+        $response = [];
+
+        $accountId = $actionData["accountId"];
+
+        // load the accountstore
+        $accountStore = new \Files\Core\AccountStore();
+        $currentAccount = $accountStore->getAccount($accountId);
+
+        // check if ID was valid, if not respond with error.
+        if ($currentAccount === null || $currentAccount === false) {
+            throw new AccountException(_("Unknown account ID"));
+        }
+
+        $backendStore = \Files\Backend\BackendStore::getInstance();
+        $backendInstance = $backendStore->getInstanceOfBackend($currentAccount->getBackend());
+
+        // check if backend really supports this feature
+        if (!$backendInstance->supports(\Files\Backend\BackendStore::FEATURE_OAUTH)) {
+            throw new AccountException(_('Feature "OAUTH" is not supported by this backend!'));
+        }
+
+        // init backend instance
+        $backendInstance->init_backend($currentAccount->getBackendConfig());
+        $backendInstance->changeAccessToken($actionData["access_token"]);
+
+        $response['status'] = true;
+        $response['access_token'] = $actionData["access_token"];
+
+        $this->addActionData($actionType, $response);
+        $GLOBALS["bus"]->addData($this->getResponseData());
+
+        return $response['status'];
+    }
+
+    /**
+     * Function will retrieve error details from exception object based on exception type.
+     * it should also send type of exception with the data. so client can know which type
+     * of exception is generated.
+     *
+     * @param object $exception the exception object which is generated
+     *
+     * @return array error data
+     * @overwrite
+     */
+    public function errorDetailsFromException($exception) {
+        parent::errorDetailsFromException($exception);
+    }
 }

Braces +6 added lines, -12 removed lines

@@ -44,8 +44,7 @@ 
 							// check if we should create a new account or edit an existing one
 							if (isset($actionData["entryid"])) {
 								$result = $this->accountUpdate($actionData);
-							}
-							else {
+							} else {
 								$result = $this->accountCreate($actionData);
 							}
 							break;
@@ -57,8 +56,7 @@ 
 						case "list":
 							if (isset($actionData["list_backend"]) && $actionData["list_backend"]) {
 								$result = $this->backendInformation($actionType);
-							}
-							else {
+							} else {
 								$result = $this->accountList($actionType, $actionData);
 							}
 							break;
@@ -78,11 +76,9 @@ 
 						default:
 							$this->handleUnknownActionType($actionType);
 					}
-				}
-				catch (MAPIException $e) {
+				} catch (MAPIException $e) {
 					$this->sendFeedback(false, $this->errorDetailsFromException($e));
-				}
-				catch (AccountException $e) {
+				} catch (AccountException $e) {
 					$this->sendFeedback(false, [
 						'type' => ERROR_GENERAL,
 						'info' => [
@@ -91,8 +87,7 @@ 
 							'display_message' => $e->getMessage(),
 						],
 					]);
-				}
-				catch (BackendException $e) {
+				} catch (BackendException $e) {
 					$this->sendFeedback(false, [
 						'type' => ERROR_GENERAL,
 						'info' => [
@@ -157,8 +152,7 @@ 
 		try {
 			$accountStore = new \Files\Core\AccountStore();
 			$accountStore->getAccount($actionData['entryid'])->beforeDelete();
-		}
-		catch (\Files\Backend\Exception $e) {
+		} catch (\Files\Backend\Exception $e) {
 			// ignore errors here
 		}