Don't use $num in stats.php3, change it to $stats_num

diff --git a/dialup_admin/Changelog b/dialup_admin/Changelog
index e0fe24b..2081bda 100644 (file)
--- a/dialup_admin/Changelog
+++ b/dialup_admin/Changelog
@@ -32,6 +32,7 @@ Ver 1.78:
 * Correctly calculate the nas ip in lib/sql/nas_list.php3. Add a check_ip() function in lib/functions.php3
   Bug noted by Nick Bright
 * Correctly check nas validity in nas_admin.php3. Bug noted by Nick Bright
+* Don't use $num in stats.php3, change it to $stats_num
 Ver 1.75:
 * A LOT of security related fixes. Now dialupadmin should hopefully be secure enough to
   be accessed by normal users (not administrators).

diff --git a/dialup_admin/htdocs/stats.php3 b/dialup_admin/htdocs/stats.php3
index d29a3f4..ca48d91 100644 (file)
--- a/dialup_admin/htdocs/stats.php3
+++ b/dialup_admin/htdocs/stats.php3
@@ -26,6 +26,7 @@ EOM;
        exit();
 }
 
+$stats_num = array();
 
 $date = strftime('%A, %e %B %Y, %T %Z');
 $now = time();
@@ -114,13 +115,13 @@ if ($link){
                        $row = @da_sql_fetch_array($search,$config);
                        $data[$day][1] = $row[res_1];
                        $data[sum][1] += $row[res_1];
-                       $num[1] = ($data[$day][1]) ? $num[1] + 1 : $num[1];
+                       $stats_num[1] = ($data[$day][1]) ? $stats_num[1] + 1 : $stats_num[1];
                        $data[$day][2] = $row[res_2];
                        $data[sum][2] += $row[res_2];
-                       $num[2] = ($data[$day][2]) ? $num[2] + 1 : $num[2];
+                       $stats_num[2] = ($data[$day][2]) ? $stats_num[2] + 1 : $stats_num[2];
                        $data[$day][3] = $row[res_3];
                        $data[sum][3] += $row[res_3];
-                       $num[3] = ($data[$day][3]) ? $num[3] + 1 : $num[3];
+                       $stats_num[3] = ($data[$day][3]) ? $stats_num[3] + 1 : $stats_num[3];
                }
                else
                        echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
@@ -129,13 +130,13 @@ if ($link){
 else
        echo "<b>Could not connect to SQL database</b><br>\n";
 
-$num[1] = ($num[1]) ? $num[1] : 1;
-$num[2] = ($num[2]) ? $num[2] : 1;
-$num[3] = ($num[3]) ? $num[3] : 1;
+$stats_num[1] = ($stats_num[1]) ? $stats_num[1] : 1;
+$stats_num[2] = ($stats_num[2]) ? $stats_num[2] : 1;
+$stats_num[3] = ($stats_num[3]) ? $stats_num[3] : 1;
 
-$data['avg'][1] = ceil($data['sum'][1] / $num[1]);
-$data['avg'][2] = ceil($data['sum'][2] / $num[2]);
-$data['avg'][3] = ceil($data['sum'][3] / $num[3]);
+$data['avg'][1] = ceil($data['sum'][1] / $stats_num[1]);
+$data['avg'][2] = ceil($data['sum'][2] / $stats_num[2]);
+$data['avg'][3] = ceil($data['sum'][3] / $stats_num[3]);
 
 $data['avg'][1] = $fun[$column[1]]($data['avg'][1]);
 $data['avg'][2] = $fun[$column[2]]($data['avg'][2]);