X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=machines.cgi;h=c50c4cbc6dc38b25e984e5f41e9f7f5f7162fa31;hb=2208385fcd937d7896023bcd60f6521102693a0d;hp=383f7cd08ba0d7a2098b7d441f15b7927b18efa6;hpb=7d4df26c66fcce393db4f57374f92ed9407c43dd;p=mirror%2Fuserdir-ldap-cgi.git

diff --git a/machines.cgi b/machines.cgi
index 383f7cd..c50c4cb 100755
--- a/machines.cgi
+++ b/machines.cgi
@@ -4,6 +4,7 @@
 # (c) 1999 Randolph Chung. Licensed under the GPL. <tausq@debian.org>
 # (c) 2004 Martin Schulze. Licensed under the GPL. <joey@debian.org>
 # (c) 2006 Ryan Murray. Licensed under the GPL. <rmurray@debian.org>
+# (c) 2008 Martin Zobel-Helas. Licensed under the GPL. <zobel@debian.org>
 
 use lib '.';
 use strict vars;
@@ -36,6 +37,7 @@ my (%attrs, @attrorder, %summaryattrs, @summaryorder);
 	  'sshrsahostkey' => 'SSH host key',
 	  'sshrsahostfprint' => 'SSH host fingerprint',
 	  'description' => 'Description',
+	  'purpose' => 'purposes of this server',
 #	  'createtimestamp' => 'Entry created',
 #	  'modifytimestamp' => 'Entry modified'
 	 );
@@ -44,7 +46,7 @@ my (%attrs, @attrorder, %summaryattrs, @summaryorder);
 @attrorder = qw(hostname admin architecture distribution access
                 sponsor sponsor-admin location machine memory
 	        disk bandwidth status notes sshrsahostkey sshrsahostfprint
-		description);
+		description purpose);
 
 # ditto for summary
 %summaryattrs = ('hostname' => 'Host name',
@@ -81,13 +83,32 @@ sub sshfingerprint {
     return $hrfpr;
 }
 
+sub purposes_uplist($) {
+	my ($purposes) = @_;
+	my $out = undef;
+
+	if (scalar @$purposes >= 1) {
+		$out = "<ul>".
+			join("", map { 
+				s#\[\[(.*?)\]\]#<a href="http://$1">$1</a>#g;
+				"<li>$_</li>\n";
+			  } sort {my $A=$a; my $B=$b; $A =~ s/[\[\]]//g; $B =~ s/[\[\]]//g; $A cmp $B} @{$data->{purpose}}
+			).
+			"</ul>";
+	}
+	return $out;
+}
+
 $SIG{__DIE__} = \&DieHandler;
 
 my $query = new CGI;
 my $host = lc($query->param('host'));
+my $sortby = lc($query->param('sortby')) || "host";
+my $sortorder = lc($query->param('sortorder')) || "asc";
 
 &Util::HTMLSendHeader;
 $ldap = Net::LDAP->new($config{ldaphost}) || &Util::HTMLError($!);
+&Util::UpgradeConnection($ldap) unless $config{usessl} eq 'False';
 $mesg;
 $ldap->bind;
 
@@ -144,7 +165,10 @@ foreach $dn (sort {$entries->{$a}->{host}->[0] cmp $entries->{$b}->{host}->[0]}
         $output{sponsor} .= $sponsor;
       }
     }
-    
+
+    my $purpose = purposes_uplist($data->{purpose});
+    $output{purpose} = $purpose if defined $purpose;
+
     $selected = " selected ";    
   }
   
@@ -176,11 +200,25 @@ if ($output{havehostdata}) {
   $hostdetails = "<h1>Summary</h1>\n";
   $hostdetails .= "<table border=\"1\" width=\"90%\">\n<tr>";
   foreach $key (@summaryorder) {
-    $hostdetails .= "<th>$summaryattrs{$key}</th>";
+    if ($sortby ne $key) {
+      $hostdetails .= "<th><a href=\"machines.cgi?sortby=$key&sortorder=asc\">$summaryattrs{$key}</a></th>";
+    } else {
+      if ($sortorder ne "dsc") {
+        $hostdetails .= "<th><a href=\"machines.cgi?sortby=$key&sortorder=dsc\">$summaryattrs{$key}</a></th>";
+      } else {
+        $hostdetails .= "<th><a href=\"machines.cgi?sortby=$key&sortorder=asc\">$summaryattrs{$key}</a></th>";
+      }
+    }
   }
   $hostdetails .= "</tr>\n";
   
-  foreach $host (sort(keys(%summary))) {
+  my @sorted;
+  if ($sortorder eq "asc") {
+     @sorted = sort {($summary{$a}->{$sortby} cmp $summary{$b}->{$sortby}) || ($summary{$a}->{'host'} cmp $summary{$b}->{'host'})} keys(%summary)
+  } else {
+     @sorted = sort {($summary{$b}->{$sortby} cmp $summary{$a}->{$sortby}) || ($summary{$a}->{'host'} cmp $summary{$b}->{'host'})} keys(%summary)
+  }
+  foreach $host (@sorted) {
     $hostdetails .= "<tr>";
     foreach $key (@summaryorder) {
       $hostdetails .= "<td>$summary{$host}{$key}&nbsp;</td>";