From cb2bc809ef29f349d38c89e202d821e67bb4c947 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 21 Sep 2010 14:47:55 -0400
Subject: [PATCH] Fix db_mode check in insert_id()
---
program/steps/settings/func.inc | 119 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 63 insertions(+), 56 deletions(-)
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 1516b98..c8e46a3 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -25,7 +25,7 @@
// similar function as /steps/settings/identities.inc::rcmail_identity_frame()
function rcmail_preferences_frame($attrib)
- {
+{
global $OUTPUT;
if (!$attrib['id'])
@@ -35,21 +35,21 @@
$OUTPUT->set_env('contentframe', $attrib['name']);
$OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif');
-
+
return html::iframe($attrib);
- }
+}
function rcmail_sections_list($attrib)
- {
+{
global $RCMAIL;
-
+
// add id to message list table if not specified
if (!strlen($attrib['id']))
$attrib['id'] = 'rcmsectionslist';
list($list, $cols) = rcmail_user_prefs();
-
+
// create XHTML table
$out = rcube_table_output($attrib, $list, $cols, 'id');
@@ -58,51 +58,61 @@
$RCMAIL->output->include_script('list.js');
return $out;
- }
+}
function rcmail_identities_list($attrib)
- {
+{
global $OUTPUT, $USER, $RCMAIL;
// add id to message list table if not specified
if (!strlen($attrib['id']))
$attrib['id'] = 'rcmIdentitiesList';
- // 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')));
+ // get identities list and define 'mail' column
+ $list = $USER->list_identities();
+ foreach ($list as $idx => $row)
+ $list[$idx]['mail'] = trim($row['name'] . ' <' . $row['email'] .'>');
- // create XHTML table
+ // get all identites from DB and define list of cols to be displayed
+ $plugin = $RCMAIL->plugins->exec_hook('identities_list', array(
+ 'list' => $list,
+ 'cols' => array('mail')));
+
+ // @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']);
return $out;
- }
+}
// similar function as in /steps/addressbook/edit.inc
function get_form_tags($attrib, $action, $id = null, $hidden = null)
- {
+{
global $EDIT_FORM, $RCMAIL;
$form_start = $form_end = '';
-
+
if (empty($EDIT_FORM)) {
$request_key = $action . (isset($id) ? '.'.$id : '');
$form_start = $RCMAIL->output->request_form(array(
- 'name' => 'form', 'method' => 'post',
- 'task' => $RCMAIL->task, 'action' => $action,
- 'request' => $request_key, 'noclose' => true) + $attrib);
-
+ 'name' => 'form',
+ 'method' => 'post',
+ 'task' => $RCMAIL->task,
+ 'action' => $action,
+ 'request' => $request_key,
+ 'noclose' => true
+ ) + $attrib);
+
if (is_array($hidden)) {
$hiddenfields = new html_hiddenfield($hidden);
$form_start .= $hiddenfields->show();
}
-
+
$form_end = !strlen($attrib['form']) ? '</form>' : '';
$EDIT_FORM = !empty($attrib['form']) ? $attrib['form'] : 'form';
@@ -110,7 +120,7 @@
}
return array($form_start, $form_end);
- }
+}
function rcmail_user_prefs($current=null)
@@ -125,30 +135,30 @@
$sections['server'] = array('id' => 'server', 'section' => rcube_label('serversettings'));
// hook + define list cols
- $plugin = $RCMAIL->plugins->exec_hook('list_prefs_sections',
+ $plugin = $RCMAIL->plugins->exec_hook('preferences_sections_list',
array('list' => $sections, 'cols' => array('section')));
$sections = $plugin['list'];
-
+
$config = $RCMAIL->config->all();
$no_override = array_flip($RCMAIL->config->get('dont_override', array()));
-
+
foreach ($sections as $idx => $sect) {
-
+
if ($current && $sect['id'] != $current)
continue;
-
+
$blocks = array();
-
+
switch ($sect['id']) {
// general
case 'general':
-
+
$blocks = array(
'main' => array('name' => Q(rcube_label('mainoptions'))),
'list' => array('name' => Q(rcube_label('listoptions'))),
);
-
+
// language selection
if (!isset($no_override['language'])) {
$a_lang = $RCMAIL->list_languages();
@@ -265,12 +275,12 @@
);
}
}
-
- break;
-
+
+ break;
+
// Mailbox view (mail screen)
case 'mailbox':
-
+
$blocks = array(
'main' => array('name' => Q(rcube_label('mainoptions'))),
'new_message' => array('name' => Q(rcube_label('newmessage'))),
@@ -292,7 +302,7 @@
if (!isset($no_override['preview_pane_mark_read'])) {
// apply default if config option is not set at all
$config['preview_pane_mark_read'] = $RCMAIL->config->get('preview_pane_mark_read', 0);
-
+
$field_id = 'rcmfd_preview_pane_mark_read';
$select_delay = new html_select(array('name' => '_preview_pane_mark_read', 'id' => $field_id,
'disabled' => $config['preview_pane']?0:1));
@@ -332,7 +342,7 @@
$select_autoexpand_threads->add(rcube_label('never'), 0);
$select_autoexpand_threads->add(rcube_label('do_expand'), 1);
$select_autoexpand_threads->add(rcube_label('expand_only_unread'), 2);
-
+
$blocks['main']['options']['autoexpand_threads'] = array(
'title' => html::label($field_id, Q(rcube_label('autoexpand_threads'))),
'content' => $select_autoexpand_threads->show($config['autoexpand_threads']),
@@ -376,10 +386,10 @@
}
break;
-
+
// Message viewing
case 'mailview':
-
+
$blocks = array(
'main' => array('name' => Q(rcube_label('mainoptions'))),
);
@@ -442,10 +452,10 @@
}
break;
-
+
// Mail composition
case 'compose':
-
+
$blocks = array(
'main' => array('name' => Q(rcube_label('mainoptions'))),
'sig' => array('name' => Q(rcube_label('signatureoptions'))),
@@ -548,10 +558,10 @@
}
break;
-
+
// Special IMAP folders
case 'folders':
-
+
$blocks = array(
'main' => array('name' => Q(rcube_label('mainoptions'))),
);
@@ -595,10 +605,10 @@
}
break;
-
+
// Server settings
case 'server':
-
+
$blocks = array(
'main' => array('name' => Q(rcube_label('mainoptions'))),
'maintenance' => array('name' => Q(rcube_label('maintenance'))),
@@ -666,20 +676,18 @@
'content' => $input_expunge->show($config['logout_expunge']?1:0),
);
}
-
+
break;
}
- $data = $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $sect['id'], 'blocks' => $blocks));
+ $data = $RCMAIL->plugins->exec_hook('preferences_list', array('section' => $sect['id'], 'blocks' => $blocks));
$found = false;
-
+
// create output
foreach ($data['blocks'] as $block) {
- if ($block['options']) {
- foreach ($block['options'] as $option) {
- $found = true;
- break 2;
- }
+ if (!empty($block['content']) || !empty($block['options'])) {
+ $found = true;
+ break;
}
}
@@ -699,10 +707,10 @@
$skins = array();
$dir = opendir($path);
-
+
if (!$dir)
return false;
-
+
while (($file = readdir($dir)) !== false)
{
$filename = $path.'/'.$file;
@@ -723,4 +731,3 @@
'identitieslist' => 'rcmail_identities_list',
));
-?>
--
Gitblit v1.9.1