Merge pull request #4951 from MrPetovan/bug/4946-move-current-theme-to-app
Move current_theme() to App
This commit is contained in:
Michael Vogel
GitHub
commit
bd0ba24518
108
boot.php
108
boot.php
|
|
@ -1018,114 +1018,6 @@ function get_max_import_size()
|
|||
return (x($a->config, 'max_import_size') ? $a->config['max_import_size'] : 0);
|
||||
}
|
||||
|
||||
|
||||
function current_theme()
|
||||
{
|
||||
$app_base_themes = ['duepuntozero', 'dispy', 'quattro'];
|
||||
|
||||
$a = get_app();
|
||||
|
||||
$page_theme = null;
|
||||
|
||||
// Find the theme that belongs to the user whose stuff we are looking at
|
||||
|
||||
if ($a->profile_uid && ($a->profile_uid != local_user())) {
|
||||
$r = q(
|
||||
"select theme from user where uid = %d limit 1",
|
||||
intval($a->profile_uid)
|
||||
);
|
||||
if (DBM::is_result($r)) {
|
||||
$page_theme = $r[0]['theme'];
|
||||
}
|
||||
}
|
||||
|
||||
// Allow folks to over-rule user themes and always use their own on their own site.
|
||||
// This works only if the user is on the same server
|
||||
|
||||
if ($page_theme && local_user() && (local_user() != $a->profile_uid)) {
|
||||
if (PConfig::get(local_user(), 'system', 'always_my_theme')) {
|
||||
$page_theme = null;
|
||||
}
|
||||
}
|
||||
|
||||
// $mobile_detect = new Mobile_Detect();
|
||||
// $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
|
||||
$is_mobile = $a->is_mobile || $a->is_tablet;
|
||||
|
||||
$standard_system_theme = Config::get('system', 'theme', '');
|
||||
$standard_theme_name = ((isset($_SESSION) && x($_SESSION, 'theme')) ? $_SESSION['theme'] : $standard_system_theme);
|
||||
|
||||
if ($is_mobile) {
|
||||
if (isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
|
||||
$theme_name = $standard_theme_name;
|
||||
} else {
|
||||
$system_theme = Config::get('system', 'mobile-theme', '');
|
||||
if ($system_theme == '') {
|
||||
$system_theme = $standard_system_theme;
|
||||
}
|
||||
$theme_name = ((isset($_SESSION) && x($_SESSION, 'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
|
||||
|
||||
if ($theme_name === '---') {
|
||||
// user has selected to have the mobile theme be the same as the normal one
|
||||
$theme_name = $standard_theme_name;
|
||||
|
||||
if ($page_theme) {
|
||||
$theme_name = $page_theme;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$theme_name = $standard_theme_name;
|
||||
|
||||
if ($page_theme) {
|
||||
$theme_name = $page_theme;
|
||||
}
|
||||
}
|
||||
|
||||
if ($theme_name
|
||||
&& (file_exists('view/theme/' . $theme_name . '/style.css')
|
||||
|| file_exists('view/theme/' . $theme_name . '/style.php'))
|
||||
) {
|
||||
return($theme_name);
|
||||
}
|
||||
|
||||
foreach ($app_base_themes as $t) {
|
||||
if (file_exists('view/theme/' . $t . '/style.css')
|
||||
|| file_exists('view/theme/' . $t . '/style.php')
|
||||
) {
|
||||
return($t);
|
||||
}
|
||||
}
|
||||
|
||||
$fallback = array_merge(glob('view/theme/*/style.css'), glob('view/theme/*/style.php'));
|
||||
if (count($fallback)) {
|
||||
return (str_replace('view/theme/', '', substr($fallback[0], 0, -10)));
|
||||
}
|
||||
|
||||
/// @TODO No final return statement?
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Return full URL to theme which is currently in effect.
|
||||
*
|
||||
* Provide a sane default if nothing is chosen or the specified theme does not exist.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
function current_theme_url()
|
||||
{
|
||||
$a = get_app();
|
||||
|
||||
$t = current_theme();
|
||||
|
||||
$opts = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : '');
|
||||
if (file_exists('view/theme/' . $t . '/style.php')) {
|
||||
return('view/theme/' . $t . '/style.pcss' . $opts);
|
||||
}
|
||||
|
||||
return('view/theme/' . $t . '/style.css');
|
||||
}
|
||||
|
||||
function feed_birthday($uid, $tz)
|
||||
{
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -513,7 +513,7 @@ function load_view_file($s) {
|
|||
return $content;
|
||||
}
|
||||
|
||||
$theme = current_theme();
|
||||
$theme = $a->getCurrentTheme();
|
||||
|
||||
if (file_exists("$d/theme/$theme/$b")) {
|
||||
$stamp1 = microtime(true);
|
||||
|
|
|
|||
12
index.php
12
index.php
|
|
@ -330,7 +330,7 @@ if (strlen($a->module)) {
|
|||
/**
|
||||
* Load current theme info
|
||||
*/
|
||||
$theme_info_file = "view/theme/".current_theme()."/theme.php";
|
||||
$theme_info_file = 'view/theme/' . $a->getCurrentTheme() . '/theme.php';
|
||||
if (file_exists($theme_info_file)) {
|
||||
require_once $theme_info_file;
|
||||
}
|
||||
|
|
@ -363,8 +363,8 @@ if ($a->module_loaded) {
|
|||
$func($a);
|
||||
}
|
||||
|
||||
if (function_exists(str_replace('-', '_', current_theme()) . '_init')) {
|
||||
$func = str_replace('-', '_', current_theme()) . '_init';
|
||||
if (function_exists(str_replace('-', '_', $a->getCurrentTheme()) . '_init')) {
|
||||
$func = str_replace('-', '_', $a->getCurrentTheme()) . '_init';
|
||||
$func($a);
|
||||
}
|
||||
|
||||
|
|
@ -402,8 +402,8 @@ if ($a->module_loaded) {
|
|||
$a->page['content'] .= $arr['content'];
|
||||
}
|
||||
|
||||
if (function_exists(str_replace('-', '_', current_theme()) . '_content_loaded')) {
|
||||
$func = str_replace('-', '_', current_theme()) . '_content_loaded';
|
||||
if (function_exists(str_replace('-', '_', $a->getCurrentTheme()) . '_content_loaded')) {
|
||||
$func = str_replace('-', '_', $a->getCurrentTheme()) . '_content_loaded';
|
||||
$func($a);
|
||||
}
|
||||
}
|
||||
|
|
@ -478,7 +478,7 @@ if ($a->is_mobile || $a->is_tablet) {
|
|||
*/
|
||||
|
||||
if (!$a->theme['stylesheet']) {
|
||||
$stylesheet = current_theme_url();
|
||||
$stylesheet = $a->getCurrentThemeStylesheetPath();
|
||||
} else {
|
||||
$stylesheet = $a->theme['stylesheet'];
|
||||
}
|
||||
|
|
|
|||
81
src/App.php
81
src/App.php
|
|
@ -1067,4 +1067,85 @@ class App
|
|||
|
||||
return $sender_email;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the current theme name.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getCurrentTheme()
|
||||
{
|
||||
if (!$this->current_theme) {
|
||||
$this->computeCurrentTheme();
|
||||
}
|
||||
|
||||
return $this->current_theme;
|
||||
}
|
||||
|
||||
/**
|
||||
* Computes the current theme name based on the node settings, the user settings and the device type
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
private function computeCurrentTheme()
|
||||
{
|
||||
$system_theme = Config::get('system', 'theme');
|
||||
if (!$system_theme) {
|
||||
throw new Exception(L10n::t('No system theme config value set.'));
|
||||
}
|
||||
|
||||
// Sane default
|
||||
$this->current_theme = $system_theme;
|
||||
|
||||
$allowed_themes = explode(',', Config::get('system', 'allowed_themes', $system_theme));
|
||||
|
||||
$page_theme = null;
|
||||
// Find the theme that belongs to the user whose stuff we are looking at
|
||||
if ($this->profile_uid && ($this->profile_uid != local_user())) {
|
||||
// Allow folks to override user themes and always use their own on their own site.
|
||||
// This works only if the user is on the same server
|
||||
$user = dba::selectFirst('user', ['theme'], ['uid' => $this->profile_uid]);
|
||||
if (DBM::is_result($user) && !PConfig::get(local_user(), 'system', 'always_my_theme')) {
|
||||
$page_theme = $user['theme'];
|
||||
}
|
||||
}
|
||||
|
||||
$user_theme = defaults($_SESSION, 'theme', $system_theme);
|
||||
// Specific mobile theme override
|
||||
if (($this->is_mobile || $this->is_tablet) && defaults($_SESSION, 'show-mobile', true)) {
|
||||
$system_mobile_theme = Config::get('system', 'mobile-theme');
|
||||
$user_mobile_theme = defaults($_SESSION, 'mobile-theme', $system_mobile_theme);
|
||||
|
||||
// --- means same mobile theme as desktop
|
||||
if (!empty($user_mobile_theme) && $user_mobile_theme !== '---') {
|
||||
$user_theme = $user_mobile_theme;
|
||||
}
|
||||
}
|
||||
|
||||
if ($page_theme) {
|
||||
$theme_name = $page_theme;
|
||||
} else {
|
||||
$theme_name = $user_theme;
|
||||
}
|
||||
|
||||
if ($theme_name
|
||||
&& in_array($theme_name, $allowed_themes)
|
||||
&& (file_exists('view/theme/' . $theme_name . '/style.css')
|
||||
|| file_exists('view/theme/' . $theme_name . '/style.php'))
|
||||
) {
|
||||
$this->current_theme = $theme_name;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Return full URL to theme which is currently in effect.
|
||||
*
|
||||
* Provide a sane default if nothing is chosen or the specified theme does not exist.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getCurrentThemeStylesheetPath()
|
||||
{
|
||||
return Core\Theme::getStylesheetPath($this->getCurrentTheme());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -228,14 +228,15 @@ class Addon
|
|||
/**
|
||||
* @brief Calls a single hook.
|
||||
*
|
||||
* @param \Friendica\App $a
|
||||
* @param string $name of the hook to call
|
||||
* @param array $hook Hook data
|
||||
* @param string|array &$data to transmit to the callback handler
|
||||
*/
|
||||
public static function callSingleHook($a, $name, $hook, &$data = null)
|
||||
public static function callSingleHook(\Friendica\App $a, $name, $hook, &$data = null)
|
||||
{
|
||||
// Don't run a theme's hook if the user isn't using the theme
|
||||
if (strpos($hook[0], 'view/theme/') !== false && strpos($hook[0], 'view/theme/'.current_theme()) === false) {
|
||||
if (strpos($hook[0], 'view/theme/') !== false && strpos($hook[0], 'view/theme/' . $a->getCurrentTheme()) === false) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file src/Core/Theme.php
|
||||
*/
|
||||
|
||||
namespace Friendica\Core;
|
||||
|
||||
use Friendica\Core\System;
|
||||
|
|
@ -28,60 +30,53 @@ class Theme
|
|||
* @param string $theme the name of the theme
|
||||
* @return array
|
||||
*/
|
||||
|
||||
public static function getInfo($theme)
|
||||
{
|
||||
$info=[
|
||||
$info = [
|
||||
'name' => $theme,
|
||||
'description' => "",
|
||||
'author' => [],
|
||||
'maintainer' => [],
|
||||
'version' => "",
|
||||
'credits' => "",
|
||||
'experimental' => false,
|
||||
'unsupported' => false
|
||||
'experimental' => file_exists("view/theme/$theme/experimental"),
|
||||
'unsupported' => file_exists("view/theme/$theme/unsupported")
|
||||
];
|
||||
|
||||
if (file_exists("view/theme/$theme/experimental"))
|
||||
$info['experimental'] = true;
|
||||
if (file_exists("view/theme/$theme/unsupported"))
|
||||
$info['unsupported'] = true;
|
||||
|
||||
if (!is_file("view/theme/$theme/theme.php")) return $info;
|
||||
if (!is_file("view/theme/$theme/theme.php")) {
|
||||
return $info;
|
||||
}
|
||||
|
||||
$a = get_app();
|
||||
$stamp1 = microtime(true);
|
||||
$f = file_get_contents("view/theme/$theme/theme.php");
|
||||
$theme_file = file_get_contents("view/theme/$theme/theme.php");
|
||||
$a->save_timestamp($stamp1, "file");
|
||||
|
||||
$r = preg_match("|/\*.*\*/|msU", $f, $m);
|
||||
$result = preg_match("|/\*.*\*/|msU", $theme_file, $matches);
|
||||
|
||||
if ($r) {
|
||||
$ll = explode("\n", $m[0]);
|
||||
foreach ( $ll as $l ) {
|
||||
$l = trim($l,"\t\n\r */");
|
||||
if ($l != "") {
|
||||
list($k, $v) = array_map("trim", explode(":", $l, 2));
|
||||
$k= strtolower($k);
|
||||
if ($k == "author") {
|
||||
|
||||
$r=preg_match("|([^<]+)<([^>]+)>|", $v, $m);
|
||||
if ($r) {
|
||||
$info['author'][] = ['name'=>$m[1], 'link'=>$m[2]];
|
||||
if ($result) {
|
||||
$comment_lines = explode("\n", $matches[0]);
|
||||
foreach ($comment_lines as $comment_line) {
|
||||
$comment_line = trim($comment_line, "\t\n\r */");
|
||||
if ($comment_line != "") {
|
||||
list($key, $value) = array_map("trim", explode(":", $comment_line, 2));
|
||||
$key = strtolower($key);
|
||||
if ($key == "author") {
|
||||
$result = preg_match("|([^<]+)<([^>]+)>|", $value, $matches);
|
||||
if ($result) {
|
||||
$info['author'][] = ['name' => $matches[1], 'link' => $matches[2]];
|
||||
} else {
|
||||
$info['author'][] = ['name'=>$v];
|
||||
$info['author'][] = ['name' => $value];
|
||||
}
|
||||
} elseif ($k == "maintainer") {
|
||||
$r=preg_match("|([^<]+)<([^>]+)>|", $v, $m);
|
||||
if ($r) {
|
||||
$info['maintainer'][] = ['name'=>$m[1], 'link'=>$m[2]];
|
||||
} elseif ($key == "maintainer") {
|
||||
$result = preg_match("|([^<]+)<([^>]+)>|", $value, $matches);
|
||||
if ($result) {
|
||||
$info['maintainer'][] = ['name' => $matches[1], 'link' => $matches[2]];
|
||||
} else {
|
||||
$info['maintainer'][] = ['name'=>$v];
|
||||
}
|
||||
} else {
|
||||
if (array_key_exists($k, $info)) {
|
||||
$info[$k] = $v;
|
||||
$info['maintainer'][] = ['name' => $value];
|
||||
}
|
||||
} elseif (array_key_exists($key, $info)) {
|
||||
$info[$key] = $value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -99,7 +94,7 @@ class Theme
|
|||
*/
|
||||
public static function getScreenshot($theme)
|
||||
{
|
||||
$exts = ['.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);
|
||||
|
|
@ -113,7 +108,7 @@ class Theme
|
|||
{
|
||||
logger("Addons: uninstalling theme " . $theme);
|
||||
|
||||
include_once("view/theme/$theme/theme.php");
|
||||
include_once "view/theme/$theme/theme.php";
|
||||
if (function_exists("{$theme}_uninstall")) {
|
||||
$func = "{$theme}_uninstall";
|
||||
$func();
|
||||
|
|
@ -124,13 +119,13 @@ class Theme
|
|||
{
|
||||
// silently fail if theme was removed
|
||||
|
||||
if (! file_exists("view/theme/$theme/theme.php")) {
|
||||
if (!file_exists("view/theme/$theme/theme.php")) {
|
||||
return false;
|
||||
}
|
||||
|
||||
logger("Addons: installing theme $theme");
|
||||
|
||||
include_once("view/theme/$theme/theme.php");
|
||||
include_once "view/theme/$theme/theme.php";
|
||||
|
||||
if (function_exists("{$theme}_install")) {
|
||||
$func = "{$theme}_install";
|
||||
|
|
@ -140,7 +135,6 @@ class Theme
|
|||
logger("Addons: FAILED installing theme $theme");
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -159,18 +153,18 @@ class Theme
|
|||
$file = basename($file);
|
||||
|
||||
// Make sure $root ends with a slash / if it's not blank
|
||||
if ($root !== '' && $root[strlen($root)-1] !== '/') {
|
||||
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)) {
|
||||
if (is_array($theme_info) && array_key_exists('extends', $theme_info)) {
|
||||
$parent = $theme_info['extends'];
|
||||
} else {
|
||||
$parent = 'NOPATH';
|
||||
}
|
||||
$theme = current_theme();
|
||||
$theme = get_app()->getCurrentTheme();
|
||||
$thname = $theme;
|
||||
$ext = substr($file,strrpos($file,'.')+1);
|
||||
$ext = substr($file, strrpos($file, '.') + 1);
|
||||
$paths = [
|
||||
"{$root}view/theme/$thname/$ext/$file",
|
||||
"{$root}view/theme/$parent/$ext/$file",
|
||||
|
|
@ -178,7 +172,7 @@ class Theme
|
|||
];
|
||||
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) {
|
||||
if (strpos($p, 'NOPATH') !== false) {
|
||||
continue;
|
||||
} elseif (file_exists($p)) {
|
||||
return $p;
|
||||
|
|
@ -186,4 +180,25 @@ class Theme
|
|||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Return relative path to theme stylesheet file
|
||||
*
|
||||
* Provide a sane default if nothing is chosen or the specified theme does not exist.
|
||||
*
|
||||
* @param string $theme Theme name
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public static function getStylesheetPath($theme)
|
||||
{
|
||||
$a = get_app();
|
||||
|
||||
$opts = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : '');
|
||||
if (file_exists('view/theme/' . $theme . '/style.php')) {
|
||||
return 'view/theme/' . $theme . '/style.pcss' . $opts;
|
||||
}
|
||||
|
||||
return 'view/theme/' . $theme . '/style.css';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ class Profile
|
|||
|
||||
$a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one
|
||||
|
||||
$theme_info_file = 'view/theme/' . current_theme() . '/theme.php';
|
||||
$theme_info_file = 'view/theme/' . $a->getCurrentTheme() . '/theme.php';
|
||||
if (file_exists($theme_info_file)) {
|
||||
require_once $theme_info_file;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ class FriendicaSmarty extends Smarty
|
|||
parent::__construct();
|
||||
|
||||
$a = get_app();
|
||||
$theme = current_theme();
|
||||
$theme = $a->getCurrentTheme();
|
||||
|
||||
// setTemplateDir can be set to an array, which Smarty will parse in order.
|
||||
// The order is thus very important here
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ class FriendicaSmartyEngine implements ITemplateEngine
|
|||
$root = $root . '/';
|
||||
}
|
||||
|
||||
$theme = current_theme();
|
||||
$theme = $a->getCurrentTheme();
|
||||
$filename = $template::SMARTY3_TEMPLATE_FOLDER . '/' . $file;
|
||||
|
||||
if (file_exists("{$root}view/theme/$theme/$filename")) {
|
||||
|
|
|
|||
|
|
@ -14,24 +14,23 @@ use Friendica\App;
|
|||
*
|
||||
* @todo Check if this is really needed.
|
||||
*/
|
||||
function load_page(App $a) {
|
||||
if(isset($_GET["mode"]) && ($_GET["mode"] == "minimal")) {
|
||||
require "view/theme/frio/minimal.php";
|
||||
} elseif((isset($_GET["mode"]) && ($_GET["mode"] == "none"))) {
|
||||
require "view/theme/frio/none.php";
|
||||
function load_page(App $a)
|
||||
{
|
||||
if (isset($_GET['mode']) && ($_GET['mode'] == 'minimal')) {
|
||||
require 'view/theme/frio/minimal.php';
|
||||
} elseif ((isset($_GET['mode']) && ($_GET['mode'] == 'none'))) {
|
||||
require 'view/theme/frio/none.php';
|
||||
} else {
|
||||
$template = 'view/theme/' . current_theme() . '/'
|
||||
. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';
|
||||
if(file_exists($template))
|
||||
require_once($template);
|
||||
else
|
||||
require_once(str_replace('theme/' . current_theme() . '/', '', $template));
|
||||
$template = 'view/theme/' . $a->getCurrentTheme() . '/'
|
||||
. ((x($a->page, 'template')) ? $a->page['template'] : 'default' ) . '.php';
|
||||
if (file_exists($template)) {
|
||||
require_once $template;
|
||||
} else {
|
||||
require_once str_replace('theme/' . $a->getCurrentTheme() . '/', '', $template);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @brief Check if page is a modal page
|
||||
*
|
||||
|
|
|
|||
|
|
@ -19,9 +19,11 @@
|
|||
*/
|
||||
use Friendica\Core\PConfig;
|
||||
|
||||
require_once 'boot.php';
|
||||
|
||||
function get_scheme_info($scheme)
|
||||
{
|
||||
$theme = current_theme();
|
||||
$theme = get_app()->getCurrentTheme();
|
||||
$themepath = 'view/theme/' . $theme . '/';
|
||||
$scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'scheme'));
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue