aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Web/WebServer.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2024-04-18 09:55:43 +0000
committerMario <mario@mariovavti.com>2024-04-18 09:55:43 +0000
commit48cec945051d259a06871d937ad998a1bd3e22ec (patch)
treeb7fea60a459dbddcb625c04a5e07f85b6047428c /Zotlabs/Web/WebServer.php
parent78a67742062def5a8a8fa3ccdcaed29c679aa4c8 (diff)
parent26c1fa07c912547f7d55c19f34aad0912e5f3f29 (diff)
downloadvolse-hubzilla-48cec945051d259a06871d937ad998a1bd3e22ec.tar.gz
volse-hubzilla-48cec945051d259a06871d937ad998a1bd3e22ec.tar.bz2
volse-hubzilla-48cec945051d259a06871d937ad998a1bd3e22ec.zip
Merge branch 'global-state-and-some-docs' into 'dev'
Reduce some global state and add some docs See merge request hubzilla/core!2119
Diffstat (limited to 'Zotlabs/Web/WebServer.php')
-rw-r--r--Zotlabs/Web/WebServer.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php
index f43ae10a4..6f8a4b956 100644
--- a/Zotlabs/Web/WebServer.php
+++ b/Zotlabs/Web/WebServer.php
@@ -13,11 +13,11 @@ class WebServer {
require_once('boot.php');
- sys_boot();
+ $installed = sys_boot();
\App::$language = get_best_language();
- load_translation_table(\App::$language,\App::$install);
+ load_translation_table(\App::$language, !$installed);
/**
@@ -56,7 +56,7 @@ class WebServer {
load_translation_table(\App::$language);
}
- if((x($_GET,'zid')) && (! \App::$install)) {
+ if (x($_GET,'zid') && $installed) {
\App::$query_string = strip_zids(\App::$query_string);
if(! local_channel()) {
if (!isset($_SESSION['my_address']) || $_SESSION['my_address'] != $_GET['zid']) {
@@ -69,14 +69,14 @@ class WebServer {
}
}
- if((x($_GET,'zat')) && (! \App::$install)) {
+ if (x($_GET,'zat') && $installed) {
\App::$query_string = strip_zats(\App::$query_string);
if(! local_channel()) {
zat_init();
}
}
- if((x($_REQUEST,'owt')) && (! \App::$install)) {
+ if (x($_REQUEST,'owt') && $installed) {
$token = $_REQUEST['owt'];
\App::$query_string = strip_query_param(\App::$query_string,'owt');
owt_init($token);
@@ -85,7 +85,7 @@ class WebServer {
if((x($_SESSION, 'authenticated')) || (x($_POST, 'auth-params')) || (\App::$module === 'login'))
require('include/auth.php');
- if(\App::$install) {
+ if (!$installed) {
/* Allow an exception for the view module so that pcss will be interpreted during installation */
if(\App::$module != 'view')
\App::$module = 'setup';