Changeset 6037 for trunk/expressoMail1_2

Timestamp:

04/26/12 11:43:10 (12 years ago)

Author:

marcosw

Message:

Ticket #2398 - Compatibilizacao com PHP-5.3 em alguns módulos do expresso

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_attachment.inc.php (modified) (1 diff)
• offline.php (modified) (1 diff)

trunk/expressoMail1_2/inc/class.imap_attachment.inc.php

@@ -93 +93 @@
                 $str = "";
                 foreach ($array as $key => $part)
-                        $str .= @eregi_replace("\{", "[",@eregi_replace("\}", "]",$part->text));
+                        $str .= @preg_replace('/\{\/i', '['',@preg_replace('\/\}/i', ']',$part->text));
                 
                 return $str;

trunk/expressoMail1_2/offline.php

@@ -129 +129 @@
         // Fix problem with cyrus delimiter changes in preferences.
         // Dots in names: enabled/disabled.
-        $save_in_folder = @eregi_replace("INBOX/", "INBOX".$_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter'], $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder']);
-        $save_in_folder = @eregi_replace("INBOX.", "INBOX".$_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter'], $save_in_folder);
+        $save_in_folder = @preg_replace('/INBOX//i', "INBOX".$_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter'], $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder']);
+        $save_in_folder = @preg_replace('/INBOX./i', "INBOX".$_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter'], $save_in_folder);
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] = $save_in_folder;
         // End Fix.