X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=772d273c521f7e1555a9e121b009a6cc0106bfaa;hb=d28fbf9d8df26d51429c1c85cb432b3d5ab31a23;hp=4a620313817fa297c4addb0544631d946ccbf36b;hpb=6d7362da4134cce31f28a5efa2c623a11f89afc2;p=friendica.git diff --git a/src/App.php b/src/App.php index 4a62031381..772d273c52 100644 --- a/src/App.php +++ b/src/App.php @@ -1,18 +1,36 @@ . + * */ + namespace Friendica; use Exception; use Friendica\App\Arguments; use Friendica\App\BaseURL; -use Friendica\App\Page; -use Friendica\App\Authentication; -use Friendica\Core\Config\Cache\ConfigCache; -use Friendica\Core\Config\IConfiguration; -use Friendica\Core\Config\IPConfiguration; -use Friendica\Core\L10n\L10n; +use Friendica\App\Module; +use Friendica\Module\Maintenance; +use Friendica\Security\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; @@ -26,10 +44,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 @@ -64,7 +79,6 @@ class App public $sourcename = ''; public $videowidth = 425; public $videoheight = 350; - public $force_max_items = 0; public $theme_events_in_profile = true; public $queue; @@ -84,7 +98,7 @@ class App private $currentMobileTheme; /** - * @var IConfiguration The config + * @var IConfig The config */ private $config; @@ -118,10 +132,15 @@ class App */ private $process; + /** + * @var IPConfig + */ + private $pConfig; + /** * Returns the current config cache of this node * - * @return ConfigCache + * @return Cache */ public function getConfigCache() { @@ -141,7 +160,7 @@ class App /** * @param Database $database The Friendica Database - * @param IConfiguration $config The Configuration + * @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 @@ -149,8 +168,9 @@ class App * @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 __construct(Database $database, IConfiguration $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, Core\Process $process) + 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) { $this->database = $database; $this->config = $config; @@ -161,6 +181,7 @@ class App $this->l10n = $l10n; $this->args = $args; $this->process = $process; + $this->pConfig = $pConfig; $this->argv = $args->getArgv(); $this->argc = $args->getArgc(); @@ -220,43 +241,6 @@ class App } } - /** - * Returns the current UserAgent as a String - * - * @return string the UserAgent as a String - * @throws HTTPException\InternalServerErrorException - */ - public function getUserAgent() - { - return - FRIENDICA_PLATFORM . " '" . - FRIENDICA_CODENAME . "' " . - FRIENDICA_VERSION . '-' . - DB_UPDATE_VERSION . '; ' . - $this->baseURL->get(); - } - - /** - * Generates the site's default sender email address - * - * @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. May be overriden by the mobile theme name. * @@ -336,7 +320,7 @@ 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']; } } @@ -368,8 +352,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 - if (!Core\PConfig::get(local_user(), 'system', 'always_my_theme')) { - $page_mobile_theme = Core\PConfig::get($this->profile_uid, 'system', 'mobile-theme'); + if (!$this->pConfig->get(local_user(), 'system', 'always_my_theme')) { + $page_mobile_theme = $this->pConfig->get($this->profile_uid, 'system', 'mobile-theme'); } } @@ -387,8 +371,6 @@ class App } /** - * @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 @@ -428,14 +410,18 @@ class App * * @param App\Module $module The determined module * @param App\Router $router - * @param IPConfiguration $pconfig + * @param IPConfig $pconfig * @param Authentication $auth The Authentication backend of the node - * @param App\Page $page The Friendica page printing container + * @param App\Page $page The Friendica page printing container + * * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ - public function runFrontend(App\Module $module, App\Router $router, IPConfiguration $pconfig, Authentication $auth, App\Page $page) + public function runFrontend(App\Module $module, App\Router $router, IPConfig $pconfig, Authentication $auth, App\Page $page, float $start_time) { + $this->profiler->set($start_time, 'start'); + $this->profiler->set(microtime(true), 'classinit'); + $moduleName = $module->getName(); try { @@ -461,12 +447,7 @@ class App Core\Hook::callAll('init_1'); } - // Exclude the backend processes from the session management - if ($this->mode->isBackend()) { - Core\Worker::executeIfIdle(); - } - - if ($this->mode->isNormal()) { + if ($this->mode->isNormal() && !$this->mode->isBackend()) { $requester = HTTPSignature::getSigner('', $_SERVER); if (!empty($requester)) { Profile::addVisitorCookieForHandle($requester); @@ -474,7 +455,7 @@ class App } // ZRL - if (!empty($_GET['zrl']) && $this->mode->isNormal()) { + if (!empty($_GET['zrl']) && $this->mode->isNormal() && !$this->mode->isBackend()) { if (!local_user()) { // Only continue when the given profile link seems valid // Valid profile links contain a path with "/profile/" and no query parameters @@ -520,8 +501,6 @@ class App // but we need "view" module for stylesheet if ($this->mode->isInstall() && $moduleName !== 'install') { $this->baseURL->redirect('install'); - } elseif (!$this->mode->isInstall() && !$this->mode->has(App\Mode::MAINTENANCEDISABLED) && $moduleName !== 'maintenance') { - $this->baseURL->redirect('maintenance'); } else { $this->checkURL(); Core\Update::check($this->getBasePath(), false, $this->mode); @@ -565,17 +544,21 @@ class App // Initialize module that can set the current theme in the init() method, either directly or via App->profile_uid $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); + if (!$this->mode->isInstall() && !$this->mode->has(App\Mode::MAINTENANCEDISABLED)) { + $module = new Module('maintenance', Maintenance::class); + } else { + // 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->baseURL, $this->logger, $_SERVER, $_POST); + $module->run($this->l10n, $this->baseURL, $this->logger, $this->profiler, $_SERVER, $_POST); } catch (HTTPException $e) { ModuleHTTPException::rawContent($e); } - $page->run($this, $this->baseURL, $this->mode, $module, $this->l10n, $this->config, $pconfig); + $page->run($this, $this->baseURL, $this->mode, $module, $this->l10n, $this->profiler, $this->config, $pconfig); } /**