Add Install Mode

- merge `friendica/develop` to `nupplaphil/install_mode`

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)
 {
 	/**

include/conversation.php

@@ -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
  */
 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 `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
+	);
 }
 
 /**

include/text.php

@@ -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);
@@ -1249,7 +1249,7 @@ function prepare_body(array &$item, $attach = false, $is_preview = false)
 
 	// Compile eventual content 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))) {
 			$filter_reasons[] = L10n::t('Content warning: %s', $item['content-warning']);
 		}

index.php

@@ -322,7 +322,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;
 }
@@ -355,8 +355,8 @@ if ($a->module_loaded) {
 		$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);
 	}
 
@@ -394,8 +394,8 @@ if ($a->module_loaded) {
 		$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);
 	}
 }
@@ -470,7 +470,7 @@ if ($a->is_mobile || $a->is_tablet) {
  */
 
 if (!$a->theme['stylesheet']) {
-	$stylesheet = current_theme_url();
+	$stylesheet = $a->getCurrentThemeStylesheetPath();
 } else {
 	$stylesheet = $a->theme['stylesheet'];
 }

mod/network.php

@@ -836,14 +836,10 @@ function networkThreadedView(App $a, $update, $parent)
 			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`
 			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 > ?
-				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,
-			CONTACT_IS_SHARING, CONTACT_IS_FRIEND,
 			$top_limit, $bottom_limit);
 
 		$data = dba::inArray($items);
@@ -860,7 +856,12 @@ function networkThreadedView(App $a, $update, $parent)
 				$s[$item['uri']] = $item;
 			}
 			foreach ($data as $item) {
-				$s[$item['uri']] = $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;
+				}
 			}
 			$r = $s;
 		}

src/App.php

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

src/Core/Addon.php

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

src/Core/Theme.php

@@ -1,7 +1,9 @@
 <?php
+
 /**
  * @file src/Core/Theme.php
  */
+
 namespace Friendica\Core;
 
 use Friendica\Core\System;
@@ -13,177 +15,190 @@ require_once 'boot.php';
  */
 class Theme
 {
-    /**
+	/**
-     * @brief Parse theme comment in search of theme infos.
+	 * @brief Parse theme comment in search of theme infos.
-     *
+	 *
-     * like
+	 * like
-     * \code
+	 * \code
-     * ..* Name: My Theme
+	 * ..* Name: My Theme
-     *   * Description: My Cool Theme
+	 *   * Description: My Cool Theme
-     * . * Version: 1.2.3
+	 * . * Version: 1.2.3
-     *   * Author: John <profile url>
+	 *   * Author: John <profile url>
-     *   * Maintainer: Jane <profile url>
+	 *   * Maintainer: Jane <profile url>
-     *   *
+	 *   *
-     * \endcode
+	 * \endcode
-     * @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)
+	{
+		$info = [
+			'name' => $theme,
+			'description' => "",
+			'author' => [],
+			'maintainer' => [],
+			'version' => "",
+			'credits' => "",
+			'experimental' => file_exists("view/theme/$theme/experimental"),
+			'unsupported' => file_exists("view/theme/$theme/unsupported")
+		];
 
-    public static function getInfo($theme)
+		if (!is_file("view/theme/$theme/theme.php")) {
-    {
+			return $info;
-        $info=[
+		}
-            'name' => $theme,
-            'description' => "",
-            'author' => [],
-            'maintainer' => [],
-            'version' => "",
-            'credits' => "",
-            'experimental' => false,
-            'unsupported' => false
-        ];
 
-        if (file_exists("view/theme/$theme/experimental"))
+		$a = get_app();
-            $info['experimental'] = true;
+		$stamp1 = microtime(true);
-        if (file_exists("view/theme/$theme/unsupported"))
+		$theme_file = file_get_contents("view/theme/$theme/theme.php");
-            $info['unsupported'] = true;
+		$a->save_timestamp($stamp1, "file");
 
-        if (!is_file("view/theme/$theme/theme.php")) return $info;
+		$result = preg_match("|/\*.*\*/|msU", $theme_file, $matches);
 
-        $a = get_app();
+		if ($result) {
-        $stamp1 = microtime(true);
+			$comment_lines = explode("\n", $matches[0]);
-        $f = file_get_contents("view/theme/$theme/theme.php");
+			foreach ($comment_lines as $comment_line) {
-        $a->save_timestamp($stamp1, "file");
+				$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' => $value];
+						}
+					} elseif ($key == "maintainer") {
+						$result = preg_match("|([^<]+)<([^>]+)>|", $value, $matches);
+						if ($result) {
+							$info['maintainer'][] = ['name' => $matches[1], 'link' => $matches[2]];
+						} else {
+							$info['maintainer'][] = ['name' => $value];
+						}
+					} elseif (array_key_exists($key, $info)) {
+						$info[$key] = $value;
+					}
+				}
+			}
+		}
+		return $info;
+	}
 
-        $r = preg_match("|/\*.*\*/|msU", $f, $m);
+	/**
+	 * @brief Returns the theme's screenshot.
+	 *
+	 * The screenshot is expected as view/theme/$theme/screenshot.[png|jpg].
+	 *
+	 * @param sring $theme The name of the theme
+	 * @return string
+	 */
+	public static function getScreenshot($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(System::baseUrl() . '/images/blank.png');
+	}
 
-        if ($r) {
+	// install and uninstall theme
-            $ll = explode("\n", $m[0]);
+	public static function uninstall($theme)
-            foreach ( $ll as $l ) {
+	{
-                $l = trim($l,"\t\n\r */");
+		logger("Addons: uninstalling theme " . $theme);
-                if ($l != "") {
-                    list($k, $v) = array_map("trim", explode(":", $l, 2));
-                    $k= strtolower($k);
-                    if ($k == "author") {
 
-                        $r=preg_match("|([^<]+)<([^>]+)>|", $v, $m);
+		include_once "view/theme/$theme/theme.php";
-                        if ($r) {
+		if (function_exists("{$theme}_uninstall")) {
-                            $info['author'][] = ['name'=>$m[1], 'link'=>$m[2]];
+			$func = "{$theme}_uninstall";
-                        } else {
+			$func();
-                            $info['author'][] = ['name'=>$v];
+		}
-                        }
+	}
-                    } elseif ($k == "maintainer") {
-                        $r=preg_match("|([^<]+)<([^>]+)>|", $v, $m);
-                        if ($r) {
-                            $info['maintainer'][] = ['name'=>$m[1], 'link'=>$m[2]];
-                        } else {
-                            $info['maintainer'][] = ['name'=>$v];
-                        }
-                    } else {
-                        if (array_key_exists($k, $info)) {
-                            $info[$k] = $v;
-                        }
-                    }
-                }
-            }
-        }
-        return $info;
-    }
 
-    /**
+	public static function install($theme)
-     * @brief Returns the theme's screenshot.
+	{
-     *
+		// silently fail if theme was removed
-     * The screenshot is expected as view/theme/$theme/screenshot.[png|jpg].
-     *
-     * @param sring $theme The name of the theme
-     * @return string
-     */
-    public static function getScreenshot($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(System::baseUrl() . '/images/blank.png');
-    }
 
-    // install and uninstall theme
+		if (!file_exists("view/theme/$theme/theme.php")) {
-    public static function uninstall($theme)
+			return false;
-    {
+		}
-        logger("Addons: uninstalling theme " . $theme);
 
-        include_once("view/theme/$theme/theme.php");
+		logger("Addons: installing theme $theme");
-        if (function_exists("{$theme}_uninstall")) {
-            $func = "{$theme}_uninstall";
-            $func();
-        }
-    }
 
-    public static function install($theme)
+		include_once "view/theme/$theme/theme.php";
-    {
-        // silently fail if theme was removed
 
-        if (! file_exists("view/theme/$theme/theme.php")) {
+		if (function_exists("{$theme}_install")) {
-            return false;
+			$func = "{$theme}_install";
-        }
+			$func();
+			return true;
+		} else {
+			logger("Addons: FAILED installing theme $theme");
+			return false;
+		}
+	}
 
-        logger("Addons: installing theme $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.
+	 *
+	 * @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
+	 */
+	public static function getPathForFile($file, $root = '')
+	{
+		$file = basename($file);
 
-        include_once("view/theme/$theme/theme.php");
+		// 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();
+		$thname = $theme;
+		$ext = substr($file, strrpos($file, '.') + 1);
+		$paths = [
+			"{$root}view/theme/$thname/$ext/$file",
+			"{$root}view/theme/$parent/$ext/$file",
+			"{$root}view/$ext/$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;
+			}
+		}
+		return '';
+	}
 
-        if (function_exists("{$theme}_install")) {
+	/**
-            $func = "{$theme}_install";
+	 * @brief Return relative path to theme stylesheet file
-            $func();
+	 *
-            return true;
+	 * Provide a sane default if nothing is chosen or the specified theme does not exist.
-        } else {
+	 *
-            logger("Addons: FAILED installing theme $theme");
+	 * @param string $theme Theme name
-            return false;
+	 *
-        }
+	 * @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';
-     * @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.
-     *
-     * @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
-     */
-    public static function getPathForFile($file, $root = '')
-    {
-        $file = basename($file);
-
-        // 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 = current_theme();
-        $thname = $theme;
-        $ext = substr($file,strrpos($file,'.')+1);
-        $paths = [
-            "{$root}view/theme/$thname/$ext/$file",
-            "{$root}view/theme/$parent/$ext/$file",
-            "{$root}view/$ext/$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;
-            }
-        }
-        return '';
-    }
 }

src/Model/Item.php

@@ -872,7 +872,7 @@ class Item extends BaseObject
 
 		$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];
 		$contacts = dba::select('contact', ['uid'], $condition);
 		while ($contact = dba::fetch($contacts)) {

src/Model/Profile.php

@@ -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;
 		}

src/Protocol/DFRN.php

@@ -2799,10 +2799,6 @@ class DFRN
 				return true;
 			}
 		} else { // $entrytype == DFRN_TOP_LEVEL
-			if ($importer["readonly"]) {
-				logger('ignoring read-only contact '.$importer["id"]);
-				return;
-			}
 			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);
 				return;

src/Protocol/Diaspora.php

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

src/Render/FriendicaSmarty.php

@@ -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

src/Render/FriendicaSmartyEngine.php

@@ -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")) {

src/Worker/OnePoll.php

@@ -309,7 +309,7 @@ class OnePoll
 
 			// 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
 				dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
 				return;
@@ -590,7 +590,7 @@ class OnePoll
 			}
 
 			$hubmode = 'subscribe';
-			if ($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly']) {
+			if ($contact['network'] === NETWORK_DFRN || $contact['blocked']) {
 				$hubmode = 'unsubscribe';
 			}
 

view/theme/frio/php/frio_boot.php

@@ -14,24 +14,23 @@ use Friendica\App;
  *
  * @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 {
-		$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
  *

view/theme/frio/php/scheme.php

@@ -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'));