From aba7b1c3ed1a47be00810694811bb54980e0fbaa Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Wed, 8 Aug 2007 16:30:37 +0000
Subject: [PATCH] Sync w/ HEAD

---
 usr/local/www/status_captiveportal.php | 40 ++++++++++++--------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/usr/local/www/status_captiveportal.php b/usr/local/www/status_captiveportal.php
index 1dcf2ba71f..8f57a0a113 100755
--- a/usr/local/www/status_captiveportal.php
+++ b/usr/local/www/status_captiveportal.php
@@ -66,7 +66,7 @@ if ($fp) {
 		if ($line) {
 			$cpent = explode(",", $line);
 			if ($_GET['showact'])
-				$cpent[4] = captiveportal_get_last_activity($cpent[1]);
+				$cpent[5] = captiveportal_get_last_activity($cpent[1]);
 			$cpdb[] = $cpent;
 		}
 	}
@@ -78,8 +78,10 @@ if ($fp) {
 			$order = 2;
 		else if ($_GET['order'] == "mac")
 			$order = 3;
-		else if ($_GET['order'] == "lastact")
+		else if ($_GET['order'] == "user")
 			$order = 4;
+		else if ($_GET['order'] == "lastact")
+			$order = 5;
 		else
 			$order = 0;
 		usort($cpdb, "clientcmp");
@@ -87,18 +89,18 @@ if ($fp) {
 }
 captiveportal_unlock();
 ?>
-<table class="sortable" name="sortabletable" id="sortabletable" width="100%" border="0" cellpadding="0" cellspacing="0">
+<table class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr>
-    <td class="listhdrr"><a href="?order=ip&showact=<?=$_GET['showact'];?>">IP address</a></td>
-    <td class="listhdrr"><a href="?order=mac&showact=<?=$_GET['showact'];?>">MAC address</a></td>
-	<td class="listhdrr"><a href="?order=user&amp;showact=<?=$_GET['showact'];?>">Username</a></td>
+    <td class="listhdrr"><a href="?order=ip&amp;showact=<?=$_GET['showact'];?>"><?=gettext("IP address");?></a></td>
+    <td class="listhdrr"><a href="?order=mac&amp;showact=<?=$_GET['showact'];?>"><?=gettext("MAC address");?></a></td>
+    <td class="listhdrr"><a href="?order=user&amp;showact=<?=$_GET['showact'];?>"><?=gettext("Username");?></a></td>
 	<?php if ($_GET['showact']): ?>
-    <td class="listhdrr"><a href="?order=start&showact=<?=$_GET['showact'];?>">Session start</a></td>
-    <td class="listhdr"><a href="?order=lastact&showact=<?=$_GET['showact'];?>">Last activity</a></td>
+    <td class="listhdrr"><a href="?order=start&amp;showact=<?=$_GET['showact'];?>"><?=gettext("Session start");?></a></td>
+    <td class="listhdr"><a href="?order=lastact&amp;showact=<?=$_GET['showact'];?>"><?=gettext("Last activity");?></a></td>
 	<?php else: ?>
-    <td class="listhdr"><a href="?order=start&showact=<?=$_GET['showact'];?>">Session start</a></td>
+    <td class="listhdr"><a href="?order=start&amp;showact=<?=$_GET['showact'];?>"><?=gettext("Session start");?></a></td>
 	<?php endif; ?>
-    <td class="list"></td>
+    <td class="list sort_ignore"></td>
   </tr>
 <?php foreach ($cpdb as $cpent): ?>
   <tr>
@@ -107,28 +109,24 @@ captiveportal_unlock();
     <td class="listr"><?=$cpent[4];?>&nbsp;</td>
     <td class="listr"><?=htmlspecialchars(date("m/d/Y H:i:s", $cpent[0]));?></td>
 	<?php if ($_GET['showact']): ?>
-    <td class="listr"><?php if ($cpent[4]) echo htmlspecialchars(date("m/d/Y H:i:s", $cpent[4]));?></td>
+    <td class="listr"><?php if ($cpent[5]) echo htmlspecialchars(date("m/d/Y H:i:s", $cpent[5]));?></td>
 	<?php endif; ?>
 	<td valign="middle" class="list" nowrap>
 	<a href="?order=<?=$_GET['order'];?>&showact=<?=$_GET['showact'];?>&act=del&id=<?=$cpent[1];?>" onclick="return confirm('Do you really want to disconnect this client?')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
   </tr>
 <?php endforeach; ?>
 </table>
-<p>
-<form action="status_captiveportal.php" method="GET">
-<input type="hidden" name="order" value="<?=$_GET['order'];?>">
+<form action="status_captiveportal.php" method="get" style="margin: 14px;">
+<input type="hidden" name="order" value="<?=$_GET['order'];?>" />
 <?php if ($_GET['showact']): ?>
-<input type="hidden" name="showact" value="0">
-<input type="submit" class="formbtn" value="Don't show last activity">
+<input type="hidden" name="showact" value="0" />
+<input type="submit" class="formbtn" value="<?=gettext("Don't show last activity");?>" />
 <?php else: ?>
-<input type="hidden" name="showact" value="1">
-<input type="submit" class="formbtn" value="Show last activity">
+<input type="hidden" name="showact" value="1" />
+<input type="submit" class="formbtn" value="<?=gettext("Show last activity");?>" />
 <?php endif; ?>
 </form>
-</p>
 <?php include("fend.inc"); ?>
 
-<meta http-equiv="refresh" content="60;url=<?php print $_SERVER['SCRIPT_NAME']; ?>">
-
 </body>
 </html>