Completed
Pull Request — master (#5231)
by Morris
16:38
created
apps/comments/lib/Activity/Filter.php 1 patch
Indentation   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -28,63 +28,63 @@
 block discarded – undo
28 28
 
29 29
 class Filter implements IFilter {
30 30
 
31
-	/** @var IL10N */
32
-	protected $l;
31
+    /** @var IL10N */
32
+    protected $l;
33 33
 
34
-	/** @var IURLGenerator */
35
-	protected $url;
34
+    /** @var IURLGenerator */
35
+    protected $url;
36 36
 
37
-	public function __construct(IL10N $l, IURLGenerator $url) {
38
-		$this->l = $l;
39
-		$this->url = $url;
40
-	}
37
+    public function __construct(IL10N $l, IURLGenerator $url) {
38
+        $this->l = $l;
39
+        $this->url = $url;
40
+    }
41 41
 
42
-	/**
43
-	 * @return string Lowercase a-z only identifier
44
-	 * @since 11.0.0
45
-	 */
46
-	public function getIdentifier() {
47
-		return 'comments';
48
-	}
42
+    /**
43
+     * @return string Lowercase a-z only identifier
44
+     * @since 11.0.0
45
+     */
46
+    public function getIdentifier() {
47
+        return 'comments';
48
+    }
49 49
 
50
-	/**
51
-	 * @return string A translated string
52
-	 * @since 11.0.0
53
-	 */
54
-	public function getName() {
55
-		return $this->l->t('Comments');
56
-	}
50
+    /**
51
+     * @return string A translated string
52
+     * @since 11.0.0
53
+     */
54
+    public function getName() {
55
+        return $this->l->t('Comments');
56
+    }
57 57
 
58
-	/**
59
-	 * @return int
60
-	 * @since 11.0.0
61
-	 */
62
-	public function getPriority() {
63
-		return 40;
64
-	}
58
+    /**
59
+     * @return int
60
+     * @since 11.0.0
61
+     */
62
+    public function getPriority() {
63
+        return 40;
64
+    }
65 65
 
66
-	/**
67
-	 * @return string Full URL to an icon, empty string when none is given
68
-	 * @since 11.0.0
69
-	 */
70
-	public function getIcon() {
71
-		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg'));
72
-	}
66
+    /**
67
+     * @return string Full URL to an icon, empty string when none is given
68
+     * @since 11.0.0
69
+     */
70
+    public function getIcon() {
71
+        return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg'));
72
+    }
73 73
 
74
-	/**
75
-	 * @param string[] $types
76
-	 * @return string[] An array of allowed apps from which activities should be displayed
77
-	 * @since 11.0.0
78
-	 */
79
-	public function filterTypes(array $types) {
80
-		return $types;
81
-	}
74
+    /**
75
+     * @param string[] $types
76
+     * @return string[] An array of allowed apps from which activities should be displayed
77
+     * @since 11.0.0
78
+     */
79
+    public function filterTypes(array $types) {
80
+        return $types;
81
+    }
82 82
 
83
-	/**
84
-	 * @return string[] An array of allowed apps from which activities should be displayed
85
-	 * @since 11.0.0
86
-	 */
87
-	public function allowedApps() {
88
-		return ['comments'];
89
-	}
83
+    /**
84
+     * @return string[] An array of allowed apps from which activities should be displayed
85
+     * @since 11.0.0
86
+     */
87
+    public function allowedApps() {
88
+        return ['comments'];
89
+    }
90 90
 }
Please login to merge, or discard this patch.
apps/comments/lib/Notification/Listener.php 1 patch
Indentation   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -27,93 +27,93 @@
 block discarded – undo
27 27
 use OCP\Notification\IManager;
28 28
 
29 29
 class Listener {
30
-	/** @var IManager */
31
-	protected $notificationManager;
30
+    /** @var IManager */
31
+    protected $notificationManager;
32 32
 
33
-	/** @var IUserManager */
34
-	protected $userManager;
33
+    /** @var IUserManager */
34
+    protected $userManager;
35 35
 
36
-	/**
37
-	 * Listener constructor.
38
-	 *
39
-	 * @param IManager $notificationManager
40
-	 * @param IUserManager $userManager
41
-	 */
42
-	public function __construct(
43
-		IManager $notificationManager,
44
-		IUserManager $userManager
45
-	) {
36
+    /**
37
+     * Listener constructor.
38
+     *
39
+     * @param IManager $notificationManager
40
+     * @param IUserManager $userManager
41
+     */
42
+    public function __construct(
43
+        IManager $notificationManager,
44
+        IUserManager $userManager
45
+    ) {
46 46
 
47
-		$this->notificationManager = $notificationManager;
48
-		$this->userManager = $userManager;
49
-	}
47
+        $this->notificationManager = $notificationManager;
48
+        $this->userManager = $userManager;
49
+    }
50 50
 
51
-	/**
52
-	 * @param CommentsEvent $event
53
-	 */
54
-	public function evaluate(CommentsEvent $event) {
55
-		$comment = $event->getComment();
51
+    /**
52
+     * @param CommentsEvent $event
53
+     */
54
+    public function evaluate(CommentsEvent $event) {
55
+        $comment = $event->getComment();
56 56
 
57
-		$mentions = $this->extractMentions($comment->getMentions());
58
-		if(empty($mentions)) {
59
-			// no one to notify
60
-			return;
61
-		}
57
+        $mentions = $this->extractMentions($comment->getMentions());
58
+        if(empty($mentions)) {
59
+            // no one to notify
60
+            return;
61
+        }
62 62
 
63
-		$notification = $this->instantiateNotification($comment);
63
+        $notification = $this->instantiateNotification($comment);
64 64
 
65
-		foreach($mentions as $uid) {
66
-			if( ($comment->getActorType() === 'users' && $uid === $comment->getActorId())
67
-				|| !$this->userManager->userExists($uid)
68
-			) {
69
-				// do not notify unknown users or yourself
70
-				continue;
71
-			}
65
+        foreach($mentions as $uid) {
66
+            if( ($comment->getActorType() === 'users' && $uid === $comment->getActorId())
67
+                || !$this->userManager->userExists($uid)
68
+            ) {
69
+                // do not notify unknown users or yourself
70
+                continue;
71
+            }
72 72
 
73
-			$notification->setUser($uid);
74
-			if(    $event->getEvent() === CommentsEvent::EVENT_DELETE
75
-				|| $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE)
76
-			{
77
-				$this->notificationManager->markProcessed($notification);
78
-			} else {
79
-				$this->notificationManager->notify($notification);
80
-			}
81
-		}
82
-	}
73
+            $notification->setUser($uid);
74
+            if(    $event->getEvent() === CommentsEvent::EVENT_DELETE
75
+                || $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE)
76
+            {
77
+                $this->notificationManager->markProcessed($notification);
78
+            } else {
79
+                $this->notificationManager->notify($notification);
80
+            }
81
+        }
82
+    }
83 83
 
84
-	/**
85
-	 * creates a notification instance and fills it with comment data
86
-	 *
87
-	 * @param IComment $comment
88
-	 * @return \OCP\Notification\INotification
89
-	 */
90
-	public function instantiateNotification(IComment $comment) {
91
-		$notification = $this->notificationManager->createNotification();
92
-		$notification
93
-			->setApp('comments')
94
-			->setObject('comment', $comment->getId())
95
-			->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
96
-			->setDateTime($comment->getCreationDateTime());
84
+    /**
85
+     * creates a notification instance and fills it with comment data
86
+     *
87
+     * @param IComment $comment
88
+     * @return \OCP\Notification\INotification
89
+     */
90
+    public function instantiateNotification(IComment $comment) {
91
+        $notification = $this->notificationManager->createNotification();
92
+        $notification
93
+            ->setApp('comments')
94
+            ->setObject('comment', $comment->getId())
95
+            ->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
96
+            ->setDateTime($comment->getCreationDateTime());
97 97
 
98
-		return $notification;
99
-	}
98
+        return $notification;
99
+    }
100 100
 
101
-	/**
102
-	 * flattens the mention array returned from comments to a list of user ids.
103
-	 *
104
-	 * @param array $mentions
105
-	 * @return string[] containing the mentions, e.g. ['alice', 'bob']
106
-	 */
107
-	public function extractMentions(array $mentions) {
108
-		if(empty($mentions)) {
109
-			return [];
110
-		}
111
-		$uids = [];
112
-		foreach($mentions as $mention) {
113
-			if($mention['type'] === 'user') {
114
-				$uids[] = $mention['id'];
115
-			}
116
-		}
117
-		return $uids;
118
-	}
101
+    /**
102
+     * flattens the mention array returned from comments to a list of user ids.
103
+     *
104
+     * @param array $mentions
105
+     * @return string[] containing the mentions, e.g. ['alice', 'bob']
106
+     */
107
+    public function extractMentions(array $mentions) {
108
+        if(empty($mentions)) {
109
+            return [];
110
+        }
111
+        $uids = [];
112
+        foreach($mentions as $mention) {
113
+            if($mention['type'] === 'user') {
114
+                $uids[] = $mention['id'];
115
+            }
116
+        }
117
+        return $uids;
118
+    }
119 119
 }
Please login to merge, or discard this patch.
apps/comments/lib/Controller/Notifications.php 1 patch
Indentation   +81 added lines, -81 removed lines patch added patch discarded remove patch
@@ -40,95 +40,95 @@
 block discarded – undo
40 40
  * @package OCA\Comments\Controller
41 41
  */
42 42
 class Notifications extends Controller {
43
-	/** @var Folder  */
44
-	protected $folder;
43
+    /** @var Folder  */
44
+    protected $folder;
45 45
 
46
-	/** @var ICommentsManager  */
47
-	protected $commentsManager;
46
+    /** @var ICommentsManager  */
47
+    protected $commentsManager;
48 48
 
49
-	/** @var IURLGenerator  */
50
-	protected $urlGenerator;
49
+    /** @var IURLGenerator  */
50
+    protected $urlGenerator;
51 51
 
52
-	/** @var IManager  */
53
-	protected $notificationManager;
52
+    /** @var IManager  */
53
+    protected $notificationManager;
54 54
 
55
-	/** @var IUserSession  */
56
-	protected $userSession;
55
+    /** @var IUserSession  */
56
+    protected $userSession;
57 57
 
58
-	/**
59
-	 * Notifications constructor.
60
-	 *
61
-	 * @param string $appName
62
-	 * @param IRequest $request
63
-	 * @param ICommentsManager $commentsManager
64
-	 * @param Folder $folder
65
-	 * @param IURLGenerator $urlGenerator
66
-	 * @param IManager $notificationManager
67
-	 * @param IUserSession $userSession
68
-	 */
69
-	public function __construct(
70
-		$appName,
71
-		IRequest $request,
72
-		ICommentsManager $commentsManager,
73
-		Folder $folder,
74
-		IURLGenerator $urlGenerator,
75
-		IManager $notificationManager,
76
-		IUserSession $userSession
77
-	) {
78
-		parent::__construct($appName, $request);
79
-		$this->commentsManager = $commentsManager;
80
-		$this->folder = $folder;
81
-		$this->urlGenerator = $urlGenerator;
82
-		$this->notificationManager = $notificationManager;
83
-		$this->userSession = $userSession;
84
-	}
58
+    /**
59
+     * Notifications constructor.
60
+     *
61
+     * @param string $appName
62
+     * @param IRequest $request
63
+     * @param ICommentsManager $commentsManager
64
+     * @param Folder $folder
65
+     * @param IURLGenerator $urlGenerator
66
+     * @param IManager $notificationManager
67
+     * @param IUserSession $userSession
68
+     */
69
+    public function __construct(
70
+        $appName,
71
+        IRequest $request,
72
+        ICommentsManager $commentsManager,
73
+        Folder $folder,
74
+        IURLGenerator $urlGenerator,
75
+        IManager $notificationManager,
76
+        IUserSession $userSession
77
+    ) {
78
+        parent::__construct($appName, $request);
79
+        $this->commentsManager = $commentsManager;
80
+        $this->folder = $folder;
81
+        $this->urlGenerator = $urlGenerator;
82
+        $this->notificationManager = $notificationManager;
83
+        $this->userSession = $userSession;
84
+    }
85 85
 
86
-	/**
87
-	 * @NoAdminRequired
88
-	 * @NoCSRFRequired
89
-	 *
90
-	 * @param string $id		the comment ID
91
-	 * @return Response
92
-	 */
93
-	public function view($id) {
94
-		try {
95
-			$comment = $this->commentsManager->get($id);
96
-			if($comment->getObjectType() !== 'files') {
97
-				return new NotFoundResponse();
98
-			}
99
-			$files = $this->folder->getById($comment->getObjectId());
100
-			if(count($files) === 0) {
101
-				$this->markProcessed($comment);
102
-				return new NotFoundResponse();
103
-			}
86
+    /**
87
+     * @NoAdminRequired
88
+     * @NoCSRFRequired
89
+     *
90
+     * @param string $id		the comment ID
91
+     * @return Response
92
+     */
93
+    public function view($id) {
94
+        try {
95
+            $comment = $this->commentsManager->get($id);
96
+            if($comment->getObjectType() !== 'files') {
97
+                return new NotFoundResponse();
98
+            }
99
+            $files = $this->folder->getById($comment->getObjectId());
100
+            if(count($files) === 0) {
101
+                $this->markProcessed($comment);
102
+                return new NotFoundResponse();
103
+            }
104 104
 
105
-			$url = $this->urlGenerator->linkToRouteAbsolute(
106
-				'files.viewcontroller.showFile',
107
-				[ 'fileid' => $comment->getObjectId() ]
108
-			);
105
+            $url = $this->urlGenerator->linkToRouteAbsolute(
106
+                'files.viewcontroller.showFile',
107
+                [ 'fileid' => $comment->getObjectId() ]
108
+            );
109 109
 
110
-			$this->markProcessed($comment);
110
+            $this->markProcessed($comment);
111 111
 
112
-			return new RedirectResponse($url);
113
-		} catch (\Exception $e) {
114
-			return new NotFoundResponse();
115
-		}
116
-	}
112
+            return new RedirectResponse($url);
113
+        } catch (\Exception $e) {
114
+            return new NotFoundResponse();
115
+        }
116
+    }
117 117
 
118
-	/**
119
-	 * Marks the notification about a comment as processed
120
-	 * @param IComment $comment
121
-	 */
122
-	protected function markProcessed(IComment $comment) {
123
-		$user = $this->userSession->getUser();
124
-		if(is_null($user)) {
125
-			return;
126
-		}
127
-		$notification = $this->notificationManager->createNotification();
128
-		$notification->setApp('comments')
129
-			->setObject('comment', $comment->getId())
130
-			->setSubject('mention')
131
-			->setUser($user->getUID());
132
-		$this->notificationManager->markProcessed($notification);
133
-	}
118
+    /**
119
+     * Marks the notification about a comment as processed
120
+     * @param IComment $comment
121
+     */
122
+    protected function markProcessed(IComment $comment) {
123
+        $user = $this->userSession->getUser();
124
+        if(is_null($user)) {
125
+            return;
126
+        }
127
+        $notification = $this->notificationManager->createNotification();
128
+        $notification->setApp('comments')
129
+            ->setObject('comment', $comment->getId())
130
+            ->setSubject('mention')
131
+            ->setUser($user->getUID());
132
+        $this->notificationManager->markProcessed($notification);
133
+    }
134 134
 }
Please login to merge, or discard this patch.
apps/comments/lib/AppInfo/Application.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -26,10 +26,10 @@
 block discarded – undo
26 26
 
27 27
 class Application extends App {
28 28
 
29
-	public function __construct (array $urlParams = array()) {
30
-		parent::__construct('comments', $urlParams);
31
-		$container = $this->getContainer();
29
+    public function __construct (array $urlParams = array()) {
30
+        parent::__construct('comments', $urlParams);
31
+        $container = $this->getContainer();
32 32
 
33
-		$container->registerAlias('NotificationsController', Notifications::class);
34
-	}
33
+        $container->registerAlias('NotificationsController', Notifications::class);
34
+    }
35 35
 }
Please login to merge, or discard this patch.
apps/comments/lib/EventHandler.php 1 patch
Indentation   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -36,56 +36,56 @@
 block discarded – undo
36 36
  * @package OCA\Comments
37 37
  */
38 38
 class EventHandler implements ICommentsEventHandler {
39
-	/** @var ActivityListener */
40
-	private $activityListener;
39
+    /** @var ActivityListener */
40
+    private $activityListener;
41 41
 
42
-	/** @var NotificationListener */
43
-	private $notificationListener;
42
+    /** @var NotificationListener */
43
+    private $notificationListener;
44 44
 
45
-	public function __construct(ActivityListener $activityListener, NotificationListener $notificationListener) {
46
-		$this->activityListener     = $activityListener;
47
-		$this->notificationListener = $notificationListener;
48
-	}
45
+    public function __construct(ActivityListener $activityListener, NotificationListener $notificationListener) {
46
+        $this->activityListener     = $activityListener;
47
+        $this->notificationListener = $notificationListener;
48
+    }
49 49
 
50
-	/**
51
-	 * @param CommentsEvent $event
52
-	 */
53
-	public function handle(CommentsEvent $event) {
54
-		if($event->getComment()->getObjectType() !== 'files') {
55
-			// this is a 'files'-specific Handler
56
-			return;
57
-		}
50
+    /**
51
+     * @param CommentsEvent $event
52
+     */
53
+    public function handle(CommentsEvent $event) {
54
+        if($event->getComment()->getObjectType() !== 'files') {
55
+            // this is a 'files'-specific Handler
56
+            return;
57
+        }
58 58
 
59
-		$eventType = $event->getEvent();
60
-		if( $eventType === CommentsEvent::EVENT_ADD
61
-		) {
62
-			$this->notificationHandler($event);
63
-			$this->activityHandler($event);
64
-			return;
65
-		}
59
+        $eventType = $event->getEvent();
60
+        if( $eventType === CommentsEvent::EVENT_ADD
61
+        ) {
62
+            $this->notificationHandler($event);
63
+            $this->activityHandler($event);
64
+            return;
65
+        }
66 66
 
67
-		$applicableEvents = [
68
-			CommentsEvent::EVENT_PRE_UPDATE,
69
-			CommentsEvent::EVENT_UPDATE,
70
-			CommentsEvent::EVENT_DELETE,
71
-		];
72
-		if(in_array($eventType, $applicableEvents)) {
73
-			$this->notificationHandler($event);
74
-			return;
75
-		}
76
-	}
67
+        $applicableEvents = [
68
+            CommentsEvent::EVENT_PRE_UPDATE,
69
+            CommentsEvent::EVENT_UPDATE,
70
+            CommentsEvent::EVENT_DELETE,
71
+        ];
72
+        if(in_array($eventType, $applicableEvents)) {
73
+            $this->notificationHandler($event);
74
+            return;
75
+        }
76
+    }
77 77
 
78
-	/**
79
-	 * @param CommentsEvent $event
80
-	 */
81
-	private function activityHandler(CommentsEvent $event) {
82
-		$this->activityListener->commentEvent($event);
83
-	}
78
+    /**
79
+     * @param CommentsEvent $event
80
+     */
81
+    private function activityHandler(CommentsEvent $event) {
82
+        $this->activityListener->commentEvent($event);
83
+    }
84 84
 
85
-	/**
86
-	 * @param CommentsEvent $event
87
-	 */
88
-	private function notificationHandler(CommentsEvent $event) {
89
-		$this->notificationListener->evaluate($event);
90
-	}
85
+    /**
86
+     * @param CommentsEvent $event
87
+     */
88
+    private function notificationHandler(CommentsEvent $event) {
89
+        $this->notificationListener->evaluate($event);
90
+    }
91 91
 }
Please login to merge, or discard this patch.
apps/comments/appinfo/routes.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,5 +24,5 @@
 block discarded – undo
24 24
 
25 25
 $application = new Application();
26 26
 $application->registerRoutes($this, ['routes' => [
27
-	['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
27
+    ['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
28 28
 ]]);
Please login to merge, or discard this patch.
apps/files_trashbin/ajax/undelete.php 1 patch
Indentation   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -31,25 +31,25 @@  discard block
 block discarded – undo
31 31
 
32 32
 $dir = '/';
33 33
 if (isset($_POST['dir'])) {
34
-	$dir = rtrim((string)$_POST['dir'], '/'). '/';
34
+    $dir = rtrim((string)$_POST['dir'], '/'). '/';
35 35
 }
36 36
 $allFiles = false;
37 37
 if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true') {
38
-	$allFiles = true;
39
-	$list = array();
40
-	$dirListing = true;
41
-	if ($dir === '' || $dir === '/') {
42
-		$dirListing = false;
43
-	}
44
-	foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) {
45
-		$fileName = $file['name'];
46
-		if (!$dirListing) {
47
-			$fileName .= '.d' . $file['mtime'];
48
-		}
49
-		$list[] = $fileName;
50
-	}
38
+    $allFiles = true;
39
+    $list = array();
40
+    $dirListing = true;
41
+    if ($dir === '' || $dir === '/') {
42
+        $dirListing = false;
43
+    }
44
+    foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) {
45
+        $fileName = $file['name'];
46
+        if (!$dirListing) {
47
+            $fileName .= '.d' . $file['mtime'];
48
+        }
49
+        $list[] = $fileName;
50
+    }
51 51
 } else {
52
-	$list = json_decode($_POST['files']);
52
+    $list = json_decode($_POST['files']);
53 53
 }
54 54
 
55 55
 $error = array();
@@ -57,38 +57,38 @@  discard block
 block discarded – undo
57 57
 
58 58
 $i = 0;
59 59
 foreach ($list as $file) {
60
-	$path = $dir . '/' . $file;
61
-	if ($dir === '/') {
62
-		$file = ltrim($file, '/');
63
-		$delimiter = strrpos($file, '.d');
64
-		$filename = substr($file, 0, $delimiter);
65
-		$timestamp =  substr($file, $delimiter+2);
66
-	} else {
67
-		$path_parts = pathinfo($file);
68
-		$filename = $path_parts['basename'];
69
-		$timestamp = null;
70
-	}
60
+    $path = $dir . '/' . $file;
61
+    if ($dir === '/') {
62
+        $file = ltrim($file, '/');
63
+        $delimiter = strrpos($file, '.d');
64
+        $filename = substr($file, 0, $delimiter);
65
+        $timestamp =  substr($file, $delimiter+2);
66
+    } else {
67
+        $path_parts = pathinfo($file);
68
+        $filename = $path_parts['basename'];
69
+        $timestamp = null;
70
+    }
71 71
 
72
-	if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) {
73
-		$error[] = $filename;
74
-		\OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, \OCP\Util::ERROR);
75
-	} else {
76
-		$success[$i]['filename'] = $file;
77
-		$success[$i]['timestamp'] = $timestamp;
78
-		$i++;
79
-	}
72
+    if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) {
73
+        $error[] = $filename;
74
+        \OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, \OCP\Util::ERROR);
75
+    } else {
76
+        $success[$i]['filename'] = $file;
77
+        $success[$i]['timestamp'] = $timestamp;
78
+        $i++;
79
+    }
80 80
 
81 81
 }
82 82
 
83 83
 if ( $error ) {
84
-	$filelist = '';
85
-	foreach ( $error as $e ) {
86
-		$filelist .= $e.', ';
87
-	}
88
-	$l = OC::$server->getL10N('files_trashbin');
89
-	$message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', ')));
90
-	OCP\JSON::error(array("data" => array("message" => $message,
91
-										  "success" => $success, "error" => $error)));
84
+    $filelist = '';
85
+    foreach ( $error as $e ) {
86
+        $filelist .= $e.', ';
87
+    }
88
+    $l = OC::$server->getL10N('files_trashbin');
89
+    $message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', ')));
90
+    OCP\JSON::error(array("data" => array("message" => $message,
91
+                                            "success" => $success, "error" => $error)));
92 92
 } else {
93
-	OCP\JSON::success(array("data" => array("success" => $success)));
93
+    OCP\JSON::success(array("data" => array("success" => $success)));
94 94
 }
Please login to merge, or discard this patch.
apps/files_trashbin/ajax/list.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -32,10 +32,10 @@
 block discarded – undo
32 32
 
33 33
 // make filelist
34 34
 try {
35
-	$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser(), $sortAttribute, $sortDirection);
35
+    $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser(), $sortAttribute, $sortDirection);
36 36
 } catch (Exception $e) {
37
-	header("HTTP/1.0 404 Not Found");
38
-	exit();
37
+    header("HTTP/1.0 404 Not Found");
38
+    exit();
39 39
 }
40 40
 
41 41
 $encodedDir = \OCP\Util::encodePath($dir);
Please login to merge, or discard this patch.
apps/files_trashbin/ajax/delete.php 1 patch
Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -32,19 +32,19 @@  discard block
 block discarded – undo
32 32
 
33 33
 // "empty trash" command
34 34
 if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true'){
35
-	$deleteAll = true;
36
-	if ($folder === '/' || $folder === '') {
37
-		OCA\Files_Trashbin\Trashbin::deleteAll();
38
-		$list = array();
39
-	} else {
40
-		$list[] = $folder;
41
-		$folder = dirname($folder);
42
-	}
35
+    $deleteAll = true;
36
+    if ($folder === '/' || $folder === '') {
37
+        OCA\Files_Trashbin\Trashbin::deleteAll();
38
+        $list = array();
39
+    } else {
40
+        $list[] = $folder;
41
+        $folder = dirname($folder);
42
+    }
43 43
 }
44 44
 else {
45
-	$deleteAll = false;
46
-	$files = (string)$_POST['files'];
47
-	$list = json_decode($files);
45
+    $deleteAll = false;
46
+    $files = (string)$_POST['files'];
47
+    $list = json_decode($files);
48 48
 }
49 49
 
50 50
 $folder = rtrim($folder, '/') . '/';
@@ -53,38 +53,38 @@  discard block
 block discarded – undo
53 53
 
54 54
 $i = 0;
55 55
 foreach ($list as $file) {
56
-	if ($folder === '/') {
57
-		$file = ltrim($file, '/');
58
-		$delimiter = strrpos($file, '.d');
59
-		$filename = substr($file, 0, $delimiter);
60
-		$timestamp =  substr($file, $delimiter+2);
61
-	} else {
62
-		$filename = $folder . '/' . $file;
63
-		$timestamp = null;
64
-	}
56
+    if ($folder === '/') {
57
+        $file = ltrim($file, '/');
58
+        $delimiter = strrpos($file, '.d');
59
+        $filename = substr($file, 0, $delimiter);
60
+        $timestamp =  substr($file, $delimiter+2);
61
+    } else {
62
+        $filename = $folder . '/' . $file;
63
+        $timestamp = null;
64
+    }
65 65
 
66
-	OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp);
67
-	if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
68
-		$error[] = $filename;
69
-		\OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', \OCP\Util::ERROR);
70
-	}
71
-	// only list deleted files if not deleting everything
72
-	else if (!$deleteAll) {
73
-		$success[$i]['filename'] = $file;
74
-		$success[$i]['timestamp'] = $timestamp;
75
-		$i++;
76
-	}
66
+    OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp);
67
+    if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
68
+        $error[] = $filename;
69
+        \OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', \OCP\Util::ERROR);
70
+    }
71
+    // only list deleted files if not deleting everything
72
+    else if (!$deleteAll) {
73
+        $success[$i]['filename'] = $file;
74
+        $success[$i]['timestamp'] = $timestamp;
75
+        $i++;
76
+    }
77 77
 }
78 78
 
79 79
 if ( $error ) {
80
-	$filelist = '';
81
-	foreach ( $error as $e ) {
82
-		$filelist .= $e.', ';
83
-	}
84
-	$l = \OC::$server->getL10N('files_trashbin');
85
-	$message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', ')));
86
-	OCP\JSON::error(array("data" => array("message" => $message,
87
-			                               "success" => $success, "error" => $error)));
80
+    $filelist = '';
81
+    foreach ( $error as $e ) {
82
+        $filelist .= $e.', ';
83
+    }
84
+    $l = \OC::$server->getL10N('files_trashbin');
85
+    $message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', ')));
86
+    OCP\JSON::error(array("data" => array("message" => $message,
87
+                                            "success" => $success, "error" => $error)));
88 88
 } else {
89
-	OCP\JSON::success(array("data" => array("success" => $success)));
89
+    OCP\JSON::success(array("data" => array("success" => $success)));
90 90
 }
Please login to merge, or discard this patch.