Completed
Pull Request — master (#3590)
by Individual IT
11:38
created
apps/systemtags/lib/Activity/Listener.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 	 */
145 145
 	public function mapperEvent(MapperEvent $event) {
146 146
 		$tagIds = $event->getTags();
147
-		if ($event->getObjectType() !== 'files' ||empty($tagIds)
147
+		if ($event->getObjectType() !== 'files' || empty($tagIds)
148 148
 			|| !in_array($event->getEvent(), [MapperEvent::EVENT_ASSIGN, MapperEvent::EVENT_UNASSIGN])
149 149
 			|| !$this->appManager->isInstalled('activity')) {
150 150
 			// System tags not for files, no tags, not (un-)assigning or no activity-app enabled (save the energy)
@@ -178,8 +178,8 @@  discard block
 block discarded – undo
178 178
 				/** @var Node $node */
179 179
 				$node = array_shift($nodes);
180 180
 				$path = $node->getPath();
181
-				if (strpos($path, '/' . $owner . '/files/') === 0) {
182
-					$path = substr($path, strlen('/' . $owner . '/files'));
181
+				if (strpos($path, '/'.$owner.'/files/') === 0) {
182
+					$path = substr($path, strlen('/'.$owner.'/files'));
183 183
 				}
184 184
 				// Get all users that have access to the mount point
185 185
 				$users = array_merge($users, Share::getUsersSharingFile($path, $owner, true, true));
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.
apps/files_sharing/lib/Controller/ExternalSharesController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -131,15 +131,15 @@
 block discarded – undo
131 131
 	 */
132 132
 	public function testRemote($remote) {
133 133
 		if (
134
-			$this->testUrl('https://' . $remote . '/ocs-provider/') ||
135
-			$this->testUrl('https://' . $remote . '/ocs-provider/index.php') ||
136
-			$this->testUrl('https://' . $remote . '/status.php', true)
134
+			$this->testUrl('https://'.$remote.'/ocs-provider/') ||
135
+			$this->testUrl('https://'.$remote.'/ocs-provider/index.php') ||
136
+			$this->testUrl('https://'.$remote.'/status.php', true)
137 137
 		) {
138 138
 			return new DataResponse('https');
139 139
 		} elseif (
140
-			$this->testUrl('http://' . $remote . '/ocs-provider/') ||
141
-			$this->testUrl('http://' . $remote . '/ocs-provider/index.php') ||
142
-			$this->testUrl('http://' . $remote . '/status.php', true)
140
+			$this->testUrl('http://'.$remote.'/ocs-provider/') ||
141
+			$this->testUrl('http://'.$remote.'/ocs-provider/index.php') ||
142
+			$this->testUrl('http://'.$remote.'/status.php', true)
143 143
 		) {
144 144
 			return new DataResponse('http');
145 145
 		} else {
Please login to merge, or discard this patch.
apps/files_sharing/lib/Controller/ShareAPIController.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 		// FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
212 212
 		$result = \OC::$server->getContactsManager()->search($query, [$property]);
213 213
 		foreach ($result as $r) {
214
-			foreach($r[$property] as $value) {
214
+			foreach ($r[$property] as $value) {
215 215
 				if ($value === $query) {
216 216
 					return $r['FN'];
217 217
 				}
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
474 474
 
475 475
 		$shares = array_merge($userShares, $groupShares);
476 476
 
477
-		$shares = array_filter($shares, function (IShare $share) {
477
+		$shares = array_filter($shares, function(IShare $share) {
478 478
 			return $share->getShareOwner() !== $this->currentUser;
479 479
 		});
480 480
 
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
 			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_USER, $node, false, -1, 0));
510 510
 			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_GROUP, $node, false, -1, 0));
511 511
 			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_LINK, $node, false, -1, 0));
512
-			if($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
512
+			if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
513 513
 				$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_EMAIL, $node, false, -1, 0));
514 514
 			}
515 515
 			if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
@@ -659,7 +659,7 @@  discard block
 block discarded – undo
659 659
 			}
660 660
 
661 661
 			if ($permissions !== null) {
662
-				$newPermissions = (int)$permissions;
662
+				$newPermissions = (int) $permissions;
663 663
 			}
664 664
 
665 665
 			if ($newPermissions !== null &&
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
 			if ($permissions === null) {
720 720
 				throw new OCSBadRequestException($this->l->t('Wrong or no update parameter given'));
721 721
 			} else {
722
-				$permissions = (int)$permissions;
722
+				$permissions = (int) $permissions;
723 723
 				$share->setPermissions($permissions);
724 724
 			}
725 725
 		}
@@ -826,7 +826,7 @@  discard block
 block discarded – undo
826 826
 
827 827
 		// First check if it is an internal share.
828 828
 		try {
829
-			$share = $this->shareManager->getShareById('ocinternal:' . $id);
829
+			$share = $this->shareManager->getShareById('ocinternal:'.$id);
830 830
 			return $share;
831 831
 		} catch (ShareNotFound $e) {
832 832
 			// Do nothing, just try the other share type
@@ -834,7 +834,7 @@  discard block
 block discarded – undo
834 834
 
835 835
 		try {
836 836
 			if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
837
-				$share = $this->shareManager->getShareById('ocMailShare:' . $id);
837
+				$share = $this->shareManager->getShareById('ocMailShare:'.$id);
838 838
 				return $share;
839 839
 			}
840 840
 		} catch (ShareNotFound $e) {
@@ -844,7 +844,7 @@  discard block
 block discarded – undo
844 844
 		if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
845 845
 			throw new ShareNotFound();
846 846
 		}
847
-		$share = $this->shareManager->getShareById('ocFederatedSharing:' . $id);
847
+		$share = $this->shareManager->getShareById('ocFederatedSharing:'.$id);
848 848
 
849 849
 		return $share;
850 850
 	}
Please login to merge, or discard this patch.
apps/files_sharing/lib/Controller/RemoteController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 	 * @return array enriched share info with data from the filecache
110 110
 	 */
111 111
 	private static function extendShareInfo($share) {
112
-		$view = new \OC\Files\View('/' . \OC_User::getUser() . '/files/');
112
+		$view = new \OC\Files\View('/'.\OC_User::getUser().'/files/');
113 113
 		$info = $view->getFileInfo($share['mountpoint']);
114 114
 
115 115
 		$share['mimetype'] = $info->getMimetype();
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 			throw new OCSNotFoundException('Share does not exist');
173 173
 		}
174 174
 
175
-		$mountPoint = '/' . \OC_User::getUser() . '/files' . $shareInfo['mountpoint'];
175
+		$mountPoint = '/'.\OC_User::getUser().'/files'.$shareInfo['mountpoint'];
176 176
 
177 177
 		if ($this->externalManager->removeShare($mountPoint) === true) {
178 178
 			return new DataResponse();
Please login to merge, or discard this patch.