X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=back2html.pm;h=ba224c79acbba03e092a68019ff015133479f37d;hb=da4562f447dcd048e2f7d73b50038f0b8414572c;hp=8fc39b45debdbdca87b394b6d7ef3c60a8c1d737;hpb=08b96bd50d1e1a45d79111a00e3935550df0c969;p=webpac

diff --git a/back2html.pm b/back2html.pm
index 8fc39b4..ba224c7 100644
--- a/back2html.pm
+++ b/back2html.pm
@@ -6,21 +6,43 @@
 
 sub back2html {
 	my $html = shift;
+	my $url_params = shift;
 
+	$html =~ s/</&lt;/g;
+	$html =~ s/>/&gt;/g;
 	my $out;
-	foreach $line (split(/###/,$html)) {
-		$out .= "<tr><td>";
-		my @items = split(/#-#/,$line);
-		if ($items[1] =~ m#(http://[\S]+)\s*.*?#i) {
+	foreach $line (split(/\s*###\s*/,$html)) {
+		$out .= "<tr><td valign=\"top\">";
+		my @items = split(/\s*#-#\s*/,$line);
+		# convert spaces in left field to non-breaking spaces
+		$items[0] =~ s#\s+#&nbsp;#g;
+		# try to make link on right field
+		sub mkurl($) {
+			my $url = shift || die "mkurl needs url as argument";
 			# chop URLS longer than 60 characters
-			my $url = substr($1,0,60);
-			$url .= "..." if (length($1) > 60);
-			$items[1] =~ s#(.*)\b(http://[\S]+)(\b?.*)#$1<a href=\"$2\">$url</a>$3#g;
+			my $txturl = substr($1,0,60);
+			$txturl .= "..." if (length($1) > 60);
+			return "<a href=\"$url\">$txturl</a>";
 		}
+		$items[1] =~ s#(http://[\S]+)#mkurl($1)#gie;
 		$out .= join("</td><td>",@items);
 		$out .= "</td></tr>\n";
 	}
-	$out =~ s/&lt;br\/*&gt;/<br\/>/g;
+	# put <br> back into html
+	$out =~ s,&lt;br/*&gt;,<br/>,gi;
+	# put <a href=xxx>yyyy</a> back into html
+	sub mkurl_param($$$$) {
+		my ($a_href,$url,$text,$a_end) = @_;
+		if ($url_params) {
+			if ($url =~ m#\?#) {
+				$url .= "&".$url_params;
+			} else {
+				$url .= "?".$url_params;
+			}
+		}
+		return '<'.$a_href.'"'.$url.'">'.$text.'<'.$a_end.'>';
+	}
+	$out =~ s#&lt;(a\s+href=)['"]*(.+?)['"]*&gt;(.+?)&lt;(/a)&gt;#mkurl_param($1,$2,$3,$4)#gsie;
 	return $out;
 }