X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4cbb1095d62b9b2ded9546040e4bc5f5b0faef67..1226d9f144310876080c077a9c45bd2257829a32:/IkiWiki/Plugin/sparkline.pm

diff --git a/IkiWiki/Plugin/sparkline.pm b/IkiWiki/Plugin/sparkline.pm
index 63c2cf943..e28d2605a 100644
--- a/IkiWiki/Plugin/sparkline.pm
+++ b/IkiWiki/Plugin/sparkline.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::sparkline;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 3.00;
 use IPC::Open2;
 
 my $match_num=qr/[-+]?[0-9]+(?:\.[0-9]+)?/;
@@ -14,11 +14,21 @@ my %locmap=(
 	left => 'TEXT_LEFT',
 );
 
-sub import { #{{{
+sub import {
+	hook(type => "getsetup", id => "sparkline", call => \&getsetup);
 	hook(type => "preprocess", id => "sparkline", call => \&preprocess);
-} # }}}
-
-sub preprocess (@) { #{{{
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+			section => "widget",
+		},
+}
+
+sub preprocess (@) {
 	my %params=@_;
 
 	my $php;
@@ -60,13 +70,13 @@ sub preprocess (@) { #{{{
 			}
 		}
 		elsif (! length $value) {
-			return "[[".gettext("sparkline parse error")." \"$key\"]]";
+			error gettext("parse error")." \"$key\"";
 		}
 		elsif ($key eq 'featurepoint') {
 			my ($x, $y, $color, $diameter, $text, $location)=
 				split(/\s*,\s*/, $value);
 			if (! defined $diameter || $diameter < 0) {
-				return "[[".gettext("sparkline bad featurepoint diameter")."]]";
+				error gettext("invalid featurepoint diameter");
 			}
 			$x=int($x);
 			$y=int($y);
@@ -76,7 +86,7 @@ sub preprocess (@) { #{{{
 			if (defined $location) {
 				$location=$locmap{$location};
 				if (! defined $location) {
-					return "[[".gettext("sparkline bad featurepoint location")."]]";
+					error gettext("invalid featurepoint location");
 				}
 			}
 			$php.=qq{\$sparkline->SetFeaturePoint($x, $y, '$color', $diameter};
@@ -87,23 +97,23 @@ sub preprocess (@) { #{{{
 	}
 
 	if ($c eq 0) {
-		return "[[".gettext("sparkline missing values")."]]";
+		error gettext("missing values");
 	}
 
 	my $height=int($params{height} || 20);
 	if ($height < 2 || $height > 100) {
-		return "[[".gettext("sparkline bad height value")."]]";
+		error gettext("invalid height value");
 	}
 	if ($style eq "Bar") {
 		$php.=qq{\$sparkline->Render($height);\n};
 	}
 	else {
 		if (! exists $params{width}) {
-			return "[[".gettext("sparkline missing width parameter")."]]";
+			error gettext("missing width parameter");
 		}
 		my $width=int($params{width});
 		if ($width < 2 || $width > 1024) {
-			return "[[".gettext("sparkline bad width value")."]]";
+			error gettext("invalid width value");
 		}
 		$php.=qq{\$sparkline->RenderResampled($width, $height);\n};
 	}
@@ -112,16 +122,16 @@ sub preprocess (@) { #{{{
 
 	# Use the sha1 of the php code that generates the sparkline as
 	# the base for its filename.
-	eval q{use Digest::SHA1};
+	eval q{use Digest::SHA};
         error($@) if $@;
 	my $fn=$params{page}."/sparkline-".
-		IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($php)).
+		IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($php)).
 		".png";
 	will_render($params{page}, $fn);
 
 	if (! -e "$config{destdir}/$fn") {
 		my $pid;
-		my $sigpipe=0;;
+		my $sigpipe=0;
 		$SIG{PIPE}=sub { $sigpipe=1 };
 		$pid=open2(*IN, *OUT, "php");
 
@@ -140,15 +150,16 @@ sub preprocess (@) { #{{{
 
 		waitpid $pid, 0;
 		$SIG{PIPE}="DEFAULT";
-		if ($sigpipe) {
-			return  "[[".gettext("sparkline failed to run php")."]]";
+		if ($sigpipe || ! defined $png) {
+			error gettext("failed to run php");
 		}
 
 		if (! $params{preview}) {
 			writefile($fn, $config{destdir}, $png, 1);
 		}
 		else {
-			# can't write the file, so embed it in a data uri
+			# in preview mode, embed the image in a data uri
+			# to avoid temp file clutter
 			eval q{use MIME::Base64};
 		        error($@) if $@;
 			return "<img src=\"data:image/png;base64,".
@@ -156,9 +167,7 @@ sub preprocess (@) { #{{{
 		}
 	}
 
-	return '<img src="'.
-		IkiWiki::abs2rel($fn, IkiWiki::dirname($params{destpage})).
-		'" alt="graph" />';
-} # }}}
+	return '<img src="'.urlto($fn, $params{destpage}).'" alt="graph" />';
+}
 
 1