Keep the nas list in a separate array $nas_list. Update various pages to use that...

diff --git a/Changelog b/Changelog
index c1788c08bd4ff60282d544dbff30a393b5640cf4..48867016d82f3e83e7e70c0986f74127250d840f 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -20,6 +20,7 @@ Ver 1.70:
 * Add a nas administration page for sql based clients
 * 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.
 
 Ver 1.68:
 * Huge PostgreSQL compatibility patch by Guy Fraser <guy@incentre.net>

diff --git a/conf/config.php3 b/conf/config.php3
index 11823d9fd0f12b6e052fdf889b4d2f63bef4c8d9..e276a0b1292c47a19d8c05582c3c6bbaf77412e4 100644 (file)
--- a/conf/config.php3
+++ b/conf/config.php3
@@ -14,6 +14,7 @@ if ($use_session){
        @session_start();
 }
 if (!isset($config)){
+       unset($nas_list);
        $ARR=file("../conf/admin.conf");
        $EXTRA_ARR = array();
        foreach($ARR as $val) {
@@ -25,6 +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 ($key == 'INCLUDE'){
                        if (is_readable($v))
                                array_push($EXTRA_ARR,file($v));
@@ -44,11 +47,16 @@ 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;
                        $config["$key"]="$v";
                }
        }
-       if ($use_session)
+       if ($use_session){
                session_register('config');
+               session_register('nas_list');
+       }
+
 }
 if ($use_session == 0 && $config[general_use_session] == 'yes'){
        // Start session

diff --git a/htdocs/failed_logins.php3 b/htdocs/failed_logins.php3
index 2527e520425deddac64d6ffc5d16885df8d32321..23b77c43e4a3872070df75b64ab155a21d4305f4 100644 (file)
--- a/htdocs/failed_logins.php3
+++ b/htdocs/failed_logins.php3
@@ -198,17 +198,9 @@ EOM;
 </td></tr><tr><td>
 <select name="server">
 <?php
-while(1){
-       $i++;
-       $name = 'nas' . $i . '_name';
-       if ($config[$name] == ''){
-               $i--;
-               break;
-       }
-       $name_ip = 'nas' . $i . '_ip';
-       $ip = $config[$name_ip];
-       $name = $config[$name];
-       $servers[$name] = $ip;
+foreach ($nas_list as $nas){
+       $name = $nas[name];
+       $servers[$name] = $nas[ip];
 }
 ksort($servers);
 foreach ($servers as $name => $ip){

diff --git a/htdocs/stats.php3 b/htdocs/stats.php3
index e03da0ee104126dd171a65ef652f38eb945294dc..bade4921735f58295b949e4ae470c45538a08a97 100644 (file)
--- a/htdocs/stats.php3
+++ b/htdocs/stats.php3
@@ -79,14 +79,9 @@ for ($j = 1; $j <= 3; $j++){
 }
 $i = 1;
 $servers[all] = 'all';
-while(1){
-       $nas = 'nas' . $i;
-       $ip = $nas . '_ip';
-       $name = $nas . '_name';
-       if ($config[$ip] == '')
-               break;
-       $name = $config[$name];
-       $servers[$name] = $config[$ip];
+foreach ($nas_list as $nas){
+       $name = $nas[name];
+       $servers[$name] = $nas[ip];
        $i++;
 }
 ksort($servers);

diff --git a/htdocs/user_finger.php3 b/htdocs/user_finger.php3
index c28476ade09de10ef084133272fe90bd1dec4e6f..a79021d1406ba06ae93c5dfd5b2fa58eb5bd1323 100644 (file)
--- a/htdocs/user_finger.php3
+++ b/htdocs/user_finger.php3
@@ -49,43 +49,29 @@ $tot_in = $tot_rem = 0;
 if ($link){
        $h = 21;
        $servers_num = 0;
-       while(1){
-               $i++;
+       foreach($nas_list as $nas){
                $num = 0;
-               $nas = 'nas' . $i;
-               $name = $nas . '_name';
-               $model = $nas . '_model';
-               $community = $nas . '_community';
-               $ip = $nas . '_ip';
-               $portnum = $nas . '_port_num';
-               $finger_type = $nas . '_finger_type';
 
-
-               if ($config[$name] == ''){
-                       $i--;
-                       break;
-               }
                if ($server != ''){
-                       if ($config[$name] == $server)
+                       if ($nas[name] == $server)
                                $servers_num++;
                        else
                                continue;
                }
                else
                        $servers_num++;
-               $name_data = $config[$ip];
-               $community_data = $config[$community];
-               $server_name[$servers_num] = $config[$name];
-               $server_model[$servers_num] = $config[$model];
+               $name_data = $nas[ip];
+               $community_data = $nas[community];
+               $server_name[$servers_num] = $nas[name];
+               $server_model[$servers_num] = $nas[model];
                if ($config[general_ld_library_path] != '')
                        putenv("LD_LIBRARY_PATH=$config[general_ld_library_path]");
                $extra = "";
                if ($config[$finger_type] != 'database' && $config[general_finger_type] == 'snmp'){
-                       $nas_type = $nas . '_type';
                        if ($config[$nas_type] == '')
                                $nas_type = $config[general_nas_type];
                        else
-                               $nas_type = $config[$nas_type];
+                               $nas_type = $nas[type];
                        if ($nas_type == '')
                                $nas_type = 'cisco';
 

diff --git a/htdocs/user_stats.php3 b/htdocs/user_stats.php3
index d96a17cb8bc068eee351d78f57d89dc4e5262d7a..ecd7285a0564e17fa9cbd3a5c25885b4d08325a3 100644 (file)
--- a/htdocs/user_stats.php3
+++ b/htdocs/user_stats.php3
@@ -192,17 +192,9 @@ EOM;
 <tr><td>
 <select name="server">
 <?php
-while(1){
-       $i++;
-       $name = 'nas' . $i . '_name';
-       if ($config[$name] == ''){
-               $i--;
-               break;
-       }
-       $name_ip = 'nas' . $i . '_ip';
-       $ip = $config[$name_ip];
-       $name = $config[$name];
-       $servers[$name] = $ip;
+foreach ($nas_list as $nas){
+       $name = $nas[name];
+       $servers[$name] = $nas[ip];
 }
 ksort($servers);
 foreach ($servers as $name => $ip){