From 3e10dbe02a21b263ce7b642c8d167adea0a21db9 Mon Sep 17 00:00:00 2001
From: Daniel Stefan Haischt <dsh@pfsense.org>
Date: Fri, 4 Aug 2006 18:21:54 +0000
Subject: - fix: added user= to HTTP query string where necessary.

---
 packages/dspam/www/dspam-analysis.php   |  2 +-
 packages/dspam/www/dspam-history.php    |  2 +-
 packages/dspam/www/dspam-perf.php       |  2 +-
 packages/dspam/www/dspam-prefs.php      |  2 +-
 packages/dspam/www/dspam-quarantine.php |  2 +-
 packages/dspam/www/dspam-train.php      | 14 +++++++-------
 packages/dspam/www/dspam-viewmsg.php    | 12 ++++++------
 packages/dspam/www/dspam.php            | 14 +++++++-------
 8 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'packages')

diff --git a/packages/dspam/www/dspam-analysis.php b/packages/dspam/www/dspam-analysis.php
index 89b48df2..f80bd54b 100644
--- a/packages/dspam/www/dspam-analysis.php
+++ b/packages/dspam/www/dspam-analysis.php
@@ -61,7 +61,7 @@ echo $pfSenseHead->getHTML();
     <td>
 <?php
   $tab_array = array();
-  $tab_array[] = array("Info",         false, "/dspam.php?{$CURRENT_USER}");
+  $tab_array[] = array("Info",         false, "/dspam.php?user={$CURRENT_USER}");
   $tab_array[] = array("Performance",  false, "/dspam-perf.php?user={$CURRENT_USER}");
   $tab_array[] = array("Preferences",  false, "/dspam-prefs.php?user={$CURRENT_USER}");
   $tab_array[] = array("Alerts",       false, "/pkg.php?xml=dspam_alerts.xml&user={$CURRENT_USER}");
diff --git a/packages/dspam/www/dspam-history.php b/packages/dspam/www/dspam-history.php
index e9b77cf2..cb5e4f2c 100644
--- a/packages/dspam/www/dspam-history.php
+++ b/packages/dspam/www/dspam-history.php
@@ -67,7 +67,7 @@ echo $pfSenseHead->getHTML();
     <td>
 <?php
   $tab_array = array();
-  $tab_array[] = array("Info",         false, "/dspam.php?{$CURRENT_USER}");
+  $tab_array[] = array("Info",         false, "/dspam.php?user={$CURRENT_USER}");
   $tab_array[] = array("Performance",  false, "/dspam-perf.php?user={$CURRENT_USER}");
   $tab_array[] = array("Preferences",  false, "/dspam-prefs.php?user={$CURRENT_USER}");
   $tab_array[] = array("Alerts",       false, "/pkg.php?xml=dspam_alerts.xml&user={$CURRENT_USER}");
diff --git a/packages/dspam/www/dspam-perf.php b/packages/dspam/www/dspam-perf.php
index bead8709..8b69319f 100644
--- a/packages/dspam/www/dspam-perf.php
+++ b/packages/dspam/www/dspam-perf.php
@@ -63,7 +63,7 @@ echo $pfSenseHead->getHTML();
     <td>
 <?php
   $tab_array = array();
-  $tab_array[] = array("Info",         false, "/dspam.php?{$CURRENT_USER}");
+  $tab_array[] = array("Info",         false, "/dspam.php?user={$CURRENT_USER}");
   $tab_array[] = array("Performance",  true,  "/dspam-perf.php?user={$CURRENT_USER}");
   $tab_array[] = array("Preferences",  false, "/dspam-prefs.php?user={$CURRENT_USER}");
   $tab_array[] = array("Alerts",       false, "/pkg.php?xml=dspam_alerts.xml&user={$CURRENT_USER}");
diff --git a/packages/dspam/www/dspam-prefs.php b/packages/dspam/www/dspam-prefs.php
index 668cface..4e6b0f90 100644
--- a/packages/dspam/www/dspam-prefs.php
+++ b/packages/dspam/www/dspam-prefs.php
@@ -60,7 +60,7 @@ echo $pfSenseHead->getHTML();
     <td>
 <?php
   $tab_array = array();
-  $tab_array[] = array("Info",         false, "/dspam.php?{$CURRENT_USER}");
+  $tab_array[] = array("Info",         false, "/dspam.php?user={$CURRENT_USER}");
   $tab_array[] = array("Performance",  false, "/dspam-perf.php?user={$CURRENT_USER}");
   $tab_array[] = array("Preferences",  true,  "/dspam-prefs.php?user={$CURRENT_USER}");
   $tab_array[] = array("Alerts",       false, "/pkg.php?xml=dspam_alerts.xml");
diff --git a/packages/dspam/www/dspam-quarantine.php b/packages/dspam/www/dspam-quarantine.php
index 19d8b755..bc205a50 100644
--- a/packages/dspam/www/dspam-quarantine.php
+++ b/packages/dspam/www/dspam-quarantine.php
@@ -74,7 +74,7 @@ echo $pfSenseHead->getHTML();
     <td>
 <?php
   $tab_array = array();
-  $tab_array[] = array("Info",         false, "/dspam.php?{$CURRENT_USER}");
+  $tab_array[] = array("Info",         false, "/dspam.php?user={$CURRENT_USER}");
   $tab_array[] = array("Performance",  false, "/dspam-perf.php?user={$CURRENT_USER}");
   $tab_array[] = array("Preferences",  false, "/dspam-prefs.php?user={$CURRENT_USER}");
   $tab_array[] = array("Alerts",       false, "/pkg.php?xml=dspam_alerts.xml&user={$CURRENT_USER}");
diff --git a/packages/dspam/www/dspam-train.php b/packages/dspam/www/dspam-train.php
index 22c2e8ba..c5c19977 100644
--- a/packages/dspam/www/dspam-train.php
+++ b/packages/dspam/www/dspam-train.php
@@ -155,14 +155,14 @@ echo $pfSenseHead->getHTML();
     <td>
 <?php
   $tab_array = array();
-  $tab_array[] = array("Info",         false, "/dspam.php?{$CURRENT_USER}");
-  $tab_array[] = array("Performance",  false, "/dspam-perf.php?{$CURRENT_USER}");
-  $tab_array[] = array("Preferences",  false, "/dspam-prefs.php?{$CURRENT_USER}");
+  $tab_array[] = array("Info",         false, "/dspam.php?user={$CURRENT_USER}");
+  $tab_array[] = array("Performance",  false, "/dspam-perf.php?user={$CURRENT_USER}");
+  $tab_array[] = array("Preferences",  false, "/dspam-prefs.php?user={$CURRENT_USER}");
   $tab_array[] = array("Alerts",       false, "/pkg.php?xml=dspam_alerts.xml&user={$CURRENT_USER}");
-  $tab_array[] = array("Quarantine ({$DATA['TOTAL_QUARANTINED_MESSAGES']})",   false, "/dspam-quarantine.php?{$CURRENT_USER}");
-  $tab_array[] = array("Analysis",     false, "/dspam-analysis.php?{$CURRENT_USER}");
-  $tab_array[] = array("History",      false, "/dspam-history.php?{$CURRENT_USER}");
-  $tab_array[] = array("Train Filter", true,  "/dspam-train.php?{$CURRENT_USER}");
+  $tab_array[] = array("Quarantine ({$DATA['TOTAL_QUARANTINED_MESSAGES']})",   false, "/dspam-quarantine.php?user={$CURRENT_USER}");
+  $tab_array[] = array("Analysis",     false, "/dspam-analysis.php?user={$CURRENT_USER}");
+  $tab_array[] = array("History",      false, "/dspam-history.php?user={$CURRENT_USER}");
+  $tab_array[] = array("Train Filter", true,  "/dspam-train.php?user={$CURRENT_USER}");
   if (isDSPAMAdmin($HTTP_SERVER_VARS['AUTH_USER'])) {
     $tab_array[] = array("Admin Suite",  false, "/dspam-admin.php");
   }
diff --git a/packages/dspam/www/dspam-viewmsg.php b/packages/dspam/www/dspam-viewmsg.php
index 13c55477..e56b081f 100644
--- a/packages/dspam/www/dspam-viewmsg.php
+++ b/packages/dspam/www/dspam-viewmsg.php
@@ -67,14 +67,14 @@ echo $pfSenseHead->getHTML();
   $querystr = "?user=?{$CURRENT_USER}&page={$DATA['QPAGE']}&sortby={$DATA['SORTBY']}&qperpage={$CONFIG['QUARANTINE_PER_PAGE']}";
 
   $tab_array = array();
-  $tab_array[] = array("Info",         false, "/dspam.php?{$CURRENT_USER}");
-  $tab_array[] = array("Performance",  false, "/dspam-perf.php?{$CURRENT_USER}");
-  $tab_array[] = array("Preferences",  false, "/dspam-prefs.php?{$CURRENT_USER}");
+  $tab_array[] = array("Info",         false, "/dspam.php?user={$CURRENT_USER}");
+  $tab_array[] = array("Performance",  false, "/dspam-perf.php?user={$CURRENT_USER}");
+  $tab_array[] = array("Preferences",  false, "/dspam-prefs.php?user={$CURRENT_USER}");
   $tab_array[] = array("Alerts",       false, "/pkg.php?xml=dspam_alerts.xml&user={$CURRENT_USER}");
   $tab_array[] = array("Quarantine (View)",   true,  "/dspam-quarantine.php{$querystr}");
-  $tab_array[] = array("Analysis",     false, "/dspam-analysis.php?{$CURRENT_USER}");
-  $tab_array[] = array("History",      false, "/dspam-history.php?{$CURRENT_USER}");
-  $tab_array[] = array("Train Filter", false, "/dspam-train.php?{$CURRENT_USER}");
+  $tab_array[] = array("Analysis",     false, "/dspam-analysis.php?user={$CURRENT_USER}");
+  $tab_array[] = array("History",      false, "/dspam-history.php?user={$CURRENT_USER}");
+  $tab_array[] = array("Train Filter", false, "/dspam-train.php?user={$CURRENT_USER}");
   if (isDSPAMAdmin($HTTP_SERVER_VARS['AUTH_USER'])) {
     $tab_array[] = array("Admin Suite",  false, "/dspam-admin.php");
   }
diff --git a/packages/dspam/www/dspam.php b/packages/dspam/www/dspam.php
index 488bed1b..244d80ef 100644
--- a/packages/dspam/www/dspam.php
+++ b/packages/dspam/www/dspam.php
@@ -76,14 +76,14 @@ echo $pfSenseHead->getHTML();
     <td>
 <?php
   $tab_array = array();
-  $tab_array[] = array("Info",         true,  "/dspam.php?{$CURRENT_USER}");
-  $tab_array[] = array("Performance",  false, "/dspam-perf.php?{$CURRENT_USER}");
-  $tab_array[] = array("Preferences",  false, "/dspam-prefs.php?{$CURRENT_USER}");
+  $tab_array[] = array("Info",         true,  "/dspam.php?user={$CURRENT_USER}");
+  $tab_array[] = array("Performance",  false, "/dspam-perf.php?user={$CURRENT_USER}");
+  $tab_array[] = array("Preferences",  false, "/dspam-prefs.php?user={$CURRENT_USER}");
   $tab_array[] = array("Alerts",       false, "/pkg.php?xml=dspam_alerts.xml&user={$CURRENT_USER}");
-  $tab_array[] = array("Quarantine ({$DATA['TOTAL_QUARANTINED_MESSAGES']})",   false, "/dspam-quarantine.php?{$CURRENT_USER}");
-  $tab_array[] = array("Analysis",     false, "/dspam-analysis.php?{$CURRENT_USER}");
-  $tab_array[] = array("History",      false, "/dspam-history.php?{$CURRENT_USER}");
-  $tab_array[] = array("Train Filter", false, "/dspam-train.php?{$CURRENT_USER}");
+  $tab_array[] = array("Quarantine ({$DATA['TOTAL_QUARANTINED_MESSAGES']})",   false, "/dspam-quarantine.php?user={$CURRENT_USER}");
+  $tab_array[] = array("Analysis",     false, "/dspam-analysis.php?user={$CURRENT_USER}");
+  $tab_array[] = array("History",      false, "/dspam-history.php?user={$CURRENT_USER}");
+  $tab_array[] = array("Train Filter", false, "/dspam-train.php?user={$CURRENT_USER}");
   if (isDSPAMAdmin($HTTP_SERVER_VARS['AUTH_USER'])) {
     $tab_array[] = array("Admin Suite",  false, "/dspam-admin.php");
   }
-- 
cgit v1.2.3