From b332e799b4840ff6d83c6e3730dd256ce493d79b Mon Sep 17 00:00:00 2001 From: Raoul Bhatia Date: Wed, 23 May 2012 15:34:33 +0200 Subject: [PATCH 1/3] improve .htaccess security rules: 1. also prevent access to .gitignore 2. make the second security rule work as expected 3. include README.md in security rules --- .htaccess | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.htaccess b/.htaccess index d5ebe4c20..82afe76de 100644 --- a/.htaccess +++ b/.htaccess @@ -30,8 +30,8 @@ php_value mbstring.func_overload 0 RewriteEngine On RewriteRule ^favicon\.ico$ skins/default/images/favicon.ico # security rules -RewriteRule .git/ - [F] -RewriteRule ^README|INSTALL|LICENSE|SQL|bin|CHANGELOG$ - [F] +RewriteRule .git - [F] +RewriteRule ^/?(README(.md)?|INSTALL|LICENSE|SQL|bin|CHANGELOG)$ - [F] From c0839699bb15902fcfef844c71f0f2d77ed3ff1c Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 25 May 2012 13:45:38 +0200 Subject: [PATCH 2/3] Move messages forwarding mode setting into Preferences --- CHANGELOG | 1 + program/localization/en_US/labels.inc | 3 +++ program/steps/settings/func.inc | 12 ++++++++++++ program/steps/settings/save_prefs.inc | 1 + skins/default/includes/messagetoolbar.html | 12 +++--------- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5d11c5e23..5ce7196c3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Move messages forwarding mode setting into Preferences - Add is_escaped attribute for html_select and html_textarea (#1488485) - Fix HTML entities handling in HTML editor (#1488483) - Fix listing shared folders on Courier IMAP (#1488466) diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 277f1a954..94bae1974 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -457,6 +457,9 @@ $labels['spellcheckignorenums'] = 'Ignore words with numbers'; $labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized'; $labels['addtodict'] = 'Add to dictionary'; $labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links'; +$labels['forwardmode'] = 'Messages forwarding'; +$labels['inline'] = 'inline'; +$labels['asattachment'] = 'as attachment'; $labels['folder'] = 'Folder'; $labels['folders'] = 'Folders'; diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 5b9ad2601..2c2d17f21 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -614,6 +614,18 @@ function rcmail_user_prefs($current=null) ); } + if (!isset($no_override['forward_attachment'])) { + $field_id = 'rcmfd_forward_attachment'; + $select = new html_select(array('name' => '_forward_attachment', 'id' => $field_id)); + $select->add(rcube_label('inline'), 0); + $select->add(rcube_label('asattachment'), 1); + + $blocks['main']['options']['forward_attachment'] = array( + 'title' => html::label($field_id, Q(rcube_label('forwardmode'))), + 'content' => $select->show(intval($config['forward_attachment'])), + ); + } + if (!isset($no_override['default_font'])) { $field_id = 'rcmfd_default_font'; $fonts = rcube_fontdefs(); diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc index 797ffb615..88fa5298a 100644 --- a/program/steps/settings/save_prefs.inc +++ b/program/steps/settings/save_prefs.inc @@ -86,6 +86,7 @@ switch ($CURR_SECTION) 'strip_existing_sig' => isset($_POST['_strip_existing_sig']), 'sig_above' => !empty($_POST['_sig_above']) && !empty($_POST['_top_posting']), 'default_font' => get_input_value('_default_font', RCUBE_INPUT_POST), + 'forward_attachment' => !empty($_POST['_forward_attachment']), ); break; diff --git a/skins/default/includes/messagetoolbar.html b/skins/default/includes/messagetoolbar.html index 57bed8a34..3f4995b83 100644 --- a/skins/default/includes/messagetoolbar.html +++ b/skins/default/includes/messagetoolbar.html @@ -26,15 +26,9 @@
-
    -
  • - - -
    • -
  • - - -
    • +
      +
      • +
From fa5f3f26f938ec8ddf7db8e9401e0e4363decfb7 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Fri, 25 May 2012 16:30:57 +0200 Subject: [PATCH 3/3] Fix calls to renamed methods --- program/include/rcube_imap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index bfa84b4e0..84b0fc11f 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -2913,11 +2913,11 @@ class rcube_imap extends rcube_storage // get list of subscribed folders if ((strpos($folder, '%') === false) && (strpos($folder, '*') === false)) { - $a_subscribed = $this->_list_folders_subscribed('', $folder . $delm . '*'); + $a_subscribed = $this->list_folders_subscribed('', $folder . $delm . '*'); $subscribed = $this->folder_exists($folder, true); } else { - $a_subscribed = $this->_list_folders_subscribed(); + $a_subscribed = $this->list_folders_subscribed(); $subscribed = in_array($folder, $a_subscribed); }