diff options
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 31 |
1 files changed, 8 insertions, 23 deletions
@@ -70,7 +70,7 @@ require_once('include/security.php'); define('PLATFORM_NAME', 'hubzilla'); -define('STD_VERSION', '10.3.34'); +define('STD_VERSION', '10.5'); define('ZOT_REVISION', '6.0'); define('DB_UPDATE_VERSION', 1263); @@ -657,8 +657,10 @@ function sys_boot(): bool { // allow somebody to set some initial settings just in case they can't // install without special fiddling - if (App::$install && file_exists('.htpreconfig.php')) + if (App::$install && file_exists('.htpreconfig.php')) { + // @phpstan-ignore include.fileNotFound @include('.htpreconfig.php'); + } if (array_key_exists('default_timezone', get_defined_vars())) { App::$config['system']['timezone'] = $default_timezone; @@ -772,7 +774,7 @@ class miniApp { * */ class App { - + public static $request = null; public static $install = false; // true if we are installing the software public static $account = null; // account record of the logged-in account public static $channel = null; // channel record of the current channel of the logged-in account @@ -870,6 +872,9 @@ class App { */ public static $template_engine_instance = []; + /// Page layouts for comanche + public static array $page_layouts = []; + private static $ldelim = [ 'internal' => '', 'smarty3' => '{{' @@ -1797,26 +1802,6 @@ function shutdown() { } /** - * @brief Returns the entity id of locally logged in account or false. - * - * Returns numeric account_id if authenticated or 0. It is possible to be - * authenticated and not connected to a channel. - * - * @return int|bool account_id or false - */ -function get_account_id() { - if (isset($_SESSION['account_id'])) { - return intval($_SESSION['account_id']); - } - - if (App::$account) { - return intval(App::$account['account_id']); - } - - return false; -} - -/** * @brief Returns the entity id (channel_id) of locally logged in channel or false. * * Returns authenticated numeric channel_id if authenticated and connected to |