remove useless uses of scalar

[git.ikiwiki.info.git] / IkiWiki / Plugin / po.pm

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index f826f9503805a55da1548a1f1d124315ee0ddb06..7dfa52f570c3cd21fa63234713b44316af3cae9c 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -10,6 +10,16 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 use Encode;
 use strict;
 use IkiWiki 3.00;
 use Encode;

+BEGIN {
+       eval 'use Locale::Po4a::Common qw(nowrapi18n)';
+       if ($@) {
+               warning(sprintf(gettext('%s is too old, can not disable %s; '.
+                                       'a denial of service can thus be '.
+                                       'triggered by malicious content'),
+                               'Locale::Po4a', 'Text::WrapI18N'));
+               eval 'use Locale::Po4a::Common';
+       }
+}

 use Locale::Po4a::Chooser;
 use Locale::Po4a::Po;
 use File::Basename;
 use Locale::Po4a::Chooser;
 use Locale::Po4a::Po;
 use File::Basename;


@@ -39,7 +49,7 @@ sub import {
        hook(type => "rename", id => "po", call => \&renamepages, first => 1);
        hook(type => "delete", id => "po", call => \&mydelete);
        hook(type => "change", id => "po", call => \&change);
        hook(type => "rename", id => "po", call => \&renamepages, first => 1);
        hook(type => "delete", id => "po", call => \&mydelete);
        hook(type => "change", id => "po", call => \&change);

-       hook(type => "cansave", id => "po", call => \&cansave);
+       hook(type => "checkcontent", id => "po", call => \&checkcontent);

        hook(type => "canremove", id => "po", call => \&canremove);
        hook(type => "canrename", id => "po", call => \&canrename);
        hook(type => "editcontent", id => "po", call => \&editcontent);
        hook(type => "canremove", id => "po", call => \&canremove);
        hook(type => "canrename", id => "po", call => \&canrename);
        hook(type => "editcontent", id => "po", call => \&editcontent);


@@ -265,7 +275,7 @@ sub pagetemplate (@) {
                $template->param(percenttranslated => percenttranslated($page));
        }
        if ($template->query(name => "istranslation")) {
                $template->param(percenttranslated => percenttranslated($page));
        }
        if ($template->query(name => "istranslation")) {

-               $template->param(istranslation => scalar istranslation($page));
+               $template->param(istranslation => istranslation($page));

        }
        if ($template->query(name => "istranslatable")) {
                $template->param(istranslatable => istranslatable($page));
        }
        if ($template->query(name => "istranslatable")) {
                $template->param(istranslatable => istranslatable($page));


@@ -378,7 +388,7 @@ sub change(@) {
        # at once. As this more or less doubles the time needed to rebuild the
        # wiki, we do so only when really needed.
 
        # at once. As this more or less doubles the time needed to rebuild the
        # wiki, we do so only when really needed.
 

-       if (scalar @rendered
+       if (@rendered

            && exists $config{rebuild} && defined $config{rebuild} && $config{rebuild}
            && UNIVERSAL::can("IkiWiki::Plugin::meta", "getsetup")
            && exists $config{meta_overrides_page_title}
            && exists $config{rebuild} && defined $config{rebuild} && $config{rebuild}
            && UNIVERSAL::can("IkiWiki::Plugin::meta", "getsetup")
            && exists $config{meta_overrides_page_title}


@@ -426,11 +436,11 @@ sub change(@) {
        }
 }
 
        }
 }
 

-sub cansave ($$$$) {
-       my ($page, $content, $cgi, $session) = (shift, shift, shift, shift);
+sub checkcontent (@) {
+       my %params=@_;

 
 

-       if (istranslation($page)) {
-               my $res = isvalidpo($content);
+       if (istranslation($params{page})) {
+               my $res = isvalidpo($params{content});

                if ($res) {
                        return undef;
                }
                if ($res) {
                        return undef;
                }


@@ -464,7 +474,7 @@ sub canrename ($$@) {
                # by looking for the master page in the list of to-be-renamed pages we
                # saved early in the renaming process.
                my $orig_torename = $session->param("po_orig_torename");
                # by looking for the master page in the list of to-be-renamed pages we
                # saved early in the renaming process.
                my $orig_torename = $session->param("po_orig_torename");

-               unless (scalar grep { $_->{src} eq $masterpage } @{$orig_torename}) {
+               unless (grep { $_->{src} eq $masterpage } @{$orig_torename}) {

                        return gettext("Can not rename a translation. Renaming the master page, ".
                                       "though, renames its translations as well.");
                }
                        return gettext("Can not rename a translation. Renaming the master page, ".
                                       "though, renames its translations as well.");
                }


@@ -527,17 +537,17 @@ sub formbuilder (@) {
        # This cannot be done in the formbuilder_setup hook as the list of types is
        # computed later.
        if ($form->field("do") eq "create") {
        # This cannot be done in the formbuilder_setup hook as the list of types is
        # computed later.
        if ($form->field("do") eq "create") {

-               for my $field ($form->field) {
+               foreach my $field ($form->field) {

                        next unless "$field" eq "type";
                        if ($field->type eq 'select') {
                                # remove po from the list of types
                                my @types = grep { $_ ne 'po' } $field->options;
                        next unless "$field" eq "type";
                        if ($field->type eq 'select') {
                                # remove po from the list of types
                                my @types = grep { $_ ne 'po' } $field->options;

-                               $field->options(\@types) if scalar @types;
+                               $field->options(\@types) if @types;

                        }
                        else {
                                # make sure the default value is not po;
                                # does this case actually happen?
                        }
                        else {
                                # make sure the default value is not po;
                                # does this case actually happen?

-                               debug "po(formbuilder) ".gettext("type field is not select - not implemented yet");
+                               debug "po(formbuilder) ".gettext("type field is not selected - not implemented yet");

                        }
                }
        }
                        }
                }
        }


@@ -841,9 +851,9 @@ sub refreshpofiles ($@) {
        my @pofiles=@_;
 
        my $potfile=potfile($masterfile);
        my @pofiles=@_;
 
        my $potfile=potfile($masterfile);

-       (-e $potfile)
-               or error("po(refreshpofiles) ".sprintf(gettext("POT file (%s) does not exist"),
-                                                      $potfile));
+       if (! -e $potfile) {
+               error("po(refreshpofiles) ".sprintf(gettext("POT file (%s) does not exist"), $potfile));
+       }

 
        foreach my $pofile (@pofiles) {
                IkiWiki::prep_writefile(basename($pofile),dirname($pofile));
 
        foreach my $pofile (@pofiles) {
                IkiWiki::prep_writefile(basename($pofile),dirname($pofile));


@@ -979,7 +989,7 @@ sub deletetranslations ($) {
                }
        } @todelete;
 
                }
        } @todelete;
 

-       if (scalar @todelete) {
+       if (@todelete) {

                commit_and_refresh(
                        gettext("removed obsolete PO files"),
                        "IkiWiki::Plugin::po::deletetranslations");
                commit_and_refresh(
                        gettext("removed obsolete PO files"),
                        "IkiWiki::Plugin::po::deletetranslations");