From b6d2744f934a1a6349be7a7ade1b4831e6eab2bd Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 15 Jul 2008 16:01:20 +0200
Subject: [PATCH] Use wikilink format for sponsors too - requires changing ldap

---
 debian/changelog |  3 ++-
 machines.cgi     | 17 ++---------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d20e3df..67fcfbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 userdir-ldap-cgi (0.3.12) unstable; urgency=low
 
   * Also support [[link|wiki links with alternate link text]].
+  * Use wikilink format for sponsors too - requires changing ldap.
 
- -- Peter Palfrader <weasel@debian.org>  Tue, 15 Jul 2008 15:54:19 +0200
+ -- Peter Palfrader <weasel@debian.org>  Tue, 15 Jul 2008 16:00:50 +0200
 
 userdir-ldap-cgi (0.3.11) unstable; urgency=low
 
diff --git a/machines.cgi b/machines.cgi
index 9438b26..b7cc9d0 100755
--- a/machines.cgi
+++ b/machines.cgi
@@ -157,21 +157,8 @@ foreach $dn (sort {$entries->{$a}->{host}->[0] cmp $entries->{$b}->{host}->[0]}
       $output{sshrsahostfprint} .= sshfingerprint($key) . "<br>";
     }
     
-    # URL
-    my ($sponsor, $url) = undef;
-    $output{sponsor} = undef;
-    foreach $sponsor (@{$data->{sponsor}}) {
-      $sponsor =~ m#((http|ftp)://\S+)#i;
-      $url = $1;
-      $sponsor =~ s/\s*$url\s*//;
-      $output{sponsor} .= "<br>" if ($output{sponsor});
-      if ($url) {
-        $output{sponsor} .= sprintf("<a href=\"%s\">%s</a>", $url, $sponsor);
-      } else {
-        $output{sponsor} .= $sponsor;
-      }
-    }
-
+    my $sponsor = item_uplist($data->{sponsor});
+    $output{sponsor} = $sponsor if defined $sponsor;
     my $purpose = item_uplist($data->{purpose});
     $output{purpose} = $purpose if defined $purpose;
 
-- 
2.20.1