[Da-tools-commits] ./debian/userdir-ldap-cgi r96: Also support [[link|wiki links with alternate link text]].

[Peter Palfrader]

------------------------------------------------------------
revno: 96
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap-cgi
timestamp: Tue 2008-07-15 15:55:44 +0200
message:
  Also support [[link|wiki links with alternate link text]].
modified:
  debian/changelog
  machines.cgi
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-07-15 13:27:17 +0000
+++ b/debian/changelog	2008-07-15 13:55:44 +0000
@@ -1,3 +1,9 @@
+userdir-ldap-cgi (0.3.12) unstable; urgency=low
+
+  * Also support [[link|wiki links with alternate link text]].
+
+ -- Peter Palfrader <weasel at debian.org>  Tue, 15 Jul 2008 15:54:19 +0200
+
 userdir-ldap-cgi (0.3.11) unstable; urgency=low
 
   * Show purposes as a bullet list

=== modified file 'machines.cgi'
--- a/machines.cgi	2008-07-15 13:26:52 +0000
+++ b/machines.cgi	2008-07-15 13:55:44 +0000
@@ -83,6 +83,13 @@
     return $hrfpr;
 }
 
+sub wiki_link($) {
+	my ($in) = @_;
+	$in =~ s#\[\[(.*?)\|(.*?)\]\]#<a href="http://$1">$2</a>#g;
+	$in =~ s#\[\[(.*?)\]\]#<a href="http://$1">$1</a>#g;
+	return $in;
+}
+
 sub purposes_uplist($) {
 	my ($purposes) = @_;
 	my $out = undef;
@@ -90,8 +97,7 @@
 	if (scalar @$purposes >= 1) {
 		$out = "<ul>".
 			join("", map { 
-				s#\[\[(.*?)\]\]#<a href="http://$1">$1</a>#g;
-				"<li>$_</li>\n";
+				"<li>".wiki_link($_)."</li>\n";
 			  } sort {my $A=$a; my $B=$b; $A =~ s/[\[\]]//g; $B =~ s/[\[\]]//g; $A cmp $B} @{$data->{purpose}}
 			).
 			"</ul>";