nextcloud / server

settings/Hooks.php

Spacing +2 added lines, -2 removed lines

@@ -126,7 +126,7 @@ 
 			$template->setSubject($this->l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
 			$template->addHeader();
 			$template->addHeading($this->l->t('Password changed for %s', [$user->getDisplayName()]), false);
-			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
+			$template->addBodyText($text.' '.$this->l->t('If you did not request this, please contact an administrator.'));
 			$template->addFooter();
 
 
@@ -196,7 +196,7 @@ 
 			$template->setSubject($this->l->t('Email address for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
 			$template->addHeader();
 			$template->addHeading($this->l->t('Email address changed for %s', [$user->getDisplayName()]), false);
-			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
+			$template->addBodyText($text.' '.$this->l->t('If you did not request this, please contact an administrator.'));
 			if ($user->getEMailAddress()) {
 				$template->addBodyText($this->l->t('The new email address is %s', [$user->getEMailAddress()]));
 			}

Indentation +175 added lines, -175 removed lines

@@ -34,179 +34,179 @@
 
 class Hooks {
 
-	/** @var IActivityManager */
-	protected $activityManager;
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IUserSession */
-	protected $userSession;
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-	/** @var IMailer */
-	protected $mailer;
-	/** @var IConfig */
-	protected $config;
-	/** @var IFactory */
-	protected $languageFactory;
-	/** @var IL10N */
-	protected $l;
-
-	public function __construct(IActivityManager $activityManager,
-								IUserManager $userManager,
-								IUserSession $userSession,
-								IURLGenerator $urlGenerator,
-								IMailer $mailer,
-								IConfig $config,
-								IFactory $languageFactory,
-								IL10N $l) {
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-		$this->urlGenerator = $urlGenerator;
-		$this->mailer = $mailer;
-		$this->config = $config;
-		$this->languageFactory = $languageFactory;
-		$this->l = $l;
-	}
-
-	/**
-	 * @param string $uid
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 */
-	public function onChangePassword($uid) {
-		$user = $this->userManager->get($uid);
-
-		if (!$user instanceof IUser || $user->getLastLogin() === 0) {
-			// User didn't login, so don't create activities and emails.
-			return;
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('settings')
-			->setType('personal_settings')
-			->setAffectedUser($user->getUID());
-
-		$instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
-
-		$actor = $this->userSession->getUser();
-		if ($actor instanceof IUser) {
-			if ($actor->getUID() !== $user->getUID()) {
-				$this->l = $this->languageFactory->get(
-					'settings',
-					$this->config->getUserValue(
-						$user->getUID(), 'core', 'lang',
-						$this->config->getSystemValue('default_language', 'en')
-					)
-				);
-
-				$text = $this->l->t('%1$s changed your password on %2$s.', [$actor->getDisplayName(), $instanceUrl]);
-				$event->setAuthor($actor->getUID())
-					->setSubject(Provider::PASSWORD_CHANGED_BY, [$actor->getUID()]);
-			} else {
-				$text = $this->l->t('Your password on %s was changed.', [$instanceUrl]);
-				$event->setAuthor($actor->getUID())
-					->setSubject(Provider::PASSWORD_CHANGED_SELF);
-			}
-		} else {
-			$text = $this->l->t('Your password on %s was reset by an administrator.', [$instanceUrl]);
-			$event->setSubject(Provider::PASSWORD_RESET);
-		}
-
-		$this->activityManager->publish($event);
-
-		if ($user->getEMailAddress() !== null) {
-			$template = $this->mailer->createEMailTemplate('settings.PasswordChanged', [
-				'displayname' => $user->getDisplayName(),
-				'emailAddress' => $user->getEMailAddress(),
-				'instanceUrl' => $instanceUrl,
-			]);
-
-			$template->setSubject($this->l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
-			$template->addHeader();
-			$template->addHeading($this->l->t('Password changed for %s', [$user->getDisplayName()]), false);
-			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
-			$template->addFooter();
-
-
-			$message = $this->mailer->createMessage();
-			$message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
-			$message->useTemplate($template);
-			$this->mailer->send($message);
-		}
-	}
-
-	/**
-	 * @param IUser $user
-	 * @param string|null $oldMailAddress
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 */
-	public function onChangeEmail(IUser $user, $oldMailAddress) {
-
-		if ($oldMailAddress === $user->getEMailAddress() ||
-			$user->getLastLogin() === 0) {
-			// Email didn't really change or user didn't login,
-			// so don't create activities and emails.
-			return;
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('settings')
-			->setType('personal_settings')
-			->setAffectedUser($user->getUID());
-
-		$instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
-
-		$actor = $this->userSession->getUser();
-		if ($actor instanceof IUser) {
-			if ($actor->getUID() !== $user->getUID()) {
-				$this->l = $this->languageFactory->get(
-					'settings',
-					$this->config->getUserValue(
-						$user->getUID(), 'core', 'lang',
-						$this->config->getSystemValue('default_language', 'en')
-					)
-				);
-
-				$text = $this->l->t('%1$s changed your email address on %2$s.', [$actor->getDisplayName(), $instanceUrl]);
-				$event->setAuthor($actor->getUID())
-					->setSubject(Provider::EMAIL_CHANGED_BY, [$actor->getUID()]);
-			} else {
-				$text = $this->l->t('Your email address on %s was changed.', [$instanceUrl]);
-				$event->setAuthor($actor->getUID())
-					->setSubject(Provider::EMAIL_CHANGED_SELF);
-			}
-		} else {
-			$text = $this->l->t('Your email address on %s was changed by an administrator.', [$instanceUrl]);
-			$event->setSubject(Provider::EMAIL_CHANGED);
-		}
-		$this->activityManager->publish($event);
-
-
-		if ($oldMailAddress !== null) {
-			$template = $this->mailer->createEMailTemplate('settings.EmailChanged', [
-				'displayname' => $user->getDisplayName(),
-				'newEMailAddress' => $user->getEMailAddress(),
-				'oldEMailAddress' => $oldMailAddress,
-				'instanceUrl' => $instanceUrl,
-			]);
-
-			$template->setSubject($this->l->t('Email address for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
-			$template->addHeader();
-			$template->addHeading($this->l->t('Email address changed for %s', [$user->getDisplayName()]), false);
-			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
-			if ($user->getEMailAddress()) {
-				$template->addBodyText($this->l->t('The new email address is %s', [$user->getEMailAddress()]));
-			}
-			$template->addFooter();
-
-
-			$message = $this->mailer->createMessage();
-			$message->setTo([$oldMailAddress => $user->getDisplayName()]);
-			$message->useTemplate($template);
-			$this->mailer->send($message);
-		}
-	}
+    /** @var IActivityManager */
+    protected $activityManager;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IUserSession */
+    protected $userSession;
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+    /** @var IMailer */
+    protected $mailer;
+    /** @var IConfig */
+    protected $config;
+    /** @var IFactory */
+    protected $languageFactory;
+    /** @var IL10N */
+    protected $l;
+
+    public function __construct(IActivityManager $activityManager,
+                                IUserManager $userManager,
+                                IUserSession $userSession,
+                                IURLGenerator $urlGenerator,
+                                IMailer $mailer,
+                                IConfig $config,
+                                IFactory $languageFactory,
+                                IL10N $l) {
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+        $this->userSession = $userSession;
+        $this->urlGenerator = $urlGenerator;
+        $this->mailer = $mailer;
+        $this->config = $config;
+        $this->languageFactory = $languageFactory;
+        $this->l = $l;
+    }
+
+    /**
+     * @param string $uid
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     */
+    public function onChangePassword($uid) {
+        $user = $this->userManager->get($uid);
+
+        if (!$user instanceof IUser || $user->getLastLogin() === 0) {
+            // User didn't login, so don't create activities and emails.
+            return;
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('settings')
+            ->setType('personal_settings')
+            ->setAffectedUser($user->getUID());
+
+        $instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
+
+        $actor = $this->userSession->getUser();
+        if ($actor instanceof IUser) {
+            if ($actor->getUID() !== $user->getUID()) {
+                $this->l = $this->languageFactory->get(
+                    'settings',
+                    $this->config->getUserValue(
+                        $user->getUID(), 'core', 'lang',
+                        $this->config->getSystemValue('default_language', 'en')
+                    )
+                );
+
+                $text = $this->l->t('%1$s changed your password on %2$s.', [$actor->getDisplayName(), $instanceUrl]);
+                $event->setAuthor($actor->getUID())
+                    ->setSubject(Provider::PASSWORD_CHANGED_BY, [$actor->getUID()]);
+            } else {
+                $text = $this->l->t('Your password on %s was changed.', [$instanceUrl]);
+                $event->setAuthor($actor->getUID())
+                    ->setSubject(Provider::PASSWORD_CHANGED_SELF);
+            }
+        } else {
+            $text = $this->l->t('Your password on %s was reset by an administrator.', [$instanceUrl]);
+            $event->setSubject(Provider::PASSWORD_RESET);
+        }
+
+        $this->activityManager->publish($event);
+
+        if ($user->getEMailAddress() !== null) {
+            $template = $this->mailer->createEMailTemplate('settings.PasswordChanged', [
+                'displayname' => $user->getDisplayName(),
+                'emailAddress' => $user->getEMailAddress(),
+                'instanceUrl' => $instanceUrl,
+            ]);
+
+            $template->setSubject($this->l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
+            $template->addHeader();
+            $template->addHeading($this->l->t('Password changed for %s', [$user->getDisplayName()]), false);
+            $template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
+            $template->addFooter();
+
+
+            $message = $this->mailer->createMessage();
+            $message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
+            $message->useTemplate($template);
+            $this->mailer->send($message);
+        }
+    }
+
+    /**
+     * @param IUser $user
+     * @param string|null $oldMailAddress
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     */
+    public function onChangeEmail(IUser $user, $oldMailAddress) {
+
+        if ($oldMailAddress === $user->getEMailAddress() ||
+            $user->getLastLogin() === 0) {
+            // Email didn't really change or user didn't login,
+            // so don't create activities and emails.
+            return;
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('settings')
+            ->setType('personal_settings')
+            ->setAffectedUser($user->getUID());
+
+        $instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
+
+        $actor = $this->userSession->getUser();
+        if ($actor instanceof IUser) {
+            if ($actor->getUID() !== $user->getUID()) {
+                $this->l = $this->languageFactory->get(
+                    'settings',
+                    $this->config->getUserValue(
+                        $user->getUID(), 'core', 'lang',
+                        $this->config->getSystemValue('default_language', 'en')
+                    )
+                );
+
+                $text = $this->l->t('%1$s changed your email address on %2$s.', [$actor->getDisplayName(), $instanceUrl]);
+                $event->setAuthor($actor->getUID())
+                    ->setSubject(Provider::EMAIL_CHANGED_BY, [$actor->getUID()]);
+            } else {
+                $text = $this->l->t('Your email address on %s was changed.', [$instanceUrl]);
+                $event->setAuthor($actor->getUID())
+                    ->setSubject(Provider::EMAIL_CHANGED_SELF);
+            }
+        } else {
+            $text = $this->l->t('Your email address on %s was changed by an administrator.', [$instanceUrl]);
+            $event->setSubject(Provider::EMAIL_CHANGED);
+        }
+        $this->activityManager->publish($event);
+
+
+        if ($oldMailAddress !== null) {
+            $template = $this->mailer->createEMailTemplate('settings.EmailChanged', [
+                'displayname' => $user->getDisplayName(),
+                'newEMailAddress' => $user->getEMailAddress(),
+                'oldEMailAddress' => $oldMailAddress,
+                'instanceUrl' => $instanceUrl,
+            ]);
+
+            $template->setSubject($this->l->t('Email address for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
+            $template->addHeader();
+            $template->addHeading($this->l->t('Email address changed for %s', [$user->getDisplayName()]), false);
+            $template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
+            if ($user->getEMailAddress()) {
+                $template->addBodyText($this->l->t('The new email address is %s', [$user->getEMailAddress()]));
+            }
+            $template->addFooter();
+
+
+            $message = $this->mailer->createMessage();
+            $message->setTo([$oldMailAddress => $user->getDisplayName()]);
+            $message->useTemplate($template);
+            $this->mailer->send($message);
+        }
+    }
 }

apps/files_versions/lib/Events/CreateVersionEvent.php

Indentation +35 added lines, -35 removed lines

@@ -37,45 +37,45 @@
 class CreateVersionEvent extends Event {
 
 
-	/** @var bool */
-	private $createVersion;
+    /** @var bool */
+    private $createVersion;
 
-	/** @var Node */
-	private $node;
+    /** @var Node */
+    private $node;
 
-	/**
-	 * CreateVersionEvent constructor.
-	 *
-	 * @param Node $node
-	 */
-	public function __construct(Node $node) {
-		$this->createVersion = true;
-		$this->node = $node;
-	}
+    /**
+     * CreateVersionEvent constructor.
+     *
+     * @param Node $node
+     */
+    public function __construct(Node $node) {
+        $this->createVersion = true;
+        $this->node = $node;
+    }
 
-	/**
-	 * get Node of the file which should be versioned
-	 *
-	 * @return Node
-	 */
-	public function getNode() {
-		return $this->node;
-	}
+    /**
+     * get Node of the file which should be versioned
+     *
+     * @return Node
+     */
+    public function getNode() {
+        return $this->node;
+    }
 
-	/**
-	 * disable versions for this file
-	 */
-	public function disableVersions() {
-		$this->createVersion = false;
-	}
+    /**
+     * disable versions for this file
+     */
+    public function disableVersions() {
+        $this->createVersion = false;
+    }
 
-	/**
-	 * should a version be created for this file?
-	 *
-	 * @return bool
-	 */
-	public function shouldCreateVersion() {
-		return $this->createVersion;
-	}
+    /**
+     * should a version be created for this file?
+     *
+     * @return bool
+     */
+    public function shouldCreateVersion() {
+        return $this->createVersion;
+    }
 
 }

apps/theming/lib/IconBuilder.php

Spacing +18 added lines, -18 removed lines

@@ -63,19 +63,19 @@ 
 			$icon->setImageFormat("png32");
 
 			$clone = clone $icon;
-			$clone->scaleImage(16,0);
+			$clone->scaleImage(16, 0);
 			$favicon->addImage($clone);
 
 			$clone = clone $icon;
-			$clone->scaleImage(32,0);
+			$clone->scaleImage(32, 0);
 			$favicon->addImage($clone);
 
 			$clone = clone $icon;
-			$clone->scaleImage(64,0);
+			$clone->scaleImage(64, 0);
 			$favicon->addImage($clone);
 
 			$clone = clone $icon;
-			$clone->scaleImage(128,0);
+			$clone->scaleImage(128, 0);
 			$favicon->addImage($clone);
 
 			$data = $favicon->getImagesBlob();
@@ -117,7 +117,7 @@ 
 	 */
 	public function renderAppIcon($app, $size) {
 		$appIcon = $this->util->getAppIcon($app);
-		if($appIcon === false) {
+		if ($appIcon === false) {
 			return false;
 		}
 		if ($appIcon instanceof ISimpleFile) {
@@ -128,20 +128,20 @@ 
 			$mime = mime_content_type($appIcon);
 		}
 
-		if($appIconContent === false || $appIconContent === "") {
+		if ($appIconContent === false || $appIconContent === "") {
 			return false;
 		}
 
 		$color = $this->themingDefaults->getColorPrimary();
 
 		// generate background image with rounded corners
-		$background = '<?xml version="1.0" encoding="UTF-8"?>' .
-			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
-			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
+		$background = '<?xml version="1.0" encoding="UTF-8"?>'.
+			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">'.
+			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:'.$color.';" />'.
 			'</svg>';
 		// resize svg magic as this seems broken in Imagemagick
-		if($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
-			if(substr($appIconContent, 0, 5) !== "<?xml") {
+		if ($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
+			if (substr($appIconContent, 0, 5) !== "<?xml") {
 				$svg = "<?xml version=\"1.0\"?>".$appIconContent;
 			} else {
 				$svg = $appIconContent;
@@ -153,7 +153,7 @@ 
 			$res = $tmp->getImageResolution();
 			$tmp->destroy();
 
-			if($x>$y) {
+			if ($x > $y) {
 				$max = $x;
 			} else {
 				$max = $y;
@@ -161,8 +161,8 @@ 
 
 			// convert svg to resized image
 			$appIconFile = new Imagick();
-			$resX = (int)(512 * $res['x'] / $max * 2.53);
-			$resY = (int)(512 * $res['y'] / $max * 2.53);
+			$resX = (int) (512 * $res['x'] / $max * 2.53);
+			$resY = (int) (512 * $res['y'] / $max * 2.53);
 			$appIconFile->setResolution($resX, $resY);
 			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
 			$appIconFile->readImageBlob($svg);
@@ -185,10 +185,10 @@ 
 			$appIconFile->scaleImage(512, 512, true);
 		}
 		// offset for icon positioning
-		$border_w = (int)($appIconFile->getImageWidth() * 0.05);
-		$border_h = (int)($appIconFile->getImageHeight() * 0.05);
-		$innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
-		$innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
+		$border_w = (int) ($appIconFile->getImageWidth() * 0.05);
+		$border_h = (int) ($appIconFile->getImageHeight() * 0.05);
+		$innerWidth = (int) ($appIconFile->getImageWidth() - $border_w * 2);
+		$innerHeight = (int) ($appIconFile->getImageHeight() - $border_h * 2);
 		$appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
 		// center icon
 		$offset_w = 512 / 2 - $innerWidth / 2;

Indentation +206 added lines, -206 removed lines

@@ -31,211 +31,211 @@
 use OCP\Files\SimpleFS\ISimpleFile;
 
 class IconBuilder {
-	/** @var ThemingDefaults */
-	private $themingDefaults;
-	/** @var Util */
-	private $util;
-	/** @var ImageManager */
-	private $imageManager;
-
-	/**
-	 * IconBuilder constructor.
-	 *
-	 * @param ThemingDefaults $themingDefaults
-	 * @param Util $util
-	 * @param ImageManager $imageManager
-	 */
-	public function __construct(
-		ThemingDefaults $themingDefaults,
-		Util $util,
-		ImageManager $imageManager
-	) {
-		$this->themingDefaults = $themingDefaults;
-		$this->util = $util;
-		$this->imageManager = $imageManager;
-	}
-
-	/**
-	 * @param $app string app name
-	 * @return string|false image blob
-	 */
-	public function getFavicon($app) {
-		if (!$this->imageManager->shouldReplaceIcons()) {
-			return false;
-		}
-		try {
-			$favicon = new Imagick();
-			$favicon->setFormat("ico");
-			$icon = $this->renderAppIcon($app, 128);
-			if ($icon === false) {
-				return false;
-			}
-			$icon->setImageFormat("png32");
-
-			$clone = clone $icon;
-			$clone->scaleImage(16,0);
-			$favicon->addImage($clone);
-
-			$clone = clone $icon;
-			$clone->scaleImage(32,0);
-			$favicon->addImage($clone);
-
-			$clone = clone $icon;
-			$clone->scaleImage(64,0);
-			$favicon->addImage($clone);
-
-			$clone = clone $icon;
-			$clone->scaleImage(128,0);
-			$favicon->addImage($clone);
-
-			$data = $favicon->getImagesBlob();
-			$favicon->destroy();
-			$icon->destroy();
-			$clone->destroy();
-			return $data;
-		} catch (\ImagickException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @param $app string app name
-	 * @return string|false image blob
-	 */
-	public function getTouchIcon($app) {
-		try {
-			$icon = $this->renderAppIcon($app, 512);
-			if ($icon === false) {
-				return false;
-			}
-			$icon->setImageFormat("png32");
-			$data = $icon->getImageBlob();
-			$icon->destroy();
-			return $data;
-		} catch (\ImagickException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Render app icon on themed background color
-	 * fallback to logo
-	 *
-	 * @param $app string app name
-	 * @param $size int size of the icon in px
-	 * @return Imagick|false
-	 */
-	public function renderAppIcon($app, $size) {
-		$appIcon = $this->util->getAppIcon($app);
-		if($appIcon === false) {
-			return false;
-		}
-		if ($appIcon instanceof ISimpleFile) {
-			$appIconContent = $appIcon->getContent();
-			$mime = $appIcon->getMimeType();
-		} else {
-			$appIconContent = file_get_contents($appIcon);
-			$mime = mime_content_type($appIcon);
-		}
-
-		if($appIconContent === false || $appIconContent === "") {
-			return false;
-		}
-
-		$color = $this->themingDefaults->getColorPrimary();
-
-		// generate background image with rounded corners
-		$background = '<?xml version="1.0" encoding="UTF-8"?>' .
-			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
-			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
-			'</svg>';
-		// resize svg magic as this seems broken in Imagemagick
-		if($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
-			if(substr($appIconContent, 0, 5) !== "<?xml") {
-				$svg = "<?xml version=\"1.0\"?>".$appIconContent;
-			} else {
-				$svg = $appIconContent;
-			}
-			$tmp = new Imagick();
-			$tmp->readImageBlob($svg);
-			$x = $tmp->getImageWidth();
-			$y = $tmp->getImageHeight();
-			$res = $tmp->getImageResolution();
-			$tmp->destroy();
-
-			if($x>$y) {
-				$max = $x;
-			} else {
-				$max = $y;
-			}
-
-			// convert svg to resized image
-			$appIconFile = new Imagick();
-			$resX = (int)(512 * $res['x'] / $max * 2.53);
-			$resY = (int)(512 * $res['y'] / $max * 2.53);
-			$appIconFile->setResolution($resX, $resY);
-			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-			$appIconFile->readImageBlob($svg);
-
-			/**
-			 * invert app icons for bright primary colors
-			 * the default nextcloud logo will not be inverted to black
-			 */
-			if ($this->util->invertTextColor($color)
-				&& !$appIcon instanceof ISimpleFile
-				&& $app !== "core"
-			) {
-				$appIconFile->negateImage(false);
-			}
-			$appIconFile->scaleImage(512, 512, true);
-		} else {
-			$appIconFile = new Imagick();
-			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-			$appIconFile->readImageBlob($appIconContent);
-			$appIconFile->scaleImage(512, 512, true);
-		}
-		// offset for icon positioning
-		$border_w = (int)($appIconFile->getImageWidth() * 0.05);
-		$border_h = (int)($appIconFile->getImageHeight() * 0.05);
-		$innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
-		$innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
-		$appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
-		// center icon
-		$offset_w = 512 / 2 - $innerWidth / 2;
-		$offset_h = 512 / 2 - $innerHeight / 2;
-
-		$finalIconFile = new Imagick();
-		$finalIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-		$finalIconFile->readImageBlob($background);
-		$finalIconFile->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
-		$finalIconFile->setImageArtifact('compose:args', "1,0,-0.5,0.5");
-		$finalIconFile->compositeImage($appIconFile, Imagick::COMPOSITE_ATOP, $offset_w, $offset_h);
-		$finalIconFile->setImageFormat('png24');
-		if (defined("Imagick::INTERPOLATE_BICUBIC") === true) {
-			$filter = Imagick::INTERPOLATE_BICUBIC;
-		} else {
-			$filter = Imagick::FILTER_LANCZOS;
-		}
-		$finalIconFile->resizeImage($size, $size, $filter, 1, false);
-
-		$appIconFile->destroy();
-		return $finalIconFile;
-	}
-
-	public function colorSvg($app, $image) {
-		try {
-			$imageFile = $this->util->getAppImage($app, $image);
-		} catch (AppPathNotFoundException $e) {
-			return false;
-		}
-		$svg = file_get_contents($imageFile);
-		if ($svg !== false && $svg !== "") {
-			$color = $this->util->elementColor($this->themingDefaults->getColorPrimary());
-			$svg = $this->util->colorizeSvg($svg, $color);
-			return $svg;
-		} else {
-			return false;
-		}
-	}
+    /** @var ThemingDefaults */
+    private $themingDefaults;
+    /** @var Util */
+    private $util;
+    /** @var ImageManager */
+    private $imageManager;
+
+    /**
+     * IconBuilder constructor.
+     *
+     * @param ThemingDefaults $themingDefaults
+     * @param Util $util
+     * @param ImageManager $imageManager
+     */
+    public function __construct(
+        ThemingDefaults $themingDefaults,
+        Util $util,
+        ImageManager $imageManager
+    ) {
+        $this->themingDefaults = $themingDefaults;
+        $this->util = $util;
+        $this->imageManager = $imageManager;
+    }
+
+    /**
+     * @param $app string app name
+     * @return string|false image blob
+     */
+    public function getFavicon($app) {
+        if (!$this->imageManager->shouldReplaceIcons()) {
+            return false;
+        }
+        try {
+            $favicon = new Imagick();
+            $favicon->setFormat("ico");
+            $icon = $this->renderAppIcon($app, 128);
+            if ($icon === false) {
+                return false;
+            }
+            $icon->setImageFormat("png32");
+
+            $clone = clone $icon;
+            $clone->scaleImage(16,0);
+            $favicon->addImage($clone);
+
+            $clone = clone $icon;
+            $clone->scaleImage(32,0);
+            $favicon->addImage($clone);
+
+            $clone = clone $icon;
+            $clone->scaleImage(64,0);
+            $favicon->addImage($clone);
+
+            $clone = clone $icon;
+            $clone->scaleImage(128,0);
+            $favicon->addImage($clone);
+
+            $data = $favicon->getImagesBlob();
+            $favicon->destroy();
+            $icon->destroy();
+            $clone->destroy();
+            return $data;
+        } catch (\ImagickException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @param $app string app name
+     * @return string|false image blob
+     */
+    public function getTouchIcon($app) {
+        try {
+            $icon = $this->renderAppIcon($app, 512);
+            if ($icon === false) {
+                return false;
+            }
+            $icon->setImageFormat("png32");
+            $data = $icon->getImageBlob();
+            $icon->destroy();
+            return $data;
+        } catch (\ImagickException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Render app icon on themed background color
+     * fallback to logo
+     *
+     * @param $app string app name
+     * @param $size int size of the icon in px
+     * @return Imagick|false
+     */
+    public function renderAppIcon($app, $size) {
+        $appIcon = $this->util->getAppIcon($app);
+        if($appIcon === false) {
+            return false;
+        }
+        if ($appIcon instanceof ISimpleFile) {
+            $appIconContent = $appIcon->getContent();
+            $mime = $appIcon->getMimeType();
+        } else {
+            $appIconContent = file_get_contents($appIcon);
+            $mime = mime_content_type($appIcon);
+        }
+
+        if($appIconContent === false || $appIconContent === "") {
+            return false;
+        }
+
+        $color = $this->themingDefaults->getColorPrimary();
+
+        // generate background image with rounded corners
+        $background = '<?xml version="1.0" encoding="UTF-8"?>' .
+            '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
+            '<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
+            '</svg>';
+        // resize svg magic as this seems broken in Imagemagick
+        if($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
+            if(substr($appIconContent, 0, 5) !== "<?xml") {
+                $svg = "<?xml version=\"1.0\"?>".$appIconContent;
+            } else {
+                $svg = $appIconContent;
+            }
+            $tmp = new Imagick();
+            $tmp->readImageBlob($svg);
+            $x = $tmp->getImageWidth();
+            $y = $tmp->getImageHeight();
+            $res = $tmp->getImageResolution();
+            $tmp->destroy();
+
+            if($x>$y) {
+                $max = $x;
+            } else {
+                $max = $y;
+            }
+
+            // convert svg to resized image
+            $appIconFile = new Imagick();
+            $resX = (int)(512 * $res['x'] / $max * 2.53);
+            $resY = (int)(512 * $res['y'] / $max * 2.53);
+            $appIconFile->setResolution($resX, $resY);
+            $appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+            $appIconFile->readImageBlob($svg);
+
+            /**
+             * invert app icons for bright primary colors
+             * the default nextcloud logo will not be inverted to black
+             */
+            if ($this->util->invertTextColor($color)
+                && !$appIcon instanceof ISimpleFile
+                && $app !== "core"
+            ) {
+                $appIconFile->negateImage(false);
+            }
+            $appIconFile->scaleImage(512, 512, true);
+        } else {
+            $appIconFile = new Imagick();
+            $appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+            $appIconFile->readImageBlob($appIconContent);
+            $appIconFile->scaleImage(512, 512, true);
+        }
+        // offset for icon positioning
+        $border_w = (int)($appIconFile->getImageWidth() * 0.05);
+        $border_h = (int)($appIconFile->getImageHeight() * 0.05);
+        $innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
+        $innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
+        $appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
+        // center icon
+        $offset_w = 512 / 2 - $innerWidth / 2;
+        $offset_h = 512 / 2 - $innerHeight / 2;
+
+        $finalIconFile = new Imagick();
+        $finalIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+        $finalIconFile->readImageBlob($background);
+        $finalIconFile->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
+        $finalIconFile->setImageArtifact('compose:args', "1,0,-0.5,0.5");
+        $finalIconFile->compositeImage($appIconFile, Imagick::COMPOSITE_ATOP, $offset_w, $offset_h);
+        $finalIconFile->setImageFormat('png24');
+        if (defined("Imagick::INTERPOLATE_BICUBIC") === true) {
+            $filter = Imagick::INTERPOLATE_BICUBIC;
+        } else {
+            $filter = Imagick::FILTER_LANCZOS;
+        }
+        $finalIconFile->resizeImage($size, $size, $filter, 1, false);
+
+        $appIconFile->destroy();
+        return $finalIconFile;
+    }
+
+    public function colorSvg($app, $image) {
+        try {
+            $imageFile = $this->util->getAppImage($app, $image);
+        } catch (AppPathNotFoundException $e) {
+            return false;
+        }
+        $svg = file_get_contents($imageFile);
+        if ($svg !== false && $svg !== "") {
+            $color = $this->util->elementColor($this->themingDefaults->getColorPrimary());
+            $svg = $this->util->colorizeSvg($svg, $color);
+            return $svg;
+        } else {
+            return false;
+        }
+    }
 
 }

lib/public/ICacheFactory.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
  * @package OCP
  * @since 7.0.0
  */
-interface ICacheFactory{
+interface ICacheFactory {
 	/**
 	 * Get a distributed memory cache instance
 	 *

Indentation +49 added lines, -49 removed lines

@@ -31,58 +31,58 @@
  * @since 7.0.0
  */
 interface ICacheFactory{
-	/**
-	 * Get a distributed memory cache instance
-	 *
-	 * All entries added trough the cache instance will be namespaced by $prefix to prevent collisions between apps
-	 *
-	 * @param string $prefix
-	 * @return ICache
-	 * @since 7.0.0
-	 * @deprecated 13.0.0 Use either createLocking, createDistributed or createLocal
-	 */
-	public function create(string $prefix = ''): ICache;
+    /**
+     * Get a distributed memory cache instance
+     *
+     * All entries added trough the cache instance will be namespaced by $prefix to prevent collisions between apps
+     *
+     * @param string $prefix
+     * @return ICache
+     * @since 7.0.0
+     * @deprecated 13.0.0 Use either createLocking, createDistributed or createLocal
+     */
+    public function create(string $prefix = ''): ICache;
 
-	/**
-	 * Check if any memory cache backend is available
-	 *
-	 * @return bool
-	 * @since 7.0.0
-	 */
-	public function isAvailable(): bool;
+    /**
+     * Check if any memory cache backend is available
+     *
+     * @return bool
+     * @since 7.0.0
+     */
+    public function isAvailable(): bool;
 
-	/**
-	 * Check if a local memory cache backend is available
-	 *
-	 * @return bool
-	 * @since 14.0.0
-	 */
-	public function isLocalCacheAvailable(): bool;
+    /**
+     * Check if a local memory cache backend is available
+     *
+     * @return bool
+     * @since 14.0.0
+     */
+    public function isLocalCacheAvailable(): bool;
 
-	/**
-	 * create a cache instance for storing locks
-	 *
-	 * @param string $prefix
-	 * @return IMemcache
-	 * @since 13.0.0
-	 */
-	public function createLocking(string $prefix = ''): IMemcache;
+    /**
+     * create a cache instance for storing locks
+     *
+     * @param string $prefix
+     * @return IMemcache
+     * @since 13.0.0
+     */
+    public function createLocking(string $prefix = ''): IMemcache;
 
-	/**
-	 * create a distributed cache instance
-	 *
-	 * @param string $prefix
-	 * @return ICache
-	 * @since 13.0.0
-	 */
-	public function createDistributed(string $prefix = ''): ICache;
+    /**
+     * create a distributed cache instance
+     *
+     * @param string $prefix
+     * @return ICache
+     * @since 13.0.0
+     */
+    public function createDistributed(string $prefix = ''): ICache;
 
-	/**
-	 * create a local cache instance
-	 *
-	 * @param string $prefix
-	 * @return ICache
-	 * @since 13.0.0
-	 */
-	public function createLocal(string $prefix = ''): ICache;
+    /**
+     * create a local cache instance
+     *
+     * @param string $prefix
+     * @return ICache
+     * @since 13.0.0
+     */
+    public function createLocal(string $prefix = ''): ICache;
 }

lib/private/NavigationManager.php

Spacing +4 added lines, -4 removed lines

@@ -88,13 +88,13 @@ 
 		}
 
 		$entry['active'] = false;
-		if(!isset($entry['icon'])) {
+		if (!isset($entry['icon'])) {
 			$entry['icon'] = '';
 		}
-		if(!isset($entry['classes'])) {
+		if (!isset($entry['classes'])) {
 			$entry['classes'] = '';
 		}
-		if(!isset($entry['type'])) {
+		if (!isset($entry['type'])) {
 			$entry['type'] = 'link';
 		}
 		$this->entries[] = $entry;
@@ -191,7 +191,7 @@ 
 			]);
 
 			$logoutUrl = \OC_User::getLogoutUrl($this->urlGenerator);
-			if($logoutUrl !== '') {
+			if ($logoutUrl !== '') {
 				// Logout
 				$this->add([
 					'type' => 'settings',

Indentation +260 added lines, -260 removed lines

@@ -44,290 +44,290 @@
  */
 
 class NavigationManager implements INavigationManager {
-	protected $entries = [];
-	protected $closureEntries = [];
-	protected $activeEntry;
-	/** @var bool */
-	protected $init = false;
-	/** @var IAppManager|AppManager */
-	protected $appManager;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IFactory */
-	private $l10nFac;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IGroupManager|Manager */
-	private $groupManager;
-	/** @var IConfig */
-	private $config;
+    protected $entries = [];
+    protected $closureEntries = [];
+    protected $activeEntry;
+    /** @var bool */
+    protected $init = false;
+    /** @var IAppManager|AppManager */
+    protected $appManager;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IFactory */
+    private $l10nFac;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IGroupManager|Manager */
+    private $groupManager;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(IAppManager $appManager,
-						 IURLGenerator $urlGenerator,
-						 IFactory $l10nFac,
-						 IUserSession $userSession,
-						 IGroupManager $groupManager,
-						 IConfig $config) {
-		$this->appManager = $appManager;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10nFac = $l10nFac;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->config = $config;
-	}
+    public function __construct(IAppManager $appManager,
+                            IURLGenerator $urlGenerator,
+                            IFactory $l10nFac,
+                            IUserSession $userSession,
+                            IGroupManager $groupManager,
+                            IConfig $config) {
+        $this->appManager = $appManager;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10nFac = $l10nFac;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->config = $config;
+    }
 
-	/**
-	 * Creates a new navigation entry
-	 *
-	 * @param array|\Closure $entry Array containing: id, name, order, icon and href key
-	 *					The use of a closure is preferred, because it will avoid
-	 * 					loading the routing of your app, unless required.
-	 * @return void
-	 */
-	public function add($entry) {
-		if ($entry instanceof \Closure) {
-			$this->closureEntries[] = $entry;
-			return;
-		}
+    /**
+     * Creates a new navigation entry
+     *
+     * @param array|\Closure $entry Array containing: id, name, order, icon and href key
+     *					The use of a closure is preferred, because it will avoid
+     * 					loading the routing of your app, unless required.
+     * @return void
+     */
+    public function add($entry) {
+        if ($entry instanceof \Closure) {
+            $this->closureEntries[] = $entry;
+            return;
+        }
 
-		$entry['active'] = false;
-		if(!isset($entry['icon'])) {
-			$entry['icon'] = '';
-		}
-		if(!isset($entry['classes'])) {
-			$entry['classes'] = '';
-		}
-		if(!isset($entry['type'])) {
-			$entry['type'] = 'link';
-		}
-		$this->entries[] = $entry;
-	}
+        $entry['active'] = false;
+        if(!isset($entry['icon'])) {
+            $entry['icon'] = '';
+        }
+        if(!isset($entry['classes'])) {
+            $entry['classes'] = '';
+        }
+        if(!isset($entry['type'])) {
+            $entry['type'] = 'link';
+        }
+        $this->entries[] = $entry;
+    }
 
-	/**
-	 * Get a list of navigation entries
-	 *
-	 * @param string $type type of the navigation entries
-	 * @return array
-	 */
-	public function getAll(string $type = 'link'): array {
-		$this->init();
-		foreach ($this->closureEntries as $c) {
-			$this->add($c());
-		}
-		$this->closureEntries = array();
+    /**
+     * Get a list of navigation entries
+     *
+     * @param string $type type of the navigation entries
+     * @return array
+     */
+    public function getAll(string $type = 'link'): array {
+        $this->init();
+        foreach ($this->closureEntries as $c) {
+            $this->add($c());
+        }
+        $this->closureEntries = array();
 
-		$result = $this->entries;
-		if ($type !== 'all') {
-			$result = array_filter($this->entries, function($entry) use ($type) {
-				return $entry['type'] === $type;
-			});
-		}
+        $result = $this->entries;
+        if ($type !== 'all') {
+            $result = array_filter($this->entries, function($entry) use ($type) {
+                return $entry['type'] === $type;
+            });
+        }
 
-		return $this->proceedNavigation($result);
-	}
+        return $this->proceedNavigation($result);
+    }
 
-	/**
-	 * Sort navigation entries by order, name and set active flag
-	 *
-	 * @param array $list
-	 * @return array
-	 */
-	private function proceedNavigation(array $list): array {
-		usort($list, function($a, $b) {
-			if (isset($a['order']) && isset($b['order'])) {
-				return ($a['order'] < $b['order']) ? -1 : 1;
-			} else if (isset($a['order']) || isset($b['order'])) {
-				return isset($a['order']) ? -1 : 1;
-			} else {
-				return ($a['name'] < $b['name']) ? -1 : 1;
-			}
-		});
+    /**
+     * Sort navigation entries by order, name and set active flag
+     *
+     * @param array $list
+     * @return array
+     */
+    private function proceedNavigation(array $list): array {
+        usort($list, function($a, $b) {
+            if (isset($a['order']) && isset($b['order'])) {
+                return ($a['order'] < $b['order']) ? -1 : 1;
+            } else if (isset($a['order']) || isset($b['order'])) {
+                return isset($a['order']) ? -1 : 1;
+            } else {
+                return ($a['name'] < $b['name']) ? -1 : 1;
+            }
+        });
 
-		$activeApp = $this->getActiveEntry();
-		if ($activeApp !== null) {
-			foreach ($list as $index => &$navEntry) {
-				if ($navEntry['id'] == $activeApp) {
-					$navEntry['active'] = true;
-				} else {
-					$navEntry['active'] = false;
-				}
-			}
-			unset($navEntry);
-		}
+        $activeApp = $this->getActiveEntry();
+        if ($activeApp !== null) {
+            foreach ($list as $index => &$navEntry) {
+                if ($navEntry['id'] == $activeApp) {
+                    $navEntry['active'] = true;
+                } else {
+                    $navEntry['active'] = false;
+                }
+            }
+            unset($navEntry);
+        }
 
-		return $list;
-	}
+        return $list;
+    }
 
 
-	/**
-	 * removes all the entries
-	 */
-	public function clear($loadDefaultLinks = true) {
-		$this->entries = [];
-		$this->closureEntries = [];
-		$this->init = !$loadDefaultLinks;
-	}
+    /**
+     * removes all the entries
+     */
+    public function clear($loadDefaultLinks = true) {
+        $this->entries = [];
+        $this->closureEntries = [];
+        $this->init = !$loadDefaultLinks;
+    }
 
-	/**
-	 * Sets the current navigation entry of the currently running app
-	 * @param string $id of the app entry to activate (from added $entry)
-	 */
-	public function setActiveEntry($id) {
-		$this->activeEntry = $id;
-	}
+    /**
+     * Sets the current navigation entry of the currently running app
+     * @param string $id of the app entry to activate (from added $entry)
+     */
+    public function setActiveEntry($id) {
+        $this->activeEntry = $id;
+    }
 
-	/**
-	 * gets the active Menu entry
-	 * @return string id or empty string
-	 *
-	 * This function returns the id of the active navigation entry (set by
-	 * setActiveEntry
-	 */
-	public function getActiveEntry() {
-		return $this->activeEntry;
-	}
+    /**
+     * gets the active Menu entry
+     * @return string id or empty string
+     *
+     * This function returns the id of the active navigation entry (set by
+     * setActiveEntry
+     */
+    public function getActiveEntry() {
+        return $this->activeEntry;
+    }
 
-	private function init() {
-		if ($this->init) {
-			return;
-		}
-		$this->init = true;
+    private function init() {
+        if ($this->init) {
+            return;
+        }
+        $this->init = true;
 
-		$l = $this->l10nFac->get('lib');
-		if ($this->config->getSystemValue('knowledgebaseenabled', true)) {
-			$this->add([
-				'type' => 'settings',
-				'id' => 'help',
-				'order' => 5,
-				'href' => $this->urlGenerator->linkToRoute('settings_help'),
-				'name' => $l->t('Help'),
-				'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'),
-			]);
-		}
+        $l = $this->l10nFac->get('lib');
+        if ($this->config->getSystemValue('knowledgebaseenabled', true)) {
+            $this->add([
+                'type' => 'settings',
+                'id' => 'help',
+                'order' => 5,
+                'href' => $this->urlGenerator->linkToRoute('settings_help'),
+                'name' => $l->t('Help'),
+                'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'),
+            ]);
+        }
 
-		if ($this->userSession->isLoggedIn()) {
-			if ($this->isAdmin()) {
-				// App management
-				$this->add([
-					'type' => 'settings',
-					'id' => 'core_apps',
-					'order' => 3,
-					'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'),
-					'name' => $l->t('Apps'),
-				]);
-			}
+        if ($this->userSession->isLoggedIn()) {
+            if ($this->isAdmin()) {
+                // App management
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'core_apps',
+                    'order' => 3,
+                    'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'),
+                    'name' => $l->t('Apps'),
+                ]);
+            }
 
-			// Personal and (if applicable) admin settings
-			$this->add([
-				'type' => 'settings',
-				'id' => 'settings',
-				'order' => 1,
-				'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
-				'name' => $l->t('Settings'),
-				'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
-			]);
+            // Personal and (if applicable) admin settings
+            $this->add([
+                'type' => 'settings',
+                'id' => 'settings',
+                'order' => 1,
+                'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
+                'name' => $l->t('Settings'),
+                'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
+            ]);
 
-			$logoutUrl = \OC_User::getLogoutUrl($this->urlGenerator);
-			if($logoutUrl !== '') {
-				// Logout
-				$this->add([
-					'type' => 'settings',
-					'id' => 'logout',
-					'order' => 99999,
-					'href' => $logoutUrl,
-					'name' => $l->t('Log out'),
-					'icon' => $this->urlGenerator->imagePath('core', 'actions/logout.svg'),
-				]);
-			}
+            $logoutUrl = \OC_User::getLogoutUrl($this->urlGenerator);
+            if($logoutUrl !== '') {
+                // Logout
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'logout',
+                    'order' => 99999,
+                    'href' => $logoutUrl,
+                    'name' => $l->t('Log out'),
+                    'icon' => $this->urlGenerator->imagePath('core', 'actions/logout.svg'),
+                ]);
+            }
 
-			if ($this->isSubadmin()) {
-				// User management
-				$this->add([
-					'type' => 'settings',
-					'id' => 'core_users',
-					'order' => 4,
-					'href' => $this->urlGenerator->linkToRoute('settings.Users.usersList'),
-					'name' => $l->t('Users'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
-				]);
-			}
-		}
+            if ($this->isSubadmin()) {
+                // User management
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'core_users',
+                    'order' => 4,
+                    'href' => $this->urlGenerator->linkToRoute('settings.Users.usersList'),
+                    'name' => $l->t('Users'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
+                ]);
+            }
+        }
 
-		if ($this->appManager === 'null') {
-			return;
-		}
+        if ($this->appManager === 'null') {
+            return;
+        }
 
-		if ($this->userSession->isLoggedIn()) {
-			$apps = $this->appManager->getEnabledAppsForUser($this->userSession->getUser());
-		} else {
-			$apps = $this->appManager->getInstalledApps();
-		}
+        if ($this->userSession->isLoggedIn()) {
+            $apps = $this->appManager->getEnabledAppsForUser($this->userSession->getUser());
+        } else {
+            $apps = $this->appManager->getInstalledApps();
+        }
 
-		foreach ($apps as $app) {
-			if (!$this->userSession->isLoggedIn() && !$this->appManager->isEnabledForUser($app, $this->userSession->getUser())) {
-				continue;
-			}
+        foreach ($apps as $app) {
+            if (!$this->userSession->isLoggedIn() && !$this->appManager->isEnabledForUser($app, $this->userSession->getUser())) {
+                continue;
+            }
 
-			// load plugins and collections from info.xml
-			$info = $this->appManager->getAppInfo($app);
-			if (empty($info['navigations'])) {
-				continue;
-			}
-			foreach ($info['navigations'] as $nav) {
-				if (!isset($nav['name'])) {
-					continue;
-				}
-				if (!isset($nav['route'])) {
-					continue;
-				}
-				$role = isset($nav['@attributes']['role']) ? $nav['@attributes']['role'] : 'all';
-				if ($role === 'admin' && !$this->isAdmin()) {
-					continue;
-				}
-				$l = $this->l10nFac->get($app);
-				$id = isset($nav['id']) ? $nav['id'] : $app;
-				$order = isset($nav['order']) ? $nav['order'] : 100;
-				$type = isset($nav['type']) ? $nav['type'] : 'link';
-				$route = $nav['route'] !== '' ? $this->urlGenerator->linkToRoute($nav['route']) : '';
-				$icon = isset($nav['icon']) ? $nav['icon'] : 'app.svg';
-				foreach ([$icon, "$app.svg"] as $i) {
-					try {
-						$icon = $this->urlGenerator->imagePath($app, $i);
-						break;
-					} catch (\RuntimeException $ex) {
-						// no icon? - ignore it then
-					}
-				}
-				if ($icon === null) {
-					$icon = $this->urlGenerator->imagePath('core', 'default-app-icon');
-				}
+            // load plugins and collections from info.xml
+            $info = $this->appManager->getAppInfo($app);
+            if (empty($info['navigations'])) {
+                continue;
+            }
+            foreach ($info['navigations'] as $nav) {
+                if (!isset($nav['name'])) {
+                    continue;
+                }
+                if (!isset($nav['route'])) {
+                    continue;
+                }
+                $role = isset($nav['@attributes']['role']) ? $nav['@attributes']['role'] : 'all';
+                if ($role === 'admin' && !$this->isAdmin()) {
+                    continue;
+                }
+                $l = $this->l10nFac->get($app);
+                $id = isset($nav['id']) ? $nav['id'] : $app;
+                $order = isset($nav['order']) ? $nav['order'] : 100;
+                $type = isset($nav['type']) ? $nav['type'] : 'link';
+                $route = $nav['route'] !== '' ? $this->urlGenerator->linkToRoute($nav['route']) : '';
+                $icon = isset($nav['icon']) ? $nav['icon'] : 'app.svg';
+                foreach ([$icon, "$app.svg"] as $i) {
+                    try {
+                        $icon = $this->urlGenerator->imagePath($app, $i);
+                        break;
+                    } catch (\RuntimeException $ex) {
+                        // no icon? - ignore it then
+                    }
+                }
+                if ($icon === null) {
+                    $icon = $this->urlGenerator->imagePath('core', 'default-app-icon');
+                }
 
-				$this->add([
-					'id' => $id,
-					'order' => $order,
-					'href' => $route,
-					'icon' => $icon,
-					'type' => $type,
-					'name' => $l->t($nav['name']),
-				]);
-			}
-		}
-	}
+                $this->add([
+                    'id' => $id,
+                    'order' => $order,
+                    'href' => $route,
+                    'icon' => $icon,
+                    'type' => $type,
+                    'name' => $l->t($nav['name']),
+                ]);
+            }
+        }
+    }
 
-	private function isAdmin() {
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-		return false;
-	}
+    private function isAdmin() {
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+        return false;
+    }
 
-	private function isSubadmin() {
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->getSubAdmin()->isSubAdmin($user);
-		}
-		return false;
-	}
+    private function isSubadmin() {
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            return $this->groupManager->getSubAdmin()->isSubAdmin($user);
+        }
+        return false;
+    }
 }

lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php

Indentation +72 added lines, -72 removed lines

@@ -31,76 +31,76 @@
 
 class SameSiteCookieMiddleware extends Middleware {
 
-	/** @var Request */
-	private $request;
-
-	/** @var ControllerMethodReflector */
-	private $reflector;
-
-	public function __construct(Request $request,
-								ControllerMethodReflector $reflector) {
-		$this->request = $request;
-		$this->reflector = $reflector;
-	}
-
-	public function beforeController($controller, $methodName) {
-		$requestUri = $this->request->getScriptName();
-		$processingScript = explode('/', $requestUri);
-		$processingScript = $processingScript[count($processingScript)-1];
-
-		if ($processingScript !== 'index.php') {
-			return;
-		}
-
-		$noSSC = $this->reflector->hasAnnotation('NoSameSiteCookieRequired');
-		if ($noSSC) {
-			return;
-		}
-
-		if (!$this->request->passesLaxCookieCheck()) {
-			throw new LaxSameSiteCookieFailedException();
-		}
-	}
-
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if ($exception instanceof LaxSameSiteCookieFailedException) {
-			$respone = new Response();
-			$respone->setStatus(Http::STATUS_FOUND);
-			$respone->addHeader('Location', $this->request->getRequestUri());
-
-			$this->setSameSiteCookie();
-
-			return $respone;
-		}
-
-		throw $exception;
-	}
-
-	protected function setSameSiteCookie() {
-		$cookieParams = $this->request->getCookieParams();
-		$secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
-		$policies = [
-			'lax',
-			'strict',
-		];
-
-		// Append __Host to the cookie if it meets the requirements
-		$cookiePrefix = '';
-		if($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
-			$cookiePrefix = '__Host-';
-		}
-
-		foreach($policies as $policy) {
-			header(
-				sprintf(
-					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
-					$cookiePrefix,
-					$policy,
-					$cookieParams['path'],
-					$policy
-				),
-				false
-			);
-		}
-	}
+    /** @var Request */
+    private $request;
+
+    /** @var ControllerMethodReflector */
+    private $reflector;
+
+    public function __construct(Request $request,
+                                ControllerMethodReflector $reflector) {
+        $this->request = $request;
+        $this->reflector = $reflector;
+    }
+
+    public function beforeController($controller, $methodName) {
+        $requestUri = $this->request->getScriptName();
+        $processingScript = explode('/', $requestUri);
+        $processingScript = $processingScript[count($processingScript)-1];
+
+        if ($processingScript !== 'index.php') {
+            return;
+        }
+
+        $noSSC = $this->reflector->hasAnnotation('NoSameSiteCookieRequired');
+        if ($noSSC) {
+            return;
+        }
+
+        if (!$this->request->passesLaxCookieCheck()) {
+            throw new LaxSameSiteCookieFailedException();
+        }
+    }
+
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if ($exception instanceof LaxSameSiteCookieFailedException) {
+            $respone = new Response();
+            $respone->setStatus(Http::STATUS_FOUND);
+            $respone->addHeader('Location', $this->request->getRequestUri());
+
+            $this->setSameSiteCookie();
+
+            return $respone;
+        }
+
+        throw $exception;
+    }
+
+    protected function setSameSiteCookie() {
+        $cookieParams = $this->request->getCookieParams();
+        $secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
+        $policies = [
+            'lax',
+            'strict',
+        ];
+
+        // Append __Host to the cookie if it meets the requirements
+        $cookiePrefix = '';
+        if($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
+            $cookiePrefix = '__Host-';
+        }
+
+        foreach($policies as $policy) {
+            header(
+                sprintf(
+                    'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
+                    $cookiePrefix,
+                    $policy,
+                    $cookieParams['path'],
+                    $policy
+                ),
+                false
+            );
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
 	public function beforeController($controller, $methodName) {
 		$requestUri = $this->request->getScriptName();
 		$processingScript = explode('/', $requestUri);
-		$processingScript = $processingScript[count($processingScript)-1];
+		$processingScript = $processingScript[count($processingScript) - 1];
 
 		if ($processingScript !== 'index.php') {
 			return;
@@ -86,14 +86,14 @@ 
 
 		// Append __Host to the cookie if it meets the requirements
 		$cookiePrefix = '';
-		if($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
+		if ($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
 			$cookiePrefix = '__Host-';
 		}
 
-		foreach($policies as $policy) {
+		foreach ($policies as $policy) {
 			header(
 				sprintf(
-					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
+					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;'.$secureCookie.'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
 					$cookiePrefix,
 					$policy,
 					$cookieParams['path'],

lib/private/AppFramework/Middleware/Security/Exceptions/LaxSameSiteCookieFailedException.php

Indentation +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@
  * @package OC\AppFramework\Middleware\Security\Exceptions
  */
 class LaxSameSiteCookieFailedException extends SecurityException {
-	public function __construct() {
-		parent::__construct('Lax Same Site Cookie is invalid in request.', Http::STATUS_PRECONDITION_FAILED);
-	}
+    public function __construct() {
+        parent::__construct('Lax Same Site Cookie is invalid in request.', Http::STATUS_PRECONDITION_FAILED);
+    }
 }

apps/dav/lib/CardDAV/ContactsManager.php

Indentation +50 added lines, -50 removed lines

@@ -29,60 +29,60 @@
 use OCP\IURLGenerator;
 
 class ContactsManager {
-	/** @var CardDavBackend  */
-	private $backend;
+    /** @var CardDavBackend  */
+    private $backend;
 
-	/** @var IL10N  */
-	private $l10n;
+    /** @var IL10N  */
+    private $l10n;
 
-	/**
-	 * ContactsManager constructor.
-	 *
-	 * @param CardDavBackend $backend
-	 * @param IL10N $l10n
-	 */
-	public function __construct(CardDavBackend $backend, IL10N $l10n) {
-		$this->backend = $backend;
-		$this->l10n = $l10n;
-	}
+    /**
+     * ContactsManager constructor.
+     *
+     * @param CardDavBackend $backend
+     * @param IL10N $l10n
+     */
+    public function __construct(CardDavBackend $backend, IL10N $l10n) {
+        $this->backend = $backend;
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * @param IManager $cm
-	 * @param string $userId
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function setupContactsProvider(IManager $cm, $userId, IURLGenerator $urlGenerator) {
-		$addressBooks = $this->backend->getAddressBooksForUser("principals/users/$userId");
-		$this->register($cm, $addressBooks, $urlGenerator);
-		$this->setupSystemContactsProvider($cm, $urlGenerator);
-	}
+    /**
+     * @param IManager $cm
+     * @param string $userId
+     * @param IURLGenerator $urlGenerator
+     */
+    public function setupContactsProvider(IManager $cm, $userId, IURLGenerator $urlGenerator) {
+        $addressBooks = $this->backend->getAddressBooksForUser("principals/users/$userId");
+        $this->register($cm, $addressBooks, $urlGenerator);
+        $this->setupSystemContactsProvider($cm, $urlGenerator);
+    }
 
-	/**
-	 * @param IManager $cm
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) {
-		$addressBooks = $this->backend->getAddressBooksForUser("principals/system/system");
-		$this->register($cm, $addressBooks, $urlGenerator);
-	}
+    /**
+     * @param IManager $cm
+     * @param IURLGenerator $urlGenerator
+     */
+    public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) {
+        $addressBooks = $this->backend->getAddressBooksForUser("principals/system/system");
+        $this->register($cm, $addressBooks, $urlGenerator);
+    }
 
-	/**
-	 * @param IManager $cm
-	 * @param $addressBooks
-	 * @param IURLGenerator $urlGenerator
-	 */
-	private function register(IManager $cm, $addressBooks, $urlGenerator) {
-		foreach ($addressBooks as $addressBookInfo) {
-			$addressBook = new \OCA\DAV\CardDAV\AddressBook($this->backend, $addressBookInfo, $this->l10n);
-			$cm->registerAddressBook(
-				new AddressBookImpl(
-					$addressBook,
-					$addressBookInfo,
-					$this->backend,
-					$urlGenerator
-				)
-			);
-		}
-	}
+    /**
+     * @param IManager $cm
+     * @param $addressBooks
+     * @param IURLGenerator $urlGenerator
+     */
+    private function register(IManager $cm, $addressBooks, $urlGenerator) {
+        foreach ($addressBooks as $addressBookInfo) {
+            $addressBook = new \OCA\DAV\CardDAV\AddressBook($this->backend, $addressBookInfo, $this->l10n);
+            $cm->registerAddressBook(
+                new AddressBookImpl(
+                    $addressBook,
+                    $addressBookInfo,
+                    $this->backend,
+                    $urlGenerator
+                )
+            );
+        }
+    }
 
 }

apps/twofactor_backupcodes/lib/Migration/Version1002Date20170926101419.php

Indentation +10 added lines, -10 removed lines

@@ -11,15 +11,15 @@
  */
 class Version1002Date20170926101419 extends BigIntMigration {
 
-	/**
-	 * @return array Returns an array with the following structure
-	 * ['table1' => ['column1', 'column2'], ...]
-	 * @since 13.0.0
-	 */
-	protected function getColumnsByTable() {
-		return [
-			'twofactor_backupcodes' => ['id'],
-		];
-	}
+    /**
+     * @return array Returns an array with the following structure
+     * ['table1' => ['column1', 'column2'], ...]
+     * @since 13.0.0
+     */
+    protected function getColumnsByTable() {
+        return [
+            'twofactor_backupcodes' => ['id'],
+        ];
+    }
 
 }