[Netpass-devel] NetPass/www/htdocs/Admin autohandler,1.19,1.20 qc.mhtml,1.30,1.31

[jeff m. <jef...@us...>]

Update of /cvsroot/netpass/NetPass/www/htdocs/Admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13903/www/htdocs/Admin

Modified Files:
	autohandler qc.mhtml 
Log Message:
bug#1409317 bug#1409318 - both in qc.mhtml, column headers and incorrect appending of npsess to url

Index: qc.mhtml
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/qc.mhtml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- qc.mhtml	18 Jan 2006 17:01:30 -0000	1.30
+++ qc.mhtml	18 Jan 2006 19:21:37 -0000	1.31
@@ -307,6 +307,7 @@
 	}
 </%perl>
 <tr>
+	<td align='center'><%$row->{'registeredOn'}%></td>
 	<td align='center'><%$row->{'lastSeen'}%>
                 <input type='hidden' name='ids'                          value="<%$macAddress%>">
                 <input type='hidden' name='ipAddr:<%$macAddress%>'       value="<%$row->{'ipAddress'}%>">
@@ -314,7 +315,6 @@
                 <input type='hidden' name='uqlinkupOrig:<%$macAddress%>' value="<%$row->{'uqlinkup'}%>">
                 <input type='hidden' name='statusOrig:<%$macAddress%>'   value="<%$row->{'status'}%>">
         </td>
-	<td align='center'><%$row->{'registeredOn'}%></td>
 	<td align='center'><%$ldap_ref%><%$row->{'username'}%><%$ldap_ref?"</a>":""%></td>
 	<td align='center'><%$row->{'ipAddress'}%></td>
 	<td align='center'><code><a href="/Admin/reports/byclient.mhtml?macs=<%$row->{'macAddress'}%>"><%$row->{'macAddress'}%></a></code></td>

Index: autohandler
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/autohandler,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- autohandler	9 Sep 2005 12:32:11 -0000	1.19
+++ autohandler	18 Jan 2006 19:21:37 -0000	1.20
@@ -20,7 +20,9 @@
 	my $lt  = shift;
 	my $url = shift;
 	my $SID = $m->session->{_session_id};
+#print STDERR "url $url\n";
 	return $lt.$url.'"' if $url =~ m{^\w+://}; # Don't alter external URLs
+	return $lt.$url.'"' if $url =~ m{javascript:ldap_popup}; # Don't alter external URLs
 	if ( $url !~ /npsess=/ ) {
 		if ($url =~ /\?/) {
 			$url =~ s/\?/?npsess=$SID&/;