namespace Friendica\Core;
-use Friendica\BaseObject;
+use Friendica\DI;
use Friendica\Model\Profile;
use Friendica\Util\Strings;
{
public static function getAllowedList()
{
- $allowed_themes_str = Config::get('system', 'allowed_themes');
+ $allowed_themes_str = DI::config()->get('system', 'allowed_themes');
$allowed_themes_raw = explode(',', str_replace(' ', '', $allowed_themes_str));
$allowed_themes = [];
if (count($allowed_themes_raw)) {
}
}
- return $allowed_themes;
+ return array_unique($allowed_themes);
}
public static function setAllowedList(array $allowed_themes)
{
- Config::set('system', 'allowed_themes', implode(',', $allowed_themes));
+ DI::config()->set('system', 'allowed_themes', implode(',', array_unique($allowed_themes)));
}
/**
- * @brief Parse theme comment in search of theme infos.
+ * Parse theme comment in search of theme infos.
*
* like
* \code
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);
}
/**
- * @brief Returns the theme's screenshot.
+ * Returns the theme's screenshot.
*
* The screenshot is expected as view/theme/$theme/screenshot.[png|jpg].
*
$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)
return true;
} catch (\Exception $e) {
+ Logger::error('Theme installation failed', ['theme' => $theme, 'error' => $e->getMessage()]);
return false;
}
}
/**
- * @brief Get the full path to relevant theme files by filename
+ * 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 '';
}
/**
- * @brief Return relative path to theme stylesheet file
+ * Return relative path to theme stylesheet file
*
* Provide a sane default if nothing is chosen or the specified theme does not exist.
*
return 'view/theme/' . $theme . '/style.css';
}
- $a = BaseObject::getApp();
+ $a = DI::app();
$query_params = [];