Przeglądaj źródła

Hestia system config was read only on login and cached as Session data

Robert Zollner 6 lat temu
rodzic
commit
3aa8bb468e
2 zmienionych plików z 13 dodań i 7 usunięć
  1. 12 1
      web/inc/main.php
  2. 1 6
      web/login/index.php

+ 12 - 1
web/inc/main.php

@@ -90,6 +90,7 @@ if (isset($_SESSION['language'])) {
 
 if (isset($_SESSION['user'])) {
     $user = $_SESSION['user'];
+    load_hestia_config();
 }
 
 if (isset($_SESSION['look']) && ( $_SESSION['look'] != 'admin' )) {
@@ -361,4 +362,14 @@ function is_it_mysql_or_mariadb() {
     $mysqltype='mysql';
     if (isset($data['mariadb'])) $mysqltype='mariadb';
     return $mysqltype;
-}
+}
+
+function load_hestia_config() {
+    // Check system configuration
+    exec (HESTIA_CMD . "v-list-sys-config json", $output, $return_var);
+    $data = json_decode(implode('', $output), true);
+    $sys_arr = $data['config'];
+    foreach ($sys_arr as $key => $value) {
+        $_SESSION[$key] = $value;
+    }
+}

+ 1 - 6
web/login/index.php

@@ -148,12 +148,7 @@ if (isset($_POST['user']) && isset($_POST['password'])) {
 }
 
 // Check system configuration
-exec (HESTIA_CMD . "v-list-sys-config json", $output, $return_var);
-$data = json_decode(implode('', $output), true);
-$sys_arr = $data['config'];
-foreach ($sys_arr as $key => $value) {
-    $_SESSION[$key] = $value;
-}
+load_hestia_config();
 
 // Detect language
 if (empty($_SESSION['language'])) {