Changeset d7344819 in github

Timestamp:

May 27, 2011 7:22:56 AM (2 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

5164670

Parents:

f5a55bf

Message:

• Added option to specify to which address book add new contacts

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/localization/en_US/labels.inc (modified) (1 diff)
• program/localization/pl_PL/labels.inc (modified) (1 diff)
• program/steps/mail/addcontact.inc (modified) (1 diff)
• program/steps/settings/func.inc (modified) (2 diffs)
• program/steps/settings/save_prefs.inc (modified) (5 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Added option to specify to which address book add new contacts
 - Added plugin hook for keep-alive requests
 - Store user preferences in session when write-master is not available and session is stored in memcache, write them later

config/main.inc.php.dist

@@ -699 +699 @@
 $rcmail_config['forward_attachment'] = false;
 
+// Defines address book (internal index) to which new contacts will be added
+// By default it is the first writeable addressbook.
+// Note: Use '0' for built-in address book.
+$rcmail_config['default_addressbook'] = null;
+
 // end of config file

program/localization/en_US/labels.inc

@@ -413 +413 @@
 $labels['reqdsn'] = 'Always request a delivery status notification';
 $labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
+$labels['defaultaddressbook'] = 'Add new contacts to the selected addressbook';
 
 $labels['folder']  = 'Folder';

program/localization/pl_PL/labels.inc

@@ -456 +456 @@
 $labels['otherfolder'] = 'Folder innego uÅŒytkownika'; 
 $labels['sharedfolder'] = 'Folder współdzielony';
+$labels['defaultaddressbook'] = 'Nowe kontakty dodawaj do wybranej ksiÄ
+ÅŒki adresowej';
 
 ?>

program/steps/mail/addcontact.inc

@@ -24 +24 @@
   return;
 
-$done = false;
-$CONTACTS = $RCMAIL->get_address_book(null, true);
+$abook = $RCMAIL->config->get('default_addressbook');
+
+// Get configured addressbook
+$CONTACTS = $RCMAIL->get_address_book($abook, true);
+
+// Get first writeable addressbook if the configured doesn't exist
+// This can happen when user deleted the addressbook (e.g. Kolab folder)
+if ($abook !== null && !is_object($CONTACTS)) {
+  $CONTACTS = $RCMAIL->get_address_book(null, true);
+}
 
 if (!empty($_POST['_address']) && is_object($CONTACTS))

program/steps/settings/func.inc

@@ -132 +132 @@
   $sections['compose'] = array('id' => 'compose', 'section' => rcube_label('messagescomposition'));
   $sections['mailview'] = array('id' => 'mailview','section' => rcube_label('messagesdisplaying'));
+  $sections['addressbook'] = array('id' => 'addressbook','section' => rcube_label('addressbook'));
   $sections['folders'] = array('id' => 'folders', 'section' => rcube_label('specialfolders'));
   $sections['server'] = array('id' => 'server',  'section' => rcube_label('serversettings'));
@@ -583 +584 @@
     break;
 
+
+    // Addressbook config
+    case 'addressbook':
+
+    $blocks = array(
+      'main' => array('name' => Q(rcube_label('mainoptions'))),
+    );
+
+    if (!isset($no_override['default_addressbook'])
+      && ($books = $RCMAIL->get_address_sources(true))
+    ) {
+      $field_id = 'rcmfd_default_addressbook';
+      $select_abook = new html_select(array('name' => '_default_addressbook', 'id' => $field_id));
+
+      foreach ($books as $book) {
+        $select_abook->add($book['name'], $book['id']);
+      }
+
+      $blocks['main']['options']['default_addressbook'] = array(
+        'title' => html::label($field_id, Q(rcube_label('defaultaddressbook'))),
+        'content' => $select_abook->show($config['default_addressbook']),
+      );
+    }
+
+    break;
+
     // Special IMAP folders
     case 'folders':

program/steps/settings/save_prefs.inc

@@ -38 +38 @@
 
   break;
+
   case 'mailbox':
     $a_user_prefs = array(
@@ -49 +50 @@
 
   break;
+
   case 'mailview':
     $a_user_prefs = array(
@@ -59 +61 @@
 
   break;
+
   case 'compose':
     $a_user_prefs = array(
@@ -75 +78 @@
 
   break;
+
+  case 'addressbook':
+    $a_user_prefs = array(
+      'default_addressbook' => get_input_value('_default_addressbook', RCUBE_INPUT_POST),
+    );
+
+  break;
+
   case 'server':
     $a_user_prefs = array(
@@ -86 +97 @@
 
   break;
+
   case 'folders':
     $a_user_prefs = array(