From faaa1ba5343499ae766dc8de270da4fc6e70d05d Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 22 Dec 2011 12:42:21 -0500
Subject: [PATCH] Make count-display label selectable by skin; always show photo placeholder, even if source doesn't support a photo col
---
program/steps/addressbook/func.inc | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index 5010e8c..fac8987 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -382,6 +382,9 @@
$OUTPUT->add_gui_object('countdisplay', $attrib['id']);
+ if ($attrib['label'])
+ $_SESSION['contactcountdisplay'] = $attrib['label'];
+
return html::span($attrib, rcube_label('loading'));
}
@@ -399,7 +402,7 @@
$out = rcube_label('nocontactsfound');
else
$out = rcube_label(array(
- 'name' => 'contactsfromto',
+ 'name' => $_SESSION['contactcountdisplay'] ? $_SESSION['contactcountdisplay'] : 'contactsfromto',
'vars' => array(
'from' => $result->first + 1,
'to' => min($result->count, $result->first + $CONFIG['pagesize']),
@@ -700,9 +703,6 @@
{
global $SOURCE_ID, $CONTACTS, $CONTACT_COLTYPES, $RCMAIL, $CONFIG;
- if (!$CONTACT_COLTYPES['photo'])
- return '';
-
if ($result = $CONTACTS->get_result())
$record = $result->first();
@@ -720,7 +720,7 @@
$img = html::img(array('src' => $photo_img, 'border' => 1, 'alt' => ''));
$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));
$content .= $hidden->show();
--
Gitblit v1.9.1