Always show address book name if multiple books are configured; fix styling

3 files changed, 16 insertions, 8 deletions

diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc
index f9d74e4fb..69fcba93c 100644
--- a/program/steps/addressbook/edit.inc
+++ b/program/steps/addressbook/edit.inc
@@ -54,7 +54,7 @@ else {
 }
 
 $SOURCE_ID = $source;
-
+rcmail_set_sourcename($CONTACTS);
 
 function rcmail_get_edit_record()
 {
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index 6b3ebad08..0a5a02287 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -160,6 +160,20 @@ function rcmail_default_source($writable=false)
     return $list[key($list)]['id'];
 }
 
+function rcmail_set_sourcename($abook)
+{
+    global $OUTPUT;
+    
+    // get address book name (for display)
+    if ($abook && $_SESSION['addressbooks_count'] > 1) {
+        $name = $abook->get_name();
+        if (!$name && $source == 0) {
+            $name = rcube_label('personaladrbook');
+        }
+        $OUTPUT->set_env('sourcename', $name);
+    }
+}
+
 
 function rcmail_directory_list($attrib)
 {
diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc
index fc983e60b..729cb3487 100644
--- a/program/steps/addressbook/show.inc
+++ b/program/steps/addressbook/show.inc
@@ -34,13 +34,7 @@ if ($cid && ($record = $CONTACTS->get_record($cid, true))) {
 }
 
 // get address book name (for display)
-if ($_SESSION['addressbooks_count'] > 1) {
-    $name = $CONTACTS->get_name();
-    if (!$name && $source == 0) {
-        $name = rcube_label('personaladrbook');
-    }
-    $OUTPUT->set_env('sourcename', $name);
-}
+rcmail_set_sourcename($CONTACTS);
 
 // return raw photo of the given contact
 if ($RCMAIL->action == 'photo') {