diff options
Diffstat (limited to 'LedgerSMB')
| -rw-r--r-- | LedgerSMB/AM.pm | 2 | ||||
| -rw-r--r-- | LedgerSMB/Mailer.pm | 2 | ||||
| -rwxr-xr-x | LedgerSMB/Template.pm | 22 | ||||
| -rwxr-xr-x | LedgerSMB/Template/PDF.pm | 3 | ||||
| -rwxr-xr-x | LedgerSMB/Template/PS.pm | 3 |
5 files changed, 22 insertions, 10 deletions
diff --git a/LedgerSMB/AM.pm b/LedgerSMB/AM.pm index 4ff9f3ed..74034fd3 100644 --- a/LedgerSMB/AM.pm +++ b/LedgerSMB/AM.pm @@ -1628,7 +1628,7 @@ sub backup { qx(PGPASSWORD="$myconfig->{dbpasswd}" pg_dump -U $myconfig->{dbuser} -h $myconfig->{dbhost} -Fc -p $myconfig->{dbport} $myconfig->{dbname}); close OUT; use LedgerSMB::Mailer; - $mail = new Mailer; + $mail = new LedgerSMB::Mailer; $mail->{to} = qq|"$myconfig->{name}" <$myconfig->{email}>|; $mail->{from} = qq|"$myconfig->{name}" <$myconfig->{email}>|; diff --git a/LedgerSMB/Mailer.pm b/LedgerSMB/Mailer.pm index eb1d4a9b..7fd7f1fb 100644 --- a/LedgerSMB/Mailer.pm +++ b/LedgerSMB/Mailer.pm @@ -33,7 +33,7 @@ # #====================================================================== -package Mailer; +package LedgerSMB::Mailer; use MIME::Lite; use MIME::Base64; diff --git a/LedgerSMB/Template.pm b/LedgerSMB/Template.pm index 0a822f7d..9d08d201 100755 --- a/LedgerSMB/Template.pm +++ b/LedgerSMB/Template.pm @@ -47,6 +47,7 @@ package LedgerSMB::Template; use Error qw(:try); use LedgerSMB::Sysconfig; +use LedgerSMB::Mailer; sub new { my $class = shift; @@ -115,14 +116,13 @@ sub render { sub output { my $self = shift; - my $method = shift; + my %args = @_; + my $method = $args{method} || $args{media}; - if ('mail' eq lc $method) { - #XXX do something - $self->_http_output; + if ('email' eq lc $method) { + $self->_email_output; } elsif ('print' eq lc $method) { - #XXX do something - $self->_http_output; + $self->_lpr_output; } else { $self->_http_output; } @@ -148,4 +148,14 @@ sub _http_output { exit; } +sub _email_output { + my $self = shift; + my $mail = new LedgerSMB::Mailer; + #TODO stub +} + +sub _lpr_output { + my $self = shift; + #TODO stub +} 1; diff --git a/LedgerSMB/Template/PDF.pm b/LedgerSMB/Template/PDF.pm index 72c080c6..7286b917 100755 --- a/LedgerSMB/Template/PDF.pm +++ b/LedgerSMB/Template/PDF.pm @@ -49,7 +49,8 @@ sub preprocess { my $rawvars = shift; my $vars; my $type = ref $rawvars; - return $vars; + #XXX Fix escaping + return $rawvars; } sub process { diff --git a/LedgerSMB/Template/PS.pm b/LedgerSMB/Template/PS.pm index 55349113..10a3806e 100755 --- a/LedgerSMB/Template/PS.pm +++ b/LedgerSMB/Template/PS.pm @@ -50,7 +50,8 @@ sub preprocess { my $rawvars = shift; my $vars; my $type = ref $rawvars; - return $vars; + #XXX fix escaping + return $rawvars; } sub process { |