[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php, 1.71.2.33.2.15, 1.71.2.33.2.16

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv8204

Modified Files:
      Tag: Version-0_9_16-branch
        class.bocalendar.inc.php 
Log Message:
fixed wrong notify on new events and added a more detailed and translated 
error-message for failed notifys


Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71.2.33.2.15
retrieving revision 1.71.2.33.2.16
diff -C2 -r1.71.2.33.2.15 -r1.71.2.33.2.16
*** class.bocalendar.inc.php    17 Aug 2003 23:02:37 -0000      1.71.2.33.2.15
--- class.bocalendar.inc.php    20 Aug 2003 10:02:28 -0000      1.71.2.33.2.16
***************
*** 2249,2255 ****
                                $to_notify = array();
                        }
!                       if (!isset($to_notify[$old_event['owner']]) && 
$msg_type != MSG_ALARM)
                        {
!                               $to_notify[$old_event['owner']] = 'owner';      
// always include the event-owner
                        }
                        $version = 
$GLOBALS['phpgw_info']['apps']['calendar']['version'];
--- 2249,2256 ----
                                $to_notify = array();
                        }
!                       $owner = $old_event ? $old_event['owner'] : 
$new_event['owner'];
!                       if ($owner && !isset($to_notify[$owner]) && $msg_type 
!= MSG_ALARM)
                        {
!                               $to_notify[$owner] = 'owner';   // always 
include the event-owner
                        }
                        $version = 
$GLOBALS['phpgw_info']['apps']['calendar']['version'];
***************
*** 2384,2388 ****
                                        if (empty($to) || $to[0] == '@' || 
$to[0] == '$')       // we have no valid email-address
                                        {
!                                               echo 
"<p>bocalendar::send_update: Empty email adress for user 
'".$details['to-fullname']."' ==> ignored !!!</p>\n";
                                                continue;
                                        }
--- 2385,2389 ----
                                        if (empty($to) || $to[0] == '@' || 
$to[0] == '$')       // we have no valid email-address
                                        {
!                                               //echo 
"<p>bocalendar::send_update: Empty email adress for user 
'".$details['to-fullname']."' ==> ignored !!!</p>\n";
                                                continue;
                                        }
***************
*** 2440,2445 ****
                                        if (!$returncode)       // not nice, 
but better than failing silently
                                        {
!                                               echo 
"<p>bocalendar::send_update: sending message to '$to' #$userid 
subject='$subject', sender='$sender' failed !!!<br>\n"; 
!                                               echo 
$send->err['desc']."</p>\n";
                                        }
                                }
--- 2441,2448 ----
                                        if (!$returncode)       // not nice, 
but better than failing silently
                                        {
!                                               echo 
'<p><b>bocalendar::send_update</b>: '.lang("Failed sending message to '%1' #%2 
subject='%3', sender='%4' !!!",$to,$userid,htmlspecialchars($subject), 
$sender)."<br>\n";
!                                               echo 
'<i>'.$send->err['desc']."</i><br>\n";
!                                               echo lang('This is mostly 
caused by a not or wrongly configured SMTP server. Notify your 
administrator.')."</p>\n";
!                                               echo '<p>'.lang('Click %1here%2 
to return to the calendar.','<a 
href="'.$GLOBALS['phpgw']->link('/calendar/').'">','</a>')."</p>\n";
                                        }
                                }