2008-07-01 04:58:33 +02:00
|
|
|
#!/usr/bin/perl
|
|
|
|
package IkiWiki::Plugin::attachment;
|
|
|
|
|
|
|
|
use warnings;
|
|
|
|
use strict;
|
|
|
|
use IkiWiki 2.00;
|
2008-07-01 06:42:42 +02:00
|
|
|
|
2008-07-01 04:58:33 +02:00
|
|
|
sub import { #{{{
|
2008-07-01 19:43:32 +02:00
|
|
|
hook(type => "checkconfig", id => "attachment", call => \&checkconfig);
|
2008-07-01 04:58:33 +02:00
|
|
|
hook(type => "formbuilder_setup", id => "attachment", call => \&formbuilder_setup);
|
|
|
|
hook(type => "formbuilder", id => "attachment", call => \&formbuilder);
|
|
|
|
} # }}}
|
|
|
|
|
2008-07-01 19:43:32 +02:00
|
|
|
sub checkconfig () { #{{{
|
|
|
|
$config{cgi_disable_uploads}=0;
|
|
|
|
} #}}}
|
|
|
|
|
|
|
|
sub formbuilder_setup (@) { #{{{
|
2008-07-01 04:58:33 +02:00
|
|
|
my %params=@_;
|
|
|
|
my $form=$params{form};
|
2008-07-02 21:42:32 +02:00
|
|
|
my $q=$params{cgi};
|
2008-07-01 04:58:33 +02:00
|
|
|
|
2008-07-06 23:35:50 +02:00
|
|
|
if (defined $form->field("do") && $form->field("do") eq "edit") {
|
2008-07-01 20:02:30 +02:00
|
|
|
$form->field(name => 'attachment', type => 'file');
|
2008-07-01 23:19:38 +02:00
|
|
|
# These buttons are not put in the usual place, so
|
2008-07-02 02:35:54 +02:00
|
|
|
# are not added to the normal formbuilder button list.
|
2008-07-01 23:19:38 +02:00
|
|
|
$form->tmpl_param("field-upload" => '<input name="_submit" type="submit" value="Upload Attachment" />');
|
|
|
|
$form->tmpl_param("field-link" => '<input name="_submit" type="submit" value="Insert Links" />');
|
2008-07-02 21:42:32 +02:00
|
|
|
|
|
|
|
# Add the javascript from the toggle plugin;
|
|
|
|
# the attachments interface uses it to toggle visibility.
|
|
|
|
require IkiWiki::Plugin::toggle;
|
|
|
|
$form->tmpl_param("javascript" => $IkiWiki::Plugin::toggle::javascript);
|
|
|
|
# Start with the attachments interface toggled invisible,
|
|
|
|
# but if it was used, keep it open.
|
|
|
|
if ($form->submitted ne "Upload Attachment" &&
|
2008-07-08 15:40:46 +02:00
|
|
|
(! defined $q->param("attachment_select") ||
|
|
|
|
! length $q->param("attachment_select"))) {
|
2008-07-02 21:42:32 +02:00
|
|
|
$form->tmpl_param("attachments-class" => "toggleable");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
$form->tmpl_param("attachments-class" => "toggleable-open");
|
|
|
|
}
|
2008-07-01 20:02:30 +02:00
|
|
|
}
|
|
|
|
elsif ($form->title eq "preferences") {
|
|
|
|
my $session=$params{session};
|
|
|
|
my $user_name=$session->param("name");
|
|
|
|
|
|
|
|
$form->field(name => "allowed_attachments", size => 50,
|
|
|
|
fieldset => "admin",
|
2008-07-03 00:07:34 +02:00
|
|
|
comment => "(".
|
|
|
|
htmllink("", "",
|
|
|
|
"ikiwiki/PageSpec/attachment",
|
|
|
|
noimageinline => 1,
|
|
|
|
linktext => "Enhanced PageSpec",
|
|
|
|
).")"
|
|
|
|
);
|
2008-07-01 20:02:30 +02:00
|
|
|
if (! IkiWiki::is_admin($user_name)) {
|
|
|
|
$form->field(name => "allowed_attachments", type => "hidden");
|
|
|
|
}
|
|
|
|
if (! $form->submitted) {
|
|
|
|
$form->field(name => "allowed_attachments", force => 1,
|
|
|
|
value => IkiWiki::userinfo_get($user_name, "allowed_attachments"));
|
|
|
|
}
|
|
|
|
if ($form->submitted && $form->submitted eq 'Save Preferences') {
|
|
|
|
if (defined $form->field("allowed_attachments")) {
|
|
|
|
IkiWiki::userinfo_set($user_name, "allowed_attachments",
|
|
|
|
$form->field("allowed_attachments")) ||
|
|
|
|
error("failed to set allowed_attachments");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2008-07-01 04:58:33 +02:00
|
|
|
} #}}}
|
|
|
|
|
|
|
|
sub formbuilder (@) { #{{{
|
|
|
|
my %params=@_;
|
|
|
|
my $form=$params{form};
|
2008-07-02 00:08:31 +02:00
|
|
|
my $q=$params{cgi};
|
2008-07-01 04:58:33 +02:00
|
|
|
|
2008-07-06 23:35:50 +02:00
|
|
|
return if ! defined $form->field("do") || $form->field("do") ne "edit";
|
2008-07-01 04:58:33 +02:00
|
|
|
|
2008-07-02 01:05:15 +02:00
|
|
|
my $filename=$q->param('attachment');
|
|
|
|
if (defined $filename && length $filename &&
|
|
|
|
($form->submitted eq "Upload Attachment" || $form->submitted eq "Save Page")) {
|
2008-07-01 21:35:01 +02:00
|
|
|
my $session=$params{session};
|
2008-07-01 04:58:33 +02:00
|
|
|
|
|
|
|
# This is an (apparently undocumented) way to get the name
|
|
|
|
# of the temp file that CGI writes the upload to.
|
|
|
|
my $tempfile=$q->tmpFileName($filename);
|
|
|
|
|
2008-07-01 23:19:38 +02:00
|
|
|
$filename=IkiWiki::titlepage(
|
|
|
|
IkiWiki::possibly_foolish_untaint(
|
|
|
|
attachment_location($form->field('page')).
|
|
|
|
IkiWiki::basename($filename)));
|
2008-07-01 04:58:33 +02:00
|
|
|
if (IkiWiki::file_pruned($filename, $config{srcdir})) {
|
|
|
|
error(gettext("bad attachment filename"));
|
|
|
|
}
|
2008-07-01 05:17:01 +02:00
|
|
|
|
2008-07-01 19:31:09 +02:00
|
|
|
# Check that the user is allowed to edit a page with the
|
|
|
|
# name of the attachment.
|
2008-07-01 21:35:01 +02:00
|
|
|
IkiWiki::check_canedit($filename, $q, $session, 1);
|
2008-07-01 06:42:42 +02:00
|
|
|
|
2008-07-01 20:02:30 +02:00
|
|
|
# Use a special pagespec to test that the attachment is valid.
|
|
|
|
my $allowed=1;
|
|
|
|
foreach my $admin (@{$config{adminuser}}) {
|
|
|
|
my $allowed_attachments=IkiWiki::userinfo_get($admin, "allowed_attachments");
|
|
|
|
if (defined $allowed_attachments &&
|
|
|
|
length $allowed_attachments) {
|
|
|
|
$allowed=pagespec_match($filename,
|
|
|
|
$allowed_attachments,
|
2008-07-02 22:33:35 +02:00
|
|
|
file => $tempfile,
|
|
|
|
user => $session->param("name"),
|
|
|
|
ip => $ENV{REMOTE_ADDR},
|
|
|
|
);
|
2008-07-01 20:02:30 +02:00
|
|
|
last if $allowed;
|
2008-07-01 05:04:37 +02:00
|
|
|
}
|
2008-07-01 04:58:33 +02:00
|
|
|
}
|
2008-07-01 20:02:30 +02:00
|
|
|
if (! $allowed) {
|
|
|
|
error(gettext("attachment rejected")." ($allowed)");
|
|
|
|
}
|
2008-07-01 06:42:42 +02:00
|
|
|
|
2008-07-01 21:35:01 +02:00
|
|
|
# Needed for fast_file_copy and for rendering below.
|
2008-07-01 19:48:07 +02:00
|
|
|
require IkiWiki::Render;
|
|
|
|
|
2008-07-01 06:42:42 +02:00
|
|
|
# Move the attachment into place.
|
|
|
|
# Try to use a fast rename; fall back to copying.
|
2008-07-01 19:39:02 +02:00
|
|
|
IkiWiki::prep_writefile($filename, $config{srcdir});
|
2008-07-01 06:42:42 +02:00
|
|
|
unlink($config{srcdir}."/".$filename);
|
2008-07-02 01:05:15 +02:00
|
|
|
if (rename($tempfile, $config{srcdir}."/".$filename)) {
|
|
|
|
# The temp file has tight permissions; loosen up.
|
|
|
|
chmod(0666 & ~umask, $config{srcdir}."/".$filename);
|
|
|
|
}
|
|
|
|
else {
|
2008-07-01 06:42:42 +02:00
|
|
|
my $fh=$q->upload('attachment');
|
|
|
|
if (! defined $fh || ! ref $fh) {
|
2008-07-08 16:42:58 +02:00
|
|
|
# needed by old CGI versions
|
|
|
|
$fh=$q->param('attachment');
|
|
|
|
if (! defined $fh || ! ref $fh) {
|
|
|
|
error("failed to get filehandle");
|
|
|
|
}
|
2008-07-01 06:42:42 +02:00
|
|
|
}
|
|
|
|
binmode($fh);
|
|
|
|
writefile($filename, $config{srcdir}, undef, 1, sub {
|
|
|
|
IkiWiki::fast_file_copy($tempfile, $filename, $fh, @_);
|
|
|
|
});
|
2008-07-01 04:58:33 +02:00
|
|
|
}
|
2008-07-01 06:42:42 +02:00
|
|
|
|
2008-07-01 21:35:01 +02:00
|
|
|
# Check the attachment in and trigger a wiki refresh.
|
|
|
|
if ($config{rcs}) {
|
|
|
|
IkiWiki::rcs_add($filename);
|
|
|
|
IkiWiki::disable_commit_hook();
|
|
|
|
IkiWiki::rcs_commit($filename, gettext("attachment upload"),
|
|
|
|
IkiWiki::rcs_prepedit($filename),
|
|
|
|
$session->param("name"), $ENV{REMOTE_ADDR});
|
|
|
|
IkiWiki::enable_commit_hook();
|
|
|
|
IkiWiki::rcs_update();
|
|
|
|
}
|
|
|
|
IkiWiki::refresh();
|
|
|
|
IkiWiki::saveindex();
|
2008-07-01 04:58:33 +02:00
|
|
|
}
|
2008-07-02 00:08:31 +02:00
|
|
|
elsif ($form->submitted eq "Insert Links") {
|
|
|
|
my $add="";
|
|
|
|
foreach my $f ($q->param("attachment_select")) {
|
|
|
|
$add.="[[$f]]\n";
|
|
|
|
}
|
|
|
|
$form->field(name => 'editcontent',
|
|
|
|
value => $form->field('editcontent')."\n\n".$add,
|
2008-07-02 21:42:32 +02:00
|
|
|
force => 1) if length $add;
|
2008-07-02 00:08:31 +02:00
|
|
|
}
|
2008-07-02 01:05:15 +02:00
|
|
|
|
|
|
|
# Generate the attachment list only after having added any new
|
|
|
|
# attachments.
|
|
|
|
$form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
|
2008-07-01 04:58:33 +02:00
|
|
|
} # }}}
|
|
|
|
|
2008-07-02 01:05:15 +02:00
|
|
|
sub attachment_location ($) {
|
|
|
|
my $page=shift;
|
|
|
|
|
|
|
|
# Put the attachment in a subdir of the page it's attached
|
|
|
|
# to, unless that page is an "index" page.
|
|
|
|
$page=~s/(^|\/)index//;
|
|
|
|
$page.="/" if length $page;
|
|
|
|
|
|
|
|
return $page;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub attachment_list ($) {
|
|
|
|
my $page=shift;
|
|
|
|
my $loc=attachment_location($page);
|
|
|
|
|
|
|
|
my @ret;
|
|
|
|
foreach my $f (values %pagesources) {
|
|
|
|
if (! defined IkiWiki::pagetype($f) &&
|
|
|
|
$f=~m/^\Q$loc\E[^\/]+$/ &&
|
|
|
|
-e "$config{srcdir}/$f") {
|
|
|
|
push @ret, {
|
2008-07-02 22:08:48 +02:00
|
|
|
"field-select" => '<input type="checkbox" name="attachment_select" value="'.$f.'" />',
|
2008-07-02 01:05:15 +02:00
|
|
|
link => htmllink($page, $page, $f, noimageinline => 1),
|
|
|
|
size => humansize((stat(_))[7]),
|
|
|
|
mtime => displaytime($IkiWiki::pagemtime{$f}),
|
|
|
|
mtime_raw => $IkiWiki::pagemtime{$f},
|
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# Sort newer attachments to the top of the list, so a newly-added
|
|
|
|
# attachment appears just before the form used to add it.
|
|
|
|
return sort { $b->{mtime_raw} <=> $a->{mtime_raw} || $a->{link} cmp $b->{link} } @ret;
|
|
|
|
}
|
|
|
|
|
2008-07-02 00:40:42 +02:00
|
|
|
my %units=( # size in bytes
|
|
|
|
B => 1,
|
|
|
|
byte => 1,
|
|
|
|
KB => 2 ** 10,
|
|
|
|
kilobyte => 2 ** 10,
|
|
|
|
K => 2 ** 10,
|
|
|
|
KB => 2 ** 10,
|
|
|
|
kilobyte => 2 ** 10,
|
|
|
|
M => 2 ** 20,
|
|
|
|
MB => 2 ** 20,
|
|
|
|
megabyte => 2 ** 20,
|
|
|
|
G => 2 ** 30,
|
|
|
|
GB => 2 ** 30,
|
|
|
|
gigabyte => 2 ** 30,
|
|
|
|
T => 2 ** 40,
|
|
|
|
TB => 2 ** 40,
|
|
|
|
terabyte => 2 ** 40,
|
|
|
|
P => 2 ** 50,
|
|
|
|
PB => 2 ** 50,
|
|
|
|
petabyte => 2 ** 50,
|
|
|
|
E => 2 ** 60,
|
|
|
|
EB => 2 ** 60,
|
|
|
|
exabyte => 2 ** 60,
|
|
|
|
Z => 2 ** 70,
|
|
|
|
ZB => 2 ** 70,
|
|
|
|
zettabyte => 2 ** 70,
|
|
|
|
Y => 2 ** 80,
|
|
|
|
YB => 2 ** 80,
|
|
|
|
yottabyte => 2 ** 80,
|
|
|
|
# ikiwiki, if you find you need larger data quantities, either modify
|
|
|
|
# yourself to add them, or travel back in time to 2008 and kill me.
|
|
|
|
# -- Joey
|
|
|
|
);
|
2008-07-01 04:58:33 +02:00
|
|
|
|
2008-07-01 20:02:30 +02:00
|
|
|
sub parsesize ($) { #{{{
|
2008-07-01 04:58:33 +02:00
|
|
|
my $size=shift;
|
2008-07-02 00:40:42 +02:00
|
|
|
|
2008-07-01 04:58:33 +02:00
|
|
|
no warnings;
|
|
|
|
my $base=$size+0; # force to number
|
|
|
|
use warnings;
|
2008-07-02 00:40:42 +02:00
|
|
|
foreach my $unit (sort keys %units) {
|
2008-07-02 02:35:54 +02:00
|
|
|
if ($size=~/[0-9\s]\Q$unit\E$/i) {
|
2008-07-02 00:40:42 +02:00
|
|
|
return $base * $units{$unit};
|
|
|
|
}
|
2008-07-01 04:58:33 +02:00
|
|
|
}
|
2008-07-02 00:40:42 +02:00
|
|
|
return $base;
|
|
|
|
} #}}}
|
|
|
|
|
|
|
|
sub humansize ($) { #{{{
|
|
|
|
my $size=shift;
|
|
|
|
|
|
|
|
foreach my $unit (reverse sort { $units{$a} <=> $units{$b} || $b cmp $a } keys %units) {
|
|
|
|
if ($size / $units{$unit} > 0.25) {
|
2008-07-02 02:35:54 +02:00
|
|
|
return (int($size / $units{$unit} * 10)/10).$unit;
|
2008-07-02 00:40:42 +02:00
|
|
|
}
|
2008-07-01 04:58:33 +02:00
|
|
|
}
|
2008-07-02 00:40:42 +02:00
|
|
|
return $size; # near zero, or negative
|
2008-07-01 04:58:33 +02:00
|
|
|
} #}}}
|
|
|
|
|
2008-07-02 00:40:42 +02:00
|
|
|
package IkiWiki::PageSpec;
|
|
|
|
|
2008-07-01 04:58:33 +02:00
|
|
|
sub match_maxsize ($$;@) { #{{{
|
|
|
|
shift;
|
2008-07-02 00:40:42 +02:00
|
|
|
my $maxsize=eval{IkiWiki::Plugin::attachment::parsesize(shift)};
|
2008-07-01 04:58:33 +02:00
|
|
|
if ($@) {
|
|
|
|
return IkiWiki::FailReason->new("unable to parse maxsize (or number too large)");
|
|
|
|
}
|
|
|
|
|
|
|
|
my %params=@_;
|
2008-07-01 05:17:01 +02:00
|
|
|
if (! exists $params{file}) {
|
2008-07-01 05:32:08 +02:00
|
|
|
return IkiWiki::FailReason->new("no file specified");
|
2008-07-01 04:58:33 +02:00
|
|
|
}
|
|
|
|
|
2008-07-01 05:17:01 +02:00
|
|
|
if (-s $params{file} > $maxsize) {
|
2008-07-02 01:05:15 +02:00
|
|
|
return IkiWiki::FailReason->new("file too large (".(-s $params{file})." > $maxsize)");
|
2008-07-01 04:58:33 +02:00
|
|
|
}
|
|
|
|
else {
|
2008-07-01 05:17:01 +02:00
|
|
|
return IkiWiki::SuccessReason->new("file not too large");
|
2008-07-01 04:58:33 +02:00
|
|
|
}
|
|
|
|
} #}}}
|
|
|
|
|
|
|
|
sub match_minsize ($$;@) { #{{{
|
|
|
|
shift;
|
2008-07-02 00:40:42 +02:00
|
|
|
my $minsize=eval{IkiWiki::Plugin::attachment::parsesize(shift)};
|
2008-07-01 04:58:33 +02:00
|
|
|
if ($@) {
|
|
|
|
return IkiWiki::FailReason->new("unable to parse minsize (or number too large)");
|
|
|
|
}
|
|
|
|
|
|
|
|
my %params=@_;
|
2008-07-01 05:17:01 +02:00
|
|
|
if (! exists $params{file}) {
|
2008-07-01 05:32:08 +02:00
|
|
|
return IkiWiki::FailReason->new("no file specified");
|
2008-07-01 04:58:33 +02:00
|
|
|
}
|
|
|
|
|
2008-07-01 05:17:01 +02:00
|
|
|
if (-s $params{file} < $minsize) {
|
|
|
|
return IkiWiki::FailReason->new("file too small");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return IkiWiki::SuccessReason->new("file not too small");
|
|
|
|
}
|
|
|
|
} #}}}
|
|
|
|
|
2008-07-02 23:30:00 +02:00
|
|
|
sub match_mimetype ($$;@) { #{{{
|
|
|
|
shift;
|
|
|
|
my $wanted=shift;
|
|
|
|
|
|
|
|
my %params=@_;
|
|
|
|
if (! exists $params{file}) {
|
|
|
|
return IkiWiki::FailReason->new("no file specified");
|
|
|
|
}
|
|
|
|
|
|
|
|
# Use ::magic to get the mime type, the idea is to only trust
|
|
|
|
# data obtained by examining the actual file contents.
|
|
|
|
eval q{use File::MimeInfo::Magic};
|
|
|
|
if ($@) {
|
|
|
|
return IkiWiki::FailReason->new("failed to load File::MimeInfo::Magic ($@); cannot check MIME type");
|
|
|
|
}
|
|
|
|
my $mimetype=File::MimeInfo::Magic::magic($params{file});
|
|
|
|
if (! defined $mimetype) {
|
|
|
|
$mimetype="unknown";
|
|
|
|
}
|
|
|
|
|
2008-07-02 23:33:37 +02:00
|
|
|
my $regexp=IkiWiki::glob2re($wanted);
|
2008-07-02 23:30:00 +02:00
|
|
|
if ($mimetype!~/^$regexp$/i) {
|
|
|
|
return IkiWiki::FailReason->new("file MIME type is $mimetype, not $wanted");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return IkiWiki::SuccessReason->new("file MIME type is $mimetype");
|
|
|
|
}
|
|
|
|
} #}}}
|
|
|
|
|
2008-07-06 23:36:26 +02:00
|
|
|
sub match_virusfree ($$;@) { #{{{
|
|
|
|
shift;
|
|
|
|
my $wanted=shift;
|
|
|
|
|
|
|
|
my %params=@_;
|
|
|
|
if (! exists $params{file}) {
|
|
|
|
return IkiWiki::FailReason->new("no file specified");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (! exists $IkiWiki::config{virus_checker} ||
|
|
|
|
! length $IkiWiki::config{virus_checker}) {
|
|
|
|
return IkiWiki::FailReason->new("no virus_checker configured");
|
|
|
|
}
|
|
|
|
|
|
|
|
# The file needs to be fed into the virus checker on stdin,
|
|
|
|
# because the file is not world-readable, and if clamdscan is
|
|
|
|
# used, clamd would fail to read it.
|
|
|
|
eval q{use IPC::Open2};
|
|
|
|
error($@) if $@;
|
|
|
|
open (IN, "<", $params{file}) || return IkiWiki::FailReason->new("failed to read file");
|
|
|
|
binmode(IN);
|
|
|
|
my $sigpipe=0;
|
|
|
|
$SIG{PIPE} = sub { $sigpipe=1 };
|
|
|
|
my $pid=open2(\*CHECKER_OUT, "<&IN", $IkiWiki::config{virus_checker});
|
|
|
|
my $reason=<CHECKER_OUT>;
|
|
|
|
chomp $reason;
|
|
|
|
1 while (<CHECKER_OUT>);
|
|
|
|
close(CHECKER_OUT);
|
|
|
|
waitpid $pid, 0;
|
|
|
|
$SIG{PIPE}="DEFAULT";
|
|
|
|
if ($sigpipe || $?) {
|
|
|
|
return IkiWiki::FailReason->new("file seems to contain a virus ($reason)");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return IkiWiki::SuccessReason->new("file seems virusfree ($reason)");
|
|
|
|
}
|
|
|
|
} #}}}
|
|
|
|
|
2008-07-01 05:17:01 +02:00
|
|
|
sub match_ispage ($$;@) { #{{{
|
|
|
|
my $filename=shift;
|
|
|
|
|
2008-07-01 06:43:19 +02:00
|
|
|
if (defined IkiWiki::pagetype($filename)) {
|
2008-07-01 05:17:01 +02:00
|
|
|
return IkiWiki::SuccessReason->new("file is a wiki page");
|
2008-07-01 04:58:33 +02:00
|
|
|
}
|
|
|
|
else {
|
2008-07-01 05:17:01 +02:00
|
|
|
return IkiWiki::FailReason->new("file is not a wiki page");
|
2008-07-01 04:58:33 +02:00
|
|
|
}
|
|
|
|
} #}}}
|
|
|
|
|
2008-07-02 22:33:35 +02:00
|
|
|
sub match_user ($$;@) { #{{{
|
|
|
|
shift;
|
|
|
|
my $user=shift;
|
|
|
|
my %params=@_;
|
|
|
|
|
|
|
|
if (! exists $params{user}) {
|
|
|
|
return IkiWiki::FailReason->new("no user specified");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (defined $params{user} && lc $params{user} eq lc $user) {
|
|
|
|
return IkiWiki::SuccessReason->new("user is $user");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return IkiWiki::FailReason->new("user is $params{user}, not $user");
|
|
|
|
}
|
|
|
|
} #}}}
|
|
|
|
|
|
|
|
sub match_ip ($$;@) { #{{{
|
|
|
|
shift;
|
|
|
|
my $ip=shift;
|
|
|
|
my %params=@_;
|
|
|
|
|
|
|
|
if (! exists $params{ip}) {
|
|
|
|
return IkiWiki::FailReason->new("no IP specified");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (defined $params{ip} && lc $params{ip} eq lc $ip) {
|
|
|
|
return IkiWiki::SuccessReason->new("IP is $ip");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return IkiWiki::FailReason->new("IP is $params{ip}, not $ip");
|
|
|
|
}
|
|
|
|
} #}}}
|
|
|
|
|
2008-07-01 04:58:33 +02:00
|
|
|
1
|