Completed
Pull Request — master (#4136)
by Jan-Christoph
11:29
created
apps/sharebymail/templates/altmailpassword.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,5 +6,5 @@
 block discarded – undo
6 6
 ?>
7 7
 
8 8
 	--
9
-<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
9
+<?php p($theme->getName().' - '.$theme->getSlogan()); ?>
10 10
 <?php print_unescaped("\n".$theme->getBaseUrl());
Please login to merge, or discard this patch.
apps/files_sharing/lib/Controller/ShareAPIController.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 		// FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
217 217
 		$result = \OC::$server->getContactsManager()->search($query, [$property]);
218 218
 		foreach ($result as $r) {
219
-			foreach($r[$property] as $value) {
219
+			foreach ($r[$property] as $value) {
220 220
 				if ($value === $query) {
221 221
 					return $r['FN'];
222 222
 				}
@@ -494,7 +494,7 @@  discard block
 block discarded – undo
494 494
 
495 495
 		$shares = array_merge($userShares, $groupShares, $circleShares);
496 496
 
497
-		$shares = array_filter($shares, function (IShare $share) {
497
+		$shares = array_filter($shares, function(IShare $share) {
498 498
 			return $share->getShareOwner() !== $this->currentUser;
499 499
 		});
500 500
 
@@ -529,7 +529,7 @@  discard block
 block discarded – undo
529 529
 			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_USER, $node, false, -1, 0));
530 530
 			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_GROUP, $node, false, -1, 0));
531 531
 			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_LINK, $node, false, -1, 0));
532
-			if($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
532
+			if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
533 533
 				$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_EMAIL, $node, false, -1, 0));
534 534
 			}
535 535
 			if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
@@ -685,7 +685,7 @@  discard block
 block discarded – undo
685 685
 			}
686 686
 
687 687
 			if ($permissions !== null) {
688
-				$newPermissions = (int)$permissions;
688
+				$newPermissions = (int) $permissions;
689 689
 			}
690 690
 
691 691
 			if ($newPermissions !== null &&
@@ -742,7 +742,7 @@  discard block
 block discarded – undo
742 742
 
743 743
 		} else {
744 744
 			if ($permissions !== null) {
745
-				$permissions = (int)$permissions;
745
+				$permissions = (int) $permissions;
746 746
 				$share->setPermissions($permissions);
747 747
 			}
748 748
 
@@ -874,7 +874,7 @@  discard block
 block discarded – undo
874 874
 
875 875
 		// First check if it is an internal share.
876 876
 		try {
877
-			$share = $this->shareManager->getShareById('ocinternal:' . $id);
877
+			$share = $this->shareManager->getShareById('ocinternal:'.$id);
878 878
 			return $share;
879 879
 		} catch (ShareNotFound $e) {
880 880
 			// Do nothing, just try the other share type
@@ -883,7 +883,7 @@  discard block
 block discarded – undo
883 883
 
884 884
 		try {
885 885
 			if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_CIRCLE)) {
886
-				$share = $this->shareManager->getShareById('ocCircleShare:' . $id);
886
+				$share = $this->shareManager->getShareById('ocCircleShare:'.$id);
887 887
 				return $share;
888 888
 			}
889 889
 		} catch (ShareNotFound $e) {
@@ -892,7 +892,7 @@  discard block
 block discarded – undo
892 892
 
893 893
 		try {
894 894
 			if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
895
-				$share = $this->shareManager->getShareById('ocMailShare:' . $id);
895
+				$share = $this->shareManager->getShareById('ocMailShare:'.$id);
896 896
 				return $share;
897 897
 			}
898 898
 		} catch (ShareNotFound $e) {
@@ -902,7 +902,7 @@  discard block
 block discarded – undo
902 902
 		if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
903 903
 			throw new ShareNotFound();
904 904
 		}
905
-		$share = $this->shareManager->getShareById('ocFederatedSharing:' . $id);
905
+		$share = $this->shareManager->getShareById('ocFederatedSharing:'.$id);
906 906
 
907 907
 		return $share;
908 908
 	}
Please login to merge, or discard this patch.
apps/sharebymail/templates/settings-admin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 	<em><?php p($l->t('Send a personalized link to a file or folder by mail.')); ?></em>
11 11
 
12 12
 	<p>
13
-		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if($_['sendPasswordMail']) p('checked'); ?> />
13
+		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if ($_['sendPasswordMail']) p('checked'); ?> />
14 14
 		<label for="sendPasswordMail"><?php p($l->t('Send password by mail')); ?></label>
15 15
 	</p>
16 16
 
Please login to merge, or discard this patch.
lib/private/Share20/Manager.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
 
321 321
 		if ($fullId === null && $expirationDate === null && $this->shareApiLinkDefaultExpireDate()) {
322 322
 			$expirationDate = new \DateTime();
323
-			$expirationDate->setTime(0,0,0);
323
+			$expirationDate->setTime(0, 0, 0);
324 324
 			$expirationDate->add(new \DateInterval('P'.$this->shareApiLinkDefaultExpireDays().'D'));
325 325
 		}
326 326
 
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
 
333 333
 			$date = new \DateTime();
334 334
 			$date->setTime(0, 0, 0);
335
-			$date->add(new \DateInterval('P' . $this->shareApiLinkDefaultExpireDays() . 'D'));
335
+			$date->add(new \DateInterval('P'.$this->shareApiLinkDefaultExpireDays().'D'));
336 336
 			if ($date < $expirationDate) {
337 337
 				$message = $this->l->t('Cannot set expiration date more than %s days in the future', [$this->shareApiLinkDefaultExpireDays()]);
338 338
 				throw new GenericShareException($message, $message, 404);
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
 		 */
386 386
 		$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_USER);
387 387
 		$existingShares = $provider->getSharesByPath($share->getNode());
388
-		foreach($existingShares as $existingShare) {
388
+		foreach ($existingShares as $existingShare) {
389 389
 			// Ignore if it is the same share
390 390
 			try {
391 391
 				if ($existingShare->getFullId() === $share->getFullId()) {
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
 		 */
443 443
 		$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_GROUP);
444 444
 		$existingShares = $provider->getSharesByPath($share->getNode());
445
-		foreach($existingShares as $existingShare) {
445
+		foreach ($existingShares as $existingShare) {
446 446
 			try {
447 447
 				if ($existingShare->getFullId() === $share->getFullId()) {
448 448
 					continue;
@@ -511,7 +511,7 @@  discard block
 block discarded – undo
511 511
 		// Make sure that we do not share a path that contains a shared mountpoint
512 512
 		if ($path instanceof \OCP\Files\Folder) {
513 513
 			$mounts = $this->mountManager->findIn($path->getPath());
514
-			foreach($mounts as $mount) {
514
+			foreach ($mounts as $mount) {
515 515
 				if ($mount->getStorage()->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) {
516 516
 					throw new \InvalidArgumentException('Path contains files shared with you');
517 517
 				}
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
559 559
 		$storage = $share->getNode()->getStorage();
560 560
 		if ($storage->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
561 561
 			$parent = $share->getNode()->getParent();
562
-			while($parent->getStorage()->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
562
+			while ($parent->getStorage()->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
563 563
 				$parent = $parent->getParent();
564 564
 			}
565 565
 			$share->setShareOwner($parent->getOwner()->getUID());
@@ -616,7 +616,7 @@  discard block
 block discarded – undo
616 616
 		}
617 617
 
618 618
 		// Generate the target
619
-		$target = $this->config->getSystemValue('share_folder', '/') .'/'. $share->getNode()->getName();
619
+		$target = $this->config->getSystemValue('share_folder', '/').'/'.$share->getNode()->getName();
620 620
 		$target = \OC\Files\Filesystem::normalizePath($target);
621 621
 		$share->setTarget($target);
622 622
 
@@ -863,7 +863,7 @@  discard block
 block discarded – undo
863 863
 	 * @param string $recipientId
864 864
 	 */
865 865
 	public function deleteFromSelf(\OCP\Share\IShare $share, $recipientId) {
866
-		list($providerId, ) = $this->splitFullId($share->getFullId());
866
+		list($providerId,) = $this->splitFullId($share->getFullId());
867 867
 		$provider = $this->factory->getProvider($providerId);
868 868
 
869 869
 		$provider->deleteFromSelf($share, $recipientId);
@@ -884,7 +884,7 @@  discard block
 block discarded – undo
884 884
 		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
885 885
 			$sharedWith = $this->groupManager->get($share->getSharedWith());
886 886
 			if (is_null($sharedWith)) {
887
-				throw new \InvalidArgumentException('Group "' . $share->getSharedWith() . '" does not exist');
887
+				throw new \InvalidArgumentException('Group "'.$share->getSharedWith().'" does not exist');
888 888
 			}
889 889
 			$recipient = $this->userManager->get($recipientId);
890 890
 			if (!$sharedWith->inGroup($recipient)) {
@@ -892,7 +892,7 @@  discard block
 block discarded – undo
892 892
 			}
893 893
 		}
894 894
 
895
-		list($providerId, ) = $this->splitFullId($share->getFullId());
895
+		list($providerId,) = $this->splitFullId($share->getFullId());
896 896
 		$provider = $this->factory->getProvider($providerId);
897 897
 
898 898
 		$provider->move($share, $recipientId);
@@ -939,7 +939,7 @@  discard block
 block discarded – undo
939 939
 
940 940
 		$shares2 = [];
941 941
 
942
-		while(true) {
942
+		while (true) {
943 943
 			$added = 0;
944 944
 			foreach ($shares as $share) {
945 945
 
@@ -1039,7 +1039,7 @@  discard block
 block discarded – undo
1039 1039
 	 *
1040 1040
 	 * @return Share[]
1041 1041
 	 */
1042
-	public function getSharesByPath(\OCP\Files\Node $path, $page=0, $perPage=50) {
1042
+	public function getSharesByPath(\OCP\Files\Node $path, $page = 0, $perPage = 50) {
1043 1043
 		return [];
1044 1044
 	}
1045 1045
 
@@ -1054,7 +1054,7 @@  discard block
 block discarded – undo
1054 1054
 	public function getShareByToken($token) {
1055 1055
 		$share = null;
1056 1056
 		try {
1057
-			if($this->shareApiAllowLinks()) {
1057
+			if ($this->shareApiAllowLinks()) {
1058 1058
 				$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_LINK);
1059 1059
 				$share = $provider->getShareByToken($token);
1060 1060
 			}
@@ -1261,7 +1261,7 @@  discard block
 block discarded – undo
1261 1261
 	 * @return int
1262 1262
 	 */
1263 1263
 	public function shareApiLinkDefaultExpireDays() {
1264
-		return (int)$this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
1264
+		return (int) $this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
1265 1265
 	}
1266 1266
 
1267 1267
 	/**
Please login to merge, or discard this patch.
apps/sharebymail/lib/ShareByMailProvider.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -234,11 +234,11 @@  discard block
 block discarded – undo
234 234
 				$share->getShareOwner(),
235 235
 				$share->getSharedBy(), $share->getSharedWith());
236 236
 		} catch (HintException $hintException) {
237
-			$this->logger->error('Failed to send share by mail: ' . $hintException->getMessage());
237
+			$this->logger->error('Failed to send share by mail: '.$hintException->getMessage());
238 238
 			$this->removeShareFromTable($shareId);
239 239
 			throw $hintException;
240 240
 		} catch (\Exception $e) {
241
-			$this->logger->error('Failed to send share by mail: ' . $e->getMessage());
241
+			$this->logger->error('Failed to send share by mail: '.$e->getMessage());
242 242
 			$this->removeShareFromTable($shareId);
243 243
 			throw new HintException('Failed to send share by mail',
244 244
 				$this->l->t('Failed to send share by E-mail'));
@@ -254,9 +254,9 @@  discard block
 block discarded – undo
254 254
 		$ownerDisplayName = ($ownerUser instanceof IUser) ? $ownerUser->getDisplayName() : $owner;
255 255
 		$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
256 256
 		if ($owner === $initiator) {
257
-			$subject = (string)$this->l->t('%s shared »%s« with you', array($ownerDisplayName, $filename));
257
+			$subject = (string) $this->l->t('%s shared »%s« with you', array($ownerDisplayName, $filename));
258 258
 		} else {
259
-			$subject = (string)$this->l->t('%s shared »%s« with you on behalf of %s', array($ownerDisplayName, $filename, $initiatorDisplayName));
259
+			$subject = (string) $this->l->t('%s shared »%s« with you on behalf of %s', array($ownerDisplayName, $filename, $initiatorDisplayName));
260 260
 		}
261 261
 
262 262
 		$message = $this->mailer->createMessage();
@@ -283,11 +283,11 @@  discard block
 block discarded – undo
283 283
 	protected function createMailBody($template, $filename, $link, $owner, $initiator) {
284 284
 
285 285
 		$mailBodyTemplate = new Template('sharebymail', $template, '');
286
-		$mailBodyTemplate->assign ('filename', \OCP\Util::sanitizeHTML($filename));
287
-		$mailBodyTemplate->assign ('link', $link);
288
-		$mailBodyTemplate->assign ('owner', \OCP\Util::sanitizeHTML($owner));
289
-		$mailBodyTemplate->assign ('initiator', \OCP\Util::sanitizeHTML($initiator));
290
-		$mailBodyTemplate->assign ('onBehalfOf', $initiator !== $owner);
286
+		$mailBodyTemplate->assign('filename', \OCP\Util::sanitizeHTML($filename));
287
+		$mailBodyTemplate->assign('link', $link);
288
+		$mailBodyTemplate->assign('owner', \OCP\Util::sanitizeHTML($owner));
289
+		$mailBodyTemplate->assign('initiator', \OCP\Util::sanitizeHTML($initiator));
290
+		$mailBodyTemplate->assign('onBehalfOf', $initiator !== $owner);
291 291
 		$mailBody = $mailBodyTemplate->fetchPage();
292 292
 
293 293
 		if (is_string($mailBody)) {
@@ -313,11 +313,11 @@  discard block
 block discarded – undo
313 313
 
314 314
 		$initiatorUser = $this->userManager->get($initiator);
315 315
 		$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
316
-		$subject = (string)$this->l->t('Password to access »%s« shared to you by %s', [$filename, $initiatorDisplayName]);
316
+		$subject = (string) $this->l->t('Password to access »%s« shared to you by %s', [$filename, $initiatorDisplayName]);
317 317
 
318 318
 		$message = $this->mailer->createMessage();
319 319
 		$htmlBody = $this->createMailBodyToSendPassword('mailpassword', $filename, $initiatorDisplayName, $password);
320
-		$textBody = $this->createMailBodyToSendPassword('altmailpassword', $filename,$initiatorDisplayName, $password);
320
+		$textBody = $this->createMailBodyToSendPassword('altmailpassword', $filename, $initiatorDisplayName, $password);
321 321
 		$message->setTo([$shareWith]);
322 322
 		$message->setSubject($subject);
323 323
 		$message->setBody($textBody, 'text/plain');
@@ -338,9 +338,9 @@  discard block
 block discarded – undo
338 338
 	protected function createMailBodyToSendPassword($template, $filename, $initiator, $password) {
339 339
 
340 340
 		$mailBodyTemplate = new Template('sharebymail', $template, '');
341
-		$mailBodyTemplate->assign ('filename', \OCP\Util::sanitizeHTML($filename));
342
-		$mailBodyTemplate->assign ('password', \OCP\Util::sanitizeHTML($password));
343
-		$mailBodyTemplate->assign ('initiator', \OCP\Util::sanitizeHTML($initiator));
341
+		$mailBodyTemplate->assign('filename', \OCP\Util::sanitizeHTML($filename));
342
+		$mailBodyTemplate->assign('password', \OCP\Util::sanitizeHTML($password));
343
+		$mailBodyTemplate->assign('initiator', \OCP\Util::sanitizeHTML($initiator));
344 344
 		$mailBody = $mailBodyTemplate->fetchPage();
345 345
 
346 346
 		if (is_string($mailBody)) {
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
 	 */
360 360
 	protected function generateToken() {
361 361
 		$token = $this->secureRandom->generate(
362
-			15, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
362
+			15, ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS);
363 363
 		return $token;
364 364
 	}
365 365
 
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
 			->orderBy('id');
381 381
 
382 382
 		$cursor = $qb->execute();
383
-		while($data = $cursor->fetch()) {
383
+		while ($data = $cursor->fetch()) {
384 384
 			$children[] = $this->createShareObject($data);
385 385
 		}
386 386
 		$cursor->closeCursor();
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
 		$qb->execute();
424 424
 		$id = $qb->getLastInsertId();
425 425
 
426
-		return (int)$id;
426
+		return (int) $id;
427 427
 	}
428 428
 
429 429
 	/**
@@ -440,7 +440,7 @@  discard block
 block discarded – undo
440 440
 		// a real password was given
441 441
 		$validPassword = $plainTextPassword !== null && $plainTextPassword !== '';
442 442
 
443
-		if($validPassword && $originalShare->getPassword() !== $share->getPassword()) {
443
+		if ($validPassword && $originalShare->getPassword() !== $share->getPassword()) {
444 444
 			$this->sendPassword($share->getNode()->getName(), $share->getSharedBy(), $share->getSharedWith(), $plainTextPassword);
445 445
 		}
446 446
 		/*
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
 
535 535
 		$cursor = $qb->execute();
536 536
 		$shares = [];
537
-		while($data = $cursor->fetch()) {
537
+		while ($data = $cursor->fetch()) {
538 538
 			$shares[] = $this->createShareObject($data);
539 539
 		}
540 540
 		$cursor->closeCursor();
@@ -586,7 +586,7 @@  discard block
 block discarded – undo
586 586
 			->execute();
587 587
 
588 588
 		$shares = [];
589
-		while($data = $cursor->fetch()) {
589
+		while ($data = $cursor->fetch()) {
590 590
 			$shares[] = $this->createShareObject($data);
591 591
 		}
592 592
 		$cursor->closeCursor();
@@ -625,7 +625,7 @@  discard block
 block discarded – undo
625 625
 
626 626
 		$cursor = $qb->execute();
627 627
 
628
-		while($data = $cursor->fetch()) {
628
+		while ($data = $cursor->fetch()) {
629 629
 			$shares[] = $this->createShareObject($data);
630 630
 		}
631 631
 		$cursor->closeCursor();
@@ -688,15 +688,15 @@  discard block
 block discarded – undo
688 688
 	protected function createShareObject($data) {
689 689
 
690 690
 		$share = new Share($this->rootFolder, $this->userManager);
691
-		$share->setId((int)$data['id'])
692
-			->setShareType((int)$data['share_type'])
693
-			->setPermissions((int)$data['permissions'])
691
+		$share->setId((int) $data['id'])
692
+			->setShareType((int) $data['share_type'])
693
+			->setPermissions((int) $data['permissions'])
694 694
 			->setTarget($data['file_target'])
695
-			->setMailSend((bool)$data['mail_send'])
695
+			->setMailSend((bool) $data['mail_send'])
696 696
 			->setToken($data['token']);
697 697
 
698 698
 		$shareTime = new \DateTime();
699
-		$shareTime->setTimestamp((int)$data['stime']);
699
+		$shareTime->setTimestamp((int) $data['stime']);
700 700
 		$share->setShareTime($shareTime);
701 701
 		$share->setSharedWith($data['share_with']);
702 702
 		$share->setPassword($data['password']);
@@ -707,7 +707,7 @@  discard block
 block discarded – undo
707 707
 		} else {
708 708
 			//OLD SHARE
709 709
 			$share->setSharedBy($data['uid_owner']);
710
-			$path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
710
+			$path = $this->getNode($share->getSharedBy(), (int) $data['file_source']);
711 711
 
712 712
 			$owner = $path->getOwner();
713 713
 			$share->setShareOwner($owner->getUID());
@@ -720,7 +720,7 @@  discard block
 block discarded – undo
720 720
 			}
721 721
 		}
722 722
 
723
-		$share->setNodeId((int)$data['file_source']);
723
+		$share->setNodeId((int) $data['file_source']);
724 724
 		$share->setNodeType($data['item_type']);
725 725
 
726 726
 		$share->setProviderId($this->identifier());
@@ -839,7 +839,7 @@  discard block
 block discarded – undo
839 839
 			);
840 840
 		}
841 841
 
842
-		$qb->innerJoin('s', 'filecache' ,'f', 's.file_source = f.fileid');
842
+		$qb->innerJoin('s', 'filecache', 'f', 's.file_source = f.fileid');
843 843
 		$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
844 844
 
845 845
 		$qb->orderBy('id');
Please login to merge, or discard this patch.
apps/sharebymail/templates/mailpassword.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	<tr><td>
28 28
 			<table cellspacing="0" cellpadding="0" border="0" width="600px">
29 29
 				<tr>
30
-					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary());?>">
30
+					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary()); ?>">
31 31
 						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
32 32
 					</td>
33 33
 				</tr>
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
53 53
 						<?php p($theme->getName()); ?> -
54 54
 						<?php p($theme->getSlogan()); ?>
55
-						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
55
+						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a>
56 56
 					</td>
57 57
 				</tr>
58 58
 				<tr>
Please login to merge, or discard this patch.