* Make img plugin not fail immediately if Image::Magick is not available.

[git.ikiwiki.info.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 5d21d0674eca2b273aaeef28e77e5c418b62531a..af3bb8a4aca307f84bc63914978f312c6dddc301 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -33,26 +33,25 @@ sub redirect ($$) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

-sub page_locked ($$;$) { #{{{
+sub check_canedit ($$$;$) { #{{{

        my $page=shift;
        my $page=shift;

+       my $q=shift;

        my $session=shift;
        my $nonfatal=shift;
        
        my $session=shift;
        my $nonfatal=shift;
        

-       my $user=$session->param("name");
-       return if defined $user && is_admin($user);
-
-       foreach my $admin (@{$config{adminuser}}) {
-               my $locked_pages=userinfo_get($admin, "locked_pages");
-               if (pagespec_match($page, userinfo_get($admin, "locked_pages"))) {
-                       return 1 if $nonfatal;
-
-                       error(sprintf(gettext("%s is locked by %s and cannot be edited"),
-                               htmllink("", "", $page, 1),
-                               userlink($admin)));
+       my $canedit;
+       run_hooks(canedit => sub {
+               return if defined $canedit;
+               my $ret=shift->($page, $q, $session);
+               if (defined $ret && $ret eq "") {
+                       $canedit=1;

                }
                }

-       }
-
-       return 0;
+               elsif (defined $ret) {
+                       $canedit=0;
+                       error($ret) unless $nonfatal;
+               }
+       });
+       return $canedit;

 } #}}}
 
 sub decode_form_utf8 ($) { #{{{
 } #}}}
 
 sub decode_form_utf8 ($) { #{{{


@@ -90,7 +89,9 @@ sub cgi_recentchanges ($) { #{{{
                delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
                $change->{pages} = [
                        map {
                delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
                $change->{pages} = [
                        map {

-                               $_->{link} = htmllink("", "", $_->{page}, 1);
+                               $_->{link} = htmllink("", "", $_->{page},
+                                       noimageinline => 1,
+                                       linktext => pagetitle($_->{page}));

                                $_;
                        } @{$change->{pages}}
                ];
                                $_;
                        } @{$change->{pages}}
                ];


@@ -111,6 +112,23 @@ sub cgi_recentchanges ($) { #{{{
        print $q->header(-charset => 'utf-8'), $template->output;
 } #}}}
 
        print $q->header(-charset => 'utf-8'), $template->output;
 } #}}}
 

+# Check if the user is signed in. If not, redirect to the signin form and
+# save their place to return to later.
+sub needsignin ($$) { #{{{
+       my $q=shift;
+       my $session=shift;
+
+       if (! defined $session->param("name") ||
+           ! userinfo_get($session->param("name"), "regdate")) {
+               if (! defined $session->param("postsignin")) {
+                       $session->param(postsignin => $ENV{QUERY_STRING});
+               }
+               cgi_signin($q, $session);
+               cgi_savesession($session);
+               exit;
+       }
+} #}}} 
+

 sub cgi_signin ($$) { #{{{
        my $q=shift;
        my $session=shift;
 sub cgi_signin ($$) { #{{{
        my $q=shift;
        my $session=shift;


@@ -127,17 +145,16 @@ sub cgi_signin ($$) { #{{{
                params => $q,
                action => $config{cgiurl},
                header => 0,
                params => $q,
                action => $config{cgiurl},
                header => 0,

-               template => (-e "$config{templatedir}/signin.tmpl" ?
-                            {template_params("signin.tmpl")} : ""),
+               template => scalar template_params("signin.tmpl"),

                stylesheet => baseurl()."style.css",
        );
        my $buttons=["Login"];
        
                stylesheet => baseurl()."style.css",
        );
        my $buttons=["Login"];
        

-       $form->field(name => "do", type => "hidden");
-       

        if ($q->param("do") ne "signin" && !$form->submitted) {
                $form->text(gettext("You need to log in first."));
        }
        if ($q->param("do") ne "signin" && !$form->submitted) {
                $form->text(gettext("You need to log in first."));
        }

+       $form->field(name => "do", type => "hidden", value => "signin",
+               force => 1);

        
        run_hooks(formbuilder_setup => sub {
                shift->(form => $form, cgi => $q, session => $session);
        
        run_hooks(formbuilder_setup => sub {
                shift->(form => $form, cgi => $q, session => $session);


@@ -165,23 +182,19 @@ sub cgi_postsignin ($$) { #{{{
        my $session=shift;
 
        # Continue with whatever was being done before the signin process.
        my $session=shift;
 
        # Continue with whatever was being done before the signin process.

-       if (defined $q->param("do") && $q->param("do") ne "signin" &&
-           defined $session->param("postsignin")) {
-               my $postsignin=CGI->new($session->param("postsignin"));
-               $session->clear("postsignin");
-               cgi($postsignin, $session);
-               cgi_savesession($session);
-               exit;
-       }
-       else {
-               redirect($q, $config{url});
-       }
+       my $postsignin=CGI->new($session->param("postsignin"));
+       $session->clear("postsignin");
+       cgi($postsignin, $session);
+       cgi_savesession($session);
+       exit;

 } #}}}
 
 sub cgi_prefs ($$) { #{{{
        my $q=shift;
        my $session=shift;
 
 } #}}}
 
 sub cgi_prefs ($$) { #{{{
        my $q=shift;
        my $session=shift;
 

+       needsignin($q, $session);
+

        eval q{use CGI::FormBuilder};
        error($@) if $@;
        my $form = CGI::FormBuilder->new(
        eval q{use CGI::FormBuilder};
        error($@) if $@;
        my $form = CGI::FormBuilder->new(


@@ -196,8 +209,7 @@ sub cgi_prefs ($$) { #{{{
                javascript => 0,
                params => $q,
                action => $config{cgiurl},
                javascript => 0,
                params => $q,
                action => $config{cgiurl},

-               template => (-e "$config{templatedir}/prefs.tmpl" ?
-                            {template_params("prefs.tmpl")} : ""),
+               template => scalar template_params("prefs.tmpl"),

                stylesheet => baseurl()."style.css",
        );
        my $buttons=["Save Preferences", "Logout", "Cancel"];
                stylesheet => baseurl()."style.css",
        );
        my $buttons=["Save Preferences", "Logout", "Cancel"];


@@ -209,14 +221,11 @@ sub cgi_prefs ($$) { #{{{
        $form->field(name => "do", type => "hidden");
        $form->field(name => "email", size => 50);
        $form->field(name => "subscriptions", size => 50,
        $form->field(name => "do", type => "hidden");
        $form->field(name => "email", size => 50);
        $form->field(name => "subscriptions", size => 50,

-               comment => "(".htmllink("", "", "PageSpec", 1).")");
-       $form->field(name => "locked_pages", size => 50,
-               comment => "(".htmllink("", "", "PageSpec", 1).")");
+               comment => "(".htmllink("", "", "PageSpec", noimageinline => 1).")");

        $form->field(name => "banned_users", size => 50);
        
        my $user_name=$session->param("name");
        if (! is_admin($user_name)) {
        $form->field(name => "banned_users", size => 50);
        
        my $user_name=$session->param("name");
        if (! is_admin($user_name)) {

-               $form->field(name => "locked_pages", type => "hidden");

                $form->field(name => "banned_users", type => "hidden");
        }
 
                $form->field(name => "banned_users", type => "hidden");
        }
 


@@ -225,8 +234,6 @@ sub cgi_prefs ($$) { #{{{
                        value => userinfo_get($user_name, "email"));
                $form->field(name => "subscriptions", force => 1,
                        value => userinfo_get($user_name, "subscriptions"));
                        value => userinfo_get($user_name, "email"));
                $form->field(name => "subscriptions", force => 1,
                        value => userinfo_get($user_name, "subscriptions"));

-               $form->field(name => "locked_pages", force => 1,
-                       value => userinfo_get($user_name, "locked_pages"));

                if (is_admin($user_name)) {
                        $form->field(name => "banned_users", force => 1,
                                value => join(" ", get_banned_users()));
                if (is_admin($user_name)) {
                        $form->field(name => "banned_users", force => 1,
                                value => join(" ", get_banned_users()));


@@ -245,14 +252,17 @@ sub cgi_prefs ($$) { #{{{
                return;
        }
        elsif ($form->submitted eq 'Save Preferences' && $form->validate) {
                return;
        }
        elsif ($form->submitted eq 'Save Preferences' && $form->validate) {

-               foreach my $field (qw(email subscriptions locked_pages)) {
+               foreach my $field (qw(email subscriptions)) {

                        if (defined $form->field($field) && length $form->field($field)) {
                        if (defined $form->field($field) && length $form->field($field)) {

-                               userinfo_set($user_name, $field, $form->field($field)) || error("failed to set $field");
+                               userinfo_set($user_name, $field, $form->field($field)) ||
+                                       error("failed to set $field");

                        }
                }
                if (is_admin($user_name)) {
                        set_banned_users(grep { ! is_admin($_) }
                        }
                }
                if (is_admin($user_name)) {
                        set_banned_users(grep { ! is_admin($_) }

-                                       split(' ', $form->field("banned_users")));
+                                       split(' ',
+                                               $form->field("banned_users"))) ||
+                               error("failed saving changes");

                }
                $form->text(gettext("Preferences saved."));
        }
                }
                $form->text(gettext("Preferences saved."));
        }


@@ -291,8 +301,7 @@ sub cgi_editpage ($$) { #{{{
                params => $q,
                action => $config{cgiurl},
                table => 0,
                params => $q,
                action => $config{cgiurl},
                table => 0,

-               template => (-e "$config{templatedir}/editpage.tmpl" ?
-                               {template_params("editpage.tmpl")} : ""),
+               template => scalar template_params("editpage.tmpl"),

        );
        
        run_hooks(formbuilder_setup => sub {
        );
        
        run_hooks(formbuilder_setup => sub {


@@ -319,6 +328,9 @@ sub cgi_editpage ($$) { #{{{
        if (exists $pagesources{$page}) {
                $file=$pagesources{$page};
                $type=pagetype($file);
        if (exists $pagesources{$page}) {
                $file=$pagesources{$page};
                $type=pagetype($file);

+               if (! defined $type) {
+                       error(sprintf(gettext("%s is not an editable page"), $page));
+               }

        }
        else {
                $type=$form->param('type');
        }
        else {
                $type=$form->param('type');


@@ -350,7 +362,7 @@ sub cgi_editpage ($$) { #{{{
        $form->tmpl_param("can_commit", $config{rcs});
        $form->tmpl_param("indexlink", indexlink());
        $form->tmpl_param("helponformattinglink",
        $form->tmpl_param("can_commit", $config{rcs});
        $form->tmpl_param("indexlink", indexlink());
        $form->tmpl_param("helponformattinglink",

-               htmllink("", "", "HelpOnFormatting", 1));
+               htmllink("", "", "HelpOnFormatting", noimageinline => 1));

        $form->tmpl_param("baseurl", baseurl());
        if (! $form->submitted) {
                $form->field(name => "rcsinfo", value => rcs_prepedit($file),
        $form->tmpl_param("baseurl", baseurl());
        if (! $form->submitted) {
                $form->field(name => "rcsinfo", value => rcs_prepedit($file),


@@ -423,16 +435,22 @@ sub cgi_editpage ($$) { #{{{
                                if length $config{userdir};
 
                        @page_locs = grep {
                                if length $config{userdir};
 
                        @page_locs = grep {

-                               ! exists $pagecase{lc $_} &&
-                               ! page_locked($_, $session, 1)
+                               ! exists $pagecase{lc $_}

                        } @page_locs;
                        } @page_locs;

-                       

                        if (! @page_locs) {
                                # hmm, someone else made the page in the
                                # meantime?
                                redirect($q, "$config{url}/".htmlpage($page));
                                return;
                        }
                        if (! @page_locs) {
                                # hmm, someone else made the page in the
                                # meantime?
                                redirect($q, "$config{url}/".htmlpage($page));
                                return;
                        }

+
+                       my @editable_locs = grep {
+                               check_canedit($_, $q, $session, 1)
+                       } @page_locs;
+                       if (! @editable_locs) {
+                               # let it throw an error this time
+                               map { check_canedit($_, $q, $session) } @page_locs;
+                       }

                        
                        my @page_types;
                        if (exists $hooks{htmlize}) {
                        
                        my @page_types;
                        if (exists $hooks{htmlize}) {


@@ -441,13 +459,13 @@ sub cgi_editpage ($$) { #{{{
                        
                        $form->tmpl_param("page_select", 1);
                        $form->field(name => "page", type => 'select',
                        
                        $form->tmpl_param("page_select", 1);
                        $form->field(name => "page", type => 'select',

-                               options => \@page_locs, value => $best_loc);
+                               options => \@editable_locs, value => $best_loc);

                        $form->field(name => "type", type => 'select',
                                options => \@page_types);
                        $form->title(sprintf(gettext("creating %s"), pagetitle($page)));
                }
                elsif ($form->field("do") eq "edit") {
                        $form->field(name => "type", type => 'select',
                                options => \@page_types);
                        $form->title(sprintf(gettext("creating %s"), pagetitle($page)));
                }
                elsif ($form->field("do") eq "edit") {

-                       page_locked($page, $session);
+                       check_canedit($page, $q, $session);

                        if (! defined $form->field('editcontent') || 
                            ! length $form->field('editcontent')) {
                                my $content="";
                        if (! defined $form->field('editcontent') || 
                            ! length $form->field('editcontent')) {
                                my $content="";


@@ -468,13 +486,31 @@ sub cgi_editpage ($$) { #{{{
        }
        else {
                # save page
        }
        else {
                # save page

-               page_locked($page, $session);
+               check_canedit($page, $q, $session);

                
                my $content=$form->field('editcontent');
 
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;
                
                my $content=$form->field('editcontent');
 
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;

-               writefile($file, $config{srcdir}, $content);
+
+               $config{cgi}=0; # avoid cgi error message
+               eval { writefile($file, $config{srcdir}, $content) };
+               $config{cgi}=1;
+               if ($@) {
+                       $form->field(name => "rcsinfo", value => rcs_prepedit($file),
+                               force => 1);
+                       $form->tmpl_param("failed_save", 1);
+                       $form->tmpl_param("error_message", $@);
+                       $form->field("editcontent", value => $content, force => 1);
+                       $form->field(name => "comments", value => $form->field('comments'), force => 1);
+                       $form->field("do", "edit)");
+                       $form->tmpl_param("page_select", 0);
+                       $form->field(name => "page", type => 'hidden');
+                       $form->field(name => "type", type => 'hidden');
+                       $form->title(sprintf(gettext("editing %s"), $page));
+                       print $form->render(submit => \@buttons);
+                       return;
+               }

                
                if ($config{rcs}) {
                        my $message="";
                
                if ($config{rcs}) {
                        my $message="";


@@ -508,6 +544,12 @@ sub cgi_editpage ($$) { #{{{
                                print $form->render(submit => \@buttons);
                                return;
                        }
                                print $form->render(submit => \@buttons);
                                return;
                        }

+                       else {
+                               # Make sure that the repo is up-to-date;
+                               # locking prevents the post-commit hook
+                               # from updating it.
+                               rcs_update();
+                       }

                }
                else {
                        require IkiWiki::Render;
                }
                else {
                        require IkiWiki::Render;


@@ -542,7 +584,7 @@ sub cgi_savesession ($) { #{{{
        my $oldmask=umask(077);
        $session->flush;
        umask($oldmask);
        my $oldmask=umask(077);
        $session->flush;
        umask($oldmask);

-}
+} #}}}

 
 sub cgi (;$$) { #{{{
        my $q=shift;
 
 sub cgi (;$$) { #{{{
        my $q=shift;


@@ -597,41 +639,31 @@ sub cgi (;$$) { #{{{
                                        email => "",
                                        password => "",
                                        regdate => time,
                                        email => "",
                                        password => "",
                                        regdate => time,

-                               });
+                               }) || error("failed adding user");

                        }
                }
        }
                        }
                }
        }

-
-       # Everything below this point needs the user to be signed in.
-       if (((! $config{anonok} || $do eq 'prefs') &&
-            (! defined $session->param("name") ||
-            ! userinfo_get($session->param("name"), "regdate")))
-            || $do eq 'signin') {
-               if ($do ne 'signin' && ! defined $session->param("postsignin")) {
-                       $session->param(postsignin => $ENV{QUERY_STRING});
-               }
-               cgi_signin($q, $session);
-               cgi_savesession($session);
-               return;
-       }
-       elsif (defined $session->param("postsignin")) {
-               cgi_postsignin($q, $session);
-       }
-
-       if (defined $session->param("name") && userinfo_get($session->param("name"), "banned")) {
+       
+       if (defined $session->param("name") &&
+           userinfo_get($session->param("name"), "banned")) {

                print $q->header(-status => "403 Forbidden");
                $session->delete();
                print gettext("You are banned.");
                cgi_savesession($session);
                print $q->header(-status => "403 Forbidden");
                $session->delete();
                print gettext("You are banned.");
                cgi_savesession($session);

-               exit;

        }
        }

-       
-       if ($do eq 'create' || $do eq 'edit') {
-               cgi_editpage($q, $session);
+       elsif ($do eq 'signin') {
+               cgi_signin($q, $session);
+               cgi_savesession($session);
+       }
+       elsif (defined $session->param("postsignin")) {
+               cgi_postsignin($q, $session);

        }
        elsif ($do eq 'prefs') {
                cgi_prefs($q, $session);
        }
        }
        elsif ($do eq 'prefs') {
                cgi_prefs($q, $session);
        }

+       elsif ($do eq 'create' || $do eq 'edit') {
+               cgi_editpage($q, $session);
+       }

        elsif ($do eq 'blog') {
                my $page=titlepage(decode_utf8($q->param('title')));
                $page=~s/(\/)/"__".ord($1)."__"/eg; # escape slashes too
        elsif ($do eq 'blog') {
                my $page=titlepage(decode_utf8($q->param('title')));
                $page=~s/(\/)/"__".ord($1)."__"/eg; # escape slashes too


@@ -647,6 +679,9 @@ sub cgi (;$$) { #{{{
                $q->param('do', 'create');
                cgi_editpage($q, $session);
        }
                $q->param('do', 'create');
                cgi_editpage($q, $session);
        }

+       elsif ($do eq 'postsignin') {
+               error(gettext("login failed, perhaps you need to turn on cookies?"));
+       }

        else {
                error("unknown do parameter");
        }
        else {
                error("unknown do parameter");
        }


@@ -676,7 +711,7 @@ sub userlink ($) { #{{{
        else {
                return htmllink("", "", escapeHTML(
                        length $config{userdir} ? $config{userdir}."/".$user : $user
        else {
                return htmllink("", "", escapeHTML(
                        length $config{userdir} ? $config{userdir}."/".$user : $user

-               ), 1);
+               ), noimageinline => 1);

        }
 } #}}}
 
        }
 } #}}}