projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
only htmlize errors when cgi is actually running
[ikiwiki.git]
/
IkiWiki.pm
diff --git
a/IkiWiki.pm
b/IkiWiki.pm
index 0b420e824975172b7a72ea6484f81c323cbde14e..d4e19c388fa19c8abfd75b6504b3190910e13536 100644
(file)
--- a/
IkiWiki.pm
+++ b/
IkiWiki.pm
@@
-1,6
+1,7
@@
#!/usr/bin/perl
package IkiWiki;
#!/usr/bin/perl
package IkiWiki;
+
use warnings;
use strict;
use Encode;
use warnings;
use strict;
use Encode;
@@
-188,11
+189,6
@@
sub loadplugin ($) { #{{{
sub error ($;$) { #{{{
my $message=shift;
my $cleaner=shift;
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->();
log_message('err' => $message) if $config{syslog};
if (defined $cleaner) {
$cleaner->();
@@
-336,7
+332,7
@@
sub readfile ($;$$) { #{{{
return $ret;
} #}}}
return $ret;
} #}}}
-sub prep_writefile ($$) {
+sub prep_writefile ($$) {
#{{{
my $file=shift;
my $destdir=shift;
my $file=shift;
my $destdir=shift;
@@
-360,7
+356,7
@@
sub prep_writefile ($$) {
}
return 1;
}
return 1;
-}
+}
#}}}
sub writefile ($$$;$$) { #{{{
my $file=shift; # can include subdirs
sub writefile ($$$;$$) { #{{{
my $file=shift; # can include subdirs
@@
-532,13
+528,18
@@
sub displaytime ($;$) { #{{{
return decode_utf8(POSIX::strftime($format, localtime($time)));
} #}}}
return decode_utf8(POSIX::strftime($format, localtime($time)));
} #}}}
-sub beautify_url ($) { #{{{
+sub beautify_url
path
($) { #{{{
my $url=shift;
if ($config{usedirs}) {
$url =~ s!/index.$config{htmlext}$!/!;
}
my $url=shift;
if ($config{usedirs}) {
$url =~ s!/index.$config{htmlext}$!/!;
}
- $url =~ s!^$!./!; # Browsers don't like empty links...
+
+ # Ensure url is not an empty link, and
+ # if it's relative, make that explicit to avoid colon confusion.
+ if ($url !~ /\//) {
+ $url="./$url";
+ }
return $url;
} #}}}
return $url;
} #}}}
@@
-548,7
+549,7
@@
sub urlto ($$) { #{{{
my $from=shift;
if (! length $to) {
my $from=shift;
if (! length $to) {
- return beautify_url(baseurl($from)."index.$config{htmlext}");
+ return beautify_url
path
(baseurl($from)."index.$config{htmlext}");
}
if (! $destsources{$to}) {
}
if (! $destsources{$to}) {
@@
-557,7
+558,7
@@
sub urlto ($$) { #{{{
my $link = abs2rel($to, dirname(htmlpage($from)));
my $link = abs2rel($to, dirname(htmlpage($from)));
- return beautify_url($link);
+ return beautify_url
path
($link);
} #}}}
sub htmllink ($$$;@) { #{{{
} #}}}
sub htmllink ($$$;@) { #{{{
@@
-604,7
+605,7
@@
sub htmllink ($$$;@) { #{{{
}
$bestlink=abs2rel($bestlink, dirname(htmlpage($page)));
}
$bestlink=abs2rel($bestlink, dirname(htmlpage($page)));
- $bestlink=beautify_url($bestlink);
+ $bestlink=beautify_url
path
($bestlink);
if (! $opts{noimageinline} && isinlinableimage($bestlink)) {
return "<img src=\"$bestlink\" alt=\"$linktext\" />";
if (! $opts{noimageinline} && isinlinableimage($bestlink)) {
return "<img src=\"$bestlink\" alt=\"$linktext\" />";
@@
-1196,6
+1197,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;
sub pagespec_merge ($$) { #{{{
my $a=shift;
my $b=shift;