Account.php

ralfbecker_sf 2016-03-29 09:58:17 UTC #1

Author: ralfbecker
New Revision: 55548

URL: http://svn.stylite.de/viewvc/egroupware?rev=55548&view=rev
Log:
fix error when saving mail-account

Modified:
trunk/egroupware/api/src/Mail/Account.php

Modified: trunk/egroupware/api/src/Mail/Account.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Mail/Account.php?rev=55548&r1=55547&r2=55548&view=diff

— trunk/egroupware/api/src/Mail/Account.php (original)
+++ trunk/egroupware/api/src/Mail/Account.php Tue Mar 29 11:58:17 2016
@@ -334,7 +334,7 @@
// store account-information of managed mail server
if ($user > 0 && $data[‘acc_smtp_type’] && $data[‘acc_smtp_type’] != NAMESPACE.’\Smtp’)
{

```
  	$smtp = self::_smtp($data);
```

  	$smtp = $this->smtpServer($data);
  	$smtp->setUserData($user, (array)$data['mailAlternateAddress'], (array)$data['mailForwardingAddress'],
  		$data['deliveryMode'], $data['accountStatus'], $data['mailLocalAddress'], $data['quotaLimit']);
  }

@@ -1136,10 +1136,12 @@

	// remove redundant namespace to fit into column
	$ns_len = strlen(__NAMESPACE__)+1;

  $backup = array();
  foreach(array('acc_smtp_type', 'acc_imap_type') as $attr)
  {
  	if (substr($data[$attr], 0, $ns_len) == __NAMESPACE__.'\\')
  	{

  		$backup[$attr] = $data[$attr];
  		$data[$attr] = substr($data[$attr], $ns_len);
  	}
  }

@@ -1164,6 +1166,9 @@
{
$data[‘acc_id’] = self::$db->get_last_insert_id(self::TABLE, ‘acc_id’);
}

```
  // restore namespace in class-names
```

  if ($backup) $data = array_merge($data, $backup);

  // store identity
  $new_ident_id = self::save_identity($data);
  if (!($data['ident_id'] > 0))

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs