Inspection of "Prefer custom theme over the theming app" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#5070)

by Julius

created 2017-06-14 08:25 UTC

Status

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -26,7 +26,7 @@
 block discarded – undo
 $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);
 

Please login to merge, or discard this patch.

lib/private/URLGenerator.php 1 patch

Spacing +55 added lines, -55 removed lines patch added patch discarded remove patch

@@ -93,40 +93,40 @@  discard block
 block discarded – undo
 	 *
 	 * 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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 			: \OC::$WEBROOT;
 
 		$request = \OC::$server->getRequest();
-		return $request->getServerProtocol() . '://' . $request->getServerHost() . $webRoot . $separator . $url;
+		return $request->getServerProtocol().'://'.$request->getServerHost().$webRoot.$separator.$url;
 	}
 
 	/**

Please login to merge, or discard this patch.

		@@ -26,7 +26,7 @@
		block discarded – undo
26	26	$app = new \OCP\AppFramework\App('theming');
27	27	/** @var \OCA\Theming\Util $util */
28	28	$util = $app->getContainer()->query(\OCA\Theming\Util::class);
29		-if(!$util->isAlreadyThemed()) {
	29	+if (!$util->isAlreadyThemed()) {
30	30
31	31	$app->getContainer()->registerCapability(\OCA\Theming\Capabilities::class);
32	32

		@@ -93,40 +93,40 @@ discard block
		block discarded – undo
93	93	*
94	94	* Returns a url to the given app and file.
95	95	*/
96		- public function linkTo( $app, $file, $args = array() ) {
	96	+ public function linkTo($app, $file, $args = array()) {
97	97	$frontControllerActive = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true \|\| getenv('front_controller_active') === 'true');
98	98
99		- if( $app != '' ) {
	99	+ if ($app != '') {
100	100	$app_path = \OC_App::getAppPath($app);
101	101	// Check if the app is in the app folder
102		- if ($app_path && file_exists($app_path . '/' . $file)) {
	102	+ if ($app_path && file_exists($app_path.'/'.$file)) {
103	103	if (substr($file, -3) == 'php') {
104	104
105		- $urlLinkTo = \OC::$WEBROOT . '/index.php/apps/' . $app;
	105	+ $urlLinkTo = \OC::$WEBROOT.'/index.php/apps/'.$app;
106	106	if ($frontControllerActive) {
107		- $urlLinkTo = \OC::$WEBROOT . '/apps/' . $app;
	107	+ $urlLinkTo = \OC::$WEBROOT.'/apps/'.$app;
108	108	}
109		- $urlLinkTo .= ($file != 'index.php') ? '/' . $file : '';
	109	+ $urlLinkTo .= ($file != 'index.php') ? '/'.$file : '';
110	110	} else {
111		- $urlLinkTo = \OC_App::getAppWebPath($app) . '/' . $file;
	111	+ $urlLinkTo = \OC_App::getAppWebPath($app).'/'.$file;
112	112	}
113	113	} else {
114		- $urlLinkTo = \OC::$WEBROOT . '/' . $app . '/' . $file;
	114	+ $urlLinkTo = \OC::$WEBROOT.'/'.$app.'/'.$file;
115	115	}
116	116	} else {
117		- if (file_exists(\OC::$SERVERROOT . '/core/' . $file)) {
118		- $urlLinkTo = \OC::$WEBROOT . '/core/' . $file;
	117	+ if (file_exists(\OC::$SERVERROOT.'/core/'.$file)) {
	118	+ $urlLinkTo = \OC::$WEBROOT.'/core/'.$file;
119	119	} else {
120	120	if ($frontControllerActive && $file === 'index.php') {
121		- $urlLinkTo = \OC::$WEBROOT . '/';
	121	+ $urlLinkTo = \OC::$WEBROOT.'/';
122	122	} else {
123		- $urlLinkTo = \OC::$WEBROOT . '/' . $file;
	123	+ $urlLinkTo = \OC::$WEBROOT.'/'.$file;
124	124	}
125	125	}
126	126	}
127	127
128	128	if ($args && $query = http_build_query($args, '', '&')) {
129		- $urlLinkTo .= '?' . $query;
	129	+ $urlLinkTo .= '?'.$query;
130	130	}
131	131
132	132	return $urlLinkTo;
		@@ -144,7 +144,7 @@ discard block
		block discarded – undo
144	144	public function imagePath($app, $image) {
145	145	$cache = $this->cacheFactory->create('imagePath');
146	146	$cacheKey = $app.'-'.$image;
147		- if($key = $cache->get($cacheKey)) {
	147	+ if ($key = $cache->get($cacheKey)) {
148	148	return $key;
149	149	}
150	150
		@@ -152,58 +152,58 @@ discard block
		block discarded – undo
152	152	$theme = \OC_Util::getTheme();
153	153
154	154	//if a theme has a png but not an svg always use the png
155		- $basename = substr(basename($image),0,-4);
	155	+ $basename = substr(basename($image), 0, -4);
156	156
157	157	$appPath = \OC_App::getAppPath($app);
158	158
159	159	// Check if the app is in the app folder
160	160	$path = '';
161	161	$themingEnabled = $this->config->getSystemValue('installed', false) && \OCP\App::isEnabled('theming') && \OC_App::isAppLoaded('theming');
162		- if (file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$image")) {
163		- $path = \OC::$WEBROOT . "/themes/$theme/apps/$app/img/$image";
164		- } elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.svg")
165		- && file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.png")) {
166		- $path = \OC::$WEBROOT . "/themes/$theme/apps/$app/img/$basename.png";
167		- } elseif (!empty($app) and file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$image")) {
168		- $path = \OC::$WEBROOT . "/themes/$theme/$app/img/$image";
169		- } elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$basename.svg")
170		- && file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$basename.png"))) {
171		- $path = \OC::$WEBROOT . "/themes/$theme/$app/img/$basename.png";
172		- } elseif (file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$image")) {
173		- $path = \OC::$WEBROOT . "/themes/$theme/core/img/$image";
174		- } elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.svg")
175		- && file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.png")) {
176		- $path = \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
177		- } elseif($themingEnabled && $image === "favicon.ico" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) {
	162	+ if (file_exists(\OC::$SERVERROOT."/themes/$theme/apps/$app/img/$image")) {
	163	+ $path = \OC::$WEBROOT."/themes/$theme/apps/$app/img/$image";
	164	+ } elseif (!file_exists(\OC::$SERVERROOT."/themes/$theme/apps/$app/img/$basename.svg")
	165	+ && file_exists(\OC::$SERVERROOT."/themes/$theme/apps/$app/img/$basename.png")) {
	166	+ $path = \OC::$WEBROOT."/themes/$theme/apps/$app/img/$basename.png";
	167	+ } elseif (!empty($app) and file_exists(\OC::$SERVERROOT."/themes/$theme/$app/img/$image")) {
	168	+ $path = \OC::$WEBROOT."/themes/$theme/$app/img/$image";
	169	+ } elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT."/themes/$theme/$app/img/$basename.svg")
	170	+ && file_exists(\OC::$SERVERROOT."/themes/$theme/$app/img/$basename.png"))) {
	171	+ $path = \OC::$WEBROOT."/themes/$theme/$app/img/$basename.png";
	172	+ } elseif (file_exists(\OC::$SERVERROOT."/themes/$theme/core/img/$image")) {
	173	+ $path = \OC::$WEBROOT."/themes/$theme/core/img/$image";
	174	+ } elseif (!file_exists(\OC::$SERVERROOT."/themes/$theme/core/img/$basename.svg")
	175	+ && file_exists(\OC::$SERVERROOT."/themes/$theme/core/img/$basename.png")) {
	176	+ $path = \OC::$WEBROOT."/themes/$theme/core/img/$basename.png";
	177	+ } elseif ($themingEnabled && $image === "favicon.ico" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) {
178	178	$cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
179		- if($app==="") { $app = "core"; }
180		- $path = $this->linkToRoute('theming.Icon.getFavicon', [ 'app' => $app ]) . '?v='. $cacheBusterValue;
181		- } elseif($themingEnabled && $image === "favicon-touch.png" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) {
	179	+ if ($app === "") { $app = "core"; }
	180	+ $path = $this->linkToRoute('theming.Icon.getFavicon', ['app' => $app]).'?v='.$cacheBusterValue;
	181	+ } elseif ($themingEnabled && $image === "favicon-touch.png" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) {
182	182	$cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
183		- if($app==="") { $app = "core"; }
184		- $path = $this->linkToRoute('theming.Icon.getTouchIcon', [ 'app' => $app ]) . '?v='. $cacheBusterValue;
185		- } elseif ($appPath && file_exists($appPath . "/img/$image")) {
186		- $path = \OC_App::getAppWebPath($app) . "/img/$image";
187		- } elseif ($appPath && !file_exists($appPath . "/img/$basename.svg")
188		- && file_exists($appPath . "/img/$basename.png")) {
189		- $path = \OC_App::getAppWebPath($app) . "/img/$basename.png";
190		- } elseif (!empty($app) and file_exists(\OC::$SERVERROOT . "/$app/img/$image")) {
191		- $path = \OC::$WEBROOT . "/$app/img/$image";
192		- } elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT . "/$app/img/$basename.svg")
193		- && file_exists(\OC::$SERVERROOT . "/$app/img/$basename.png"))) {
194		- $path = \OC::$WEBROOT . "/$app/img/$basename.png";
195		- } elseif (file_exists(\OC::$SERVERROOT . "/core/img/$image")) {
196		- $path = \OC::$WEBROOT . "/core/img/$image";
197		- } elseif (!file_exists(\OC::$SERVERROOT . "/core/img/$basename.svg")
198		- && file_exists(\OC::$SERVERROOT . "/core/img/$basename.png")) {
199		- $path = \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
	183	+ if ($app === "") { $app = "core"; }
	184	+ $path = $this->linkToRoute('theming.Icon.getTouchIcon', ['app' => $app]).'?v='.$cacheBusterValue;
	185	+ } elseif ($appPath && file_exists($appPath."/img/$image")) {
	186	+ $path = \OC_App::getAppWebPath($app)."/img/$image";
	187	+ } elseif ($appPath && !file_exists($appPath."/img/$basename.svg")
	188	+ && file_exists($appPath."/img/$basename.png")) {
	189	+ $path = \OC_App::getAppWebPath($app)."/img/$basename.png";
	190	+ } elseif (!empty($app) and file_exists(\OC::$SERVERROOT."/$app/img/$image")) {
	191	+ $path = \OC::$WEBROOT."/$app/img/$image";
	192	+ } elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT."/$app/img/$basename.svg")
	193	+ && file_exists(\OC::$SERVERROOT."/$app/img/$basename.png"))) {
	194	+ $path = \OC::$WEBROOT."/$app/img/$basename.png";
	195	+ } elseif (file_exists(\OC::$SERVERROOT."/core/img/$image")) {
	196	+ $path = \OC::$WEBROOT."/core/img/$image";
	197	+ } elseif (!file_exists(\OC::$SERVERROOT."/core/img/$basename.svg")
	198	+ && file_exists(\OC::$SERVERROOT."/core/img/$basename.png")) {
	199	+ $path = \OC::$WEBROOT."/themes/$theme/core/img/$basename.png";
200	200	}
201	201
202		- if($path !== '') {
	202	+ if ($path !== '') {
203	203	$cache->set($cacheKey, $path);
204	204	return $path;
205	205	} else {
206		- throw new RuntimeException('image not found: image:' . $image . ' webroot:' . \OC::$WEBROOT . ' serverroot:' . \OC::$SERVERROOT);
	206	+ throw new RuntimeException('image not found: image:'.$image.' webroot:'.\OC::$WEBROOT.' serverroot:'.\OC::$SERVERROOT);
207	207	}
208	208	}
209	209
		@@ -217,7 +217,7 @@ discard block
		block discarded – undo
217	217	$separator = $url[0] === '/' ? '' : '/';
218	218
219	219	if (\OC::$CLI && !defined('PHPUNIT_RUN')) {
220		- return rtrim($this->config->getSystemValue('overwrite.cli.url'), '/') . '/' . ltrim($url, '/');
	220	+ return rtrim($this->config->getSystemValue('overwrite.cli.url'), '/').'/'.ltrim($url, '/');
221	221	}
222	222
223	223	// The ownCloud web root can already be prepended.
		@@ -226,7 +226,7 @@ discard block
		block discarded – undo
226	226	: \OC::$WEBROOT;
227	227
228	228	$request = \OC::$server->getRequest();
229		- return $request->getServerProtocol() . '://' . $request->getServerHost() . $webRoot . $separator . $url;
	229	+ return $request->getServerProtocol().'://'.$request->getServerHost().$webRoot.$separator.$url;
230	230	}
231	231
232	232	/**

nextcloud / server

Pull Request — master (#5070)

Status

Category

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +55 added lines, -55 removed lines patch added patch discarded remove patch