commit 52e4af4e11a11e836ca2bb628cc9cb03f9b4b2dd
parent fbd367733b183fedebe8d2e176b0ffe749da7568
Author: ukai <ukai>
Date: Sun, 20 Jan 2002 17:06:42 +0000
[w3m-dev 02876] w3mmail.cgi.in backport from w3mmee
* action='file://$0'
* don't add \n to $body's tail
* $body =~ s/\r+\n/\n/g;
* s/@cmd/@opt/
* url_unquote: + should be unquote too
From: Fumitoshi UKAI <ukai@debian.or.jp>
Diffstat:
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2002-01-21 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * [w3m-dev 02876] w3mmail.cgi.in backport from w3mmee
+ * action='file://$0'
+ * don't add \n to $body's tail
+ * $body =~ s/\r+\n/\n/g;
+ * s/@cmd/@opt/
+ * url_unquote: + should be unquote too
+
2002-01-18 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 02873] delete "decode MIME-body" in doc{,-jp}/README
diff --git a/scripts/w3mmail.cgi.in b/scripts/w3mmail.cgi.in
@@ -35,7 +35,7 @@ if ($query =~ s/^\w+://) {
print "\r\n";
print "<html><head><title>W3M Mailer: $qurl</title></head>\n";
print "<body><h1>W3M Mailer: $qurl</h1>\n";
- print "<form action='$0' method='POST'>\n";
+ print "<form action='file://$0' method='POST'>\n";
print "<input type='hidden' name='cookie' value='$local_cookie'>\n";
print "<table>\n";
if ($opt{'from'}) {
@@ -108,7 +108,7 @@ if ($query =~ s/^\w+://) {
print "User-Agent: $ENV{'SERVER_SOFTWARE'} $prog/$id\n";
print "\n";
print $body;
- print "\n";
+ print "\n" if ($body !~ /\n$/);
print "</pre>\n";
print "<input type='submit' name='action' value='Send'>\n";
print "<hr>\n";
@@ -256,6 +256,7 @@ sub conv_nkf {
return nkf(@opt);
}
local($body) = pop(@opt);
+ $body =~ s/\r+\n/\n/g;
$| = 1;
pipe(R, W2);
pipe(R2, W);
@@ -265,7 +266,7 @@ sub conv_nkf {
close(W);
open(STDIN, "<&R2");
open(STDOUT, ">&W2");
- exec "nkf", @cmd;
+ exec "nkf", @opt;
die;
}
close(R2);
@@ -309,6 +310,6 @@ sub html_quote {
sub url_unquote {
local($_) = @_;
- s/%([0-9A-Fa-f][0-9A-Fa-f])/chr(hex($1))/ge;
+ s/\+|%([0-9A-Fa-f][0-9A-Fa-f])/$& eq '+' ? ' ' : chr(hex($1))/ge;
return $_;
}
