X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FTheme.php;h=6f0d9d43603a54e683ffbf7f3b6fb1b053069d19;hb=3f3422975266835fc125d1d61aae85ccc10d96d9;hp=37e673e404fd88a301357584a53a8f0ebed3b081;hpb=fb503e82bf6d9dd05e857626251ee56d5d4cbf54;p=friendica.git

diff --git a/src/Core/Theme.php b/src/Core/Theme.php
index 37e673e404..6f0d9d4360 100644
--- a/src/Core/Theme.php
+++ b/src/Core/Theme.php
@@ -6,7 +6,7 @@
 
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
+use Friendica\DI;
 use Friendica\Model\Profile;
 use Friendica\Util\Strings;
 
@@ -31,12 +31,12 @@ class Theme
 			}
 		}
 
-		return $allowed_themes;
+		return array_unique($allowed_themes);
 	}
 
 	public static function setAllowedList(array $allowed_themes)
 	{
-		Config::set('system', 'allowed_themes', implode(',', $allowed_themes));
+		Config::set('system', 'allowed_themes', implode(',', array_unique($allowed_themes)));
 	}
 
 	/**
@@ -73,10 +73,9 @@ class Theme
 			return $info;
 		}
 
-		$a = \get_app();
 		$stamp1 = microtime(true);
 		$theme_file = file_get_contents("view/theme/$theme/theme.php");
-		$a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
+		DI::profiler()->saveTimestamp($stamp1, "file", System::callstack());
 
 		$result = preg_match("|/\*.*\*/|msU", $theme_file, $matches);
 
@@ -126,10 +125,10 @@ class Theme
 		$exts = ['.png', '.jpg'];
 		foreach ($exts as $ext) {
 			if (file_exists('view/theme/' . $theme . '/screenshot' . $ext)) {
-				return System::baseUrl() . '/view/theme/' . $theme . '/screenshot' . $ext;
+				return DI::baseUrl() . '/view/theme/' . $theme . '/screenshot' . $ext;
 			}
 		}
-		return System::baseUrl() . '/images/blank.png';
+		return DI::baseUrl() . '/images/blank.png';
 	}
 
 	public static function uninstall($theme)
@@ -177,6 +176,7 @@ class Theme
 
 			return true;
 		} catch (\Exception $e) {
+			Logger::error('Theme installation failed', ['theme' => $theme, 'error' => $e->getMessage()]);
 			return false;
 		}
 	}
@@ -184,45 +184,33 @@ class Theme
 	/**
 	 * @brief Get the full path to relevant theme files by filename
 	 *
-	 * This function search in the theme directory (and if not present in global theme directory)
-	 * if there is a directory with the file extension and  for a file with the given
-	 * filename.
+	 * This function searches in order in the current theme directory, in the current theme parent directory, and lastly
+	 * in the base view/ folder.
 	 *
 	 * @param string $file Filename
-	 * @param string $root Full root path
 	 * @return string Path to the file or empty string if the file isn't found
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \Exception
 	 */
-	public static function getPathForFile($file, $root = '')
+	public static function getPathForFile($file)
 	{
-		$file = basename($file);
+		$a = DI::app();
+
+		$theme = $a->getCurrentTheme();
+
+		$parent = Strings::sanitizeFilePathItem($a->theme_info['extends'] ?? $theme);
 
-		// Make sure $root ends with a slash / if it's not blank
-		if ($root !== '' && $root[strlen($root) - 1] !== '/') {
-			$root = $root . '/';
-		}
-		$theme_info = \get_app()->theme_info;
-		if (is_array($theme_info) && array_key_exists('extends', $theme_info)) {
-			$parent = $theme_info['extends'];
-		} else {
-			$parent = 'NOPATH';
-		}
-		$theme = \get_app()->getCurrentTheme();
-		$parent = Strings::sanitizeFilePathItem($parent);
-		$ext = substr($file, strrpos($file, '.') + 1);
 		$paths = [
-			"{$root}view/theme/$theme/$ext/$file",
-			"{$root}view/theme/$parent/$ext/$file",
-			"{$root}view/$ext/$file",
+			"view/theme/$theme/$file",
+			"view/theme/$parent/$file",
+			"view/$file",
 		];
-		foreach ($paths as $p) {
-			// strpos() is faster than strstr when checking if one string is in another (http://php.net/manual/en/function.strstr.php)
-			if (strpos($p, 'NOPATH') !== false) {
-				continue;
-			} elseif (file_exists($p)) {
-				return $p;
+
+		foreach ($paths as $path) {
+			if (file_exists($path)) {
+				return $path;
 			}
 		}
+
 		return '';
 	}
 
@@ -243,7 +231,7 @@ class Theme
 			return 'view/theme/' . $theme . '/style.css';
 		}
 
-		$a = BaseObject::getApp();
+		$a = DI::app();
 
 		$query_params = [];