X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=9b6f6a5a296eea138749891e8b93c320caeeeee0;hb=779099a491486333424717e0fecc7390fada24a2;hp=749cbe9cc9ded105e4a49361c6c36507307ad4eb;hpb=feb720a3ee7a0b75e7cc2c78d12b848dc0a7894c;p=friendica.git
diff --git a/src/App.php b/src/App.php
index 749cbe9cc9..9b6f6a5a29 100644
--- a/src/App.php
+++ b/src/App.php
@@ -1,24 +1,38 @@
.
+ *
*/
+
namespace Friendica;
-use Detection\MobileDetect;
-use DOMDocument;
-use DOMXPath;
use Exception;
use Friendica\App\Arguments;
use Friendica\App\BaseURL;
-use Friendica\Core\Config\Cache\ConfigCache;
-use Friendica\Core\Config\Configuration;
-use Friendica\Core\Config\PConfiguration;
-use Friendica\Core\L10n\L10n;
+use Friendica\App\Authentication;
+use Friendica\Core\Config\Cache;
+use Friendica\Core\Config\IConfig;
+use Friendica\Core\PConfig\IPConfig;
+use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Core\Theme;
use Friendica\Database\Database;
use Friendica\Model\Profile;
-use Friendica\Module\Login;
use Friendica\Module\Special\HTTPException as ModuleHTTPException;
use Friendica\Network\HTTPException;
use Friendica\Util\ConfigFileLoader;
@@ -28,10 +42,7 @@ use Friendica\Util\Strings;
use Psr\Log\LoggerInterface;
/**
- *
- * class: App
- *
- * @brief Our main application structure for the life of this page.
+ * Our main application structure for the life of this page.
*
* Primarily deals with the URL that got us here
* and tries to make some sense of it, and
@@ -42,9 +53,6 @@ use Psr\Log\LoggerInterface;
*/
class App
{
- /** @deprecated 2019.09 - use App\Arguments->getQueryString() */
- public $query_string;
- public $page;
public $profile;
public $profile_uid;
public $user;
@@ -54,20 +62,14 @@ 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;
- public $is_tablet;
- public $theme_info = [];
+ public $theme_info = [];
public $category;
// Allow themes to control internal parameters
// by changing App values in theme.php
@@ -77,42 +79,25 @@ class App
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 string The name of the current theme
- */
+ /** @var string The name of the current theme */
private $currentTheme;
+ /** @var string The name of the current mobile theme */
+ private $currentMobileTheme;
/**
- * @var bool check if request was an AJAX (xmlhttprequest) request
- */
- private $isAjax;
-
- /**
- * @var MobileDetect
- */
- public $mobileDetect;
-
- /**
- * @var Configuration The config
+ * @var IConfig The config
*/
private $config;
@@ -142,23 +127,23 @@ class App
private $args;
/**
- * Returns the current config cache of this node
- *
- * @return ConfigCache
+ * @var Core\Process The process methods
*/
- public function getConfigCache()
- {
- return $this->config->getCache();
- }
+ private $process;
/**
- * Returns the current config of this node
+ * @var IPConfig
+ */
+ private $pConfig;
+
+ /**
+ * Returns the current config cache of this node
*
- * @return Configuration
+ * @return Cache
*/
- public function getConfig()
+ public function getConfigCache()
{
- return $this->config;
+ return $this->config->getCache();
}
/**
@@ -173,131 +158,32 @@ class App
}
/**
- * The Logger of this app
- *
- * @return LoggerInterface
+ * @param Database $database The Friendica Database
+ * @param IConfig $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
+ * @param IPConfig $pConfig Personal configuration
*/
- public function getLogger()
+ public function __construct(Database $database, IConfig $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, Core\Process $process, IPConfig $pConfig)
{
- return $this->logger;
- }
+ $this->database = $database;
+ $this->config = $config;
+ $this->mode = $mode;
+ $this->baseURL = $baseURL;
+ $this->profiler = $profiler;
+ $this->logger = $logger;
+ $this->l10n = $l10n;
+ $this->args = $args;
+ $this->process = $process;
+ $this->pConfig = $pConfig;
- /**
- * The profiler of this app
- *
- * @return Profiler
- */
- public function getProfiler()
- {
- return $this->profiler;
- }
-
- /**
- * Returns the Mode of the Application
- *
- * @return App\Mode The Application Mode
- */
- public function getMode()
- {
- return $this->mode;
- }
-
- /**
- * Returns the Database of the Application
- *
- * @return Database
- */
- public function getDBA()
- {
- return $this->database;
- }
-
- /**
- * Register a stylesheet file path to be included in the
tag of every page.
- * Inclusion is done in App->initHead().
- * The path can be absolute or relative to the Friendica installation base folder.
- *
- * @param string $path
- *
- * @see initHead()
- *
- */
- 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, '/');
- }
-
- /**
- * Register a javascript file path to be included in the tag of every page.
- * Inclusion is done in App->initFooter().
- * The path can be absolute or relative to the Friendica installation base folder.
- *
- * @param string $path
- *
- * @see initFooter()
- *
- */
- public function registerFooterScript($path)
- {
- $url = str_replace($this->getBasePath() . DIRECTORY_SEPARATOR, '', $path);
-
- $this->footerScripts[] = trim($url, '/');
- }
-
- public $queue;
-
- /**
- * @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 L10n $l10n The translator instance
- * @param App\Arguments $args The Friendica Arguments of the call
- * @param MobileDetect $mobileDetect A mobile detection class
- */
- public function __construct(Database $database, Configuration $config, App\Mode $mode, App\Router $router, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, App\Module $module, MobileDetect $mobileDetect)
- {
- $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->mobileDetect = $mobileDetect;
-
- $this->cmd = $args->getCommand();
$this->argv = $args->getArgv();
$this->argc = $args->getArgc();
- $this->query_string = $args->getQueryString();
- $this->module = $module->getName();
-
- $this->is_mobile = $mobileDetect->isMobile();
- $this->is_tablet = $mobileDetect->isTablet();
-
- $this->isAjax = strtolower(defaults($_SERVER, 'HTTP_X_REQUESTED_WITH', '')) == 'xmlhttprequest';
-
- $this->page = [
- 'aside' => '',
- 'bottom' => '',
- 'content' => '',
- 'footer' => '',
- 'htmlhead' => '',
- 'nav' => '',
- 'page_title' => '',
- 'right_aside' => '',
- 'template' => '',
- 'title' => ''
- ];
$this->load();
}
@@ -354,198 +240,6 @@ class App
}
}
- /**
- * Returns the scheme of the current call
- *
- * @return string
- *
- * @deprecated 2019.06 - use BaseURL->getScheme() instead
- */
- public function getScheme()
- {
- return $this->baseURL->getScheme();
- }
-
- /**
- * Retrieves the Friendica instance base URL
- *
- * @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)
- {
- return $this->baseURL->get($ssl);
- }
-
- /**
- * @brief Initializes the baseurl components
- *
- * Clears the baseurl cache to prevent inconsistencies
- *
- * @param string $url
- *
- * @deprecated 2019.06 - use BaseURL->saveByURL($url) instead
- */
- public function setBaseURL($url)
- {
- $this->baseURL->saveByURL($url);
- }
-
- /**
- * Returns the current hostname
- *
- * @return string
- *
- * @deprecated 2019.06 - use BaseURL->getHostname() instead
- */
- public function getHostName()
- {
- return $this->baseURL->getHostname();
- }
-
- /**
- * Returns the sub-path of the full URL
- *
- * @return string
- *
- * @deprecated 2019.06 - use BaseURL->getUrlPath() instead
- */
- public function getURLPath()
- {
- return $this->baseURL->getUrlPath();
- }
-
- /**
- * Initializes App->page['htmlhead'].
- *
- * Includes:
- * - Page title
- * - Favicons
- * - Registered stylesheets (through App->registerStylesheet())
- * - Infinite scroll data
- * - head.tpl template
- */
- private function initHead(App\Module $module, PConfiguration $pconfig)
- {
- $interval = ((local_user()) ? $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']) && $module->getName()) {
- $this->page['title'] = ucfirst($module->getName());
- }
-
- // 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' => $this->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
- */
- private 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'] .= '' . "\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' => $this->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.
- *
- * @param string $origURL
- *
- * @return string The cleaned url
- *
- * @deprecated 2019.09 - Use BaseURL->remove() instead
- * @see BaseURL::remove()
- */
- public function removeBaseURL($origURL)
- {
- return $this->baseURL->remove($origURL);
- }
-
/**
* Returns the current UserAgent as a String
*
@@ -559,221 +253,55 @@ class App
FRIENDICA_CODENAME . "' " .
FRIENDICA_VERSION . '-' .
DB_UPDATE_VERSION . '; ' .
- $this->getBaseURL();
+ $this->baseURL->get();
}
/**
- * Returns true, if the call is from a backend node (f.e. from a worker)
+ * Returns the current theme name. May be overriden by the mobile theme name.
*
- * @return bool Is it a known backend?
- *
- * @deprecated 2019.09 - use App\Mode->isBackend() instead
- * @see App\Mode::isBackend()
- * Use BaseObject::getClass(App\Mode::class) to get the global instance of Mode
- */
- public function isBackend()
- {
- return $this->mode->isBackend();
- }
-
- /**
- * @brief Checks if the maximum number of database processes is reached
- *
- * @return bool Is the limit reached?
- */
- 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'] != '') {
- $this->logger->debug('Processcheck: Processes: ' . $processlist['amount'] . ' - Processlist: ' . $processlist['list']);
-
- if ($processlist['amount'] > $max_processes) {
- $this->logger->debug('Processcheck: Maximum number of processes for ' . $process . ' tasks (' . $max_processes . ') reached.');
- return true;
- }
- }
- return false;
- */
- }
-
- /**
- * @brief Checks if the minimal memory is reached
- *
- * @return bool Is the memory limit reached?
- * @throws HTTPException\InternalServerErrorException
- */
- 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) {
- $this->logger->debug('Minimal memory reached.', ['free' => $free, 'memtotal' => $meminfo['MemTotal'], 'limit' => $min_memory]);
- }
-
- return $reached;
- }
-
- /**
- * @brief Checks if the maximum load is reached
- *
- * @return bool Is the load reached?
- * @throws HTTPException\InternalServerErrorException
- */
- public function isMaxLoadReached()
- {
- if ($this->mode->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) {
- $this->logger->info('system load for process too high.', ['load' => $load, 'process' => $process, 'maxsysload' => $maxsysload]);
- 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
+ * @return string
+ * @throws Exception
*/
- public function proc_run($command, $args)
+ public function getCurrentTheme()
{
- if (!function_exists('proc_open')) {
- return;
+ if ($this->mode->isInstall()) {
+ 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;
- }
+ // Specific mobile theme override
+ if (($this->mode->isMobile() || $this->mode->isTablet()) && Core\Session::get('show-mobile', true)) {
+ $user_mobile_theme = $this->getCurrentMobileTheme();
- $cmdline .= ' --' . $key;
- if (!is_null($value) && !is_bool($value)) {
- $cmdline .= ' ' . $value;
+ // --- means same mobile theme as desktop
+ if (!empty($user_mobile_theme) && $user_mobile_theme !== '---') {
+ return $user_mobile_theme;
}
}
- if ($this->isMinMemoryReached()) {
- return;
+ if (!$this->currentTheme) {
+ $this->computeCurrentTheme();
}
- 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)) {
- $this->logger->debug('We got no resource for command.', ['cmd' => $cmdline]);
- return;
- }
- proc_close($resource);
+ return $this->currentTheme;
}
/**
- * Generates the site's default sender email address
+ * Returns the current mobile theme name.
*
* @return string
- * @throws HTTPException\InternalServerErrorException
- */
- public function getSenderEmailAddress()
- {
- $sender_email = $this->config->get('config', 'sender_email');
- if (empty($sender_email)) {
- $hostname = $this->baseURL->getHostname();
- if (strpos($hostname, ':')) {
- $hostname = substr($hostname, 0, strpos($hostname, ':'));
- }
-
- $sender_email = 'noreply@' . $hostname;
- }
-
- return $sender_email;
- }
-
- /**
- * Returns the current theme name.
- *
- * @return string the name of the current theme
- * @throws HTTPException\InternalServerErrorException
+ * @throws Exception
*/
- public function getCurrentTheme()
+ public function getCurrentMobileTheme()
{
if ($this->mode->isInstall()) {
return '';
}
- if (!$this->currentTheme) {
- $this->computeCurrentTheme();
+ if (is_null($this->currentMobileTheme)) {
+ $this->computeCurrentMobileTheme();
}
- return $this->currentTheme;
+ return $this->currentMobileTheme;
}
public function setCurrentTheme($theme)
@@ -781,8 +309,13 @@ class App
$this->currentTheme = $theme;
}
+ public function setCurrentMobileTheme($theme)
+ {
+ $this->currentMobileTheme = $theme;
+ }
+
/**
- * Computes the current theme name based on the node settings, the user settings and the device type
+ * Computes the current theme name based on the node settings, the page owner settings and the user settings
*
* @throws Exception
*/
@@ -794,7 +327,7 @@ class App
}
// Sane default
- $this->currentTheme = $system_theme;
+ $this->setCurrentTheme($system_theme);
$page_theme = null;
// Find the theme that belongs to the user whose stuff we are looking at
@@ -802,29 +335,12 @@ class App
// 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 = $this->database->selectFirst('user', ['theme'], ['uid' => $this->profile_uid]);
- if ($this->database->isResult($user) && !Core\PConfig::get(local_user(), 'system', 'always_my_theme')) {
+ if ($this->database->isResult($user) && !$this->pConfig->get(local_user(), 'system', 'always_my_theme')) {
$page_theme = $user['theme'];
}
}
- $user_theme = Core\Session::get('theme', $system_theme);
-
- // 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);
-
- // --- 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;
- }
+ $theme_name = $page_theme ?: Core\Session::get('theme', $system_theme);
$theme_name = Strings::sanitizeFilePathItem($theme_name);
if ($theme_name
@@ -832,41 +348,52 @@ class App
&& (file_exists('view/theme/' . $theme_name . '/style.css')
|| file_exists('view/theme/' . $theme_name . '/style.php'))
) {
- $this->currentTheme = $theme_name;
+ $this->setCurrentTheme($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
- * @throws HTTPException\InternalServerErrorException
+ * Computes the current mobile theme name based on the node settings, the page owner settings and the user settings
*/
- public function getCurrentThemeStylesheetPath()
+ private function computeCurrentMobileTheme()
{
- return Core\Theme::getStylesheetPath($this->getCurrentTheme());
- }
+ $system_mobile_theme = $this->config->get('system', 'mobile-theme', '');
- /**
- * Check if request was an AJAX (xmlhttprequest) request.
- *
- * @return boolean true if it was an AJAX request
- */
- public function isAjax()
- {
- return $this->isAjax;
+ // Sane default
+ $this->setCurrentMobileTheme($system_mobile_theme);
+
+ $page_mobile_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
+ if (!$this->pConfig->get(local_user(), 'system', 'always_my_theme')) {
+ $page_mobile_theme = $this->pConfig->get($this->profile_uid, 'system', 'mobile-theme');
+ }
+ }
+
+ $mobile_theme_name = $page_mobile_theme ?: Core\Session::get('mobile-theme', $system_mobile_theme);
+
+ $mobile_theme_name = Strings::sanitizeFilePathItem($mobile_theme_name);
+ if ($mobile_theme_name == '---'
+ ||
+ in_array($mobile_theme_name, Theme::getAllowedList())
+ && (file_exists('view/theme/' . $mobile_theme_name . '/style.css')
+ || file_exists('view/theme/' . $mobile_theme_name . '/style.php'))
+ ) {
+ $this->setCurrentMobileTheme($mobile_theme_name);
+ }
}
/**
- * @deprecated use Arguments->get() instead
+ * Provide a sane default if nothing is chosen or the specified theme does not exist.
*
- * @see App\Arguments
+ * @return string
+ * @throws Exception
*/
- public function getArgumentValue($position, $default = '')
+ public function getCurrentThemeStylesheetPath()
{
- return $this->args->get($position, $default);
+ return Core\Theme::getStylesheetPath($this->getCurrentTheme());
}
/**
@@ -883,8 +410,8 @@ class App
// and www.example.com vs example.com.
// We will only change the url to an ip address if there is no existing setting
- if (empty($url) || (!Util\Strings::compareLink($url, $this->getBaseURL())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $this->baseURL->getHostname()))) {
- $this->config->set('system', 'url', $this->getBaseURL());
+ if (empty($url) || (!Util\Strings::compareLink($url, $this->baseURL->get())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $this->baseURL->getHostname()))) {
+ $this->config->set('system', 'url', $this->baseURL->get());
}
}
@@ -896,9 +423,16 @@ class App
*
* This probably should change to limit the size of this monster method.
*
- * @param App\Module $module The determined module
+ * @param App\Module $module The determined module
+ * @param App\Router $router
+ * @param IPConfig $pconfig
+ * @param Authentication $auth The Authentication backend of the node
+ * @param App\Page $page The Friendica page printing container
+ *
+ * @throws HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
- public function runFrontend(App\Module $module, App\Router $router, PConfiguration $pconfig)
+ public function runFrontend(App\Module $module, App\Router $router, IPConfig $pconfig, Authentication $auth, App\Page $page)
{
$moduleName = $module->getName();
@@ -909,7 +443,7 @@ class App
}
// Max Load Average reached: ERROR
- if ($this->isMaxProcessesReached() || $this->isMaxLoadReached()) {
+ if ($this->process->isMaxProcessesReached() || $this->process->isMaxLoadReached()) {
header('Retry-After: 120');
header('Refresh: 120; url=' . $this->baseURL->get() . "/" . $this->args->getQueryString());
@@ -922,19 +456,11 @@ class App
System::externalRedirect($this->baseURL->get() . '/' . $this->args->getQueryString());
}
- Core\Session::init();
Core\Hook::callAll('init_1');
}
// 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 = [];
+ if ($this->mode->isBackend()) {
Core\Worker::executeIfIdle();
}
@@ -972,7 +498,7 @@ class App
Model\Profile::openWebAuthInit($token);
}
- Login::sessionAuth();
+ $auth->withSession($this);
if (empty($_SESSION['authenticated'])) {
header('X-Account-Management-Status: none');
@@ -991,9 +517,9 @@ class App
// in install mode, any url loads install module
// but we need "view" module for stylesheet
if ($this->mode->isInstall() && $moduleName !== 'install') {
- $this->internalRedirect('install');
+ $this->baseURL->redirect('install');
} elseif (!$this->mode->isInstall() && !$this->mode->has(App\Mode::MAINTENANCEDISABLED) && $moduleName !== 'maintenance') {
- $this->internalRedirect('maintenance');
+ $this->baseURL->redirect('maintenance');
} else {
$this->checkURL();
Core\Update::check($this->getBasePath(), false, $this->mode);
@@ -1003,188 +529,51 @@ class App
// Compatibility with the Android Diaspora client
if ($moduleName == 'stream') {
- $this->internalRedirect('network?order=post');
+ $this->baseURL->redirect('network?order=post');
}
if ($moduleName == 'conversations') {
- $this->internalRedirect('message');
+ $this->baseURL->redirect('message');
}
if ($moduleName == 'commented') {
- $this->internalRedirect('network?order=comment');
+ $this->baseURL->redirect('network?order=comment');
}
if ($moduleName == 'liked') {
- $this->internalRedirect('network?order=comment');
+ $this->baseURL->redirect('network?order=comment');
}
if ($moduleName == 'activity') {
- $this->internalRedirect('network?conv=1');
+ $this->baseURL->redirect('network?conv=1');
}
if (($moduleName == 'status_messages') && ($this->args->getCommand() == 'status_messages/new')) {
- $this->internalRedirect('bookmarklet');
+ $this->baseURL->redirect('bookmarklet');
}
if (($moduleName == 'user') && ($this->args->getCommand() == 'user/edit')) {
- $this->internalRedirect('settings');
+ $this->baseURL->redirect('settings');
}
if (($moduleName == 'tag_followings') && ($this->args->getCommand() == 'tag_followings/manage')) {
- $this->internalRedirect('search');
+ $this->baseURL->redirect('search');
}
// Initialize module that can set the current theme in the init() method, either directly or via App->profile_uid
- $this->page['page_title'] = $moduleName;
+ $page['page_title'] = $moduleName;
// 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);
// Let the module run it's internal process (init, get, post, ...)
- $module->run($this->l10n, $this, $this->logger, $this->getCurrentTheme(), $_SERVER, $_POST);
-
+ $module->run($this->l10n, $this->baseURL, $this->logger, $_SERVER, $_POST);
} catch (HTTPException $e) {
ModuleHTTPException::rawContent($e);
}
- $content = '';
-
- try {
- $moduleClass = $module->getClassName();
-
- $arr = ['content' => $content];
- Core\Hook::callAll($moduleClass . '_mod_content', $arr);
- $content = $arr['content'];
- $arr = ['content' => call_user_func([$moduleClass, 'content'])];
- Core\Hook::callAll($moduleClass . '_mod_aftercontent', $arr);
- $content .= $arr['content'];
- } catch (HTTPException $e) {
- $content = ModuleHTTPException::content($e);
- }
-
- // initialise content region
- if ($this->mode->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($module, $pconfig);
-
- /* Build the page ending -- this is stuff that goes right before
- * the closing tag
- */
- $this->initFooter();
-
- if (!$this->isAjax()) {
- Core\Hook::callAll('page_end', $this->page['content']);
- }
-
- // Add the navigation (menu) template
- if ($moduleName != 'install' && $moduleName != '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(" ");
-
- $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 ($_GET["mode"] == "raw") {
- header("Content-type: text/html; charset=utf-8");
-
- echo substr($target->saveHTML(), 6, -8);
-
- exit();
- }
- }
-
- $page = $this->page;
- $profile = $this->profile;
-
- header("X-Friendica-Version: " . FRIENDICA_VERSION);
- header("Content-type: text/html; charset=utf-8");
-
- if ($this->config->get('system', 'hsts') && ($this->baseURL->getSSLPolicy() == BaseURL::SSL_POLICY_FULL)) {
- header("Strict-Transport-Security: max-age=31536000");
- }
-
- // 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');
- }
-
- // If there is no page template use the default page template
- if (empty($template)) {
- $template = Core\Theme::getPathForFile("default.php");
- }
-
- // Theme templates expect $a as an App instance
- $a = $this;
-
- // Used as is in view/php/default.php
- $lang = $this->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;
- }
-
- /**
- * Redirects to another module relative to the current Friendica base.
- * 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)
- *
- * @throws HTTPException\InternalServerErrorException In Case the given URL is not relative to the Friendica node
- */
- public function internalRedirect($toUrl = '', $ssl = false)
- {
- if (!empty(parse_url($toUrl, PHP_URL_SCHEME))) {
- throw new HTTPException\InternalServerErrorException("'$toUrl is not a relative path, please use System::externalRedirectTo");
- }
-
- $redirectTo = $this->baseURL->get($ssl) . '/' . ltrim($toUrl, '/');
- Core\System::externalRedirect($redirectTo);
+ $page->run($this, $this->baseURL, $this->mode, $module, $this->l10n, $this->config, $pconfig);
}
/**
@@ -1200,7 +589,7 @@ class App
if (!empty(parse_url($toUrl, PHP_URL_SCHEME))) {
Core\System::externalRedirect($toUrl);
} else {
- $this->internalRedirect($toUrl);
+ $this->baseURL->redirect($toUrl);
}
}
}