summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/func.inc21
-rw-r--r--program/steps/mail/move_del.inc5
-rw-r--r--program/steps/mail/show.inc38
-rw-r--r--program/steps/settings/func.inc208
-rw-r--r--program/steps/settings/save_prefs.inc32
5 files changed, 168 insertions, 136 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 76bb9b712..d655a3316 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -558,6 +558,27 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE)
}
+// return an HTML iframe for loading mail content
+function rcmail_messagecontent_frame($attrib)
+ {
+ global $OUTPUT, $JS_OBJECT_NAME;
+
+ if (empty($attrib['id']))
+ $attrib['id'] = 'rcmailcontentwindow';
+
+ // allow the following attributes to be added to the <iframe> tag
+ $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'src', 'width', 'height', 'frameborder'));
+ $framename = $attrib['id'];
+
+ $out = sprintf('<iframe name="%s"%s></iframe>'."\n",
+ $framename,
+ $attrib_str);
+
+ $OUTPUT->add_script("$JS_OBJECT_NAME.set_env('contentframe', '$framename');");
+
+ return $out;
+ }
+
// return code for search function
function rcmail_search_form($attrib)
{
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 80b2ad8d6..a7aa5c782 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -24,7 +24,7 @@ $REMOTE_REQUEST = TRUE;
// move messages
if ($_action=='moveto' && $_GET['_uid'] && $_GET['_target_mbox'])
{
- $count = sizeof(explode(',', $_GET['_uid']));
+ $count = sizeof(explode(',', $_GET['_uid']));
$moved = $IMAP->move_message($_GET['_uid'], $_GET['_target_mbox'], $_GET['_mbox']);
if (!$moved)
@@ -62,8 +62,7 @@ else
// update message count display
$pages = ceil($IMAP->messagecount()/$IMAP->page_size);
-$commands = "if (this.message_list) this.message_list.init();\n";
-$commands .= sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text());
+$commands = sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text());
$commands .= sprintf("this.set_env('pagecount', %d);\n", $pages);
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index c8e493756..8e6c3cd36 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -30,12 +30,18 @@ if ($_GET['_uid'])
$MESSAGE = array('UID' => get_input_value('_uid', RCUBE_INPUT_GET));
$MESSAGE['headers'] = $IMAP->get_headers($MESSAGE['UID']);
$MESSAGE['structure'] = $IMAP->get_structure($MESSAGE['UID']);
-
+
// go back to list if message not found (wrong UID)
if (!$MESSAGE['headers'] || !$MESSAGE['structure'])
{
- $_action = 'list';
- return;
+ show_message('messageopenerror', 'error');
+ if ($_action=='preview' && template_exists('messagepreview'))
+ parse_template('messagepreview');
+ else
+ {
+ $_action = 'list';
+ return;
+ }
}
$MESSAGE['subject'] = $IMAP->decode_header($MESSAGE['headers']->subject);
@@ -131,28 +137,6 @@ function rcmail_message_attachments($attrib)
-// return an HTML iframe for loading mail content
-function rcmail_messagecontent_frame($attrib)
- {
- global $COMM_PATH, $OUTPUT, $GET_URL, $JS_OBJECT_NAME;
-
- // allow the following attributes to be added to the <iframe> tag
- $attrib_str = create_attrib_string($attrib);
- $framename = 'rcmailcontentwindow';
-
- $out = sprintf('<iframe src="%s" name="%s"%s>%s</iframe>'."\n",
- $GET_URL,
- $framename,
- $attrib_str,
- rcube_label('loading'));
-
-
- $OUTPUT->add_script("$JS_OBJECT_NAME.set_env('contentframe', '$framename');");
-
- return $out;
- }
-
-
function rcmail_remote_objects_msg($attrib)
{
global $CONFIG, $OUTPUT, $JS_OBJECT_NAME;
@@ -177,8 +161,10 @@ function rcmail_remote_objects_msg($attrib)
}
-if ($_action=='print')
+if ($_action=='print' && template_exists('printmessage'))
parse_template('printmessage');
+else if ($_action=='preview' && template_exists('messagepreview'))
+ parse_template('messagepreview');
else
parse_template('message');
?> \ No newline at end of file
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index fd985726d..70d29dbfe 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -34,6 +34,8 @@ function rcmail_user_prefs_form($attrib)
{
global $DB, $CONFIG, $sess_user_lang;
+ $no_override = is_array($CONFIG['dont_override']) ? array_flip($CONFIG['dont_override']) : array();
+
// add some labels to client
rcube_add_label('nopagesizewarning');
@@ -46,116 +48,138 @@ function rcmail_user_prefs_form($attrib)
// return the complete edit form as table
$out = "$form_start<table" . $attrib_str . ">\n\n";
- $a_show_cols = array(
- 'language' => array('type' => 'text'),
- 'pagesize' => array('type' => 'text'),
- 'timezone' => array('type' => 'text'),
- 'prettydate' => array('type' => 'text'),
- 'draft_autosave' => array('type' => 'text')
- );
-
// show language selection
- $a_lang = rcube_list_languages();
- asort($a_lang);
+ 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));
+ $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("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
- $field_id,
- rep_specialchars_output(rcube_label('language')),
- $select_lang->show($sess_user_lang));
+ $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+ $field_id,
+ rep_specialchars_output(rcube_label('language')),
+ $select_lang->show($sess_user_lang));
+ }
// show page size selection
- $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: 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');
+ 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: 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("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
- $field_id,
- rep_specialchars_output(rcube_label('timezone')),
- $select_timezone->show($CONFIG['timezone']));
-
-
- $field_id = 'rcmfd_dst';
- $input_dst = new checkbox(array('name' => '_dst_active', 'id' => $field_id, 'value' => 1));
- $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
- $field_id,
- rep_specialchars_output(rcube_label('dstactive')),
- $input_dst->show($CONFIG['dst_active']));
+ $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+ $field_id,
+ rep_specialchars_output(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("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+ $field_id,
+ rep_specialchars_output(rcube_label('dstactive')),
+ $input_dst->show($CONFIG['dst_active']));
+ }
// show page size selection
- $field_id = 'rcmfd_pgsize';
- $input_pagesize = new textfield(array('name' => '_pagesize', 'id' => $field_id, 'size' => 5));
+ if (!isset($no_override['pagesize']))
+ {
+ $field_id = 'rcmfd_pgsize';
+ $input_pagesize = new textfield(array('name' => '_pagesize', 'id' => $field_id, 'size' => 5));
- $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
- $field_id,
- rep_specialchars_output(rcube_label('pagesize')),
- $input_pagesize->show($CONFIG['pagesize']));
+ $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+ $field_id,
+ rep_specialchars_output(rcube_label('pagesize')),
+ $input_pagesize->show($CONFIG['pagesize']));
+ }
- // show checkbox for HTML/plaintext messages
- $field_id = 'rcmfd_htmlmsg';
- $input_pagesize = new checkbox(array('name' => '_prefer_html', 'id' => $field_id, 'value' => 1));
+ // 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("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
- $field_id,
- rep_specialchars_output(rcube_label('preferhtml')),
- $input_pagesize->show($CONFIG['prefer_html']?1:0));
+ $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+ $field_id,
+ rep_specialchars_output(rcube_label('prettydate')),
+ $input_prettydate->show($CONFIG['prettydate']?1:0));
+ }
- // MM: Show checkbox for toggling 'pretty dates'
- $field_id = 'rcmfd_prettydate';
- $input_prettydate = new checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));
+ // 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("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
- $field_id,
- rep_specialchars_output(rcube_label('prettydate')),
- $input_prettydate->show($CONFIG['prettydate']?1:0));
+ $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+ $field_id,
+ rep_specialchars_output(rcube_label('preferhtml')),
+ $input_pagesize->show($CONFIG['prefer_html']?1:0));
+ }
// Show checkbox for HTML Editor
- $field_id = 'rcmfd_htmleditor';
- $input_htmleditor = new checkbox(array('name' => '_htmleditor', 'id' => $field_id, 'value' => 1));
- $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
- $field_id,
- rep_specialchars_output(rcube_label('htmleditor')),
- $input_htmleditor->show($CONFIG['htmleditor']?1:0));
-
- if (!empty($CONFIG['drafts_mbox']))
+ if (!isset($no_override['htmleditor']))
+ {
+ $field_id = 'rcmfd_htmleditor';
+ $input_htmleditor = new checkbox(array('name' => '_htmleditor', 'id' => $field_id, 'value' => 1));
+ $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+ $field_id,
+ rep_specialchars_output(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("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+ $field_id,
+ rep_specialchars_output(rcube_label('previewpane')),
+ $input_preview->show($CONFIG['preview_pane']?1:0));
+ }
+
+ if (!empty($CONFIG['drafts_mbox']) && !isset($no_override['preview_pane']))
{
$field_id = 'rcmfd_autosave';
$select_autosave = new select(array('name' => '_draft_autosave', 'id' => $field_id));
diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index a438de002..fd254f9f3 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -19,21 +19,23 @@
*/
-$a_user_prefs = $_SESSION['user_prefs'];
-if (!is_array($a_user_prefs))
- $a_user_prefs = array();
-
-
-$a_user_prefs['timezone'] = isset($_POST['_timezone']) ? floatval($_POST['_timezone']) : $CONFIG['timezone'];
-$a_user_prefs['dst_active'] = isset($_POST['_dst_active']) ? TRUE : FALSE;
-$a_user_prefs['pagesize'] = is_numeric($_POST['_pagesize']) ? (int)$_POST['_pagesize'] : $CONFIG['pagesize'];
-$a_user_prefs['prefer_html'] = isset($_POST['_prefer_html']) ? TRUE : FALSE;
-$a_user_prefs['htmleditor'] = isset($_POST['_htmleditor']) ? TRUE : FALSE;
-$a_user_prefs['draft_autosave'] = isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0;
-
-// MM: Date format toggle (Pretty / Standard)
-$a_user_prefs['prettydate'] = isset($_POST['_pretty_date']) ? TRUE : FALSE;
-
+$a_user_prefs = array(
+ 'timezone' => isset($_POST['_timezone']) ? floatval($_POST['_timezone']) : $CONFIG['timezone'],
+ 'dst_active' => isset($_POST['_dst_active']) ? TRUE : FALSE,
+ 'pagesize' => is_numeric($_POST['_pagesize']) ? intval($_POST['_pagesize']) : $CONFIG['pagesize'],
+ 'prettydate' => isset($_POST['_pretty_date']) ? TRUE : FALSE,
+ 'prefer_html' => isset($_POST['_prefer_html']) ? TRUE : FALSE,
+ 'htmleditor' => isset($_POST['_htmleditor']) ? TRUE : FALSE,
+ 'preview_pane' => isset($_POST['_preview_pane']) ? TRUE : FALSE,
+ 'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0
+ );
+
+// don't override these parameters
+foreach ((array)$CONFIG['dont_override'] as $p)
+ $a_user_prefs[$p] = $CONFIG[$p];
+
+
+// switch UI language
if (isset($_POST['_language']))
{
$sess_user_lang = $_SESSION['user_lang'] = get_input_value('_language', RCUBE_INPUT_POST);
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-30 14:25:18 +0000