From f05834857c74b60a03378e01e3a178dfb15f297c Mon Sep 17 00:00:00 2001 From: alecpl Date: Mon, 3 Aug 2009 18:27:53 +0000 Subject: - Re-designed User Preferences interface --- program/steps/settings/func.inc | 446 ++++------------------------------------ 1 file changed, 41 insertions(+), 405 deletions(-) (limited to 'program/steps/settings/func.inc') diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index f833c1a5c..11201781c 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -22,396 +22,53 @@ if (!$OUTPUT->ajax_call) $OUTPUT->set_pagetitle(rcube_label('preferences')); -function rcmail_user_prefs_form($attrib) -{ - global $RCMAIL; +// define sections list +$SECTIONS['general'] = array('id' => 'general', 'section' => rcube_label('uisettings')); +$SECTIONS['mailbox'] = array('id' => 'mailbox', 'section' => rcube_label('mailboxview')); +$SECTIONS['compose'] = array('id' => 'compose', 'section' => rcube_label('messagescomposition')); +$SECTIONS['mailview'] = array('id' => 'mailview','section' => rcube_label('messagesdisplaying')); +$SECTIONS['folders'] = array('id' => 'folders', 'section' => rcube_label('specialfolders')); +$SECTIONS['server'] = array('id' => 'server', 'section' => rcube_label('serversettings')); - $no_override = array_flip($RCMAIL->config->get('dont_override', array())); - $blocks = $attrib['parts'] ? preg_split('/[\s,;]+/', strip_quotes($attrib['parts'])) : array('general','mailbox','compose','mailview','folders','server'); - // add some labels to client - $RCMAIL->output->add_label('nopagesizewarning'); - - list($form_start, $form_end) = get_form_tags($attrib, 'save-prefs'); - unset($attrib['form']); - - $out = $form_start; - - foreach ($blocks as $part) - $out .= rcmail_user_prefs_block($part, $no_override, $attrib); - - return $out . $form_end; -} - -function rcmail_user_prefs_block($part, $no_override, $attrib) -{ - global $RCMAIL; - $config = $RCMAIL->config->all(); - - switch ($part) +// similar function as /steps/settings/identities.inc::rcmail_identity_frame() +function rcmail_preferences_frame($attrib) { - // General UI settings - case 'general': - $table = new html_table(array('cols' => 2)); - - // show language selection - if (!isset($no_override['language'])) { - $a_lang = $RCMAIL->list_languages(); - asort($a_lang); - - $field_id = 'rcmfd_lang'; - $select_lang = new html_select(array('name' => '_language', 'id' => $field_id)); - $select_lang->add(array_values($a_lang), array_keys($a_lang)); - - $table->add('title', html::label($field_id, Q(rcube_label('language')))); - $table->add(null, $select_lang->show($RCMAIL->user->language)); - } - - // show page size selection - if (!isset($no_override['timezone'])) { - $field_id = 'rcmfd_timezone'; - $select_timezone = new html_select(array('name' => '_timezone', 'id' => $field_id, 'onchange' => "document.getElementById('rcmfd_dst').disabled=this.selectedIndex==0")); - $select_timezone->add(rcube_label('autodetect'), 'auto'); - $select_timezone->add('(GMT -11:00) Midway Island, Samoa', '-11'); - $select_timezone->add('(GMT -10:00) Hawaii', '-10'); - $select_timezone->add('(GMT -9:30) Marquesas Islands', '-9.5'); - $select_timezone->add('(GMT -9:00) Alaska', '-9'); - $select_timezone->add('(GMT -8:00) Pacific Time (US/Canada)', '-8'); - $select_timezone->add('(GMT -7:00) Mountain Time (US/Canada)', '-7'); - $select_timezone->add('(GMT -6:00) Central Time (US/Canada), Mexico City', '-6'); - $select_timezone->add('(GMT -5:00) Eastern Time (US/Canada), Bogota, Lima', '-5'); - $select_timezone->add('(GMT -4:30) Caracas', '-4.5'); - $select_timezone->add('(GMT -4:00) Atlantic Time (Canada), La Paz', '-4'); - $select_timezone->add('(GMT -3:30) Nfld Time (Canada), Nfld, S. Labador', '-3.5'); - $select_timezone->add('(GMT -3:00) Brazil, Buenos Aires, Georgetown', '-3'); - $select_timezone->add('(GMT -2:00) Mid-Atlantic', '-2'); - $select_timezone->add('(GMT -1:00) Azores, Cape Verde Islands', '-1'); - $select_timezone->add('(GMT) Western Europe, London, Lisbon, Casablanca', '0'); - $select_timezone->add('(GMT +1:00) Central European Time', '1'); - $select_timezone->add('(GMT +2:00) EET: Tallinn, Helsinki, Kaliningrad, South Africa', '2'); - $select_timezone->add('(GMT +3:00) Baghdad, Kuwait, Riyadh, Moscow, Nairobi', '3'); - $select_timezone->add('(GMT +3:30) Tehran', '3.5'); - $select_timezone->add('(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi', '4'); - $select_timezone->add('(GMT +4:30) Kabul', '4.5'); - $select_timezone->add('(GMT +5:00) Ekaterinburg, Islamabad, Karachi', '5'); - $select_timezone->add('(GMT +5:30) Chennai, Kolkata, Mumbai, New Delhi', '5.5'); - $select_timezone->add('(GMT +5:45) Kathmandu', '5.75'); - $select_timezone->add('(GMT +6:00) Almaty, Dhaka, Colombo', '6'); - $select_timezone->add('(GMT +6:30) Cocos Islands, Myanmar', '6.5'); - $select_timezone->add('(GMT +7:00) Bangkok, Hanoi, Jakarta', '7'); - $select_timezone->add('(GMT +8:00) Beijing, Perth, Singapore, Taipei', '8'); - $select_timezone->add('(GMT +8:45) Caiguna, Eucla, Border Village', '8.75'); - $select_timezone->add('(GMT +9:00) Tokyo, Seoul, Yakutsk', '9'); - $select_timezone->add('(GMT +9:30) Adelaide, Darwin', '9.5'); - $select_timezone->add('(GMT +10:00) EAST/AEST: Sydney, Guam, Vladivostok', '10'); - $select_timezone->add('(GMT +10:30) New South Wales', '10.5'); - $select_timezone->add('(GMT +11:00) Magadan, Solomon Islands', '11'); - $select_timezone->add('(GMT +11:30) Norfolk Island', '11.5'); - $select_timezone->add('(GMT +12:00) Auckland, Wellington, Kamchatka', '12'); - $select_timezone->add('(GMT +12:45) Chatham Islands', '12.75'); - $select_timezone->add('(GMT +13:00) Tonga, Pheonix Islands', '13'); - $select_timezone->add('(GMT +14:00) Kiribati', '14'); - - $table->add('title', html::label($field_id, Q(rcube_label('timezone')))); - $table->add(null, $select_timezone->show((string)$config['timezone'])); - } - - // daylight savings - if (!isset($no_override['dst_active'])) { - $field_id = 'rcmfd_dst'; - $input_dst = new html_checkbox(array('name' => '_dst_active', 'id' => $field_id, 'value' => 1, 'disabled' => ($config['timezone'] === 'auto'))); - - $table->add('title', html::label($field_id, Q(rcube_label('dstactive')))); - $table->add(null, $input_dst->show($config['dst_active'])); - } - - // MM: Show checkbox for toggling 'pretty dates' - if (!isset($no_override['prettydate'])) { - $field_id = 'rcmfd_prettydate'; - $input_prettydate = new html_checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1)); - - $table->add('title', html::label($field_id, Q(rcube_label('prettydate')))); - $table->add(null, $input_prettydate->show($config['prettydate']?1:0)); - } - - // show page size selection - if (!isset($no_override['pagesize'])) { - $field_id = 'rcmfd_pgsize'; - $input_pagesize = new html_inputfield(array('name' => '_pagesize', 'id' => $field_id, 'size' => 5)); - - $table->add('title', html::label($field_id, Q(rcube_label('pagesize')))); - $table->add(null, $input_pagesize->show($config['pagesize'])); - } - - // show drop-down for available skins - if (!isset($no_override['skin'])) { - $skins = rcmail_get_skins(); - - if (count($skins) > 1) { - $field_id = 'rcmfd_skin'; - $input_skin = new html_select(array('name'=>'_skin', 'id'=>$field_id)); - - foreach($skins as $skin) - $input_skin->add($skin, $skin); - - $table->add('title', html::label($field_id, Q(rcube_label('skin')))); - $table->add(null, $input_skin->show($config['skin'])); - } - } - - $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table)); - - if ($table->size()) - $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('uisettings'))) . $table->show($attrib)); - break; - - - // Mailbox view (mail screen) - case 'mailbox': - $table = new html_table(array('cols' => 2)); - - if (!isset($no_override['focus_on_new_message'])) { - $field_id = 'rcmfd_focus_on_new_message'; - $input_focus_on_new_message = new html_checkbox(array('name' => '_focus_on_new_message', 'id' => $field_id, 'value' => 1)); - $table->add('title', html::label($field_id, Q(rcube_label('focusonnewmessage')))); - $table->add(null, $input_focus_on_new_message->show($config['focus_on_new_message']?1:0)); - } - - // show config parameter for preview pane - if (!isset($no_override['preview_pane'])) { - $field_id = 'rcmfd_preview'; - $input_preview = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1)); - - $table->add('title', html::label($field_id, Q(rcube_label('previewpane')))); - $table->add(null, $input_preview->show($config['preview_pane']?1:0)); - } - - if (!isset($no_override['mdn_requests'])) { - $field_id = 'rcmfd_mdn_requests'; - $select_mdn_requests = new html_select(array('name' => '_mdn_requests', 'id' => $field_id)); - $select_mdn_requests->add(rcube_label('askuser'), 0); - $select_mdn_requests->add(rcube_label('autosend'), 1); - $select_mdn_requests->add(rcube_label('ignore'), 2); - - $table->add('title', html::label($field_id, Q(rcube_label('mdnrequests')))); - $table->add(null, $select_mdn_requests->show($config['mdn_requests'])); - } - - if (!isset($no_override['keep_alive'])) { - $field_id = 'rcmfd_keep_alive'; - $select_keep_alive = new html_select(array('name' => '_keep_alive', 'id' => $field_id)); - - foreach(array(1, 3, 5, 10, 15, 30, 60) as $min) - if((!$config['min_keep_alive'] || $config['min_keep_alive'] <= $min * 60) - && (!$config['session_lifetime'] || $config['session_lifetime'] > $min)) { - $select_keep_alive->add(rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min))), $min); - } - - $table->add('title', html::label($field_id, Q(rcube_label('keepalive')))); - $table->add(null, $select_keep_alive->show($config['keep_alive']/60)); - } - - if (!isset($no_override['check_all_folders'])) { - $field_id = 'rcmfd_check_all_folders'; - $input_check_all = new html_checkbox(array('name' => '_check_all_folders', 'id' => $field_id, 'value' => 1)); - $table->add('title', html::label($field_id, Q(rcube_label('checkallfolders')))); - $table->add(null, $input_check_all->show($config['check_all_folders']?1:0)); - } - - $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table)); - - if ($table->size()) - $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('mailboxview'))) . $table->show($attrib)); - break; - - - // Message viewing - case 'mailview': - $table = new html_table(array('cols' => 2)); - - // show checkbox for HTML/plaintext messages - if (!isset($no_override['prefer_html'])) { - $field_id = 'rcmfd_htmlmsg'; - $input_preferhtml = new html_checkbox(array('name' => '_prefer_html', 'id' => $field_id, 'value' => 1, - 'onchange' => JS_OBJECT_NAME.'.toggle_prefer_html(this)')); - - $table->add('title', html::label($field_id, Q(rcube_label('preferhtml')))); - $table->add(null, $input_preferhtml->show($config['prefer_html']?1:0)); - } - - if (!isset($no_override['show_images'])) { - $field_id = 'rcmfd_show_images'; - $input_show_images = new html_select(array('name' => '_show_images', 'id' => $field_id)); - $input_show_images->add(rcube_label('never'), 0); - $input_show_images->add(rcube_label('fromknownsenders'), 1); - $input_show_images->add(rcube_label('always'), 2); - - $table->add('title', html::label($field_id, Q(rcube_label('showremoteimages')))); - $table->add(null, $input_show_images->show($config['show_images'])); - } - - if (!isset($no_override['inline_images'])) { - $field_id = 'rcmfd_inline_images'; - $input_inline_images = new html_checkbox(array('name' => '_inline_images', 'id' => $field_id, 'value' => 1)); - - $table->add('title', html::label($field_id, Q(rcube_label('showinlineimages')))); - $table->add(null, $input_inline_images->show($config['inline_images']?1:0)); - } - - // "display after delete" checkbox - if (!isset($no_override['display_next'])) { - $field_id = 'rcmfd_displaynext'; - $input_displaynext = new html_checkbox(array('name' => '_display_next', 'id' => $field_id, 'value' => 1)); + global $OUTPUT; - $table->add('title', html::label($field_id, Q(rcube_label('displaynext')))); - $table->add(null, $input_displaynext->show($config['display_next']?1:0)); - } - - $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table)); - - if ($table->size()) - $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('messagesdisplaying'))) . $table->show($attrib)); - break; - - // Mail composition - case 'compose': - $table = new html_table(array('cols' => 2)); - - // Show checkbox for HTML Editor - if (!isset($no_override['htmleditor'])) { - $field_id = 'rcmfd_htmleditor'; - $input_htmleditor = new html_checkbox(array('name' => '_htmleditor', 'id' => $field_id, 'value' => 1)); - - $table->add('title', html::label($field_id, Q(rcube_label('htmleditor')))); - $table->add(null, $input_htmleditor->show($config['htmleditor']?1:0)); - } - - if (!isset($no_override['draft_autosave'])) { - $field_id = 'rcmfd_autosave'; - $select_autosave = new html_select(array('name' => '_draft_autosave', 'id' => $field_id, 'disabled' => empty($config['drafts_mbox']))); - $select_autosave->add(rcube_label('never'), 0); - foreach (array(1, 3, 5, 10) as $i => $min) - $select_autosave->add(rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min))), $min*60); - - $table->add('title', html::label($field_id, Q(rcube_label('autosavedraft')))); - $table->add(null, $select_autosave->show($config['draft_autosave'])); - } - - if (!isset($no_override['mime_param_folding'])) { - $field_id = 'rcmfd_param_folding'; - $select_param_folding = new html_select(array('name' => '_mime_param_folding', 'id' => $field_id)); - $select_param_folding->add(rcube_label('2231folding'), 0); - $select_param_folding->add(rcube_label('miscfolding'), 1); - $select_param_folding->add(rcube_label('2047folding'), 2); - - $table->set_row_attribs('advanced'); - $table->add('title', html::label($field_id, Q(rcube_label('mimeparamfolding')))); - $table->add(null, $select_param_folding->show($config['mime_param_folding'])); - } - - $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table)); - - if ($table->size()) - $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('messagescomposition'))) . $table->show($attrib)); - break; - - - // Special IMAP folders - case 'folders': - // Configure special folders - if (!isset($no_override['default_imap_folders'])) { - $RCMAIL->imap_init(true); - $select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true, 'maxlength' => 30)); - - $table = new html_table(array('cols' => 2)); - - if (!isset($no_override['drafts_mbox'])) { - $table->add('title', Q(rcube_label('drafts'))); - $table->add(null, $select->show($config['drafts_mbox'], array('name' => "_drafts_mbox", 'onchange' => "document.getElementById('rcmfd_autosave').disabled=this.selectedIndex==0"))); - } - - if (!isset($no_override['sent_mbox'])) { - $table->add('title', Q(rcube_label('sent'))); - $table->add(null, $select->show($config['sent_mbox'], array('name' => "_sent_mbox"))); - } - - if (!isset($no_override['junk_mbox'])) { - $table->add('title', Q(rcube_label('junk'))); - $table->add(null, $select->show($config['junk_mbox'], array('name' => "_junk_mbox"))); - } - - if (!isset($no_override['trash_mbox'])) { - $table->add('title', Q(rcube_label('trash'))); - $table->add(null, $select->show($config['trash_mbox'], array('name' => "_trash_mbox"))); - } - - $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table)); - - $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('specialfolders'))) . $table->show($attrib)); - } - break; - - - // Server settings - case 'server': - $table = new html_table(array('cols' => 2)); - - if (!isset($no_override['read_when_deleted'])) { - $field_id = 'rcmfd_read_deleted'; - $input_readdeleted = new html_checkbox(array('name' => '_read_when_deleted', 'id' => $field_id, 'value' => 1)); - - $table->add('title', html::label($field_id, Q(rcube_label('readwhendeleted')))); - $table->add(null, $input_readdeleted->show($config['read_when_deleted']?1:0)); - } + if (!$attrib['id']) + $attrib['id'] = 'rcmprefsframe'; - if (!isset($no_override['flag_for_deletion'])) { - $field_id = 'rcmfd_flag_for_deletion'; - $input_flagfordeletion = new html_checkbox(array('name' => '_flag_for_deletion', 'id' => $field_id, 'value' => 1)); + $attrib['name'] = $attrib['id']; - $table->add('title', html::label($field_id, Q(rcube_label('flagfordeletion')))); - $table->add(null, $input_flagfordeletion->show($config['flag_for_deletion']?1:0)); - } - - // don't show deleted messages - if (!isset($no_override['skip_deleted'])) { - $field_id = 'rcmfd_skip_deleted'; - $input_purge = new html_checkbox(array('name' => '_skip_deleted', 'id' => $field_id, 'value' => 1)); - - $table->add('title', html::label($field_id, Q(rcube_label('skipdeleted')))); - $table->add(null, $input_purge->show($config['skip_deleted']?1:0)); - } - - // Trash purging on logout - if (!isset($no_override['logout_purge'])) { - $field_id = 'rcmfd_logout_purge'; - $input_purge = new html_checkbox(array('name' => '_logout_purge', 'id' => $field_id, 'value' => 1)); - - $table->add('title', html::label($field_id, Q(rcube_label('logoutclear')))); - $table->add(null, $input_purge->show($config['logout_purge']?1:0)); - } - - // INBOX compacting on logout - if (!isset($no_override['logout_expunge'])) { - $field_id = 'rcmfd_logout_expunge'; - $input_expunge = new html_checkbox(array('name' => '_logout_expunge', 'id' => $field_id, 'value' => 1)); + $OUTPUT->set_env('contentframe', $attrib['name']); + $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif'); + + return html::iframe($attrib); + } - $table->add('title', html::label($field_id, Q(rcube_label('logoutcompact')))); - $table->add(null, $input_expunge->show($config['logout_expunge']?1:0)); - } - $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table)); +function rcmail_sections_list($attrib) + { + global $RCMAIL, $SECTIONS; + + // add id to message list table if not specified + if (!strlen($attrib['id'])) + $attrib['id'] = 'rcmsectionslist'; - if ($table->size()) - $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('serversettings'))) . $table->show($attrib)); - break; + // hook + define list cols + $plugin = $RCMAIL->plugins->exec_hook('list_prefs_sections', + array('list' => $SECTIONS, 'cols' => array('section'))); + + // create XHTML table + $out = rcube_table_output($attrib, $plugin['list'], $plugin['cols'], 'id'); + // set client env + $RCMAIL->output->add_gui_object('sectionslist', $attrib['id']); + $RCMAIL->output->include_script('list.js'); - default: - $out = ''; - } - return $out; -} + } function rcmail_identities_list($attrib) @@ -437,7 +94,6 @@ function rcmail_identities_list($attrib) } - // similar function as in /steps/addressbook/edit.inc function get_form_tags($attrib, $action, $id = null, $hidden = null) { @@ -447,7 +103,10 @@ function get_form_tags($attrib, $action, $id = null, $hidden = null) 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); + $form_start = $RCMAIL->output->request_form(array( + 'name' => 'form', 'method' => 'post', + 'task' => $RCMAIL->task, 'action' => $action, + 'request' => $request_key, 'noclose' => true) + $attrib); if (is_array($hidden)) { $hiddenfields = new html_hiddenfield($hidden); @@ -463,35 +122,12 @@ function get_form_tags($attrib, $action, $id = null, $hidden = null) return array($form_start, $form_end); } -function rcmail_get_skins() - { - $path = 'skins'; - $skins = array(); - - $dir = opendir($path); - - if (!$dir) - return false; - - while (($file = readdir($dir)) !== false) - { - $filename = $path.'/'.$file; - if (is_dir($filename) && is_readable($filename) - && !in_array($file, array('.', '..', '.svn'))) - $skins[] = $file; - } - - closedir($dir); - - return $skins; - } - // register UI objects $OUTPUT->add_handlers(array( - 'userprefs' => 'rcmail_user_prefs_form', + 'prefsframe' => 'rcmail_preferences_frame', + 'sectionslist' => 'rcmail_sections_list', 'identitieslist' => 'rcmail_identities_list', - 'itentitieslist' => 'rcmail_identities_list' // keep this for backward compatibility )); ?> -- cgit v1.2.3