Fixing several small bugs...

----------------------------------------------------------------------

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1905 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/config/conf.pl b/config/conf.pl
index 7ef3064733c4ac08bbebfbdadd0e651f56883f90..f61e5b50f307085cc24ece89b53768ab77d9d73c 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -1981,13 +1981,13 @@ sub set_defaults {
          
          $continue = 1;
       } elsif ($server eq "courier") {
          
          $continue = 1;
       } elsif ($server eq "courier") {

-         $default_folder_prefix = "mail/";
+         $default_folder_prefix = "INBOX.";

          $trash_folder = "Trash";
          $sent_folder = "Sent";
          $draft_folder = "Drafts";
          $trash_folder = "Trash";
          $sent_folder = "Sent";
          $draft_folder = "Drafts";

-         $show_prefix_option = true;
+         $show_prefix_option = false;

          $default_sub_of_inbox = false;
          $default_sub_of_inbox = false;

-         $show_contain_subfolders_option = true;
+         $show_contain_subfolders_option = false;

          $imap_server_type = "courier";
          $disp_default_folder_prefix = $default_folder_prefix;
 
          $imap_server_type = "courier";
          $disp_default_folder_prefix = $default_folder_prefix;
 

diff --git a/functions/mime.php b/functions/mime.php
index aee86e84971dd318d02e4a7b3606accbf7ce8b7a..9b65e9c9ab5431fd351cd8b499ec0541c0a0d1d9 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -790,7 +790,7 @@ class msg_header {
 
      // Encode only if the string contains 8-bit characters or =?
      $j = strlen( $string  );
 
      // Encode only if the string contains 8-bit characters or =?
      $j = strlen( $string  );

-     $l = FALSE;                             // Must be encoded ?
+     $l = strstr($string, '=?');         // Must be encoded ?

      $ret = '';
      for( $i=0; $i < $j; ++$i) {
         switch( $string{$i} ) {
      $ret = '';
      for( $i=0; $i < $j; ++$i) {
         switch( $string{$i} ) {


@@ -798,7 +798,6 @@ class msg_header {
           $ret .= '=3D';
           break;
        case '?':
           $ret .= '=3D';
           break;
        case '?':

-          $l = TRUE;

           $ret .= '=3F';
           break;
        case '_':
           $ret .= '=3F';
           break;
        case '_':

diff --git a/src/options_display.php b/src/options_display.php
index 5fd5c5ef2679df6d04829326da2e3e46162257e8..1ddaeb0cc58253c0e62b0ef079dac15c114d5bcd 100644 (file)
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -18,7 +18,7 @@ define('SMOPT_GRP_MESSAGE', 2);
 
 /* Define the optpage load function for the display options page. */
 function load_optpage_data_display() {
 
 /* Define the optpage load function for the display options page. */
 function load_optpage_data_display() {

-    global $theme, $languages, $js_autodetect_results;
+    global $theme, $language, $languages, $js_autodetect_results;

 
     /* Build a simple array into which we will build options. */
     $optgrps = array();
 
     /* Build a simple array into which we will build options. */
     $optgrps = array();


@@ -48,6 +48,7 @@ function load_optpage_data_display() {
         'save'    => 'save_option_theme'
     );
 
         'save'    => 'save_option_theme'
     );
 

+    $language = (!isset($language) || ($language == '') ? 'en' : $language);

     $language_values = array();
     foreach ($languages as $lang_key => $lang_attributes) {
         if (isset($lang_attributes['NAME'])) {
     $language_values = array();
     foreach ($languages as $lang_key => $lang_attributes) {
         if (isset($lang_attributes['NAME'])) {