nextcloud / server

apps/theming/lib/Util.php

Indentation +178 added lines, -178 removed lines

@@ -33,183 +33,183 @@
 
 class Util {
 
-	/** @var IConfig */
-	private $config;
-
-	/** @var IAppManager */
-	private $appManager;
-
-	/** @var IAppData */
-	private $appData;
-
-	/**
-	 * Util constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IAppManager $appManager
-	 * @param IAppData $appData
-	 */
-	public function __construct(IConfig $config, IAppManager $appManager, IAppData $appData) {
-		$this->config = $config;
-		$this->appManager = $appManager;
-		$this->appData = $appData;
-	}
-
-	/**
-	 * @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|ISimpleFile path to app icon / file of 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', '') !== '') {
-			$logoFile = null;
-			try {
-				$folder = $this->appData->getFolder('images');
-				if ($folder !== null) {
-					return $folder->getFile('logo');
-				}
-			} catch (NotFoundException $e) {}
-		}
-		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;
-	}
-
-	/**
-	 * Check if a custom theme is set in the server configuration
-	 * 
-	 * @return bool
-	 */
-	public function isAlreadyThemed() {
-		$theme = $this->config->getSystemValue('theme', '');
-		if ($theme !== '') {
-			return true;
-		}
-		return false;
-	}
+    /** @var IConfig */
+    private $config;
+
+    /** @var IAppManager */
+    private $appManager;
+
+    /** @var IAppData */
+    private $appData;
+
+    /**
+     * Util constructor.
+     *
+     * @param IConfig $config
+     * @param IAppManager $appManager
+     * @param IAppData $appData
+     */
+    public function __construct(IConfig $config, IAppManager $appManager, IAppData $appData) {
+        $this->config = $config;
+        $this->appManager = $appManager;
+        $this->appData = $appData;
+    }
+
+    /**
+     * @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|ISimpleFile path to app icon / file of 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', '') !== '') {
+            $logoFile = null;
+            try {
+                $folder = $this->appData->getFolder('images');
+                if ($folder !== null) {
+                    return $folder->getFile('logo');
+                }
+            } catch (NotFoundException $e) {}
+        }
+        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;
+    }
+
+    /**
+     * Check if a custom theme is set in the server configuration
+     * 
+     * @return bool
+     */
+    public function isAlreadyThemed() {
+        $theme = $this->config->getSystemValue('theme', '');
+        if ($theme !== '') {
+            return true;
+        }
+        return false;
+    }
 
 }

apps/theming/appinfo/app.php

Indentation +27 added lines, -27 removed lines

@@ -28,34 +28,34 @@
 $util = $app->getContainer()->query(\OCA\Theming\Util::class);
 if(!$util->isAlreadyThemed()) {
 
-	$app->getContainer()->registerCapability(\OCA\Theming\Capabilities::class);
+    $app->getContainer()->registerCapability(\OCA\Theming\Capabilities::class);
 
-	$linkToCSS = \OC::$server->getURLGenerator()->linkToRoute(
-		'theming.Theming.getStylesheet',
-		[
-			'v' => \OC::$server->getConfig()->getAppValue('theming', 'cachebuster', '0'),
-		]
-	);
-	\OCP\Util::addHeader(
-		'link',
-		[
-			'rel' => 'stylesheet',
-			'href' => $linkToCSS,
-		]
-	);
+    $linkToCSS = \OC::$server->getURLGenerator()->linkToRoute(
+        'theming.Theming.getStylesheet',
+        [
+            'v' => \OC::$server->getConfig()->getAppValue('theming', 'cachebuster', '0'),
+        ]
+    );
+    \OCP\Util::addHeader(
+        'link',
+        [
+            'rel' => 'stylesheet',
+            'href' => $linkToCSS,
+        ]
+    );
 
-	$linkToJs = \OC::$server->getURLGenerator()->linkToRoute(
-		'theming.Theming.getJavascript',
-		[
-			'v' => \OC::$server->getConfig()->getAppValue('theming', 'cachebuster', '0'),
-		]
-	);
-	\OCP\Util::addHeader(
-		'script',
-		[
-			'src' => $linkToJs,
-			'nonce' => \OC::$server->getContentSecurityPolicyNonceManager()->getNonce()
-		], ''
-	);
+    $linkToJs = \OC::$server->getURLGenerator()->linkToRoute(
+        'theming.Theming.getJavascript',
+        [
+            'v' => \OC::$server->getConfig()->getAppValue('theming', 'cachebuster', '0'),
+        ]
+    );
+    \OCP\Util::addHeader(
+        'script',
+        [
+            'src' => $linkToJs,
+            'nonce' => \OC::$server->getContentSecurityPolicyNonceManager()->getNonce()
+        ], ''
+    );
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 $app = new \OCP\AppFramework\App('theming');
 /** @var \OCA\Theming\Util $util */
 $util = $app->getContainer()->query(\OCA\Theming\Util::class);
-if(!$util->isAlreadyThemed()) {
+if (!$util->isAlreadyThemed()) {
 
 	$app->getContainer()->registerCapability(\OCA\Theming\Capabilities::class);
 

lib/private/URLGenerator.php

Indentation +195 added lines, -195 removed lines

@@ -42,199 +42,199 @@
  * Class to generate URLs
  */
 class URLGenerator implements IURLGenerator {
-	/** @var IConfig */
-	private $config;
-	/** @var ICacheFactory */
-	private $cacheFactory;
-
-	/**
-	 * @param IConfig $config
-	 * @param ICacheFactory $cacheFactory
-	 */
-	public function __construct(IConfig $config,
-								ICacheFactory $cacheFactory) {
-		$this->config = $config;
-		$this->cacheFactory = $cacheFactory;
-	}
-
-	/**
-	 * Creates an url using a defined route
-	 * @param string $route
-	 * @param array $parameters args with param=>value, will be appended to the returned url
-	 * @return string the url
-	 *
-	 * Returns a url to the given route.
-	 */
-	public function linkToRoute($route, $parameters = array()) {
-		// TODO: mock router
-		$urlLinkTo = \OC::$server->getRouter()->generate($route, $parameters);
-		return $urlLinkTo;
-	}
-
-	/**
-	 * Creates an absolute url using a defined route
-	 * @param string $routeName
-	 * @param array $arguments args with param=>value, will be appended to the returned url
-	 * @return string the url
-	 *
-	 * Returns an absolute url to the given route.
-	 */
-	public function linkToRouteAbsolute($routeName, $arguments = array()) {
-		return $this->getAbsoluteURL($this->linkToRoute($routeName, $arguments));
-	}
-
-	/**
-	 * Creates an url
-	 * @param string $app app
-	 * @param string $file file
-	 * @param array $args array with param=>value, will be appended to the returned url
-	 *    The value of $args will be urlencoded
-	 * @return string the url
-	 *
-	 * Returns a url to the given app and file.
-	 */
-	public function linkTo( $app, $file, $args = array() ) {
-		$frontControllerActive = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
-
-		if( $app != '' ) {
-			$app_path = \OC_App::getAppPath($app);
-			// Check if the app is in the app folder
-			if ($app_path && file_exists($app_path . '/' . $file)) {
-				if (substr($file, -3) == 'php') {
-
-					$urlLinkTo = \OC::$WEBROOT . '/index.php/apps/' . $app;
-					if ($frontControllerActive) {
-						$urlLinkTo = \OC::$WEBROOT . '/apps/' . $app;
-					}
-					$urlLinkTo .= ($file != 'index.php') ? '/' . $file : '';
-				} else {
-					$urlLinkTo = \OC_App::getAppWebPath($app) . '/' . $file;
-				}
-			} else {
-				$urlLinkTo = \OC::$WEBROOT . '/' . $app . '/' . $file;
-			}
-		} else {
-			if (file_exists(\OC::$SERVERROOT . '/core/' . $file)) {
-				$urlLinkTo = \OC::$WEBROOT . '/core/' . $file;
-			} else {
-				if ($frontControllerActive && $file === 'index.php') {
-					$urlLinkTo = \OC::$WEBROOT . '/';
-				} else {
-					$urlLinkTo = \OC::$WEBROOT . '/' . $file;
-				}
-			}
-		}
-
-		if ($args && $query = http_build_query($args, '', '&')) {
-			$urlLinkTo .= '?' . $query;
-		}
-
-		return $urlLinkTo;
-	}
-
-	/**
-	 * Creates path to an image
-	 * @param string $app app
-	 * @param string $image image name
-	 * @throws \RuntimeException If the image does not exist
-	 * @return string the url
-	 *
-	 * Returns the path to the image.
-	 */
-	public function imagePath($app, $image) {
-		$cache = $this->cacheFactory->create('imagePath');
-		$cacheKey = $app.'-'.$image;
-		if($key = $cache->get($cacheKey)) {
-			return $key;
-		}
-
-		// Read the selected theme from the config file
-		$theme = \OC_Util::getTheme();
-
-		//if a theme has a png but not an svg always use the png
-		$basename = substr(basename($image),0,-4);
-
-		$appPath = \OC_App::getAppPath($app);
-
-		// Check if the app is in the app folder
-		$path = '';
-		$themingEnabled = $this->config->getSystemValue('installed', false) && \OCP\App::isEnabled('theming') && \OC_App::isAppLoaded('theming');
-		if (file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$image")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/apps/$app/img/$image";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.png")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/apps/$app/img/$basename.png";
-		} elseif (!empty($app) and file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$image")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/$app/img/$image";
-		} elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$basename.png"))) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/$app/img/$basename.png";
-		} elseif (file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$image")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/core/img/$image";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.png")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
-		} elseif($themingEnabled && $image === "favicon.ico" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) {
-			$cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
-			if($app==="") { $app = "core"; }
-			$path = $this->linkToRoute('theming.Icon.getFavicon', [ 'app' => $app ]) . '?v='. $cacheBusterValue;
-		} elseif($themingEnabled && $image === "favicon-touch.png" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) {
-			$cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
-			if($app==="") { $app = "core"; }
-			$path = $this->linkToRoute('theming.Icon.getTouchIcon', [ 'app' => $app ]) . '?v='. $cacheBusterValue;
-		} elseif ($appPath && file_exists($appPath . "/img/$image")) {
-			$path =  \OC_App::getAppWebPath($app) . "/img/$image";
-		} elseif ($appPath && !file_exists($appPath . "/img/$basename.svg")
-			&& file_exists($appPath . "/img/$basename.png")) {
-			$path =  \OC_App::getAppWebPath($app) . "/img/$basename.png";
-		} elseif (!empty($app) and file_exists(\OC::$SERVERROOT . "/$app/img/$image")) {
-			$path =  \OC::$WEBROOT . "/$app/img/$image";
-		} elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT . "/$app/img/$basename.svg")
-				&& file_exists(\OC::$SERVERROOT . "/$app/img/$basename.png"))) {
-			$path =  \OC::$WEBROOT . "/$app/img/$basename.png";
-		} elseif (file_exists(\OC::$SERVERROOT . "/core/img/$image")) {
-			$path =  \OC::$WEBROOT . "/core/img/$image";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/core/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/core/img/$basename.png")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
-		}
-
-		if($path !== '') {
-			$cache->set($cacheKey, $path);
-			return $path;
-		} else {
-			throw new RuntimeException('image not found: image:' . $image . ' webroot:' . \OC::$WEBROOT . ' serverroot:' . \OC::$SERVERROOT);
-		}
-	}
-
-
-	/**
-	 * Makes an URL absolute
-	 * @param string $url the url in the ownCloud host
-	 * @return string the absolute version of the url
-	 */
-	public function getAbsoluteURL($url) {
-		$separator = $url[0] === '/' ? '' : '/';
-
-		if (\OC::$CLI && !defined('PHPUNIT_RUN')) {
-			return rtrim($this->config->getSystemValue('overwrite.cli.url'), '/') . '/' . ltrim($url, '/');
-		}
-
-		// The ownCloud web root can already be prepended.
-		$webRoot = substr($url, 0, strlen(\OC::$WEBROOT)) === \OC::$WEBROOT
-			? ''
-			: \OC::$WEBROOT;
-
-		$request = \OC::$server->getRequest();
-		return $request->getServerProtocol() . '://' . $request->getServerHost() . $webRoot . $separator . $url;
-	}
-
-	/**
-	 * @param string $key
-	 * @return string url to the online documentation
-	 */
-	public function linkToDocs($key) {
-		$theme = \OC::$server->getThemingDefaults();
-		return $theme->buildDocLinkToKey($key);
-	}
+    /** @var IConfig */
+    private $config;
+    /** @var ICacheFactory */
+    private $cacheFactory;
+
+    /**
+     * @param IConfig $config
+     * @param ICacheFactory $cacheFactory
+     */
+    public function __construct(IConfig $config,
+                                ICacheFactory $cacheFactory) {
+        $this->config = $config;
+        $this->cacheFactory = $cacheFactory;
+    }
+
+    /**
+     * Creates an url using a defined route
+     * @param string $route
+     * @param array $parameters args with param=>value, will be appended to the returned url
+     * @return string the url
+     *
+     * Returns a url to the given route.
+     */
+    public function linkToRoute($route, $parameters = array()) {
+        // TODO: mock router
+        $urlLinkTo = \OC::$server->getRouter()->generate($route, $parameters);
+        return $urlLinkTo;
+    }
+
+    /**
+     * Creates an absolute url using a defined route
+     * @param string $routeName
+     * @param array $arguments args with param=>value, will be appended to the returned url
+     * @return string the url
+     *
+     * Returns an absolute url to the given route.
+     */
+    public function linkToRouteAbsolute($routeName, $arguments = array()) {
+        return $this->getAbsoluteURL($this->linkToRoute($routeName, $arguments));
+    }
+
+    /**
+     * Creates an url
+     * @param string $app app
+     * @param string $file file
+     * @param array $args array with param=>value, will be appended to the returned url
+     *    The value of $args will be urlencoded
+     * @return string the url
+     *
+     * Returns a url to the given app and file.
+     */
+    public function linkTo( $app, $file, $args = array() ) {
+        $frontControllerActive = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
+
+        if( $app != '' ) {
+            $app_path = \OC_App::getAppPath($app);
+            // Check if the app is in the app folder
+            if ($app_path && file_exists($app_path . '/' . $file)) {
+                if (substr($file, -3) == 'php') {
+
+                    $urlLinkTo = \OC::$WEBROOT . '/index.php/apps/' . $app;
+                    if ($frontControllerActive) {
+                        $urlLinkTo = \OC::$WEBROOT . '/apps/' . $app;
+                    }
+                    $urlLinkTo .= ($file != 'index.php') ? '/' . $file : '';
+                } else {
+                    $urlLinkTo = \OC_App::getAppWebPath($app) . '/' . $file;
+                }
+            } else {
+                $urlLinkTo = \OC::$WEBROOT . '/' . $app . '/' . $file;
+            }
+        } else {
+            if (file_exists(\OC::$SERVERROOT . '/core/' . $file)) {
+                $urlLinkTo = \OC::$WEBROOT . '/core/' . $file;
+            } else {
+                if ($frontControllerActive && $file === 'index.php') {
+                    $urlLinkTo = \OC::$WEBROOT . '/';
+                } else {
+                    $urlLinkTo = \OC::$WEBROOT . '/' . $file;
+                }
+            }
+        }
+
+        if ($args && $query = http_build_query($args, '', '&')) {
+            $urlLinkTo .= '?' . $query;
+        }
+
+        return $urlLinkTo;
+    }
+
+    /**
+     * Creates path to an image
+     * @param string $app app
+     * @param string $image image name
+     * @throws \RuntimeException If the image does not exist
+     * @return string the url
+     *
+     * Returns the path to the image.
+     */
+    public function imagePath($app, $image) {
+        $cache = $this->cacheFactory->create('imagePath');
+        $cacheKey = $app.'-'.$image;
+        if($key = $cache->get($cacheKey)) {
+            return $key;
+        }
+
+        // Read the selected theme from the config file
+        $theme = \OC_Util::getTheme();
+
+        //if a theme has a png but not an svg always use the png
+        $basename = substr(basename($image),0,-4);
+
+        $appPath = \OC_App::getAppPath($app);
+
+        // Check if the app is in the app folder
+        $path = '';
+        $themingEnabled = $this->config->getSystemValue('installed', false) && \OCP\App::isEnabled('theming') && \OC_App::isAppLoaded('theming');
+        if (file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$image")) {
+            $path = \OC::$WEBROOT . "/themes/$theme/apps/$app/img/$image";
+        } elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.svg")
+            && file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.png")) {
+            $path =  \OC::$WEBROOT . "/themes/$theme/apps/$app/img/$basename.png";
+        } elseif (!empty($app) and file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$image")) {
+            $path =  \OC::$WEBROOT . "/themes/$theme/$app/img/$image";
+        } elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$basename.svg")
+            && file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$basename.png"))) {
+            $path =  \OC::$WEBROOT . "/themes/$theme/$app/img/$basename.png";
+        } elseif (file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$image")) {
+            $path =  \OC::$WEBROOT . "/themes/$theme/core/img/$image";
+        } elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.svg")
+            && file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.png")) {
+            $path =  \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
+        } elseif($themingEnabled && $image === "favicon.ico" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) {
+            $cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
+            if($app==="") { $app = "core"; }
+            $path = $this->linkToRoute('theming.Icon.getFavicon', [ 'app' => $app ]) . '?v='. $cacheBusterValue;
+        } elseif($themingEnabled && $image === "favicon-touch.png" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) {
+            $cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
+            if($app==="") { $app = "core"; }
+            $path = $this->linkToRoute('theming.Icon.getTouchIcon', [ 'app' => $app ]) . '?v='. $cacheBusterValue;
+        } elseif ($appPath && file_exists($appPath . "/img/$image")) {
+            $path =  \OC_App::getAppWebPath($app) . "/img/$image";
+        } elseif ($appPath && !file_exists($appPath . "/img/$basename.svg")
+            && file_exists($appPath . "/img/$basename.png")) {
+            $path =  \OC_App::getAppWebPath($app) . "/img/$basename.png";
+        } elseif (!empty($app) and file_exists(\OC::$SERVERROOT . "/$app/img/$image")) {
+            $path =  \OC::$WEBROOT . "/$app/img/$image";
+        } elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT . "/$app/img/$basename.svg")
+                && file_exists(\OC::$SERVERROOT . "/$app/img/$basename.png"))) {
+            $path =  \OC::$WEBROOT . "/$app/img/$basename.png";
+        } elseif (file_exists(\OC::$SERVERROOT . "/core/img/$image")) {
+            $path =  \OC::$WEBROOT . "/core/img/$image";
+        } elseif (!file_exists(\OC::$SERVERROOT . "/core/img/$basename.svg")
+            && file_exists(\OC::$SERVERROOT . "/core/img/$basename.png")) {
+            $path =  \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
+        }
+
+        if($path !== '') {
+            $cache->set($cacheKey, $path);
+            return $path;
+        } else {
+            throw new RuntimeException('image not found: image:' . $image . ' webroot:' . \OC::$WEBROOT . ' serverroot:' . \OC::$SERVERROOT);
+        }
+    }
+
+
+    /**
+     * Makes an URL absolute
+     * @param string $url the url in the ownCloud host
+     * @return string the absolute version of the url
+     */
+    public function getAbsoluteURL($url) {
+        $separator = $url[0] === '/' ? '' : '/';
+
+        if (\OC::$CLI && !defined('PHPUNIT_RUN')) {
+            return rtrim($this->config->getSystemValue('overwrite.cli.url'), '/') . '/' . ltrim($url, '/');
+        }
+
+        // The ownCloud web root can already be prepended.
+        $webRoot = substr($url, 0, strlen(\OC::$WEBROOT)) === \OC::$WEBROOT
+            ? ''
+            : \OC::$WEBROOT;
+
+        $request = \OC::$server->getRequest();
+        return $request->getServerProtocol() . '://' . $request->getServerHost() . $webRoot . $separator . $url;
+    }
+
+    /**
+     * @param string $key
+     * @return string url to the online documentation
+     */
+    public function linkToDocs($key) {
+        $theme = \OC::$server->getThemingDefaults();
+        return $theme->buildDocLinkToKey($key);
+    }
 }

Spacing +55 added lines, -55 removed lines

@@ -93,40 +93,40 @@ 
 	 *
 	 * Returns a url to the given app and file.
 	 */
-	public function linkTo( $app, $file, $args = array() ) {
+	public function linkTo($app, $file, $args = array()) {
 		$frontControllerActive = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
 
-		if( $app != '' ) {
+		if ($app != '') {
 			$app_path = \OC_App::getAppPath($app);
 			// Check if the app is in the app folder
-			if ($app_path && file_exists($app_path . '/' . $file)) {
+			if ($app_path && file_exists($app_path.'/'.$file)) {
 				if (substr($file, -3) == 'php') {
 
-					$urlLinkTo = \OC::$WEBROOT . '/index.php/apps/' . $app;
+					$urlLinkTo = \OC::$WEBROOT.'/index.php/apps/'.$app;
 					if ($frontControllerActive) {
-						$urlLinkTo = \OC::$WEBROOT . '/apps/' . $app;
+						$urlLinkTo = \OC::$WEBROOT.'/apps/'.$app;
 					}
-					$urlLinkTo .= ($file != 'index.php') ? '/' . $file : '';
+					$urlLinkTo .= ($file != 'index.php') ? '/'.$file : '';
 				} else {
-					$urlLinkTo = \OC_App::getAppWebPath($app) . '/' . $file;
+					$urlLinkTo = \OC_App::getAppWebPath($app).'/'.$file;
 				}
 			} else {
-				$urlLinkTo = \OC::$WEBROOT . '/' . $app . '/' . $file;
+				$urlLinkTo = \OC::$WEBROOT.'/'.$app.'/'.$file;
 			}
 		} else {
-			if (file_exists(\OC::$SERVERROOT . '/core/' . $file)) {
-				$urlLinkTo = \OC::$WEBROOT . '/core/' . $file;
+			if (file_exists(\OC::$SERVERROOT.'/core/'.$file)) {
+				$urlLinkTo = \OC::$WEBROOT.'/core/'.$file;
 			} else {
 				if ($frontControllerActive && $file === 'index.php') {
-					$urlLinkTo = \OC::$WEBROOT . '/';
+					$urlLinkTo = \OC::$WEBROOT.'/';
 				} else {
-					$urlLinkTo = \OC::$WEBROOT . '/' . $file;
+					$urlLinkTo = \OC::$WEBROOT.'/'.$file;
 				}
 			}
 		}
 
 		if ($args && $query = http_build_query($args, '', '&')) {
-			$urlLinkTo .= '?' . $query;
+			$urlLinkTo .= '?'.$query;
 		}
 
 		return $urlLinkTo;
@@ -144,7 +144,7 @@ 
 	public function imagePath($app, $image) {
 		$cache = $this->cacheFactory->create('imagePath');
 		$cacheKey = $app.'-'.$image;
-		if($key = $cache->get($cacheKey)) {
+		if ($key = $cache->get($cacheKey)) {
 			return $key;
 		}
 
@@ -152,58 +152,58 @@ 
 		$theme = \OC_Util::getTheme();
 
 		//if a theme has a png but not an svg always use the png
-		$basename = substr(basename($image),0,-4);
+		$basename = substr(basename($image), 0, -4);
 
 		$appPath = \OC_App::getAppPath($app);
 
 		// Check if the app is in the app folder
 		$path = '';
 		$themingEnabled = $this->config->getSystemValue('installed', false) && \OCP\App::isEnabled('theming') && \OC_App::isAppLoaded('theming');
-		if (file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$image")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/apps/$app/img/$image";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.png")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/apps/$app/img/$basename.png";
-		} elseif (!empty($app) and file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$image")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/$app/img/$image";
-		} elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$basename.png"))) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/$app/img/$basename.png";
-		} elseif (file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$image")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/core/img/$image";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.png")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
-		} elseif($themingEnabled && $image === "favicon.ico" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) {
+		if (file_exists(\OC::$SERVERROOT."/themes/$theme/apps/$app/img/$image")) {
+			$path = \OC::$WEBROOT."/themes/$theme/apps/$app/img/$image";
+		} elseif (!file_exists(\OC::$SERVERROOT."/themes/$theme/apps/$app/img/$basename.svg")
+			&& file_exists(\OC::$SERVERROOT."/themes/$theme/apps/$app/img/$basename.png")) {
+			$path = \OC::$WEBROOT."/themes/$theme/apps/$app/img/$basename.png";
+		} elseif (!empty($app) and file_exists(\OC::$SERVERROOT."/themes/$theme/$app/img/$image")) {
+			$path = \OC::$WEBROOT."/themes/$theme/$app/img/$image";
+		} elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT."/themes/$theme/$app/img/$basename.svg")
+			&& file_exists(\OC::$SERVERROOT."/themes/$theme/$app/img/$basename.png"))) {
+			$path = \OC::$WEBROOT."/themes/$theme/$app/img/$basename.png";
+		} elseif (file_exists(\OC::$SERVERROOT."/themes/$theme/core/img/$image")) {
+			$path = \OC::$WEBROOT."/themes/$theme/core/img/$image";
+		} elseif (!file_exists(\OC::$SERVERROOT."/themes/$theme/core/img/$basename.svg")
+			&& file_exists(\OC::$SERVERROOT."/themes/$theme/core/img/$basename.png")) {
+			$path = \OC::$WEBROOT."/themes/$theme/core/img/$basename.png";
+		} elseif ($themingEnabled && $image === "favicon.ico" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) {
 			$cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
-			if($app==="") { $app = "core"; }
-			$path = $this->linkToRoute('theming.Icon.getFavicon', [ 'app' => $app ]) . '?v='. $cacheBusterValue;
-		} elseif($themingEnabled && $image === "favicon-touch.png" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) {
+			if ($app === "") { $app = "core"; }
+			$path = $this->linkToRoute('theming.Icon.getFavicon', ['app' => $app]).'?v='.$cacheBusterValue;
+		} elseif ($themingEnabled && $image === "favicon-touch.png" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) {
 			$cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
-			if($app==="") { $app = "core"; }
-			$path = $this->linkToRoute('theming.Icon.getTouchIcon', [ 'app' => $app ]) . '?v='. $cacheBusterValue;
-		} elseif ($appPath && file_exists($appPath . "/img/$image")) {
-			$path =  \OC_App::getAppWebPath($app) . "/img/$image";
-		} elseif ($appPath && !file_exists($appPath . "/img/$basename.svg")
-			&& file_exists($appPath . "/img/$basename.png")) {
-			$path =  \OC_App::getAppWebPath($app) . "/img/$basename.png";
-		} elseif (!empty($app) and file_exists(\OC::$SERVERROOT . "/$app/img/$image")) {
-			$path =  \OC::$WEBROOT . "/$app/img/$image";
-		} elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT . "/$app/img/$basename.svg")
-				&& file_exists(\OC::$SERVERROOT . "/$app/img/$basename.png"))) {
-			$path =  \OC::$WEBROOT . "/$app/img/$basename.png";
-		} elseif (file_exists(\OC::$SERVERROOT . "/core/img/$image")) {
-			$path =  \OC::$WEBROOT . "/core/img/$image";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/core/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/core/img/$basename.png")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
+			if ($app === "") { $app = "core"; }
+			$path = $this->linkToRoute('theming.Icon.getTouchIcon', ['app' => $app]).'?v='.$cacheBusterValue;
+		} elseif ($appPath && file_exists($appPath."/img/$image")) {
+			$path = \OC_App::getAppWebPath($app)."/img/$image";
+		} elseif ($appPath && !file_exists($appPath."/img/$basename.svg")
+			&& file_exists($appPath."/img/$basename.png")) {
+			$path = \OC_App::getAppWebPath($app)."/img/$basename.png";
+		} elseif (!empty($app) and file_exists(\OC::$SERVERROOT."/$app/img/$image")) {
+			$path = \OC::$WEBROOT."/$app/img/$image";
+		} elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT."/$app/img/$basename.svg")
+				&& file_exists(\OC::$SERVERROOT."/$app/img/$basename.png"))) {
+			$path = \OC::$WEBROOT."/$app/img/$basename.png";
+		} elseif (file_exists(\OC::$SERVERROOT."/core/img/$image")) {
+			$path = \OC::$WEBROOT."/core/img/$image";
+		} elseif (!file_exists(\OC::$SERVERROOT."/core/img/$basename.svg")
+			&& file_exists(\OC::$SERVERROOT."/core/img/$basename.png")) {
+			$path = \OC::$WEBROOT."/themes/$theme/core/img/$basename.png";
 		}
 
-		if($path !== '') {
+		if ($path !== '') {
 			$cache->set($cacheKey, $path);
 			return $path;
 		} else {
-			throw new RuntimeException('image not found: image:' . $image . ' webroot:' . \OC::$WEBROOT . ' serverroot:' . \OC::$SERVERROOT);
+			throw new RuntimeException('image not found: image:'.$image.' webroot:'.\OC::$WEBROOT.' serverroot:'.\OC::$SERVERROOT);
 		}
 	}
 
@@ -217,7 +217,7 @@ 
 		$separator = $url[0] === '/' ? '' : '/';
 
 		if (\OC::$CLI && !defined('PHPUNIT_RUN')) {
-			return rtrim($this->config->getSystemValue('overwrite.cli.url'), '/') . '/' . ltrim($url, '/');
+			return rtrim($this->config->getSystemValue('overwrite.cli.url'), '/').'/'.ltrim($url, '/');
 		}
 
 		// The ownCloud web root can already be prepended.
@@ -226,7 +226,7 @@ 
 			: \OC::$WEBROOT;
 
 		$request = \OC::$server->getRequest();
-		return $request->getServerProtocol() . '://' . $request->getServerHost() . $webRoot . $separator . $url;
+		return $request->getServerProtocol().'://'.$request->getServerHost().$webRoot.$separator.$url;
 	}
 
 	/**