cgiurl

[ikiwiki.git] / ikiwiki
diff --git a/ikiwiki b/ikiwiki

index 5efca6c7ffa24a1993a2b83824df7fd4ed7dc038..78e0d2798b913e8fbc795c07619d0011d8c717e7 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -23,6 +23,7 @@ my $wikiname="wiki";
  my $default_pagetype=".mdwn";
  my $cgi=0;
  my $url="";
+my $cgiurl="";
  my $svn=1;
  
  sub usage {
@@ -262,8 +263,15 @@ sub finalize ($$) {
         $path=~s/\.\.\/$/index.html/;
         $pagelink="<a href=\"$path\">$wikiname</a>/ $pagelink";
         
+       my @actions;
+       if (length $cgiurl) {
+               push @actions, "<a href=\"$cgiurl?do=edit&page=$page\">Edit</a>";
+               push @actions, "<a href=\"$cgiurl?do=recentchanges\">RecentChanges</a>";
+       }
+       
         $content="<html>\n<head><title>$title</title></head>\n<body>\n".
                   "<h1>$pagelink</h1>\n".
+                 "@actions\n<hr>\n".
                   $content.
                   "</body>\n</html>\n";
         
@@ -497,13 +505,20 @@ sub gen_wrapper ($$) {
         if (! -x $this) {
                 error("$this doesn't seem to be executable");
         }
-       
-       my $call=qq{"$this", "$this", "$srcdir", "$destdir", "--wikiname=$wikiname"};
-       $call.=', "--verbose"' if $verbose;
-       $call.=', "--rebuild"' if $rebuild;
-       $call.=', "--nosvn"' if !$svn;
-       $call.=', "--cgi"' if $cgi;
-       $call.=', "--url='.$url.'"' if $url;
+
+       my @params=($srcdir, $destdir, "--wikiname=$wikiname");
+       push @params, "--verbose" if $verbose;
+       push @params, "--rebuild" if $rebuild;
+       push @params, "--nosvn" if !$svn;
+       push @params, "--cgi" if $cgi;
+       push @params, "--url=$url" if $url;
+       push @params, "--cgiurl=$url" if $cgiurl;
+       my $params=join(" ", @params);
+       my $call='';
+       foreach my $p ($this, $this, @params) {
+               $call.=qq{"$p", };
+       }
+       $call.="NULL";
         
         my @envsave;
         push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
@@ -511,8 +526,8 @@ sub gen_wrapper ($$) {
         my $envsave="";
         foreach my $var (@envsave) {
                 $envsave.=<<"EOF"
-               if ((s=getenv("$var")))
-                       asprintf(&newenviron[i++], "%s=%s", "$var", s);
+       if ((s=getenv("$var")))
+               asprintf(&newenviron[i++], "%s=%s", "$var", s);
  EOF
         }
         
@@ -527,17 +542,22 @@ EOF
  
  extern char **environ;
  
-int main (void) {
+int main (int argc, char **argv) {
         /* Sanitize environment. */
         char *s;
         char *newenviron[$#envsave+3];
         int i=0;
-       $envsave;
+$envsave
         newenviron[i++]="HOME=$ENV{HOME}";
         newenviron[i]=NULL;
         environ=newenviron;
  
-       execl($call, NULL);
+       if (argc == 2 && strcmp(argv[1], "--params") == 0) {
+               printf("$params\\n");
+               exit(0);
+       }
+       
+       execl($call);
         perror("failed to run $this");
         exit(1);
  }
@@ -587,7 +607,7 @@ sub cgi () {
                                -rows => 20,
                                -columns => 80),
                       $q->br,
-                     "$ENV{HOME} Optional comment about this change",
+                     "Optional comment about this change",
                       $q->br,
                       $q->textfield(-name => "comments", -size => 80),
                       $q->br,
@@ -610,7 +630,7 @@ sub cgi () {
                 
                 my $message="web commit from $ENV{REMOTE_ADDR}";
                 if (defined $q->param('comments')) {
-                       $message.="\n".$q->param('comments');
+                       $message.=": ".$q->param('comments');
                 }
                 
                 if ($svn) {
@@ -644,6 +664,7 @@ if (grep /^-/, @ARGV) {
                 "svn!" => \$svn,
                 "cgi" => \$cgi,
                 "url=s" => \$url,
+               "cgiurl=s" => \$cgiurl,
         ) || usage();
  }
  usage() unless @ARGV == 2;