nextcloud / server

apps/comments/lib/Notification/Listener.php

Indentation +78 added lines, -78 removed lines

@@ -27,93 +27,93 @@
 use OCP\Notification\IManager;
 
 class Listener {
-	/** @var IManager */
-	protected $notificationManager;
+    /** @var IManager */
+    protected $notificationManager;
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/**
-	 * Listener constructor.
-	 *
-	 * @param IManager $notificationManager
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(
-		IManager $notificationManager,
-		IUserManager $userManager
-	) {
+    /**
+     * Listener constructor.
+     *
+     * @param IManager $notificationManager
+     * @param IUserManager $userManager
+     */
+    public function __construct(
+        IManager $notificationManager,
+        IUserManager $userManager
+    ) {
 
-		$this->notificationManager = $notificationManager;
-		$this->userManager = $userManager;
-	}
+        $this->notificationManager = $notificationManager;
+        $this->userManager = $userManager;
+    }
 
-	/**
-	 * @param CommentsEvent $event
-	 */
-	public function evaluate(CommentsEvent $event) {
-		$comment = $event->getComment();
+    /**
+     * @param CommentsEvent $event
+     */
+    public function evaluate(CommentsEvent $event) {
+        $comment = $event->getComment();
 
-		$mentions = $this->extractMentions($comment->getMentions());
-		if(empty($mentions)) {
-			// no one to notify
-			return;
-		}
+        $mentions = $this->extractMentions($comment->getMentions());
+        if(empty($mentions)) {
+            // no one to notify
+            return;
+        }
 
-		$notification = $this->instantiateNotification($comment);
+        $notification = $this->instantiateNotification($comment);
 
-		foreach($mentions as $uid) {
-			if( ($comment->getActorType() === 'users' && $uid === $comment->getActorId())
-				|| !$this->userManager->userExists($uid)
-			) {
-				// do not notify unknown users or yourself
-				continue;
-			}
+        foreach($mentions as $uid) {
+            if( ($comment->getActorType() === 'users' && $uid === $comment->getActorId())
+                || !$this->userManager->userExists($uid)
+            ) {
+                // do not notify unknown users or yourself
+                continue;
+            }
 
-			$notification->setUser($uid);
-			if(    $event->getEvent() === CommentsEvent::EVENT_DELETE
-				|| $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE)
-			{
-				$this->notificationManager->markProcessed($notification);
-			} else {
-				$this->notificationManager->notify($notification);
-			}
-		}
-	}
+            $notification->setUser($uid);
+            if(    $event->getEvent() === CommentsEvent::EVENT_DELETE
+                || $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE)
+            {
+                $this->notificationManager->markProcessed($notification);
+            } else {
+                $this->notificationManager->notify($notification);
+            }
+        }
+    }
 
-	/**
-	 * creates a notification instance and fills it with comment data
-	 *
-	 * @param IComment $comment
-	 * @return \OCP\Notification\INotification
-	 */
-	public function instantiateNotification(IComment $comment) {
-		$notification = $this->notificationManager->createNotification();
-		$notification
-			->setApp('comments')
-			->setObject('comment', $comment->getId())
-			->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
-			->setDateTime($comment->getCreationDateTime());
+    /**
+     * creates a notification instance and fills it with comment data
+     *
+     * @param IComment $comment
+     * @return \OCP\Notification\INotification
+     */
+    public function instantiateNotification(IComment $comment) {
+        $notification = $this->notificationManager->createNotification();
+        $notification
+            ->setApp('comments')
+            ->setObject('comment', $comment->getId())
+            ->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
+            ->setDateTime($comment->getCreationDateTime());
 
-		return $notification;
-	}
+        return $notification;
+    }
 
-	/**
-	 * flattens the mention array returned from comments to a list of user ids.
-	 *
-	 * @param array $mentions
-	 * @return string[] containing the mentions, e.g. ['alice', 'bob']
-	 */
-	public function extractMentions(array $mentions) {
-		if(empty($mentions)) {
-			return [];
-		}
-		$uids = [];
-		foreach($mentions as $mention) {
-			if($mention['type'] === 'user') {
-				$uids[] = $mention['id'];
-			}
-		}
-		return $uids;
-	}
+    /**
+     * flattens the mention array returned from comments to a list of user ids.
+     *
+     * @param array $mentions
+     * @return string[] containing the mentions, e.g. ['alice', 'bob']
+     */
+    public function extractMentions(array $mentions) {
+        if(empty($mentions)) {
+            return [];
+        }
+        $uids = [];
+        foreach($mentions as $mention) {
+            if($mention['type'] === 'user') {
+                $uids[] = $mention['id'];
+            }
+        }
+        return $uids;
+    }
 }

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/Controller/Notifications.php

Indentation +81 added lines, -81 removed lines

@@ -40,95 +40,95 @@
  * @package OCA\Comments\Controller
  */
 class Notifications extends Controller {
-	/** @var Folder  */
-	protected $folder;
+    /** @var Folder  */
+    protected $folder;
 
-	/** @var ICommentsManager  */
-	protected $commentsManager;
+    /** @var ICommentsManager  */
+    protected $commentsManager;
 
-	/** @var IURLGenerator  */
-	protected $urlGenerator;
+    /** @var IURLGenerator  */
+    protected $urlGenerator;
 
-	/** @var IManager  */
-	protected $notificationManager;
+    /** @var IManager  */
+    protected $notificationManager;
 
-	/** @var IUserSession  */
-	protected $userSession;
+    /** @var IUserSession  */
+    protected $userSession;
 
-	/**
-	 * Notifications constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param ICommentsManager $commentsManager
-	 * @param Folder $folder
-	 * @param IURLGenerator $urlGenerator
-	 * @param IManager $notificationManager
-	 * @param IUserSession $userSession
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		ICommentsManager $commentsManager,
-		Folder $folder,
-		IURLGenerator $urlGenerator,
-		IManager $notificationManager,
-		IUserSession $userSession
-	) {
-		parent::__construct($appName, $request);
-		$this->commentsManager = $commentsManager;
-		$this->folder = $folder;
-		$this->urlGenerator = $urlGenerator;
-		$this->notificationManager = $notificationManager;
-		$this->userSession = $userSession;
-	}
+    /**
+     * Notifications constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param ICommentsManager $commentsManager
+     * @param Folder $folder
+     * @param IURLGenerator $urlGenerator
+     * @param IManager $notificationManager
+     * @param IUserSession $userSession
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        ICommentsManager $commentsManager,
+        Folder $folder,
+        IURLGenerator $urlGenerator,
+        IManager $notificationManager,
+        IUserSession $userSession
+    ) {
+        parent::__construct($appName, $request);
+        $this->commentsManager = $commentsManager;
+        $this->folder = $folder;
+        $this->urlGenerator = $urlGenerator;
+        $this->notificationManager = $notificationManager;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param string $id		the comment ID
-	 * @return Response
-	 */
-	public function view($id) {
-		try {
-			$comment = $this->commentsManager->get($id);
-			if($comment->getObjectType() !== 'files') {
-				return new NotFoundResponse();
-			}
-			$files = $this->folder->getById($comment->getObjectId());
-			if(count($files) === 0) {
-				$this->markProcessed($comment);
-				return new NotFoundResponse();
-			}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param string $id		the comment ID
+     * @return Response
+     */
+    public function view($id) {
+        try {
+            $comment = $this->commentsManager->get($id);
+            if($comment->getObjectType() !== 'files') {
+                return new NotFoundResponse();
+            }
+            $files = $this->folder->getById($comment->getObjectId());
+            if(count($files) === 0) {
+                $this->markProcessed($comment);
+                return new NotFoundResponse();
+            }
 
-			$url = $this->urlGenerator->linkToRouteAbsolute(
-				'files.viewcontroller.showFile',
-				[ 'fileid' => $comment->getObjectId() ]
-			);
+            $url = $this->urlGenerator->linkToRouteAbsolute(
+                'files.viewcontroller.showFile',
+                [ 'fileid' => $comment->getObjectId() ]
+            );
 
-			$this->markProcessed($comment);
+            $this->markProcessed($comment);
 
-			return new RedirectResponse($url);
-		} catch (\Exception $e) {
-			return new NotFoundResponse();
-		}
-	}
+            return new RedirectResponse($url);
+        } catch (\Exception $e) {
+            return new NotFoundResponse();
+        }
+    }
 
-	/**
-	 * Marks the notification about a comment as processed
-	 * @param IComment $comment
-	 */
-	protected function markProcessed(IComment $comment) {
-		$user = $this->userSession->getUser();
-		if(is_null($user)) {
-			return;
-		}
-		$notification = $this->notificationManager->createNotification();
-		$notification->setApp('comments')
-			->setObject('comment', $comment->getId())
-			->setSubject('mention')
-			->setUser($user->getUID());
-		$this->notificationManager->markProcessed($notification);
-	}
+    /**
+     * Marks the notification about a comment as processed
+     * @param IComment $comment
+     */
+    protected function markProcessed(IComment $comment) {
+        $user = $this->userSession->getUser();
+        if(is_null($user)) {
+            return;
+        }
+        $notification = $this->notificationManager->createNotification();
+        $notification->setApp('comments')
+            ->setObject('comment', $comment->getId())
+            ->setSubject('mention')
+            ->setUser($user->getUID());
+        $this->notificationManager->markProcessed($notification);
+    }
 }

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

Indentation +5 added lines, -5 removed lines

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

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

Indentation +45 added lines, -45 removed lines

@@ -36,56 +36,56 @@
  * @package OCA\Comments
  */
 class EventHandler implements ICommentsEventHandler {
-	/** @var ActivityListener */
-	private $activityListener;
+    /** @var ActivityListener */
+    private $activityListener;
 
-	/** @var NotificationListener */
-	private $notificationListener;
+    /** @var NotificationListener */
+    private $notificationListener;
 
-	public function __construct(ActivityListener $activityListener, NotificationListener $notificationListener) {
-		$this->activityListener     = $activityListener;
-		$this->notificationListener = $notificationListener;
-	}
+    public function __construct(ActivityListener $activityListener, NotificationListener $notificationListener) {
+        $this->activityListener     = $activityListener;
+        $this->notificationListener = $notificationListener;
+    }
 
-	/**
-	 * @param CommentsEvent $event
-	 */
-	public function handle(CommentsEvent $event) {
-		if($event->getComment()->getObjectType() !== 'files') {
-			// this is a 'files'-specific Handler
-			return;
-		}
+    /**
+     * @param CommentsEvent $event
+     */
+    public function handle(CommentsEvent $event) {
+        if($event->getComment()->getObjectType() !== 'files') {
+            // this is a 'files'-specific Handler
+            return;
+        }
 
-		$eventType = $event->getEvent();
-		if( $eventType === CommentsEvent::EVENT_ADD
-		) {
-			$this->notificationHandler($event);
-			$this->activityHandler($event);
-			return;
-		}
+        $eventType = $event->getEvent();
+        if( $eventType === CommentsEvent::EVENT_ADD
+        ) {
+            $this->notificationHandler($event);
+            $this->activityHandler($event);
+            return;
+        }
 
-		$applicableEvents = [
-			CommentsEvent::EVENT_PRE_UPDATE,
-			CommentsEvent::EVENT_UPDATE,
-			CommentsEvent::EVENT_DELETE,
-		];
-		if(in_array($eventType, $applicableEvents)) {
-			$this->notificationHandler($event);
-			return;
-		}
-	}
+        $applicableEvents = [
+            CommentsEvent::EVENT_PRE_UPDATE,
+            CommentsEvent::EVENT_UPDATE,
+            CommentsEvent::EVENT_DELETE,
+        ];
+        if(in_array($eventType, $applicableEvents)) {
+            $this->notificationHandler($event);
+            return;
+        }
+    }
 
-	/**
-	 * @param CommentsEvent $event
-	 */
-	private function activityHandler(CommentsEvent $event) {
-		$this->activityListener->commentEvent($event);
-	}
+    /**
+     * @param CommentsEvent $event
+     */
+    private function activityHandler(CommentsEvent $event) {
+        $this->activityListener->commentEvent($event);
+    }
 
-	/**
-	 * @param CommentsEvent $event
-	 */
-	private function notificationHandler(CommentsEvent $event) {
-		$this->notificationListener->evaluate($event);
-	}
+    /**
+     * @param CommentsEvent $event
+     */
+    private function notificationHandler(CommentsEvent $event) {
+        $this->notificationListener->evaluate($event);
+    }
 }

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/routes.php

Indentation +1 added lines, -1 removed lines

@@ -24,5 +24,5 @@
 
 $application = new Application();
 $application->registerRoutes($this, ['routes' => [
-	['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
+    ['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
 ]]);

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 {

Indentation +31 added lines, -31 removed lines

@@ -23,48 +23,48 @@
 
 $eventDispatcher = \OC::$server->getEventDispatcher();
 $eventDispatcher->addListener(
-	'OCA\Files::loadAdditionalScripts',
-	function() {
-		\OCP\Util::addScript('oc-backbone-webdav');
-		\OCP\Util::addScript('comments', 'merged');
-		\OCP\Util::addStyle('comments', 'comments');
-	}
+    'OCA\Files::loadAdditionalScripts',
+    function() {
+        \OCP\Util::addScript('oc-backbone-webdav');
+        \OCP\Util::addScript('comments', 'merged');
+        \OCP\Util::addStyle('comments', 'comments');
+    }
 );
 
 $eventDispatcher->addListener(\OCP\Comments\CommentsEntityEvent::EVENT_ENTITY, function(\OCP\Comments\CommentsEntityEvent $event) {
-	$event->addEntityCollection('files', function($name) {
-		$nodes = \OC::$server->getUserFolder()->getById(intval($name));
-		return !empty($nodes);
-	});
+    $event->addEntityCollection('files', function($name) {
+        $nodes = \OC::$server->getUserFolder()->getById(intval($name));
+        return !empty($nodes);
+    });
 });
 
 $notificationManager = \OC::$server->getNotificationManager();
 $notificationManager->registerNotifier(
-	function() {
-		$application = new \OCP\AppFramework\App('comments');
-		return $application->getContainer()->query(\OCA\Comments\Notification\Notifier::class);
-	},
-	function () {
-		$l = \OC::$server->getL10N('comments');
-		return ['id' => 'comments', 'name' => $l->t('Comments')];
-	}
+    function() {
+        $application = new \OCP\AppFramework\App('comments');
+        return $application->getContainer()->query(\OCA\Comments\Notification\Notifier::class);
+    },
+    function () {
+        $l = \OC::$server->getL10N('comments');
+        return ['id' => 'comments', 'name' => $l->t('Comments')];
+    }
 );
 
 $commentsManager = \OC::$server->getCommentsManager();
 $commentsManager->registerEventHandler(function () {
-	$application = new \OCP\AppFramework\App('comments');
-	/** @var \OCA\Comments\EventHandler $handler */
-	$handler = $application->getContainer()->query(\OCA\Comments\EventHandler::class);
-	return $handler;
+    $application = new \OCP\AppFramework\App('comments');
+    /** @var \OCA\Comments\EventHandler $handler */
+    $handler = $application->getContainer()->query(\OCA\Comments\EventHandler::class);
+    return $handler;
 });
 $commentsManager->registerDisplayNameResolver('user', function($id) {
-	$manager = \OC::$server->getUserManager();
-	$user = $manager->get($id);
-	if(is_null($user)) {
-		$l = \OC::$server->getL10N('comments');
-		$displayName = $l->t('Unknown user');
-	} else {
-		$displayName = $user->getDisplayName();
-	}
-	return $displayName;
+    $manager = \OC::$server->getUserManager();
+    $user = $manager->get($id);
+    if(is_null($user)) {
+        $l = \OC::$server->getL10N('comments');
+        $displayName = $l->t('Unknown user');
+    } else {
+        $displayName = $user->getDisplayName();
+    }
+    return $displayName;
 });

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

Indentation +43 added lines, -43 removed lines

@@ -31,25 +31,25 @@ 
 
 $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') {
-	$allFiles = true;
-	$list = array();
-	$dirListing = true;
-	if ($dir === '' || $dir === '/') {
-		$dirListing = false;
-	}
-	foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) {
-		$fileName = $file['name'];
-		if (!$dirListing) {
-			$fileName .= '.d' . $file['mtime'];
-		}
-		$list[] = $fileName;
-	}
+    $allFiles = true;
+    $list = array();
+    $dirListing = true;
+    if ($dir === '' || $dir === '/') {
+        $dirListing = false;
+    }
+    foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) {
+        $fileName = $file['name'];
+        if (!$dirListing) {
+            $fileName .= '.d' . $file['mtime'];
+        }
+        $list[] = $fileName;
+    }
 } else {
-	$list = json_decode($_POST['files']);
+    $list = json_decode($_POST['files']);
 }
 
 $error = array();
@@ -57,38 +57,38 @@ 
 
 $i = 0;
 foreach ($list as $file) {
-	$path = $dir . '/' . $file;
-	if ($dir === '/') {
-		$file = ltrim($file, '/');
-		$delimiter = strrpos($file, '.d');
-		$filename = substr($file, 0, $delimiter);
-		$timestamp =  substr($file, $delimiter+2);
-	} else {
-		$path_parts = pathinfo($file);
-		$filename = $path_parts['basename'];
-		$timestamp = null;
-	}
+    $path = $dir . '/' . $file;
+    if ($dir === '/') {
+        $file = ltrim($file, '/');
+        $delimiter = strrpos($file, '.d');
+        $filename = substr($file, 0, $delimiter);
+        $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) ) {
-		$error[] = $filename;
-		\OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, \OCP\Util::ERROR);
-	} else {
-		$success[$i]['filename'] = $file;
-		$success[$i]['timestamp'] = $timestamp;
-		$i++;
-	}
+    if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) {
+        $error[] = $filename;
+        \OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, \OCP\Util::ERROR);
+    } else {
+        $success[$i]['filename'] = $file;
+        $success[$i]['timestamp'] = $timestamp;
+        $i++;
+    }
 
 }
 
 if ( $error ) {
-	$filelist = '';
-	foreach ( $error as $e ) {
-		$filelist .= $e.', ';
-	}
-	$l = OC::$server->getL10N('files_trashbin');
-	$message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', ')));
-	OCP\JSON::error(array("data" => array("message" => $message,
-										  "success" => $success, "error" => $error)));
+    $filelist = '';
+    foreach ( $error as $e ) {
+        $filelist .= $e.', ';
+    }
+    $l = OC::$server->getL10N('files_trashbin');
+    $message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', ')));
+    OCP\JSON::error(array("data" => array("message" => $message,
+                                            "success" => $success, "error" => $error)));
 } else {
-	OCP\JSON::success(array("data" => array("success" => $success)));
+    OCP\JSON::success(array("data" => array("success" => $success)));
 }

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

Indentation +3 added lines, -3 removed lines

@@ -32,10 +32,10 @@
 
 // make filelist
 try {
-	$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser(), $sortAttribute, $sortDirection);
+    $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser(), $sortAttribute, $sortDirection);
 } catch (Exception $e) {
-	header("HTTP/1.0 404 Not Found");
-	exit();
+    header("HTTP/1.0 404 Not Found");
+    exit();
 }
 
 $encodedDir = \OCP\Util::encodePath($dir);

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