Completed
Pull Request — master (#330)
by Maxence
01:30
created
lib/Circles/FileSharingBroadcaster.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
 	 * @param $fileName
250 250
 	 * @param string $link
251 251
 	 * @param string $author
252
-	 * @param $circleName
252
+	 * @param string $circleName
253 253
 	 * @param string $email
254 254
 	 *
255 255
 	 * @throws Exception
@@ -363,7 +363,7 @@  discard block
 block discarded – undo
363 363
 	 * @param $subject
364 364
 	 * @param $text
365 365
 	 * @param $fileName
366
-	 * @param $link
366
+	 * @param string $link
367 367
 	 * @param string $author
368 368
 	 * @param string $circleName
369 369
 	 *
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
 	 * @throws IllegalIDChangeException
194 194
 	 */
195 195
 	private function generateShare($data) {
196
-		$this->logger->log(0, 'Regenerate shares from payload: ' . json_encode($data));
196
+		$this->logger->log(0, 'Regenerate shares from payload: '.json_encode($data));
197 197
 
198 198
 		$share = new Share($this->rootFolder, $this->userManager);
199 199
 		$share->setId($data['id']);
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 			}
241 241
 		} catch (Exception $e) {
242 242
 			OC::$server->getLogger()
243
-					   ->log(1, 'Circles::sharedByMail - mail were not sent: ' . $e->getMessage());
243
+					   ->log(1, 'Circles::sharedByMail - mail were not sent: '.$e->getMessage());
244 244
 		}
245 245
 	}
246 246
 
@@ -258,8 +258,8 @@  discard block
 block discarded – undo
258 258
 		$message = $this->mailer->createMessage();
259 259
 
260 260
 		$this->logger->log(
261
-			0, "Sending mail to circle '" . $circleName . "': " . $email . ' file: ' . $fileName
262
-			   . ' - link: ' . $link
261
+			0, "Sending mail to circle '".$circleName."': ".$email.' file: '.$fileName
262
+			   . ' - link: '.$link
263 263
 		);
264 264
 
265 265
 		$subject = $this->l10n->t('%s shared »%s« with you.', [$author, $fileName]);
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 	protected function sendPasswordByMail(IShare $share, $circleName, $email) {
295 295
 		$message = $this->mailer->createMessage();
296 296
 
297
-		$this->logger->log(0, "Sending password mail to circle '" . $circleName . "': " . $email);
297
+		$this->logger->log(0, "Sending password mail to circle '".$circleName."': ".$email);
298 298
 
299 299
 		$filename = $share->getNode()
300 300
 						  ->getName();
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
349 349
 		if ($initiatorEmailAddress !== null) {
350 350
 			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
351
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
351
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
352 352
 		} else {
353 353
 			$emailTemplate->addFooter();
354 354
 		}
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
 		$emailTemplate->addHeader();
385 385
 		$emailTemplate->addHeading($subject, false);
386 386
 		$emailTemplate->addBodyText(
387
-			htmlspecialchars($text) . '<br>' . htmlspecialchars(
387
+			htmlspecialchars($text).'<br>'.htmlspecialchars(
388 388
 				$this->l10n->t('Click the button below to open it.')
389 389
 			), $text
390 390
 		);
Please login to merge, or discard this patch.