X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=web%2Fmachines.cgi;h=61e50cd4812c2edc2c1fa54851f53e94695aee9f;hb=d039813ea237f2ef74b99f5bf188d64c615ec7a2;hp=973b43294ba338f44fa390b573eb1113a22fb53c;hpb=17450b68dfef531fd21a59bc615f24426f080d6f;p=mirror%2Fuserdir-ldap.git

diff --git a/web/machines.cgi b/web/machines.cgi
index 973b432..61e50cd 100755
--- a/web/machines.cgi
+++ b/web/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.4 1999/10/01 03:44:20 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,7 +121,7 @@ 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";