From 5cfdef0add9fc9c56a2cb3c370e41e9866e8efe2 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Tue, 15 Jan 2002 16:13:39 +0000 Subject: [w3m-dev 02840] * scripts/w3mmail.cgi.in: use LOCAL_COOKIE * scripts/w3mmail.cgi.in: no need HTTP response header * scripts/w3mmail.cgi.in: fix typo $nkf_NKF * scripts/w3mmail.cgi.in: eval { use NKF; } is perl5ism * scripts/multipart/multipart.cgi.in: ditto From: Hironori Sakamoto --- ChangeLog | 11 ++++++++++- scripts/multipart/multipart.cgi.in | 2 +- scripts/w3mmail.cgi.in | 20 +++++++++++++------- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4af3a63..8acfdf9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-01-16 Hironori Sakamoto + + * [w3m-dev 02840] + * scripts/w3mmail.cgi.in: use LOCAL_COOKIE + * scripts/w3mmail.cgi.in: no need HTTP response header + * scripts/w3mmail.cgi.in: fix typo $nkf_NKF + * scripts/w3mmail.cgi.in: eval { use NKF; } is perl5ism + * scripts/multipart/multipart.cgi.in: ditto + 2002-01-16 Hironori Sakamoto * [w3m-dev 02835] @@ -1949,4 +1958,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.220 2002/01/15 16:07:58 ukai Exp $ +$Id: ChangeLog,v 1.221 2002/01/15 16:13:39 ukai Exp $ diff --git a/scripts/multipart/multipart.cgi.in b/scripts/multipart/multipart.cgi.in index d009519..7244e48 100644 --- a/scripts/multipart/multipart.cgi.in +++ b/scripts/multipart/multipart.cgi.in @@ -1,6 +1,6 @@ #!@PERL@ -eval { use NKF; }; +eval "use NKF;"; if (! $@) { $use_NKF = 1; $CONV = "-e"; diff --git a/scripts/w3mmail.cgi.in b/scripts/w3mmail.cgi.in index 90bcb0c..fea6194 100755 --- a/scripts/w3mmail.cgi.in +++ b/scripts/w3mmail.cgi.in @@ -1,10 +1,11 @@ #!@PERL@ -$rcsid = q$Id: w3mmail.cgi.in,v 1.1 2002/01/15 05:36:24 ukai Exp $; +$rcsid = q$Id: w3mmail.cgi.in,v 1.2 2002/01/15 16:13:39 ukai Exp $; ($id = $rcsid) =~ s/^.*,v ([\d\.]*).*/$1/; ($prog=$0) =~ s/.*\///; $query = $ENV{'QUERY_STRING'}; +$local_cookie = $ENV{'LOCAL_COOKIE'}; $url = $query; $SENDMAIL = '/usr/lib/sendmail'; $SENDMAIL = '/usr/sbin/sendmail' if -x '/usr/sbin/sendmail'; @@ -26,7 +27,6 @@ if ($query =~ s/^\w+://) { $body = $opt{'body'}; delete $opt{'body'}; - print "200 HTTP/1.0 OK\r\n"; print "Content-Type: text/html\r\n"; print "w3m-control: END\r\n"; print "w3m-control: PREV_LINK\r\n"; @@ -35,6 +35,7 @@ if ($query =~ s/^\w+://) { print "

W3M Mailer: $qurl

\n"; print "
\n"; print "\n"; + print "\n"; print "\n"; if ($opt{'from'}) { print "
From:" . &html_quote($opt{'from'}) @@ -69,9 +70,15 @@ if ($query =~ s/^\w+://) { print "\n"; exit(0); } else { - print "200 HTTP/1.0 OK\r\n"; sysread(STDIN, $req, $ENV{'CONTENT_LENGTH'}); %opt = &parse_opt($req); + if ($local_cookie ne $opt{'cookie'}) { + print "Content-Type: text/plain\r\n"; + print "\r\n"; + print "Local cookie doesn't match: It may be an illegal execution\n"; + exit 1; + } + delete $opt{'cookie'}; $body = &html_quote($opt{'body'}); delete $opt{'body'}; $act = $opt{'action'}; @@ -87,6 +94,7 @@ if ($query =~ s/^\w+://) { print "

W3M Mailer: preview

\n"; print "\n"; print "\n"; + print "\n"; print "
\n"; print "
\n";
 	foreach $h (keys %opt) {
@@ -116,7 +124,6 @@ if ($query =~ s/^\w+://) {
 	print "\n";
     } else {
 	unless (open(MAIL, "|$SENDMAIL -t")) {
-	    print "200 HTTP/1.0 OK\r\n";
 	    print "Content-Type: text/html\r\n";
 	    print "\r\n";
 	    print "W3M Mailer\n";
@@ -144,7 +151,6 @@ if ($query =~ s/^\w+://) {
 	    print "w3m-control: BACK\r\n";
 	    print "\r\n";
 	} else {
-	    print "200 HTTP/1.0 OK\r\n";
 	    print "Content-Type: text/html\r\n";
 	    print "\r\n";
 	    print "W3M Mailer\n";
@@ -158,11 +164,11 @@ if ($query =~ s/^\w+://) {
 sub lang_setup {
     $lang = $ENV{'LANG'};
     if ($lang =~ /^ja/i) {
-	eval { use NKF; };
+	eval "use NKF;";
 	if (! $@) {
 	    $use_NKF = 1;
 	} else {
-	    $nkf_NKF = 0;
+	    $use_NKF = 0;
 	}
     }
 }
-- 
cgit v1.2.3