[Fmsystem-commits] [9528] glitch

[Sigurd Nes]

Revision: 9528
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9528
Author:   sigurdne
Date:     2012-06-07 07:33:25 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
glitch

Modified Paths:
--------------
    trunk/property/inc/class.uiworkorder.inc.php

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2012-06-07 07:07:22 UTC 
(rev 9527)
+++ trunk/property/inc/class.uiworkorder.inc.php        2012-06-07 07:33:25 UTC 
(rev 9528)
@@ -1190,12 +1190,8 @@
 
                                                foreach($notify_list as $entry)
                                                {
-                                                       if($entry['is_active'] 
&& $entry['notification_method'] == 'email' && $entry['email'])
+                                                       if($entry['is_active'] 
&& $entry['notification_method'] == 'sms' && $entry['sms'])
                                                        {
-                                                               $toarray[] = 
"{$entry['first_name']} {$entry['last_name']}<{$entry['email']}>";
-                                                       }
-                                                       else 
if($entry['is_active'] && $entry['notification_method'] == 'sms' && 
$entry['sms'])
-                                                       {
                                                                
$sms->websend2pv($this->account,$entry['sms'],$sms_text);
                                                                $toarray_sms[] 
= "{$entry['first_name']} {$entry['last_name']}({$entry['sms']})";
                                                                
$receipt['message'][]=array('msg'=>lang('%1 is 
notified',"{$entry['first_name']} {$entry['last_name']}"));
@@ -1209,6 +1205,16 @@
                                                }
                                        }
                                                
+                                       reset($notify_list);
+                                       foreach($notify_list as $entry)
+                                       {
+                                               if($entry['is_active'] && 
$entry['notification_method'] == 'email' && $entry['email'])
+                                               {
+                                                       $toarray[] = 
"{$entry['first_name']} {$entry['last_name']}<{$entry['email']}>";
+                                               }
+                                       }
+                                       unset($entry);
+
                                        if ($toarray)
                                        {
                                                $to = implode(';',$toarray);