X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/e25c3a0a7caa9783c657efe86611929ecb7bd4a3..208ccbed0ee41d9092d4e908c0ea5e18a7766faa:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 5a05a0f73..f1a5f8058 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 package IkiWiki;
+
 use warnings;
 use strict;
 use Encode;
@@ -336,7 +337,7 @@ sub readfile ($;$$) { #{{{
 	return $ret;
 } #}}}
 
-sub prep_writefile ($$) {
+sub prep_writefile ($$) { #{{{
 	my $file=shift;
 	my $destdir=shift;
 	
@@ -360,7 +361,7 @@ sub prep_writefile ($$) {
 	}
 
 	return 1;
-}
+} #}}}
 
 sub writefile ($$$;$$) { #{{{
 	my $file=shift; # can include subdirs
@@ -532,7 +533,7 @@ sub displaytime ($;$) { #{{{
 	return decode_utf8(POSIX::strftime($format, localtime($time)));
 } #}}}
 
-sub beautify_url ($) { #{{{
+sub beautify_urlpath ($) { #{{{
 	my $url=shift;
 
 	if ($config{usedirs}) {
@@ -553,7 +554,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}) {
@@ -562,7 +563,7 @@ sub urlto ($$) { #{{{
 
 	my $link = abs2rel($to, dirname(htmlpage($from)));
 
-	return beautify_url($link);
+	return beautify_urlpath($link);
 } #}}}
 
 sub htmllink ($$$;@) { #{{{
@@ -609,7 +610,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\" />";
@@ -1201,6 +1202,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;