Make nas_list actually work

diff --git a/Changelog b/Changelog
index 48867016d82f3e83e7e70c0986f74127250d840f..a10c265a3d7ee681c55951d637d15f11378e1a7c 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -21,6 +21,7 @@ Ver 1.70:
 * Fix small bugs in accounting.php3 and user_stats.php3. Add nas_admin.php3 to the buttons page
 * Add da_sql_escape_string for all relevant variables in lib/sql files
 * Keep the nas list in a separate array $nas_list. Update various pages to use that one now.
+* Make nas_list actually work
 
 Ver 1.68:
 * Huge PostgreSQL compatibility patch by Guy Fraser <guy@incentre.net>

diff --git a/conf/config.php3 b/conf/config.php3
index e276a0b1292c47a19d8c05582c3c6bbaf77412e4..412d8841426e0aaae9f5db157a7925996afecd6a 100644 (file)
--- a/conf/config.php3
+++ b/conf/config.php3
@@ -26,8 +26,8 @@ if (!isset($config)){
                        $val=$config[$matches[1]];
                        $v=preg_replace("/%\{$matches[1]\}/",$val,$v);
                }
-               if (preg_match("/^general_nas(\d+)_(\w+)$/",$key,$matches))
-                       $nas_list[$matches[2]][$matches[1]] = $key;
+               if (preg_match("/^nas(\d+)_(\w+)$/",$key,$matches))
+                       $nas_list[$matches[1]][$matches[2]] = $v;
                if ($key == 'INCLUDE'){
                        if (is_readable($v))
                                array_push($EXTRA_ARR,file($v));
@@ -47,8 +47,8 @@ if (!isset($config)){
                                $val=$config[$matches[1]];
                                $v=preg_replace("/%\{$matches[1]\}/",$val,$v);
                        }
-                       if (preg_match("/^general_nas(\d+)_(\w+)$/",$key,$matches))
-                               $nas_list[$matches[2]][$matches[1]] = $key;
+                       if (preg_match("/^nas(\d+)_(\w+)$/",$key,$matches))
+                               $nas_list[$matches[1]][$matches[2]] = $v;
                        $config["$key"]="$v";
                }
        }