Ticket #1486377: extended_addressbook_r3593.patch

config/main.inc.php

@@ -384 +384 @@
   'email_field'   => 'mail',  // this field represents the contact's e-mail
   'surname_field' => 'sn',    // this field represents the contact's last name
   'firstname_field' => 'gn',  // this field represents the contact's first name
+  'work_number_field'   => '', // contact work phone number
+  'home_number_field'   => '', // contact home phone number
+  'fax_number_field'    => '', // contact fax number
+  'mobile_number_field' => '', // contact cell number
+  'title_field'         => '', // contact company title
+  'company_field'       => '', // contact company name
+  'work_address_field'  => '', // contact work address
+  'home_address_field'  => '', // contact home address
+  'note_field'          => '', // contact notes
   'sort'          => 'cn',    // The field to sort the listing by.
   'scope'         => 'sub',   // search mode: sub|base|list
   'filter'        => '',      // used for basic listing (if not empty) and will be &'d with search queries. example: status=act

program/include/rcube_contacts.php

@@ -37 +37 @@
     private $search_fields;
     private $search_string;
     private $cache;
-    private $table_cols = array('name', 'email', 'firstname', 'surname', 'vcard');
+    private $table_cols = array('name', 'email', 'firstname', 'surname', 'work_number', 'home_number', 'fax_number', 'mobile_number', 'title', 'company', 'work_address', 'home_address', 'note', 'vcard');
   
     /** public properties */
     var $primary_key = 'contact_id';

program/include/rcube_vcard.php

@@ -75 +75 @@
     $this->nickname = $this->raw['NICKNAME'][0][0];
     $this->organization = $this->raw['ORG'][0][0];
     $this->business = ($this->raw['X-ABSHOWAS'][0][0] == 'COMPANY') || (join('', (array)$this->raw['N'][0]) == '' && !empty($this->organization));
+    $this->title = $this->raw['TITLE'][0];
+    $this->note = $this->raw['NOTE'][0];
+    foreach ($this->raw['LABEL'] as $entry) {
+        if ($entry['type'][0] == "HOME"){
+            $this->home_address = $entry[0];
+        }
+        elseif ($entry['type'][0] == "WORK") {
+            $this->work_address = $entry[0];
+        }
+    }
+    foreach ($this->raw['TEL'] as $entry) {
+        if ($entry['type'][0] == "HOME"){
+            $this->home_number = $entry[0];
+        }
+        elseif ($entry['type'][0] == "WORK") {
+            $this->work_number = $entry[0];
+        }
+        elseif ($entry['type'][0] == "CELL") {
+            $this->mobile_number = $entry[0];
+        }
+        elseif ($entry['type'][0] == "FAX") {
+            $this->fax_number = $entry[0];
+        }
+    }
     
     foreach ((array)$this->raw['EMAIL'] as $i => $raw_email)
       $this->email[$i] = is_array($raw_email) ? $raw_email[0] : $raw_email;
@@ -138 +162 @@
           $this->raw['EMAIL'][$index][0] = $value;
         }
         break;
+
+      case 'home_number':
+        $index=$this->get_type_index('TEL','HOME');
+        if (!is_array($this->raw['TEL'][$index])) {
+            $this->raw['TEL'][$index] =  array(0 => $value, 'type' => 'HOME');
+        }
+        else {
+            $this->raw['TEL'][0][0] = $value;
+        }
+        break;
+
+      case 'work_number':
+        $index=$this->get_type_index('TEL','WORK');
+        if (!is_array($this->raw['TEL'][$index])) {
+            $this->raw['TEL'][$index] = array(0 => $value, 'type' => 'WORK');
+        }
+        else {
+            $this->raw['TEL'][0][0] = $value;
+        }
+        break;
+
+      case 'mobile_number':
+        $index=$this->get_type_index('TEL','CELL');
+        if (!is_array($this->raw['TEL'][$index])) {
+            $this->raw['TEL'][$index] = array(0 => $value, 'type' => 'CELL');
+        }
+        else {
+            $this->raw['TEL'][0][0] = $value;
+        }
+        break;
+
+      case 'fax_number':
+        $index=$this->get_type_index('TEL','FAX');
+        if (!is_array($this->raw['TEL'][$index])) {
+            $this->raw['TEL'][$index] = array(0 => $value, 'type' => 'FAX');
+        }
+        else {
+            $this->raw['TEL'][0][0] = $value;
+        }
+        break;
+
     }
   }
 

program/localization/en_US/labels.inc

@@ -242 +242 @@
 $labels['firstname'] = 'First name';
 $labels['surname']   = 'Last name';
 $labels['email']     = 'E-Mail';
+$labels['phone']         = 'Phone';
+$labels['work_number']   = 'Work Number';
+$labels['home_number']   = 'Home Number';
+$labels['fax_number']    = 'Fax Number';
+$labels['mobile_number'] = 'Mobile Number';
+$labels['title']         = 'Title';
+$labels['company']       = 'Company';
+$labels['work_address']  = 'Work Address';
+$labels['home_address']  = 'Home Address';
+$labels['note']          = 'Note';
 
 $labels['addcontact'] = 'Add new contact';
 $labels['editcontact'] = 'Edit contact';

program/steps/addressbook/edit.inc

@@ -60 +60 @@
   // return the complete address edit form as table
   $out = "$form_start<table>\n\n";
 
-  $a_show_cols = array('name', 'firstname', 'surname', 'email');
+  $a_show_cols = array('name', 'firstname', 'surname', 'email', 'work_number', 'home_number', 'fax_number', 'mobile_number', 'title', 'company', 'work_address', 'home_address', 'note');
+  $textarea_cols = array('work_address' => 1, 'home_address' => 1, 'note' => 1);
+
   foreach ($a_show_cols as $col)
   {
     $attrib['id'] = 'rcmfd_'.$col;
+    if (array_key_exists($col, $textarea_cols)) {
+        $value = rcmail_get_edit_field($col, $record[$col], $attrib,'textarea');
+    }
+    else {
     $value = rcmail_get_edit_field($col, $record[$col], $attrib);
+    }
     $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
                     $attrib['id'],
                     Q(rcube_label($col)),

program/steps/addressbook/export.inc

@@ -35 +35 @@
   $vcard->set('firstname', $row['firstname']);
   $vcard->set('surname', $row['surname']);
   $vcard->set('email', $row['email']);
+  $vcard->set('title', $row['title']);
+  $vcard->set('company', $row['company']);
+  $vcard->set('work_number', $row['work_number']);
+  $vcard->set('home_number', $row['home_number']);
+  $vcard->set('mobile_number', $row['mobile_number']);
+  $vcard->set('fax_number', $row['fax_number']);
+  $vcard->set('work_address', $row['work_address']);
+  $vcard->set('home_address', $row['home_address']);
+  $vcard->set('note', $row['note']);
   
   echo $vcard->export();
 }

program/steps/addressbook/import.inc

@@ -152 +152 @@
         'firstname' => $vcard->firstname,
         'surname' => $vcard->surname,
         'email' => $email,
+        'work_number'   => $vcard->work_number,
+        'home_number'   => $vcard->home_number,
+        'mobile_number' => $vcard->mobile_number,
+        'fax_number'    => $vcard->fax_number,
+        'title'         => $vcard->title,
+        'company'       => $vcard->organization,
+        'work_address'  => $vcard->work_address,
+        'home_address'  => $vcard->home_address,
+        'note'          => $vcard->note,
         'vcard' => $vcard->export(),
       );
       

program/steps/addressbook/save.inc

@@ -40 +40 @@
 
 
 // setup some vars we need
-$a_save_cols = array('name', 'firstname', 'surname', 'email');
+$a_save_cols = array('name', 'firstname', 'surname', 'email', 'work_number', 'home_number', 'fax_number', 'mobile_number', 'title', 'company', 'work_address', 'home_address', 'note');
 $a_record = array();
 
 // read POST values into hash array

program/steps/addressbook/show.inc

@@ -43 +43 @@
   // return the complete address record as table
   $table = new html_table(array('cols' => 2));
 
-  $a_show_cols = array('name', 'firstname', 'surname', 'email');
-  $microformats = array('name' => 'fn', 'email' => 'email');
+  $a_show_cols = array('name', 'firstname', 'surname', 'email', 'work_number', 'home_number', 'fax_number', 'mobile_number', 'title', 'company', 'work_address', 'home_address', 'note');
+  $microformats = array(
+    'name'          => 'fn',
+    'email'         => 'email',
+    'work_number'   => 'tel',
+    'home_number'   => 'tel',
+    'fax_number'    => 'tel',
+    'mobile_number' => 'tel',
+    'tile'          => 'title',
+    'company'       => 'organization-name',
+    'work_address'  => 'label',
+    'home_address'  => 'label',
+    'note'          => 'note',
+  );
 
   foreach ($a_show_cols as $col) {
     if ($col == 'email' && !empty($record[$col])) {

SQL/mysql.initial.sql

@@ -86 +86 @@
  `email` varchar(128) NOT NULL,
  `firstname` varchar(128) NOT NULL DEFAULT '',
  `surname` varchar(128) NOT NULL DEFAULT '',
+ `work_number` varchar(50) NOT NULL,
+ `home_number` varchar(50) NOT NULL,
+ `fax_number` varchar(50) NOT NULL,
+ `mobile_number` varchar(50) NOT NULL,
+ `title` varchar(50) NOT NULL,
+ `company` varchar(128) NOT NULL,
+ `work_address` varchar(255) NOT NULL,
+ `home_address` varchar(255) NOT NULL,
+ `note` text NULL, 
  `vcard` text NULL,
  `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
  PRIMARY KEY(`contact_id`),

SQL/mysql.update.sql

@@ -113 +113 @@
 
 ALTER TABLE `users` CHANGE `last_login` `last_login` datetime DEFAULT NULL;
 UPDATE `users` SET `last_login` = NULL WHERE `last_login` = '1000-01-01 00:00:00';
+
+ALTER TABLE `contacts`
+    ADD `work_number` varchar(50) NOT NULL DEFAULT '',
+    ADD `home_number` varchar(50) NOT NULL DEFAULT '',
+    ADD `fax_number` varchar(50) NOT NULL DEFAULT '',
+    ADD `mobile_number` varchar(50) NOT NULL DEFAULT '',
+    ADD `title` varchar(50) NOT NULL DEFAULT '',
+    ADD `company` varchar(128) NOT NULL DEFAULT '',
+    ADD `work_address` varchar(255) NOT NULL DEFAULT '',
+    ADD `home_address` varchar(255) NOT NULL DEFAULT '',
+    ADD `note` text NOT NULL DEFAULT '';
+ No newline at end of file

SQL/postgres.initial.sql

@@ -110 +110 @@
     email varchar(128) DEFAULT '' NOT NULL,
     firstname varchar(128) DEFAULT '' NOT NULL,
     surname varchar(128) DEFAULT '' NOT NULL,
+    work_number character varying(50) DEFAULT ''::character varying NOT NULL,
+    home_number character varying(50) DEFAULT ''::character varying NOT NULL,
+    fax_number character varying(50) DEFAULT ''::character varying NOT NULL,
+    mobile_number character varying(50) DEFAULT ''::character varying NOT NULL,
+    title character varying(50) DEFAULT ''::character varying NOT NULL,
+    company character varying(128) DEFAULT ''::character varying NOT NULL,
+    work_address character varying(255) DEFAULT ''::character varying NOT NULL,
+    home_address character varying(255) DEFAULT ''::character varying NOT NULL,
+    note text DEFAULT ''::character varying NOT NULL,
     vcard text
 );
 

SQL/postgres.update.sql

@@ -81 +81 @@
 
 ALTER TABLE users ALTER last_login DROP NOT NULL;
 ALTER TABLE users ALTER last_login SET DEFAULT NULL;
+
+ALTER TABLE contacts ADD work_number character varying(50) DEFAULT ''::character varying NOT NULL;
+ALTER TABLE contacts ADD home_number character varying(50) DEFAULT ''::character varying NOT NULL;
+ALTER TABLE contacts ADD fax_number character varying(50) DEFAULT ''::character varying NOT NULL;
+ALTER TABLE contacts ADD mobile_number character varying(50) DEFAULT ''::character varying NOT NULL;
+ALTER TABLE contacts ADD title character varying(50) DEFAULT ''::character varying NOT NULL;
+ALTER TABLE contacts ADD company character varying(128) DEFAULT ''::character varying NOT NULL;
+ALTER TABLE contacts ADD work_address character varying(255) DEFAULT ''::character varying NOT NULL;
+ALTER TABLE contacts ADD home_address character varying(255) DEFAULT ''::character varying NOT NULL;
+ALTER TABLE contacts ADD note text DEFAULT ''::character varying NOT NULL;
+ No newline at end of file

SQL/sqlite.initial.sql

@@ -31 +31 @@
   email varchar(128) NOT NULL default '',
   firstname varchar(128) NOT NULL default '',
   surname varchar(128) NOT NULL default '',
+  work_number varchar(50) NOT NULL default '',
+  home_number varchar(50) NOT NULL default '',
+  mobile_number varchar(50) NOT NULL default '',
+  fax_number varchar(50) NOT NULL default '',
+  title varchar(50) NOT NULL default '',
+  company varchar(128) NOT NULL default '',
+  work_address varchar(255) NOT NULL default '',
+  home_address varchar(255) NOT NULL default '',
+  note text NOT NULL default '',
   vcard text NOT NULL default ''
 );
 

SQL/sqlite.update.sql

@@ -142 +142 @@
 CREATE INDEX ix_users_username ON users(username);
 CREATE INDEX ix_users_alias ON users(alias);
 DROP TABLE tmp_users;
+
+-- Updates from version 0.4-beta
+
+ALTER TABLE contacts ADD work_number varchar(50) DEFAULT '' NOT NULL;
+ALTER TABLE contacts ADD home_number varchar(50) DEFAULT '' NOT NULL;
+ALTER TABLE contacts ADD fax_number varchar(50) DEFAULT '' NOT NULL;
+ALTER TABLE contacts ADD mobile_number varchar(50) DEFAULT '' NOT NULL;
+ALTER TABLE contacts ADD title varchar(50) DEFAULT '' NOT NULL;
+ALTER TABLE contacts ADD company varchar(128) DEFAULT '' NOT NULL;
+ALTER TABLE contacts ADD work_address varchar(255) DEFAULT '' NOT NULL;
+ALTER TABLE contacts ADD home_address varchar(255) DEFAULT '' NOT NULL;
+ALTER TABLE contacts ADD note text DEFAULT '' NOT NULL;