storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[w3m-dev 02876] w3mmail.cgi.in backport from w3mmee

Browse Source 
* 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>
This commit is contained in:
Fumitoshi UKAI
2002-01-20 17:06:42 +00:00
parent cb8700f9b6
commit 2af8f6fd2e
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -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> 2002-01-18 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 02873] delete "decode MIME-body" in doc{,-jp}/README * [w3m-dev 02873] delete "decode MIME-body" in doc{,-jp}/README
@@ -2140,4 +2149,4 @@
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.243 2002/01/18 13:09:07 ukai Exp $ $Id: ChangeLog,v 1.244 2002/01/20 17:06:42 ukai Exp $

11
scripts/w3mmail.cgi.in
View File

@@ -1,6 +1,6 @@
#!@PERL@ #!@PERL@
$rcsid = q$Id: w3mmail.cgi.in,v 1.3 2002/01/15 17:46:01 ukai Exp $; $rcsid = q$Id: w3mmail.cgi.in,v 1.4 2002/01/20 17:06:42 ukai Exp $;
($id = $rcsid) =~ s/^.*,v ([\d\.]*).*/$1/; ($id = $rcsid) =~ s/^.*,v ([\d\.]*).*/$1/;
($prog=$0) =~ s/.*\///; ($prog=$0) =~ s/.*\///;
@@ -35,7 +35,7 @@ if ($query =~ s/^\w+://) {
print "\r\n"; print "\r\n";
print "<html><head><title>W3M Mailer: $qurl</title></head>\n"; print "<html><head><title>W3M Mailer: $qurl</title></head>\n";
print "<body><h1>W3M Mailer: $qurl</h1>\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 "<input type='hidden' name='cookie' value='$local_cookie'>\n";
print "<table>\n"; print "<table>\n";
if ($opt{'from'}) { if ($opt{'from'}) {
@@ -108,7 +108,7 @@ if ($query =~ s/^\w+://) {
print "User-Agent: $ENV{'SERVER_SOFTWARE'} $prog/$id\n"; print "User-Agent: $ENV{'SERVER_SOFTWARE'} $prog/$id\n";
print "\n"; print "\n";
print $body; print $body;
print "\n"; print "\n" if ($body !~ /\n$/);
print "</pre>\n"; print "</pre>\n";
print "<input type='submit' name='action' value='Send'>\n"; print "<input type='submit' name='action' value='Send'>\n";
print "<hr>\n"; print "<hr>\n";
@@ -256,6 +256,7 @@ sub conv_nkf {
return nkf(@opt); return nkf(@opt);
} }
local($body) = pop(@opt); local($body) = pop(@opt);
$body =~ s/\r+\n/\n/g;
$| = 1; $| = 1;
pipe(R, W2); pipe(R, W2);
pipe(R2, W); pipe(R2, W);
@@ -265,7 +266,7 @@ sub conv_nkf {
close(W); close(W);
open(STDIN, "<&R2"); open(STDIN, "<&R2");
open(STDOUT, ">&W2"); open(STDOUT, ">&W2");
exec "nkf", @cmd; exec "nkf", @opt;
die; die;
} }
close(R2); close(R2);
@@ -309,6 +310,6 @@ sub html_quote {
sub url_unquote { sub url_unquote {
local($_) = @_; 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 $_; return $_;
} }