Theming: Code cleanup and cache buster for mime icons

Signed-off-by: Julius Haertl <jus@bitgrid.net>

4 files changed, 18 insertions, 44 deletions

diff --git a/apps/theming/lib/Controller/IconController.php b/apps/theming/lib/Controller/IconController.php
index 6f97fdcdaba..f2355fe3f82 100644
--- a/apps/theming/lib/Controller/IconController.php
+++ b/apps/theming/lib/Controller/IconController.php
@@ -23,17 +23,11 @@
 namespace OCA\Theming\Controller;
 
 use OCA\Theming\IconBuilder;
-use OCA\Theming\Template;
 use OCA\Theming\ThemingDefaults;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\DataDisplayResponse;
-use OCP\AppFramework\Http\StreamResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\Files\IRootFolder;
-use OCP\IConfig;
-use OCP\IL10N;
 use OCP\IRequest;
 use OCA\Theming\Util;
 
@@ -44,12 +38,6 @@ class IconController extends Controller {
 	private $util;
 	/** @var ITimeFactory */
 	private $timeFactory;
-	/** @var IL10N */
-	private $l;
-	/** @var IConfig */
-	private $config;
-	/** @var IRootFolder */
-	private $rootFolder;
 	/** @var IconBuilder */
 	private $iconBuilder;
 
@@ -58,22 +46,17 @@ class IconController extends Controller {
 	 *
 	 * @param string $appName
 	 * @param IRequest $request
-	 * @param IConfig $config
 	 * @param ThemingDefaults $themingDefaults
 	 * @param Util $util
 	 * @param ITimeFactory $timeFactory
-	 * @param IL10N $l
-	 * @param IRootFolder $rootFolder
+	 * @param IconBuilder $iconBuilder
 	 */
 	public function __construct(
 		$appName,
 		IRequest $request,
-		IConfig $config,
 		ThemingDefaults $themingDefaults,
 		Util $util,
 		ITimeFactory $timeFactory,
-		IL10N $l,
-		IRootFolder $rootFolder,
 		IconBuilder $iconBuilder
 	) {
 		parent::__construct($appName, $request);
@@ -81,22 +64,16 @@ class IconController extends Controller {
 		$this->themingDefaults = $themingDefaults;
 		$this->util = $util;
 		$this->timeFactory = $timeFactory;
-		$this->l = $l;
-		$this->config = $config;
-		$this->rootFolder = $rootFolder;
 		$this->iconBuilder = $iconBuilder;
-		//if(extension_loaded('imagick')) {
-		//	$this->iconBuilder = new IconBuilder($this->themingDefaults, $this->util);
-		//}
 	}
 
 	/**
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 *
-	 * @param $app app name
-	 * @param $image image file name (svg required)
-	 * @return StreamResponse|DataResponse
+	 * @param $app string app name
+	 * @param $image string image file name (svg required)
+	 * @return DataDisplayResponse
 	 */
 	public function getThemedIcon($app, $image) {
 		$image = $this->util->getAppImage($app, $image);
@@ -116,8 +93,8 @@ class IconController extends Controller {
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 *
-	 * @param $app app name
-	 * @return StreamResponse|DataResponse
+	 * @param $app string app name
+	 * @return DataDisplayResponse
 	 */
 	public function getFavicon($app="core") {
 		if($this->themingDefaults->shouldReplaceIcons()) {
@@ -138,8 +115,8 @@ class IconController extends Controller {
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 *
-	 * @param $app app name
-	 * @return StreamResponse|DataResponse
+	 * @param $app string app name
+	 * @return DataDisplayResponse
 	 */
 	public function getTouchIcon($app="core") {
 		if($this->themingDefaults->shouldReplaceIcons()) {
@@ -154,5 +131,4 @@ class IconController extends Controller {
 		return $response;
 	}
 
-
 }
\ No newline at end of file
diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
index 7ba4feb62dd..c908f0e5782 100644
--- a/apps/theming/lib/Controller/ThemingController.php
+++ b/apps/theming/lib/Controller/ThemingController.php
@@ -425,6 +425,7 @@ class ThemingController extends Controller {
 	 * @return DataDownloadResponse
 	 */
 	public function getJavascript() {
+		$cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
 		$responseJS = '(function() {
 	OCA.Theming = {
 		name: ' . json_encode($this->template->getName()) . ',
@@ -432,6 +433,7 @@ class ThemingController extends Controller {
 		slogan: ' . json_encode($this->template->getSlogan()) . ',
 		color: ' . json_encode($this->template->getMailHeaderColor()) . ',
 		inverted: ' . json_encode($this->util->invertTextColor($this->template->getMailHeaderColor())) . ',
+		cacheBuster: ' . json_encode($cacheBusterValue). '
 	};
 })();';
 		$response = new Http\DataDisplayResponse($responseJS);
diff --git a/apps/theming/lib/IconBuilder.php b/apps/theming/lib/IconBuilder.php
index b61e12d9236..edd7602a2e4 100644
--- a/apps/theming/lib/IconBuilder.php
+++ b/apps/theming/lib/IconBuilder.php
@@ -47,7 +47,7 @@ class IconBuilder {
 	}
 
 	/**
-	 * @param $app app name
+	 * @param $app string app name
 	 * @return string image blob
 	 */
 	public function getFavicon($app) {
@@ -60,7 +60,7 @@ class IconBuilder {
 	}
 
 	/**
-	 * @param $app app name
+	 * @param $app string app name
 	 * @return string image blob
 	 */
 	public function getTouchIcon($app) {
@@ -75,7 +75,7 @@ class IconBuilder {
 	 * Render app icon on themed background color
 	 * fallback to logo
 	 *
-	 * @param $app app name
+	 * @param $app string app name
 	 * @return Imagick
 	 */
 	public function renderAppIcon($app) {
diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php
index 8aa5f50ede2..84c631092a8 100644
--- a/apps/theming/lib/Util.php
+++ b/apps/theming/lib/Util.php
@@ -94,12 +94,11 @@ class Util {
 
 
 	/**
-	 * @param $app app name
+	 * @param $app string app name
 	 * @return string path to app icon / logo
 	 */
 	public function getAppIcon($app) {
 		$appPath = \OC_App::getAppPath($app);
-
 		$icon = $appPath . '/img/' . $app . '.svg';
 		if(file_exists($icon)) {
 			return $icon;
@@ -108,7 +107,6 @@ class Util {
 		if(file_exists($icon)) {
 			return $icon;
 		}
-
 		if($this->config->getAppValue('theming', 'logoMime', '') !== '' && $this->rootFolder->nodeExists('/themedinstancelogo')) {
 			return $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data/') . '/themedinstancelogo';
 		}
@@ -116,20 +114,18 @@ class Util {
 	}
 
 	/**
-	 * @param $app app name
-	 * @param $image relative path to image in app folder
+	 * @param $app string app name
+	 * @param $image string relative path to image in app folder
 	 * @return string absolute path to image
 	 */
 	public function getAppImage($app, $image) {
 		$appPath = \OC_App::getAppPath($app);
-
 		if($app==="core") {
 			$icon = \OC::$SERVERROOT . '/core/img/' . $image;
 			if(file_exists($icon)) {
 				return $icon;
 			}
 		}
-
 		$icon = $appPath . '/img/' . $image;
 		if(file_exists($icon)) {
 			return $icon;
@@ -156,8 +152,8 @@ class Util {
 	/**
 	 * replace default color with a custom one
 	 *
-	 * @param $svg content of a svg file
-	 * @param $color color to match
+	 * @param $svg string content of a svg file
+	 * @param $color string color to match
 	 * @return string
 	 */
 	public function colorizeSvg($svg, $color) {