Author: leithoff
New Revision: 49577
URL: http://svn.stylite.de/viewvc/egroupware?rev=49577&view=rev
Log:
fix broken mail_activesync send after changes how identity is seeded
Modified:
trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php
trunk/mail/inc/class.mail_activesync.inc.php
Modified: trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php?rev=49577&r1=49576&r2=49577&view=diff
— trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php (original)
+++ trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php Tue Nov 25 15:16:40 2014
@@ -697,7 +697,27 @@
{
$account = emailadmin_account::read($account);
}
-
return $account->identities(null, true, 'params');
-
$userEMailAdresses = array(); -
$identities = $account->identities(null, true, 'params'); -
foreach($identities as $ik => $ident) { -
//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($ident)); -
$identity = emailadmin_account::read_identity($ik,true,null,$account); -
//error_log(__METHOD__.' ('.__LINE__.') '.':'.$ik.'->'.array2string($identity)); -
// standardIdentity has ident_id==acc_id (as it is done within account->identities) -
if (empty($identity['ident_id'])) $identity['ident_id'] = $identity['acc_id']; -
if (!isset($userEMailAdresses[$identity['ident_id']])) -
{ -
$userEMailAdresses[$identity['ident_id']] = array('acc_id'=>$identity['acc_id'], -
'ident_id'=>$identity['ident_id'], -
'ident_email'=>$identity['ident_email'], -
'ident_org'=>$identity['ident_org'], -
'ident_realname'=>$identity['ident_realname'], -
'ident_signature'=>$identity['ident_signature'], -
'ident_name'=>$identity['ident_name']); -
} -
} -
return $userEMailAdresses;}
/**
@@ -5439,7 +5459,7 @@
/**- getStandardIdentityForProfile
- get either the first identity out of the given identities or the one matching the profile_id
-
- @param object $_identities identity iterator object with identities from emailadmin_account
-
- @param object/array $_identities identity iterator object or array with identities from emailadmin_account
- @param integer $_profile_id the acc_id/profileID the identity with the matching key is the standard one
-
@return array the identity
*/
@@ -5449,6 +5469,7 @@
// use the standardIdentity
foreach($_identities as $key => $acc) {
if ($c==0) $identity = $acc;
-
//error_log(__METHOD__.__LINE__." $key == $_profile_id "); if ($key==$_profile_id) $identity = $acc; $c++; }
@@ -5986,7 +6007,7 @@
try {
$mailObject->Send();
}
-
catch(phpmailerException $e) {
-
catch(Exception $e) { $sendOK = false; $errorInfo = $e->getMessage(); if ($mailObject->ErrorInfo) // use the complete mailer ErrorInfo, for full Information
@@ -6295,7 +6316,6 @@
$seemsToBePlainMessage = true;
}
$this->createBodyFromStructure($mailObject, $structure, $parenttype=null);
-
$mailObject->SetMessageType(); $mailObject->CreateHeader(); // this sets the boundary stufff //echo "Boundary:".$mailObject->FetchBoundary(1).'<br>'; //$boundary ='';
Modified: trunk/mail/inc/class.mail_activesync.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/inc/class.mail_activesync.inc.php?rev=49577&r1=49576&r2=49577&view=diff
— trunk/mail/inc/class.mail_activesync.inc.php (original)
+++ trunk/mail/inc/class.mail_activesync.inc.php Tue Nov 25 15:16:40 2014
@@ -1203,7 +1203,6 @@
}
}
-
$mailObject->SetMessageType(); $Header = $mailObject->CreateHeader(); //debugLog(__METHOD__.__LINE__.' MailObject-Header:'.array2string($Header)); $Body = trim($mailObject->CreateBody()); // philip thinks this is needed, so lets try if it does any good/harm
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs