[w3m-dev 03408] edit From in w3mail.cgi

* scripts/w3mmail.cgi.in: edit from as well
From: AIDA Shinra <aida-s@jcom.home.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-11-11 15:50:28 +00:00
parent d4b7c51b76
commit 7e6c94ea23
2 changed files with 13 additions and 15 deletions

View File

@@ -1,3 +1,8 @@
2002-11-12 AIDA Shinra <aida-s@jcom.home.ne.jp>
* [w3m-dev 03408] edit From in w3mail.cgi
* scripts/w3mmail.cgi.in: edit from as well
2002-11-12 AIDA Shinra <aida-s@jcom.home.ne.jp> 2002-11-12 AIDA Shinra <aida-s@jcom.home.ne.jp>
* [w3m-dev 03408] fix Bug#87472 * [w3m-dev 03408] fix Bug#87472
@@ -4536,4 +4541,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.497 2002/11/11 15:33:28 ukai Exp $ $Id: ChangeLog,v 1.498 2002/11/11 15:50:28 ukai Exp $

View File

@@ -1,6 +1,6 @@
#!@PERL@ #!@PERL@
$rcsid = q$Id: w3mmail.cgi.in,v 1.10 2002/01/30 04:27:32 ukai Exp $; $rcsid = q$Id: w3mmail.cgi.in,v 1.11 2002/11/11 15:50:28 ukai Exp $;
($id = $rcsid) =~ s/^.*,v ([\d\.]*).*/$1/; ($id = $rcsid) =~ s/^.*,v ([\d\.]*).*/$1/;
($prog=$0) =~ s/.*\///; ($prog=$0) =~ s/.*\///;
@@ -46,13 +46,7 @@ if ($query =~ s/^\w+://) {
print "<form action='file://$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'}) { foreach $h ('from', 'to', 'cc', 'bcc', 'subject') {
$v = &lang_html_quote($opt{'from'});
print "<tr><td>From:<td>$v\n";
print "<input type='hidden' name='from' value=\"$v\">\n";
delete $opt{'from'};
}
foreach $h ('to', 'cc', 'bcc', 'subject') {
$v = &lang_html_quote($opt{$h}); $v = &lang_html_quote($opt{$h});
print "<tr><td>\u$h:<td><input type='text' name=\"$h\" value=\"$v\">\n"; print "<tr><td>\u$h:<td><input type='text' name=\"$h\" value=\"$v\">\n";
delete $opt{$h}; delete $opt{$h};
@@ -132,12 +126,7 @@ if ($query =~ s/^\w+://) {
print "<input type='submit' name='action' value='Send'>\n"; print "<input type='submit' name='action' value='Send'>\n";
print "<hr>\n"; print "<hr>\n";
print "<table>\n"; print "<table>\n";
if ($opt{'from'}) { foreach $h ('from', 'to', 'cc', 'bcc', 'subject') {
print "<tr><td>From:<td>$v{'from'}\n";
print "<input type='hidden' name='from' value=\"$v{'from'}\">\n";
delete $opt{'from'};
}
foreach $h ('to', 'cc', 'bcc', 'subject') {
print "<tr><td>\u$h:<td><input type='text' name=\"$h\" value=\"$v{$h}\">\n"; print "<tr><td>\u$h:<td><input type='text' name=\"$h\" value=\"$v{$h}\">\n";
delete $opt{$h}; delete $opt{$h};
} }
@@ -160,6 +149,10 @@ if ($query =~ s/^\w+://) {
print "<input type='submit' name='action' value='Preview'><br>\n"; print "<input type='submit' name='action' value='Preview'><br>\n";
print "</body></html>\n"; print "</body></html>\n";
} else { } else {
# XXX: quote?
# if ($opt{'from'}) {
# $sendmail_fromopt = '-f' . $opt{'from'};
# }
unless (open(MAIL, "|$SENDMAIL $SENDMAIL_OPT")) { unless (open(MAIL, "|$SENDMAIL $SENDMAIL_OPT")) {
print "Content-Type: text/html\r\n"; print "Content-Type: text/html\r\n";
print "\r\n"; print "\r\n";