X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=machines.cgi;h=b7cc9d0449a94dcf265d498b7c7256fb7cfae9d5;hb=b6d2744f934a1a6349be7a7ade1b4831e6eab2bd;hp=c50c4cbc6dc38b25e984e5f41e9f7f5f7162fa31;hpb=322919654cd45c61089c40679cf8eb5bce85b2a2;p=mirror%2Fuserdir-ldap-cgi.git
diff --git a/machines.cgi b/machines.cgi
index c50c4cb..b7cc9d0 100755
--- a/machines.cgi
+++ b/machines.cgi
@@ -83,16 +83,22 @@ sub sshfingerprint {
return $hrfpr;
}
-sub purposes_uplist($) {
- my ($purposes) = @_;
+sub wiki_link($) {
+ my ($in) = @_;
+ $in =~ s#\[\[(.*?)\|(.*?)\]\]#$2#g;
+ $in =~ s#\[\[(.*?)\]\]#$1#g;
+ return $in;
+}
+
+sub item_uplist($) {
+ my ($items) = @_;
my $out = undef;
- if (scalar @$purposes >= 1) {
+ if (scalar @$items >= 1) {
$out = "
".
join("", map {
- s#\[\[(.*?)\]\]#$1#g;
- "- $_
\n";
- } sort {my $A=$a; my $B=$b; $A =~ s/[\[\]]//g; $B =~ s/[\[\]]//g; $A cmp $B} @{$data->{purpose}}
+ "- ".wiki_link($_)."
\n";
+ } sort {my $A=$a; my $B=$b; $A =~ s/[\[\]]//g; $B =~ s/[\[\]]//g; $A cmp $B} @{$items}
).
"
";
}
@@ -151,22 +157,9 @@ foreach $dn (sort {$entries->{$a}->{host}->[0] cmp $entries->{$b}->{host}->[0]}
$output{sshrsahostfprint} .= sshfingerprint($key) . "
";
}
- # 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} .= "
" if ($output{sponsor});
- if ($url) {
- $output{sponsor} .= sprintf("%s", $url, $sponsor);
- } else {
- $output{sponsor} .= $sponsor;
- }
- }
-
- my $purpose = purposes_uplist($data->{purpose});
+ my $sponsor = item_uplist($data->{sponsor});
+ $output{sponsor} = $sponsor if defined $sponsor;
+ my $purpose = item_uplist($data->{purpose});
$output{purpose} = $purpose if defined $purpose;
$selected = " selected ";