use Friendica\Database\DBA;
use Friendica\Network\HTTPException\InternalServerErrorException;
-require_once 'boot.php';
-require_once 'include/text.php';
-
/**
*
* class: App
*/
private $isAjax;
+ /**
+ * @var MobileDetect
+ */
+ public $mobileDetect;
+
/**
* Register a stylesheet file path to be included in the <head> tag of every page.
* Inclusion is done in App->initHead().
public function registerStylesheet($path)
{
$url = str_replace($this->getBasePath() . DIRECTORY_SEPARATOR, '', $path);
- $url = htmlspecialchars($url, ENT_COMPAT, 'UTF-8');
+
$this->stylesheets[] = trim($url, '/');
}
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) {
// Detect mobile devices
$mobile_detect = new MobileDetect();
+
+ $this->mobileDetect = $mobile_detect;
+
$this->is_mobile = $mobile_detect->isMobile();
$this->is_tablet = $mobile_detect->isTablet();
* 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);
}
}
- 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:
- *
- * <?php return <<<INI
- *
- * [section]
- * key = value
- *
- * INI;
- * // Keep this line
- *
+ * @deprecated since version 2018.12
* @param string $filepath
* @param bool $overwrite Force value overwrite if the config key already exists
* @throws Exception
*/
- public function loadConfigFile($filepath, $overwrite = false)
+ public function loadINIConfigFile($filepath, $overwrite = false)
{
if (!file_exists($filepath)) {
- throw new Exception('Error parsing non-existent config file ' . $filepath);
+ throw new Exception('Error parsing non-existent INI config file ' . $filepath);
}
$contents = include($filepath);
$config = parse_ini_string($contents, true, INI_SCANNER_TYPED);
if ($config === false) {
- throw new Exception('Error parsing config file ' . $filepath);
+ throw new Exception('Error parsing INI config file ' . $filepath);
}
- foreach ($config as $category => $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:
+ *
+ * <?php return [
+ * 'section' => [
+ * '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);
+ }
+ }
}
}
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, '/');
// 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')))
{
$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() : '' );
}
/**
$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') != '') {
$meminfo[$key] = (int) ($meminfo[$key] / 1024);
}
- if (!isset($meminfo['MemAvailable']) || !isset($meminfo['MemFree'])) {
+ if (!isset($meminfo['MemFree'])) {
return false;
}
- $free = $meminfo['MemAvailable'] + $meminfo['MemFree'];
+ $free = $meminfo['MemFree'];
$reached = ($free < $min_memory);
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
*
}
}
- // Load current theme info
- $theme_info_file = 'view/theme/' . $this->getCurrentTheme() . '/theme.php';
- if (file_exists($theme_info_file)) {
- require_once $theme_info_file;
- }
-
- // initialise content region
- if ($this->getMode()->isNormal()) {
- Core\Addon::callHooks('page_content_top', $this->page['content']);
- }
+ $content = '';
// Call module functions
if ($this->module_loaded) {
}
if (! $this->error) {
- $arr = ['content' => $this->page['content']];
+ $arr = ['content' => $content];
Core\Addon::callHooks($this->module . '_mod_content', $arr);
- $this->page['content'] = $arr['content'];
+ $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'];
+ $content .= $arr['content'];
}
+ }
- if (function_exists(str_replace('-', '_', $this->getCurrentTheme()) . '_content_loaded')) {
- $func = str_replace('-', '_', $this->getCurrentTheme()) . '_content_loaded';
- $func($this);
- }
+ // Load current theme info after module has been executed 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;
+ }
+
+ // initialise content region
+ if ($this->getMode()->isNormal()) {
+ Core\Addon::callHooks('page_content_top', $this->page['content']);
}
+ $this->page['content'] .= $content;
+
/* Create the page head after setting the language
* and getting any auth credentials.
*
*/
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");
}
*/
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);