Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
acl response
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
editdiff.pm
diff --git
a/IkiWiki/Plugin/editdiff.pm
b/IkiWiki/Plugin/editdiff.pm
index 9872e9686c2a3255d638968002a5d6339c1d20e2..015ce9c148d554c29a3db6a04227a2a50c88f02e 100644
(file)
--- a/
IkiWiki/Plugin/editdiff.pm
+++ b/
IkiWiki/Plugin/editdiff.pm
@@
-4,16
+4,26
@@
package IkiWiki::Plugin::editdiff;
use warnings;
use strict;
use warnings;
use strict;
-use IkiWiki
2
.00;
+use IkiWiki
3
.00;
use HTML::Entities;
use IPC::Open2;
use HTML::Entities;
use IPC::Open2;
-sub import { #{{{
+sub import {
+ hook(type => "getsetup", id => "editdiff", call => \&getsetup);
hook(type => "formbuilder_setup", id => "editdiff",
call => \&formbuilder_setup);
hook(type => "formbuilder_setup", id => "editdiff",
call => \&formbuilder_setup);
-}
#}}}
+}
-sub diff ($$) { #{{{
+sub getsetup () {
+ return
+ plugin => {
+ safe => 1,
+ rebuild => 0,
+ section => "web",
+ },
+}
+
+sub diff ($$) {
my $orig=shift;
my $content=shift;
my $orig=shift;
my $content=shift;
@@
-41,13
+51,13
@@
sub diff ($$) { #{{{
return "couldn't run diff\n" if $sigpipe;
return "<pre>".encode_entities($ret)."</pre>";
return "couldn't run diff\n" if $sigpipe;
return "<pre>".encode_entities($ret)."</pre>";
-}
#}}}
+}
-sub formbuilder_setup {
#{{{
+sub formbuilder_setup {
my %params=@_;
my $form=$params{form};
my %params=@_;
my $form=$params{form};
- return if
defined !
$form->field("do") || $form->field("do") ne "edit";
+ return if
! defined
$form->field("do") || $form->field("do") ne "edit";
my $page=$form->field("page");
$page = IkiWiki::possibly_foolish_untaint($page);
my $page=$form->field("page");
$page = IkiWiki::possibly_foolish_untaint($page);
@@
-61,8
+71,8
@@
sub formbuilder_setup { #{{{
$content=~s/\r/\n/g;
my $diff = diff(srcfile($pagesources{$page}), $content);
$content=~s/\r/\n/g;
my $diff = diff(srcfile($pagesources{$page}), $content);
- $form->tmpl_param("page_
preview
", $diff);
+ $form->tmpl_param("page_
diff
", $diff);
}
}
-}
#}}}
+}
1
1