Also support [[link|wiki links with alternate link text]].

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

diff --git a/machines.cgi b/machines.cgi
index c50c4cb..4cfe3a8 100755 (executable)
--- a/machines.cgi
+++ b/machines.cgi
@@ -83,6 +83,13 @@ sub sshfingerprint {
     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 @@ sub purposes_uplist($) {
        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>";