CS fixes

1 files changed, 118 insertions, 118 deletions

diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index 325c66ae8..f71eee39a 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -5,7 +5,7 @@
  | program/steps/settings/save_prefs.inc                                 |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2009, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -20,190 +20,190 @@
 */
 
 $CURR_SECTION = rcube_utils::get_input_value('_section', rcube_utils::INPUT_POST);
-
 $a_user_prefs = array();
 
 // set options for specified section
-switch ($CURR_SECTION)
-{
-  case 'general':
+switch ($CURR_SECTION) {
+case 'general':
     $a_user_prefs = array(
-      'language'     => isset($_POST['_language']) ? rcube_utils::get_input_value('_language', rcube_utils::INPUT_POST) : $CONFIG['language'],
-      'timezone'     => isset($_POST['_timezone']) ? rcube_utils::get_input_value('_timezone', rcube_utils::INPUT_POST) : $CONFIG['timezone'],
-      'date_format'  => isset($_POST['_date_format']) ? rcube_utils::get_input_value('_date_format', rcube_utils::INPUT_POST) : $CONFIG['date_format'],
-      'time_format'  => isset($_POST['_time_format']) ? rcube_utils::get_input_value('_time_format', rcube_utils::INPUT_POST) : ($CONFIG['time_format'] ? $CONFIG['time_format'] : 'H:i'),
-      'prettydate'   => isset($_POST['_pretty_date']) ? TRUE : FALSE,
-      'refresh_interval' => isset($_POST['_refresh_interval']) ? intval($_POST['_refresh_interval'])*60 : $CONFIG['refresh_interval'],
-      'standard_windows' => isset($_POST['_standard_windows']) ? TRUE : FALSE,
-      'skin'         => isset($_POST['_skin']) ? rcube_utils::get_input_value('_skin', rcube_utils::INPUT_POST) : $CONFIG['skin'],
+        'language'     => isset($_POST['_language']) ? rcube_utils::get_input_value('_language', rcube_utils::INPUT_POST) : $CONFIG['language'],
+        'timezone'     => isset($_POST['_timezone']) ? rcube_utils::get_input_value('_timezone', rcube_utils::INPUT_POST) : $CONFIG['timezone'],
+        'date_format'  => isset($_POST['_date_format']) ? rcube_utils::get_input_value('_date_format', rcube_utils::INPUT_POST) : $CONFIG['date_format'],
+        'time_format'  => isset($_POST['_time_format']) ? rcube_utils::get_input_value('_time_format', rcube_utils::INPUT_POST) : ($CONFIG['time_format'] ? $CONFIG['time_format'] : 'H:i'),
+        'prettydate'   => isset($_POST['_pretty_date']) ? true : false,
+        'refresh_interval' => isset($_POST['_refresh_interval']) ? intval($_POST['_refresh_interval'])*60 : $CONFIG['refresh_interval'],
+        'standard_windows' => isset($_POST['_standard_windows']) ? true : false,
+        'skin'         => isset($_POST['_skin']) ? rcube_utils::get_input_value('_skin', rcube_utils::INPUT_POST) : $CONFIG['skin'],
     );
 
     // compose derived date/time format strings
     if ((isset($_POST['_date_format']) || isset($_POST['_time_format'])) && $a_user_prefs['date_format'] && $a_user_prefs['time_format']) {
-      $a_user_prefs['date_short'] = 'D ' . $a_user_prefs['time_format'];
-      $a_user_prefs['date_long'] = $a_user_prefs['date_format'] . ' ' . $a_user_prefs['time_format'];
+        $a_user_prefs['date_short'] = 'D ' . $a_user_prefs['time_format'];
+        $a_user_prefs['date_long']  = $a_user_prefs['date_format'] . ' ' . $a_user_prefs['time_format'];
     }
 
-  break;
+    break;
 
-  case 'mailbox':
+case 'mailbox':
     $a_user_prefs = array(
-      'preview_pane'         => isset($_POST['_preview_pane']) ? TRUE : FALSE,
-      'preview_pane_mark_read' => isset($_POST['_preview_pane_mark_read']) ? intval($_POST['_preview_pane_mark_read']) : $CONFIG['preview_pane_mark_read'],
-      'autoexpand_threads'   => isset($_POST['_autoexpand_threads']) ? intval($_POST['_autoexpand_threads']) : 0,
-      'mdn_requests'         => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0,
-      'check_all_folders'    => isset($_POST['_check_all_folders']) ? TRUE : FALSE,
-      'mail_pagesize'        => is_numeric($_POST['_mail_pagesize']) ? max(2, intval($_POST['_mail_pagesize'])) : $CONFIG['mail_pagesize'],
+        'preview_pane'         => isset($_POST['_preview_pane']) ? true : false,
+        'preview_pane_mark_read' => isset($_POST['_preview_pane_mark_read']) ? intval($_POST['_preview_pane_mark_read']) : $CONFIG['preview_pane_mark_read'],
+        'autoexpand_threads'   => isset($_POST['_autoexpand_threads']) ? intval($_POST['_autoexpand_threads']) : 0,
+        'mdn_requests'         => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0,
+        'check_all_folders'    => isset($_POST['_check_all_folders']) ? true : false,
+        'mail_pagesize'        => is_numeric($_POST['_mail_pagesize']) ? max(2, intval($_POST['_mail_pagesize'])) : $CONFIG['mail_pagesize'],
     );
 
-  break;
+    break;
 
-  case 'mailview':
+case 'mailview':
     $a_user_prefs = array(
-      'message_extwin'  => intval($_POST['_message_extwin']),
-      'message_show_email' => isset($_POST['_message_show_email']) ? TRUE : FALSE,
-      'prefer_html'     => isset($_POST['_prefer_html']) ? TRUE : FALSE,
-      'inline_images'   => isset($_POST['_inline_images']) ? TRUE : FALSE,
-      'show_images'     => isset($_POST['_show_images']) ? intval($_POST['_show_images']) : 0,
-      'display_next'    => isset($_POST['_display_next']) ? TRUE : FALSE,
-      'default_charset' => rcube_utils::get_input_value('_default_charset', rcube_utils::INPUT_POST),
+        'message_extwin'  => intval($_POST['_message_extwin']),
+        'message_show_email' => isset($_POST['_message_show_email']) ? true : false,
+        'prefer_html'     => isset($_POST['_prefer_html']) ? true : false,
+        'inline_images'   => isset($_POST['_inline_images']) ? true : false,
+        'show_images'     => isset($_POST['_show_images']) ? intval($_POST['_show_images']) : 0,
+        'display_next'    => isset($_POST['_display_next']) ? true : false,
+        'default_charset' => rcube_utils::get_input_value('_default_charset', rcube_utils::INPUT_POST),
     );
 
-  break;
+    break;
 
-  case 'compose':
+case 'compose':
     $a_user_prefs = array(
-      'compose_extwin'     => intval($_POST['_compose_extwin']),
-      'htmleditor'         => intval($_POST['_htmleditor']),
-      'draft_autosave'     => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0,
-      'mime_param_folding' => isset($_POST['_mime_param_folding']) ? intval($_POST['_mime_param_folding']) : 0,
-      'force_7bit'         => isset($_POST['_force_7bit']) ? TRUE : FALSE,
-      'mdn_default'        => isset($_POST['_mdn_default']) ? TRUE : FALSE,
-      'dsn_default'        => isset($_POST['_dsn_default']) ? TRUE : FALSE,
-      'reply_same_folder'  => isset($_POST['_reply_same_folder']) ? TRUE : FALSE,
-      'spellcheck_before_send' => isset($_POST['_spellcheck_before_send']) ? TRUE : FALSE,
-      'spellcheck_ignore_syms' => isset($_POST['_spellcheck_ignore_syms']) ? TRUE : FALSE,
-      'spellcheck_ignore_nums' => isset($_POST['_spellcheck_ignore_nums']) ? TRUE : FALSE,
-      'spellcheck_ignore_caps' => isset($_POST['_spellcheck_ignore_caps']) ? TRUE : FALSE,
-      'show_sig'           => isset($_POST['_show_sig']) ? intval($_POST['_show_sig']) : 1,
-      'reply_mode'         => isset($_POST['_reply_mode']) ? intval($_POST['_reply_mode']) : 0,
-      'strip_existing_sig' => isset($_POST['_strip_existing_sig']),
-      'default_font'       => rcube_utils::get_input_value('_default_font', rcube_utils::INPUT_POST),
-      'default_font_size'  => rcube_utils::get_input_value('_default_font_size', rcube_utils::INPUT_POST),
-      'reply_all_mode'     => intval($_POST['_reply_all_mode']),
-      'forward_attachment' => !empty($_POST['_forward_attachment']),
+        'compose_extwin'     => intval($_POST['_compose_extwin']),
+        'htmleditor'         => intval($_POST['_htmleditor']),
+        'draft_autosave'     => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0,
+        'mime_param_folding' => isset($_POST['_mime_param_folding']) ? intval($_POST['_mime_param_folding']) : 0,
+        'force_7bit'         => isset($_POST['_force_7bit']) ? true : false,
+        'mdn_default'        => isset($_POST['_mdn_default']) ? true : false,
+        'dsn_default'        => isset($_POST['_dsn_default']) ? true : false,
+        'reply_same_folder'  => isset($_POST['_reply_same_folder']) ? true : false,
+        'spellcheck_before_send' => isset($_POST['_spellcheck_before_send']) ? true : false,
+        'spellcheck_ignore_syms' => isset($_POST['_spellcheck_ignore_syms']) ? true : false,
+        'spellcheck_ignore_nums' => isset($_POST['_spellcheck_ignore_nums']) ? true : false,
+        'spellcheck_ignore_caps' => isset($_POST['_spellcheck_ignore_caps']) ? true : false,
+        'show_sig'           => isset($_POST['_show_sig']) ? intval($_POST['_show_sig']) : 1,
+        'reply_mode'         => isset($_POST['_reply_mode']) ? intval($_POST['_reply_mode']) : 0,
+        'strip_existing_sig' => isset($_POST['_strip_existing_sig']),
+        'default_font'       => rcube_utils::get_input_value('_default_font', rcube_utils::INPUT_POST),
+        'default_font_size'  => rcube_utils::get_input_value('_default_font_size', rcube_utils::INPUT_POST),
+        'reply_all_mode'     => intval($_POST['_reply_all_mode']),
+        'forward_attachment' => !empty($_POST['_forward_attachment']),
     );
 
-  break;
+    break;
 
-  case 'addressbook':
+case 'addressbook':
     $a_user_prefs = array(
-      'default_addressbook'  => rcube_utils::get_input_value('_default_addressbook', rcube_utils::INPUT_POST, true),
-      'autocomplete_single'  => isset($_POST['_autocomplete_single']) ? TRUE : FALSE,
-      'addressbook_sort_col' => rcube_utils::get_input_value('_addressbook_sort_col', rcube_utils::INPUT_POST),
-      'addressbook_name_listing' => intval(rcube_utils::get_input_value('_addressbook_name_listing', rcube_utils::INPUT_POST)),
-      'addressbook_pagesize' => is_numeric($_POST['_addressbook_pagesize']) ? max(2, intval($_POST['_addressbook_pagesize'])) : $CONFIG['addressbook_pagesize'],
+        'default_addressbook'  => rcube_utils::get_input_value('_default_addressbook', rcube_utils::INPUT_POST, true),
+        'autocomplete_single'  => isset($_POST['_autocomplete_single']) ? true : false,
+        'addressbook_sort_col' => rcube_utils::get_input_value('_addressbook_sort_col', rcube_utils::INPUT_POST),
+        'addressbook_name_listing' => intval(rcube_utils::get_input_value('_addressbook_name_listing', rcube_utils::INPUT_POST)),
+        'addressbook_pagesize' => is_numeric($_POST['_addressbook_pagesize']) ? max(2, intval($_POST['_addressbook_pagesize'])) : $CONFIG['addressbook_pagesize'],
     );
 
-  break;
+    break;
 
-  case 'server':
+case 'server':
     $a_user_prefs = array(
-      'read_when_deleted' => isset($_POST['_read_when_deleted']) ? TRUE : FALSE,
-      'skip_deleted'      => isset($_POST['_skip_deleted']) ? TRUE : FALSE,
-      'flag_for_deletion' => isset($_POST['_flag_for_deletion']) ? TRUE : FALSE,
-      'delete_always' 	  => isset($_POST['_delete_always']) ? TRUE : FALSE,
-      'delete_junk' 	  => isset($_POST['_delete_junk']) ? TRUE : FALSE,
-      'logout_purge'      => isset($_POST['_logout_purge']) ? TRUE : FALSE,
-      'logout_expunge'    => isset($_POST['_logout_expunge']) ? TRUE : FALSE,
+        'read_when_deleted' => isset($_POST['_read_when_deleted']) ? true : false,
+        'skip_deleted'      => isset($_POST['_skip_deleted']) ? true : false,
+        'flag_for_deletion' => isset($_POST['_flag_for_deletion']) ? true : false,
+        'delete_always'     => isset($_POST['_delete_always']) ? true : false,
+        'delete_junk'       => isset($_POST['_delete_junk']) ? true : false,
+        'logout_purge'      => isset($_POST['_logout_purge']) ? true : false,
+        'logout_expunge'    => isset($_POST['_logout_expunge']) ? true : false,
     );
 
-  break;
+    break;
 
-  case 'folders':
+case 'folders':
     $a_user_prefs = array(
-      'show_real_foldernames'  =>
-      isset($_POST['_show_real_foldernames']) ? TRUE : FALSE,
-      'drafts_mbox' => rcube_utils::get_input_value('_drafts_mbox', rcube_utils::INPUT_POST, true),
-      'sent_mbox'   => rcube_utils::get_input_value('_sent_mbox', rcube_utils::INPUT_POST, true),
-      'junk_mbox'   => rcube_utils::get_input_value('_junk_mbox', rcube_utils::INPUT_POST, true),
-      'trash_mbox'  => rcube_utils::get_input_value('_trash_mbox', rcube_utils::INPUT_POST, true),
+        'show_real_foldernames' => isset($_POST['_show_real_foldernames']) ? true : false,
+        'drafts_mbox' => rcube_utils::get_input_value('_drafts_mbox', rcube_utils::INPUT_POST, true),
+        'sent_mbox'   => rcube_utils::get_input_value('_sent_mbox', rcube_utils::INPUT_POST, true),
+        'junk_mbox'   => rcube_utils::get_input_value('_junk_mbox', rcube_utils::INPUT_POST, true),
+        'trash_mbox'  => rcube_utils::get_input_value('_trash_mbox', rcube_utils::INPUT_POST, true),
     );
 
-  break;
+    break;
 }
 
 $plugin = rcmail::get_instance()->plugins->exec_hook('preferences_save',
-  array('prefs' => $a_user_prefs, 'section' => $CURR_SECTION));
+    array('prefs' => $a_user_prefs, 'section' => $CURR_SECTION));
 
 $a_user_prefs = $plugin['prefs'];
 
 // don't override these parameters
-foreach ((array)$CONFIG['dont_override'] as $p)
-  $a_user_prefs[$p] = $CONFIG[$p];
+foreach ((array)$CONFIG['dont_override'] as $p) {
+    $a_user_prefs[$p] = $CONFIG[$p];
+}
 
 
 // verify some options
-switch ($CURR_SECTION)
-{
-  case 'general':
-
+switch ($CURR_SECTION) {
+case 'general':
     // switch UI language
     if (isset($_POST['_language']) && $a_user_prefs['language'] != $_SESSION['language']) {
-      $RCMAIL->load_language($a_user_prefs['language']);
-      $OUTPUT->command('reload', 500);
+        $RCMAIL->load_language($a_user_prefs['language']);
+        $OUTPUT->command('reload', 500);
     }
 
     // switch skin (if valid, otherwise unset the pref and fall back to default)
     if (!$OUTPUT->set_skin($a_user_prefs['skin']))
-      unset($a_user_prefs['skin']);
+        unset($a_user_prefs['skin']);
     else if ($RCMAIL->config->get('skin') != $a_user_prefs['skin'])
-      $OUTPUT->command('reload', 500);
+        $OUTPUT->command('reload', 500);
 
     $a_user_prefs['timezone'] = (string) $a_user_prefs['timezone'];
 
     if (!empty($a_user_prefs['refresh_interval']) && !empty($CONFIG['min_refresh_interval'])) {
-      if ($a_user_prefs['refresh_interval'] < $CONFIG['min_refresh_interval']) {
-        $a_user_prefs['refresh_interval'] = $CONFIG['min_refresh_interval'];
-      }
+        if ($a_user_prefs['refresh_interval'] < $CONFIG['min_refresh_interval']) {
+            $a_user_prefs['refresh_interval'] = $CONFIG['min_refresh_interval'];
+        }
     }
 
     break;
 
-  case 'mailbox':
-
+case 'mailbox':
     // force min size
-    if ($a_user_prefs['mail_pagesize'] < 1)
-      $a_user_prefs['mail_pagesize'] = 10;
+    if ($a_user_prefs['mail_pagesize'] < 1) {
+        $a_user_prefs['mail_pagesize'] = 10;
+    }
 
-    if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['mail_pagesize'] > $CONFIG['max_pagesize']))
-      $a_user_prefs['mail_pagesize'] = (int) $CONFIG['max_pagesize'];
+    if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['mail_pagesize'] > $CONFIG['max_pagesize'])) {
+        $a_user_prefs['mail_pagesize'] = (int) $CONFIG['max_pagesize'];
+    }
 
     break;
 
-  case 'addressbook':
-
+case 'addressbook':
     // force min size
-    if ($a_user_prefs['addressbook_pagesize'] < 1)
-      $a_user_prefs['addressbook_pagesize'] = 10;
+    if ($a_user_prefs['addressbook_pagesize'] < 1) {
+        $a_user_prefs['addressbook_pagesize'] = 10;
+    }
 
-    if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['addressbook_pagesize'] > $CONFIG['max_pagesize']))
-      $a_user_prefs['addressbook_pagesize'] = (int) $CONFIG['max_pagesize'];
+    if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['addressbook_pagesize'] > $CONFIG['max_pagesize'])) {
+        $a_user_prefs['addressbook_pagesize'] = (int) $CONFIG['max_pagesize'];
+    }
 
     break;
 
-  case 'folders':
-
+case 'folders':
     // special handling for 'default_folders'
     if (in_array('default_folders', (array)$CONFIG['dont_override'])) {
-      foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p)
-        $a_user_prefs[$p] = $CONFIG[$p];
-    } else {
-      $a_user_prefs['default_folders'] = array('INBOX');
-      foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) {
-        if ($a_user_prefs[$p])
-          $a_user_prefs['default_folders'][] = $a_user_prefs[$p];
-      }
+        foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) {
+            $a_user_prefs[$p] = $CONFIG[$p];
+        }
+    }
+    else {
+        $a_user_prefs['default_folders'] = array('INBOX');
+        foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) {
+            if ($a_user_prefs[$p]) {
+                $a_user_prefs['default_folders'][] = $a_user_prefs[$p];
+            }
+        }
     }
 
     break;
@@ -211,14 +211,14 @@ switch ($CURR_SECTION)
 
 // Save preferences
 if (!$plugin['abort'])
-  $saved = $RCMAIL->user->save_prefs($a_user_prefs);
+    $saved = $RCMAIL->user->save_prefs($a_user_prefs);
 else
-  $saved = $plugin['result'];
+    $saved = $plugin['result'];
 
 if ($saved)
-  $OUTPUT->show_message('successfullysaved', 'confirmation');
+    $OUTPUT->show_message('successfullysaved', 'confirmation');
 else
-  $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');
+    $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');
 
 // display the form again
 $RCMAIL->overwrite_action('edit-prefs');