X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Fsteps%2Fsettings%2Ffunc.inc;h=8df3ce8d3300ad9c5d83f6beab18d6791cd150e9;hb=76507f7c63a660742e76889ad6e3919f3dde3bb0;hp=7bac1f7d27ac2f6bc733e1fc1b578cda2a0b3c73;hpb=ade1655456ffdb799be8081f57ec90a408b99dd9;p=roundcube.git diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 7bac1f7..8df3ce8 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -4,8 +4,8 @@ +-----------------------------------------------------------------------+ | program/steps/settings/func.inc | | | - | This file is part of the RoundCube Webmail client | - | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland | + | This file is part of the Roundcube Webmail client | + | Copyright (C) 2005-2007, The Roundcube Dev Team | | Licensed under the GNU GPL | | | | PURPOSE: | @@ -15,264 +15,883 @@ | Author: Thomas Bruederli | +-----------------------------------------------------------------------+ - $Id: func.inc 892 2007-10-20 21:47:11Z thomasb $ + $Id: func.inc 5481 2011-11-24 07:53:00Z alec $ */ +if (!$OUTPUT->ajax_call) + $OUTPUT->set_pagetitle(rcube_label('preferences')); -// get user record -$sql_result = $DB->query("SELECT username, mail_host FROM ".get_table_name('users')." - WHERE user_id=?", - $_SESSION['user_id']); - -if ($USER_DATA = $DB->fetch_assoc($sql_result)) + +// similar function as /steps/settings/identities.inc::rcmail_identity_frame() +function rcmail_preferences_frame($attrib) { - $username = $USER_DATA['username'] . (!strpos($USER_DATA['username'], '@') ? '@'.$USER_DATA['mail_host'] : ''); - $OUTPUT->set_pagetitle(sprintf('%s %s', rcube_label('settingsfor'), $username)); + global $OUTPUT; + + if (!$attrib['id']) + $attrib['id'] = 'rcmprefsframe'; + + $attrib['name'] = $attrib['id']; + + $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; -function rcmail_user_prefs_form($attrib) - { - global $DB, $CONFIG, $sess_user_lang; - - $no_override = !empty($CONFIG['dont_override']) ? array_flip((array)$CONFIG['dont_override']) : array('preview_pane'=>true); - - // add some labels to client - rcube_add_label('nopagesizewarning'); - - list($form_start, $form_end) = get_form_tags($attrib, 'save-prefs'); - unset($attrib['form']); - - // allow the following attributes to be added to the tag - $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary')); - - // return the complete edit form as table - $out = "$form_start\n\n"; - - // show language selection - if (!isset($no_override['language'])) - { - $a_lang = rcube_list_languages(); - asort($a_lang); - - $field_id = 'rcmfd_lang'; - $select_lang = new select(array('name' => '_language', 'id' => $field_id)); - $select_lang->add(array_values($a_lang), array_keys($a_lang)); - - $out .= sprintf("\n", - $field_id, - Q(rcube_label('language')), - $select_lang->show($sess_user_lang)); - } - - - // show page size selection - if (!isset($no_override['timezone'])) - { - $field_id = 'rcmfd_timezone'; - $select_timezone = new select(array('name' => '_timezone', 'id' => $field_id)); - $select_timezone->add('(GMT -11:00) Midway Island, Samoa', '-11'); - $select_timezone->add('(GMT -10:00) Hawaii', '-10'); - $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:00) Atlantic Time (Canada), Caracas, La Paz', '-4'); - $select_timezone->add('(GMT -3:00) Brazil, Buenos Aires, Georgetown', '-3'); - $select_timezone->add('(GMT -3:30) Nfld Time (Canada), Nfld, S. Labador', '-3.5'); - $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: 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 +7:00) Bangkok, Hanoi, Jakarta', '7'); - $select_timezone->add('(GMT +8:00) Beijing, Perth, Singapore, Taipei', '8'); - $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 +11:00) Magadan, Solomon Islands', '11'); - $select_timezone->add('(GMT +12:00) Auckland, Wellington, Kamchatka', '12'); - $select_timezone->add('(GMT +13:00) Tonga, Pheonix Islands', '13'); - $select_timezone->add('(GMT +14:00) Kiribati', '14'); - - - $out .= sprintf("\n", - $field_id, - Q(rcube_label('timezone')), - $select_timezone->show($CONFIG['timezone'])); - } - - // daylight savings - if (!isset($no_override['dst_active'])) - { - $field_id = 'rcmfd_dst'; - $input_dst = new checkbox(array('name' => '_dst_active', 'id' => $field_id, 'value' => 1)); - $out .= sprintf("\n", - $field_id, - Q(rcube_label('dstactive')), - $input_dst->show($CONFIG['dst_active'])); - } - - // show page size selection - if (!isset($no_override['pagesize'])) - { - $field_id = 'rcmfd_pgsize'; - $input_pagesize = new textfield(array('name' => '_pagesize', 'id' => $field_id, 'size' => 5)); - - $out .= sprintf("\n", - $field_id, - Q(rcube_label('pagesize')), - $input_pagesize->show($CONFIG['pagesize'])); - } - - // MM: Show checkbox for toggling 'pretty dates' - if (!isset($no_override['prettydate'])) - { - $field_id = 'rcmfd_prettydate'; - $input_prettydate = new checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1)); - - $out .= sprintf("\n", - $field_id, - Q(rcube_label('prettydate')), - $input_prettydate->show($CONFIG['prettydate']?1:0)); - } - - // show checkbox for HTML/plaintext messages - if (!isset($no_override['prefer_html'])) - { - $field_id = 'rcmfd_htmlmsg'; - $input_pagesize = new checkbox(array('name' => '_prefer_html', 'id' => $field_id, 'value' => 1)); - - $out .= sprintf("\n", - $field_id, - Q(rcube_label('preferhtml')), - $input_pagesize->show($CONFIG['prefer_html']?1:0)); - } - - // Show checkbox for HTML Editor - if (!isset($no_override['htmleditor']) && $CONFIG['enable_htmleditor']) - { - $field_id = 'rcmfd_htmleditor'; - $input_htmleditor = new checkbox(array('name' => '_htmleditor', 'id' => $field_id, 'value' => 1)); - $out .= sprintf("\n", - $field_id, - Q(rcube_label('htmleditor')), - $input_htmleditor->show($CONFIG['htmleditor']?1:0)); - } - - // show config parameter for preview pane - if (!isset($no_override['preview_pane'])) - { - $field_id = 'rcmfd_preview'; - $input_preview = new checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1)); - $out .= sprintf("\n", - $field_id, - Q(rcube_label('previewpane')), - $input_preview->show($CONFIG['preview_pane']?1:0)); - } - - if (!empty($CONFIG['drafts_mbox']) && !isset($no_override['draft_autosave'])) - { - $field_id = 'rcmfd_autosave'; - $select_autosave = new select(array('name' => '_draft_autosave', 'id' => $field_id)); - $select_autosave->add(rcube_label('never'), 0); - foreach (array(3, 5, 10) as $i => $min) - $select_autosave->add(rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min))), $min*60); - - $out .= sprintf("\n", - $field_id, - Q(rcube_label('autosavedraft')), - $select_autosave->show($CONFIG['draft_autosave'])); - } - - $out .= "\n
%s
%s
%s
%s
%s
%s
%s
%s
%s
$form_end"; - - return $out; - } + // 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'); -function rcmail_identities_list($attrib) - { - global $DB, $CONFIG, $OUTPUT; + // set client env + $RCMAIL->output->add_gui_object('sectionslist', $attrib['id']); + $RCMAIL->output->include_script('list.js'); + return $out; +} - // get contacts from DB - $sql_result = $DB->query("SELECT * FROM ".get_table_name('identities')." - WHERE del<>1 - AND user_id=? - ORDER BY standard DESC, name ASC", - $_SESSION['user_id']); +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'; - // define list of cols to be displayed - $a_show_cols = array('name', 'email', 'organization', 'reply-to'); + // get identities list and define 'mail' column + $list = $USER->list_identities(); + foreach ($list as $idx => $row) + $list[$idx]['mail'] = trim($row['name'] . ' <' . rcube_idn_to_utf8($row['email']) .'>'); + + // 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