master
Joey Hess 2008-07-23 19:25:46 -04:00
parent 4944fb6829
commit 762bf0b887
3 changed files with 18 additions and 18 deletions

View File

@ -11,7 +11,7 @@ sub import { #{{{
hook(type => "formbuilder", id => "attachment", call => \&formbuilder); hook(type => "formbuilder", id => "attachment", call => \&formbuilder);
} # }}} } # }}}
sub check_canattach ($$;$) { sub check_canattach ($$;$) { #{{{
my $session=shift; my $session=shift;
my $dest=shift; # where it's going to be put, under the srcdir my $dest=shift; # where it's going to be put, under the srcdir
my $file=shift; # the path to the attachment currently my $file=shift; # the path to the attachment currently
@ -43,7 +43,7 @@ sub check_canattach ($$;$) {
else { else {
return 1; return 1;
} }
} } #}}}
sub checkconfig () { #{{{ sub checkconfig () { #{{{
$config{cgi_disable_uploads}=0; $config{cgi_disable_uploads}=0;
@ -207,7 +207,7 @@ sub formbuilder (@) { #{{{
$form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]); $form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
} # }}} } # }}}
sub attachment_location ($) { sub attachment_location ($) { #{{{
my $page=shift; my $page=shift;
# Put the attachment in a subdir of the page it's attached # Put the attachment in a subdir of the page it's attached
@ -216,9 +216,9 @@ sub attachment_location ($) {
$page.="/" if length $page; $page.="/" if length $page;
return $page; return $page;
} } #}}}
sub attachment_list ($) { sub attachment_list ($) { #{{{
my $page=shift; my $page=shift;
my $loc=attachment_location($page); my $loc=attachment_location($page);
@ -240,9 +240,9 @@ sub attachment_list ($) {
# Sort newer attachments to the top of the list, so a newly-added # Sort newer attachments to the top of the list, so a newly-added
# attachment appears just before the form used to add it. # attachment appears just before the form used to add it.
return sort { $b->{mtime_raw} <=> $a->{mtime_raw} || $a->{link} cmp $b->{link} } @ret; return sort { $b->{mtime_raw} <=> $a->{mtime_raw} || $a->{link} cmp $b->{link} } @ret;
} } #}}}
my %units=( # size in bytes my %units=( #{{{ # size in bytes
B => 1, B => 1,
byte => 1, byte => 1,
KB => 2 ** 10, KB => 2 ** 10,
@ -274,7 +274,7 @@ my %units=( # size in bytes
# ikiwiki, if you find you need larger data quantities, either modify # 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. # yourself to add them, or travel back in time to 2008 and kill me.
# -- Joey # -- Joey
); ); #}}}
sub parsesize ($) { #{{{ sub parsesize ($) { #{{{
my $size=shift; my $size=shift;

View File

@ -12,7 +12,7 @@ sub import { #{{{
} # }}} } # }}}
sub check_canremove ($$$$) { sub check_canremove ($$$$) { #{{{
my $page=shift; my $page=shift;
my $q=shift; my $q=shift;
my $session=shift; my $session=shift;
@ -42,7 +42,7 @@ sub check_canremove ($$$$) {
if ($attachment) { if ($attachment) {
IkiWiki::Plugin::attachment::check_canattach($session, $page, $file); IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
} }
} } #}}}
sub formbuilder_setup (@) { #{{{ sub formbuilder_setup (@) { #{{{
my %params=@_; my %params=@_;
@ -79,7 +79,7 @@ sub confirmation_form ($$) { #{{{
return $f, ["Remove", "Cancel"]; return $f, ["Remove", "Cancel"];
} #}}} } #}}}
sub removal_confirm ($$@) { sub removal_confirm ($$@) { #{{{
my $q=shift; my $q=shift;
my $session=shift; my $session=shift;
my $attachment=shift; my $attachment=shift;
@ -107,9 +107,9 @@ sub removal_confirm ($$@) {
IkiWiki::showform($f, $buttons, $session, $q); IkiWiki::showform($f, $buttons, $session, $q);
exit 0; exit 0;
} } #}}}
sub postremove ($) { sub postremove ($) { #{{{
my $session=shift; my $session=shift;
# Load saved form state and return to edit form. # Load saved form state and return to edit form.
@ -117,7 +117,7 @@ sub postremove ($) {
$session->clear("postremove"); $session->clear("postremove");
IkiWiki::cgi_savesession($session); IkiWiki::cgi_savesession($session);
IkiWiki::cgi($postremove, $session); IkiWiki::cgi($postremove, $session);
} } #}}}
sub formbuilder (@) { #{{{ sub formbuilder (@) { #{{{
my %params=@_; my %params=@_;

View File

@ -102,7 +102,7 @@ sub rename_form ($$$) { #{{{
return $f, ["Rename", "Cancel"]; return $f, ["Rename", "Cancel"];
} #}}} } #}}}
sub rename_start ($$$$) { sub rename_start ($$$$) { #{{{
my $q=shift; my $q=shift;
my $session=shift; my $session=shift;
my $attachment=shift; my $attachment=shift;
@ -127,9 +127,9 @@ sub rename_start ($$$$) {
IkiWiki::showform($f, $buttons, $session, $q); IkiWiki::showform($f, $buttons, $session, $q);
exit 0; exit 0;
} } #}}}
sub postrename ($;$$$) { sub postrename ($;$$$) { #{{{
my $session=shift; my $session=shift;
my $src=shift; my $src=shift;
my $dest=shift; my $dest=shift;
@ -160,7 +160,7 @@ sub postrename ($;$$$) {
} }
IkiWiki::cgi_editpage($postrename, $session); IkiWiki::cgi_editpage($postrename, $session);
} } #}}}
sub formbuilder (@) { #{{{ sub formbuilder (@) { #{{{
my %params=@_; my %params=@_;