githubFork/roundcubemail.git

- Don't call rcube_idn_to_ascii() on empty data

alecpl

2011-06-02 2d5beeaf06e92dd98adcb7c2661be93087542b46

commit \| author \| age
4e17e6	1	<?php
T	2
	3	/*
	4	+-----------------------------------------------------------------------+
	5	\| program/steps/settings/save_prefs.inc \|
	6	\| \|
e019f2	7	\| This file is part of the Roundcube Webmail client \|
f5e7b3	8	\| Copyright (C) 2005-2009, The Roundcube Dev Team \|
30233b	9	\| Licensed under the GNU GPL \|
4e17e6	10	\| \|
T	11	\| PURPOSE: \|
	12	\| Save user preferences to DB and to the current session \|
	13	\| \|
	14	+-----------------------------------------------------------------------+
	15	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	16	+-----------------------------------------------------------------------+
	17
	18	$Id$
	19
	20	*/
57f0c8	21
f05834	22	$CURR_SECTION = get_input_value('_section', RCUBE_INPUT_POST);
b19097	23
f05834	24	$a_user_prefs = array();
A	25
	26	// set options for specified section
	27	switch ($CURR_SECTION)
	28	{
	29	case 'general':
	30	$a_user_prefs = array(
	31	'language' => isset($_POST['_language']) ? get_input_value('_language', RCUBE_INPUT_POST) : $CONFIG['language'],
	32	'timezone' => isset($_POST['_timezone']) ? (is_numeric($_POST['_timezone']) ? floatval($_POST['_timezone']) : get_input_value('_timezone', RCUBE_INPUT_POST)) : $CONFIG['timezone'],
	33	'dst_active' => isset($_POST['_dst_active']) ? TRUE : FALSE,
	34	'pagesize' => is_numeric($_POST['_pagesize']) ? max(2, intval($_POST['_pagesize'])) : $CONFIG['pagesize'],
	35	'prettydate' => isset($_POST['_pretty_date']) ? TRUE : FALSE,
	36	'skin' => isset($_POST['_skin']) ? get_input_value('_skin', RCUBE_INPUT_POST) : $CONFIG['skin'],
	37	);
	38
	39	break;
d73448	40
f05834	41	case 'mailbox':
A	42	$a_user_prefs = array(
bc4960	43	'preview_pane' => isset($_POST['_preview_pane']) ? TRUE : FALSE,
T	44	'preview_pane_mark_read' => isset($_POST['_preview_pane_mark_read']) ? intval($_POST['_preview_pane_mark_read']) : $CONFIG['preview_pane_mark_read'],
f52c93	45	'autoexpand_threads' => isset($_POST['_autoexpand_threads']) ? intval($_POST['_autoexpand_threads']) : 0,
f05834	46	'mdn_requests' => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0,
A	47	'keep_alive' => isset($_POST['_keep_alive']) ? intval($_POST['_keep_alive'])*60 : $CONFIG['keep_alive'],
	48	'check_all_folders' => isset($_POST['_check_all_folders']) ? TRUE : FALSE,
	49	);
	50
	51	break;
d73448	52
f05834	53	case 'mailview':
A	54	$a_user_prefs = array(
	55	'prefer_html' => isset($_POST['_prefer_html']) ? TRUE : FALSE,
	56	'inline_images' => isset($_POST['_inline_images']) ? TRUE : FALSE,
	57	'show_images' => isset($_POST['_show_images']) ? intval($_POST['_show_images']) : 0,
	58	'display_next' => isset($_POST['_display_next']) ? TRUE : FALSE,
e55ab0	59	'default_charset' => get_input_value('_default_charset', RCUBE_INPUT_POST),
f05834	60	);
e55ab0	61
f05834	62	break;
d73448	63
f05834	64	case 'compose':
A	65	$a_user_prefs = array(
868deb	66	'htmleditor' => intval($_POST['_htmleditor']),
f05834	67	'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0,
A	68	'mime_param_folding' => isset($_POST['_mime_param_folding']) ? intval($_POST['_mime_param_folding']) : 0,
47ad83	69	'force_7bit' => isset($_POST['_force_7bit']) ? TRUE : FALSE,
b3660b	70	'mdn_default' => isset($_POST['_mdn_default']) ? TRUE : FALSE,
f22ea7	71	'dsn_default' => isset($_POST['_dsn_default']) ? TRUE : FALSE,
eeb85f	72	'reply_same_folder' => isset($_POST['_reply_same_folder']) ? TRUE : FALSE,
1d5779	73	'spellcheck_before_send' => isset($_POST['_spellcheck_before_send']) ? TRUE : FALSE,
0207c4	74	'show_sig' => isset($_POST['_show_sig']) ? intval($_POST['_show_sig']) : 1,
T	75	'top_posting' => !empty($_POST['_top_posting']),
	76	'strip_existing_sig' => isset($_POST['_strip_existing_sig']),
655bd9	77	'sig_above' => !empty($_POST['_sig_above']) && !empty($_POST['_top_posting']),
f05834	78	);
A	79
	80	break;
d73448	81
A	82	case 'addressbook':
	83	$a_user_prefs = array(
d9641b	84	'default_addressbook' => get_input_value('_default_addressbook', RCUBE_INPUT_POST, true),
d73448	85	);
A	86
	87	break;
	88
f05834	89	case 'server':
A	90	$a_user_prefs = array(
	91	'read_when_deleted' => isset($_POST['_read_when_deleted']) ? TRUE : FALSE,
	92	'skip_deleted' => isset($_POST['_skip_deleted']) ? TRUE : FALSE,
	93	'flag_for_deletion' => isset($_POST['_flag_for_deletion']) ? TRUE : FALSE,
b7f952	94	'delete_always' => isset($_POST['_delete_always']) ? TRUE : FALSE,
f05834	95	'logout_purge' => isset($_POST['_logout_purge']) ? TRUE : FALSE,
A	96	'logout_expunge' => isset($_POST['_logout_expunge']) ? TRUE : FALSE,
	97	);
	98
	99	break;
d73448	100
f05834	101	case 'folders':
A	102	$a_user_prefs = array(
d9641b	103	'drafts_mbox' => get_input_value('_drafts_mbox', RCUBE_INPUT_POST, true),
A	104	'sent_mbox' => get_input_value('_sent_mbox', RCUBE_INPUT_POST, true),
	105	'junk_mbox' => get_input_value('_junk_mbox', RCUBE_INPUT_POST, true),
	106	'trash_mbox' => get_input_value('_trash_mbox', RCUBE_INPUT_POST, true),
f05834	107	);
A	108
	109	break;
	110	}
	111
dae34b	112	$plugin = rcmail::get_instance()->plugins->exec_hook('preferences_save',
f05834	113	array('prefs' => $a_user_prefs, 'section' => $CURR_SECTION));
A	114
dae34b	115	$a_user_prefs = $plugin['prefs'];
cc97ea	116
b19097	117	// don't override these parameters
T	118	foreach ((array)$CONFIG['dont_override'] as $p)
	119	$a_user_prefs[$p] = $CONFIG[$p];
4e17e6	120
f05834	121
A	122	// verify some options
	123	switch ($CURR_SECTION)
	124	{
	125	case 'general':
	126
	127	// switch UI language
141c9e	128	if (isset($_POST['_language']) && $a_user_prefs['language'] != $_SESSION['language']) {
f05834	129	$RCMAIL->load_language($a_user_prefs['language']);
141c9e	130	$OUTPUT->command('reload', 500);
f05834	131	}
A	132
62c791	133	// switch skin (if valid, otherwise unset the pref and fall back to default)
T	134	if (!$OUTPUT->set_skin($a_user_prefs['skin']))
	135	unset($a_user_prefs['skin']);
f05834	136
A	137	// force min size
	138	if ($a_user_prefs['pagesize'] < 1)
	139	$a_user_prefs['pagesize'] = 10;
	140
	141	if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['pagesize'] > $CONFIG['max_pagesize']))
	142	$a_user_prefs['pagesize'] = (int) $CONFIG['max_pagesize'];
	143
b373fd	144	$a_user_prefs['timezone'] = $_SESSION['timezone'] = (string) $a_user_prefs['timezone'];
A	145
f05834	146	break;
A	147	case 'mailbox':
	148
	149	// force keep_alive
	150	if (isset($a_user_prefs['keep_alive'])) {
	151	$a_user_prefs['keep_alive'] = max(60, $CONFIG['min_keep_alive'], $a_user_prefs['keep_alive']);
	152	if (!empty($CONFIG['session_lifetime']))
	153	$a_user_prefs['keep_alive'] = min($CONFIG['session_lifetime']*60, $a_user_prefs['keep_alive']);
	154	}
	155
	156	break;
	157	case 'folders':
	158
	159	// special handling for 'default_imap_folders'
	160	if (in_array('default_imap_folders', (array)$CONFIG['dont_override'])) {
	161	foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p)
141c9e	162	$a_user_prefs[$p] = $CONFIG[$p];
f05834	163	} else {
A	164	$a_user_prefs['default_imap_folders'] = array('INBOX');
	165	foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) {
141c9e	166	if ($a_user_prefs[$p])
f05834	167	$a_user_prefs['default_imap_folders'][] = $a_user_prefs[$p];
141c9e	168	}
f05834	169	}
A	170
	171	break;
64f20d	172	}
2a4135	173
dae34b	174	// Save preferences
A	175	if (!$plugin['abort'])
	176	$saved = $USER->save_prefs($a_user_prefs);
	177	else
	178	$saved = $plugin['result'];
	179
	180	if ($saved)
f11541	181	$OUTPUT->show_message('successfullysaved', 'confirmation');
dae34b	182	else
A	183	$OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');
4e17e6	184
f05834	185	// display the form again
A	186	rcmail_overwrite_action('edit-prefs');
b25dfd	187