[Da-tools-commits] ./debian/userdir-ldap-cgi r94: Show purposes as a bullet list, support [[wikistylelinks]]

[Peter Palfrader]

------------------------------------------------------------
revno: 94
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap-cgi
timestamp: Tue 2008-07-15 15:26:52 +0200
message:
  Show purposes as a bullet list, support [[wikistylelinks]]
modified:
  machines.cgi
-------------- next part --------------
=== modified file 'machines.cgi'
--- a/machines.cgi	2008-05-25 16:27:04 +0000
+++ b/machines.cgi	2008-07-15 13:26:52 +0000
@@ -83,6 +83,22 @@
     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;
@@ -150,9 +166,9 @@
       }
     }
 
-	#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 ";    
   }