From 413710d555354df2fad6d4a7f40ca4a1335e09f5 Mon Sep 17 00:00:00 2001 From: Miles Lott Date: Tue, 27 Apr 2004 02:57:04 +0000 Subject: [PATCH] Fix setting of n_prefix based on Title field - bug #942723 from tachometry_nik --- .../inc/import/Import_from_Outlook_-_Deutsch | 16 ++++++++-------- .../inc/import/Import_from_Outlook_-_English | 18 +++++++++--------- .../inc/import/Import_from_Outlook_-_Espanol | 2 +- .../inc/import/Import_from_Outlook_-_French | 14 +++++++------- .../inc/import/Import_from_Outlook_-_Italiano | 18 +++++++++--------- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/addressbook/inc/import/Import_from_Outlook_-_Deutsch b/addressbook/inc/import/Import_from_Outlook_-_Deutsch index ccb8a4c6df..14124368e6 100644 --- a/addressbook/inc/import/Import_from_Outlook_-_Deutsch +++ b/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]=''; - while ( list($name, $value) = each($this->currentrecord)) + $buffer[$this->id] = ''; + while(list($name, $value) = each($this->currentrecord)) { $buffer[$this->id][$name] = $value; //echo '
'.$name.' => '.$value; @@ -159,10 +159,10 @@ function import_end_file($buffer,$access='private',$cat_id=0) { $contacts = CreateObject('phpgwapi.contacts'); - //echo '
'; - for ($i=1;$i<=count($buffer);$i++) + //echo '
'; + for($i=1;$i<=count($buffer);$i++) { - while ( list($name,$value) = @each($buffer[$i]) ) + while(list($name,$value) = @each($buffer[$i])) { //echo '
'.$i.': '.$name.' => '.$value; $entry[$i][$name] = $value; diff --git a/addressbook/inc/import/Import_from_Outlook_-_English b/addressbook/inc/import/Import_from_Outlook_-_English index 01297389cf..0d7b3faff7 100644 --- a/addressbook/inc/import/Import_from_Outlook_-_English +++ b/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]=''; - while ( list($name, $value) = each($this->currentrecord)) + $buffer[$this->id] = ''; + while(list($name, $value) = each($this->currentrecord)) { $buffer[$this->id][$name] = $value; //echo '
'.$name.' => '.$value; @@ -155,10 +155,10 @@ function import_end_file($buffer,$access='private',$cat_id=0) { $contacts = CreateObject('phpgwapi.contacts'); - //echo '
'; - for ($i=1;$i<=count($buffer);$i++) + //echo '
'; + for($i=1;$i<=count($buffer);$i++) { - while ( list($name,$value) = @each($buffer[$i]) ) + while(list($name,$value) = @each($buffer[$i])) { //echo '
'.$i.': '.$name.' => '.$value; $entry[$i][$name] = $value; diff --git a/addressbook/inc/import/Import_from_Outlook_-_Espanol b/addressbook/inc/import/Import_from_Outlook_-_Espanol index 5dac35b3c1..42b2476aea 100755 --- a/addressbook/inc/import/Import_from_Outlook_-_Espanol +++ b/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', diff --git a/addressbook/inc/import/Import_from_Outlook_-_French b/addressbook/inc/import/Import_from_Outlook_-_French index c70822ac87..fe8fcdc187 100755 --- a/addressbook/inc/import/Import_from_Outlook_-_French +++ b/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]=''; - while ( list($name, $value) = each($this->currentrecord)) + $buffer[$this->id] = ''; + while(list($name, $value) = each($this->currentrecord)) { $buffer[$this->id][$name] = $value; //echo '
'.$name.' => '.$value; @@ -153,10 +153,10 @@ function import_end_file($buffer,$access='private',$cat_id=0) { $contacts = CreateObject('phpgwapi.contacts'); - //echo '
'; - for ($i=1;$i<=count($buffer);$i++) + //echo '
'; + for($i=1;$i<=count($buffer);$i++) { - while ( list($name,$value) = @each($buffer[$i]) ) + while(list($name,$value) = @each($buffer[$i])) { //echo '
'.$i.': '.$name.' => '.$value; $entry[$i][$name] = $value; diff --git a/addressbook/inc/import/Import_from_Outlook_-_Italiano b/addressbook/inc/import/Import_from_Outlook_-_Italiano index 70e8e59086..2b2695b980 100644 --- a/addressbook/inc/import/Import_from_Outlook_-_Italiano +++ b/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]=''; - while ( list($name, $value) = each($this->currentrecord)) + $buffer[$this->id] = ''; + while(list($name, $value) = each($this->currentrecord)) { $buffer[$this->id][$name] = $value; //echo '
'.$name.' => '.$value; @@ -164,10 +164,10 @@ function import_end_file($buffer,$access='private',$cat_id=0) { $contacts = CreateObject('phpgwapi.contacts'); - //echo '
'; - for ($i=1;$i<=count($buffer);$i++) + //echo '
'; + for($i=1;$i<=count($buffer);$i++) { - while ( list($name,$value) = @each($buffer[$i]) ) + while(list($name,$value) = @each($buffer[$i])) { //echo '
'.$i.': '.$name.' => '.$value; $entry[$i][$name] = $value;