From: <sam...@us...> - 2011-08-05 21:26:47
|
Revision: 35872 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35872&view=rev Author: sampaioprimo Date: 2011-08-05 21:26:41 +0000 (Fri, 05 Aug 2011) Log Message: ----------- add tracker items to daily reports Modified Paths: -------------- trunk/lib/reportslib.php trunk/lib/trackers/trackerlib.php Modified: trunk/lib/reportslib.php =================================================================== --- trunk/lib/reportslib.php 2011-08-05 21:26:13 UTC (rev 35871) +++ trunk/lib/reportslib.php 2011-08-05 21:26:41 UTC (rev 35872) @@ -175,6 +175,14 @@ $calendarlib = TikiLib::lib('calendar'); $item = $calendarlib->get_item($change['data']['calitemId']); $body .= tr('%0 added or updated event %1', "<u>{$change['data']['user']}</u>", "<a href='$tikiUrl/tiki-calendar_edit_item.php?viewcalitemId={$change['data']['calitemId']}'>{$item['name']}</a>"); + } elseif ($change['event'] == 'tracker_item_modified') { + $trklib = TikiLib::lib('trk'); + $tracker = $trklib->get_tracker($change['data']['trackerId']); + $body .= tr('%0 added or updated tracker item id %1 on tracker %2', + "<u>{$change['data']['user']}</u>", + "<a href='$tikiUrl/tiki-view_tracker_item.php?itemId={$change['data']['itemId']}'>{$change['data']['itemId']}</a>", + "<a href='$tikiUrl/tiki-view_tracker.php?trackerId={$change['data']['trackerId']}'>{$tracker['name']}</a>" + ); } if ($key==0) Modified: trunk/lib/trackers/trackerlib.php =================================================================== --- trunk/lib/trackers/trackerlib.php 2011-08-05 21:26:13 UTC (rev 35871) +++ trunk/lib/trackers/trackerlib.php 2011-08-05 21:26:41 UTC (rev 35872) @@ -2883,10 +2883,22 @@ return $newTrackerId; } function get_notification_emails($trackerId, $itemId, $options, $status='', $oldStatus='') { - global $prefs; + global $prefs, $user; $watchers_global = $this->get_event_watches('tracker_modified',$trackerId); $watchers_local = $this->get_local_notifications($itemId, $status, $oldStatus); - $watchers_item = $itemId? $this->get_event_watches('tracker_item_modified',$itemId, array('trackerId'=>$trackerId)): array(); + $watchers_item = $itemId ? $this->get_event_watches('tracker_item_modified',$itemId, array('trackerId'=>$trackerId)) : array(); + + // use daily reports feature only if tracker item has been added or updated + if ($prefs['feature_daily_report_watches'] == 'y' && !empty($status)) { + $reportslib = TikiLib::lib('reports'); + $reportslib->makeReportCache($watchers_global, + array('event' => 'tracker_item_modified', 'itemId' => $itemId, 'trackerId' => $trackerId, 'user' => $user) + ); + $reportslib->makeReportCache($watchers_item, + array('event' => 'tracker_item_modified', 'itemId' => $itemId, 'trackerId' => $trackerId, 'user' => $user) + ); + } + $watchers_outbound = array(); if( array_key_exists( "outboundEmail", $options ) && $options["outboundEmail"] ) { $emails3 = preg_split('/,/', $options['outboundEmail']); @@ -2900,7 +2912,7 @@ $watchers_outbound[] = array('email'=>$w, 'user'=>$u, 'language'=>$user_preferences[$u]['language'], 'mailCharset'=>$user_preferences[$u]['mailCharset']); } } - //echo "<pre>GLOBAL ";print_r($watchers_global);echo 'LOCAL ';print_r($watchers_local); echo 'ITEM ';print_r($watchers_item); echo 'OUTBOUND ';print_r($watchers_outbound); + $emails = array(); $watchers = array(); foreach (array('watchers_global', 'watchers_local', 'watchers_item', 'watchers_outbound') as $ws) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |