grommunio / grommunio-web

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

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

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
 		}
 

plugins/files/php/cssloader.php

Braces +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
 	$content .= file_get_contents("../resources/css/navbar.css");
 	$content .= file_get_contents("../resources/css/pdfjspanel.css");
 	$content .= file_get_contents("../resources/css/webodfpanel.css");
-}
-else {
+} else {
 	$content .= file_get_contents("../resources/css/files" . $debug . ".css");
 }
 

plugins/files/php/class.filesbrowsermodule.php

Braces +27 added lines, -54 removed lines

@@ -115,19 +115,16 @@ 
 										// check if we should create something new or edit an existing file/folder
 										if (isset($actionData["entryid"])) {
 											$result = $this->rename($actionType, $actionData);
-										}
-										else {
+										} else {
 											$result = $this->save($actionData);
 										}
 										break;
 								}
-							}
-							else {
+							} else {
 								// check if we should create something new or edit an existing file/folder
 								if (isset($actionData["entryid"])) {
 									$result = $this->rename($actionType, $actionData);
-								}
-								else {
+								} else {
 									$result = $this->save($actionData);
 								}
 							}
@@ -164,11 +161,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' => [
@@ -177,8 +172,7 @@ 
 							'display_message' => $e->getMessage(),
 						],
 					]);
-				}
-				catch (BackendException $e) {
+				} catch (BackendException $e) {
 					$this->sendFeedback(false, [
 						'type' => ERROR_GENERAL,
 						'info' => [
@@ -239,8 +233,7 @@ 
 					'parent_entryid' => $this->createId($realNodeId),
 				];
 			}
-		}
-		else {
+		} else {
 			$account = $this->accountStore->getAccount($accountID);
 
 			// initialize the backend
@@ -356,8 +349,7 @@ 
 				$dirName = dirname($nodeId, 1);
 				if ($dirName === '/') {
 					$path = stringToUTF8Encode($nodeIdPrefix . $dirName);
-				}
-				else {
+				} else {
 					$path = stringToUTF8Encode($nodeIdPrefix . $dirName . '/');
 				}
 
@@ -371,8 +363,7 @@ 
 					$dir[$id]['store_entryid'] = $storeEntryid;
 
 					$updateCache = true;
-				}
-				else {
+				} else {
 					$entryid = $node['entryid'];
 					$parentEntryid = $node['parent_entryid'];
 					$storeEntryid = $node['store_entryid'];
@@ -401,8 +392,7 @@ 
 			if ($updateCache) {
 				$this->setCache($accountID, $cachePath, $dir);
 			}
-		}
-		else {
+		} else {
 			Logger::debug(self::LOG_CONTEXT, "dir was empty");
 		}
 
@@ -433,8 +423,7 @@ 
 
 		if ($navtree) {
 			$sortednodes = ArrayUtil::sort_by_key($nodes, $sortkey, $sortdir);
-		}
-		else {
+		} else {
 			$sortednodes = ArrayUtil::sort_props_by_key($nodes, $sortkey, $sortdir);
 		}
 
@@ -481,8 +470,7 @@ 
 			$response['status'] = true;
 			$this->addActionData($actionType, $response);
 			$GLOBALS["bus"]->addData($this->getResponseData());
-		}
-		else {
+		} else {
 			$nodeId = $actionData['folder_id'];
 
 			$relNodeId = substr($nodeId, strpos($nodeId, '/'));
@@ -495,8 +483,7 @@ 
 
 			try {
 				$result = $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");
@@ -686,8 +673,7 @@ 
 
 			try {
 				$lsdata = $initializedBackend->ls($relDirname); // we can only check files in the same folder, so one request will be enough
-			}
-			catch (Exception $e) {
+			} catch (Exception $e) {
 				// ignore - if file not found -> does not exist :)
 			}
 			if (isset($lsdata) && is_array($lsdata)) {
@@ -810,8 +796,7 @@ 
 
 				$this->updateDirCache($initializedBackend, $dirName, $filePath, $actionData);
 			}
-		}
-		elseif ($actionData["type"] === "mail") {
+		} elseif ($actionData["type"] === "mail") {
 			foreach ($actionData["items"] as $item) {
 				list($tmpname, $filename) = $this->prepareEmailForUpload($item);
 
@@ -825,8 +810,7 @@ 
 
 				$this->updateDirCache($initializedBackend, $dirName, $filePath, $actionData);
 			}
-		}
-		else {
+		} else {
 			$this->sendFeedback(false, [
 				'type' => ERROR_GENERAL,
 				'info' => [
@@ -941,12 +925,10 @@ 
 						// Set filename
 						if (isset($props[PR_ATTACH_LONG_FILENAME])) {
 							$filename = PathUtil::sanitizeFilename($props[PR_ATTACH_LONG_FILENAME]);
-						}
-						else {
+						} else {
 							if (isset($props[PR_ATTACH_FILENAME])) {
 								$filename = PathUtil::sanitizeFilename($props[PR_ATTACH_FILENAME]);
-							}
-							else {
+							} else {
 								if (isset($props[PR_DISPLAY_NAME])) {
 									$filename = PathUtil::sanitizeFilename($props[PR_DISPLAY_NAME]);
 								}
@@ -956,8 +938,7 @@ 
 						// Set content type
 						if (isset($props[PR_ATTACH_MIME_TAG])) {
 							$contentType = $props[PR_ATTACH_MIME_TAG];
-						}
-						else {
+						} else {
 							// Parse the extension of the filename to get the content type
 							if (strrpos($filename, ".") !== false) {
 								$extension = strtolower(substr($filename, strrpos($filename, ".")));
@@ -1001,12 +982,10 @@ 
 						return [$tmpname, $filename];
 					}
 				}
-			}
-			else {
+			} else {
 				Logger::error(self::LOG_CONTEXT, "store could not be opened");
 			}
-		}
-		else {
+		} else {
 			Logger::error(self::LOG_CONTEXT, "wrong call, store and entryid have to be set");
 		}
 
@@ -1060,8 +1039,7 @@ 
 				if (isset($messageProps[PR_EC_IMAP_EMAIL]) || propIsError(PR_EC_IMAP_EMAIL, $messageProps) == MAPI_E_NOT_ENOUGH_MEMORY) {
 					// Stream the message to properly get the PR_EC_IMAP_EMAIL property
 					$stream = mapi_openproperty($message, PR_EC_IMAP_EMAIL, IID_IStream, 0, 0);
-				}
-				else {
+				} else {
 					// Get addressbook for current session
 					$addrBook = $GLOBALS['mapisession']->getAddressbook();
 
@@ -1071,8 +1049,7 @@ 
 
 				if (!empty($messageProps[PR_SUBJECT])) {
 					$filename = PathUtil::sanitizeFilename($messageProps[PR_SUBJECT]) . '.eml';
-				}
-				else {
+				} else {
 					$filename = _('Untitled') . '.eml';
 				}
 
@@ -1132,8 +1109,7 @@ 
 
 		try {
 			$sInfo = $initializedBackend->sharingDetails($relRecords);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$response['status'] = false;
 			$response['header'] = _('Fetching sharing information failed');
 			$response['message'] = $e->getMessage();
@@ -1193,8 +1169,7 @@ 
 
 		try {
 			$sInfo = $initializedBackend->share($sharingRecords);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$response['status'] = false;
 			$response['header'] = _('Sharing failed');
 			$response['message'] = $e->getMessage();
@@ -1255,8 +1230,7 @@ 
 
 		try {
 			$sInfo = $initializedBackend->share($sharingRecords, true);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$response['status'] = false;
 			$response['header'] = _('Updating share failed');
 			$response['message'] = $e->getMessage();
@@ -1305,8 +1279,7 @@ 
 
 		try {
 			$sInfo = $initializedBackend->unshare($records);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$response['status'] = false;
 			$response['header'] = _('Deleting share failed');
 			$response['message'] = $e->getMessage();

plugins/passwd/php/class.passwdmodule.php

Braces +6 added lines, -12 removed lines

@@ -19,8 +19,7 @@ 
 						default:
 							$this->handleUnknownActionType($actionType);
 					}
-				}
-				catch (MAPIException $e) {
+				} catch (MAPIException $e) {
 					$this->sendFeedback(false, $this->errorDetailsFromException($e));
 				}
 			}
@@ -59,8 +58,7 @@ 
 
 		if (empty($errorMessage)) {
 			$this->saveInDB($data);
-		}
-		else {
+		} else {
 			$this->sendFeedback(false, [
 				'type' => ERROR_ZARAFA,
 				'info' => [
@@ -92,8 +90,7 @@ 
 
 		if ($data['current_password'] !== $sessionPass) {
 			$errorMessage = _('Current password does not match.');
-		}
-		elseif (defined('PLUGIN_PASSWD_USE_ZCORE') && PLUGIN_PASSWD_USE_ZCORE) {
+		} elseif (defined('PLUGIN_PASSWD_USE_ZCORE') && PLUGIN_PASSWD_USE_ZCORE) {
 			try {
 				$result = nsp_setuserpasswd($userName, $sessionPass, $newPassword);
 				// password changed successfully
@@ -111,8 +108,7 @@ 
 
 					return;
 				}
-			}
-			catch (MAPIException $e) {
+			} catch (MAPIException $e) {
 				if (mapi_last_hresult() == MAPI_E_NO_ACCESS) {
 					$errorMessage = _('Your password is wrong or you have insufficient permission to change password');
 				}
@@ -120,8 +116,7 @@ 
 			if (empty($errorMessage)) {
 				$errorMessage = _('Password is not changed.');
 			}
-		}
-		else {
+		} else {
 			$url = (defined('PLUGIN_PASSWD_ADMIN_API_ENDPOINT') && PLUGIN_PASSWD_ADMIN_API_ENDPOINT) ?
 				PLUGIN_PASSWD_ADMIN_API_ENDPOINT :
 				'http://[::1]:8080/api/v1/passwd';
@@ -141,8 +136,7 @@ 
 
 			if ($result === false) {
 				$errorMessage = _('Error changing password. Please contact the system administrator.');
-			}
-			else {
+			} else {
 				$this->sendFeedback(true, [
 					'info' => [
 						'display_message' => _('Password has been changed successfully.'),

plugins/mdm/php/class.pluginmdmmodule.php

Braces +13 added lines, -26 removed lines

@@ -53,8 +53,7 @@ 
 						// fallback for "old-style" states
 						if (isset($unserializedState->data->devices)) {
 							$devices[$unserializedState->data->devices->{$username}->data->deviceid] = $unserializedState->data->devices->{$username}->data;
-						}
-						else {
+						} else {
 							$devices[$unserializedState->data->deviceid] = $unserializedState->data;
 						}
 					}
@@ -94,8 +93,7 @@ 
 
 					return true;
 				}
-			}
-			catch (Exception $e) {
+			} catch (Exception $e) {
 				error_log(sprintf("mdm plugin resyncDevice Exception: %s", $e));
 
 				return false;
@@ -168,8 +166,7 @@ 
 				$ret = file_get_contents(PLUGIN_MDM_ADMIN_API_WIPE_ENDPOINT . $GLOBALS["mapisession"]->getUserName() . "?devices=" . $deviceid, false, stream_context_create($opts));
 
 				return $ret;
-			}
-			catch (Exception $e) {
+			} catch (Exception $e) {
 				error_log(sprintf("mdm plugin removeDevice Exception: %s", $e));
 
 				return false;
@@ -268,8 +265,7 @@ 
 						default:
 							$this->handleUnknownActionType($actionType);
 					}
-				}
-				catch (Exception $e) {
+				} catch (Exception $e) {
 					$title = _('Mobile device management plugin');
 					$display_message = sprintf(_('Unexpected error occurred. Please contact your system administrator. Error code: %s'), $e->getMessage());
 					$this->sendFeedback(true, ["type" => ERROR_GENERAL, "info" => ['title' => $title, 'display_message' => $display_message]]);
@@ -320,8 +316,7 @@ 
 				$folderType = $this->getSyncFolderType($type);
 				if (isset($synchedFolderTypes[$folderType])) {
 					++$synchedFolderTypes[$folderType];
-				}
-				else {
+				} else {
 					$synchedFolderTypes[$folderType] = 1;
 				}
 			}
@@ -400,8 +395,7 @@ 
 			foreach ($stores as $store) {
 				try {
 					$entryid = mapi_msgstore_entryidfromsourcekey($store, hex2bin($item->folderid));
-				}
-				catch (MAPIException $me) {
+				} catch (MAPIException $me) {
 					continue;
 				}
 			}
@@ -496,11 +490,9 @@ 
 			}
 			if ($storeType == ZARAFA_STORE_DELEGATE_GUID) {
 				$storeUserName = $GLOBALS["mapisession"]->getUserNameOfStore($msgstore_props[PR_ENTRYID]);
-			}
-			elseif ($storeType == ZARAFA_STORE_PUBLIC_GUID) {
+			} elseif ($storeType == ZARAFA_STORE_PUBLIC_GUID) {
 				$storeUserName = "SYSTEM";
-			}
-			else {
+			} else {
 				$storeUserName = $msgstore_props[PR_USER_NAME];
 			}
 
@@ -521,16 +513,14 @@ 
 
 					try {
 						$subtreeFolder = mapi_msgstore_openentry($store, $subtreeFolderEntryID);
-					}
-					catch (MAPIException $e) {
+					} catch (MAPIException $e) {
 						// We've handled the event
 						$e->setHandled();
 					}
 
 					if ($storeType != ZARAFA_STORE_PUBLIC_GUID) {
 						$this->getSubFolders($subtreeFolder, $store, $properties, $storeData, $storeUserName);
-					}
-					else {
+					} else {
 						$this->getSubFoldersPublic($subtreeFolder, $store, $properties, $storeData, $storeUserName);
 					}
 				}
@@ -558,8 +548,7 @@ 
 		try {
 			$inbox = mapi_msgstore_getreceivefolder($store);
 			$inboxProps = mapi_getprops($inbox, [PR_ENTRYID]);
-		}
-		catch (MAPIException $e) {
+		} catch (MAPIException $e) {
 			// don't propagate this error to parent handlers, if store doesn't support it
 			if ($e->getCode() === MAPI_E_NO_SUPPORT) {
 				$e->setHandled();
@@ -634,8 +623,7 @@ 
 			try {
 				// load folder props
 				$folder = mapi_msgstore_openentry($store, $folderEntryID);
-			}
-			catch (MAPIException $e) {
+			} catch (MAPIException $e) {
 				// Indicate that we don't have access to the store,
 				// so no more attempts to read properties or open entries.
 				$store_access = false;
@@ -834,8 +822,7 @@ 
 						if ($specialFolder) {
 							// Special folders can be redirected again to getSubFolders(),
 							$this->getSubFolders($specialFolder, $store, $properties, $storeData, $storeUserName);
-						}
-						else {
+						} else {
 							$folderObject = mapi_msgstore_openentry($store, $subfolder[PR_ENTRYID]);
 							array_push($expand, ['folder' => $folderObject, 'props' => $subfolder]);
 						}

plugins/filesbackendOwncloud/php/class.backend.php

Braces +12 added lines, -24 removed lines

@@ -177,8 +177,7 @@ 
 			$this->ocs_client = new ocsclient($this->getOwncloudBaseURL(), $this->user, $this->pass, $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());
@@ -216,8 +215,7 @@ 
 		$this->log("[COPY] start for dir: {$src_path} -> {$dst_path}");
 		if ($overwrite) {
 			$overwrite = 'T';
-		}
-		else {
+		} else {
 			$overwrite = 'F';
 		}
 
@@ -233,14 +231,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'));
@@ -376,8 +372,7 @@ 
 		if ($httpcode && $httpcode == "200" && $versiondata) {
 			$versions = json_decode($versiondata);
 			$version = $versions->versionstring;
-		}
-		else {
+		} else {
 			$version = "Undetected (no ownCloud?)";
 		}
 
@@ -410,8 +405,7 @@ 
 
 		try {
 			$this->ocs_client->loadShares($path);
-		}
-		catch (ConnectionException $e) {
+		} catch (ConnectionException $e) {
 			$this->log('[GETSHARES]: connection exception while loading shares: ' . $e->getMessage() . " " . $e->getCode());
 		}
 		$shares = $this->ocs_client->getAllShares();
@@ -466,8 +460,7 @@ 
 		if (count($patharray) > 1) {
 			try {
 				$this->ocs_client->loadShares();
-			}
-			catch (ConnectionException $e) {
+			} catch (ConnectionException $e) {
 				$this->log('[SHARINGDETAILS]: connection exception while loading shares: ' . $e->getMessage() . " " . $e->getCode());
 			}
 
@@ -491,13 +484,11 @@ 
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			if (count($patharray) == 1) {
 				try {
 					$shares = $this->ocs_client->loadShareByPath($patharray[0]);
-				}
-				catch (FileNotFoundException $e) {
+				} catch (FileNotFoundException $e) {
 					$shares = false;
 				}
 
@@ -518,8 +509,7 @@ 
 						];
 					}
 				}
-			}
-			else {
+			} else {
 				return false; // $patharray was empty...
 			}
 		}
@@ -564,8 +554,7 @@ 
 						"token" => $share->getToken(),
 						"url" => $share->getUrl(),
 					];
-				}
-				else {
+				} else {
 					foreach ($options as $key => $value) {
 						$this->ocs_client->updateShare($path, $key, $value);
 					}
@@ -575,8 +564,7 @@ 
 					];
 				}
 			}
-		}
-		else {
+		} else {
 			$this->log('No share params given');
 
 			return false; // no shareparams...

plugins/filesbackendOwncloud/php/lib/ocsapi/class.ocsclient.php

Braces +7 added lines, -14 removed lines

@@ -160,8 +160,7 @@ 
 
 		if ($httpcode == 0) {
 			$message = curl_errno($ch);
-		}
-		else {
+		} else {
 			$message = $httpcode;
 		}
 		curl_close($ch);
@@ -194,8 +193,7 @@ 
 
 		if (empty($path)) {
 			$url = $this->getOCSUrl();
-		}
-		else {
+		} else {
 			$url = $this->getOCSUrl() . "?path=" . urlencode($path) . "&subfiles=true";
 		}
 		$this->parseListingResponse($this->doCurlGetRequest($url));
@@ -278,8 +276,7 @@ 
 		if ($httpcode === 200) {
 			try {
 				$xmldata = new \SimpleXMLElement($responsedata);
-			}
-			catch (\Exception $e) {
+			} catch (\Exception $e) {
 				throw new InvalidResponseException($responsedata);
 			}
 
@@ -466,8 +463,7 @@ 
 		if ($response) {
 			try {
 				$xmldata = new \SimpleXMLElement($response);
-			}
-			catch (\Exception $e) {
+			} catch (\Exception $e) {
 				throw new InvalidResponseException($response);
 			}
 
@@ -486,8 +482,7 @@ 
 					return false;
 				}
 			}
-		}
-		else {
+		} else {
 			throw new InvalidResponseException($response);
 		}
 
@@ -512,8 +507,7 @@ 
 
 		try {
 			$xmldata = new \SimpleXMLElement($response);
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			throw new InvalidResponseException($response);
 		}
 
@@ -574,8 +568,7 @@ 
 				default:
 					throw new InvalidResponseException($message);
 			}
-		}
-		else {
+		} else {
 			throw new InvalidResponseException("Response contains no meta block.");
 		}
 	}

plugins/filesbackendOwncloud/php/lib/ocsapi/test/TestClient.php

Braces +1 added lines, -2 removed lines

@@ -58,7 +58,6 @@
 try {
 	$deleteShare = $ocscloient->loadShareByID($share4->getId());
 	print_r($deleteShare);
-}
-catch (Exception $e) {
+} catch (Exception $e) {
 	print_r($e);
 }