projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More progress on storing group_id on new inserts.
[timetracker.git]
/
cron.php
diff --git
a/cron.php
b/cron.php
index
7175c8f
..
94a20dd
100644
(file)
--- a/
cron.php
+++ b/
cron.php
@@
-45,10
+45,10
@@
import('ttFavReportHelper');
import('ttReportHelper');
$mdb2 = getConnection();
import('ttReportHelper');
$mdb2 = getConnection();
-$now =
mk
time();
+$now = time();
- $sql = "select
* from tt_fav_reports fr
- left join tt_
cron c
on (c.report_id = fr.id)
+ $sql = "select
c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.report_condition from tt_cron c
+ left join tt_
fav_reports fr
on (c.report_id = fr.id)
where $now >= c.next and fr.status = 1
and c.status = 1 and c.report_id is not null and c.email is not null";
$res = $mdb2->query($sql);
where $now >= c.next and fr.status = 1
and c.status = 1 and c.report_id is not null and c.email is not null";
$res = $mdb2->query($sql);
@@
-59,24
+59,28
@@
while ($val = $res->fetchRow()) {
// We have jobs to execute in user language.
// Get favorite report details.
// We have jobs to execute in user language.
// Get favorite report details.
- $
report = ttFavReportHelper::getReport
($val['report_id']);
- if (!$
report
) continue; // Skip not found report.
+ $
options = ttFavReportHelper::getReportOptions
($val['report_id']);
+ if (!$
options
) continue; // Skip not found report.
// Recycle global $user object, as user settings are specific for each report.
// Recycle global $user object, as user settings are specific for each report.
- $user = new ttUser(null, $
report
['user_id']);
+ $user = new ttUser(null, $
options
['user_id']);
if (!$user->id) continue; // Skip not found user.
if (!$user->id) continue; // Skip not found user.
+
+ // Skip users with disabled Notifications plugin.
+ if (!$user->isPluginEnabled('no')) continue;
+
// Recycle $i18n object because language is user-specific.
$i18n->load($user->lang);
// Check condition on a report.
$condition_ok = true;
if ($val['report_condition'])
// Recycle $i18n object because language is user-specific.
$i18n->load($user->lang);
// Check condition on a report.
$condition_ok = true;
if ($val['report_condition'])
- $condition_ok = ttReportHelper::checkFavReportCondition($
report
, $val['report_condition']);
+ $condition_ok = ttReportHelper::checkFavReportCondition($
options
, $val['report_condition']);
// Email report if condition is okay.
if ($condition_ok) {
// Email report if condition is okay.
if ($condition_ok) {
- if (ttReportHelper::sendFavReport($
report, $val['email
']))
- echo "Report ".$val['report_id']. " sent
to ".$val['email']."
<br>";
+ if (ttReportHelper::sendFavReport($
options, $val['subject'], $val['email'], $val['cc
']))
+ echo "Report ".$val['report_id']. " sent
.
<br>";
else
echo "Error while emailing report...<br>";
}
else
echo "Error while emailing report...<br>";
}