Removed extra <> around RCPT TO addresses that made some mail-servers fail.

[squirrelmail.git] / functions / i18n.php

diff --git a/functions/i18n.php b/functions/i18n.php
index e7a9a8e9fde2bad3cdea98cdafae791c4ef956f3..b3e54477d582d5e12b9f95941918e60bfec2e32e 100644 (file)
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -22,6 +22,9 @@
    $languages['ca']['NAME']    = 'Catalan';
    $languages['ca']['CHARSET'] = 'iso-8859-1';
 
+   $languages['hr']['NAME']    = 'Croatian';
+   $languages['hr']['CHARSET'] = 'iso-8859-2';
+
    $languages['cs_CZ']['NAME']    = 'Czech';
    $languages['cs_CZ']['CHARSET'] = 'iso-8859-2';
    
@@ -40,6 +43,12 @@
    $languages['fi']['NAME']    = 'Finnish';
    $languages['fi']['CHARSET'] = 'iso-8859-1';
 
+   $languages['hu']['NAME']    = 'Hungarian';
+   $languages['hu']['CHARSET'] = 'iso-8859-1';
+
+   $languages['is']['NAME']    = 'Icelandic';
+   $languages['is']['CHARSET'] = 'iso-8859-1';
+   
    $languages['it']['NAME']    = 'Italian';
    $languages['it']['CHARSET'] = 'iso-8859-1';
   
@@ -756,14 +765,16 @@
       if ($SetupAlready)
          return;
       $SetupAlready = 1;
-     
+      
+      $charset_headers_sent=false;
+      
       if ($do_search && ! $sm_language && isset($HTTP_ACCEPT_LANGUAGE)) {
          $sm_language = substr($HTTP_ACCEPT_LANGUAGE, 0, 2);
       }
 
       if (isset($sm_language) && $use_gettext &&
          $squirrelmail_language != '' &&
-         $languages[$sm_language]['CHARSET']) {
+        isset($languages[$sm_language]['CHARSET'])) {
          if ((ini_get('safe_mode') == FALSE) && (getenv('LC_ALL') != $sm_language)) {
            putenv('LC_ALL=' . $sm_language);
          }
@@ -771,6 +782,26 @@
          bindtextdomain('squirrelmail', '../locale/');
          textdomain('squirrelmail');
          header ('Content-Type: text/html; charset=' . $languages[$sm_language]['CHARSET']);
+         $charset_headers_sent=true;
       }
+      return $charset_headers_sent;
+   }
+
+   function set_my_charset(){
+     //
+     // There can be a $default_charset setting in the
+     // config.php file, but the user may have a different language
+     // selected for a user interface. This function checks the
+     // language selected by the user and tags the outgoing messages 
+     // with the appropriate charset corresponding to the language
+     // selection. This is "more right" (tm), than just stamping the 
+     // message blindly with the system-wide $default_charset.
+     //
+     global $data_dir, $username, $default_charset, $languages;
+     $my_language = getPref($data_dir, $username, "language");
+     if (!$my_language) return;
+     $my_charset=$languages[$my_language]['CHARSET'];
+     if ($my_charset) $default_charset=$my_charset;
    }
+
 ?>