X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=machines.cgi;h=c50c4cbc6dc38b25e984e5f41e9f7f5f7162fa31;hb=322919654cd45c61089c40679cf8eb5bce85b2a2;hp=166c2cae566f51f7061860871e3d419e0c8a7f70;hpb=295f9baecdce2ac043eaf41833094b0435d932aa;p=mirror%2Fuserdir-ldap-cgi.git

diff --git a/machines.cgi b/machines.cgi
index 166c2ca..c50c4cb 100755
--- a/machines.cgi
+++ b/machines.cgi
@@ -83,6 +83,22 @@ 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;
@@ -92,6 +108,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;
 
@@ -149,9 +166,9 @@ foreach $dn (sort {$entries->{$a}->{host}->[0] cmp $entries->{$b}->{host}->[0]}
       }
     }
 
-	#Reformat purposes to be pleasing for the human eye:
-	$output{purpose} = join(",", @{$data->{purpose}});
-    
+    my $purpose = purposes_uplist($data->{purpose});
+    $output{purpose} = $purpose if defined $purpose;
+
     $selected = " selected ";    
   }