MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add Install Mode

Browse source 
- merge `friendica/develop` to `nupplaphil/install_mode`
This commit is contained in:
Philipp Holzer 2018-04-29 20:15:12 +02:00
parent da9ac7b879 bd0ba24518
commit b4f5311e7f
18 changed files with 7851 additions and 7830 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
boot.php
View file

@ -1018,114 +1018,6 @@ function get_max_import_size()
return (x($a->config, 'max_import_size') ? $a->config['max_import_size'] : 0); 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) function feed_birthday($uid, $tz)
{ {
/** /**

10
include/conversation.php
View file

@ -470,11 +470,15 @@ These Fields are not added below (yet). They are here to for bug search.
* @brief SQL join for contacts that are needed for displaying items * @brief SQL join for contacts that are needed for displaying items
*/ */
function item_joins() { function item_joins() {
return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND return sprintf("STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
(NOT `contact`.`blocked` OR `contact`.`pending`) AND NOT `contact`.`blocked`
AND ((NOT `contact`.`readonly` AND NOT `contact`.`pending` AND (`contact`.`rel` IN (%s, %s)))
OR `contact`.`self` OR (`item`.`id` != `item`.`parent`))
LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id` LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id`
LEFT JOIN `event` ON `event-id` = `event`.`id`"; LEFT JOIN `event` ON `event-id` = `event`.`id`",
CONTACT_IS_SHARING, CONTACT_IS_FRIEND
);
} }
/** /**

4
include/text.php
View file

@ -513,7 +513,7 @@ function load_view_file($s) {
return $content; return $content;
} }
$theme = current_theme(); $theme = $a->getCurrentTheme();
if (file_exists("$d/theme/$theme/$b")) { if (file_exists("$d/theme/$theme/$b")) {
$stamp1 = microtime(true); $stamp1 = microtime(true);
@ -1249,7 +1249,7 @@ function prepare_body(array &$item, $attach = false, $is_preview = false)
// Compile eventual content filter reasons // Compile eventual content filter reasons
$filter_reasons = []; $filter_reasons = [];
if (!$is_preview && !($item['self'] && local_user() == $item['uid'])) { if (!$is_preview && public_contact() != $item['author-id']) {
if (!empty($item['content-warning']) && (!local_user() || !PConfig::get(local_user(), 'system', 'disable_cw', false))) { if (!empty($item['content-warning']) && (!local_user() || !PConfig::get(local_user(), 'system', 'disable_cw', false))) {
$filter_reasons[] = L10n::t('Content warning: %s', $item['content-warning']); $filter_reasons[] = L10n::t('Content warning: %s', $item['content-warning']);
} }

12
index.php
View file

@ -322,7 +322,7 @@ if (strlen($a->module)) {
/** /**
* Load current theme info * 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)) { if (file_exists($theme_info_file)) {
require_once $theme_info_file; require_once $theme_info_file;
} }
@ -355,8 +355,8 @@ if ($a->module_loaded) {
$func($a); $func($a);
} }
if (function_exists(str_replace('-', '_', current_theme()) . '_init')) { if (function_exists(str_replace('-', '_', $a->getCurrentTheme()) . '_init')) {
$func = str_replace('-', '_', current_theme()) . '_init'; $func = str_replace('-', '_', $a->getCurrentTheme()) . '_init';
$func($a); $func($a);
} }
@ -394,8 +394,8 @@ if ($a->module_loaded) {
$a->page['content'] .= $arr['content']; $a->page['content'] .= $arr['content'];
} }
if (function_exists(str_replace('-', '_', current_theme()) . '_content_loaded')) { if (function_exists(str_replace('-', '_', $a->getCurrentTheme()) . '_content_loaded')) {
$func = str_replace('-', '_', current_theme()) . '_content_loaded'; $func = str_replace('-', '_', $a->getCurrentTheme()) . '_content_loaded';
$func($a); $func($a);
} }
} }
@ -470,7 +470,7 @@ if ($a->is_mobile || $a->is_tablet) {
*/ */
if (!$a->theme['stylesheet']) { if (!$a->theme['stylesheet']) {
$stylesheet = current_theme_url(); $stylesheet = $a->getCurrentThemeStylesheetPath();
} else { } else {
$stylesheet = $a->theme['stylesheet']; $stylesheet = $a->theme['stylesheet'];
} }

13
mod/network.php
View file

@ -836,14 +836,10 @@ function networkThreadedView(App $a, $update, $parent)
STRAIGHT_JOIN (SELECT `oid` FROM `term` WHERE `term` IN STRAIGHT_JOIN (SELECT `oid` FROM `term` WHERE `term` IN
(SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `otype` = ? AND `type` = ? AND `uid` = 0) AS `term` (SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `otype` = ? AND `type` = ? AND `uid` = 0) AS `term`
ON `item`.`id` = `term`.`oid` ON `item`.`id` = `term`.`oid`
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`author-id` STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-id`
AND (`item`.`parent-uri` != `item`.`uri`
OR `contact`.`uid` = `item`.`uid` AND `contact`.`self`
OR `contact`.`rel` IN (?, ?) AND NOT `contact`.`readonly`)
WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ? WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ?
AND NOT `contact`.`hidden` AND NOT `contact`.`blocked`" . $sql_tag_nets, AND NOT `author`.`hidden` AND NOT `author`.`blocked`" . $sql_tag_nets,
local_user(), TERM_OBJ_POST, TERM_HASHTAG, local_user(), TERM_OBJ_POST, TERM_HASHTAG,
CONTACT_IS_SHARING, CONTACT_IS_FRIEND,
$top_limit, $bottom_limit); $top_limit, $bottom_limit);
$data = dba::inArray($items); $data = dba::inArray($items);
@ -860,8 +856,13 @@ function networkThreadedView(App $a, $update, $parent)
$s[$item['uri']] = $item; $s[$item['uri']] = $item;
} }
foreach ($data as $item) { foreach ($data as $item) {
// Don't show hash tag posts from blocked or ignored contacts
$condition = ["`nurl` = ? AND `uid` = ? AND (`blocked` OR `readonly`)",
normalise_link($item['author-link']), local_user()];
if (!dba::exists('contact', $condition)) {
$s[$item['uri']] = $item; $s[$item['uri']] = $item;
} }
}
$r = $s; $r = $s;
} }
} }

81
src/App.php
View file

@ -1095,4 +1095,85 @@ class App
return false; return false;
} }
/**
* 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());
}
} }

5
src/Core/Addon.php
View file

@ -228,14 +228,15 @@ class Addon
/** /**
* @brief Calls a single hook. * @brief Calls a single hook.
* *
* @param \Friendica\App $a
* @param string $name of the hook to call * @param string $name of the hook to call
* @param array $hook Hook data * @param array $hook Hook data
* @param string|array &$data to transmit to the callback handler * @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 // 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; return;
} }

103
src/Core/Theme.php
View file

@ -1,7 +1,9 @@
<?php <?php
/** /**
* @file src/Core/Theme.php * @file src/Core/Theme.php
*/ */
namespace Friendica\Core; namespace Friendica\Core;
use Friendica\Core\System; use Friendica\Core\System;
@ -28,60 +30,53 @@ class Theme
* @param string $theme the name of the theme * @param string $theme the name of the theme
* @return array * @return array
*/ */
public static function getInfo($theme) public static function getInfo($theme)
{ {
$info=[ $info = [
'name' => $theme, 'name' => $theme,
'description' => "", 'description' => "",
'author' => [], 'author' => [],
'maintainer' => [], 'maintainer' => [],
'version' => "", 'version' => "",
'credits' => "", 'credits' => "",
'experimental' => false, 'experimental' => file_exists("view/theme/$theme/experimental"),
'unsupported' => false 'unsupported' => file_exists("view/theme/$theme/unsupported")
]; ];
if (file_exists("view/theme/$theme/experimental")) if (!is_file("view/theme/$theme/theme.php")) {
$info['experimental'] = true; return $info;
if (file_exists("view/theme/$theme/unsupported")) }
$info['unsupported'] = true;
if (!is_file("view/theme/$theme/theme.php")) return $info;
$a = get_app(); $a = get_app();
$stamp1 = microtime(true); $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"); $a->save_timestamp($stamp1, "file");
$r = preg_match("|/\*.*\*/|msU", $f, $m); $result = preg_match("|/\*.*\*/|msU", $theme_file, $matches);
if ($r) { if ($result) {
$ll = explode("\n", $m[0]); $comment_lines = explode("\n", $matches[0]);
foreach ( $ll as $l ) { foreach ($comment_lines as $comment_line) {
$l = trim($l,"\t\n\r */"); $comment_line = trim($comment_line, "\t\n\r */");
if ($l != "") { if ($comment_line != "") {
list($k, $v) = array_map("trim", explode(":", $l, 2)); list($key, $value) = array_map("trim", explode(":", $comment_line, 2));
$k= strtolower($k); $key = strtolower($key);
if ($k == "author") { if ($key == "author") {
$result = preg_match("|([^<]+)<([^>]+)>|", $value, $matches);
$r=preg_match("|([^<]+)<([^>]+)>|", $v, $m); if ($result) {
if ($r) { $info['author'][] = ['name' => $matches[1], 'link' => $matches[2]];
$info['author'][] = ['name'=>$m[1], 'link'=>$m[2]];
} else { } else {
$info['author'][] = ['name'=>$v]; $info['author'][] = ['name' => $value];
} }
} elseif ($k == "maintainer") { } elseif ($key == "maintainer") {
$r=preg_match("|([^<]+)<([^>]+)>|", $v, $m); $result = preg_match("|([^<]+)<([^>]+)>|", $value, $matches);
if ($r) { if ($result) {
$info['maintainer'][] = ['name'=>$m[1], 'link'=>$m[2]]; $info['maintainer'][] = ['name' => $matches[1], 'link' => $matches[2]];
} else { } else {
$info['maintainer'][] = ['name'=>$v]; $info['maintainer'][] = ['name' => $value];
}
} else {
if (array_key_exists($k, $info)) {
$info[$k] = $v;
} }
} elseif (array_key_exists($key, $info)) {
$info[$key] = $value;
} }
} }
} }
@ -99,7 +94,7 @@ class Theme
*/ */
public static function getScreenshot($theme) public static function getScreenshot($theme)
{ {
$exts = ['.png','.jpg']; $exts = ['.png', '.jpg'];
foreach ($exts as $ext) { foreach ($exts as $ext) {
if (file_exists('view/theme/' . $theme . '/screenshot' . $ext)) { if (file_exists('view/theme/' . $theme . '/screenshot' . $ext)) {
return(System::baseUrl() . '/view/theme/' . $theme . '/screenshot' . $ext); return(System::baseUrl() . '/view/theme/' . $theme . '/screenshot' . $ext);
@ -113,7 +108,7 @@ class Theme
{ {
logger("Addons: uninstalling theme " . $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")) { if (function_exists("{$theme}_uninstall")) {
$func = "{$theme}_uninstall"; $func = "{$theme}_uninstall";
$func(); $func();
@ -124,13 +119,13 @@ class Theme
{ {
// silently fail if theme was removed // silently fail if theme was removed
if (! file_exists("view/theme/$theme/theme.php")) { if (!file_exists("view/theme/$theme/theme.php")) {
return false; return false;
} }
logger("Addons: installing theme $theme"); logger("Addons: installing theme $theme");
include_once("view/theme/$theme/theme.php"); include_once "view/theme/$theme/theme.php";
if (function_exists("{$theme}_install")) { if (function_exists("{$theme}_install")) {
$func = "{$theme}_install"; $func = "{$theme}_install";
@ -140,7 +135,6 @@ class Theme
logger("Addons: FAILED installing theme $theme"); logger("Addons: FAILED installing theme $theme");
return false; return false;
} }
} }
/** /**
@ -159,18 +153,18 @@ class Theme
$file = basename($file); $file = basename($file);
// Make sure $root ends with a slash / if it's not blank // 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 . '/'; $root = $root . '/';
} }
$theme_info = get_app()->theme_info; $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']; $parent = $theme_info['extends'];
} else { } else {
$parent = 'NOPATH'; $parent = 'NOPATH';
} }
$theme = current_theme(); $theme = get_app()->getCurrentTheme();
$thname = $theme; $thname = $theme;
$ext = substr($file,strrpos($file,'.')+1); $ext = substr($file, strrpos($file, '.') + 1);
$paths = [ $paths = [
"{$root}view/theme/$thname/$ext/$file", "{$root}view/theme/$thname/$ext/$file",
"{$root}view/theme/$parent/$ext/$file", "{$root}view/theme/$parent/$ext/$file",
@ -178,7 +172,7 @@ class Theme
]; ];
foreach ($paths as $p) { 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) // 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; continue;
} elseif (file_exists($p)) { } elseif (file_exists($p)) {
return $p; return $p;
@ -186,4 +180,25 @@ class Theme
} }
return ''; 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';
}
} }

2
src/Model/Item.php
View file

@ -872,7 +872,7 @@ class Item extends BaseObject
$users = []; $users = [];
$condition = ["`nurl` IN (SELECT `nurl` FROM `contact` WHERE `id` = ?) AND `uid` != 0 AND NOT `blocked` AND NOT `readonly` AND `rel` IN (?, ?)", $condition = ["`nurl` IN (SELECT `nurl` FROM `contact` WHERE `id` = ?) AND `uid` != 0 AND NOT `blocked` AND `rel` IN (?, ?)",
$parent['owner-id'], CONTACT_IS_SHARING, CONTACT_IS_FRIEND]; $parent['owner-id'], CONTACT_IS_SHARING, CONTACT_IS_FRIEND];
$contacts = dba::select('contact', ['uid'], $condition); $contacts = dba::select('contact', ['uid'], $condition);
while ($contact = dba::fetch($contacts)) { while ($contact = dba::fetch($contacts)) {

2
src/Model/Profile.php
View file

@ -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 $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)) { if (file_exists($theme_info_file)) {
require_once $theme_info_file; require_once $theme_info_file;
} }

4
src/Protocol/DFRN.php
View file

@ -2799,10 +2799,6 @@ class DFRN
return true; return true;
} }
} else { // $entrytype == DFRN_TOP_LEVEL } else { // $entrytype == DFRN_TOP_LEVEL
if ($importer["readonly"]) {
logger('ignoring read-only contact '.$importer["id"]);
return;
}
if (($importer["uid"] == 0) && ($importer["importer_uid"] != 0)) { if (($importer["uid"] == 0) && ($importer["importer_uid"] != 0)) {
logger("Contact ".$importer["id"]." isn't known to user ".$importer["importer_uid"].". The post will be ignored.", LOGGER_DEBUG); logger("Contact ".$importer["id"]." isn't known to user ".$importer["importer_uid"].". The post will be ignored.", LOGGER_DEBUG);
return; return;

2
src/Protocol/Diaspora.php
View file

@ -1151,7 +1151,7 @@ class Diaspora
//} //}
// We don't seem to like that person // We don't seem to like that person
if ($contact["blocked"] || $contact["readonly"]) { if ($contact["blocked"]) {
// Maybe blocked, don't accept. // Maybe blocked, don't accept.
return false; return false;
// We are following this person? // We are following this person?

2
src/Render/FriendicaSmarty.php
View file

@ -22,7 +22,7 @@ class FriendicaSmarty extends Smarty
parent::__construct(); parent::__construct();
$a = get_app(); $a = get_app();
$theme = current_theme(); $theme = $a->getCurrentTheme();
// setTemplateDir can be set to an array, which Smarty will parse in order. // setTemplateDir can be set to an array, which Smarty will parse in order.
// The order is thus very important here // The order is thus very important here

2
src/Render/FriendicaSmartyEngine.php
View file

@ -62,7 +62,7 @@ class FriendicaSmartyEngine implements ITemplateEngine
$root = $root . '/'; $root = $root . '/';
} }
$theme = current_theme(); $theme = $a->getCurrentTheme();
$filename = $template::SMARTY3_TEMPLATE_FOLDER . '/' . $file; $filename = $template::SMARTY3_TEMPLATE_FOLDER . '/' . $file;
if (file_exists("{$root}view/theme/$theme/$filename")) { if (file_exists("{$root}view/theme/$theme/$filename")) {

4
src/Worker/OnePoll.php
View file

@ -309,7 +309,7 @@ class OnePoll
// Are we allowed to import from this person? // Are we allowed to import from this person?
if ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly']) { if ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked']) {
// set the last-update so we don't keep polling // set the last-update so we don't keep polling
dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
return; return;
@ -590,7 +590,7 @@ class OnePoll
} }
$hubmode = 'subscribe'; $hubmode = 'subscribe';
if ($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly']) { if ($contact['network'] === NETWORK_DFRN || $contact['blocked']) {
$hubmode = 'unsubscribe'; $hubmode = 'unsubscribe';
} }

15064
util/messages.po
View file

File diff suppressed because it is too large Load diff

27
view/theme/frio/php/frio_boot.php
View file

@ -14,24 +14,23 @@ use Friendica\App;
* *
* @todo Check if this is really needed. * @todo Check if this is really needed.
*/ */
function load_page(App $a) { function load_page(App $a)
if(isset($_GET["mode"]) && ($_GET["mode"] == "minimal")) { {
require "view/theme/frio/minimal.php"; if (isset($_GET['mode']) && ($_GET['mode'] == 'minimal')) {
} elseif((isset($_GET["mode"]) && ($_GET["mode"] == "none"))) { require 'view/theme/frio/minimal.php';
require "view/theme/frio/none.php"; } elseif ((isset($_GET['mode']) && ($_GET['mode'] == 'none'))) {
require 'view/theme/frio/none.php';
} else { } else {
$template = 'view/theme/' . current_theme() . '/' $template = 'view/theme/' . $a->getCurrentTheme() . '/'
. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php'; . ((x($a->page, 'template')) ? $a->page['template'] : 'default' ) . '.php';
if(file_exists($template)) if (file_exists($template)) {
require_once($template); require_once $template;
else } else {
require_once(str_replace('theme/' . current_theme() . '/', '', $template)); require_once str_replace('theme/' . $a->getCurrentTheme() . '/', '', $template);
}
} }
} }
/** /**
* @brief Check if page is a modal page * @brief Check if page is a modal page
* *

4
view/theme/frio/php/scheme.php
View file

@ -19,9 +19,11 @@
*/ */
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
require_once 'boot.php';
function get_scheme_info($scheme) function get_scheme_info($scheme)
{ {
$theme = current_theme(); $theme = get_app()->getCurrentTheme();
$themepath = 'view/theme/' . $theme . '/'; $themepath = 'view/theme/' . $theme . '/';
$scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'scheme')); $scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'scheme'));