From 34854b63ee18d7b1a8b95d138460504e5d1c3f67 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 02 Aug 2011 13:17:59 -0400
Subject: [PATCH] - Fix setting default addressbook as selected in source selector
---
program/steps/addressbook/edit.inc | 7 ++++++-
program/steps/addressbook/func.inc | 4 ++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc
index 69fcba9..0ad977d 100644
--- a/program/steps/addressbook/edit.inc
+++ b/program/steps/addressbook/edit.inc
@@ -43,7 +43,12 @@
else {
$source = get_input_value('_source', RCUBE_INPUT_GPC);
- $CONTACTS = $RCMAIL->get_address_book($source);
+ if (!strlen($source)) {
+ // Give priority to configured default
+ $source = $RCMAIL->config->get('default_addressbook');
+ }
+
+ $CONTACTS = $RCMAIL->get_address_book($source, true);
// find writable addressbook
if (!$CONTACTS || $CONTACTS->readonly)
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index 932d349..7fb1e2c 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -150,10 +150,10 @@
global $RCMAIL;
// get list of address sources
- $list = $RCMAIL->get_address_sources($writable);
+ $first = reset($RCMAIL->get_address_sources($writable));
// use first directory by default
- return $list[key($list)]['id'];
+ return $first['id'];
}
function rcmail_set_sourcename($abook)
--
Gitblit v1.9.1