X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/98bd33eee47852021b360795cf0d6dd041bcebb7..59ad1a440aa71be06f2db8fdd1edb98f3f0bd39b:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6e03121c0..80e317110 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -189,11 +189,6 @@ sub loadplugin ($) { #{{{
 sub error ($;$) { #{{{
 	my $message=shift;
 	my $cleaner=shift;
-	if ($config{cgi}) {
-		print "Content-type: text/html\n\n";
-		print misctemplate(gettext("Error"),
-			"<p>".gettext("Error").": $message</p>");
-	}
 	log_message('err' => $message) if $config{syslog};
 	if (defined $cleaner) {
 		$cleaner->();
@@ -337,7 +332,7 @@ sub readfile ($;$$) { #{{{
 	return $ret;
 } #}}}
 
-sub prep_writefile ($$) {
+sub prep_writefile ($$) { #{{{
 	my $file=shift;
 	my $destdir=shift;
 	
@@ -361,7 +356,7 @@ sub prep_writefile ($$) {
 	}
 
 	return 1;
-}
+} #}}}
 
 sub writefile ($$$;$$) { #{{{
 	my $file=shift; # can include subdirs
@@ -533,7 +528,7 @@ sub displaytime ($;$) { #{{{
 	return decode_utf8(POSIX::strftime($format, localtime($time)));
 } #}}}
 
-sub beautify_url ($) { #{{{
+sub beautify_urlpath ($) { #{{{
 	my $url=shift;
 
 	if ($config{usedirs}) {
@@ -554,7 +549,7 @@ sub urlto ($$) { #{{{
 	my $from=shift;
 
 	if (! length $to) {
-		return beautify_url(baseurl($from)."index.$config{htmlext}");
+		return beautify_urlpath(baseurl($from)."index.$config{htmlext}");
 	}
 
 	if (! $destsources{$to}) {
@@ -563,7 +558,7 @@ sub urlto ($$) { #{{{
 
 	my $link = abs2rel($to, dirname(htmlpage($from)));
 
-	return beautify_url($link);
+	return beautify_urlpath($link);
 } #}}}
 
 sub htmllink ($$$;@) { #{{{
@@ -610,7 +605,7 @@ sub htmllink ($$$;@) { #{{{
 	}
 	
 	$bestlink=abs2rel($bestlink, dirname(htmlpage($page)));
-	$bestlink=beautify_url($bestlink);
+	$bestlink=beautify_urlpath($bestlink);
 	
 	if (! $opts{noimageinline} && isinlinableimage($bestlink)) {
 		return "<img src=\"$bestlink\" alt=\"$linktext\" />";
@@ -773,21 +768,30 @@ sub preprocess ($$$;$$) { #{{{
 			}
 			my $ret;
 			if (! $scan) {
-				$ret=$hooks{preprocess}{$command}{call}->(
-					@params,
-					page => $page,
-					destpage => $destpage,
-					preview => $preprocess_preview,
-				);
+				$ret=eval {
+					$hooks{preprocess}{$command}{call}->(
+						@params,
+						page => $page,
+						destpage => $destpage,
+						preview => $preprocess_preview,
+					);
+				};
+				if ($@) {
+					chomp $@;
+				 	$ret="[[!$command <span class=\"error\">".
+						gettext("Error").": $@"."</span>]]";
+				}
 			}
 			else {
 				# use void context during scan pass
-				$hooks{preprocess}{$command}{call}->(
-					@params,
-					page => $page,
-					destpage => $destpage,
-					preview => $preprocess_preview,
-				);
+				eval {
+					$hooks{preprocess}{$command}{call}->(
+						@params,
+						page => $page,
+						destpage => $destpage,
+						preview => $preprocess_preview,
+					);
+				};
 				$ret="";
 			}
 			$preprocessing{$page}--;
@@ -1202,6 +1206,12 @@ sub gettext { #{{{
 	}
 } #}}}
 
+sub yesno ($) { #{{{
+	my $val=shift;
+
+	return (defined $val && lc($val) eq gettext("yes"));
+} #}}}
+
 sub pagespec_merge ($$) { #{{{
 	my $a=shift;
 	my $b=shift;