[Fmsystem-commits] [9350]

[Erik Holm-Larsen]

Revision: 9350
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9350
Author:   erikhl
Date:     2012-05-10 05:43:47 +0000 (Thu, 10 May 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.uiactivities.inc.php

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2012-05-09 
20:56:17 UTC (rev 9349)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2012-05-10 
05:43:47 UTC (rev 9350)
@@ -445,12 +445,18 @@
                if($activity->get_group_id() && $activity->get_group_id() > 0)
                {
                        
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_group_id(),
 true));
-                       
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),
 $subject, $body);
+                       if($activity->get_contact_person_2() && 
$activity->get_contact_person_2()->get_email())
+                               
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),
 $subject, $body);
+                       else if($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
+                               
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_1(),
 $subject, $body);
                }
                else if($activity->get_organization_id() && 
$activity->get_organization_id() > 0)
                {
                        
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_organization_id()));
-                       
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),
 $subject, $body);
+                       if($activity->get_contact_person_2() && 
$activity->get_contact_person_2()->get_email())
+                               
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),
 $subject, $body);
+                       else if($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
+                               
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_1(),
 $subject, $body);
                }
            }
        
@@ -487,13 +493,19 @@
        {
                //$contact_person2 = 
activitycalendar_socontactperson::get_instance()->get_group_contact2($activity>get_group_id());
                
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_group_id(),
 true));
-               
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),
 $subject, $body);
+               if($activity->get_contact_person_2() && 
$activity->get_contact_person_2()->get_email())
+                       
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),
 $subject, $body);
+               else if($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
+                       
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_1(),
 $subject, $body);
        }
        else if($activity->get_organization_id() && 
$activity->get_organization_id() > 0)
        {
                //$contact_person2 = 
activitycalendar_socontactperson::get_instance()->get_oup_contact2($activity>get_group_id());
                
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_organization_id()));
-               
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),
 $subject, $body);
+               if($activity->get_contact_person_2() && 
$activity->get_contact_person_2()->get_email())
+                               
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),
 $subject, $body);
+               else if($activity->get_contact_person_1() && 
$activity->get_contact_person_1()->get_email())
+                       
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_1(),
 $subject, $body);
        }
        
        $GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' => 
'activitycalendar.uiactivities.index', 'message' => 'E-post sendt'));