Ticket #1484743: rcmail_comments.diff

program/include/rcube_contacts.inc

@@ -34 +34 @@
   var $result = null;
   var $search_fields;
   var $search_string;
-  var $table_cols = array('name', 'email', 'firstname', 'surname');
+  var $table_cols = array('name', 'email', 'firstname', 'surname', 'comments');
   
   /** public properties */
   var $primary_key = 'contact_id';

program/localization/en_GB/labels.inc

@@ -162 +162 @@
 $labels['firstname'] = 'First name';
 $labels['surname']   = 'Last name';
 $labels['email']     = 'E-Mail';
+$labels['comments']  = 'Additional info';
 
 $labels['addcontact'] = 'Add new contact';
 $labels['editcontact'] = 'Edit contact';

program/localization/en_US/labels.inc

@@ -166 +166 @@
 $labels['firstname'] = 'First name';
 $labels['surname']   = 'Last name';
 $labels['email']     = 'E-Mail';
+$labels['comments']  = 'Additional info';
 
 $labels['addcontact'] = 'Add new contact';
 $labels['editcontact'] = 'Edit contact';

program/localization/nl_NL/labels.inc

@@ -128 +128 @@
 $labels['firstname'] = 'Voornaam';
 $labels['surname'] = 'Achternaam';
 $labels['email'] = 'E-Mail';
+$labels['comments']  = 'Extra info';
 $labels['addcontact'] = 'Voeg geselecteerde contacten toe aan het adresboek';
 $labels['editcontact'] = 'Contactpersoon wijzigen';
 $labels['edit'] = 'Wijzig';

program/steps/addressbook/edit.inc

@@ -61 +61 @@
   // 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', 'comments');
   foreach ($a_show_cols as $col)
   {
     $attrib['id'] = 'rcmfd_'.$col;
-    $value = rcmail_get_edit_field($col, $record[$col], $attrib);
+    $value = rcmail_get_edit_field($col, $record[$col], $attrib, $col=='comments' ? 'textarea' : 'text');
     $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/save.inc

@@ -37 +37 @@
 
 
 // setup some vars we need
-$a_save_cols = array('name', 'firstname', 'surname', 'email');
+$a_save_cols = array('name', 'firstname', 'surname', 'email', 'comments');
 $a_record = array();
 $cid = get_input_value('_cid', RCUBE_INPUT_POST);
 

program/steps/addressbook/search.inc

@@ -26 +26 @@
 $search_request = md5('addr'.$search);
 
 // get contacts for this user
-$result = $CONTACTS->search(array('name','email'), $search);
+$result = $CONTACTS->search(isset($GLOBALS['CONFIG']['address_search_fields']) ? $GLOBALS['CONFIG']['address_search_fields'] : array('name','email'), $search);
 
 if ($result->count > 0)
 {

program/steps/addressbook/show.inc

@@ -43 +43 @@
   // return the complete address record as table
   $out = "<table>\n\n";
 
-  $a_show_cols = array('name', 'firstname', 'surname', 'email');
+  $a_show_cols = array('name', 'firstname', 'surname', 'email', 'comments');
   foreach ($a_show_cols as $col)
     {
     if ($col=='email' && !empty($record[$col]))