Completed
Pull Request — master (#5231)
by Morris
16:38
created
apps/comments/lib/EventHandler.php 2 patches
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.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -51,13 +51,13 @@  discard block
 block discarded – undo
51 51
 	 * @param CommentsEvent $event
52 52
 	 */
53 53
 	public function handle(CommentsEvent $event) {
54
-		if($event->getComment()->getObjectType() !== 'files') {
54
+		if ($event->getComment()->getObjectType() !== 'files') {
55 55
 			// this is a 'files'-specific Handler
56 56
 			return;
57 57
 		}
58 58
 
59 59
 		$eventType = $event->getEvent();
60
-		if( $eventType === CommentsEvent::EVENT_ADD
60
+		if ($eventType === CommentsEvent::EVENT_ADD
61 61
 		) {
62 62
 			$this->notificationHandler($event);
63 63
 			$this->activityHandler($event);
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 			CommentsEvent::EVENT_UPDATE,
70 70
 			CommentsEvent::EVENT_DELETE,
71 71
 		];
72
-		if(in_array($eventType, $applicableEvents)) {
72
+		if (in_array($eventType, $applicableEvents)) {
73 73
 			$this->notificationHandler($event);
74 74
 			return;
75 75
 		}
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/comments/appinfo/app.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -50,14 +50,14 @@  discard block
 block discarded – undo
50 50
 		$application = new \OCP\AppFramework\App('comments');
51 51
 		return $application->getContainer()->query(\OCA\Comments\Notification\Notifier::class);
52 52
 	},
53
-	function () {
53
+	function() {
54 54
 		$l = \OC::$server->getL10N('comments');
55 55
 		return ['id' => 'comments', 'name' => $l->t('Comments')];
56 56
 	}
57 57
 );
58 58
 
59 59
 $commentsManager = \OC::$server->getCommentsManager();
60
-$commentsManager->registerEventHandler(function () {
60
+$commentsManager->registerEventHandler(function() {
61 61
 	$application = new \OCP\AppFramework\App('comments');
62 62
 	/** @var \OCA\Comments\EventHandler $handler */
63 63
 	$handler = $application->getContainer()->query(\OCA\Comments\EventHandler::class);
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 $commentsManager->registerDisplayNameResolver('user', function($id) {
67 67
 	$manager = \OC::$server->getUserManager();
68 68
 	$user = $manager->get($id);
69
-	if(is_null($user)) {
69
+	if (is_null($user)) {
70 70
 		$l = \OC::$server->getL10N('comments');
71 71
 		$displayName = $l->t('Unknown user');
72 72
 	} else {
Please login to merge, or discard this patch.
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -23,48 +23,48 @@
 block discarded – undo
23 23
 
24 24
 $eventDispatcher = \OC::$server->getEventDispatcher();
25 25
 $eventDispatcher->addListener(
26
-	'OCA\Files::loadAdditionalScripts',
27
-	function() {
28
-		\OCP\Util::addScript('oc-backbone-webdav');
29
-		\OCP\Util::addScript('comments', 'merged');
30
-		\OCP\Util::addStyle('comments', 'comments');
31
-	}
26
+    'OCA\Files::loadAdditionalScripts',
27
+    function() {
28
+        \OCP\Util::addScript('oc-backbone-webdav');
29
+        \OCP\Util::addScript('comments', 'merged');
30
+        \OCP\Util::addStyle('comments', 'comments');
31
+    }
32 32
 );
33 33
 
34 34
 $eventDispatcher->addListener(\OCP\Comments\CommentsEntityEvent::EVENT_ENTITY, function(\OCP\Comments\CommentsEntityEvent $event) {
35
-	$event->addEntityCollection('files', function($name) {
36
-		$nodes = \OC::$server->getUserFolder()->getById(intval($name));
37
-		return !empty($nodes);
38
-	});
35
+    $event->addEntityCollection('files', function($name) {
36
+        $nodes = \OC::$server->getUserFolder()->getById(intval($name));
37
+        return !empty($nodes);
38
+    });
39 39
 });
40 40
 
41 41
 $notificationManager = \OC::$server->getNotificationManager();
42 42
 $notificationManager->registerNotifier(
43
-	function() {
44
-		$application = new \OCP\AppFramework\App('comments');
45
-		return $application->getContainer()->query(\OCA\Comments\Notification\Notifier::class);
46
-	},
47
-	function () {
48
-		$l = \OC::$server->getL10N('comments');
49
-		return ['id' => 'comments', 'name' => $l->t('Comments')];
50
-	}
43
+    function() {
44
+        $application = new \OCP\AppFramework\App('comments');
45
+        return $application->getContainer()->query(\OCA\Comments\Notification\Notifier::class);
46
+    },
47
+    function () {
48
+        $l = \OC::$server->getL10N('comments');
49
+        return ['id' => 'comments', 'name' => $l->t('Comments')];
50
+    }
51 51
 );
52 52
 
53 53
 $commentsManager = \OC::$server->getCommentsManager();
54 54
 $commentsManager->registerEventHandler(function () {
55
-	$application = new \OCP\AppFramework\App('comments');
56
-	/** @var \OCA\Comments\EventHandler $handler */
57
-	$handler = $application->getContainer()->query(\OCA\Comments\EventHandler::class);
58
-	return $handler;
55
+    $application = new \OCP\AppFramework\App('comments');
56
+    /** @var \OCA\Comments\EventHandler $handler */
57
+    $handler = $application->getContainer()->query(\OCA\Comments\EventHandler::class);
58
+    return $handler;
59 59
 });
60 60
 $commentsManager->registerDisplayNameResolver('user', function($id) {
61
-	$manager = \OC::$server->getUserManager();
62
-	$user = $manager->get($id);
63
-	if(is_null($user)) {
64
-		$l = \OC::$server->getL10N('comments');
65
-		$displayName = $l->t('Unknown user');
66
-	} else {
67
-		$displayName = $user->getDisplayName();
68
-	}
69
-	return $displayName;
61
+    $manager = \OC::$server->getUserManager();
62
+    $user = $manager->get($id);
63
+    if(is_null($user)) {
64
+        $l = \OC::$server->getL10N('comments');
65
+        $displayName = $l->t('Unknown user');
66
+    } else {
67
+        $displayName = $user->getDisplayName();
68
+    }
69
+    return $displayName;
70 70
 });
Please login to merge, or discard this patch.
apps/files_trashbin/templates/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 					<label for="select_all_trash">
28 28
 						<span class="hidden-visually"><?php p($l->t('Select all'))?></span>
29 29
 					</label>
30
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
30
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
31 31
 					<span id="selectedActionsList" class='selectedActions'>
32 32
 						<a href="" class="undelete">
33 33
 							<span class="icon icon-history"></span>
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 				</div>
38 38
 			</th>
39 39
 			<th id="headerDate" class="hidden column-mtime">
40
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Deleted' )); ?></span><span class="sort-indicator"></span></a>
40
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Deleted')); ?></span><span class="sort-indicator"></span></a>
41 41
 				<span class="selectedActions">
42 42
 					<a href="" class="delete-selected">
43 43
 						<span><?php p($l->t('Delete'))?></span>
Please login to merge, or discard this patch.
apps/files_trashbin/ajax/undelete.php 2 patches
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.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -31,10 +31,10 @@  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
-if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true') {
37
+if (isset($_POST['allfiles']) && (string) $_POST['allfiles'] === 'true') {
38 38
 	$allFiles = true;
39 39
 	$list = array();
40 40
 	$dirListing = true;
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) {
45 45
 		$fileName = $file['name'];
46 46
 		if (!$dirListing) {
47
-			$fileName .= '.d' . $file['mtime'];
47
+			$fileName .= '.d'.$file['mtime'];
48 48
 		}
49 49
 		$list[] = $fileName;
50 50
 	}
@@ -57,21 +57,21 @@  discard block
 block discarded – undo
57 57
 
58 58
 $i = 0;
59 59
 foreach ($list as $file) {
60
-	$path = $dir . '/' . $file;
60
+	$path = $dir.'/'.$file;
61 61
 	if ($dir === '/') {
62 62
 		$file = ltrim($file, '/');
63 63
 		$delimiter = strrpos($file, '.d');
64 64
 		$filename = substr($file, 0, $delimiter);
65
-		$timestamp =  substr($file, $delimiter+2);
65
+		$timestamp = substr($file, $delimiter + 2);
66 66
 	} else {
67 67
 		$path_parts = pathinfo($file);
68 68
 		$filename = $path_parts['basename'];
69 69
 		$timestamp = null;
70 70
 	}
71 71
 
72
-	if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) {
72
+	if (!OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp)) {
73 73
 		$error[] = $filename;
74
-		\OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, \OCP\Util::ERROR);
74
+		\OCP\Util::writeLog('trashbin', 'can\'t restore '.$filename, \OCP\Util::ERROR);
75 75
 	} else {
76 76
 		$success[$i]['filename'] = $file;
77 77
 		$success[$i]['timestamp'] = $timestamp;
@@ -80,9 +80,9 @@  discard block
 block discarded – undo
80 80
 
81 81
 }
82 82
 
83
-if ( $error ) {
83
+if ($error) {
84 84
 	$filelist = '';
85
-	foreach ( $error as $e ) {
85
+	foreach ($error as $e) {
86 86
 		$filelist .= $e.', ';
87 87
 	}
88 88
 	$l = OC::$server->getL10N('files_trashbin');
Please login to merge, or discard this patch.
apps/files_trashbin/ajax/list.php 2 patches
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.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,8 @@
 block discarded – undo
25 25
 \OC::$server->getSession()->close();
26 26
 
27 27
 // Load the files
28
-$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : '';
29
-$sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name';
28
+$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : '';
29
+$sortAttribute = isset($_GET['sort']) ? (string) $_GET['sort'] : 'name';
30 30
 $sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
31 31
 $data = array();
32 32
 
Please login to merge, or discard this patch.
apps/files_trashbin/ajax/delete.php 3 patches
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.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 $folder = isset($_POST['dir']) ? $_POST['dir'] : '/';
32 32
 
33 33
 // "empty trash" command
34
-if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true'){
34
+if (isset($_POST['allfiles']) && (string) $_POST['allfiles'] === 'true') {
35 35
 	$deleteAll = true;
36 36
 	if ($folder === '/' || $folder === '') {
37 37
 		OCA\Files_Trashbin\Trashbin::deleteAll();
@@ -43,11 +43,11 @@  discard block
 block discarded – undo
43 43
 }
44 44
 else {
45 45
 	$deleteAll = false;
46
-	$files = (string)$_POST['files'];
46
+	$files = (string) $_POST['files'];
47 47
 	$list = json_decode($files);
48 48
 }
49 49
 
50
-$folder = rtrim($folder, '/') . '/';
50
+$folder = rtrim($folder, '/').'/';
51 51
 $error = array();
52 52
 $success = array();
53 53
 
@@ -57,16 +57,16 @@  discard block
 block discarded – undo
57 57
 		$file = ltrim($file, '/');
58 58
 		$delimiter = strrpos($file, '.d');
59 59
 		$filename = substr($file, 0, $delimiter);
60
-		$timestamp =  substr($file, $delimiter+2);
60
+		$timestamp = substr($file, $delimiter + 2);
61 61
 	} else {
62
-		$filename = $folder . '/' . $file;
62
+		$filename = $folder.'/'.$file;
63 63
 		$timestamp = null;
64 64
 	}
65 65
 
66 66
 	OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp);
67 67
 	if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
68 68
 		$error[] = $filename;
69
-		\OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', \OCP\Util::ERROR);
69
+		\OCP\Util::writeLog('trashbin', 'can\'t delete '.$filename.' permanently.', \OCP\Util::ERROR);
70 70
 	}
71 71
 	// only list deleted files if not deleting everything
72 72
 	else if (!$deleteAll) {
@@ -76,9 +76,9 @@  discard block
 block discarded – undo
76 76
 	}
77 77
 }
78 78
 
79
-if ( $error ) {
79
+if ($error) {
80 80
 	$filelist = '';
81
-	foreach ( $error as $e ) {
81
+	foreach ($error as $e) {
82 82
 		$filelist .= $e.', ';
83 83
 	}
84 84
 	$l = \OC::$server->getL10N('files_trashbin');
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,8 +40,7 @@
 block discarded – undo
40 40
 		$list[] = $folder;
41 41
 		$folder = dirname($folder);
42 42
 	}
43
-}
44
-else {
43
+} else {
45 44
 	$deleteAll = false;
46 45
 	$files = (string)$_POST['files'];
47 46
 	$list = json_decode($files);
Please login to merge, or discard this patch.
apps/files_trashbin/lib/AppInfo/Application.php 2 patches
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -27,23 +27,23 @@
 block discarded – undo
27 27
 use OCA\Files_Trashbin\Expiration;
28 28
 
29 29
 class Application extends App {
30
-	public function __construct (array $urlParams = []) {
31
-		parent::__construct('files_trashbin', $urlParams);
30
+    public function __construct (array $urlParams = []) {
31
+        parent::__construct('files_trashbin', $urlParams);
32 32
 
33
-		$container = $this->getContainer();
34
-		/*
33
+        $container = $this->getContainer();
34
+        /*
35 35
 		 * Register capabilities
36 36
 		 */
37
-		$container->registerCapability('OCA\Files_Trashbin\Capabilities');
37
+        $container->registerCapability('OCA\Files_Trashbin\Capabilities');
38 38
 
39
-		/*
39
+        /*
40 40
 		 * Register expiration
41 41
 		 */
42
-		$container->registerService('Expiration', function($c) {
43
-			return  new Expiration(
44
-				$c->query('ServerContainer')->getConfig(),
45
-				$c->query('OCP\AppFramework\Utility\ITimeFactory')
46
-			);
47
-		});
48
-	}
42
+        $container->registerService('Expiration', function($c) {
43
+            return  new Expiration(
44
+                $c->query('ServerContainer')->getConfig(),
45
+                $c->query('OCP\AppFramework\Utility\ITimeFactory')
46
+            );
47
+        });
48
+    }
49 49
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 use OCA\Files_Trashbin\Expiration;
28 28
 
29 29
 class Application extends App {
30
-	public function __construct (array $urlParams = []) {
30
+	public function __construct(array $urlParams = []) {
31 31
 		parent::__construct('files_trashbin', $urlParams);
32 32
 
33 33
 		$container = $this->getContainer();
Please login to merge, or discard this patch.
apps/files_trashbin/lib/Command/Expire.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -31,30 +31,30 @@
 block discarded – undo
31 31
 use OCP\Command\ICommand;
32 32
 
33 33
 class Expire implements ICommand {
34
-	use FileAccess;
34
+    use FileAccess;
35 35
 
36
-	/**
37
-	 * @var string
38
-	 */
39
-	private $user;
36
+    /**
37
+     * @var string
38
+     */
39
+    private $user;
40 40
 
41
-	/**
42
-	 * @param string $user
43
-	 */
44
-	function __construct($user) {
45
-		$this->user = $user;
46
-	}
41
+    /**
42
+     * @param string $user
43
+     */
44
+    function __construct($user) {
45
+        $this->user = $user;
46
+    }
47 47
 
48
-	public function handle() {
49
-		$userManager = \OC::$server->getUserManager();
50
-		if (!$userManager->userExists($this->user)) {
51
-			// User has been deleted already
52
-			return;
53
-		}
48
+    public function handle() {
49
+        $userManager = \OC::$server->getUserManager();
50
+        if (!$userManager->userExists($this->user)) {
51
+            // User has been deleted already
52
+            return;
53
+        }
54 54
 
55
-		\OC_Util::tearDownFS();
56
-		\OC_Util::setupFS($this->user);
57
-		Trashbin::expire($this->user);
58
-		\OC_Util::tearDownFS();
59
-	}
55
+        \OC_Util::tearDownFS();
56
+        \OC_Util::setupFS($this->user);
57
+        Trashbin::expire($this->user);
58
+        \OC_Util::tearDownFS();
59
+    }
60 60
 }
Please login to merge, or discard this patch.