grommunio / grommunio-web

grommunio.php

Braces +4 added lines, -8 removed lines

@@ -24,8 +24,7 @@ 
 	// before we close the session.
 	if (isset($_SESSION["lang"])) {
 		$session_lang = $_SESSION["lang"];
-	}
-	else {
+	} else {
 		$session_lang = LANG;
 	}
 
@@ -62,8 +61,7 @@ 
 			// Return a HTTP 503 error so the client can act upon this event correctly.
 			header('HTTP/1.1 503 Service unavailable');
 			header("X-grommunio-Hresult: " . get_mapi_error_name(WebAppAuthentication::getErrorCode()));
-		}
-		else {
+		} else {
 			// The session expired, or the user is otherwise not logged on.
 			// Return a HTTP 401 error so the client can act upon this event correctly.
 			header('HTTP/1.1 401 Unauthorized');
@@ -145,8 +143,7 @@ 
 	// Execute the request
 	try {
 		$json = $request->execute($json);
-	}
-	catch (Exception $e) {
+	} catch (Exception $e) {
 		// invalid requestdata exception
 		dump($e);
 	}
@@ -160,8 +157,7 @@ 
 		// Set the correct header and compress the response
 		header("Content-Encoding: gzip");
 		echo gzencode($json);
-	}
-	else {
+	} else {
 		echo $json;
 	}
 

plugins/files/php/plugin.files.php

Braces +1 added lines, -2 removed lines

@@ -60,8 +60,7 @@
 				case 'form':
 					if (isset($_GET['backend'])) {
 						$backend = urldecode($_GET["backend"]);
-					}
-					else {
+					} else {
 						$backend = '';
 					}
 					$backendstore = Files\Backend\BackendStore::getInstance();

plugins/files/php/modules/class.hierarchylistmodule.php

Braces +6 added lines, -12 removed lines

@@ -47,11 +47,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' => [
@@ -60,8 +58,7 @@ 
 							'display_message' => $e->getMessage(),
 						],
 					]);
-				}
-				catch (BackendException $e) {
+				} catch (BackendException $e) {
 					$this->sendFeedback(false, [
 						'type' => ERROR_GENERAL,
 						'info' => [
@@ -71,8 +68,7 @@ 
 							'code' => $e->getCode(),
 						],
 					]);
-				}
-				catch (Exception $e) {
+				} catch (Exception $e) {
 					$this->sendFeedback(false, [
 						'type' => ERROR_GENERAL,
 						'info' => [
@@ -172,8 +168,7 @@ 
 			}
 
 			$this->sendFeedback(true);
-		}
-		else {
+		} else {
 			$nodeId = $actionData['folder_id'];
 			$relNodeId = substr($nodeId, strpos($nodeId, '/'));
 
@@ -185,8 +180,7 @@ 
 
 			try {
 				$initializedBackend->delete($relNodeId);
-			}
-			catch (\Files\Backend\Exception $e) {
+			} catch (\Files\Backend\Exception $e) {
 				// TODO: this might fails because the file was already deleted.
 				// fire error message if any other error occurred.
 				// Logger::debug(self::LOG_CONTEXT, "deleted a directory that was no longer available");

plugins/files/php/modules/class.fileslistmodule.php

Braces +8 added lines, -16 removed lines

@@ -79,8 +79,7 @@ 
 			// Get the username from the Encryption store
 			$encryptionStore = \EncryptionStore::getInstance();
 			$this->uid = $encryptionStore->get('username');
-		}
-		else {
+		} else {
 			$this->uid = $_SESSION["username"];
 		}
 		// As of the V6, the following characters can not longer being a part of the key identifier: {}()/\@:
@@ -259,8 +258,7 @@ 
 					$dir[$id]['store_entryid'] = $storeEntryid;
 
 					$updateCache = true;
-				}
-				else {
+				} else {
 					$entryid = $node['entryid'];
 					$parentEntryid = $node['parent_entryid'];
 					$storeEntryid = $node['store_entryid'];
@@ -272,8 +270,7 @@ 
 				if (is_null($nodeHasSubFolder)) {
 					unset($dir[$id]);
 					$updateCache = true;
-				}
-				else {
+				} else {
 					array_push($nodes, [
 						'id' => $realID,
 						'folder_id' => $realID,
@@ -367,8 +364,7 @@ 
 			try {
 				$dir = $backend->ls($id);
 				$this->setCache($accountID, $cachePath, $dir);
-			}
-			catch (Exception $e) {
+			} catch (Exception $e) {
 				$errorCode = $e->getCode();
 
 				// If folder not found or folder doesn't have enough access then don't display that folder.
@@ -379,8 +375,7 @@ 
 				$errorCode === self::ALL_BACKEND_ERR_NOTFOUND) {
 					if ($errorCode === self::ALL_BACKEND_ERR_NOTFOUND) {
 						Logger::error(self::LOG_CONTEXT, '[hasSubFolder]: folder ' . $id . ' not found');
-					}
-					else {
+					} else {
 						Logger::error(self::LOG_CONTEXT, '[hasSubFolder]: Access denied for folder ' . $id);
 					}
 
@@ -480,8 +475,7 @@ 
 				];
 				$response = $folder;
 			}
-		}
-		else {
+		} else {
 			// Rename/update the folder/file name
 			$folderId = $actionData['message_action']["source_folder_id"];
 			// rename/update the folder or files name.
@@ -517,8 +511,7 @@ 
 				$this->setCache($account->getId(), dirname($relSrc), $dir);
 
 				$this->updateCacheAfterRename($relSrc, $relDst, $account->getId());
-			}
-			else {
+			} else {
 				// clear the cache
 				$this->deleteCache($account->getId(), dirname($relSrc));
 			}
@@ -753,8 +746,7 @@ 
 				foreach ($action["store_entryid"] as $store_id) {
 					array_push($store, $store_id);
 				}
-			}
-			else {
+			} else {
 				$store = $action["store_entryid"];
 			}
 		}

plugins/files/php/Files/Backend/class.backendstore.php

Braces +2 added lines, -4 removed lines

@@ -71,8 +71,7 @@ 
 					array_push($list, $file);
 				}
 			}
-		}
-		else {
+		} else {
 			Logger::error(self::LOG_CONTEXT, "Error opening the backend directory: " . $workdir);
 		}
 
@@ -99,8 +98,7 @@ 
 					array_push($list, $backendName);
 				}
 			}
-		}
-		else {
+		} else {
 			Logger::error(self::LOG_CONTEXT, "Error opening the external backend directory: " . $workdir);
 		}
 

plugins/files/php/Files/Backend/Webdav/class.backend.php

Braces +22 added lines, -44 removed lines

@@ -214,8 +214,7 @@ 
 		if ($backend_config["use_grommunio_credentials"] === false) {
 			$this->set_user($backend_config["user"]);
 			$this->set_pass($backend_config["password"]);
-		}
-		else {
+		} else {
 			// For backward compatibility we will check if the Encryption store exists. If not,
 			// we will fall back to the old way of retrieving the password from the session.
 			if (class_exists('EncryptionStore')) {
@@ -223,8 +222,7 @@ 
 				$encryptionStore = \EncryptionStore::getInstance();
 				$this->set_user($encryptionStore->get('username'));
 				$this->set_pass($encryptionStore->get('password'));
-			}
-			else {
+			} else {
 				$this->set_user($GLOBALS['mapisession']->getUserName());
 				$password = $_SESSION['password'];
 				if (function_exists('openssl_decrypt')) {
@@ -338,8 +336,7 @@ 
 			$this->sabre_client->addCurlSetting(CURLOPT_SSL_VERIFYPEER, !$this->allowselfsigned);
 
 			return true;
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->log('Failed to open: ' . $e->getMessage());
 			if (intval($e->getHTTPCode()) == 401) {
 				$e = new BackendException($this->parseErrorCodeToMessage(self::WD_ERR_UNAUTHORIZED), $e->getHTTPCode());
@@ -417,15 +414,13 @@ 
 			$this->log("[LS] done in {$time} seconds");
 
 			return $lsdata;
-		}
-		catch (ClientException $e) {
+		} catch (ClientException $e) {
 			$this->log('ls sabre ClientException: ' . $e->getMessage());
 			$e = new BackendException($this->parseErrorCodeToMessage($e->getCode()), $e->getCode());
 			$e->setTitle($this->backendTransName . _('Sabre error'));
 
 			throw $e;
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->log('ls general exception: ' . $e->getMessage() . " [" . $e->getHTTPCode() . "]");
 			// THIS IS A FIX FOR OWNCLOUD - It does return 500 instead of 401...
 			$err_code = $e->getHTTPCode();
@@ -465,14 +460,12 @@ 
 			$this->log("[MKCOL] done in {$time} seconds: " . $response['statusCode']);
 
 			return true;
-		}
-		catch (ClientException $e) {
+		} catch (ClientException $e) {
 			$e = new BackendException($this->parseErrorCodeToMessage($e->getCode()), $e->getCode());
 			$e->setTitle($this->backendTransName . _('Sabre error'));
 
 			throw $e;
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->log('[MKCOL] fatal: ' . $e->getMessage());
 			$e = new BackendException($this->parseErrorCodeToMessage($e->getHTTPCode()), $e->getHTTPCode());
 			$e->setTitle($this->backendTransName . _('Directory creation failed'));
@@ -502,14 +495,12 @@ 
 			$this->log("[DELETE] done in {$time} seconds: " . $response['statusCode']);
 
 			return true;
-		}
-		catch (ClientException $e) {
+		} catch (ClientException $e) {
 			$e = new BackendException($this->parseErrorCodeToMessage($e->getCode()), $e->getCode());
 			$e->setTitle($this->backendTransName . _('Sabre error'));
 
 			throw $e;
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->log('[DELETE] fatal: ' . $e->getMessage());
 			$e = new BackendException($this->parseErrorCodeToMessage($e->getHTTPCode()), $e->getHTTPCode());
 			$e->setTitle($this->backendTransName . _('Deletion failed'));
@@ -538,8 +529,7 @@ 
 		$this->log("[MOVE] start for dir: {$src_path} -> {$dst_path}");
 		if ($overwrite) {
 			$overwrite = 'T';
-		}
-		else {
+		} else {
 			$overwrite = 'F';
 		}
 
@@ -550,14 +540,12 @@ 
 			$this->log("[MOVE] done in {$time} seconds: " . $response['statusCode']);
 
 			return true;
-		}
-		catch (ClientException $e) {
+		} catch (ClientException $e) {
 			$e = new BackendException($this->parseErrorCodeToMessage($e->getCode()), $e->getCode());
 			$e->setTitle($this->backendTransName . _('Sabre error'));
 
 			throw $e;
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->log('[MOVE] fatal: ' . $e->getMessage());
 			$e = new BackendException($this->parseErrorCodeToMessage($e->getHTTPCode()), $e->getHTTPCode());
 			$e->setTitle($this->backendTransName . _('Moving failed'));
@@ -590,14 +578,12 @@ 
 			$this->log("[PUT] done in {$time} seconds: " . $response['statusCode']);
 
 			return true;
-		}
-		catch (ClientException $e) {
+		} catch (ClientException $e) {
 			$e = new BackendException($this->parseErrorCodeToMessage($e->getCode()), $e->getCode());
 			$e->setTitle($this->backendTransName . _('Sabre error'));
 
 			throw $e;
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->log('[PUT] fatal: ' . $e->getMessage());
 			$e = new BackendException($this->parseErrorCodeToMessage($e->getHTTPCode()), $e->getHTTPCode());
 			$e->setTitle($this->backendTransName . _('Connection failed'));
@@ -669,14 +655,12 @@ 
 			$time_end = microtime(true);
 			$time = $time_end - $time_start;
 			$this->log("[GET_FILE] done in {$time} seconds: " . $response['statusCode']);
-		}
-		catch (ClientException $e) {
+		} catch (ClientException $e) {
 			$e = new BackendException($this->parseErrorCodeToMessage($e->getCode()), $e->getCode());
 			$e->setTitle($this->backendTransName . _('Sabre error'));
 
 			throw $e;
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->log('[GET_FILE] - FATAL -' . $e->getMessage());
 			$e = new BackendException($this->parseErrorCodeToMessage($e->getHTTPCode()), $e->getHTTPCode());
 			$e->setTitle($this->backendTransName . _('File or folder not found'));
@@ -751,8 +735,7 @@ 
 		$type = $response["{DAV:}resourcetype"]->resourceType;
 		if (is_array($type) && !empty($type)) {
 			$type = $type[0] == "{DAV:}collection" ? "collection" : "file";
-		}
-		else {
+		} else {
 			$type = "file"; // fall back to file if detection fails... less harmful
 		}
 
@@ -849,8 +832,7 @@ 
 		$this->log("[COPY] start for dir: {$src_path} -> {$dst_path}");
 		if ($overwrite) {
 			$overwrite = 'T';
-		}
-		else {
+		} else {
 			$overwrite = 'F';
 		}
 
@@ -866,14 +848,12 @@ 
 			$this->log("[COPY] done in {$time} seconds: " . $response['statusCode']);
 
 			return true;
-		}
-		catch (ClientException $e) {
+		} catch (ClientException $e) {
 			$e = new BackendException($this->parseErrorCodeToMessage($e->getCode()), $e->getCode());
 			$e->setTitle($this->backendTransName . _('Sabre error'));
 
 			throw $e;
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->log('[COPY] - FATAL - ' . $e->getMessage());
 			$e = new BackendException($this->parseErrorCodeToMessage($e->getHTTPCode()), $e->getHTTPCode());
 			$e->setTitle($this->backendTransName . _('Copying failed'));
@@ -890,8 +870,7 @@ 
 	protected function webdavUrl() {
 		if ($this->ssl) {
 			$url = "https://";
-		}
-		else {
+		} else {
 			$url = "http://";
 		}
 
@@ -1098,8 +1077,7 @@ 
 		if ($httpcode && $httpcode == "200" && $versiondata) {
 			$versions = json_decode($versiondata);
 			$version = $versions->versionstring;
-		}
-		else {
+		} else {
 			$version = "Undetected (no Owncloud?)";
 		}
 

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

Braces +2 added lines, -4 removed lines

@@ -20,8 +20,7 @@ 
 
 		if ($dir == "DESC") {
 			usort($arr, ['self', 'invsort']);
-		}
-		else {
+		} else {
 			usort($arr, ['self', 'sort']);
 		}
 
@@ -45,8 +44,7 @@ 
 
 		if ($dir == "DESC") {
 			usort($arr, ['self', 'invpropsort']);
-		}
-		else {
+		} else {
 			usort($arr, ['self', 'propsort']);
 		}
 

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

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

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()]);