Completed
Pull Request — master (#439)
by Joas
01:52
created
lib/Events/UserEvents.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 		try {
51 51
 			$this->membersService->onUserRemoved($userId);
52 52
 		} catch (\Exception $e) {
53
-			$this->miscService->log('exception while onUserDeleted ' . $e->getMessage());
53
+			$this->miscService->log('exception while onUserDeleted '.$e->getMessage());
54 54
 		}
55 55
 	}
56 56
 
Please login to merge, or discard this patch.
lib/GlobalScale/GSMount/MountProvider.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -148,13 +148,13 @@
 block discarded – undo
148 148
 		}
149 149
 
150 150
 		$info = pathinfo($share->getMountPoint());
151
-		$filename = $this->get('dirname', $info) . '/' . $this->get('filename', $info);
151
+		$filename = $this->get('dirname', $info).'/'.$this->get('filename', $info);
152 152
 		$extension = $this->get('extension', $info);
153
-		$extension = ($extension === '') ? '' : '.' . $extension;
153
+		$extension = ($extension === '') ? '' : '.'.$extension;
154 154
 
155 155
 		$n = 2;
156 156
 		while (true) {
157
-			$path = $filename . " ($n)" . $extension;
157
+			$path = $filename." ($n)".$extension;
158 158
 			try {
159 159
 				$fs->get($path);
160 160
 			} catch (NotFoundException $e) {
Please login to merge, or discard this patch.
lib/GlobalScale/FileUnshare.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 			\OC::$server->getLogger()->log(3, '### 2');
92 92
 
93 93
 
94
-			$this->miscService->log('### ' . json_encode($event->getData()));
94
+			$this->miscService->log('### '.json_encode($event->getData()));
95 95
 
96 96
 			try {
97 97
 				$node = $share->getNode();
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 
103 103
 			$event->getData()
104 104
 				  ->s('gs_federated', $share->getToken())
105
-				  ->s('gs_filename', '/' . $filename);
105
+				  ->s('gs_filename', '/'.$filename);
106 106
 		}
107 107
 
108 108
 	}
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 		}
192 192
 
193 193
 		$members =
194
-			$this->membersRequest->forceGetMembers($circle->getUniqueId(), Member::LEVEL_MEMBER, 0,true);
194
+			$this->membersRequest->forceGetMembers($circle->getUniqueId(), Member::LEVEL_MEMBER, 0, true);
195 195
 		foreach ($members AS $member) {
196 196
 			$this->parseMember($member);
197 197
 
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
 			}
201 201
 
202 202
 			if ($member->getInstance() !== '') {
203
-				$this->miscService->log('#### GENERATE FEDERATED CIRCLES SHARE ' . $member->getInstance());
203
+				$this->miscService->log('#### GENERATE FEDERATED CIRCLES SHARE '.$member->getInstance());
204 204
 			}
205 205
 		}
206 206
 	}
Please login to merge, or discard this patch.
lib/GlobalScale/FileShare.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -105,14 +105,14 @@  discard block
 block discarded – undo
105 105
 			$node = $share->getNode();
106 106
 			$filename = $node->getName();
107 107
 		} catch (NotFoundException $e) {
108
-			$this->miscService->log('issue while FileShare: ' . $e->getMessage());
108
+			$this->miscService->log('issue while FileShare: '.$e->getMessage());
109 109
 
110 110
 			return;
111 111
 		}
112 112
 
113 113
 		$event->getData()
114 114
 			  ->s('gs_federated', $share->getToken())
115
-			  ->s('gs_filename', '/' . $filename);
115
+			  ->s('gs_filename', '/'.$filename);
116 116
 	}
117 117
 
118 118
 
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 			);
302 302
 		} catch (Exception $e) {
303 303
 			OC::$server->getLogger()
304
-					   ->log(1, 'Circles::sharedByMail - mail were not sent: ' . $e->getMessage());
304
+					   ->log(1, 'Circles::sharedByMail - mail were not sent: '.$e->getMessage());
305 305
 		}
306 306
 	}
307 307
 
@@ -319,8 +319,8 @@  discard block
 block discarded – undo
319 319
 		$message = $this->mailer->createMessage();
320 320
 
321 321
 		$this->miscService->log(
322
-			"Sending mail to circle '" . $circleName . "': " . $email . ' file: ' . $fileName
323
-			. ' - link: ' . $link, 0
322
+			"Sending mail to circle '".$circleName."': ".$email.' file: '.$fileName
323
+			. ' - link: '.$link, 0
324 324
 		);
325 325
 
326 326
 		$subject = $this->l10n->t('%s shared »%s« with you.', [$author, $fileName]);
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
 
360 360
 		$message = $this->mailer->createMessage();
361 361
 
362
-		$this->miscService->log("Sending password mail to circle '" . $circleName . "': " . $email, 0);
362
+		$this->miscService->log("Sending password mail to circle '".$circleName."': ".$email, 0);
363 363
 
364 364
 		$filename = $share->getNode()
365 365
 						  ->getName();
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
415 415
 		if ($initiatorEmailAddress !== null) {
416 416
 			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
417
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
417
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
418 418
 		} else {
419 419
 			$emailTemplate->addFooter();
420 420
 		}
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
 		$emailTemplate->addHeader();
450 450
 		$emailTemplate->addHeading($subject, false);
451 451
 		$emailTemplate->addBodyText(
452
-			htmlspecialchars($text) . '<br>' . htmlspecialchars(
452
+			htmlspecialchars($text).'<br>'.htmlspecialchars(
453 453
 				$this->l10n->t('Click the button below to open it.')
454 454
 			), $text
455 455
 		);
Please login to merge, or discard this patch.
lib/Service/GSDownstreamService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@
 block discarded – undo
155 155
 			$gs = $this->globalScaleService->getGlobalScaleEvent($event);
156 156
 			$gs->manage($event);
157 157
 		} catch (Exception $e) {
158
-			$this->miscService->log('issue onNewEvent: ' . json_encode($event) . ' - ' . $e->getMessage());
158
+			$this->miscService->log('issue onNewEvent: '.json_encode($event).' - '.$e->getMessage());
159 159
 		}
160 160
 	}
161 161
 
Please login to merge, or discard this patch.
lib/Service/BroadcastService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
 		}
139 139
 
140 140
 		$members =
141
-			$this->membersRequest->forceGetMembers($circle->getUniqueId(), Member::LEVEL_MEMBER, 0,true);
141
+			$this->membersRequest->forceGetMembers($circle->getUniqueId(), Member::LEVEL_MEMBER, 0, true);
142 142
 		foreach ($members AS $member) {
143 143
 			// removed so you can share to contacts
144 144
 //			$this->parseMember($member);
Please login to merge, or discard this patch.
lib/ShareByCircleProvider.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -300,19 +300,19 @@  discard block
 block discarded – undo
300 300
 	 */
301 301
 	private function createShare($share) {
302 302
 		$this->miscService->log(
303
-			'Creating share (1/4) - type: ' . $share->getShareType() . ' - token: '
304
-			. $share->getToken() . ' - type: ' . $share->getShareType() . ' - with: '
305
-			. $share->getSharedWith() . ' - permissions: ' . $share->getPermissions(), 0
303
+			'Creating share (1/4) - type: '.$share->getShareType().' - token: '
304
+			. $share->getToken().' - type: '.$share->getShareType().' - with: '
305
+			. $share->getSharedWith().' - permissions: '.$share->getPermissions(), 0
306 306
 		);
307 307
 
308 308
 		$qb = $this->getBaseInsertSql($share);
309
-		$this->miscService->log('Share creation (2/4) : ' . json_encode($qb->getSQL()), 0);
309
+		$this->miscService->log('Share creation (2/4) : '.json_encode($qb->getSQL()), 0);
310 310
 
311 311
 		$result = $qb->execute();
312
-		$this->miscService->log('Share creation result (3/4) : ' . json_encode($result), 0);
312
+		$this->miscService->log('Share creation result (3/4) : '.json_encode($result), 0);
313 313
 
314 314
 		$id = $qb->getLastInsertId();
315
-		$this->miscService->log('Share created ID (4/4) : ' . $id, 0);
315
+		$this->miscService->log('Share created ID (4/4) : '.$id, 0);
316 316
 
317 317
 		try {
318 318
 			$share->setId($id);
@@ -538,7 +538,7 @@  discard block
 block discarded – undo
538 538
 	public function getShareByToken($token) {
539 539
 		$qb = $this->dbConnection->getQueryBuilder();
540 540
 
541
-		$this->miscService->log("Opening share by token '#" . $token . "'", 0);
541
+		$this->miscService->log("Opening share by token '#".$token."'", 0);
542 542
 
543 543
 		$cursor = $qb->select('*')
544 544
 					 ->from('share')
@@ -562,7 +562,7 @@  discard block
 block discarded – undo
562 562
 			try {
563 563
 				$data = $this->getShareByPersonalToken($token);
564 564
 			} catch (Exception $e) {
565
-				$this->miscService->log("Share '#" . $token . "' not found.", 0);
565
+				$this->miscService->log("Share '#".$token."' not found.", 0);
566 566
 				throw new ShareNotFound('Share not found', $this->l10n->t('Could not find share'));
567 567
 			}
568 568
 		}
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
571 571
 			$share = $this->createShareObject($data);
572 572
 		} catch (InvalidShare $e) {
573 573
 			$this->miscService->log(
574
-				"Share Object '#" . $token . "' not created. " . json_encode($data), 0
574
+				"Share Object '#".$token."' not created. ".json_encode($data), 0
575 575
 			);
576 576
 			throw new ShareNotFound('Share not found', $this->l10n->t('Could not find share'));
577 577
 		}
@@ -620,7 +620,7 @@  discard block
 block discarded – undo
620 620
 			throw new ShareNotFound('personal check not found');
621 621
 		}
622 622
 
623
-		\OC::$server->getLogger()->log(3, '#### ' . json_encode($data));
623
+		\OC::$server->getLogger()->log(3, '#### '.json_encode($data));
624 624
 		$member = null;
625 625
 		try {
626 626
 			$member = $this->membersService->getMemberById($data['personal_member_id']);
Please login to merge, or discard this patch.
lib/Service/GSUpstreamService.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -144,12 +144,12 @@  discard block
 block discarded – undo
144 144
 			} else {
145 145
 //				$gs->verify($event); // needed ? as we check event on the 'master' of the circle
146 146
 				$this->confirmEvent($event);
147
-				$this->miscService->log('confirmed: ' . json_encode($event));
147
+				$this->miscService->log('confirmed: '.json_encode($event));
148 148
 				$gs->manage($event); // needed ? as we manage it throw the confirmEvent
149 149
 			}
150 150
 		} catch (Exception $e) {
151 151
 			$this->miscService->log(
152
-				get_class($e) . ' on new event: ' . $e->getMessage() . ' - ' . json_encode($event), 1
152
+				get_class($e).' on new event: '.$e->getMessage().' - '.json_encode($event), 1
153 153
 			);
154 154
 			throw $e;
155 155
 		}
@@ -238,13 +238,13 @@  discard block
 block discarded – undo
238 238
 		$request->setDataSerialize($event);
239 239
 
240 240
 		$result = $this->retrieveJson($request);
241
-		$this->miscService->log('result ' . json_encode($result));
241
+		$this->miscService->log('result '.json_encode($result));
242 242
 		if ($this->getInt('status', $result) === 0) {
243 243
 			throw new GlobalScaleEventException($this->get('error', $result));
244 244
 		}
245 245
 
246 246
 		$updatedData = $this->getArray('event', $result);
247
-		$this->miscService->log('updatedEvent: ' . json_encode($updatedData));
247
+		$this->miscService->log('updatedEvent: '.json_encode($updatedData));
248 248
 		if (!empty($updatedData)) {
249 249
 			$updated = new GSEvent();
250 250
 			try {
Please login to merge, or discard this patch.
lib/Command/SyncContact.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -119,9 +119,9 @@  discard block
 block discarded – undo
119 119
 		$tCards = $tBooks = 0;
120 120
 		$knownBooks = [];
121 121
 		foreach ($users as $user) {
122
-			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/' . $user->getUID());
122
+			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/'.$user->getUID());
123 123
 			$output->writeln(
124
-				'- User <info>' . $user->getUID() . '</info> have ' . sizeof($books) . ' address books:'
124
+				'- User <info>'.$user->getUID().'</info> have '.sizeof($books).' address books:'
125 125
 			);
126 126
 
127 127
 			$tBooks += sizeof($books);
@@ -137,11 +137,11 @@  discard block
 block discarded – undo
137 137
 
138 138
 				$shared = '';
139 139
 				if ($owner !== $user->getUID()) {
140
-					$shared = ' (shared by <info>' . $owner . '</info>)';
140
+					$shared = ' (shared by <info>'.$owner.'</info>)';
141 141
 				}
142 142
 
143 143
 				$output->writeln(
144
-					'  <comment>*</comment> book #' . $bookId . $shared . ' contains '
144
+					'  <comment>*</comment> book #'.$bookId.$shared.' contains '
145 145
 					. sizeof($cards)
146 146
 					. ' entries'
147 147
 				);
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 		}
152 152
 
153 153
 		$output->writeln('');
154
-		$output->writeln('with a total of ' . $tBooks . ' address books and ' . $tCards . ' contact entries');
154
+		$output->writeln('with a total of '.$tBooks.' address books and '.$tCards.' contact entries');
155 155
 	}
156 156
 
157 157
 
Please login to merge, or discard this patch.