nextcloud / server

apps/encryption/lib/Crypto/EncryptAll.php

Spacing +14 added lines, -14 removed lines

@@ -133,7 +133,7 @@ 
 		$this->input = $input;
 		$this->output = $output;
 
-		$headline = 'Encrypt all files with the ' . Encryption::DISPLAY_NAME;
+		$headline = 'Encrypt all files with the '.Encryption::DISPLAY_NAME;
 		$this->output->writeln("\n");
 		$this->output->writeln($headline);
 		$this->output->writeln(str_pad('', strlen($headline), '='));
@@ -179,14 +179,14 @@ 
 		$progress->setFormat(" %message% \n [%bar%]");
 		$progress->start();
 
-		foreach($this->userManager->getBackends() as $backend) {
+		foreach ($this->userManager->getBackends() as $backend) {
 			$limit = 500;
 			$offset = 0;
 			do {
 				$users = $backend->getUsers('', $limit, $offset);
 				foreach ($users as $user) {
 					if ($this->keyManager->userHasKeys($user) === false) {
-						$progress->setMessage('Create key-pair for ' . $user);
+						$progress->setMessage('Create key-pair for '.$user);
 						$progress->advance();
 						$this->setupUserFS($user);
 						$password = $this->generateOneTimePassword($user);
@@ -198,7 +198,7 @@ 
 					}
 				}
 				$offset += $limit;
-			} while(count($users) >= $limit);
+			} while (count($users) >= $limit);
 		}
 
 		$progress->setMessage('Key-pair created for all users');
@@ -236,7 +236,7 @@ 
 	 */
 	protected function encryptAllUserFilesWithMasterKey(ProgressBar $progress) {
 		$userNo = 1;
-		foreach($this->userManager->getBackends() as $backend) {
+		foreach ($this->userManager->getBackends() as $backend) {
 			$limit = 500;
 			$offset = 0;
 			do {
@@ -247,7 +247,7 @@ 
 					$userNo++;
 				}
 				$offset += $limit;
-			} while(count($users) >= $limit);
+			} while (count($users) >= $limit);
 		}
 	}
 
@@ -262,19 +262,19 @@ 
 
 		$this->setupUserFS($uid);
 		$directories = array();
-		$directories[] =  '/' . $uid . '/files';
+		$directories[] = '/'.$uid.'/files';
 
-		while($root = array_pop($directories)) {
+		while ($root = array_pop($directories)) {
 			$content = $this->rootView->getDirectoryContent($root);
 			foreach ($content as $file) {
-				$path = $root . '/' . $file['name'];
+				$path = $root.'/'.$file['name'];
 				if ($this->rootView->is_dir($path)) {
 					$directories[] = $path;
 					continue;
 				} else {
 					$progress->setMessage("encrypt files for user $userCount: $path");
 					$progress->advance();
-					if($this->encryptFile($path) === false) {
+					if ($this->encryptFile($path) === false) {
 						$progress->setMessage("encrypt files for user $userCount: $path (already encrypted)");
 						$progress->advance();
 					}
@@ -292,7 +292,7 @@ 
 	protected function encryptFile($path) {
 
 		$source = $path;
-		$target = $path . '.encrypted.' . time();
+		$target = $path.'.encrypted.'.time();
 
 		try {
 			$this->rootView->copy($source, $target);
@@ -414,7 +414,7 @@ 
 					continue;
 				}
 
-				$subject = (string)$this->l->t('one-time password for server-side-encryption');
+				$subject = (string) $this->l->t('one-time password for server-side-encryption');
 				list($htmlBody, $textBody) = $this->createMailBody($password);
 
 				// send it out now
@@ -462,11 +462,11 @@ 
 	protected function createMailBody($password) {
 
 		$html = new \OC_Template("encryption", "mail", "");
-		$html->assign ('password', $password);
+		$html->assign('password', $password);
 		$htmlMail = $html->fetchPage();
 
 		$plainText = new \OC_Template("encryption", "altmail", "");
-		$plainText->assign ('password', $password);
+		$plainText->assign('password', $password);
 		$plainTextMail = $plainText->fetchPage();
 
 		return [$htmlMail, $plainTextMail];

apps/encryption/lib/Crypto/DecryptAll.php

Spacing +3 added lines, -3 removed lines

@@ -83,10 +83,10 @@ 
 
 		$question = new Question('Please enter the recovery key password: ');
 
-		if($this->util->isMasterKeyEnabled()) {
+		if ($this->util->isMasterKeyEnabled()) {
 			$output->writeln('Use master key to decrypt all files');
 			$user = $this->keyManager->getMasterKeyId();
-			$password =$this->keyManager->getMasterKeyPassword();
+			$password = $this->keyManager->getMasterKeyPassword();
 		} else {
 			$recoveryKeyId = $this->keyManager->getRecoveryKeyId();
 			if (!empty($user)) {
@@ -101,7 +101,7 @@ 
 				if ($useLoginPassword) {
 					$question = new Question('Please enter the user\'s login password: ');
 				} else if ($this->util->isRecoveryEnabledForUser($user) === false) {
-					$output->writeln('No recovery key available for user ' . $user);
+					$output->writeln('No recovery key available for user '.$user);
 					return false;
 				} else {
 					$user = $recoveryKeyId;

apps/comments/lib/Activity/Provider.php

Spacing +3 added lines, -3 removed lines

@@ -181,12 +181,12 @@
 				}
 
 				$message = preg_replace(
-					'/(^|\s)(' . '@' . $mention['id'] . ')(\b)/',
+					'/(^|\s)('.'@'.$mention['id'].')(\b)/',
 					//'${1}' . $this->regexSafeUser($mention['id'], $displayName) . '${3}',
-					'${1}' . '{mention' . $mentionCount . '}' . '${3}',
+					'${1}'.'{mention'.$mentionCount.'}'.'${3}',
 					$message
 				);
-				$mentions['mention' . $mentionCount] = $this->generateUserParameter($mention['id']);
+				$mentions['mention'.$mentionCount] = $this->generateUserParameter($mention['id']);
 				$mentionCount++;
 			}
 

apps/comments/lib/Notification/Listener.php

Spacing +8 added lines, -8 removed lines

@@ -55,15 +55,15 @@ 
 		$comment = $event->getComment();
 
 		$mentions = $this->extractMentions($comment->getMentions());
-		if(empty($mentions)) {
+		if (empty($mentions)) {
 			// no one to notify
 			return;
 		}
 
 		$notification = $this->instantiateNotification($comment);
 
-		foreach($mentions as $uid) {
-			if( ($comment->getActorType() === 'users' && $uid === $comment->getActorId())
+		foreach ($mentions as $uid) {
+			if (($comment->getActorType() === 'users' && $uid === $comment->getActorId())
 				|| !$this->userManager->userExists($uid)
 			) {
 				// do not notify unknown users or yourself
@@ -71,7 +71,7 @@ 
 			}
 
 			$notification->setUser($uid);
-			if(    $event->getEvent() === CommentsEvent::EVENT_DELETE
+			if ($event->getEvent() === CommentsEvent::EVENT_DELETE
 				|| $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE)
 			{
 				$this->notificationManager->markProcessed($notification);
@@ -92,7 +92,7 @@ 
 		$notification
 			->setApp('comments')
 			->setObject('comment', $comment->getId())
-			->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
+			->setSubject('mention', [$comment->getObjectType(), $comment->getObjectId()])
 			->setDateTime($comment->getCreationDateTime());
 
 		return $notification;
@@ -105,12 +105,12 @@ 
 	 * @return string[] containing the mentions, e.g. ['alice', 'bob']
 	 */
 	public function extractMentions(array $mentions) {
-		if(empty($mentions)) {
+		if (empty($mentions)) {
 			return [];
 		}
 		$uids = [];
-		foreach($mentions as $mention) {
-			if($mention['type'] === 'user') {
+		foreach ($mentions as $mention) {
+			if ($mention['type'] === 'user') {
 				$uids[] = $mention['id'];
 			}
 		}

apps/comments/lib/AppInfo/Application.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 
 class Application extends App {
 
-	public function __construct (array $urlParams = array()) {
+	public function __construct(array $urlParams = array()) {
 		parent::__construct('comments', $urlParams);
 		$container = $this->getContainer();
 

apps/comments/lib/EventHandler.php

Spacing +3 added lines, -3 removed lines

@@ -51,13 +51,13 @@ 
 	 * @param CommentsEvent $event
 	 */
 	public function handle(CommentsEvent $event) {
-		if($event->getComment()->getObjectType() !== 'files') {
+		if ($event->getComment()->getObjectType() !== 'files') {
 			// this is a 'files'-specific Handler
 			return;
 		}
 
 		$eventType = $event->getEvent();
-		if( $eventType === CommentsEvent::EVENT_ADD
+		if ($eventType === CommentsEvent::EVENT_ADD
 		) {
 			$this->notificationHandler($event);
 			$this->activityHandler($event);
@@ -69,7 +69,7 @@ 
 			CommentsEvent::EVENT_UPDATE,
 			CommentsEvent::EVENT_DELETE,
 		];
-		if(in_array($eventType, $applicableEvents)) {
+		if (in_array($eventType, $applicableEvents)) {
 			$this->notificationHandler($event);
 			return;
 		}

apps/files_trashbin/ajax/undelete.php

Spacing +9 added lines, -9 removed lines

@@ -31,10 +31,10 @@ 
 
 $dir = '/';
 if (isset($_POST['dir'])) {
-	$dir = rtrim((string)$_POST['dir'], '/'). '/';
+	$dir = rtrim((string) $_POST['dir'], '/').'/';
 }
 $allFiles = false;
-if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true') {
+if (isset($_POST['allfiles']) && (string) $_POST['allfiles'] === 'true') {
 	$allFiles = true;
 	$list = array();
 	$dirListing = true;
@@ -44,7 +44,7 @@ 
 	foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) {
 		$fileName = $file['name'];
 		if (!$dirListing) {
-			$fileName .= '.d' . $file['mtime'];
+			$fileName .= '.d'.$file['mtime'];
 		}
 		$list[] = $fileName;
 	}
@@ -57,21 +57,21 @@ 
 
 $i = 0;
 foreach ($list as $file) {
-	$path = $dir . '/' . $file;
+	$path = $dir.'/'.$file;
 	if ($dir === '/') {
 		$file = ltrim($file, '/');
 		$delimiter = strrpos($file, '.d');
 		$filename = substr($file, 0, $delimiter);
-		$timestamp =  substr($file, $delimiter+2);
+		$timestamp = substr($file, $delimiter + 2);
 	} else {
 		$path_parts = pathinfo($file);
 		$filename = $path_parts['basename'];
 		$timestamp = null;
 	}
 
-	if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) {
+	if (!OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp)) {
 		$error[] = $filename;
-		\OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, \OCP\Util::ERROR);
+		\OCP\Util::writeLog('trashbin', 'can\'t restore '.$filename, \OCP\Util::ERROR);
 	} else {
 		$success[$i]['filename'] = $file;
 		$success[$i]['timestamp'] = $timestamp;
@@ -80,9 +80,9 @@ 
 
 }
 
-if ( $error ) {
+if ($error) {
 	$filelist = '';
-	foreach ( $error as $e ) {
+	foreach ($error as $e) {
 		$filelist .= $e.', ';
 	}
 	$l = OC::$server->getL10N('files_trashbin');

apps/files_trashbin/ajax/list.php

Spacing +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
 \OC::$server->getSession()->close();
 
 // Load the files
-$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : '';
-$sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name';
+$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : '';
+$sortAttribute = isset($_GET['sort']) ? (string) $_GET['sort'] : 'name';
 $sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
 $data = array();
 

apps/files_trashbin/ajax/delete.php

Spacing +8 added lines, -8 removed lines

@@ -31,7 +31,7 @@ 
 $folder = isset($_POST['dir']) ? $_POST['dir'] : '/';
 
 // "empty trash" command
-if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true'){
+if (isset($_POST['allfiles']) && (string) $_POST['allfiles'] === 'true') {
 	$deleteAll = true;
 	if ($folder === '/' || $folder === '') {
 		OCA\Files_Trashbin\Trashbin::deleteAll();
@@ -43,11 +43,11 @@ 
 }
 else {
 	$deleteAll = false;
-	$files = (string)$_POST['files'];
+	$files = (string) $_POST['files'];
 	$list = json_decode($files);
 }
 
-$folder = rtrim($folder, '/') . '/';
+$folder = rtrim($folder, '/').'/';
 $error = array();
 $success = array();
 
@@ -57,16 +57,16 @@ 
 		$file = ltrim($file, '/');
 		$delimiter = strrpos($file, '.d');
 		$filename = substr($file, 0, $delimiter);
-		$timestamp =  substr($file, $delimiter+2);
+		$timestamp = substr($file, $delimiter + 2);
 	} else {
-		$filename = $folder . '/' . $file;
+		$filename = $folder.'/'.$file;
 		$timestamp = null;
 	}
 
 	OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp);
 	if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
 		$error[] = $filename;
-		\OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', \OCP\Util::ERROR);
+		\OCP\Util::writeLog('trashbin', 'can\'t delete '.$filename.' permanently.', \OCP\Util::ERROR);
 	}
 	// only list deleted files if not deleting everything
 	else if (!$deleteAll) {
@@ -76,9 +76,9 @@ 
 	}
 }
 
-if ( $error ) {
+if ($error) {
 	$filelist = '';
-	foreach ( $error as $e ) {
+	foreach ($error as $e) {
 		$filelist .= $e.', ';
 	}
 	$l = \OC::$server->getL10N('files_trashbin');