bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #6428 from MrPetovan/bug/5148-get-cookies-from-safari-2

Browse source 
Add variable query parameter to stylesheet URL for iOS Safari
This commit is contained in:
Michael Vogel 2019-01-12 09:33:35 +01:00 committed by GitHub
parent cd3ab5ddc9 a9b8eb4d56
commit 2fbf1d54e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 33 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/App.php
View file

@ -101,6 +101,11 @@ class App
*/
private $isAjax;
/**
* @var MobileDetect
*/
public $mobileDetect;
/**
* Register a stylesheet file path to be included in the <head> tag of every page.
* Inclusion is done in App->initHead().
@ -268,6 +273,9 @@ class App
// Detect mobile devices
$mobile_detect = new MobileDetect();
$this->mobileDetect = $mobile_detect;
$this->is_mobile = $mobile_detect->isMobile();
$this->is_tablet = $mobile_detect->isTablet();

20
src/Core/Theme.php
View file

@ -6,8 +6,10 @@
namespace Friendica\Core;
use Friendica\BaseObject;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Model\Profile;
/**
* Some functions to handle themes
@ -191,13 +193,19 @@ class Theme
*/
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;
if (!file_exists('view/theme/' . $theme . '/style.php')) {
return 'view/theme/' . $theme . '/style.css';
}
return 'view/theme/' . $theme . '/style.css';
$a = BaseObject::getApp();
$query_params = [];
$puid = Profile::getThemeUid($a);
if ($puid) {
$query_params['puid'] = $puid;
}
return 'view/theme/' . $theme . '/style.pcss' . (!empty($query_params) ? '?' . http_build_query($query_params) : '');
}
}

13
src/Model/Profile.php
View file

@ -1176,7 +1176,7 @@ class Profile
* Get the user ID of the page owner.
*
* Used from within PCSS themes to set theme parameters. If there's a
* puid request variable, that is the "page owner" and normally their theme
* profile_uid variable set in App, that is the "page owner" and normally their theme
* settings take precedence; unless a local user sets the "always_my_theme"
* system pconfig, which means they don't want to see anybody else's theme
* settings except their own while on this site.
@ -1184,13 +1184,12 @@ class Profile
* @brief Get the user ID of the page owner
* @return int user ID
*
* @note Returns local_user instead of user ID if "always_my_theme"
* is set to true
* @note Returns local_user instead of user ID if "always_my_theme" is set to true
*/
public static function getThemeUid()
public static function getThemeUid(App $a)
{
$uid = (!empty($_REQUEST['puid']) ? intval($_REQUEST['puid']) : 0);
if ((local_user()) && ((PConfig::get(local_user(), 'system', 'always_my_theme')) || (!$uid))) {
$uid = !empty($a->profile_uid) ? intval($a->profile_uid) : 0;
if (local_user() && (PConfig::get(local_user(), 'system', 'always_my_theme') || !$uid)) {
return local_user();
}
@ -1198,7 +1197,7 @@ class Profile
}
/**
* Stip zrl parameter from a string.
* Strip zrl parameter from a string.
*
* @param string $s The input string.
* @return string The zrl.

2
view/theme/duepuntozero/style.php
View file

@ -10,7 +10,7 @@ if (file_exists("$THEMEPATH/style.css")) {
echo file_get_contents("$THEMEPATH/style.css");
}
$uid = Profile::getThemeUid();
$uid = defaults($_REQUEST, 'puid', 0);
$s_colorset = Config::get('duepuntozero', 'colorset');
$colorset = PConfig::get($uid, 'duepuntozero', 'colorset');

5
view/theme/frio/php/default.php
View file

@ -42,10 +42,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
// Add the theme color meta
// It makes mobile Chrome UI match Frio's top bar color.
$uid = $a->profile_uid;
if (is_null($uid)) {
$uid = Profile::getThemeUid();
}
$uid = Profile::getThemeUid($a);
$scheme = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema'));
if ($scheme && ($scheme != '---')) {
if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {

2
view/theme/frio/style.php
View file

@ -14,7 +14,7 @@ $scheme_modified = 0;
if ($a->module !== 'install') {
// Get the UID of the profile owner.
$uid = Profile::getThemeUid();
$uid = defaults($_REQUEST, 'puid', 0);
if ($uid) {
PConfig::load($uid, 'frio');

2
view/theme/quattro/style.php
View file

@ -6,7 +6,7 @@ use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Model\Profile;
$uid = Profile::getThemeUid();
$uid = defaults($_REQUEST, 'puid', 0);
$color = false;
$quattro_align = false;

2
view/theme/vier/style.php
View file

@ -7,7 +7,7 @@ use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Model\Profile;
$uid = Profile::getThemeUid();
$uid = defaults($_REQUEST, 'puid', 0);
$style = PConfig::get($uid, 'vier', 'style');