projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dutch translation improved.
[timetracker.git]
/
WEB-INF
/
lib
/
ttReportHelper.class.php
diff --git
a/WEB-INF/lib/ttReportHelper.class.php
b/WEB-INF/lib/ttReportHelper.class.php
index
71cee91
..
c66cb33
100644
(file)
--- a/
WEB-INF/lib/ttReportHelper.class.php
+++ b/
WEB-INF/lib/ttReportHelper.class.php
@@
-1573,9
+1573,9
@@
class ttReportHelper {
}
// sendFavReport - sends a favorite report to a specified email, called from cron.php
}
// sendFavReport - sends a favorite report to a specified email, called from cron.php
- static function sendFavReport($report, $
email
) {
+ static function sendFavReport($report, $
subject, $email, $cc
) {
// We are called from cron.php, we have no $bean in session.
// We are called from cron.php, we have no $bean in session.
- // cron.php set global $user and $i18n objects to match our favorite report user.
+ // cron.php set
s
global $user and $i18n objects to match our favorite report user.
global $user;
global $i18n;
global $user;
global $i18n;
@@
-1587,9
+1587,14
@@
class ttReportHelper {
$mailer->setCharSet(CHARSET);
$mailer->setContentType('text/html');
$mailer->setSender(SENDER);
$mailer->setCharSet(CHARSET);
$mailer->setContentType('text/html');
$mailer->setSender(SENDER);
+ if (!empty($cc))
+ $mailer->setReceiverCC($cc);
+ if (!empty($user->bcc_email))
+ $mailer->setReceiverBCC($user->bcc_email);
$mailer->setReceiver($email);
$mailer->setMailMode(MAIL_MODE);
$mailer->setReceiver($email);
$mailer->setMailMode(MAIL_MODE);
- if (!$mailer->send($report['name'], $body))
+ if (empty($subject)) $subject = $report['name'];
+ if (!$mailer->send($subject, $body))
return false;
return true;
return false;
return true;