[Fmsystem-commits] [8216]

[Erik Holm-Larsen]

Revision: 8216
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8216
Author:   erikhl
Date:     2011-11-29 13:36:12 +0000 (Tue, 29 Nov 2011)
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       2011-11-29 
13:29:21 UTC (rev 8215)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2011-11-29 
13:36:12 UTC (rev 8216)
@@ -359,6 +359,7 @@
                }
                if($email)
                {
+                       //var_dump($mail_rows);
                        $this->send_email_to_selection($mail_rows);     
                }
                else
@@ -412,7 +413,6 @@
     {
        foreach($activities as $activity)
        {
-               
                //$activity = 
activitycalendar_soactivity::get_instance()->get_single($activity_id);
                $subject = lang('mail_subject_update');
                $link_text = 
"http://www.bergen.kommune.no/portico/activitycalendarfrontend/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}";
@@ -503,12 +503,13 @@
                //$mailtoAddress = "address@hidden";
                
                //var_dump($mailtoAddress);
-
+//var_dump($mailtoAddress.';'.$from.';'.$subject);
                if (strlen($mailtoAddress) > 0) 
                {
                        try
                        {
                                //var_dump('inne i try');
+//                             var_dump('inne i try - org;');
                                $GLOBALS['phpgw']->send->msg('email', 
$mailtoAddress, $subject, $body, '', '', '', $from, '', 'html');
                        }
                        catch (phpmailerException $e)
@@ -520,7 +521,10 @@
     
        function send_mailnotification_to_group($contact_person_id, $subject, 
$body)
        {
-               $send = CreateObject('phpgwapi.send');
+               if (!is_object($GLOBALS['phpgw']->send))
+               {
+                       $GLOBALS['phpgw']->send = CreateObject('phpgwapi.send');
+               }
 
                $config = CreateObject('phpgwapi.config','booking');
                $config->read();
@@ -534,12 +538,14 @@
                
                $mailtoAddress = 
activitycalendar_socontactperson::get_instance()->get_mailaddress_for_group_contact($contact_person_id);
                //$mailtoaddress = "address@hidden";
-
+//var_dump($mailtoAddress.';'.$from.';'.$subject);
                if (strlen($mailtoAddress) > 0) 
                {
                        try
                        {
-                               $send->msg('email', $mailtoAddress, $subject, 
$body, '', '', '', $from, '', 'html');
+//                             var_dump('inne i try - group;');
+//                             $send->msg('email', $mailtoAddress, $subject, 
$body, '', '', '', $from, '', 'html');
+                               $GLOBALS['phpgw']->send->msg('email', 
$mailtoAddress, $subject, $body, '', '', '', $from, '', 'html');
                        }
                        catch (phpmailerException $e)
                        {