improved logic

[ikiwiki.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 52da67b9a13453ba4c83fc81edc474a4da89d360..9e85e1f4402d8399f0714cba1d9cf34f470d3efe 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -38,6 +38,7 @@ sub cgi_recentchanges ($) { #{{{
                indexlink => indexlink(),
                wikiname => $config{wikiname},
                changelog => [rcs_recentchanges(100)],
                indexlink => indexlink(),
                wikiname => $config{wikiname},
                changelog => [rcs_recentchanges(100)],

+               styleurl => styleurl(),

        );
        print $q->header, $template->output;
 } #}}}
        );
        print $q->header, $template->output;
 } #}}}


@@ -64,7 +65,8 @@ sub cgi_signin ($$) { #{{{
                action => $q->request_uri,
                header => 0,
                template => (-e "$config{templatedir}/signin.tmpl" ?
                action => $q->request_uri,
                header => 0,
                template => (-e "$config{templatedir}/signin.tmpl" ?

-                             "$config{templatedir}/signin.tmpl" : "")
+                             "$config{templatedir}/signin.tmpl" : ""),
+               stylesheet => styleurl(),

        );
        
        $form->field(name => "name", required => 0);
        );
        
        $form->field(name => "name", required => 0);


@@ -228,7 +230,8 @@ sub cgi_prefs ($$) { #{{{
                params => $q,
                action => $q->request_uri,
                template => (-e "$config{templatedir}/prefs.tmpl" ?
                params => $q,
                action => $q->request_uri,
                template => (-e "$config{templatedir}/prefs.tmpl" ?

-                             "$config{templatedir}/prefs.tmpl" : "")
+                             "$config{templatedir}/prefs.tmpl" : ""),
+               stylesheet => styleurl(),

        );
        my @buttons=("Save Preferences", "Logout", "Cancel");
        
        );
        my @buttons=("Save Preferences", "Logout", "Cancel");
        


@@ -305,10 +308,12 @@ sub cgi_editpage ($$) { #{{{
        $page=lc($page);
        
        my $file=$page.$config{default_pageext};
        $page=lc($page);
        
        my $file=$page.$config{default_pageext};

-       my $newfile=1;

        if (exists $pagesources{lc($page)}) {
                $file=$pagesources{lc($page)};
        if (exists $pagesources{lc($page)}) {
                $file=$pagesources{lc($page)};

-               $newfile=0;
+       }
+       my $newfile=0;
+       if (! -e "$config{srcdir}/$file") {
+               $newfile=1;

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


@@ -323,6 +328,7 @@ sub cgi_editpage ($$) { #{{{
        $form->tmpl_param("indexlink", indexlink());
        $form->tmpl_param("helponformattinglink",
                htmllink("", "HelpOnFormatting", 1));
        $form->tmpl_param("indexlink", indexlink());
        $form->tmpl_param("helponformattinglink",
                htmllink("", "HelpOnFormatting", 1));

+       $form->tmpl_param("styleurl", styleurl());

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


@@ -399,7 +405,7 @@ sub cgi_editpage ($$) { #{{{
                            ! length $form->field('content')) {
                                my $content="";
                                if (exists $pagesources{lc($page)}) {
                            ! length $form->field('content')) {
                                my $content="";
                                if (exists $pagesources{lc($page)}) {

-                                       $content=readfile("$config{srcdir}/$pagesources{lc($page)}");
+                                       $content=readfile(srcfile($pagesources{lc($page)}));

                                        $content=~s/\n/\r\n/g;
                                }
                                $form->field(name => "content", value => $content,
                                        $content=~s/\n/\r\n/g;
                                }
                                $form->field(name => "content", value => $content,


@@ -419,7 +425,7 @@ sub cgi_editpage ($$) { #{{{
                my $content=$form->field('content');
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;
                my $content=$form->field('content');
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;

-               writefile("$config{srcdir}/$file", $content);
+               writefile($file, $config{srcdir}, $content);

                
                my $message="web commit ";
                if (length $session->param("name")) {
                
                my $message="web commit ";
                if (length $session->param("name")) {


@@ -469,6 +475,12 @@ sub cgi_editpage ($$) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

+sub cgi_hyperestraier () { #{{{
+       # only works for GET requests
+       chdir("$config{wikistatedir}/hyperestraier") || error("chdir: $!");
+       exec("./".basename($config{cgiurl})) || error("estseek.cgi failed");
+} #}}}
+

 sub cgi () { #{{{
        eval q{use CGI};
        eval q{use CGI::Session};
 sub cgi () { #{{{
        eval q{use CGI};
        eval q{use CGI::Session};


@@ -477,7 +489,12 @@ sub cgi () { #{{{
        
        my $do=$q->param('do');
        if (! defined $do || ! length $do) {
        
        my $do=$q->param('do');
        if (! defined $do || ! length $do) {

-               error("\"do\" parameter missing");
+               if (defined $q->param('phrase')) {
+                       cgi_hyperestraier();
+               }
+               else {
+                       error("\"do\" parameter missing");
+               }

        }
        
        # Things that do not need a session.
        }
        
        # Things that do not need a session.


@@ -485,6 +502,9 @@ sub cgi () { #{{{
                cgi_recentchanges($q);
                return;
        }
                cgi_recentchanges($q);
                return;
        }

+       elsif ($do eq 'hyperestraier') {
+               cgi_hyperestraier();
+       }

        
        CGI::Session->name("ikiwiki_session_$config{wikiname}");
        
        
        CGI::Session->name("ikiwiki_session_$config{wikiname}");