X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=machines.cgi;h=5cdbbcd021449508136426ab902403e44e9a4d55;hb=7186c5b0dbf23f02d1564637b55c5f45fbb44193;hp=4cfe3a868f6a0507cd6b567624c7c0b336a60150;hpb=be8fd4aac4624ffe3c42a869d3a8b6c0f633a7d5;p=mirror%2Fuserdir-ldap-cgi.git

diff --git a/machines.cgi b/machines.cgi
index 4cfe3a8..5cdbbcd 100755
--- a/machines.cgi
+++ b/machines.cgi
@@ -17,7 +17,7 @@ use POSIX;
 use MIME::Base64;
 use Digest::MD5 qw(md5_hex);
 
-my (%attrs, @attrorder, %summaryattrs, @summaryorder);
+my (%attrs, @attrorder, %summaryattrs, @summaryorder, %summarylistitems);
 
 # This defines the description of the fields, and which fields are retrieved
 %attrs = ('hostname' => 'Host name',
@@ -50,13 +50,14 @@ my (%attrs, @attrorder, %summaryattrs, @summaryorder);
 
 # ditto for summary
 %summaryattrs = ('hostname' => 'Host name',
-                 'host'     => 'just for a link',
-                 'architecture' => 'Architecture',
-		 'distribution' => 'Distribution',
+		 'host'     => 'just for a link',
+		 'architecture' => 'Architecture',
 		 'status' => 'Status',
-		 'access' => 'Access');
-		 
-@summaryorder = ('hostname', 'architecture', 'distribution', 'status', 'access');		 
+		 'access' => 'Access',
+		 'sponsor' => 'Sponsor',
+		 'purpose' => 'Purpose');
+@summaryorder = qw{hostname architecture sponsor purpose status access};
+%summarylistitems = map {$_=>1} qw{purpose sponsor};
 
 # Global settings...
 my %config = &Util::ReadConfigFile;
@@ -90,15 +91,15 @@ sub wiki_link($) {
 	return $in;
 }
 
-sub purposes_uplist($) {
-	my ($purposes) = @_;
+sub item_uplist($) {
+	my ($items) = @_;
 	my $out = undef;
 
-	if (scalar @$purposes >= 1) {
+	if (scalar @$items >= 1) {
 		$out = "<ul>".
 			join("", map { 
 				"<li>".wiki_link($_)."</li>\n";
-			  } sort {my $A=$a; my $B=$b; $A =~ s/[\[\]]//g; $B =~ s/[\[\]]//g; $A cmp $B} @{$data->{purpose}}
+			  } sort {my $A=$a; my $B=$b; $A =~ s/[\[\]]//g; $B =~ s/[\[\]]//g; $A cmp $B} @{$items}
 			).
 			"</ul>";
 	}
@@ -157,34 +158,26 @@ foreach $dn (sort {$entries->{$a}->{host}->[0] cmp $entries->{$b}->{host}->[0]}
       $output{sshrsahostfprint} .= sshfingerprint($key) . "<br>";
     }
     
-    # URL
-    my ($sponsor, $url) = undef;
-    $output{sponsor} = undef;
-    foreach $sponsor (@{$data->{sponsor}}) {
-      $sponsor =~ m#((http|ftp)://\S+)#i;
-      $url = $1;
-      $sponsor =~ s/\s*$url\s*//;
-      $output{sponsor} .= "<br>" if ($output{sponsor});
-      if ($url) {
-        $output{sponsor} .= sprintf("<a href=\"%s\">%s</a>", $url, $sponsor);
-      } else {
-        $output{sponsor} .= $sponsor;
-      }
-    }
-
-    my $purpose = purposes_uplist($data->{purpose});
+    my $sponsor = item_uplist($data->{sponsor});
+    $output{sponsor} = $sponsor if defined $sponsor;
+    my $purpose = item_uplist($data->{purpose});
     $output{purpose} = $purpose if defined $purpose;
 
-    $selected = " selected ";    
+    $selected = " selected ";
   }
-  
-  $hostlist .= "<option value=\"$thishost\"$selected>$thishost\n";
-  
+
+  $hostlist .= "<option value=\"$thishost\"$selected>$thishost\n" unless ($data->{status}->[0] =~ /^unlisted/);
+
   # collect summary info
   foreach $key (keys(%summaryattrs)) {
-    $summary{$thishost}{$key} = $data->{$key}->[0];
+    if (exists $summarylistitems{$key}) {
+      my $v = item_uplist($data->{$key});
+      $summary{$thishost}{$key} = $v if defined $v;
+    } else {
+      $summary{$thishost}{$key} = $data->{$key}->[0];
+    }
   }
-  
+
   $summary{$thishost}{hostname} = undef;
   foreach my $hostname (@{$data->{hostname}}) {
     $summary{$thishost}{hostname} .= sprintf("%s<a href=\"machines.cgi?host=%s\">%s</a>", ($summary{$thishost}{hostname} ? '<br>' : ''), $summary{$thishost}{host}, $hostname);
@@ -225,6 +218,7 @@ if ($output{havehostdata}) {
      @sorted = sort {($summary{$b}->{$sortby} cmp $summary{$a}->{$sortby}) || ($summary{$a}->{'host'} cmp $summary{$b}->{'host'})} keys(%summary)
   }
   foreach $host (@sorted) {
+    next if $summary{$host}{status} =~ /^unlisted/;
     $hostdetails .= "<tr>";
     foreach $key (@summaryorder) {
       $hostdetails .= "<td>$summary{$host}{$key}&nbsp;</td>";