richter 02/03/15 11:53:56
Modified: Embperl Tag: Embperl2c Mail.pm
Embperl/Syntax Tag: Embperl2c HTML.pm Mail.pm
test/html Tag: Embperl2c mail.htm
Added: test/cmp Tag: Embperl2c mail.htm
Log:
fix mail taglib
Revision Changes Path
No revision
No revision
1.29.4.5 +17 -9 embperl/Embperl/Mail.pm
Index: Mail.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Mail.pm,v
retrieving revision 1.29.4.4
retrieving revision 1.29.4.5
diff -u -r1.29.4.4 -r1.29.4.5
--- Mail.pm 22 Jan 2002 09:29:55 -0000 1.29.4.4
+++ Mail.pm 15 Mar 2002 19:53:56 -0000 1.29.4.5
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Mail.pm,v 1.29.4.4 2002/01/22 09:29:55 richter Exp $
+# $Id: Mail.pm,v 1.29.4.5 2002/03/15 19:53:56 richter Exp $
#
###################################################################################
@@ -18,6 +18,7 @@
require Embperl ;
+require Embperl::Constant ;
use Apache::Constants qw(&OPT_EXECCGI &DECLINED &OK &FORBIDDEN &NOT_FOUND) ;
@@ -32,7 +33,7 @@
@ISA = qw(Embperl);
-$VERSION = '1.3.4';
+$VERSION = '2.0b7';
@@ -44,14 +45,21 @@
my $data ;
my @errors ;
- $req -> {options} ||= &Embperl::optDisableHtmlScan | &Embperl::optRawInput |
- &Embperl::optKeepSpaces | &Embperl::optReturnError;
+ $req -> {options} ||= &Embperl::Constant::optKeepSpaces |
&Embperl::Constant::optReturnError;
+ $req -> {syntax} ||= 'EmbperlBlocks' ;
$req -> {escmode} ||= 0 ;
$req -> {output} = \$data ;
$req -> {errors} ||= \@errors ;
- Embperl::Execute ($req) ;
+ if ($Embperl::req)
+ {
+ $Embperl::req -> execute_component ($req) ;
+ }
+ else
+ {
+ Embperl::Execute ($req) ;
+ }
die "@errors" if (@errors) ;
@@ -68,8 +76,8 @@
($helo?(Hello => $helo):())
) or die "Cannot connect to mailhost
$req->{mailhost}" ;
- my $from = $req -> {from} || $ENV{'EMBPERL_MAILFROM'} ;
- $smtp->mail($from || "WWW-Server\@$ENV{SERVER_NAME}");
+ my $from = $req -> {from} || $ENV{'EMBPERL_MAILFROM'} ||
"WWW-Server\@$ENV{SERVER_NAME}" || 'localhost' ;
+ $smtp->mail($from);
my $to ;
if (ref ($req -> {'to'}))
@@ -90,7 +98,7 @@
else
{
$cc = [] ;
- @$cc = split (/\s*;\s*/, $req -> {'cc'}) ;
+ @$cc = split (/\s*;\s*/, $req -> {'cc'}) if ($req -> {'cc'}) ;
}
my $bcc ;
@@ -101,7 +109,7 @@
else
{
$bcc = [] ;
- @$bcc = split (/\s*;\s*/, $req -> {'bcc'}) ;
+ @$bcc = split (/\s*;\s*/, $req -> {'bcc'}) if ($req -> {'bcc'}) ;
}
my $headers = $req->{mailheaders} ;
No revision
No revision
1.1.2.17 +3 -3 embperl/Embperl/Syntax/Attic/HTML.pm
Index: HTML.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/HTML.pm,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- HTML.pm 22 Jan 2002 09:29:56 -0000 1.1.2.16
+++ HTML.pm 15 Mar 2002 19:53:56 -0000 1.1.2.17
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: HTML.pm,v 1.1.2.16 2002/01/22 09:29:56 richter Exp $
+# $Id: HTML.pm,v 1.1.2.17 2002/03/15 19:53:56 richter Exp $
#
###################################################################################
@@ -275,10 +275,10 @@
sub AddTagBlock
{
- my ($self, $tagname, $attrs, $attrsurl, $attrsnoval, $procinfo) = @_ ;
+ my ($self, $tagname, $attrs, $attrsurl, $attrsnoval, $procinfo, $taginfo) = @_ ;
- my $tag = $self -> AddTag ($tagname, $attrs, $attrsurl, $attrsnoval, $procinfo)
;
+ my $tag = $self -> AddTag ($tagname, $attrs, $attrsurl, $attrsnoval, $procinfo,
$taginfo) ;
$tag -> {'nodetype'} = &ntypStartTag ;
1.1.2.6 +3 -3 embperl/Embperl/Syntax/Attic/Mail.pm
Index: Mail.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/Mail.pm,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Mail.pm 22 Jan 2002 09:29:56 -0000 1.1.2.5
+++ Mail.pm 15 Mar 2002 19:53:56 -0000 1.1.2.6
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Mail.pm,v 1.1.2.5 2002/01/22 09:29:56 richter Exp $
+# $Id: Mail.pm,v 1.1.2.6 2002/03/15 19:53:56 richter Exp $
#
###################################################################################
@@ -71,7 +71,6 @@
'mailhost', 'mailhelo', 'maildebug'],
undef, undef,
{
removenode => 42,
- perlcode => {},
perlcodeend => q{
{
use Embperl::Mail ;
@@ -96,7 +95,8 @@
},
stackname => 'mail_send',
'push' => '%$x%',
- }) ;
+ },
+ ) ;
}
No revision
No revision
1.1.2.1 +19 -0 embperl/test/cmp/Attic/mail.htm
No revision
No revision
1.1.2.3 +4 -0 embperl/test/html/Attic/mail.htm
Index: mail.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/Attic/mail.htm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- mail.htm 28 Mar 2001 12:58:24 -0000 1.1.2.2
+++ mail.htm 15 Mar 2002 19:53:56 -0000 1.1.2.3
@@ -16,6 +16,10 @@
from Embperl's Mail taglib.
</mail:send>
+ [+ "tagend" +]<br>
+
+ $? = [+ $? +]<br>
+
[$ if $? $]
<h2>Sorry, there was an error, your mail couldn't be send</h2>
[$else$]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
