nextcloud / server

apps/comments/lib/Controller/Notifications.php

Spacing +4 added lines, -4 removed lines

@@ -93,18 +93,18 @@ 
 	public function view($id) {
 		try {
 			$comment = $this->commentsManager->get($id);
-			if($comment->getObjectType() !== 'files') {
+			if ($comment->getObjectType() !== 'files') {
 				return new NotFoundResponse();
 			}
 			$files = $this->folder->getById($comment->getObjectId());
-			if(count($files) === 0) {
+			if (count($files) === 0) {
 				$this->markProcessed($comment);
 				return new NotFoundResponse();
 			}
 
 			$url = $this->urlGenerator->linkToRouteAbsolute(
 				'files.viewcontroller.showFile',
-				[ 'fileid' => $comment->getObjectId() ]
+				['fileid' => $comment->getObjectId()]
 			);
 
 			$this->markProcessed($comment);
@@ -121,7 +121,7 @@ 
 	 */
 	protected function markProcessed(IComment $comment) {
 		$user = $this->userSession->getUser();
-		if(is_null($user)) {
+		if (is_null($user)) {
 			return;
 		}
 		$notification = $this->notificationManager->createNotification();

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/comments/appinfo/app.php

Spacing +3 added lines, -3 removed lines

@@ -50,14 +50,14 @@ 
 		$application = new \OCP\AppFramework\App('comments');
 		return $application->getContainer()->query(\OCA\Comments\Notification\Notifier::class);
 	},
-	function () {
+	function() {
 		$l = \OC::$server->getL10N('comments');
 		return ['id' => 'comments', 'name' => $l->t('Comments')];
 	}
 );
 
 $commentsManager = \OC::$server->getCommentsManager();
-$commentsManager->registerEventHandler(function () {
+$commentsManager->registerEventHandler(function() {
 	$application = new \OCP\AppFramework\App('comments');
 	/** @var \OCA\Comments\EventHandler $handler */
 	$handler = $application->getContainer()->query(\OCA\Comments\EventHandler::class);
@@ -66,7 +66,7 @@ 
 $commentsManager->registerDisplayNameResolver('user', function($id) {
 	$manager = \OC::$server->getUserManager();
 	$user = $manager->get($id);
-	if(is_null($user)) {
+	if (is_null($user)) {
 		$l = \OC::$server->getL10N('comments');
 		$displayName = $l->t('Unknown user');
 	} else {

apps/files_trashbin/templates/index.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 					<label for="select_all_trash">
 						<span class="hidden-visually"><?php p($l->t('Select all'))?></span>
 					</label>
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
 					<span id="selectedActionsList" class='selectedActions'>
 						<a href="" class="undelete">
 							<span class="icon icon-history"></span>
@@ -37,7 +37,7 @@ 
 				</div>
 			</th>
 			<th id="headerDate" class="hidden column-mtime">
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Deleted' )); ?></span><span class="sort-indicator"></span></a>
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Deleted')); ?></span><span class="sort-indicator"></span></a>
 				<span class="selectedActions">
 					<a href="" class="delete-selected">
 						<span><?php p($l->t('Delete'))?></span>

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');

apps/files_trashbin/lib/Storage.php

Spacing +12 added lines, -12 removed lines

@@ -87,7 +87,7 @@ 
 			if ($currentUser) {
 				$currentUserId = $currentUser->getUID();
 
-				$view = new View($currentUserId . '/files');
+				$view = new View($currentUserId.'/files');
 				$fileInfo = $view->getFileInfo($oldPath);
 				if ($fileInfo) {
 					$sourceStorage = $fileInfo->getStorage();
@@ -104,11 +104,11 @@ 
 		} catch (\Exception $e) {
 			// do nothing, in this case we just disable the trashbin and continue
 			$logger = \OC::$server->getLogger();
-			$logger->debug('Trashbin storage could not check if a file was moved out of a shared folder: ' . $e->getMessage());
+			$logger->debug('Trashbin storage could not check if a file was moved out of a shared folder: '.$e->getMessage());
 		}
 
-		if($fileMovedOutOfSharedFolder) {
-			self::$moveOutOfSharedFolder['/' . $currentUserId . '/files' . $oldPath] = true;
+		if ($fileMovedOutOfSharedFolder) {
+			self::$moveOutOfSharedFolder['/'.$currentUserId.'/files'.$oldPath] = true;
 		} else {
 			self::$disableTrash = true;
 		}
@@ -147,9 +147,9 @@ 
 	 * @return bool true if the operation succeeded, false otherwise
 	 */
 	public function unlink($path) {
-		if (isset(self::$moveOutOfSharedFolder[$this->mountPoint . $path])) {
+		if (isset(self::$moveOutOfSharedFolder[$this->mountPoint.$path])) {
 			$result = $this->doDelete($path, 'unlink', true);
-			unset(self::$moveOutOfSharedFolder[$this->mountPoint . $path]);
+			unset(self::$moveOutOfSharedFolder[$this->mountPoint.$path]);
 		} else {
 			$result = $this->doDelete($path, 'unlink');
 		}
@@ -165,9 +165,9 @@ 
 	 * @return bool true if the operation succeeded, false otherwise
 	 */
 	public function rmdir($path) {
-		if (isset(self::$moveOutOfSharedFolder[$this->mountPoint . $path])) {
+		if (isset(self::$moveOutOfSharedFolder[$this->mountPoint.$path])) {
 			$result = $this->doDelete($path, 'rmdir', true);
-			unset(self::$moveOutOfSharedFolder[$this->mountPoint . $path]);
+			unset(self::$moveOutOfSharedFolder[$this->mountPoint.$path]);
 		} else {
 			$result = $this->doDelete($path, 'rmdir');
 		}
@@ -182,8 +182,8 @@ 
 	 * @param $path
 	 * @return bool
 	 */
-	protected function shouldMoveToTrash($path){
-		$normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path);
+	protected function shouldMoveToTrash($path) {
+		$normalized = Filesystem::normalizePath($this->mountPoint.'/'.$path);
 		$parts = explode('/', $normalized);
 		if (count($parts) < 4) {
 			return false;
@@ -220,7 +220,7 @@ 
 			return false;
 		}
 
-		$normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path, true, false, true);
+		$normalized = Filesystem::normalizePath($this->mountPoint.'/'.$path, true, false, true);
 		$result = true;
 		$view = Filesystem::getView();
 		if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
@@ -248,7 +248,7 @@ 
 	 * Setup the storate wrapper callback
 	 */
 	public static function setupStorage() {
-		\OC\Files\Filesystem::addStorageWrapper('oc_trashbin', function ($mountPoint, $storage) {
+		\OC\Files\Filesystem::addStorageWrapper('oc_trashbin', function($mountPoint, $storage) {
 			return new \OCA\Files_Trashbin\Storage(
 				array('storage' => $storage, 'mountPoint' => $mountPoint),
 				\OC::$server->getUserManager()