Changeset 4217 for branches/2.2.0.1/calendar/inc
- Timestamp:
- 05/04/11 17:11:07 (13 years ago)
- Location:
- branches/2.2.0.1/calendar/inc
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.0.1/calendar/inc/class.bocalendar.inc.php
r4159 r4217 1186 1186 $this->so->set_category(strval($l_categories[0])); 1187 1187 } 1188 $this->so->set_title($l_cal['title']);1188 $this->so->set_title($l_cal['title']); 1189 1189 $this->so->set_description($l_cal['description']); 1190 1190 $this->so->set_observations($l_cal['observations']); 1191 $this->so->set_notifications_owner($l_cal['notifications_owner']); 1191 1192 $this->so->set_attachment($l_cal['attachment']); 1192 1193 $this->so->set_ex_participants($l_cal['ex_participants']); … … 3110 3111 3111 3112 $GLOBALS['phpgw_info']['user']['preferences'] = $GLOBALS['phpgw']->preferences->create_email_preferences(); 3112 $sender = $GLOBALS['phpgw_info']['user']['email']; 3113 3114 $temp_tz_offset = $this->prefs['common']['tz_offset']; 3113 $preferences = CreateObject('phpgwapi.preferences',(int)$this->owner); 3114 $GLOBALS['phpgw']->accounts->get_account_name((int)$owner,$lid,$fname,$lname); 3115 3116 if($new_event['notifications_owner'] == '1'){ 3117 $sender = $preferences->email_address((int)$owner); 3118 $sender_name = $fname.' '.$lname; 3119 }else{ 3120 $sender = $GLOBALS['phpgw_info']['user']['email']; 3121 $sender_name = $GLOBALS['phpgw_info']['user']['fullname']; 3122 } 3123 3124 $temp_tz_offset = $this->prefs['common']['tz_offset']; 3115 3125 $temp_timeformat = $this->prefs['common']['timeformat']; 3116 3126 $temp_dateformat = $this->prefs['common']['dateformat']; … … 3252 3262 continue; // dont notify rejected participants 3253 3263 } 3254 if($userid != $ GLOBALS['phpgw_info']['user']['account_id']|| $msg_type == MSG_ALARM || isset($new_event['attachment']))3264 if($userid != $owner || $msg_type == MSG_ALARM || isset($new_event['attachment'])) 3255 3265 { 3256 3266 print_debug('Msg Type',$msg_type); … … 3512 3522 $mail->Body .= "\n--01BD3665.3AF0D360--\n"; 3513 3523 $mail->From = $sender; 3514 $mail->FromName = $ GLOBALS['phpgw_info']['user']['fullname'];3524 $mail->FromName = $sender_name; 3515 3525 $mail->Sender = $mail->From; 3516 3526 $mail->SenderName = $mail->FromName; … … 3605 3615 3606 3616 $mail->From = $sender; 3607 $mail->FromName = $ GLOBALS['phpgw_info']['user']['fullname'];3617 $mail->FromName = $sender_name; 3608 3618 $mail->Sender = $mail->From; 3609 3619 $mail->SenderName = $mail->FromName; … … 3662 3672 $mail->Port = $emailadmin['smtpPort']; 3663 3673 $mail->From = $sender; 3664 $mail->FromName = $ GLOBALS['phpgw_info']['user']['fullname'];3674 $mail->FromName = $sender_name; 3665 3675 $mail->Sender = $mail->From; 3666 3676 $mail->SenderName = $mail->FromName; -
branches/2.2.0.1/calendar/inc/class.bocustom_fields.inc.php
r3976 r4217 34 34 'observations' => 'Observations', 35 35 'alter_by' => 'Alter by', 36 'attachment' => 'attachment' 36 'attachment' => 'attachment', 37 'notifications_owner' => 'notifications_owner' 37 38 ); 38 39 -
branches/2.2.0.1/calendar/inc/class.socalendar.inc.php
r4024 r4217 380 380 } 381 381 382 function set_notifications_owner($notifications_owner='') 383 { 384 $this->cal->set_notifications_owner($notifications_owner); 385 } 386 382 387 function set_ex_participants($ex_participants='') 383 388 { -
branches/2.2.0.1/calendar/inc/class.socalendar__.inc.php
r3976 r4217 107 107 } 108 108 109 function set_notifications_owner($notifications_owner='') 110 { 111 $this->add_attribute('notifications_owner',$notifications_owner); 112 } 113 109 114 function set_alter_by($alter_by='') 110 115 { -
branches/2.2.0.1/calendar/inc/class.socalendar_sql.inc.php
r4147 r4217 570 570 $this->set_description(stripslashes($GLOBALS['phpgw']->strip_html($this->stream->f('description')))); 571 571 $this->set_observations(stripslashes($GLOBALS['phpgw']->strip_html($this->stream->f('observations')))); 572 $this->set_notifications_owner(stripslashes($GLOBALS['phpgw']->strip_html($this->stream->f('notifications_owner')))); 572 573 $this->set_alter_by(stripslashes($GLOBALS['phpgw']->strip_html($this->stream->f('alter_by')))); 573 574 $this->set_attachment(stripslashes($GLOBALS['phpgw']->strip_html($this->stream->f('attachment')))); … … 986 987 . "description='".$this->stream->db_addslashes($event['description'])."', " 987 988 . "observations='".$this->stream->db_addslashes($event['observations'])."', " 989 . 'notifications_owner='.(int)$event['notifications_owner'].',' 988 990 . "attachment='".$this->stream->db_addslashes($sattach)."', " 989 991 . "alter_by='".$this->stream->db_addslashes($GLOBALS['phpgw_info']['user']['fullname'])."', " -
branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php
r4195 r4217 6015 6015 } 6016 6016 6017 // Reminder6017 // Reminder 6018 6018 // The user must use "Alarm Management" to change/modify an alarm 6019 6019 // so only display the email reminder fields if this is a new event … … 6097 6097 'data' => '<select name="cal[recur_type]">'."\n".$str.'</select>'."\n" 6098 6098 ); 6099 6100 6101 $preferences = CreateObject('phpgwapi.preferences',(int)$this->owner); 6102 $selected_creator = $selected_owner = ''; 6103 if($event['notifications_owner'] == 1) 6104 $selected_owner = ' selected'; 6105 else 6106 $selected_creator = ' selected'; 6107 6108 $option = '<option value="0" '.$selected_creator.' >'.$GLOBALS['phpgw']->common->grab_owner_name((int)$_SESSION['phpgw_session']['account_id']).'</option>'; 6109 if($_SESSION['phpgw_session']['account_id'] != $event['owner']){ 6110 $option .= '<option value="1" '.$selected_owner.' >'.$GLOBALS['phpgw']->common->grab_owner_name((int)$event['owner']).'</option>'; 6111 } 6112 6113 6114 $var['notifications_owner'] = Array( 6115 'field' => lang('Send notificatios as'), 6116 'data' => '<select name="cal[notifications_owner]" >'.$option.'</select>' 6117 ); 6118 6099 6119 6100 6120 if($event['recur_enddate']['year'] != 0 && $event['recur_enddate']['month'] != 0 && $event['recur_enddate']['mday'] != 0)
Note: See TracChangeset
for help on using the changeset viewer.