Adds ICQ UIN support

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

diff --git a/machines.cgi b/machines.cgi
index 973b432..1bca7f8 100755 (executable)
--- a/machines.cgi
+++ b/machines.cgi
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
-#$Id: machines.cgi,v 1.2 1999/09/30 05:38:29 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>
 
 use lib '.';
@@ -18,7 +19,6 @@ my (%attrs, @attrorder, %summaryattrs, @summaryorder);
           'distribution' => 'Distribution',
          'access' => 'Access',
          'sponsor' => 'Sponsor',
-         'sponsorurl' => 'Sponsor URL',
          'sponsor-admin' => 'Sponsor admin',
          'location' => 'Location',
          'machine' => 'Processor',
@@ -87,7 +87,19 @@ 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
-    $output{sponsor} = sprintf("<a href=\"%s\">%s</a>", $output{sponsorurl}, $output{sponsor});   
+    my ($sponsor, $url) = undef;
+    $output{sponsor} = undef;
+    foreach $sponsor (@{$data->{sponsor}}) {
+      $sponsor =~ m#((http|ftp)://\S+)#i;
+      $url = $1;
+      $sponsor =~ s/$url//;
+      $output{sponsor} .= "<br>" if ($output{sponsor});
+      if ($url) {
+        $output{sponsor} .= sprintf("<a href=\"%s\">%s</a>", $url, $sponsor);
+      } else {
+        $output{sponsor} .= $sponsor;
+      }
+    }
     
     $selected = " selected ";    
   }
@@ -109,18 +121,18 @@ if ($output{havehostdata}) {
   $hostdetails .= "<ul>\n";
   foreach $key (@attrorder) {
     if ($output{$key}) {
-      $hostdetails .= "<li><b>$key:</b> $output{$key}\n";
+      $hostdetails .= "<li><b>$attrs{$key}:</b> $output{$key}\n";
     }
   }
   $hostdetails .= "</ul>\n";
 } 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>";