fix capitalisation for voip field

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

diff --git a/machines.cgi b/machines.cgi
index 34d622a..de5191e 100755 (executable)
--- a/machines.cgi
+++ b/machines.cgi
@@ -92,6 +92,7 @@ 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;
 
@@ -197,9 +198,9 @@ if ($output{havehostdata}) {
   
   my @sorted;
   if ($sortorder eq "asc") {
-     @sorted = sort {$summary{$a}->{$sortby} cmp $summary{$b}->{$sortby}} keys(%summary);
+     @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}} keys(%summary);
+     @sorted = sort {($summary{$b}->{$sortby} cmp $summary{$a}->{$sortby}) || ($summary{$a}->{'host'} cmp $summary{$b}->{'host'})} keys(%summary)
   }
   foreach $host (@sorted) {
     $hostdetails .= "<tr>";