Changeset 5243
- Timestamp:
- 12/12/11 15:35:26 (12 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/calendar/inc/class.socalendar_sql.inc.php
r5132 r5243 17 17 $_SESSION['rootPath'] = PHPGW_INCLUDE_ROOT; 18 18 require_once $_SESSION['rootPath'].'/API/class.servicelocator.php'; 19 }else if($_SESSION['rootPath']){ 20 require_once $_SESSION['rootPath'].'/API/class.servicelocator.php'; 19 21 }else{ 20 require_once $_SESSION['rootPath'].'/API/class.servicelocator.php';22 require_once PHPGW_INCLUDE_ROOT.'/API/class.servicelocator.php'; 21 23 } 22 24 -
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r5228 r5243 2459 2459 2460 2460 $quotaInfo = (!isset($params['noQuotaInfo'])) ? $this->get_quota( array('folder_id' => $currentFolder)) : false; //VERIFICA SE O USUARIO TEM COTA 2461 2461 2462 2462 return ( ( is_array($quotaInfo) ) ? array_merge($return, $quotaInfo) : $return ); 2463 2463 } … … 3263 3263 } 3264 3264 3265 function add_recipients($recipient_type, $full_address, $mail )3265 function add_recipients($recipient_type, $full_address, $mail, $mobile = false) 3266 3266 { 3267 3267 //remove a comma if is given two unexpected commas … … 3269 3269 $parse_address = imap_rfc822_parse_adrlist($full_address, ""); 3270 3270 $bolean = true; 3271 foreach ($parse_address as $val) 3272 { 3273 //echo "<script language=\"javascript\">javascript:alert('".$val->mailbox."@".$val->host."');</script>"; 3274 if ($val->mailbox == "INVALID_ADDRESS") 3275 continue; 3276 3277 if (empty($val->personal)) 3271 if(!$mobile){ 3272 foreach ($parse_address as $val) 3278 3273 { 3279 switch($recipient_type) 3274 //echo "<script language=\"javascript\">javascript:alert('".$val->mailbox."@".$val->host."');</script>"; 3275 if ($val->mailbox == "INVALID_ADDRESS") 3276 continue; 3277 3278 if (empty($val->personal)) 3280 3279 { 3281 case "to": 3282 $mail->AddTo($val->mailbox."@".$val->host); 3283 break; 3284 case "cc": 3285 $mail->AddCc($val->mailbox."@".$val->host); 3286 break; 3287 case "cco": 3288 $mail->AddBcc($val->mailbox."@".$val->host); 3289 break; 3290 } 3291 } 3292 else 3280 switch($recipient_type) 3281 { 3282 case "to": 3283 $mail->AddTo($val->mailbox."@".$val->host); 3284 break; 3285 case "cc": 3286 $mail->AddCc($val->mailbox."@".$val->host); 3287 break; 3288 case "cco": 3289 $mail->AddBcc($val->mailbox."@".$val->host); 3290 break; 3291 } 3292 } 3293 else 3294 { 3295 switch($recipient_type) 3296 { 3297 case "to": 3298 $mail->AddTo($val->mailbox."@".$val->host, $val->personal); 3299 break; 3300 case "cc": 3301 $mail->AddCc($val->mailbox."@".$val->host, $val->personal); 3302 break; 3303 case "cco": 3304 $mail->AddBcc($val->mailbox."@".$val->host, $val->personal); 3305 break; 3306 } 3307 } 3308 if($val->mailbox == "UNEXPECTED_DATA_AFTER_ADDRESS"){ 3309 $bolean = false; 3310 } 3311 3312 } 3313 }else{ 3314 foreach ($parse_address as $val) 3293 3315 { 3294 switch($recipient_type) 3316 //echo "<script language=\"javascript\">javascript:alert('".$val->mailbox."@".$val->host."');</script>"; 3317 if ($val->mailbox == "INVALID_ADDRESS") 3318 continue; 3319 3320 if (empty($val->personal)) 3295 3321 { 3296 case "to": 3297 $mail->AddTo($val->mailbox."@".$val->host, $val->personal); 3298 break; 3299 case "cc": 3300 $mail->AddCc($val->mailbox."@".$val->host, $val->personal); 3301 break; 3302 case "cco": 3303 $mail->AddBcc($val->mailbox."@".$val->host, $val->personal); 3304 break; 3305 } 3306 } 3307 if($val->mailbox == "UNEXPECTED_DATA_AFTER_ADDRESS"){ 3308 $bolean = false; 3309 } 3310 3322 switch($recipient_type) 3323 { 3324 case "to": 3325 $mail->AddAddress($val->mailbox."@".$val->host); 3326 break; 3327 case "cc": 3328 $mail->AddCC($val->mailbox."@".$val->host); 3329 break; 3330 } 3331 } 3332 else 3333 { 3334 switch($recipient_type) 3335 { 3336 case "to": 3337 $mail->AddAddress($val->mailbox."@".$val->host, $val->personal); 3338 break; 3339 case "cc": 3340 $mail->AddCC($val->mailbox."@".$val->host, $val->personal); 3341 break; 3342 } 3343 } 3344 if($val->mailbox == "UNEXPECTED_DATA_AFTER_ADDRESS"){ 3345 $bolean = false; 3346 } 3347 3348 } 3311 3349 } 3312 3350 return $bolean; -
trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
r5238 r5243 1 1 <?php 2 require_once($_SESSION['rootPath'].'/API/class.servicelocator.php'); 2 3 require_once(($_SESSION['rootPath'] ? $_SESSION['rootPath'] : PHPGW_INCLUDE_ROOT).'/API/class.servicelocator.php'); 3 4 include_once("class.imap_functions.inc.php"); 4 5 include_once("class.functions.inc.php"); -
trunk/mobile/inc/class.ui_mobilemail.inc.php
r5043 r5243 14 14 15 15 include_once(PHPGW_INCLUDE_ROOT.'/expressoMail1_2/inc/class.imap_functions.inc.php'); 16 16 17 $_SESSION['rootPath'] = PHPGW_INCLUDE_ROOT; 18 17 19 // Classe principal do Mini Mail 18 20 class ui_mobilemail{ … … 899 901 //Cria objeto 900 902 $mail = new PHPMailer(); 901 903 902 904 $db_functions = CreateObject('expressoMail1_2.db_functions'); 903 905 … … 906 908 $ccaddress = implode(',',$db_functions->getAddrs(explode(',',$ccaddress))); 907 909 908 if(!$this->imap_functions->add_recipients("to", $toaddress, &$mail ))910 if(!$this->imap_functions->add_recipients("to", $toaddress, &$mail, true)) 909 911 { 910 912 $error_msg = lang("Some addresses in the To field were not recognized. Please make sure that all addresses are properly formed"); 911 913 } 912 914 913 if(!$this->imap_functions->add_recipients("cc", $ccaddress, &$mail ))915 if(!$this->imap_functions->add_recipients("cc", $ccaddress, &$mail, true)) 914 916 { 915 917 $error_msg = lang("Some addresses in the CC field were not recognized. Please make sure that all addresses are properly formed");
Note: See TracChangeset
for help on using the changeset viewer.