summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
Diffstat (limited to 'program')
-rw-r--r--program/include/main.inc5
-rw-r--r--program/localization/pl_PL/labels.inc1
-rw-r--r--program/steps/settings/func.inc14
3 files changed, 14 insertions, 6 deletions
diff --git a/program/include/main.inc b/program/include/main.inc
index e8e92161d..f98e4311e 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -732,8 +732,9 @@ function rcube_table_output($attrib, $table_data, $a_show_cols, $id_col)
$table = new html_table(/*array('cols' => count($a_show_cols))*/);
// add table header
- foreach ($a_show_cols as $col)
- $table->add_header($col, Q(rcube_label($col)));
+ if (!$attrib['noheader'])
+ foreach ($a_show_cols as $col)
+ $table->add_header($col, Q(rcube_label($col)));
$c = 0;
if (!is_array($table_data))
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index a1e858112..639cf0b95 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -344,5 +344,6 @@ $labels['vietnamese'] = 'wietnamski';
$labels['japanese'] = 'japoński';
$labels['korean'] = 'koreański';
$labels['chinese'] = 'chiński';
+$labels['folderctions'] = 'Działania na folderach...';
?>
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 1516b9810..f22cad8ef 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -69,14 +69,20 @@ function rcmail_identities_list($attrib)
if (!strlen($attrib['id']))
$attrib['id'] = 'rcmIdentitiesList';
+ // get identities list and define 'mail' column
+ $list = $USER->list_identities();
+ foreach ($list as $idx => $row)
+ $list[$idx]['mail'] = trim($row['name'] . ' <' . $row['email'] .'>');
+
// get all identites from DB and define list of cols to be displayed
$plugin = $RCMAIL->plugins->exec_hook('list_identities', array(
- 'list' => $USER->list_identities(),
- 'cols' => array('name', 'email')));
+ 'list' => $list,
+ 'cols' => array('mail')));
- // create XHTML table
+ // @TODO: use <UL> instead of <TABLE> for identities list
+ // create XHTML table
$out = rcube_table_output($attrib, $plugin['list'], $plugin['cols'], 'identity_id');
-
+
// set client env
$OUTPUT->add_gui_object('identitieslist', $attrib['id']);