X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=machines.cgi;h=81b9c8415dc79729cacf5770735d29944b9b0977;hb=refs%2Fheads%2Ffordsa;hp=ce41198dcd44da4dadd569eca5c1e83a8c0fe059;hpb=2810251c37f6e1b1ae68fcda76c1a776315633cb;p=mirror%2Fuserdir-ldap-cgi.git
diff --git a/machines.cgi b/machines.cgi
index ce41198..81b9c84 100755
--- 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);
@@ -144,7 +144,8 @@ foreach $dn (sort {$entries->{$a}->{host}->[0] cmp $entries->{$b}->{host}->[0]}
# Format email addresses
$output{admin} = sprintf("%s", $output{admin}, $output{admin});
- $output{'sponsor-admin'} = sprintf("%s", $output{'sponsor-admin'}, $output{'sponsor-admin'});
+ $output{'sponsor-admin'} = sprintf("%s", $output{'sponsor-admin'}, $output{'sponsor-admin'})
+ if defined $output{'sponsor-admin'};
$output{sshrsahostkey} = undef;
foreach $key (@{$data->{sshrsahostkey}}) {