Changeset 130 in subversion for trunk/roundcubemail/program/include/main.inc

Timestamp:

Feb 4, 2006 2:08:10 PM (7 years ago)

Author:

roundcube

Message:

Bugfixes for encoding and sending with attachments

File:

• trunk/roundcubemail/program/include/main.inc (modified) (5 diffs)

trunk/roundcubemail/program/include/main.inc

@@ -72 +72 @@
   // we can use the database for storing session data
   // session queries do not work with MDB2
-  if ($CONFIG['db_backend']!='mdb2' && is_object($DB) /* && $DB->db_provider!='sqlite' */)
+  if ($CONFIG['db_backend']!='mdb2' && is_object($DB))
     include_once('include/session.inc');
 
@@ -710 +710 @@
     
   // convert charset using iconv module  
-  if (function_exists('iconv') && $from!='UTF-7' && $to!='UTF-7') {
+  if (0 && function_exists('iconv') && $from!='UTF-7' && $to!='UTF-7') {
     return iconv($from, $to, $str);
     }
-    
+
+  $conv = new utf8();
+
   // convert string to UTF-8
   if ($from=='UTF-7')
@@ -721 +723 @@
   else if ($from!='UTF-8')
     {
-    $conv = new utf8($from);
+    $conv->loadCharset($from);
     $str = $conv->strToUtf8($str);
     }
@@ -732 +734 @@
   else if ($to!='UTF-8')
     {
-    $conv = new utf8($to);    
+    $conv->loadCharset($to);
     return $conv->utf8ToStr($str);
     }
@@ -961 +963 @@
         'messages' => 'rcmail_message_list',
         'messagecountdisplay' => 'rcmail_messagecount_display',
+        'quotadisplay' => 'rcmail_quota_display',
         'messageheaders' => 'rcmail_message_headers',
         'messagebody' => 'rcmail_message_body',