nextcloud / server

apps/updatenotification/lib/ResetTokenBackgroundJob.php

Indentation +35 added lines, -35 removed lines

@@ -34,44 +34,44 @@
  * @package OCA\UpdateNotification
  */
 class ResetTokenBackgroundJob extends TimedJob {
-	/** @var IConfig */
-	private $config;
-	/** @var ITimeFactory */
-	private $timeFactory;
+    /** @var IConfig */
+    private $config;
+    /** @var ITimeFactory */
+    private $timeFactory;
 
-	/**
-	 * @param IConfig|null $config
-	 * @param ITimeFactory|null $timeFactory
-	 */
-	public function __construct(IConfig $config = null,
-								ITimeFactory $timeFactory = null) {
-		// Run all 10 minutes
-		$this->setInterval(60 * 10);
+    /**
+     * @param IConfig|null $config
+     * @param ITimeFactory|null $timeFactory
+     */
+    public function __construct(IConfig $config = null,
+                                ITimeFactory $timeFactory = null) {
+        // Run all 10 minutes
+        $this->setInterval(60 * 10);
 
-		if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) {
-			$this->config = $config;
-			$this->timeFactory = $timeFactory;
-		} else {
-			$this->fixDIForJobs();
-		}
-	}
+        if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) {
+            $this->config = $config;
+            $this->timeFactory = $timeFactory;
+        } else {
+            $this->fixDIForJobs();
+        }
+    }
 
-	/**
-	 * DI for jobs
-	 */
-	private function fixDIForJobs() {
-		$this->config = \OC::$server->getConfig();
-		$this->timeFactory = new TimeFactory();
-	}
+    /**
+     * DI for jobs
+     */
+    private function fixDIForJobs() {
+        $this->config = \OC::$server->getConfig();
+        $this->timeFactory = new TimeFactory();
+    }
 
-	/**
-	 * @param $argument
-	 */
-	protected function run($argument) {
-		// Delete old tokens after 2 days
-		if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
-			$this->config->deleteSystemValue('updater.secret');
-		}
-	}
+    /**
+     * @param $argument
+     */
+    protected function run($argument) {
+        // Delete old tokens after 2 days
+        if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
+            $this->config->deleteSystemValue('updater.secret');
+        }
+    }
 
 }

apps/updatenotification/appinfo/routes.php

Indentation +2 added lines, -2 removed lines

@@ -25,6 +25,6 @@
 
 $application = new Application();
 $application->registerRoutes($this, ['routes' => [
-	['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'],
-	['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'],
+    ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'],
+    ['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'],
 ]]);

apps/updatenotification/appinfo/app.php

Indentation +27 added lines, -27 removed lines

@@ -23,33 +23,33 @@
  */
 
 if(\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) {
-	$updater = new \OC\Updater\VersionCheck(
-		\OC::$server->getHTTPClientService(),
-		\OC::$server->getConfig()
-	);
-	$updateChecker = new \OCA\UpdateNotification\UpdateChecker(
-		$updater
-	);
+    $updater = new \OC\Updater\VersionCheck(
+        \OC::$server->getHTTPClientService(),
+        \OC::$server->getConfig()
+    );
+    $updateChecker = new \OCA\UpdateNotification\UpdateChecker(
+        $updater
+    );
 
-	$userObject = \OC::$server->getUserSession()->getUser();
-	if($userObject !== null) {
-		if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
-			!\OC::$server->getAppManager()->isEnabledForUser('notifications')) {
-			if($updateChecker->getUpdateState() !== []) {
-				\OCP\Util::addScript('updatenotification', 'notification');
-				OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript');
-			}
-		}
-	}
+    $userObject = \OC::$server->getUserSession()->getUser();
+    if($userObject !== null) {
+        if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
+            !\OC::$server->getAppManager()->isEnabledForUser('notifications')) {
+            if($updateChecker->getUpdateState() !== []) {
+                \OCP\Util::addScript('updatenotification', 'notification');
+                OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript');
+            }
+        }
+    }
 
-	$manager = \OC::$server->getNotificationManager();
-	$manager->registerNotifier(function() use ($manager) {
-		return \OC::$server->query(\OCA\UpdateNotification\Notification\Notifier::class);
-	}, function() {
-		$l = \OC::$server->getL10N('updatenotification');
-		return [
-			'id' => 'updatenotification',
-			'name' => $l->t('Update notifications'),
-		];
-	});
+    $manager = \OC::$server->getNotificationManager();
+    $manager->registerNotifier(function() use ($manager) {
+        return \OC::$server->query(\OCA\UpdateNotification\Notification\Notifier::class);
+    }, function() {
+        $l = \OC::$server->getL10N('updatenotification');
+        return [
+            'id' => 'updatenotification',
+            'name' => $l->t('Update notifications'),
+        ];
+    });
 }

apps/theming/templates/settings-admin.php

Indentation -1 removed lines

@@ -1,6 +1,5 @@
 <?php
 /**
-
  *
  * @author Bjoern Schiessle <bjoern@schiessle.org>
  * @author Jan-Christoph Borchardt <hey@jancborchardt.net>

apps/theming/lib/Util.php

Indentation +159 added lines, -159 removed lines

@@ -30,164 +30,164 @@
 
 class Util {
 
-	/** @var IConfig */
-	private $config;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IAppManager */
-	private $appManager;
-
-	/**
-	 * Util constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IRootFolder $rootFolder
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(IConfig $config, IRootFolder $rootFolder, IAppManager $appManager) {
-		$this->config = $config;
-		$this->rootFolder = $rootFolder;
-		$this->appManager = $appManager;
-	}
-
-	/**
-	 * @param string $color rgb color value
-	 * @return bool
-	 */
-	public function invertTextColor($color) {
-		$l = $this->calculateLuminance($color);
-		if($l>0.5) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * get color for on-page elements:
-	 * theme color by default, grey if theme color is to bright
-	 * @param $color
-	 * @return string
-	 */
-	public function elementColor($color) {
-		$l = $this->calculateLuminance($color);
-		if($l>0.8) {
-			return '#555555';
-		} else {
-			return $color;
-		}
-	}
-
-	/**
-	 * @param string $color rgb color value
-	 * @return float
-	 */
-	public function calculateLuminance($color) {
-		$hex = preg_replace("/[^0-9A-Fa-f]/", '', $color);
-		if (strlen($hex) === 3) {
-			$hex = $hex{0} . $hex{0} . $hex{1} . $hex{1} . $hex{2} . $hex{2};
-		}
-		if (strlen($hex) !== 6) {
-			return 0;
-		}
-		$r = hexdec(substr($hex, 0, 2));
-		$g = hexdec(substr($hex, 2, 2));
-		$b = hexdec(substr($hex, 4, 2));
-		return (0.299 * $r + 0.587 * $g + 0.114 * $b)/255;
-	}
-
-	/**
-	 * @param $color
-	 * @return string base64 encoded radio button svg
-	 */
-	public function generateRadioButton($color) {
-		$radioButtonIcon = '<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">' .
-			'<path d="M8 1a7 7 0 0 0-7 7 7 7 0 0 0 7 7 7 7 0 0 0 7-7 7 7 0 0 0-7-7zm0 1a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6zm0 2a4 4 0 1 0 0 8 4 4 0 0 0 0-8z" fill="'.$color.'"/></svg>';
-		return base64_encode($radioButtonIcon);
-	}
-
-
-	/**
-	 * @param $app string app name
-	 * @return string path to app icon / logo
-	 */
-	public function getAppIcon($app) {
-		$app = str_replace(array('\0', '/', '\\', '..'), '', $app);
-		try {
-			$appPath = $this->appManager->getAppPath($app);
-			$icon = $appPath . '/img/' . $app . '.svg';
-			if (file_exists($icon)) {
-				return $icon;
-			}
-			$icon = $appPath . '/img/app.svg';
-			if (file_exists($icon)) {
-				return $icon;
-			}
-		} catch (AppPathNotFoundException $e) {}
-
-		if($this->config->getAppValue('theming', 'logoMime', '') !== '' && $this->rootFolder->nodeExists('/themedinstancelogo')) {
-			return $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/themedinstancelogo';
-		}
-		return \OC::$SERVERROOT . '/core/img/logo.svg';
-	}
-
-	/**
-	 * @param $app string app name
-	 * @param $image string relative path to image in app folder
-	 * @return string|false absolute path to image
-	 */
-	public function getAppImage($app, $image) {
-		$app = str_replace(array('\0', '/', '\\', '..'), '', $app);
-		$image = str_replace(array('\0', '\\', '..'), '', $image);
-		if ($app === "core") {
-			$icon = \OC::$SERVERROOT . '/core/img/' . $image;
-			if (file_exists($icon)) {
-				return $icon;
-			}
-		}
-
-		try {
-			$appPath = $this->appManager->getAppPath($app);
-		} catch (AppPathNotFoundException $e) {
-			return false;
-		}
-
-		$icon = $appPath . '/img/' . $image;
-		if (file_exists($icon)) {
-			return $icon;
-		}
-		$icon = $appPath . '/img/' . $image . '.svg';
-		if (file_exists($icon)) {
-			return $icon;
-		}
-		$icon = $appPath . '/img/' . $image . '.png';
-		if (file_exists($icon)) {
-			return $icon;
-		}
-		$icon = $appPath . '/img/' . $image . '.gif';
-		if (file_exists($icon)) {
-			return $icon;
-		}
-		$icon = $appPath . '/img/' . $image . '.jpg';
-		if (file_exists($icon)) {
-			return $icon;
-		}
-
-		return false;
-	}
-
-	/**
-	 * replace default color with a custom one
-	 *
-	 * @param $svg string content of a svg file
-	 * @param $color string color to match
-	 * @return string
-	 */
-	public function colorizeSvg($svg, $color) {
-		$svg = preg_replace('/#0082c9/i', $color, $svg);
-		return $svg;
-	}
+    /** @var IConfig */
+    private $config;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IAppManager */
+    private $appManager;
+
+    /**
+     * Util constructor.
+     *
+     * @param IConfig $config
+     * @param IRootFolder $rootFolder
+     * @param IAppManager $appManager
+     */
+    public function __construct(IConfig $config, IRootFolder $rootFolder, IAppManager $appManager) {
+        $this->config = $config;
+        $this->rootFolder = $rootFolder;
+        $this->appManager = $appManager;
+    }
+
+    /**
+     * @param string $color rgb color value
+     * @return bool
+     */
+    public function invertTextColor($color) {
+        $l = $this->calculateLuminance($color);
+        if($l>0.5) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * get color for on-page elements:
+     * theme color by default, grey if theme color is to bright
+     * @param $color
+     * @return string
+     */
+    public function elementColor($color) {
+        $l = $this->calculateLuminance($color);
+        if($l>0.8) {
+            return '#555555';
+        } else {
+            return $color;
+        }
+    }
+
+    /**
+     * @param string $color rgb color value
+     * @return float
+     */
+    public function calculateLuminance($color) {
+        $hex = preg_replace("/[^0-9A-Fa-f]/", '', $color);
+        if (strlen($hex) === 3) {
+            $hex = $hex{0} . $hex{0} . $hex{1} . $hex{1} . $hex{2} . $hex{2};
+        }
+        if (strlen($hex) !== 6) {
+            return 0;
+        }
+        $r = hexdec(substr($hex, 0, 2));
+        $g = hexdec(substr($hex, 2, 2));
+        $b = hexdec(substr($hex, 4, 2));
+        return (0.299 * $r + 0.587 * $g + 0.114 * $b)/255;
+    }
+
+    /**
+     * @param $color
+     * @return string base64 encoded radio button svg
+     */
+    public function generateRadioButton($color) {
+        $radioButtonIcon = '<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">' .
+            '<path d="M8 1a7 7 0 0 0-7 7 7 7 0 0 0 7 7 7 7 0 0 0 7-7 7 7 0 0 0-7-7zm0 1a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6zm0 2a4 4 0 1 0 0 8 4 4 0 0 0 0-8z" fill="'.$color.'"/></svg>';
+        return base64_encode($radioButtonIcon);
+    }
+
+
+    /**
+     * @param $app string app name
+     * @return string path to app icon / logo
+     */
+    public function getAppIcon($app) {
+        $app = str_replace(array('\0', '/', '\\', '..'), '', $app);
+        try {
+            $appPath = $this->appManager->getAppPath($app);
+            $icon = $appPath . '/img/' . $app . '.svg';
+            if (file_exists($icon)) {
+                return $icon;
+            }
+            $icon = $appPath . '/img/app.svg';
+            if (file_exists($icon)) {
+                return $icon;
+            }
+        } catch (AppPathNotFoundException $e) {}
+
+        if($this->config->getAppValue('theming', 'logoMime', '') !== '' && $this->rootFolder->nodeExists('/themedinstancelogo')) {
+            return $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/themedinstancelogo';
+        }
+        return \OC::$SERVERROOT . '/core/img/logo.svg';
+    }
+
+    /**
+     * @param $app string app name
+     * @param $image string relative path to image in app folder
+     * @return string|false absolute path to image
+     */
+    public function getAppImage($app, $image) {
+        $app = str_replace(array('\0', '/', '\\', '..'), '', $app);
+        $image = str_replace(array('\0', '\\', '..'), '', $image);
+        if ($app === "core") {
+            $icon = \OC::$SERVERROOT . '/core/img/' . $image;
+            if (file_exists($icon)) {
+                return $icon;
+            }
+        }
+
+        try {
+            $appPath = $this->appManager->getAppPath($app);
+        } catch (AppPathNotFoundException $e) {
+            return false;
+        }
+
+        $icon = $appPath . '/img/' . $image;
+        if (file_exists($icon)) {
+            return $icon;
+        }
+        $icon = $appPath . '/img/' . $image . '.svg';
+        if (file_exists($icon)) {
+            return $icon;
+        }
+        $icon = $appPath . '/img/' . $image . '.png';
+        if (file_exists($icon)) {
+            return $icon;
+        }
+        $icon = $appPath . '/img/' . $image . '.gif';
+        if (file_exists($icon)) {
+            return $icon;
+        }
+        $icon = $appPath . '/img/' . $image . '.jpg';
+        if (file_exists($icon)) {
+            return $icon;
+        }
+
+        return false;
+    }
+
+    /**
+     * replace default color with a custom one
+     *
+     * @param $svg string content of a svg file
+     * @param $color string color to match
+     * @return string
+     */
+    public function colorizeSvg($svg, $color) {
+        $svg = preg_replace('/#0082c9/i', $color, $svg);
+        return $svg;
+    }
 
 }

apps/theming/lib/Controller/IconController.php

Indentation +133 added lines, -133 removed lines

@@ -36,142 +36,142 @@
 use OCP\IConfig;
 
 class IconController extends Controller {
-	/** @var ThemingDefaults */
-	private $themingDefaults;
-	/** @var Util */
-	private $util;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var IConfig */
-	private $config;
-	/** @var IconBuilder */
-	private $iconBuilder;
-	/** @var ImageManager */
-	private $imageManager;
+    /** @var ThemingDefaults */
+    private $themingDefaults;
+    /** @var Util */
+    private $util;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var IConfig */
+    private $config;
+    /** @var IconBuilder */
+    private $iconBuilder;
+    /** @var ImageManager */
+    private $imageManager;
 
-	/**
-	 * IconController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param ThemingDefaults $themingDefaults
-	 * @param Util $util
-	 * @param ITimeFactory $timeFactory
-	 * @param IConfig $config
-	 * @param IconBuilder $iconBuilder
-	 * @param ImageManager $imageManager
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		ThemingDefaults $themingDefaults,
-		Util $util,
-		ITimeFactory $timeFactory,
-		IConfig $config,
-		IconBuilder $iconBuilder,
-		ImageManager $imageManager
-	) {
-		parent::__construct($appName, $request);
+    /**
+     * IconController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param ThemingDefaults $themingDefaults
+     * @param Util $util
+     * @param ITimeFactory $timeFactory
+     * @param IConfig $config
+     * @param IconBuilder $iconBuilder
+     * @param ImageManager $imageManager
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        ThemingDefaults $themingDefaults,
+        Util $util,
+        ITimeFactory $timeFactory,
+        IConfig $config,
+        IconBuilder $iconBuilder,
+        ImageManager $imageManager
+    ) {
+        parent::__construct($appName, $request);
 
-		$this->themingDefaults = $themingDefaults;
-		$this->util = $util;
-		$this->timeFactory = $timeFactory;
-		$this->config = $config;
-		$this->iconBuilder = $iconBuilder;
-		$this->imageManager = $imageManager;
-	}
+        $this->themingDefaults = $themingDefaults;
+        $this->util = $util;
+        $this->timeFactory = $timeFactory;
+        $this->config = $config;
+        $this->iconBuilder = $iconBuilder;
+        $this->imageManager = $imageManager;
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param $app string app name
-	 * @param $image string image file name (svg required)
-	 * @return FileDisplayResponse|NotFoundResponse
-	 */
-	public function getThemedIcon($app, $image) {
-		try {
-			$iconFile = $this->imageManager->getCachedImage("icon-" . $app . '-' . str_replace("/","_",$image));
-		} catch (NotFoundException $exception) {
-			$icon = $this->iconBuilder->colorSvg($app, $image);
-			if ($icon === false || $icon === "") {
-				return new NotFoundResponse();
-			}
-			$iconFile = $this->imageManager->setCachedImage("icon-" . $app . '-' . str_replace("/","_",$image), $icon);
-		}
-		if ($iconFile !== false) {
-			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
-			$response->cacheFor(86400);
-			$expires = new \DateTime();
-			$expires->setTimestamp($this->timeFactory->getTime());
-			$expires->add(new \DateInterval('PT24H'));
-			$response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
-			$response->addHeader('Pragma', 'cache');
-			return $response;
-		} else {
-			return new NotFoundResponse();
-		}
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param $app string app name
+     * @param $image string image file name (svg required)
+     * @return FileDisplayResponse|NotFoundResponse
+     */
+    public function getThemedIcon($app, $image) {
+        try {
+            $iconFile = $this->imageManager->getCachedImage("icon-" . $app . '-' . str_replace("/","_",$image));
+        } catch (NotFoundException $exception) {
+            $icon = $this->iconBuilder->colorSvg($app, $image);
+            if ($icon === false || $icon === "") {
+                return new NotFoundResponse();
+            }
+            $iconFile = $this->imageManager->setCachedImage("icon-" . $app . '-' . str_replace("/","_",$image), $icon);
+        }
+        if ($iconFile !== false) {
+            $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
+            $response->cacheFor(86400);
+            $expires = new \DateTime();
+            $expires->setTimestamp($this->timeFactory->getTime());
+            $expires->add(new \DateInterval('PT24H'));
+            $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
+            $response->addHeader('Pragma', 'cache');
+            return $response;
+        } else {
+            return new NotFoundResponse();
+        }
+    }
 
-	/**
-	 * Return a 32x32 favicon as png
-	 *
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param $app string app name
-	 * @return FileDisplayResponse|NotFoundResponse
-	 */
-	public function getFavicon($app = "core") {
-		if ($this->themingDefaults->shouldReplaceIcons()) {
-			try {
-				$iconFile = $this->imageManager->getCachedImage('favIcon-' . $app);
-			} catch (NotFoundException $exception) {
-				$icon = $this->iconBuilder->getFavicon($app);
-				$iconFile = $this->imageManager->setCachedImage('favIcon-' . $app, $icon);
-			}
-			if ($iconFile !== false) {
-				$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
-				$response->cacheFor(86400);
-				$expires = new \DateTime();
-				$expires->setTimestamp($this->timeFactory->getTime());
-				$expires->add(new \DateInterval('PT24H'));
-				$response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
-				$response->addHeader('Pragma', 'cache');
-				return $response;
-			}
-		}
-		return new NotFoundResponse();
-	}
+    /**
+     * Return a 32x32 favicon as png
+     *
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param $app string app name
+     * @return FileDisplayResponse|NotFoundResponse
+     */
+    public function getFavicon($app = "core") {
+        if ($this->themingDefaults->shouldReplaceIcons()) {
+            try {
+                $iconFile = $this->imageManager->getCachedImage('favIcon-' . $app);
+            } catch (NotFoundException $exception) {
+                $icon = $this->iconBuilder->getFavicon($app);
+                $iconFile = $this->imageManager->setCachedImage('favIcon-' . $app, $icon);
+            }
+            if ($iconFile !== false) {
+                $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
+                $response->cacheFor(86400);
+                $expires = new \DateTime();
+                $expires->setTimestamp($this->timeFactory->getTime());
+                $expires->add(new \DateInterval('PT24H'));
+                $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
+                $response->addHeader('Pragma', 'cache');
+                return $response;
+            }
+        }
+        return new NotFoundResponse();
+    }
 
-	/**
-	 * Return a 512x512 icon for touch devices
-	 *
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param $app string app name
-	 * @return FileDisplayResponse|NotFoundResponse
-	 */
-	public function getTouchIcon($app = "core") {
-		if ($this->themingDefaults->shouldReplaceIcons()) {
-			try {
-				$iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app);
-			} catch (NotFoundException $exception) {
-				$icon = $this->iconBuilder->getTouchIcon($app);
-				$iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app, $icon);
-			}
-			if ($iconFile !== false) {
-				$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);
-				$response->cacheFor(86400);
-				$expires = new \DateTime();
-				$expires->setTimestamp($this->timeFactory->getTime());
-				$expires->add(new \DateInterval('PT24H'));
-				$response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
-				$response->addHeader('Pragma', 'cache');
-				return $response;
-			}
-		}
-		return new NotFoundResponse();
-	}
+    /**
+     * Return a 512x512 icon for touch devices
+     *
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param $app string app name
+     * @return FileDisplayResponse|NotFoundResponse
+     */
+    public function getTouchIcon($app = "core") {
+        if ($this->themingDefaults->shouldReplaceIcons()) {
+            try {
+                $iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app);
+            } catch (NotFoundException $exception) {
+                $icon = $this->iconBuilder->getTouchIcon($app);
+                $iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app, $icon);
+            }
+            if ($iconFile !== false) {
+                $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);
+                $response->cacheFor(86400);
+                $expires = new \DateTime();
+                $expires->setTimestamp($this->timeFactory->getTime());
+                $expires->add(new \DateInterval('PT24H'));
+                $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
+                $response->addHeader('Pragma', 'cache');
+                return $response;
+            }
+        }
+        return new NotFoundResponse();
+    }
 }

apps/theming/lib/Settings/Section.php

Indentation +46 added lines, -46 removed lines

@@ -28,55 +28,55 @@
 use OCP\Settings\IIconSection;
 
 class Section implements IIconSection {
-	/** @var IL10N */
-	private $l;
-	/** @var IURLGenerator */
-	private $url;
+    /** @var IL10N */
+    private $l;
+    /** @var IURLGenerator */
+    private $url;
 
-	/**
-	 * @param IURLGenerator $url
-	 * @param IL10N $l
-	 */
-	public function __construct(IURLGenerator $url, IL10N $l) {
-		$this->url = $url;
-		$this->l = $l;
-	}
+    /**
+     * @param IURLGenerator $url
+     * @param IL10N $l
+     */
+    public function __construct(IURLGenerator $url, IL10N $l) {
+        $this->url = $url;
+        $this->l = $l;
+    }
 
-	/**
-	 * returns the ID of the section. It is supposed to be a lower case string,
-	 * e.g. 'ldap'
-	 *
-	 * @returns string
-	 */
-	public function getID() {
-		return 'theming';
-	}
+    /**
+     * returns the ID of the section. It is supposed to be a lower case string,
+     * e.g. 'ldap'
+     *
+     * @returns string
+     */
+    public function getID() {
+        return 'theming';
+    }
 
-	/**
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
-	 * integration'. Use the L10N service to translate it.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->l->t('Theming');
-	}
+    /**
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+     * integration'. Use the L10N service to translate it.
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->l->t('Theming');
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the settings navigation. The sections are arranged in ascending order of
-	 * the priority values. It is required to return a value between 0 and 99.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 30;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the settings navigation. The sections are arranged in ascending order of
+     * the priority values. It is required to return a value between 0 and 99.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 30;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getIcon() {
-		return $this->url->imagePath('theming', 'app-dark.svg');
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function getIcon() {
+        return $this->url->imagePath('theming', 'app-dark.svg');
+    }
 }

apps/theming/appinfo/routes.php

Indentation +53 added lines, -53 removed lines

@@ -25,58 +25,58 @@
  */
 
 return ['routes' => [
-	[
-		'name' => 'Theming#updateStylesheet',
-		'url' => '/ajax/updateStylesheet',
-		'verb' => 'POST'
-	],
-	[
-		'name' => 'Theming#undo',
-		'url' => '/ajax/undoChanges',
-		'verb' => 'POST'
-	],
-	[
-		'name' => 'Theming#updateLogo',
-		'url' => '/ajax/updateLogo',
-		'verb' => 'POST'
-	],
-	[
-		'name' => 'Theming#getStylesheet',
-		'url' => '/styles',
-		'verb' => 'GET',
-	],
-	[
-		'name' => 'Theming#getLogo',
-		'url' => '/logo',
-		'verb' => 'GET',
-	],
-	[
-		'name' => 'Theming#getLoginBackground',
-		'url' => '/loginbackground',
-		'verb' => 'GET',
-	],
-	[
-		'name' => 'Theming#getJavascript',
-		'url' => '/js/theming',
-		'verb' => 'GET',
-	],
-	[
-		'name'	=> 'Icon#getFavicon',
-		'url' => '/favicon/{app}',
-		'verb' => 'GET',
-		'defaults' => array('app' => 'core'),
-	],
-	[
-		'name'	=> 'Icon#getTouchIcon',
-		'url' => '/icon/{app}',
-		'verb' => 'GET',
-		'defaults' => array('app' => 'core'),
-	],
-	[
-		'name'	=> 'Icon#getThemedIcon',
-		'url' => '/img/{app}/{image}',
-		'verb' => 'GET',
-		'requirements' => array('image' => '.+')
-	],
+    [
+        'name' => 'Theming#updateStylesheet',
+        'url' => '/ajax/updateStylesheet',
+        'verb' => 'POST'
+    ],
+    [
+        'name' => 'Theming#undo',
+        'url' => '/ajax/undoChanges',
+        'verb' => 'POST'
+    ],
+    [
+        'name' => 'Theming#updateLogo',
+        'url' => '/ajax/updateLogo',
+        'verb' => 'POST'
+    ],
+    [
+        'name' => 'Theming#getStylesheet',
+        'url' => '/styles',
+        'verb' => 'GET',
+    ],
+    [
+        'name' => 'Theming#getLogo',
+        'url' => '/logo',
+        'verb' => 'GET',
+    ],
+    [
+        'name' => 'Theming#getLoginBackground',
+        'url' => '/loginbackground',
+        'verb' => 'GET',
+    ],
+    [
+        'name' => 'Theming#getJavascript',
+        'url' => '/js/theming',
+        'verb' => 'GET',
+    ],
+    [
+        'name'	=> 'Icon#getFavicon',
+        'url' => '/favicon/{app}',
+        'verb' => 'GET',
+        'defaults' => array('app' => 'core'),
+    ],
+    [
+        'name'	=> 'Icon#getTouchIcon',
+        'url' => '/icon/{app}',
+        'verb' => 'GET',
+        'defaults' => array('app' => 'core'),
+    ],
+    [
+        'name'	=> 'Icon#getThemedIcon',
+        'url' => '/img/{app}/{image}',
+        'verb' => 'GET',
+        'requirements' => array('image' => '.+')
+    ],
 ]];
 

apps/theming/appinfo/app.php

Indentation +18 added lines, -18 removed lines

@@ -24,31 +24,31 @@
  */
 
 $linkToCSS = \OC::$server->getURLGenerator()->linkToRoute(
-	'theming.Theming.getStylesheet',
-	[
-		'v' => \OC::$server->getConfig()->getAppValue('theming', 'cachebuster', '0'),
-	]
+    'theming.Theming.getStylesheet',
+    [
+        'v' => \OC::$server->getConfig()->getAppValue('theming', 'cachebuster', '0'),
+    ]
 );
 \OCP\Util::addHeader(
-	'link',
-	[
-		'rel' => 'stylesheet',
-		'href' => $linkToCSS,
-	]
+    'link',
+    [
+        'rel' => 'stylesheet',
+        'href' => $linkToCSS,
+    ]
 );
 
 $linkToJs = \OC::$server->getURLGenerator()->linkToRoute(
-	'theming.Theming.getJavascript',
-	[
-		'v' => \OC::$server->getConfig()->getAppValue('theming', 'cachebuster', '0'),
-	]
+    'theming.Theming.getJavascript',
+    [
+        'v' => \OC::$server->getConfig()->getAppValue('theming', 'cachebuster', '0'),
+    ]
 );
 \OCP\Util::addHeader(
-	'script',
-	[
-		'src' => $linkToJs,
-		'nonce' => \OC::$server->getContentSecurityPolicyNonceManager()->getNonce()
-	], ''
+    'script',
+    [
+        'src' => $linkToJs,
+        'nonce' => \OC::$server->getContentSecurityPolicyNonceManager()->getNonce()
+    ], ''
 );
 
 $app = new \OCP\AppFramework\App('theming');