sync

[web.mtrack] / MTrackWeb / Cron / Notify.php

diff --git a/MTrackWeb/Cron/Notify.php b/MTrackWeb/Cron/Notify.php
index 89197ba..313352c 100644 (file)
--- a/MTrackWeb/Cron/Notify.php
+++ b/MTrackWeb/Cron/Notify.php
@@ -1,6 +1,8 @@
 <?php
 require_once 'MTrackWeb.php';
 
+// is this used currently - it's supposed to be for sending out notificatios on changes?
+
 class MTrackWeb_Cron_Notify extends MTrackWeb
 {
     
@@ -31,25 +33,29 @@ class MTrackWeb_Cron_Notify extends MTrackWeb
         $e->action = 'MTRACK.NOTIFY';
         $e->selectAdd();
         $e->selectAdd('MAX(event_when) as event_when');
-        
-        if (!$e->find(true)) {
-            $e->event_when = date('Y-m-d H:i:s', 0); // should be a long time ago..
+        $e->find(true);
+        if (empty($e->event_when)) {
+            $e->event_when = date('Y-m-d H:i:s', strtotime("NOW - 2 days")); // should be a long time ago..
         }
          
         
         
-        stream_filter_register("mtrackcanonical", 'CanonicalLineEndingFilter');
-        stream_filter_register("mtrackunix", 'UnixLineEndingFilter');
+        //stream_filter_register("mtrackcanonical", 'CanonicalLineEndingFilter');
+        //stream_filter_register("mtrackunix", 'UnixLineEndingFilter');
         
         $w = DB_DataObject::factory('core_watch');
+        //echo "gather watched";
+       // DB_DataObject::debugLevel(1);
         // returns a list of user with the objects they are watching..
         $watches = $w->watched('email');
-        
+        //echo "\nDONE WATCHED\n";
         $CS = DB_DataObject::factory('mtrack_change');
         
         $messages = array();
         $cache = array();
         foreach($watches as $uid => $ar) {
+            //echo "gather changes";
+            //print_r($uid); print_r($ar);
             // we can now query mtrack_change for anything that occured in that list..
             $messages = $CS->gatherChanges($e->event_when, $uid, $ar);
             //print_R($messages);exit;
@@ -57,6 +63,7 @@ class MTrackWeb_Cron_Notify extends MTrackWeb
             
             // should be like a list of tickets
             foreach ($messages as $m=>$ar) {
+                
                 $lr = explode(':', $m);
                 $o = DB_DataObject::Factory($lr[0]);
                 $o->autoJoin();
@@ -67,7 +74,7 @@ class MTrackWeb_Cron_Notify extends MTrackWeb
                     $cs->autoJoin();
                     $cache[implode(',', $ar)] = $cs->fetchAll();
                 }
-                $u  = DB_DataObject::factory('Person');
+                $u  = DB_DataObject::factory('core_person');
                 $u->get($uid);
                 $method =  'notify_'. $lr[0] ;
                 if (method_exists($this,$method)) {
@@ -108,12 +115,31 @@ class MTrackWeb_Cron_Notify extends MTrackWeb
      *   - to user...
      *   
      */
-    function calcAddress($changes, $user) {
+    function calcAddress($ticket, $changes, $user)
+    {
         $ff = HTML_FlexyFramework::get();
-     
         
+        
+        $changers = array();
+        foreach($changes as $c) {
+            if ($change->person_id == $user->id) {
+                continue;
+            }
+            if (in_array($change->person_id_name, $changers)) {
+                continue;
+            }
+            $changers[] = $change->person_id_name;
+            
+        }
+        $fromname = '"'. addslashes($project->toEventString()). '"';
+        if (count($changers) == 1) {
+            $fromname = '"'. addslashes($changers[0]).  '"';
+        }
+        
+        $p = $ticket->project();
         $headers['To'] = '"'. addslashes($user->name). '" <' . $user->email .'>';
-        $headers['From'] = $ff->MTrack['email_address']; // could be the user who made the change...
+        $headers['From'] = '"'. addslashes($project->toEventString()). '" '. 
+                $ff->MTrackWeb['email_address']; // could be the user who made the change...
         
         //if (count($from) > 1) {
         //    $rep = array();
@@ -121,7 +147,8 @@ class MTrackWeb_Cron_Notify extends MTrackWeb
          //       foreach ($from as $email) {
          // $rep[] = make_email($email[0], $email[1]);
         // }
-        $headers['Reply-To'] =  $ff->MTrack['email_address'];
+        
+        $headers['Reply-To'] =  $ff->MTrackWeb['email_address'];
         //}
         return $headers;
     }
@@ -138,10 +165,16 @@ class MTrackWeb_Cron_Notify extends MTrackWeb
     function notify_mtrack_ticket($ticket, $changes, $user)
     {
         //global $MAX_DIFF;
-      
+        $ff = HTML_FlexyFramework::get();
+     
+        
+        
+        
+     
+     
         // from is always the system.. ??
         // unless all the changers are the same..
-        $headers = $this->calcAddress($changes, $user);
+        $headers = $this->calcAddress($ticket, $changes, $user);
         
           
         //$headers['To'] = '"'. addslashes($user->name). '" <' . $user->email .'>';
@@ -189,9 +222,10 @@ class MTrackWeb_Cron_Notify extends MTrackWeb
         // }
     
         $headers['Subject'] = sprintf("%s#%s %s (%s %s)",
-          $subj, $ticket->id, $ticket->summary, $ticket->status_name, $ticket->classification_id_name);
+          $subj, $ticket->id, $ticket->summary,
+          $ticket->status_name, $ticket->classification_id_name);
     
-        $owner = strlen($ticket->owner) ? $ticket->owner_id_name : 'nobody';
+        $owner =  $ticket->owner_id ? $ticket->owner_id_name : 'nobody';
     
         $body = 
             sprintf("%s/Ticket.php/%s\n\n", $ff->MTrackWeb['url'], $ticket->id) .
@@ -258,15 +292,18 @@ class MTrackWeb_Cron_Notify extends MTrackWeb
                     //case 'commit?'  
                       
                     default:
-                        if (!strlen($audit->oldvalue)) {
-                            $body .= "Set {$audit->field()} to: {$audit->value}\n";
+                        $oldvalue = $audit->oldvalue($this);
+                        $value = $audit->oldvalue($this);
+                        if (!strlen($oldvalue)) {
+                            $body .= "Set {$audit->field()} to: {$value}\n";
                             continue;
                         }
-                        if (!strlen($audit->value)) {
-                            $body .= "Removed {$audit->field()} - was: {$audit->oldvalue}\n";
+                        
+                        if (!strlen($value)) {
+                            $body .= "Removed {$audit->field()} - was: {$oldvalue}\n";
                             continue;
                         }
-                        $body .= "Changed {$audit->field()} from :{$audit->oldvalue} -> {$audit->value}\n";
+                        $body .= "Changed {$audit->field()} from :{$oldvalue} -> {$value}\n";
                         continue;  
                 }
             }
@@ -281,7 +318,7 @@ class MTrackWeb_Cron_Notify extends MTrackWeb
     
 }
 
-
+/*
 class CanonicalLineEndingFilter extends php_user_filter {
     function filter($in, $out, &$consumed, $closing)
     {
@@ -303,4 +340,6 @@ class CanonicalLineEndingFilter extends php_user_filter {
       }
       return PSFS_PASS_ON;
     }
-    }
\ No newline at end of file
+}
+*/
+    
\ No newline at end of file