[Da-tools-commits] ./debian/userdir-ldap-cgi r99: Use wikilink format for sponsors too - requires changing ldap

[Peter Palfrader]

------------------------------------------------------------
revno: 99
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap-cgi
timestamp: Tue 2008-07-15 16:01:20 +0200
message:
  Use wikilink format for sponsors too - requires changing ldap
modified:
  debian/changelog
  machines.cgi
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-07-15 13:55:44 +0000
+++ b/debian/changelog	2008-07-15 14:01:20 +0000
@@ -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 at debian.org>  Tue, 15 Jul 2008 15:54:19 +0200
+ -- Peter Palfrader <weasel at debian.org>  Tue, 15 Jul 2008 16:00:50 +0200
 
 userdir-ldap-cgi (0.3.11) unstable; urgency=low
 

=== modified file 'machines.cgi'
--- a/machines.cgi	2008-07-15 13:59:12 +0000
+++ b/machines.cgi	2008-07-15 14:01:20 +0000
@@ -157,21 +157,8 @@
       $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;