Random passwords, debian-private and new hashings scheme

[mirror/userdir-ldap.git] / web / machines.cgi

diff --git a/web/machines.cgi b/web/machines.cgi
index 1b2c022..1bca7f8 100755 (executable)
--- a/web/machines.cgi
+++ b/web/machines.cgi
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: machines.cgi,v 1.3 1999/09/30 06:21:28 tausq Exp $
+# $Id: machines.cgi,v 1.5 2000/01/23 05:36:58 tausq Exp $
 
 # (c) 1999 Randolph Chung. Licensed under the GPL. <tausq@debian.org>
 
@@ -87,16 +87,17 @@ foreach $dn (sort {$entries->{$a}->{host}->[0] <=> $entries->{$b}->{host}->[0]}
     $output{'sponsor-admin'} = sprintf("<a href=\"mailto:%s\">%s</a>", $output{'sponsor-admin'}, $output{'sponsor-admin'});
     
     # URL
-    my $sponsor;
+    my ($sponsor, $url) = undef;
     $output{sponsor} = undef;
     foreach $sponsor (@{$data->{sponsor}}) {
-      print "<!-- $sponsor -->\n";
-      $sponsor =~ /(.*)\s*(http.*)?/i;
+      $sponsor =~ m#((http|ftp)://\S+)#i;
+      $url = $1;
+      $sponsor =~ s/$url//;
       $output{sponsor} .= "<br>" if ($output{sponsor});
-      if ($2) {
-        $output{sponsor} .= sprintf("<a href=\"%s\">%s</a>", $1, $2);
+      if ($url) {
+        $output{sponsor} .= sprintf("<a href=\"%s\">%s</a>", $url, $sponsor);
       } else {
-        $output{sponsor} .= $1;
+        $output{sponsor} .= $sponsor;
       }
     }
     
@@ -127,11 +128,11 @@ if ($output{havehostdata}) {
 } else {
   # display summary info
   $hostdetails = "<h1>Summary</h1>\n";
-  $hostdetails .= "<table border=1 width=90%>\n<th>";
+  $hostdetails .= "<table border=1 width=90%>\n<tr>";
   foreach $key (@summaryorder) {
-    $hostdetails .= "<td>$summaryattrs{$key}</td>";
+    $hostdetails .= "<th>$summaryattrs{$key}</th>";
   }
-  $hostdetails .= "</th>\n";
+  $hostdetails .= "</tr>\n";
   
   foreach $host (sort(keys(%summary))) {
     $hostdetails .= "<tr>";