[Fmsystem-commits] [9116] fixed mail-sending from activities, get contact person 2 from booking when sending mail

[Erik Holm-Larsen]

Revision: 9116
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9116
Author:   erikhl
Date:     2012-04-11 06:33:54 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
fixed mail-sending from activities, get contact person 2 from booking when 
sending mail

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-04-10 
16:43:51 UTC (rev 9115)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2012-04-11 
06:33:54 UTC (rev 9116)
@@ -435,10 +435,12 @@
                
                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);
                }
                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);
                }
            }
@@ -474,11 +476,13 @@
        if($activity->get_group_id() && $activity->get_group_id() > 0)
        {
                //$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);
        }
        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);
        }
        
@@ -486,7 +490,7 @@
        
     }
     
-       function send_mailnotification_to_organization($contact_person_id, 
$subject, $body)
+       function send_mailnotification_to_organization($contact_person, 
$subject, $body)
        {
                
                //var_dump($contact_person_id . ',' . $subject . ',' . $body);
@@ -505,7 +509,7 @@
                        return false;
                }
                
-               $mailtoAddress = 
activitycalendar_socontactperson::get_instance()->get_mailaddress_for_org_contact($contact_person_id);
+               $mailtoAddress = 
activitycalendar_socontactperson::get_instance()->get_mailaddress_for_org_contact($contact_person->get_id());
                //$mailtoAddress = "address@hidden";
                
                //var_dump($mailtoAddress);
@@ -534,7 +538,7 @@
                }
        }
     
-       function send_mailnotification_to_group($contact_person_id, $subject, 
$body)
+       function send_mailnotification_to_group($contact_person, $subject, 
$body)
        {
                if (!is_object($GLOBALS['phpgw']->send))
                {
@@ -551,7 +555,7 @@
                        return false;
                }
                
-               $mailtoAddress = 
activitycalendar_socontactperson::get_instance()->get_mailaddress_for_group_contact($contact_person_id);
+               $mailtoAddress = 
activitycalendar_socontactperson::get_instance()->get_mailaddress_for_group_contact($contact_person->get_id());
                //$mailtoaddress = "address@hidden";
 //var_dump($mailtoAddress.';'.$from.';'.$subject);
                if (strlen($mailtoAddress) > 0)