Add changelog entry for machines.cgi location detail fix

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

diff --git a/machines.cgi b/machines.cgi
index 74cacb6..81b9c84 100755 (executable)
--- a/machines.cgi
+++ b/machines.cgi
@@ -27,7 +27,7 @@ my (%attrs, @attrorder, %summaryattrs, @summaryorder, %summarylistitems);
          'access' => 'Access',
          'sponsor' => 'Sponsor',
          'sponsor-admin' => 'Sponsor admin',
-         'location' => 'Location',
+         'l' => 'Location',
          'machine' => 'Processor',
          'memory' => 'Memory',
          'disk' => 'Disk space',
@@ -36,14 +36,14 @@ my (%attrs, @attrorder, %summaryattrs, @summaryorder, %summarylistitems);
          'notes' => 'Notes',
          'sshrsahostkey' => 'SSH host key',
          'description' => 'Description',
-         'purpose' => 'purposes of this server',
+         'purpose' => 'Purposes of this server',
 #        'createtimestamp' => 'Entry created',
 #        'modifytimestamp' => 'Entry modified'
         );
 
 # This defines what fields are displayed, and in what order
 @attrorder = qw(hostname admin architecture distribution access
-                sponsor sponsor-admin location machine memory
+                sponsor sponsor-admin l machine memory
                disk bandwidth status notes sshrsahostkey sshrsahostfprint
                description purpose);
 
@@ -95,7 +95,7 @@ sub item_uplist($) {
                $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} @tmp
+                         } sort {my $A=$a; my $B=$b; $A =~ s/\[\[[-*]?(.*?)\]\]/\1/g; $B =~ s/\[\[[-*]?(.*?)\]\]/\1/g; $A cmp $B} @tmp
                        ).
                        "</ul>";
        }
@@ -144,7 +144,8 @@ foreach $dn (sort {$entries->{$a}->{host}->[0] cmp $entries->{$b}->{host}->[0]}
     
     # Format email addresses
     $output{admin} = sprintf("<a href=\"mailto:%s\">%s</a>", $output{admin}, $output{admin});
-    $output{'sponsor-admin'} = sprintf("<a href=\"mailto:%s\">%s</a>", $output{'sponsor-admin'}, $output{'sponsor-admin'});
+    $output{'sponsor-admin'} = sprintf("<a href=\"mailto:%s\">%s</a>", $output{'sponsor-admin'}, $output{'sponsor-admin'})
+      if defined $output{'sponsor-admin'};
 
     $output{sshrsahostkey} = undef;
     foreach $key (@{$data->{sshrsahostkey}}) {