X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=bc7890fcf9ce89eef0374a3f79a1e3d9c254e262;hb=89eaf508f19be57a07971c5f40b4bb538e36e891;hp=67625228b40153d1d1e5fe80c0115756d019b1c6;hpb=5437e99090b53c0c8d48c57812211f755fff5800;p=friendica.git diff --git a/src/App.php b/src/App.php index 67625228b4..bc7890fcf9 100644 --- a/src/App.php +++ b/src/App.php @@ -9,11 +9,9 @@ use DOMDocument; use DOMXPath; use Exception; use Friendica\Database\DBA; +use Friendica\Network\HTTPException; use Friendica\Network\HTTPException\InternalServerErrorException; -require_once 'boot.php'; -require_once 'include/text.php'; - /** * * class: App @@ -104,6 +102,11 @@ class App */ private $isAjax; + /** + * @var MobileDetect + */ + public $mobileDetect; + /** * Register a stylesheet file path to be included in the tag of every page. * Inclusion is done in App->initHead(). @@ -214,7 +217,7 @@ class App set_include_path( get_include_path() . PATH_SEPARATOR . $this->getBasePath() . DIRECTORY_SEPARATOR . 'include' . PATH_SEPARATOR - . $this->getBasePath(). DIRECTORY_SEPARATOR . 'library' . PATH_SEPARATOR + . $this->getBasePath() . DIRECTORY_SEPARATOR . 'library' . PATH_SEPARATOR . $this->getBasePath()); if (!empty($_SERVER['QUERY_STRING']) && strpos($_SERVER['QUERY_STRING'], 'pagename=') === 0) { @@ -271,6 +274,9 @@ class App // Detect mobile devices $mobile_detect = new MobileDetect(); + + $this->mobileDetect = $mobile_detect; + $this->is_mobile = $mobile_detect->isMobile(); $this->is_tablet = $mobile_detect->isTablet(); @@ -329,24 +335,24 @@ class App * Load the configuration files * * First loads the default value for all the configuration keys, then the legacy configuration files, then the - * expected local.ini.php + * expected local.config.php */ private function loadConfigFiles() { - $this->loadConfigFile($this->getBasePath() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'config.ini.php'); - $this->loadConfigFile($this->getBasePath() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'settings.ini.php'); + $this->loadConfigFile($this->getBasePath() . '/config/defaults.config.php'); + $this->loadConfigFile($this->getBasePath() . '/config/settings.config.php'); // Legacy .htconfig.php support - if (file_exists($this->getBasePath() . DIRECTORY_SEPARATOR . '.htpreconfig.php')) { + if (file_exists($this->getBasePath() . '/.htpreconfig.php')) { $a = $this; - include $this->getBasePath() . DIRECTORY_SEPARATOR . '.htpreconfig.php'; + include $this->getBasePath() . '/.htpreconfig.php'; } // Legacy .htconfig.php support - if (file_exists($this->getBasePath() . DIRECTORY_SEPARATOR . '.htconfig.php')) { + if (file_exists($this->getBasePath() . '/.htconfig.php')) { $a = $this; - include $this->getBasePath() . DIRECTORY_SEPARATOR . '.htconfig.php'; + include $this->getBasePath() . '/.htconfig.php'; $this->setConfigValue('database', 'hostname', $db_host); $this->setConfigValue('database', 'username', $db_user); @@ -374,33 +380,26 @@ class App } } - if (file_exists($this->getBasePath() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php')) { - $this->loadConfigFile($this->getBasePath() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php', true); + if (file_exists($this->getBasePath() . '/config/local.config.php')) { + $this->loadConfigFile($this->getBasePath() . '/config/local.config.php', true); + } elseif (file_exists($this->getBasePath() . '/config/local.ini.php')) { + $this->loadINIConfigFile($this->getBasePath() . '/config/local.ini.php', true); } } /** - * Tries to load the specified configuration file into the App->config array. + * Tries to load the specified legacy configuration file into the App->config array. * Doesn't overwrite previously set values by default to prevent default config files to supersede DB Config. * - * The config format is INI and the template for configuration files is the following: - * - * $values) { - foreach ($values as $key => $value) { - if ($overwrite) { - $this->setConfigValue($category, $key, $value); - } else { - $this->setDefaultConfigValue($category, $key, $value); - } - } + $this->loadConfigArray($config, $overwrite); + } + + /** + * Tries to load the specified configuration file into the App->config array. + * Doesn't overwrite previously set values by default to prevent default config files to supersede DB Config. + * + * The config format is PHP array and the template for configuration files is the following: + * + * [ + * 'key' => 'value', + * ], + * ]; + * + * @param string $filepath + * @param bool $overwrite Force value overwrite if the config key already exists + * @throws Exception + */ + public function loadConfigFile($filepath, $overwrite = false) + { + if (!file_exists($filepath)) { + throw new Exception('Error loading non-existent config file ' . $filepath); } + + $config = include($filepath); + + if (!is_array($config)) { + throw new Exception('Error loading config file ' . $filepath); + } + + $this->loadConfigArray($config, $overwrite); } /** * Loads addons configuration files * - * First loads all activated addons default configuration throught the load_config hook, then load the local.ini.php + * First loads all activated addons default configuration through the load_config hook, then load the local.config.php * again to overwrite potential local addon configuration. */ private function loadAddonConfig() { // Loads addons default config - Core\Addon::callHooks('load_config'); + Core\Hook::callAll('load_config'); // Load the local addon config file to overwritten default addon config values - if (file_exists($this->getBasePath() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'addon.ini.php')) { - $this->loadConfigFile($this->getBasePath() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'addon.ini.php', true); + if (file_exists($this->getBasePath() . '/config/addon.config.php')) { + $this->loadConfigFile($this->getBasePath() . '/config/addon.config.php', true); + } elseif (file_exists($this->getBasePath() . '/config/addon.ini.php')) { + $this->loadINIConfigFile($this->getBasePath() . '/config/addon.ini.php', true); + } + } + + /** + * Tries to load the specified configuration array into the App->config array. + * Doesn't overwrite previously set values by default to prevent default config files to supersede DB Config. + * + * @param array $config + * @param bool $overwrite Force value overwrite if the config key already exists + */ + private function loadConfigArray(array $config, $overwrite = false) + { + foreach ($config as $category => $values) { + foreach ($values as $key => $value) { + if ($overwrite) { + $this->setConfigValue($category, $key, $value); + } else { + $this->setDefaultConfigValue($category, $key, $value); + } + } } } @@ -485,7 +529,7 @@ class App if (!empty($relative_script_path)) { // Module if (!empty($_SERVER['QUERY_STRING'])) { - $path = trim(dirname($relative_script_path, substr_count(trim($_SERVER['QUERY_STRING'], '/'), '/') + 1), '/'); + $path = trim(rdirname($relative_script_path, substr_count(trim($_SERVER['QUERY_STRING'], '/'), '/') + 1), '/'); } else { // Root page $path = trim($relative_script_path, '/'); @@ -511,7 +555,7 @@ class App // Use environment variables for mysql if they are set beforehand if (!empty(getenv('MYSQL_HOST')) - && (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER'))) + && !empty(getenv('MYSQL_USERNAME') || !empty(getenv('MYSQL_USER'))) && getenv('MYSQL_PASSWORD') !== false && !empty(getenv('MYSQL_DATABASE'))) { @@ -630,7 +674,7 @@ class App $this->hostname = Core\Config::get('config', 'hostname'); } - return $scheme . '://' . $this->hostname . (!empty($this->getURLPath()) ? '/' . $this->getURLPath() : '' ); + return $scheme . '://' . $this->hostname . !empty($this->getURLPath() ? '/' . $this->getURLPath() : '' ); } /** @@ -661,8 +705,8 @@ class App $this->urlPath = trim($parsed['path'], '\\/'); } - if (file_exists($this->getBasePath() . DIRECTORY_SEPARATOR . '.htpreconfig.php')) { - include $this->getBasePath() . DIRECTORY_SEPARATOR . '.htpreconfig.php'; + if (file_exists($this->getBasePath() . '/.htpreconfig.php')) { + include $this->getBasePath() . '/.htpreconfig.php'; } if (Core\Config::get('config', 'hostname') != '') { @@ -1325,14 +1369,18 @@ class App return ''; } - //// @TODO Compute the current theme only once (this behavior has - /// already been implemented, but it didn't work well - - /// https://github.com/friendica/friendica/issues/5092) - $this->computeCurrentTheme(); + if (!$this->currentTheme) { + $this->computeCurrentTheme(); + } return $this->currentTheme; } + public function setCurrentTheme($theme) + { + $this->currentTheme = $theme; + } + /** * Computes the current theme name based on the node settings, the user settings and the device type * @@ -1671,30 +1719,30 @@ class App } } - // Load current theme info - $theme_info_file = 'view/theme/' . $this->getCurrentTheme() . '/theme.php'; - if (file_exists($theme_info_file)) { - require_once $theme_info_file; - } + // Initialize module that can set the current theme in the init() method, either directly or via App->profile_uid + try { + $content = ''; - // initialise content region - if ($this->getMode()->isNormal()) { - Core\Addon::callHooks('page_content_top', $this->page['content']); - } + // Initialize module that can set the current theme in the init() method, either directly or via App->profile_uid + if ($this->module_loaded) { + $this->page['page_title'] = $this->module; + $placeholder = ''; - // Call module functions - if ($this->module_loaded) { - $this->page['page_title'] = $this->module; - $placeholder = ''; + Core\Addon::callHooks($this->module . '_mod_init', $placeholder); - Core\Addon::callHooks($this->module . '_mod_init', $placeholder); + call_user_func([$this->module_class, 'init']); - 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. + if (!$this->error) { + call_user_func([$this->module_class, 'rawContent']); + } + } - // "rawContent" is especially meant for technical endpoints. - // This endpoint doesn't need any theme initialization or other comparable stuff. - if (!$this->error) { - 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 (function_exists(str_replace('-', '_', $this->getCurrentTheme()) . '_init')) { @@ -1702,29 +1750,40 @@ class App $func($this); } - if (! $this->error && $_SERVER['REQUEST_METHOD'] === 'POST') { - Core\Addon::callHooks($this->module . '_mod_post', $_POST); - call_user_func([$this->module_class, 'post']); - } + if ($this->module_loaded) { + if (! $this->error && $_SERVER['REQUEST_METHOD'] === 'POST') { + Core\Addon::callHooks($this->module . '_mod_post', $_POST); + call_user_func([$this->module_class, 'post']); + } - if (! $this->error) { - Core\Addon::callHooks($this->module . '_mod_afterpost', $placeholder); - call_user_func([$this->module_class, 'afterpost']); - } + if (! $this->error) { + Core\Addon::callHooks($this->module . '_mod_afterpost', $placeholder); + call_user_func([$this->module_class, 'afterpost']); + } - if (! $this->error) { - $arr = ['content' => $this->page['content']]; - Core\Addon::callHooks($this->module . '_mod_content', $arr); - $this->page['content'] = $arr['content']; - $arr = ['content' => call_user_func([$this->module_class, 'content'])]; - Core\Addon::callHooks($this->module . '_mod_aftercontent', $arr); - $this->page['content'] .= $arr['content']; + if (! $this->error) { + $arr = ['content' => $content]; + Core\Addon::callHooks($this->module . '_mod_content', $arr); + $content = $arr['content']; + $arr = ['content' => call_user_func([$this->module_class, 'content'])]; + Core\Addon::callHooks($this->module . '_mod_aftercontent', $arr); + $content .= $arr['content']; + } } - if (function_exists(str_replace('-', '_', $this->getCurrentTheme()) . '_content_loaded')) { - $func = str_replace('-', '_', $this->getCurrentTheme()) . '_content_loaded'; - $func($this); + // initialise content region + if ($this->getMode()->isNormal()) { + Core\Addon::callHooks('page_content_top', $this->page['content']); } + + $this->page['content'] .= $content; + } catch (HTTPException $e) { + header($_SERVER["SERVER_PROTOCOL"] . " " . $e->httpcode . " " . $e->httpdesc , true, $e->httpcode); + $error = ($e->getMessage() !== "" ? $e->getMessage() : $e->httpdesc); + $tpl = Core\Renderer::getMarkupTemplate("404.tpl"); + $this->page['content'] = Core\Renderer::replaceMacros($tpl, [ + '$message' => $error + ]); } /* Create the page head after setting the language @@ -1842,7 +1901,7 @@ class App */ public function internalRedirect($toUrl = '', $ssl = false) { - if (filter_var($toUrl, FILTER_VALIDATE_URL)) { + if (!empty(parse_url($toUrl, PHP_URL_SCHEME))) { throw new InternalServerErrorException("'$toUrl is not a relative path, please use System::externalRedirectTo"); } @@ -1859,7 +1918,7 @@ class App */ public function redirect($toUrl) { - if (filter_var($toUrl, FILTER_VALIDATE_URL)) { + if (!empty(parse_url($toUrl, PHP_URL_SCHEME))) { Core\System::externalRedirect($toUrl); } else { $this->internalRedirect($toUrl);