Completed
Pull Request — master (#3869)
by Jan-Christoph
17:04
created
apps/files_external/lib/Lib/Backend/SMB_OC.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,11 +61,11 @@
 block discarded – undo
61 61
 		;
62 62
 	}
63 63
 
64
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
64
+	public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) {
65 65
 		$username_as_share = ($storage->getBackendOption('username_as_share') === true);
66 66
 
67 67
 		if ($username_as_share) {
68
-			$share = '/' . $storage->getBackendOption('user');
68
+			$share = '/'.$storage->getBackendOption('user');
69 69
 			$storage->setBackendOption('share', $share);
70 70
 		}
71 71
 	}
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Api.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 			'path' => $path,
61 61
 			'type' => 'dir',
62 62
 			'backend' => $mountConfig['backend'],
63
-			'scope' => ( $isSystemMount ? 'system' : 'personal' ),
63
+			'scope' => ($isSystemMount ? 'system' : 'personal'),
64 64
 			'permissions' => $permissions,
65 65
 			'id' => $mountConfig['id'],
66 66
 			'class' => $mountConfig['class']
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 		$user = \OC::$server->getUserSession()->getUser()->getUID();
80 80
 
81 81
 		$mounts = \OC_Mount_Config::getAbsoluteMountPoints($user);
82
-		foreach($mounts as $mountPoint => $mount) {
82
+		foreach ($mounts as $mountPoint => $mount) {
83 83
 			$entries[] = self::formatMount($mountPoint, $mount);
84 84
 		}
85 85
 
Please login to merge, or discard this patch.
apps/systemtags/templates/list.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,14 +18,14 @@
 block discarded – undo
18 18
 		<tr>
19 19
 			<th id='headerName' class="hidden column-name">
20 20
 				<div id="headerName-container">
21
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
21
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
22 22
 				</div>
23 23
 			</th>
24 24
 			<th id="headerSize" class="hidden column-size">
25 25
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
26 26
 			</th>
27 27
 			<th id="headerDate" class="hidden column-mtime">
28
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
28
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
29 29
 			</th>
30 30
 		</tr>
31 31
 	</thead>
Please login to merge, or discard this patch.
apps/systemtags/lib/Activity/Provider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -279,7 +279,7 @@
 block discarded – undo
279 279
 		if ($tagData === null) {
280 280
 			list($name, $status) = explode('|||', substr($parameter, 3, -3));
281 281
 			$tagData = [
282
-				'id' => 0,// No way to recover the ID
282
+				'id' => 0, // No way to recover the ID
283 283
 				'name' => $name,
284 284
 				'assignable' => $status === 'assignable',
285 285
 				'visible' => $status !== 'invisible',
Please login to merge, or discard this patch.
apps/files_sharing/templates/list.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,14 +15,14 @@
 block discarded – undo
15 15
 		<tr>
16 16
 			<th id='headerName' class="hidden column-name">
17 17
 				<div id="headerName-container">
18
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
18
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
19 19
 				</div>
20 20
 			</th>
21 21
 			<th id="headerDate" class="hidden column-mtime">
22
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Share time' )); ?></span><span class="sort-indicator"></span></a>
22
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Share time')); ?></span><span class="sort-indicator"></span></a>
23 23
 			</th>
24 24
 			<th class="hidden column-expiration">
25
-				<a class="columntitle"><span><?php p($l->t( 'Expiration date' )); ?></span></a>
25
+				<a class="columntitle"><span><?php p($l->t('Expiration date')); ?></span></a>
26 26
 			</th>
27 27
 		</tr>
28 28
 	</thead>
Please login to merge, or discard this patch.
apps/files_sharing/ajax/shareinfo.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 if (!$isWritable) {
66 66
 	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
67 67
 	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
68
-	\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
68
+	\OC\Files\Filesystem::addStorageWrapper('readonly', function($mountPoint, $storage) {
69 69
 		return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
70 70
 	});
71 71
 	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 $rootInfo = \OC\Files\Filesystem::getFileInfo($path);
75 75
 $rootView = new \OC\Files\View('');
76 76
 
77
-if($rootInfo === false || !($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
77
+if ($rootInfo === false || !($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
78 78
 	OCP\JSON::error(array('data' => 'Share is not readable.'));
79 79
 	exit();
80 80
 }
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 			$formatted['children'] = getChildInfo($child, $view, $sharePermissions);
94 94
 		}
95 95
 		$formatted['mtime'] = $formatted['mtime'] / 1000;
96
-		$formatted['permissions'] = $sharePermissions & (int)$formatted['permissions'];
96
+		$formatted['permissions'] = $sharePermissions & (int) $formatted['permissions'];
97 97
 		$result[] = $formatted;
98 98
 	}
99 99
 	return $result;
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 
102 102
 $result = \OCA\Files\Helper::formatFileInfo($rootInfo);
103 103
 $result['mtime'] = $result['mtime'] / 1000;
104
-$result['permissions'] = (int)$result['permissions'] & $share->getPermissions();
104
+$result['permissions'] = (int) $result['permissions'] & $share->getPermissions();
105 105
 
106 106
 
107 107
 if ($rootInfo->getType() === 'dir') {
Please login to merge, or discard this patch.
apps/files_sharing/lib/Activity/Providers/RemoteShares.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -140,7 +140,7 @@
 block discarded – undo
140 140
 		return [
141 141
 			'type' => 'user',
142 142
 			'id' => $remoteUser->getUser(),
143
-			'name' => $cloudId,// Todo display name from contacts
143
+			'name' => $cloudId, // Todo display name from contacts
144 144
 			'server' => $remoteUser->getRemote(),
145 145
 		];
146 146
 	}
Please login to merge, or discard this patch.
apps/files_sharing/lib/Migration.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 		$stmt = $this->getReShares();
69 69
 
70 70
 		$owners = [];
71
-		while($share = $stmt->fetch()) {
71
+		while ($share = $stmt->fetch()) {
72 72
 
73 73
 			$this->shareCache[$share['id']] = $share;
74 74
 
@@ -131,11 +131,11 @@  discard block
 block discarded – undo
131 131
 	 */
132 132
 	private function findOwner($share) {
133 133
 		$currentShare = $share;
134
-		while(!is_null($currentShare['parent'])) {
134
+		while (!is_null($currentShare['parent'])) {
135 135
 			if (isset($this->shareCache[$currentShare['parent']])) {
136 136
 				$currentShare = $this->shareCache[$currentShare['parent']];
137 137
 			} else {
138
-				$currentShare = $this->getShare((int)$currentShare['parent']);
138
+				$currentShare = $this->getShare((int) $currentShare['parent']);
139 139
 				$this->shareCache[$currentShare['id']] = $currentShare;
140 140
 			}
141 141
 		}
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 
183 183
 		$ordered = [];
184 184
 		foreach ($shares as $share) {
185
-			$ordered[(int)$share['id']] = $share;
185
+			$ordered[(int) $share['id']] = $share;
186 186
 		}
187 187
 
188 188
 		return $ordered;
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 
227 227
 		$ordered = [];
228 228
 		foreach ($shares as $share) {
229
-			$ordered[(int)$share['id']] = $share;
229
+			$ordered[(int) $share['id']] = $share;
230 230
 		}
231 231
 
232 232
 		return $ordered;
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 					->set('uid_initiator', $query->createNamedParameter($owner['initiator']));
270 270
 
271 271
 
272
-				if ((int)$owner['type'] !== \OCP\Share::SHARE_TYPE_LINK) {
272
+				if ((int) $owner['type'] !== \OCP\Share::SHARE_TYPE_LINK) {
273 273
 					$query->set('parent', $query->createNamedParameter(null));
274 274
 				}
275 275
 
Please login to merge, or discard this patch.
apps/files_sharing/lib/ExpireSharesJob.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
 			);
69 69
 
70 70
 		$shares = $qb->execute();
71
-		while($share = $shares->fetch()) {
71
+		while ($share = $shares->fetch()) {
72 72
 			\OCP\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
73 73
 		}
74 74
 		$shares->closeCursor();
Please login to merge, or discard this patch.