From: <pk...@us...> - 2012-04-04 19:28:26
|
Revision: 40711 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40711&view=rev Author: pkdille Date: 2012-04-04 19:28:19 +0000 (Wed, 04 Apr 2012) Log Message: ----------- [QT] Rollback rejected proposition r37479 Revision Links: -------------- http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37479&view=rev Modified Paths: -------------- branches/proposals/6.x/lib/reportslib.php branches/proposals/6.x/lib/trackers/trackerlib.php Property Changed: ---------------- branches/proposals/6.x/ branches/proposals/6.x/templates/list_file_gallery_content.tpl branches/proposals/6.x/templates/modules/mod-perspective.tpl branches/proposals/6.x/tiki-switch_perspective.php Property changes on: branches/proposals/6.x ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 /branches/7.x:33946,34580,34583,37474,37832 /branches/experimental/big-blue-button:26681-26698 /branches/experimental/declfilter:15787-16031 /branches/experimental/edit_fixup:20923-21573 /branches/experimental/kaltura_integration_two:20962-22011 /branches/experimental/moz-metrics:23452-23480 /branches/experimental/ui-revamp2:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/proposals/4.x:24005 /trunk:31428,31623,31628,32682,33677,33681,35226,35960,36110,36318,36320-36321,37470,37828,39280,39705,39858 + /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 /branches/7.x:33946,34580,34583,37832 /branches/experimental/big-blue-button:26681-26698 /branches/experimental/declfilter:15787-16031 /branches/experimental/edit_fixup:20923-21573 /branches/experimental/kaltura_integration_two:20962-22011 /branches/experimental/moz-metrics:23452-23480 /branches/experimental/ui-revamp2:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/proposals/4.x:24005 /trunk:31428,31623,31628,32682,33677,33681,35226,35960,36110,36318,36320-36321,37828,39280,39705,39858 Modified: branches/proposals/6.x/lib/reportslib.php =================================================================== --- branches/proposals/6.x/lib/reportslib.php 2012-04-04 19:25:08 UTC (rev 40710) +++ branches/proposals/6.x/lib/reportslib.php 2012-04-04 19:28:19 UTC (rev 40711) @@ -178,7 +178,7 @@ global $calendarlib; require_once('lib/calendar/calendarlib.php'); $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' || $change['event'] == 'tracker_item_comment') { + } elseif ($change['event'] == 'tracker_item_modified') { global $trklib; require_once('lib/trackers/trackerlib.php'); $trackerId = $change['data']['trackerId']; @@ -187,35 +187,18 @@ $tracker = $trklib->get_tracker($trackerId); $mainFieldValue = $trklib->get_isMain_value($trackerId, $itemId); - if ($change['event'] == 'tracker_item_modified') { - if ($mainFieldValue) { - $body .= tr('%0 added or updated tracker item %1 on tracker %2', - "<u>{$change['data']['user']}</u>", - "<a href='$tikiUrl/tiki-view_tracker_item.php?itemId=$itemId'>$mainFieldValue</a>", - "<a href='$tikiUrl/tiki-view_tracker.php?trackerId=$trackerId'>{$tracker['name']}</a>" - ); - } else { - $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=$itemId'>$itemId</a>", - "<a href='$tikiUrl/tiki-view_tracker.php?trackerId=$trackerId'>{$tracker['name']}</a>" - ); - } + if ($mainFieldValue) { + $body .= tr('%0 added or updated tracker item %1 on tracker %2', + "<u>{$change['data']['user']}</u>", + "<a href='$tikiUrl/tiki-view_tracker_item.php?itemId=$itemId'>$mainFieldValue</a>", + "<a href='$tikiUrl/tiki-view_tracker.php?trackerId=$trackerId'>{$tracker['name']}</a>" + ); } else { - // tracker_item_comment event - if ($mainFieldValue) { - $body .= tr('%0 added a new comment to %1 on tracker %2', - "<u>{$change['data']['user']}</u>", - "<a href='$tikiUrl/tiki-view_tracker_item.php?itemId=$itemId&cookietab=2'>$mainFieldValue</a>", - "<a href='$tikiUrl/tiki-view_tracker.php?trackerId=$trackerId'>{$tracker['name']}</a>" - ); - } else { - $body .= tr('%0 added a new comment to item id %1 on tracker %2', - "<u>{$change['data']['user']}</u>", - "<a href='$tikiUrl/tiki-view_tracker_item.php?itemId=$itemId&cookietab=2'>$itemId</a>", - "<a href='$tikiUrl/tiki-view_tracker.php?trackerId=$trackerId'>{$tracker['name']}</a>" - ); - } + $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=$itemId'>$itemId</a>", + "<a href='$tikiUrl/tiki-view_tracker.php?trackerId=$trackerId'>{$tracker['name']}</a>" + ); } } Modified: branches/proposals/6.x/lib/trackers/trackerlib.php =================================================================== --- branches/proposals/6.x/lib/trackers/trackerlib.php 2012-04-04 19:25:08 UTC (rev 40710) +++ branches/proposals/6.x/lib/trackers/trackerlib.php 2012-04-04 19:28:19 UTC (rev 40711) @@ -254,9 +254,8 @@ } function replace_item_comment($commentId, $itemId, $title, $data, $user, $options) { - global $smarty, $notificationlib, $prefs, $user; + global $smarty, $notificationlib, $prefs; include_once ('lib/notifications/notificationlib.php'); - $title = strip_tags($title); $data = strip_tags($data, "<a>"); @@ -276,13 +275,6 @@ $watchers = $this->get_notification_emails($trackerId, $itemId, $options); - if ($prefs['feature_daily_report_watches'] == 'y') { - global $reportslib; require_once('lib/reportslib.php'); - $reportslib->makeReportCache($watchers, - array('event' => 'tracker_item_comment', 'itemId' => $itemId, 'trackerId' => $trackerId, 'user' => $user, 'threadId' => $commentId) - ); - } - if (count($watchers > 0)) { $trackerName = $this->getOne("select `name` from `tiki_trackers` where `trackerId`=?",array((int) $trackerId)); $smarty->assign('mail_date', $this->now); Property changes on: branches/proposals/6.x/templates/list_file_gallery_content.tpl ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/templates/list_file_gallery_content.tpl:16998-18916 /branches/4.x/templates/list_file_gallery_content.tpl:22817-23908 /branches/5.x/templates/list_file_gallery_content.tpl:26025-26523,26527-28378 /branches/7.x/templates/list_file_gallery_content.tpl:33946,34580,34583,37474,37832 /branches/experimental/big-blue-button/templates/list_file_gallery_content.tpl:26681-26698 /branches/experimental/declfilter/templates/list_file_gallery_content.tpl:15787-16031 /branches/experimental/edit_fixup/templates/list_file_gallery_content.tpl:20923-21573 /branches/experimental/kaltura_integration_two/templates/list_file_gallery_content.tpl:20962-22011 /branches/experimental/moz-metrics/templates/list_file_gallery_content.tpl:23452-23480 /branches/experimental/ui-revamp2/templates/list_file_gallery_content.tpl:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update/templates/list_file_gallery_content.tpl:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/proposals/4.x/templates/list_file_gallery_content.tpl:24005 /trunk/templates/list_file_gallery_content.tpl:31428,31623,32183,32682,33111,33677,33681,34698-34699,35226,35960,36110,37470,39280,39705,39858 + /branches/3.0/templates/list_file_gallery_content.tpl:16998-18916 /branches/4.x/templates/list_file_gallery_content.tpl:22817-23908 /branches/5.x/templates/list_file_gallery_content.tpl:26025-26523,26527-28378 /branches/7.x/templates/list_file_gallery_content.tpl:33946,34580,34583,37832 /branches/experimental/big-blue-button/templates/list_file_gallery_content.tpl:26681-26698 /branches/experimental/declfilter/templates/list_file_gallery_content.tpl:15787-16031 /branches/experimental/edit_fixup/templates/list_file_gallery_content.tpl:20923-21573 /branches/experimental/kaltura_integration_two/templates/list_file_gallery_content.tpl:20962-22011 /branches/experimental/moz-metrics/templates/list_file_gallery_content.tpl:23452-23480 /branches/experimental/ui-revamp2/templates/list_file_gallery_content.tpl:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update/templates/list_file_gallery_content.tpl:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/proposals/4.x/templates/list_file_gallery_content.tpl:24005 /trunk/templates/list_file_gallery_content.tpl:31428,31623,32183,32682,33111,33677,33681,34698-34699,35226,35960,36110,39280,39705,39858 Property changes on: branches/proposals/6.x/templates/modules/mod-perspective.tpl ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/templates/modules/mod-perspective.tpl:16998-18916 /branches/4.x/templates/modules/mod-perspective.tpl:22817-23908 /branches/5.x/templates/modules/mod-perspective.tpl:26025-26523,26527-28378 /branches/7.x/templates/modules/mod-perspective.tpl:33946,37474,37832 /branches/experimental/big-blue-button/templates/modules/mod-perspective.tpl:26681-26698 /branches/experimental/declfilter/templates/modules/mod-perspective.tpl:15787-16031 /branches/experimental/edit_fixup/templates/modules/mod-perspective.tpl:20923-21573 /branches/experimental/kaltura_integration_two/templates/modules/mod-perspective.tpl:20962-22011 /branches/experimental/moz-metrics/templates/modules/mod-perspective.tpl:23452-23480 /branches/experimental/ui-revamp2/templates/modules/mod-perspective.tpl:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update/templates/modules/mod-perspective.tpl:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/proposals/4.x/templates/modules/mod-perspective.tpl:24005 /trunk/templates/modules/mod-perspective.tpl:29485-30546,31628,33677,33681,35226,35960,36110,37470,39280,39705,39858 + /branches/3.0/templates/modules/mod-perspective.tpl:16998-18916 /branches/4.x/templates/modules/mod-perspective.tpl:22817-23908 /branches/5.x/templates/modules/mod-perspective.tpl:26025-26523,26527-28378 /branches/7.x/templates/modules/mod-perspective.tpl:33946,37832 /branches/experimental/big-blue-button/templates/modules/mod-perspective.tpl:26681-26698 /branches/experimental/declfilter/templates/modules/mod-perspective.tpl:15787-16031 /branches/experimental/edit_fixup/templates/modules/mod-perspective.tpl:20923-21573 /branches/experimental/kaltura_integration_two/templates/modules/mod-perspective.tpl:20962-22011 /branches/experimental/moz-metrics/templates/modules/mod-perspective.tpl:23452-23480 /branches/experimental/ui-revamp2/templates/modules/mod-perspective.tpl:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update/templates/modules/mod-perspective.tpl:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/proposals/4.x/templates/modules/mod-perspective.tpl:24005 /trunk/templates/modules/mod-perspective.tpl:29485-30546,31628,33677,33681,35226,35960,36110,39280,39705,39858 Property changes on: branches/proposals/6.x/tiki-switch_perspective.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/tiki-switch_perspective.php:16998-18916 /branches/4.x/tiki-switch_perspective.php:22817-23908 /branches/5.x/tiki-switch_perspective.php:26025-26523,26527-28378 /branches/7.x/tiki-switch_perspective.php:33946,37474,37832 /branches/experimental/big-blue-button/tiki-switch_perspective.php:26681-26698 /branches/experimental/declfilter/tiki-switch_perspective.php:15787-16031 /branches/experimental/edit_fixup/tiki-switch_perspective.php:20923-21573 /branches/experimental/kaltura_integration_two/tiki-switch_perspective.php:20962-22011 /branches/experimental/moz-metrics/tiki-switch_perspective.php:23452-23480 /branches/experimental/ui-revamp2/tiki-switch_perspective.php:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update/tiki-switch_perspective.php:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/proposals/4.x/tiki-switch_perspective.php:24005 /trunk/tiki-switch_perspective.php:29485-30546,31628,33677,33681,35226,35960,36110,37470,39280,39705,39858 + /branches/3.0/tiki-switch_perspective.php:16998-18916 /branches/4.x/tiki-switch_perspective.php:22817-23908 /branches/5.x/tiki-switch_perspective.php:26025-26523,26527-28378 /branches/7.x/tiki-switch_perspective.php:33946,37832 /branches/experimental/big-blue-button/tiki-switch_perspective.php:26681-26698 /branches/experimental/declfilter/tiki-switch_perspective.php:15787-16031 /branches/experimental/edit_fixup/tiki-switch_perspective.php:20923-21573 /branches/experimental/kaltura_integration_two/tiki-switch_perspective.php:20962-22011 /branches/experimental/moz-metrics/tiki-switch_perspective.php:23452-23480 /branches/experimental/ui-revamp2/tiki-switch_perspective.php:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update/tiki-switch_perspective.php:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/proposals/4.x/tiki-switch_perspective.php:24005 /trunk/tiki-switch_perspective.php:29485-30546,31628,33677,33681,35226,35960,36110,39280,39705,39858 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |