Completed
Pull Request — master (#8359)
by Robin
32:03 queued 13:52
created
apps/encryption/lib/Crypto/DecryptAll.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -83,10 +83,10 @@  discard block
 block discarded – undo
83 83
 
84 84
 		$question = new Question('Please enter the recovery key password: ');
85 85
 
86
-		if($this->util->isMasterKeyEnabled()) {
86
+		if ($this->util->isMasterKeyEnabled()) {
87 87
 			$output->writeln('Use master key to decrypt all files');
88 88
 			$user = $this->keyManager->getMasterKeyId();
89
-			$password =$this->keyManager->getMasterKeyPassword();
89
+			$password = $this->keyManager->getMasterKeyPassword();
90 90
 		} else {
91 91
 			$recoveryKeyId = $this->keyManager->getRecoveryKeyId();
92 92
 			if (!empty($user)) {
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 				if ($useLoginPassword) {
102 102
 					$question = new Question('Please enter the user\'s login password: ');
103 103
 				} else if ($this->util->isRecoveryEnabledForUser($user) === false) {
104
-					$output->writeln('No recovery key available for user ' . $user);
104
+					$output->writeln('No recovery key available for user '.$user);
105 105
 					return false;
106 106
 				} else {
107 107
 					$user = $recoveryKeyId;
Please login to merge, or discard this patch.
apps/comments/lib/Activity/Provider.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -181,12 +181,12 @@
 block discarded – undo
181 181
 				}
182 182
 
183 183
 				$message = preg_replace(
184
-					'/(^|\s)(' . '@' . $mention['id'] . ')(\b)/',
184
+					'/(^|\s)('.'@'.$mention['id'].')(\b)/',
185 185
 					//'${1}' . $this->regexSafeUser($mention['id'], $displayName) . '${3}',
186
-					'${1}' . '{mention' . $mentionCount . '}' . '${3}',
186
+					'${1}'.'{mention'.$mentionCount.'}'.'${3}',
187 187
 					$message
188 188
 				);
189
-				$mentions['mention' . $mentionCount] = $this->generateUserParameter($mention['id']);
189
+				$mentions['mention'.$mentionCount] = $this->generateUserParameter($mention['id']);
190 190
 				$mentionCount++;
191 191
 			}
192 192
 
Please login to merge, or discard this patch.
apps/comments/lib/Notification/Listener.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -55,15 +55,15 @@  discard block
 block discarded – undo
55 55
 		$comment = $event->getComment();
56 56
 
57 57
 		$mentions = $this->extractMentions($comment->getMentions());
58
-		if(empty($mentions)) {
58
+		if (empty($mentions)) {
59 59
 			// no one to notify
60 60
 			return;
61 61
 		}
62 62
 
63 63
 		$notification = $this->instantiateNotification($comment);
64 64
 
65
-		foreach($mentions as $uid) {
66
-			if( ($comment->getActorType() === 'users' && $uid === $comment->getActorId())
65
+		foreach ($mentions as $uid) {
66
+			if (($comment->getActorType() === 'users' && $uid === $comment->getActorId())
67 67
 				|| !$this->userManager->userExists($uid)
68 68
 			) {
69 69
 				// do not notify unknown users or yourself
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 			}
72 72
 
73 73
 			$notification->setUser($uid);
74
-			if(    $event->getEvent() === CommentsEvent::EVENT_DELETE
74
+			if ($event->getEvent() === CommentsEvent::EVENT_DELETE
75 75
 				|| $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE)
76 76
 			{
77 77
 				$this->notificationManager->markProcessed($notification);
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 		$notification
93 93
 			->setApp('comments')
94 94
 			->setObject('comment', $comment->getId())
95
-			->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
95
+			->setSubject('mention', [$comment->getObjectType(), $comment->getObjectId()])
96 96
 			->setDateTime($comment->getCreationDateTime());
97 97
 
98 98
 		return $notification;
@@ -105,12 +105,12 @@  discard block
 block discarded – undo
105 105
 	 * @return string[] containing the mentions, e.g. ['alice', 'bob']
106 106
 	 */
107 107
 	public function extractMentions(array $mentions) {
108
-		if(empty($mentions)) {
108
+		if (empty($mentions)) {
109 109
 			return [];
110 110
 		}
111 111
 		$uids = [];
112
-		foreach($mentions as $mention) {
113
-			if($mention['type'] === 'user') {
112
+		foreach ($mentions as $mention) {
113
+			if ($mention['type'] === 'user') {
114 114
 				$uids[] = $mention['id'];
115 115
 			}
116 116
 		}
Please login to merge, or discard this patch.
apps/comments/lib/AppInfo/Application.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 
27 27
 class Application extends App {
28 28
 
29
-	public function __construct (array $urlParams = array()) {
29
+	public function __construct(array $urlParams = array()) {
30 30
 		parent::__construct('comments', $urlParams);
31 31
 		$container = $this->getContainer();
32 32
 
Please login to merge, or discard this patch.
apps/comments/lib/EventHandler.php 1 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/files_trashbin/ajax/undelete.php 1 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 1 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 1 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.
apps/files_trashbin/lib/Command/ExpireTrash.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@
 block discarded – undo
117 117
 		\OC_Util::setupFS($user);
118 118
 
119 119
 		// Check if this user has a trashbin directory
120
-		$view = new \OC\Files\View('/' . $user);
120
+		$view = new \OC\Files\View('/'.$user);
121 121
 		if (!$view->is_dir('/files_trashbin/files')) {
122 122
 			return false;
123 123
 		}
Please login to merge, or discard this patch.