Fix setting of n_prefix based on Title field - bug #942723 from tachometry_nik

addressbook/inc/import/Import_from_Outlook_-_Deutsch

@@ -14,7 +14,7 @@
 //
 // The array need not be in any order and any fields not defined will
 // not be transferred.  If the val='+', the value will be appended to
-// the previous field and any text after the '+' will be appended 
+// the previous field and any text after the '+' will be appended
 // before the value.  For example, the following would add a comma and
 // a space between LastName and FirstName and store it in FullName:
 //
@@ -33,7 +33,7 @@
 
 		/* Thanks to knecke for the Outlook fields */
 		var $import = array(
-			'Anrede' => 'title',
+			'Anrede' => 'n_prefix',
 			'Vorname' => 'n_given',
 			'Weitere Vornamen' => 'n_middle',
 			'Nachname' => 'n_family',
@@ -129,7 +129,7 @@
 
 		function import_start_record($buffer)
 		{
-			$top=array();
+			$top = array();
 			++$this->id;
 			$this->currentrecord = $top;
 			return $buffer;
@@ -147,8 +147,8 @@
 
 		function import_end_record($buffer)
 		{
-			$buffer[$this->id]='';
+			$buffer[$this->id] = '';
-			while ( list($name, $value) = each($this->currentrecord))
+			while(list($name, $value) = each($this->currentrecord))
 			{
 				$buffer[$this->id][$name] = $value;
 				//echo '<br>'.$name.' => '.$value;
@@ -159,10 +159,10 @@
 		function import_end_file($buffer,$access='private',$cat_id=0)
 		{
 			$contacts = CreateObject('phpgwapi.contacts');
-			//echo '<br>'; 
+			//echo '<br>';
-			for ($i=1;$i<=count($buffer);$i++)
+			for($i=1;$i<=count($buffer);$i++)
 			{
-				while ( list($name,$value) = @each($buffer[$i]) )
+				while(list($name,$value) = @each($buffer[$i]))
 				{
 					//echo '<br>'.$i.': '.$name.' => '.$value;
 					$entry[$i][$name] = $value;

addressbook/inc/import/Import_from_Outlook_-_English

@@ -14,7 +14,7 @@
 //
 // The array need not be in any order and any fields not defined will
 // not be transferred.  If the val='+', the value will be appended to
-// the previous field and any text after the '+' will be appended 
+// the previous field and any text after the '+' will be appended
 // before the value.  For example, the following would add a comma and
 // a space between LastName and FirstName and store it in FullName:
 //
@@ -32,7 +32,7 @@
 		var $type = 'csv';
 
 		var $import = array(
-			'Title' => 'title', 
+			'Title' => 'n_prefix',
 			'First Name' => 'n_given',
 			'Middle Name' => 'n_middle',
 			'Last Name' => 'n_family',
@@ -83,7 +83,7 @@
 			"Assistant's Name" => '', //newPilotPerson
 			'Billing Information' => '',
 			'Birthday' => 'bday',
-			'Categories' => '', 
+			'Categories' => '',
 			'Children' => '',
 			'Directory Server' => '',
 			'E-mail Address' => 'email',
@@ -125,7 +125,7 @@
 
 		function import_start_record($buffer)
 		{
-			$top=array();
+			$top = array();
 			++$this->id;
 			$this->currentrecord = $top;
 			return $buffer;
@@ -143,8 +143,8 @@
 
 		function import_end_record($buffer)
 		{
-			$buffer[$this->id]='';
+			$buffer[$this->id] = '';
-			while ( list($name, $value) = each($this->currentrecord))
+			while(list($name, $value) = each($this->currentrecord))
 			{
 				$buffer[$this->id][$name] = $value;
 				//echo '<br>'.$name.' => '.$value;
@@ -155,10 +155,10 @@
 		function import_end_file($buffer,$access='private',$cat_id=0)
 		{
 			$contacts = CreateObject('phpgwapi.contacts');
-			//echo '<br>'; 
+			//echo '<br>';
-			for ($i=1;$i<=count($buffer);$i++)
+			for($i=1;$i<=count($buffer);$i++)
 			{
-				while ( list($name,$value) = @each($buffer[$i]) )
+				while(list($name,$value) = @each($buffer[$i]))
 				{
 					//echo '<br>'.$i.': '.$name.' => '.$value;
 					$entry[$i][$name] = $value;

addressbook/inc/import/Import_from_Outlook_-_Espanol

@@ -33,7 +33,7 @@
 		var $type = 'csv';
 
 		var $import = array(
-			'Tratamiento' => 'title', 
+			'Tratamiento' => 'n_prefix', 
 			'Nombre' => 'n_given',
 			'Segundo Nombre' => 'n_middle',
 			'Apellidos' => 'n_family',

addressbook/inc/import/Import_from_Outlook_-_French

@@ -14,7 +14,7 @@
 //
 // The array need not be in any order and any fields not defined will
 // not be transferred.  If the val='+', the value will be appended to
-// the previous field and any text after the '+' will be appended 
+// the previous field and any text after the '+' will be appended
 // before the value.  For example, the following would add a comma and
 // a space between LastName and FirstName and store it in FullName:
 //
@@ -123,7 +123,7 @@
 
 		function import_start_record($buffer)
 		{
-			$top=array();
+			$top = array();
 			++$this->id;
 			$this->currentrecord = $top;
 			return $buffer;
@@ -141,8 +141,8 @@
 
 		function import_end_record($buffer)
 		{
-			$buffer[$this->id]='';
+			$buffer[$this->id] = '';
-			while ( list($name, $value) = each($this->currentrecord))
+			while(list($name, $value) = each($this->currentrecord))
 			{
 				$buffer[$this->id][$name] = $value;
 				//echo '<br>'.$name.' => '.$value;
@@ -153,10 +153,10 @@
 		function import_end_file($buffer,$access='private',$cat_id=0)
 		{
 			$contacts = CreateObject('phpgwapi.contacts');
-			//echo '<br>'; 
+			//echo '<br>';
-			for ($i=1;$i<=count($buffer);$i++)
+			for($i=1;$i<=count($buffer);$i++)
 			{
-				while ( list($name,$value) = @each($buffer[$i]) )
+				while(list($name,$value) = @each($buffer[$i]))
 				{
 					//echo '<br>'.$i.': '.$name.' => '.$value;
 					$entry[$i][$name] = $value;

addressbook/inc/import/Import_from_Outlook_-_Italiano

@@ -14,7 +14,7 @@
 //
 // The array need not be in any order and any fields not defined will
 // not be transferred.  If the val='+', the value will be appended to
-// the previous field and any text after the '+' will be appended 
+// the previous field and any text after the '+' will be appended
 // before the value.  For example, the following would add a comma and
 // a space between LastName and FirstName and store it in FullName:
 //
@@ -32,7 +32,7 @@
 		var $type = 'csv';
 
 		var $import = array(
-			'Titolo' => 'title', 
+			'Titolo' => 'n_prefix',
 			'Nome' => 'n_given',
 			'Secondo nome' => 'n_middle',
 			'Cognome' => 'n_family',
@@ -85,7 +85,7 @@
 			'Nome assistente' => '', //newPilotPerson
 			'Dati fatturazione' => '',
 			'Compleanno' => 'bday',
-			'Categorie' => '', 
+			'Categorie' => '',
 			'Figli' => '',
 			'Server di elenchi in linea' => '',
 			'Indirizzo posta elettronica' => 'email',
@@ -134,7 +134,7 @@
 
 		function import_start_record($buffer)
 		{
-			$top=array();
+			$top = array();
 			++$this->id;
 			$this->currentrecord = $top;
 			return $buffer;
@@ -152,8 +152,8 @@
 
 		function import_end_record($buffer)
 		{
-			$buffer[$this->id]='';
+			$buffer[$this->id] = '';
-			while ( list($name, $value) = each($this->currentrecord))
+			while(list($name, $value) = each($this->currentrecord))
 			{
 				$buffer[$this->id][$name] = $value;
 				//echo '<br>'.$name.' => '.$value;
@@ -164,10 +164,10 @@
 		function import_end_file($buffer,$access='private',$cat_id=0)
 		{
 			$contacts = CreateObject('phpgwapi.contacts');
-			//echo '<br>'; 
+			//echo '<br>';
-			for ($i=1;$i<=count($buffer);$i++)
+			for($i=1;$i<=count($buffer);$i++)
 			{
-				while ( list($name,$value) = @each($buffer[$i]) )
+				while(list($name,$value) = @each($buffer[$i]))
 				{
 					//echo '<br>'.$i.': '.$name.' => '.$value;
 					$entry[$i][$name] = $value;