[interchange-cvs] interchange - jon modified 2 files
interchange-core@interchange.redhat.com
interchange-core@interchange.redhat.com
Fri Nov 2 01:16:00 2001
User: jon
Date: 2001-11-02 06:15:52 GMT
Modified: dist/usertag email.tag email_raw.tag
Log:
Add 'hide' option to suppress result code output.
Revision Changes Path
2.1 +6 -4 interchange/dist/usertag/email.tag
rev 2.1, prev_rev 2.0
Index: email.tag
===================================================================
RCS file: /var/cvs/interchange/dist/usertag/email.tag,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -u -r2.0 -r2.1
--- email.tag 2001/07/18 02:22:39 2.0
+++ email.tag 2001/11/02 06:15:52 2.1
@@ -1,10 +1,11 @@
UserTag email Order to subject reply from extra
UserTag email hasEndTag
+UserTag email addAttr
UserTag email Interpolate
UserTag email Routine <<EOR
sub {
- my($to, $subject, $reply, $from, $extra, $body) = @_;
- my($ok);
+ my ($to, $subject, $reply, $from, $extra, $opt, $body) = @_;
+ my $ok = 0;
$subject = '<no subject>' unless defined $subject && $subject;
@@ -16,7 +17,7 @@
}
$extra =~ s/\s*$/\n/ if $extra;
- $ok = 0;
+
SEND: {
open(Vend::MAIL,"|$Vend::Cfg->{SendMailProgram} -t") or last SEND;
print Vend::MAIL
@@ -40,6 +41,7 @@
"With subject '$subject'\n" .
"And body:\n$body");
}
- $ok;
+
+ return $opt->{hide} ? '' : $ok;
}
EOR
2.1 +4 -2 interchange/dist/usertag/email_raw.tag
rev 2.1, prev_rev 2.0
Index: email_raw.tag
===================================================================
RCS file: /var/cvs/interchange/dist/usertag/email_raw.tag,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -u -r2.0 -r2.1
--- email_raw.tag 2001/07/18 02:22:39 2.0
+++ email_raw.tag 2001/11/02 06:15:52 2.1
@@ -17,10 +17,11 @@
EOD
UserTag email-raw hasEndTag
+UserTag email-raw addAttr
UserTag email-raw Interpolate
UserTag email-raw Routine <<EOR
sub {
- my($body) = @_;
+ my($opt, $body) = @_;
my($ok);
$body =~ s/^\s+//;
@@ -37,6 +38,7 @@
::logError("Unable to send mail using $Vend::Cfg->{SendMailProgram}\n" .
"Message follows:\n\n$body");
}
- $ok;
+
+ return $opt->{hide} ? '' : $ok;
}
EOR