- Timestamp:
- 11/21/11 14:59:25 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.ScriptS.inc.php
r5134 r5192 25 25 var $EmailVoip; 26 26 var $EmailExpresso; 27 27 var $AlternateEmailExpresso = array(); 28 28 29 function ScriptS() { 29 30 … … 48 49 $this->EmailVoip = trim($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['voip_email_redirect']); 49 50 $this->EmailExpresso = trim($_SESSION['phpgw_info']['expressomail']['user']['email']); 51 52 include_once $_SESSION['rootPath'] . '/header.inc.php'; 53 require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php'; 54 $alternativeMailService = ServiceLocator::getService('ldap'); 55 $this->AlternateEmailExpresso = $alternativeMailService->getMailAlternateByUidNumber($_SESSION['phpgw_info']['expressomail']['user']['account_id']); 50 56 } 51 57 … … 159 165 unset($key); 160 166 $tmp = explode("&&", $this->newout); 167 168 foreach($this->AlternateEmailExpresso as $alternative) 169 { 170 if(!stristr($tmp3, ", \"$alternative\"")) 171 $tmp3_aux .= ", \"$alternative\""; 172 } 173 174 $tmp3 .= $tmp3_aux; 175 161 176 foreach ($tmp as $key => $tmp1) { 162 177 if ($key == 2) { … … 166 181 } 167 182 } 183 168 184 unset($this->newout); 169 185 $this->newout = substr($tmp2, 0, (strlen($tmp2) - 2)); … … 462 478 if ($vacation['status'] == 'on') { 463 479 $newscriptbody .= "vacation :days " . $vacation['days'] . " :addresses ["; 464 480 $newscriptbody .= $vacation['addresses']; 465 481 $newscriptbody .= "] text:\n" . utf8_encode($vacation['text']) . "\n.\n;\n\n"; 466 482 } … … 509 525 $newscriptfoot .= preg_replace("/[\\n\\r]/", " ", $this->newout) . "\n"; 510 526 } 527 511 528 $newscriptfoot .= "#mode&&basic\n"; 512 529 … … 527 544 528 545 // Retorna o script construido; 546 529 547 return $newscript; 530 548 }
Note: See TracChangeset
for help on using the changeset viewer.