diff --git a/emhttp/plugins/dynamix/Vars.page b/emhttp/plugins/dynamix/Vars.page index c15913b17..9a0a59a1d 100644 --- a/emhttp/plugins/dynamix/Vars.page +++ b/emhttp/plugins/dynamix/Vars.page @@ -27,10 +27,9 @@ $(function() { -$myPage['text'] = $page['text'] = $pages['Vars']['text'] = $language = $text = $notes = $site = $webComponentTranslations = '...'; -$globals = $GLOBALS; -ksort($globals); -if (isset($globals['_SERVER']['PHP_AUTH_PW'])) $globals['_SERVER']['PHP_AUTH_PW'] = "***"; +$globals = []; +$names = ['devs','disks','sec','sec_nfs','shares','users','var']; +foreach ($names as $name) $globals[$name] = $$name; echo "
",htmlspecialchars(print_r($globals,true)),""; ?> diff --git a/emhttp/plugins/dynamix/template.php b/emhttp/plugins/dynamix/template.php index d6238d19f..c50290a4e 100644 --- a/emhttp/plugins/dynamix/template.php +++ b/emhttp/plugins/dynamix/template.php @@ -30,13 +30,13 @@ require_once "$docroot/webGui/include/Helpers.php"; extract(parse_plugin_cfg('dynamix',true)); // Read emhttp status -$var = (array)@parse_ini_file('state/var.ini'); -$sec = (array)@parse_ini_file('state/sec.ini',true); $devs = (array)@parse_ini_file('state/devs.ini',true); $disks = (array)@parse_ini_file('state/disks.ini',true); -$users = (array)@parse_ini_file('state/users.ini',true); -$shares = (array)@parse_ini_file('state/shares.ini',true); +$sec = (array)@parse_ini_file('state/sec.ini',true); $sec_nfs = (array)@parse_ini_file('state/sec_nfs.ini',true); +$shares = (array)@parse_ini_file('state/shares.ini',true); +$users = (array)@parse_ini_file('state/users.ini',true); +$var = (array)@parse_ini_file('state/var.ini'); // Merge SMART settings require_once "$docroot/webGui/include/CustomMerge.php";