From 293d6d0b1bcebd8f4729f6c21a767f9a6b57ba67 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 16 Apr 2014 14:38:55 +0000
Subject: [PATCH] revert r46615 as it breaks creating of new accounts

---
 addressbook/inc/class.addressbook_ui.inc.php | 45 +-------------------
 1 file changed, 1 insertion(+), 44 deletions(-)

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 27ee1c9cb8..47408074df 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -1950,47 +1950,7 @@ window.egw_LAB.wait(function() {
 				$content['tid'] = $_GET['typeid'] ? $_GET['typeid'] : ($active_tid?$active_tid:$new_type[0]);
 				foreach($this->get_contact_columns() as $field)
 				{
-					if ($_GET['presets'][$field])
-					{
-						if ($field=='email'||$field=='email_home')
-						{
-							$singleAddress = imap_rfc822_parse_adrlist($_GET['presets'][$field],'');
-							//error_log(__METHOD__.__LINE__.' Address:'.$singleAddress[0]->mailbox."@".$singleAddress[0]->host.", ".$singleAddress[0]->personal);
-							if (!(!is_array($singleAddress) || count($singleAddress)<1))
-							{
-								$content[$field] = $singleAddress[0]->mailbox."@".$singleAddress[0]->host;
-								if (!empty($singleAddress[0]->personal))
-								{
-									if (strpos($singleAddress[0]->personal,',')===false)
-									{
-										list($P_n_given,$P_n_family,$P_org_name)=explode(' ',$singleAddress[0]->personal,3);
-										if (strlen(trim($P_n_given))>0) $content['n_given'] = trim($P_n_given);
-										if (strlen(trim($P_n_family))>0) $content['n_family'] = trim($P_n_family);
-										if (strlen(trim($P_org_name))>0) $content['org_name'] = trim($P_org_name);
-									}
-									else
-									{
-										list($P_n_family,$P_other)=explode(',',$singleAddress[0]->personal,2);
-										if (strlen(trim($P_n_family))>0) $content['n_family'] = trim($P_n_family);
-										if (strlen(trim($P_other))>0)
-										{
-											list($P_n_given,$P_org_name)=explode(',',$P_other,2);
-											if (strlen(trim($P_n_given))>0) $content['n_given'] = trim($P_n_given);
-											if (strlen(trim($P_org_name))>0) $content['org_name'] = trim($P_org_name);
-										}
-									}
-								}
-							}
-							else
-							{
-								$content[$field] = $_GET['presets'][$field];
-							}
-						}
-						else
-						{
-							$content[$field] = $_GET['presets'][$field];
-						}
-					}
+					if ($_GET['presets'][$field]) $content[$field] = $_GET['presets'][$field];
 				}
 				if (isset($_GET['presets']))
 				{
@@ -2002,13 +1962,10 @@ window.egw_LAB.wait(function() {
 							break;
 						}
 					}
-					$content['n_fn'] = $this->fullname($content);
 				}
-				$content['owner'] = $this->default_private ? $this->user.'p' : $this->default_addressbook;
 				$content['creator'] = $this->user;
 				$content['created'] = $this->now_su;
 				unset($state);
-				//_debug_array($content);
 			}
 
 			if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);	// dont allow HTML!