X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttNotificationHelper.class.php;h=af1bcd3c8314eea211b3ff64ae8be5db3494f734;hb=15ae2165165da813912300d223c50b74f44cc1e0;hp=addbcdb650321b67c7e7d242215face3865a5bba;hpb=4af7dd7e10968588fe4c2828be5402f41d53ebc5;p=timetracker.git

diff --git a/WEB-INF/lib/ttNotificationHelper.class.php b/WEB-INF/lib/ttNotificationHelper.class.php
index addbcdb6..af1bcd3c 100644
--- a/WEB-INF/lib/ttNotificationHelper.class.php
+++ b/WEB-INF/lib/ttNotificationHelper.class.php
@@ -26,9 +26,6 @@
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 
-import('ttTeamHelper');
-import('ttUserHelper');
-
 // Class ttNotificationHelper is used to help with notification related tasks.
 class ttNotificationHelper {
 	
@@ -39,9 +36,9 @@ class ttNotificationHelper {
  
     $mdb2 = getConnection();
 
-    $sql = "select c.id, c.cron_spec, c.report_id, c.email, c.report_condition, c.status, fr.name from tt_cron c
+    $sql = "select c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.report_condition, c.status, fr.name from tt_cron c
       left join tt_fav_reports fr on (fr.id = c.report_id)
-      where c.id = $id and c.team_id = $user->team_id";
+      where c.id = $id and c.group_id = ".$user->getActiveGroup();
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -57,7 +54,7 @@ class ttNotificationHelper {
   	    
     $mdb2 = getConnection();
     
-    $sql = "delete from tt_cron where id = $id and team_id = $user->team_id";
+    $sql = "delete from tt_cron where id = $id and group_id = ".$user->getActiveGroup();
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -70,16 +67,18 @@ class ttNotificationHelper {
   {
     $mdb2 = getConnection();
 
-    $team_id = (int) $fields['team_id'];
+    $group_id = (int) $fields['group_id'];
     $cron_spec = $fields['cron_spec'];
     $next = (int) $fields['next'];
     $report_id = (int) $fields['report_id'];
     $email = $fields['email'];
+    $cc = $fields['cc'];
+    $subject = $fields['subject'];
     $report_condition = $fields['report_condition'];
     $status = $fields['status'];
     
-    $sql = "insert into tt_cron (team_id, cron_spec, next, report_id, email, report_condition, status)
-      values ($team_id, ".$mdb2->quote($cron_spec).", $next, $report_id, ".$mdb2->quote($email).", ".$mdb2->quote($report_condition).", ".$mdb2->quote($status).")";
+    $sql = "insert into tt_cron (group_id, cron_spec, next, report_id, email, cc, subject, report_condition, status)
+      values ($group_id, ".$mdb2->quote($cron_spec).", $next, $report_id, ".$mdb2->quote($email).", ".$mdb2->quote($cc).", ".$mdb2->quote($subject).", ".$mdb2->quote($report_condition).", ".$mdb2->quote($status).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -93,16 +92,18 @@ class ttNotificationHelper {
     $mdb2 = getConnection();
     
     $notification_id = (int) $fields['id'];
-    $team_id = (int) $fields['team_id'];
+    $group_id = (int) $fields['group_id'];
     $cron_spec = $fields['cron_spec'];
     $next = (int) $fields['next'];
     $report_id = (int) $fields['report_id'];
     $email = $fields['email'];
+    $cc = $fields['cc'];
+    $subject = $fields['subject'];
     $report_condition = $fields['report_condition'];
     $status = $fields['status'];
     
-    $sql = "update tt_cron set cron_spec = ".$mdb2->quote($cron_spec).", next = $next, report_id = $report_id, email = ".$mdb2->quote($email).", report_condition = ".$mdb2->quote($report_condition).", status = ".$mdb2->quote($status).
-      " where id = $notification_id and team_id = $team_id";
+    $sql = "update tt_cron set cron_spec = ".$mdb2->quote($cron_spec).", next = $next, report_id = $report_id, email = ".$mdb2->quote($email).", cc = ".$mdb2->quote($cc).", subject = ".$mdb2->quote($subject).", report_condition = ".$mdb2->quote($report_condition).", status = ".$mdb2->quote($status).
+      " where id = $notification_id and group_id = $group_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }