X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=c7305c8c1dd40e0abcba0ac36df862040fb41449;hb=6a376c29d85cb3e3b5ccf99bc604da472a7191c7;hp=8b2d50512b80b695f3b770db337e5e395e7e5791;hpb=753c41bb401d49aecea95fe3327e8a4f4bc6182f;p=friendica.git

diff --git a/src/App.php b/src/App.php
index 8b2d50512b..c7305c8c1d 100644
--- a/src/App.php
+++ b/src/App.php
@@ -4,20 +4,22 @@
  */
 namespace Friendica;
 
-use Detection\MobileDetect;
-use DOMDocument;
-use DOMXPath;
 use Exception;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
 use Friendica\Core\Config\Cache\ConfigCache;
 use Friendica\Core\Config\Configuration;
-use Friendica\Core\Hook;
+use Friendica\Core\Config\PConfiguration;
+use Friendica\Core\L10n\L10n;
+use Friendica\Core\System;
 use Friendica\Core\Theme;
 use Friendica\Database\Database;
-use Friendica\Database\DBA;
 use Friendica\Model\Profile;
+use Friendica\Module\Login;
+use Friendica\Module\Special\HTTPException as ModuleHTTPException;
 use Friendica\Network\HTTPException;
-use Friendica\Util\BaseURL;
-use Friendica\Util\Config\ConfigFileLoader;
+use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
@@ -38,9 +40,12 @@ use Psr\Log\LoggerInterface;
  */
 class App
 {
-	public $module_class = null;
-	public $query_string = '';
-	public $page = [];
+	/** @deprecated 2019.09 - use App\Arguments->getQueryString() */
+	public $query_string;
+	/**
+	 * @var Page The current page environment
+	 */
+	public $page;
 	public $profile;
 	public $profile_uid;
 	public $user;
@@ -50,64 +55,48 @@ class App
 	public $page_contact;
 	public $content;
 	public $data = [];
+	/** @deprecated 2019.09 - use App\Arguments->getCommand() */
 	public $cmd = '';
+	/** @deprecated 2019.09 - use App\Arguments->getArgv() or Arguments->get() */
 	public $argv;
+	/** @deprecated 2019.09 - use App\Arguments->getArgc() */
 	public $argc;
+	/** @deprecated 2019.09 - Use App\Module->getName() instead */
 	public $module;
 	public $timezone;
 	public $interactive = true;
 	public $identities;
-	public $is_mobile = false;
-	public $is_tablet = false;
+	/** @deprecated 2019.09 - Use App\Mode->isMobile() instead */
+	public $is_mobile;
+	/** @deprecated 2019.09 - Use App\Mode->isTable() instead */
+	public $is_tablet;
 	public $theme_info = [];
 	public $category;
 	// Allow themes to control internal parameters
 	// by changing App values in theme.php
 
-	public $sourcename = '';
-	public $videowidth = 425;
-	public $videoheight = 350;
-	public $force_max_items = 0;
+	public $sourcename              = '';
+	public $videowidth              = 425;
+	public $videoheight             = 350;
+	public $force_max_items         = 0;
 	public $theme_events_in_profile = true;
-
-	public $stylesheets = [];
-	public $footerScripts = [];
+	public $queue;
 
 	/**
 	 * @var App\Mode The Mode of the Application
 	 */
 	private $mode;
 
-	/**
-	 * @var App\Router
-	 */
-	private $router;
-
 	/**
 	 * @var BaseURL
 	 */
 	private $baseURL;
 
-	/**
-	 * @var bool true, if the call is from an backend node (f.e. worker)
-	 */
-	private $isBackend;
-
 	/**
 	 * @var string The name of the current theme
 	 */
 	private $currentTheme;
 
-	/**
-	 * @var bool check if request was an AJAX (xmlhttprequest) request
-	 */
-	private $isAjax;
-
-	/**
-	 * @var MobileDetect
-	 */
-	public $mobileDetect;
-
 	/**
 	 * @var Configuration The config
 	 */
@@ -128,6 +117,21 @@ class App
 	 */
 	private $database;
 
+	/**
+	 * @var L10n The translator
+	 */
+	private $l10n;
+
+	/**
+	 * @var App\Arguments
+	 */
+	private $args;
+
+	/**
+	 * @var Core\Process The process methods
+	 */
+	private $process;
+
 	/**
 	 * Returns the current config cache of this node
 	 *
@@ -190,89 +194,74 @@ class App
 	}
 
 	/**
-	 * Returns the router of the Application
+	 * Returns the Database of the Application
 	 *
-	 * @return App\Router
-	 */
-	public function getRouter()
-	{
-		return $this->router;
-	}
-
-	/**
 	 * @return Database
 	 */
-	public function getDatabase()
+	public function getDBA()
 	{
 		return $this->database;
 	}
 
 	/**
-	 * Register a stylesheet file path to be included in the <head> tag of every page.
-	 * Inclusion is done in App->initHead().
-	 * The path can be absolute or relative to the Friendica installation base folder.
-	 *
-	 * @see initHead()
-	 *
-	 * @param string $path
+	 * @deprecated 2019.09 - use Page->registerStylesheet instead
+	 * @see        Page::registerStylesheet()
 	 */
 	public function registerStylesheet($path)
 	{
-		if (mb_strpos($path, $this->getBasePath() . DIRECTORY_SEPARATOR) === 0) {
-			$path = mb_substr($path, mb_strlen($this->getBasePath() . DIRECTORY_SEPARATOR));
-		}
-
-		$this->stylesheets[] = trim($path, '/');
+		$this->page->registerStylesheet($path);
 	}
 
 	/**
-	 * Register a javascript file path to be included in the <footer> tag of every page.
-	 * Inclusion is done in App->initFooter().
-	 * The path can be absolute or relative to the Friendica installation base folder.
-	 *
-	 * @see initFooter()
-	 *
-	 * @param string $path
+	 * @deprecated 2019.09 - use Page->registerFooterScript instead
+	 * @see        Page::registerFooterScript()
 	 */
 	public function registerFooterScript($path)
 	{
-		$url = str_replace($this->getBasePath() . DIRECTORY_SEPARATOR, '', $path);
-
-		$this->footerScripts[] = trim($url, '/');
+		$this->page->registerFooterScript($path);
 	}
 
-	public $queue;
-
 	/**
-	 * @brief App constructor.
-	 *
-	 * @param Database $database The Friendica Database
-	 * @param Configuration    $config    The Configuration
-	 * @param App\Mode         $mode      The mode of this Friendica app
-	 * @param App\Router       $router    The router of this Friendica app
-	 * @param BaseURL          $baseURL   The full base URL of this Friendica app
-	 * @param LoggerInterface  $logger    The current app logger
-	 * @param Profiler         $profiler  The profiler of this application
-	 * @param bool             $isBackend Whether it is used for backend or frontend (Default true=backend)
-	 *
-	 * @throws Exception if the Basepath is not usable
+	 * @param Database        $database The Friendica Database
+	 * @param Configuration   $config   The Configuration
+	 * @param App\Mode        $mode     The mode of this Friendica app
+	 * @param BaseURL         $baseURL  The full base URL of this Friendica app
+	 * @param LoggerInterface $logger   The current app logger
+	 * @param Profiler        $profiler The profiler of this application
+	 * @param L10n            $l10n     The translator instance
+	 * @param App\Arguments   $args     The Friendica Arguments of the call
+	 * @param Core\Process    $process  The process methods
 	 */
-	public function __construct(Database $database, Configuration $config, App\Mode $mode, App\Router $router, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
+	public function __construct(Database $database, Configuration $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, App\Module $module, App\Page $page, Core\Process $process)
 	{
-		BaseObject::setApp($this);
-
 		$this->database = $database;
 		$this->config   = $config;
 		$this->mode     = $mode;
-		$this->router   = $router;
 		$this->baseURL  = $baseURL;
 		$this->profiler = $profiler;
 		$this->logger   = $logger;
+		$this->l10n     = $l10n;
+		$this->args     = $args;
+		$this->process  = $process;
 
-		$this->profiler->reset();
+		$this->cmd          = $args->getCommand();
+		$this->argv         = $args->getArgv();
+		$this->argc         = $args->getArgc();
+		$this->query_string = $args->getQueryString();
+		$this->module       = $module->getName();
+		$this->page         = $page;
 
-		$this->reload();
+		$this->is_mobile = $mode->isMobile();
+		$this->is_tablet = $mode->isTablet();
+
+		$this->load();
+	}
 
+	/**
+	 * Load the whole app instance
+	 */
+	public function load()
+	{
 		set_time_limit(0);
 
 		// This has to be quite large to deal with embedded private photos
@@ -284,97 +273,19 @@ class App
 			. $this->getBasePath() . DIRECTORY_SEPARATOR . 'library' . PATH_SEPARATOR
 			. $this->getBasePath());
 
-		if (!empty($_SERVER['QUERY_STRING']) && strpos($_SERVER['QUERY_STRING'], 'pagename=') === 0) {
-			$this->query_string = substr($_SERVER['QUERY_STRING'], 9);
-		} elseif (!empty($_SERVER['QUERY_STRING']) && strpos($_SERVER['QUERY_STRING'], 'q=') === 0) {
-			$this->query_string = substr($_SERVER['QUERY_STRING'], 2);
-		}
-
-		// removing trailing / - maybe a nginx problem
-		$this->query_string = ltrim($this->query_string, '/');
-
-		if (!empty($_GET['pagename'])) {
-			$this->cmd = trim($_GET['pagename'], '/\\');
-		} elseif (!empty($_GET['q'])) {
-			$this->cmd = trim($_GET['q'], '/\\');
-		}
-
-		// fix query_string
-		$this->query_string = str_replace($this->cmd . '&', $this->cmd . '?', $this->query_string);
-
-		// unix style "homedir"
-		if (substr($this->cmd, 0, 1) === '~') {
-			$this->cmd = 'profile/' . substr($this->cmd, 1);
-		}
-
-		// Diaspora style profile url
-		if (substr($this->cmd, 0, 2) === 'u/') {
-			$this->cmd = 'profile/' . substr($this->cmd, 2);
-		}
-
-		/*
-		 * Break the URL path into C style argc/argv style arguments for our
-		 * modules. Given "http://example.com/module/arg1/arg2", $this->argc
-		 * will be 3 (integer) and $this->argv will contain:
-		 *   [0] => 'module'
-		 *   [1] => 'arg1'
-		 *   [2] => 'arg2'
-		 *
-		 *
-		 * There will always be one argument. If provided a naked domain
-		 * URL, $this->argv[0] is set to "home".
-		 */
-
-		$this->argv = explode('/', $this->cmd);
-		$this->argc = count($this->argv);
-		if ((array_key_exists('0', $this->argv)) && strlen($this->argv[0])) {
-			$this->module = str_replace('.', '_', $this->argv[0]);
-			$this->module = str_replace('-', '_', $this->module);
-		} else {
-			$this->argc = 1;
-			$this->argv = ['home'];
-			$this->module = 'home';
-		}
-
-		$this->isBackend = $isBackend || $this->checkBackend($this->module);
-
-		// Detect mobile devices
-		$mobile_detect = new MobileDetect();
-
-		$this->mobileDetect = $mobile_detect;
-
-		$this->is_mobile = $mobile_detect->isMobile();
-		$this->is_tablet = $mobile_detect->isTablet();
-
-		$this->isAjax = strtolower(defaults($_SERVER, 'HTTP_X_REQUESTED_WITH', '')) == 'xmlhttprequest';
-
-		// Register template engines
-		Core\Renderer::registerTemplateEngine('Friendica\Render\FriendicaSmartyEngine');
-	}
-
-	/**
-	 * Reloads the whole app instance
-	 */
-	public function reload()
-	{
-		$this->getMode()->determine($this->getBasePath());
-
-		if ($this->getMode()->has(App\Mode::DBAVAILABLE)) {
-			$loader = new ConfigFileLoader($this->getBasePath(), $this->getMode());
-			$this->config->getCache()->load($loader->loadCoreConfig('addon'), true);
+		$this->profiler->reset();
 
-			$this->profiler->update(
-				$this->config->get('system', 'profiler', false),
-				$this->config->get('rendertime', 'callstack', false));
+		if ($this->mode->has(App\Mode::DBAVAILABLE)) {
+			$this->profiler->update($this->config);
 
 			Core\Hook::loadHooks();
-			$loader = new ConfigFileLoader($this->getBasePath(), $this->mode);
+			$loader = new ConfigFileLoader($this->getBasePath());
 			Core\Hook::callAll('load_config', $loader);
 		}
 
 		$this->loadDefaultTimezone();
-
-		Core\L10n::init();
+		// Register template engines
+		Core\Renderer::registerTemplateEngine('Friendica\Render\FriendicaSmartyEngine');
 	}
 
 	/**
@@ -400,6 +311,7 @@ class App
 
 	/**
 	 * Returns the scheme of the current call
+	 *
 	 * @return string
 	 *
 	 * @deprecated 2019.06 - use BaseURL->getScheme() instead
@@ -415,6 +327,8 @@ class App
 	 * @param bool $ssl Whether to append http or https under BaseURL::SSL_POLICY_SELFSIGN
 	 *
 	 * @return string Friendica server base URL
+	 *
+	 * @deprecated 2019.09 - use BaseUrl->get($ssl) instead
 	 */
 	public function getBaseURL($ssl = false)
 	{
@@ -422,7 +336,7 @@ class App
 	}
 
 	/**
-	 * @brief Initializes the baseurl components
+	 * @brief      Initializes the baseurl components
 	 *
 	 * Clears the baseurl cache to prevent inconsistencies
 	 *
@@ -460,139 +374,18 @@ class App
 	}
 
 	/**
-	 * Initializes App->page['htmlhead'].
-	 *
-	 * Includes:
-	 * - Page title
-	 * - Favicons
-	 * - Registered stylesheets (through App->registerStylesheet())
-	 * - Infinite scroll data
-	 * - head.tpl template
-	 */
-	public function initHead()
-	{
-		$interval = ((local_user()) ? Core\PConfig::get(local_user(), 'system', 'update_interval') : 40000);
-
-		// If the update is 'deactivated' set it to the highest integer number (~24 days)
-		if ($interval < 0) {
-			$interval = 2147483647;
-		}
-
-		if ($interval < 10000) {
-			$interval = 40000;
-		}
-
-		// Default title: current module called
-		if (empty($this->page['title']) && $this->module) {
-			$this->page['title'] = ucfirst($this->module);
-		}
-
-		// Prepend the sitename to the page title
-		$this->page['title'] = $this->config->get('config', 'sitename', '') . (!empty($this->page['title']) ? ' | ' . $this->page['title'] : '');
-
-		if (!empty(Core\Renderer::$theme['stylesheet'])) {
-			$stylesheet = Core\Renderer::$theme['stylesheet'];
-		} else {
-			$stylesheet = $this->getCurrentThemeStylesheetPath();
-		}
-
-		$this->registerStylesheet($stylesheet);
-
-		$shortcut_icon = $this->config->get('system', 'shortcut_icon');
-		if ($shortcut_icon == '') {
-			$shortcut_icon = 'images/friendica-32.png';
-		}
-
-		$touch_icon = $this->config->get('system', 'touch_icon');
-		if ($touch_icon == '') {
-			$touch_icon = 'images/friendica-128.png';
-		}
-
-		Core\Hook::callAll('head', $this->page['htmlhead']);
-
-		$tpl = Core\Renderer::getMarkupTemplate('head.tpl');
-		/* put the head template at the beginning of page['htmlhead']
-		 * since the code added by the modules frequently depends on it
-		 * being first
-		 */
-		$this->page['htmlhead'] = Core\Renderer::replaceMacros($tpl, [
-			'$local_user'      => local_user(),
-			'$generator'       => 'Friendica' . ' ' . FRIENDICA_VERSION,
-			'$delitem'         => Core\L10n::t('Delete this item?'),
-			'$update_interval' => $interval,
-			'$shortcut_icon'   => $shortcut_icon,
-			'$touch_icon'      => $touch_icon,
-			'$block_public'    => intval($this->config->get('system', 'block_public')),
-			'$stylesheets'     => $this->stylesheets,
-		]) . $this->page['htmlhead'];
-	}
-
-	/**
-	 * Initializes App->page['footer'].
-	 *
-	 * Includes:
-	 * - Javascript homebase
-	 * - Mobile toggle link
-	 * - Registered footer scripts (through App->registerFooterScript())
-	 * - footer.tpl template
-	 */
-	public function initFooter()
-	{
-		// If you're just visiting, let javascript take you home
-		if (!empty($_SESSION['visitor_home'])) {
-			$homebase = $_SESSION['visitor_home'];
-		} elseif (local_user()) {
-			$homebase = 'profile/' . $this->user['nickname'];
-		}
-
-		if (isset($homebase)) {
-			$this->page['footer'] .= '<script>var homebase="' . $homebase . '";</script>' . "\n";
-		}
-
-		/*
-		 * Add a "toggle mobile" link if we're using a mobile device
-		 */
-		if ($this->is_mobile || $this->is_tablet) {
-			if (isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
-				$link = 'toggle_mobile?address=' . urlencode(curPageURL());
-			} else {
-				$link = 'toggle_mobile?off=1&address=' . urlencode(curPageURL());
-			}
-			$this->page['footer'] .= Core\Renderer::replaceMacros(Core\Renderer::getMarkupTemplate("toggle_mobile_footer.tpl"), [
-				'$toggle_link' => $link,
-				'$toggle_text' => Core\L10n::t('toggle mobile')
-			]);
-		}
-
-		Core\Hook::callAll('footer', $this->page['footer']);
-
-		$tpl = Core\Renderer::getMarkupTemplate('footer.tpl');
-		$this->page['footer'] = Core\Renderer::replaceMacros($tpl, [
-			'$footerScripts' => $this->footerScripts,
-		]) . $this->page['footer'];
-	}
-
-	/**
-	 * @brief Removes the base url from an url. This avoids some mixed content problems.
+	 * @brief      Removes the base url from an url. This avoids some mixed content problems.
 	 *
 	 * @param string $origURL
 	 *
 	 * @return string The cleaned url
-	 * @throws HTTPException\InternalServerErrorException
+	 *
+	 * @deprecated 2019.09 - Use BaseURL->remove() instead
+	 * @see        BaseURL::remove()
 	 */
 	public function removeBaseURL($origURL)
 	{
-		// Remove the hostname from the url if it is an internal link
-		$nurl = Util\Strings::normaliseLink($origURL);
-		$base = Util\Strings::normaliseLink($this->getBaseURL());
-		$url = str_replace($base . '/', '', $nurl);
-
-		// if it is an external link return the orignal value
-		if ($url == Util\Strings::normaliseLink($origURL)) {
-			return $origURL;
-		} else {
-			return $url;
-		}
+		return $this->baseURL->remove($origURL);
 	}
 
 	/**
@@ -612,214 +405,27 @@ class App
 	}
 
 	/**
-	 * @brief Checks if the site is called via a backend process
-	 *
-	 * This isn't a perfect solution. But we need this check very early.
-	 * So we cannot wait until the modules are loaded.
-	 *
-	 * @param string $module
-	 * @return bool
-	 */
-	private function checkBackend($module) {
-		static $backends = [
-			'_well_known',
-			'api',
-			'dfrn_notify',
-			'feed',
-			'fetch',
-			'followers',
-			'following',
-			'hcard',
-			'hostxrd',
-			'inbox',
-			'manifest',
-			'nodeinfo',
-			'noscrape',
-			'objects',
-			'outbox',
-			'poco',
-			'post',
-			'proxy',
-			'pubsub',
-			'pubsubhubbub',
-			'receive',
-			'rsd_xml',
-			'salmon',
-			'statistics_json',
-			'xrd',
-		];
-
-		// Check if current module is in backend or backend flag is set
-		return in_array($module, $backends);
-	}
-
-	/**
-	 * Returns true, if the call is from a backend node (f.e. from a worker)
-	 *
-	 * @return bool Is it a known backend?
-	 */
-	public function isBackend()
-	{
-		return $this->isBackend;
-	}
-
-	/**
-	 * @brief Checks if the maximum number of database processes is reached
-	 *
-	 * @return bool Is the limit reached?
+	 * @deprecated 2019.09 - use Core\Process->isMaxProcessesReached() instead
 	 */
 	public function isMaxProcessesReached()
 	{
-		// Deactivated, needs more investigating if this check really makes sense
-		return false;
-
-		/*
-		 * Commented out to suppress static analyzer issues
-		 *
-		if ($this->is_backend()) {
-			$process = 'backend';
-			$max_processes = $this->config->get('system', 'max_processes_backend');
-			if (intval($max_processes) == 0) {
-				$max_processes = 5;
-			}
-		} else {
-			$process = 'frontend';
-			$max_processes = $this->config->get('system', 'max_processes_frontend');
-			if (intval($max_processes) == 0) {
-				$max_processes = 20;
-			}
-		}
-
-		$processlist = DBA::processlist();
-		if ($processlist['list'] != '') {
-			Core\Logger::log('Processcheck: Processes: ' . $processlist['amount'] . ' - Processlist: ' . $processlist['list'], Core\Logger::DEBUG);
-
-			if ($processlist['amount'] > $max_processes) {
-				Core\Logger::log('Processcheck: Maximum number of processes for ' . $process . ' tasks (' . $max_processes . ') reached.', Core\Logger::DEBUG);
-				return true;
-			}
-		}
-		return false;
-		 */
+		return $this->process->isMaxProcessesReached();
 	}
 
 	/**
-	 * @brief Checks if the minimal memory is reached
-	 *
-	 * @return bool Is the memory limit reached?
-	 * @throws HTTPException\InternalServerErrorException
+	 * @deprecated 2019.09 - use Core\Process->isMinMemoryReached() instead
 	 */
 	public function isMinMemoryReached()
 	{
-		$min_memory = $this->config->get('system', 'min_memory', 0);
-		if ($min_memory == 0) {
-			return false;
-		}
-
-		if (!is_readable('/proc/meminfo')) {
-			return false;
-		}
-
-		$memdata = explode("\n", file_get_contents('/proc/meminfo'));
-
-		$meminfo = [];
-		foreach ($memdata as $line) {
-			$data = explode(':', $line);
-			if (count($data) != 2) {
-				continue;
-			}
-			list($key, $val) = $data;
-			$meminfo[$key] = (int) trim(str_replace('kB', '', $val));
-			$meminfo[$key] = (int) ($meminfo[$key] / 1024);
-		}
-
-		if (!isset($meminfo['MemFree'])) {
-			return false;
-		}
-
-		$free = $meminfo['MemFree'];
-
-		$reached = ($free < $min_memory);
-
-		if ($reached) {
-			Core\Logger::log('Minimal memory reached: ' . $free . '/' . $meminfo['MemTotal'] . ' - limit ' . $min_memory, Core\Logger::DEBUG);
-		}
-
-		return $reached;
+		return $this->process->isMinMemoryReached();
 	}
 
 	/**
-	 * @brief Checks if the maximum load is reached
-	 *
-	 * @return bool Is the load reached?
-	 * @throws HTTPException\InternalServerErrorException
+	 * @deprecated 2019.09 - use Core\Process->isMaxLoadReached() instead
 	 */
 	public function isMaxLoadReached()
 	{
-		if ($this->isBackend()) {
-			$process = 'backend';
-			$maxsysload = intval($this->config->get('system', 'maxloadavg'));
-			if ($maxsysload < 1) {
-				$maxsysload = 50;
-			}
-		} else {
-			$process = 'frontend';
-			$maxsysload = intval($this->config->get('system', 'maxloadavg_frontend'));
-			if ($maxsysload < 1) {
-				$maxsysload = 50;
-			}
-		}
-
-		$load = Core\System::currentLoad();
-		if ($load) {
-			if (intval($load) > $maxsysload) {
-				Core\Logger::log('system: load ' . $load . ' for ' . $process . ' tasks (' . $maxsysload . ') too high.');
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Executes a child process with 'proc_open'
-	 *
-	 * @param string $command The command to execute
-	 * @param array  $args    Arguments to pass to the command ( [ 'key' => value, 'key2' => value2, ... ]
-	 * @throws HTTPException\InternalServerErrorException
-	 */
-	public function proc_run($command, $args)
-	{
-		if (!function_exists('proc_open')) {
-			return;
-		}
-
-		$cmdline = $this->config->get('config', 'php_path', 'php') . ' ' . escapeshellarg($command);
-
-		foreach ($args as $key => $value) {
-			if (!is_null($value) && is_bool($value) && !$value) {
-				continue;
-			}
-
-			$cmdline .= ' --' . $key;
-			if (!is_null($value) && !is_bool($value)) {
-				$cmdline .= ' ' . $value;
-			}
-		}
-
-		if ($this->isMinMemoryReached()) {
-			return;
-		}
-
-		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-			$resource = proc_open('cmd /c start /b ' . $cmdline, [], $foo, $this->getBasePath());
-		} else {
-			$resource = proc_open($cmdline . ' &', [], $foo, $this->getBasePath());
-		}
-		if (!is_resource($resource)) {
-			Core\Logger::log('We got no resource for command ' . $cmdline, Core\Logger::DEBUG);
-			return;
-		}
-		proc_close($resource);
+		return $this->process->isMaxLoadReached();
 	}
 
 	/**
@@ -851,7 +457,7 @@ class App
 	 */
 	public function getCurrentTheme()
 	{
-		if ($this->getMode()->isInstall()) {
+		if ($this->mode->isInstall()) {
 			return '';
 		}
 
@@ -876,7 +482,7 @@ class App
 	{
 		$system_theme = $this->config->get('system', 'theme');
 		if (!$system_theme) {
-			throw new Exception(Core\L10n::t('No system theme config value set.'));
+			throw new Exception($this->l10n->t('No system theme config value set.'));
 		}
 
 		// Sane default
@@ -887,8 +493,8 @@ class App
 		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 (DBA::isResult($user) && !Core\PConfig::get(local_user(), 'system', 'always_my_theme')) {
+			$user = $this->database->selectFirst('user', ['theme'], ['uid' => $this->profile_uid]);
+			if ($this->database->isResult($user) && !Core\PConfig::get(local_user(), 'system', 'always_my_theme')) {
 				$page_theme = $user['theme'];
 			}
 		}
@@ -898,7 +504,7 @@ class App
 		// Specific mobile theme override
 		if (($this->is_mobile || $this->is_tablet) && Core\Session::get('show-mobile', true)) {
 			$system_mobile_theme = $this->config->get('system', 'mobile-theme');
-			$user_mobile_theme = Core\Session::get('mobile-theme', $system_mobile_theme);
+			$user_mobile_theme   = Core\Session::get('mobile-theme', $system_mobile_theme);
 
 			// --- means same mobile theme as desktop
 			if (!empty($user_mobile_theme) && $user_mobile_theme !== '---') {
@@ -914,9 +520,9 @@ class App
 
 		$theme_name = Strings::sanitizeFilePathItem($theme_name);
 		if ($theme_name
-			&& in_array($theme_name, Theme::getAllowedList())
-			&& (file_exists('view/theme/' . $theme_name . '/style.css')
-			|| file_exists('view/theme/' . $theme_name . '/style.php'))
+		    && in_array($theme_name, Theme::getAllowedList())
+		    && (file_exists('view/theme/' . $theme_name . '/style.css')
+		        || file_exists('view/theme/' . $theme_name . '/style.php'))
 		) {
 			$this->currentTheme = $theme_name;
 		}
@@ -936,31 +542,22 @@ class App
 	}
 
 	/**
-	 * Check if request was an AJAX (xmlhttprequest) request.
-	 *
-	 * @return boolean true if it was an AJAX request
+	 * @deprecated 2019.09 - use App\Mode->isAjax() instead
+	 * @see        App\Mode::isAjax()
 	 */
 	public function isAjax()
 	{
-		return $this->isAjax;
+		return $this->mode->isAjax();
 	}
 
 	/**
-	 * Returns the value of a argv key
-	 * TODO there are a lot of $a->argv usages in combination with defaults() which can be replaced with this method
+	 * @deprecated use Arguments->get() instead
 	 *
-	 * @param int $position the position of the argument
-	 * @param mixed $default the default value if not found
-	 *
-	 * @return mixed returns the value of the argument
+	 * @see        App\Arguments
 	 */
 	public function getArgumentValue($position, $default = '')
 	{
-		if (array_key_exists($position, $this->argv)) {
-			return $this->argv[$position];
-		}
-
-		return $default;
+		return $this->args->get($position, $default);
 	}
 
 	/**
@@ -989,382 +586,160 @@ class App
 	 * request and a representation of the response.
 	 *
 	 * This probably should change to limit the size of this monster method.
+	 *
+	 * @param App\Module $module The determined module
 	 */
-	public function runFrontend()
+	public function runFrontend(App\Module $module, App\Router $router, PConfiguration $pconfig)
 	{
-		// Missing DB connection: ERROR
-		if ($this->getMode()->has(App\Mode::LOCALCONFIGPRESENT) && !$this->getMode()->has(App\Mode::DBAVAILABLE)) {
-			Module\Special\HTTPException::rawContent(
-				new HTTPException\InternalServerErrorException('Apologies but the website is unavailable at the moment.')
-			);
-		}
+		$moduleName = $module->getName();
 
-		// Max Load Average reached: ERROR
-		if ($this->isMaxProcessesReached() || $this->isMaxLoadReached()) {
-			header('Retry-After: 120');
-			header('Refresh: 120; url=' . $this->getBaseURL() . "/" . $this->query_string);
+		try {
+			// Missing DB connection: ERROR
+			if ($this->mode->has(App\Mode::LOCALCONFIGPRESENT) && !$this->mode->has(App\Mode::DBAVAILABLE)) {
+				throw new HTTPException\InternalServerErrorException('Apologies but the website is unavailable at the moment.');
+			}
 
-			Module\Special\HTTPException::rawContent(
-				new HTTPException\ServiceUnavailableException('The node is currently overloaded. Please try again later.')
-			);
-		}
+			// Max Load Average reached: ERROR
+			if ($this->process->isMaxProcessesReached() || $this->process->isMaxLoadReached()) {
+				header('Retry-After: 120');
+				header('Refresh: 120; url=' . $this->baseURL->get() . "/" . $this->args->getQueryString());
 
-		if (!$this->getMode()->isInstall()) {
-			// Force SSL redirection
-			if ($this->baseURL->checkRedirectHttps()) {
-				header('HTTP/1.1 302 Moved Temporarily');
-				header('Location: ' . $this->getBaseURL() . '/' . $this->query_string);
-				exit();
+				throw new HTTPException\ServiceUnavailableException('The node is currently overloaded. Please try again later.');
 			}
 
-			Core\Session::init();
-			Core\Hook::callAll('init_1');
-		}
-
-		// Exclude the backend processes from the session management
-		if (!$this->isBackend()) {
-			$stamp1 = microtime(true);
-			session_start();
-			$this->profiler->saveTimestamp($stamp1, 'parser', Core\System::callstack());
-			Core\L10n::setSessionVariable();
-			Core\L10n::setLangFromSession();
-		} else {
-			$_SESSION = [];
-			Core\Worker::executeIfIdle();
-		}
+			if (!$this->mode->isInstall()) {
+				// Force SSL redirection
+				if ($this->baseURL->checkRedirectHttps()) {
+					System::externalRedirect($this->baseURL->get() . '/' . $this->args->getQueryString());
+				}
 
-		if ($this->getMode()->isNormal()) {
-			$requester = HTTPSignature::getSigner('', $_SERVER);
-			if (!empty($requester)) {
-				Profile::addVisitorCookieForHandle($requester);
+				Core\Session::init();
+				Core\Hook::callAll('init_1');
 			}
-		}
 
-		// ZRL
-		if (!empty($_GET['zrl']) && $this->getMode()->isNormal()) {
-			$this->query_string = Model\Profile::stripZrls($this->query_string);
-			if (!local_user()) {
-				// Only continue when the given profile link seems valid
-				// Valid profile links contain a path with "/profile/" and no query parameters
-				if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") &&
-					strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) {
-					if (Core\Session::get('visitor_home') != $_GET["zrl"]) {
-						Core\Session::set('my_url', $_GET['zrl']);
-						Core\Session::set('authenticated', 0);
-					}
+			// Exclude the backend processes from the session management
+			if (!$this->mode->isBackend()) {
+				$stamp1 = microtime(true);
+				session_start();
+				$this->profiler->saveTimestamp($stamp1, 'parser', Core\System::callstack());
+				$this->l10n->setSessionVariable();
+				$this->l10n->setLangFromSession();
+			} else {
+				$_SESSION = [];
+				Core\Worker::executeIfIdle();
+			}
 
-					Model\Profile::zrlInit($this);
-				} else {
-					// Someone came with an invalid parameter, maybe as a DDoS attempt
-					// We simply stop processing here
-					Core\Logger::log("Invalid ZRL parameter " . $_GET['zrl'], Core\Logger::DEBUG);
-					Module\Special\HTTPException::rawContent(
-						new HTTPException\ForbiddenException()
-					);
+			if ($this->mode->isNormal()) {
+				$requester = HTTPSignature::getSigner('', $_SERVER);
+				if (!empty($requester)) {
+					Profile::addVisitorCookieForHandle($requester);
 				}
 			}
-		}
-
-		if (!empty($_GET['owt']) && $this->getMode()->isNormal()) {
-			$token = $_GET['owt'];
-			$this->query_string = Model\Profile::stripQueryParam($this->query_string, 'owt');
-			Model\Profile::openWebAuthInit($token);
-		}
-
-		Module\Login::sessionAuth();
-
-		if (empty($_SESSION['authenticated'])) {
-			header('X-Account-Management-Status: none');
-		}
 
-		$_SESSION['sysmsg']       = Core\Session::get('sysmsg', []);
-		$_SESSION['sysmsg_info']  = Core\Session::get('sysmsg_info', []);
-		$_SESSION['last_updated'] = Core\Session::get('last_updated', []);
-
-		/*
-		 * check_config() is responsible for running update scripts. These automatically
-		 * update the DB schema whenever we push a new one out. It also checks to see if
-		 * any addons have been added or removed and reacts accordingly.
-		 */
-
-		// in install mode, any url loads install module
-		// but we need "view" module for stylesheet
-		if ($this->getMode()->isInstall() && $this->module !== 'install') {
-			$this->internalRedirect('install');
-		} elseif (!$this->getMode()->isInstall() && !$this->getMode()->has(App\Mode::MAINTENANCEDISABLED) && $this->module !== 'maintenance') {
-			$this->internalRedirect('maintenance');
-		} else {
-			$this->checkURL();
-			Core\Update::check($this->getBasePath(), false, $this->getMode());
-			Core\Addon::loadAddons();
-			Core\Hook::loadHooks();
-		}
-
-		$this->page = [
-			'aside' => '',
-			'bottom' => '',
-			'content' => '',
-			'footer' => '',
-			'htmlhead' => '',
-			'nav' => '',
-			'page_title' => '',
-			'right_aside' => '',
-			'template' => '',
-			'title' => ''
-		];
-
-		// Compatibility with the Android Diaspora client
-		if ($this->module == 'stream') {
-			$this->internalRedirect('network?order=post');
-		}
-
-		if ($this->module == 'conversations') {
-			$this->internalRedirect('message');
-		}
-
-		if ($this->module == 'commented') {
-			$this->internalRedirect('network?order=comment');
-		}
-
-		if ($this->module == 'liked') {
-			$this->internalRedirect('network?order=comment');
-		}
-
-		if ($this->module == 'activity') {
-			$this->internalRedirect('network?conv=1');
-		}
-
-		if (($this->module == 'status_messages') && ($this->cmd == 'status_messages/new')) {
-			$this->internalRedirect('bookmarklet');
-		}
-
-		if (($this->module == 'user') && ($this->cmd == 'user/edit')) {
-			$this->internalRedirect('settings');
-		}
-
-		if (($this->module == 'tag_followings') && ($this->cmd == 'tag_followings/manage')) {
-			$this->internalRedirect('search');
-		}
-
-		// Compatibility with the Firefox App
-		if (($this->module == "users") && ($this->cmd == "users/sign_in")) {
-			$this->module = "login";
-		}
-
-		/*
-		 * ROUTING
-		 *
-		 * From the request URL, routing consists of obtaining the name of a BaseModule-extending class of which the
-		 * post() and/or content() static methods can be respectively called to produce a data change or an output.
-		 */
+			// ZRL
+			if (!empty($_GET['zrl']) && $this->mode->isNormal()) {
+				if (!local_user()) {
+					// Only continue when the given profile link seems valid
+					// Valid profile links contain a path with "/profile/" and no query parameters
+					if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") &&
+					    strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) {
+						if (Core\Session::get('visitor_home') != $_GET["zrl"]) {
+							Core\Session::set('my_url', $_GET['zrl']);
+							Core\Session::set('authenticated', 0);
+						}
+
+						Model\Profile::zrlInit($this);
+					} else {
+						// Someone came with an invalid parameter, maybe as a DDoS attempt
+						// We simply stop processing here
+						$this->logger->debug('Invalid ZRL parameter.', ['zrl' => $_GET['zrl']]);
+						throw new HTTPException\ForbiddenException();
+					}
+				}
+			}
 
-		// First we try explicit routes defined in App\Router
-		$this->router->collectRoutes();
+			if (!empty($_GET['owt']) && $this->mode->isNormal()) {
+				$token = $_GET['owt'];
+				Model\Profile::openWebAuthInit($token);
+			}
 
-		$data = $this->router->getRouteCollector();
-		Hook::callAll('route_collection', $data);
+			Login::sessionAuth();
 
-		$this->module_class = $this->router->getModuleClass($this->cmd);
+			if (empty($_SESSION['authenticated'])) {
+				header('X-Account-Management-Status: none');
+			}
 
-		// Then we try addon-provided modules that we wrap in the LegacyModule class
-		if (!$this->module_class && Core\Addon::isEnabled($this->module) && file_exists("addon/{$this->module}/{$this->module}.php")) {
-			//Check if module is an app and if public access to apps is allowed or not
-			$privateapps = $this->config->get('config', 'private_addons', false);
-			if ((!local_user()) && Core\Hook::isAddonApp($this->module) && $privateapps) {
-				info(Core\L10n::t("You must be logged in to use addons. "));
+			$_SESSION['sysmsg']       = Core\Session::get('sysmsg', []);
+			$_SESSION['sysmsg_info']  = Core\Session::get('sysmsg_info', []);
+			$_SESSION['last_updated'] = Core\Session::get('last_updated', []);
+
+			/*
+			 * check_config() is responsible for running update scripts. These automatically
+			 * update the DB schema whenever we push a new one out. It also checks to see if
+			 * any addons have been added or removed and reacts accordingly.
+			 */
+
+			// in install mode, any url loads install module
+			// but we need "view" module for stylesheet
+			if ($this->mode->isInstall() && $moduleName !== 'install') {
+				$this->internalRedirect('install');
+			} elseif (!$this->mode->isInstall() && !$this->mode->has(App\Mode::MAINTENANCEDISABLED) && $moduleName !== 'maintenance') {
+				$this->internalRedirect('maintenance');
 			} else {
-				include_once "addon/{$this->module}/{$this->module}.php";
-				if (function_exists($this->module . '_module')) {
-					LegacyModule::setModuleFile("addon/{$this->module}/{$this->module}.php");
-					$this->module_class = LegacyModule::class;
-				}
+				$this->checkURL();
+				Core\Update::check($this->getBasePath(), false, $this->mode);
+				Core\Addon::loadAddons();
+				Core\Hook::loadHooks();
 			}
-		}
-
-		/* Finally, we look for a 'standard' program module in the 'mod' directory
-		 * We emulate a Module class through the LegacyModule class
-		 */
-		if (!$this->module_class && file_exists("mod/{$this->module}.php")) {
-			LegacyModule::setModuleFile("mod/{$this->module}.php");
-			$this->module_class = LegacyModule::class;
-		}
 
-		/* The URL provided does not resolve to a valid module.
-		 *
-		 * On Dreamhost sites, quite often things go wrong for no apparent reason and they send us to '/internal_error.html'.
-		 * We don't like doing this, but as it occasionally accounts for 10-20% or more of all site traffic -
-		 * we are going to trap this and redirect back to the requested page. As long as you don't have a critical error on your page
-		 * this will often succeed and eventually do the right thing.
-		 *
-		 * Otherwise we are going to emit a 404 not found.
-		 */
-		if (!$this->module_class) {
-			// Stupid browser tried to pre-fetch our Javascript img template. Don't log the event or return anything - just quietly exit.
-			if (!empty($_SERVER['QUERY_STRING']) && preg_match('/{[0-9]}/', $_SERVER['QUERY_STRING']) !== 0) {
-				exit();
+			// Compatibility with the Android Diaspora client
+			if ($moduleName == 'stream') {
+				$this->internalRedirect('network?order=post');
 			}
 
-			if (!empty($_SERVER['QUERY_STRING']) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
-				Core\Logger::log('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']);
-				$this->internalRedirect($_SERVER['REQUEST_URI']);
+			if ($moduleName == 'conversations') {
+				$this->internalRedirect('message');
 			}
 
-			Core\Logger::log('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], Core\Logger::DEBUG);
-
-			$this->module_class = Module\PageNotFound::class;
-		}
-
-		// Initialize module that can set the current theme in the init() method, either directly or via App->profile_uid
-		$this->page['page_title'] = $this->module;
-		try {
-			$placeholder = '';
-
-			Core\Hook::callAll($this->module . '_mod_init', $placeholder);
-
-			call_user_func([$this->module_class, 'init']);
-
-			// "rawContent" is especially meant for technical endpoints.
-			// This endpoint doesn't need any theme initialization or other comparable stuff.
-			call_user_func([$this->module_class, 'rawContent']);
-
-			// Load current theme info after module has been initialized as theme could have been set in module
-			$theme_info_file = 'view/theme/' . $this->getCurrentTheme() . '/theme.php';
-			if (file_exists($theme_info_file)) {
-				require_once $theme_info_file;
+			if ($moduleName == 'commented') {
+				$this->internalRedirect('network?order=comment');
 			}
 
-			if (function_exists(str_replace('-', '_', $this->getCurrentTheme()) . '_init')) {
-				$func = str_replace('-', '_', $this->getCurrentTheme()) . '_init';
-				$func($this);
+			if ($moduleName == 'liked') {
+				$this->internalRedirect('network?order=comment');
 			}
 
-			if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-				Core\Hook::callAll($this->module . '_mod_post', $_POST);
-				call_user_func([$this->module_class, 'post']);
+			if ($moduleName == 'activity') {
+				$this->internalRedirect('network?conv=1');
 			}
 
-			Core\Hook::callAll($this->module . '_mod_afterpost', $placeholder);
-			call_user_func([$this->module_class, 'afterpost']);
-		} catch(HTTPException $e) {
-			Module\Special\HTTPException::rawContent($e);
-		}
-
-		$content = '';
-
-		try {
-			$arr = ['content' => $content];
-			Core\Hook::callAll($this->module . '_mod_content', $arr);
-			$content = $arr['content'];
-			$arr = ['content' => call_user_func([$this->module_class, 'content'])];
-			Core\Hook::callAll($this->module . '_mod_aftercontent', $arr);
-			$content .= $arr['content'];
-		} catch(HTTPException $e) {
-			$content = Module\Special\HTTPException::content($e);
-		}
-
-		// initialise content region
-		if ($this->getMode()->isNormal()) {
-			Core\Hook::callAll('page_content_top', $this->page['content']);
-		}
-
-		$this->page['content'] .= $content;
-
-		/* Create the page head after setting the language
-		 * and getting any auth credentials.
-		 *
-		 * Moved initHead() and initFooter() to after
-		 * all the module functions have executed so that all
-		 * theme choices made by the modules can take effect.
-		 */
-		$this->initHead();
-
-		/* Build the page ending -- this is stuff that goes right before
-		 * the closing </body> tag
-		 */
-		$this->initFooter();
-
-		if (!$this->isAjax()) {
-			Core\Hook::callAll('page_end', $this->page['content']);
-		}
-
-		// Add the navigation (menu) template
-		if ($this->module != 'install' && $this->module != 'maintenance') {
-			$this->page['htmlhead'] .= Core\Renderer::replaceMacros(Core\Renderer::getMarkupTemplate('nav_head.tpl'), []);
-			$this->page['nav']       = Content\Nav::build($this);
-		}
-
-		// Build the page - now that we have all the components
-		if (isset($_GET["mode"]) && (($_GET["mode"] == "raw") || ($_GET["mode"] == "minimal"))) {
-			$doc = new DOMDocument();
-
-			$target = new DOMDocument();
-			$target->loadXML("<root></root>");
-
-			$content = mb_convert_encoding($this->page["content"], 'HTML-ENTITIES', "UTF-8");
-
-			/// @TODO one day, kill those error-surpressing @ stuff, or PHP should ban it
-			@$doc->loadHTML($content);
-
-			$xpath = new DOMXPath($doc);
-
-			$list = $xpath->query("//*[contains(@id,'tread-wrapper-')]");  /* */
-
-			foreach ($list as $item) {
-				$item = $target->importNode($item, true);
-
-				// And then append it to the target
-				$target->documentElement->appendChild($item);
+			if (($moduleName == 'status_messages') && ($this->args->getCommand() == 'status_messages/new')) {
+				$this->internalRedirect('bookmarklet');
 			}
 
-			if ($_GET["mode"] == "raw") {
-				header("Content-type: text/html; charset=utf-8");
-
-				echo substr($target->saveHTML(), 6, -8);
-
-				exit();
+			if (($moduleName == 'user') && ($this->args->getCommand() == 'user/edit')) {
+				$this->internalRedirect('settings');
 			}
-		}
 
-		$page    = $this->page;
-		$profile = $this->profile;
+			if (($moduleName == 'tag_followings') && ($this->args->getCommand() == 'tag_followings/manage')) {
+				$this->internalRedirect('search');
+			}
 
-		header("X-Friendica-Version: " . FRIENDICA_VERSION);
-		header("Content-type: text/html; charset=utf-8");
+			// Initialize module that can set the current theme in the init() method, either directly or via App->profile_uid
+			$this->page['page_title'] = $moduleName;
 
-		if ($this->config->get('system', 'hsts') && ($this->baseURL->getSSLPolicy() == BaseUrl::SSL_POLICY_FULL)) {
-			header("Strict-Transport-Security: max-age=31536000");
-		}
+			// determine the module class and save it to the module instance
+			// @todo there's an implicit dependency due SESSION::start(), so it has to be called here (yet)
+			$module = $module->determineClass($this->args, $router, $this->config);
 
-		// Some security stuff
-		header('X-Content-Type-Options: nosniff');
-		header('X-XSS-Protection: 1; mode=block');
-		header('X-Permitted-Cross-Domain-Policies: none');
-		header('X-Frame-Options: sameorigin');
-
-		// Things like embedded OSM maps don't work, when this is enabled
-		// header("Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src 'self'; style-src 'self' 'unsafe-inline'; font-src 'self'; img-src 'self' https: data:; media-src 'self' https:; child-src 'self' https:; object-src 'none'");
-
-		/* We use $_GET["mode"] for special page templates. So we will check if we have
-		 * to load another page template than the default one.
-		 * The page templates are located in /view/php/ or in the theme directory.
-		 */
-		if (isset($_GET["mode"])) {
-			$template = Core\Theme::getPathForFile($_GET["mode"] . '.php');
-		}
+			// Let the module run it's internal process (init, get, post, ...)
+			$module->run($this->l10n, $this, $this->logger, $this->getCurrentTheme(), $_SERVER, $_POST);
 
-		// If there is no page template use the default page template
-		if (empty($template)) {
-			$template = Core\Theme::getPathForFile("default.php");
+		} catch (HTTPException $e) {
+			ModuleHTTPException::rawContent($e);
 		}
 
-		// Theme templates expect $a as an App instance
-		$a = $this;
-
-		// Used as is in view/php/default.php
-		$lang = Core\L10n::getCurrentLang();
-
-		/// @TODO Looks unsafe (remote-inclusion), is maybe not but Core\Theme::getPathForFile() uses file_exists() but does not escape anything
-		require_once $template;
+		$this->page->run($this, $this->baseURL, $this->mode, $module, $this->l10n, $this->config, $pconfig);
 	}
 
 	/**
@@ -1372,7 +747,7 @@ class App
 	 * If you want to redirect to a external URL, use System::externalRedirectTo()
 	 *
 	 * @param string $toUrl The destination URL (Default is empty, which is the default page of the Friendica node)
-	 * @param bool $ssl if true, base URL will try to get called with https:// (works just for relative paths)
+	 * @param bool   $ssl   if true, base URL will try to get called with https:// (works just for relative paths)
 	 *
 	 * @throws HTTPException\InternalServerErrorException In Case the given URL is not relative to the Friendica node
 	 */
@@ -1382,7 +757,7 @@ class App
 			throw new HTTPException\InternalServerErrorException("'$toUrl is not a relative path, please use System::externalRedirectTo");
 		}
 
-		$redirectTo = $this->getBaseURL($ssl) . '/' . ltrim($toUrl, '/');
+		$redirectTo = $this->baseURL->get($ssl) . '/' . ltrim($toUrl, '/');
 		Core\System::externalRedirect($redirectTo);
 	}
 
@@ -1391,6 +766,7 @@ class App
 	 * Should only be used if it isn't clear if the URL is either internal or external
 	 *
 	 * @param string $toUrl The target URL
+	 *
 	 * @throws HTTPException\InternalServerErrorException
 	 */
 	public function redirect($toUrl)