Changeset 5645 in subversion

Timestamp:

Dec 22, 2011 12:42:21 PM (17 months ago)

Author:

thomasb

Message:

Make count-display label selectable by skin; always show photo placeholder, even if source doesn't support a photo col

File:

• trunk/roundcubemail/program/steps/addressbook/func.inc (modified) (4 diffs)

trunk/roundcubemail/program/steps/addressbook/func.inc

@@ -383 +383 @@
     $OUTPUT->add_gui_object('countdisplay', $attrib['id']);
 
+    if ($attrib['label'])
+      $_SESSION['contactcountdisplay'] = $attrib['label'];
+
     return html::span($attrib, rcube_label('loading'));
 }
@@ -400 +403 @@
     else
         $out = rcube_label(array(
-            'name'  => 'contactsfromto',
+            'name'  => $_SESSION['contactcountdisplay'] ? $_SESSION['contactcountdisplay'] : 'contactsfromto',
             'vars'  => array(
             'from'  => $result->first + 1,
@@ -701 +704 @@
     global $SOURCE_ID, $CONTACTS, $CONTACT_COLTYPES, $RCMAIL, $CONFIG;
 
-    if (!$CONTACT_COLTYPES['photo'])
-        return '';
-
     if ($result = $CONTACTS->get_result())
         $record = $result->first();
@@ -721 +721 @@
     $content = html::div($attrib, $img);
 
-    if ($RCMAIL->action == 'edit' || $RCMAIL->action == 'add') {
+    if ($CONTACT_COLTYPES['photo'] && ($RCMAIL->action == 'edit' || $RCMAIL->action == 'add')) {
         $RCMAIL->output->add_gui_object('contactphoto', $attrib['id']);
         $hidden = new html_hiddenfield(array('name' => '_photo', 'id' => 'ff_photo', 'value' => $ff_value));