Changeset 6037

Timestamp:

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

Author:

marcosw

Message:

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

Location:

trunk

Files:

• calendar/inc/class.boicalendar.inc.php (modified) (5 diffs)
• expressoMail1_2/inc/class.imap_attachment.inc.php (modified) (1 diff)
• expressoMail1_2/offline.php (modified) (1 diff)
• filemanager/inc/class.bofilemanager.inc.php (modified) (4 diffs)
• mobile/inc/class.ui_mobilemail.inc.php (modified) (1 diff)
• phpgwapi/inc/class.interserver.inc.php (modified) (1 diff)
• phpgwapi/inc/class.sessions.inc.php (modified) (1 diff)
• phpgwapi/inc/class.xml.inc.php (modified) (1 diff)
• workflow/inc/class.bo_adminjobs.inc.php (modified) (1 diff)
• workflow/inc/class.bo_utils.inc.php (modified) (1 diff)
• workflow/inc/class.powergraphic.inc.php (modified) (1 diff)

trunk/calendar/inc/class.boicalendar.inc.php

@@ -2383 +2383 @@
                                         //                                              if(preg_match('/D/', $_f_['day_raw']))
                                         if (strstr($_f_['day_raw'], 'D')) {
-                                                        $dur['days'] = eregi_replace("([0-9]+)D(.*)", "\\1", $_f_['day_raw']);
+                                                        $dur['days'] = preg_replace('/([0-9]+)D(.*)/i', '\\1', $_f_['day_raw']);
                                                 }
 
@@ -2389 +2389 @@
                                         //                                              if(preg_match('/W/', $_f_["day_raw"]))
                                         if (strstr($_f_['day_raw'], 'W')) {
-                                                        $dur['weeks'] = eregi_replace("([^|.*]+D)?([0-9]+)W", "\\2", $_f_['day_raw']);
+                                                        $dur['weeks'] = preg_replace('/([^|.*]+D)?([0-9]+)W/i', '\\2', $_f_['day_raw']);
                                                 }
                                         }
@@ -2398 +2398 @@
                                         //                                              if(preg_match('/H/', $_f_["time_raw"]))
                                         if (strstr($_f_['time_raw'], 'H')) {
-                                                        $dur['hours'] = eregi_replace("([0-9]+)H(.*)", "\\1", $_f_['time_raw']);
+                                                        $dur['hours'] = preg_replace('/([0-9]+)H(.*)/i', '\\1', $_f_['time_raw']);
                                                 }
 
@@ -2405 +2405 @@
                                         //                                              if(preg_match('/M/', $_f_["time_raw"]))
                                         if (strstr($_f_['time_raw'], 'M')) {
-                                                        $dur['minutes'] = eregi_replace("([^|.*]+H)?([0-9]+)M(.*)", "\\2", $_f_['time_raw']);
+                                                        $dur['minutes'] = preg_replace('/([^|.*]+H)?([0-9]+)M(.*)/i', '\\2', $_f_['time_raw']);
                                                 }
 
@@ -2412 +2412 @@
                                         //                                              if(preg_match('/S/', $_f_["time_raw"]) )
                                         if (strstr($_f_['time_raw'], 'S')) {
-                                                        $dur['seconds'] = eregi_replace("([^|.*]+M)?([0-9]+)S(.*)", "\\2", $_f_['time_raw']);
+                                                        $dur['seconds'] = preg_replace('/([^|.*]+M)?([0-9]+)S(.*)/i', '\\2', $_f_['time_raw']);
                                                 }
                                         }

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.

trunk/filemanager/inc/class.bofilemanager.inc.php

@@ -138 +138 @@
                         if ($all)
                         {
-                                if (preg_match("-([\\/<>\|\'\"\&])-", $string, $badchars))
+                                if (preg_match('/-([\\/<>\|\'\"\&])-/', $string, $badchars))
                                 $rstring = $badchars[1];
                         }
                         else
                         {
-                                if (preg_match("-([\\/<>])-", $string, $badchars))
+                                if (preg_match('/-([\\/<>])-/', $string, $badchars))
                                 $rstring = $badchars[1];
                         }
@@ -212 +212 @@
                 {
                         //var_dump($string);
-                        if (preg_match ("/=(.*)(&|$)/U", $string))
+                        if (preg_match('/\/=(.*)(&|$)\/U/', $string))
                         {
                                 $rstring = $string;
@@ -228 +228 @@
                         }
                         elseif ($this->hostname != "" && preg_match("/^$this->hostname/", $string))
-//                      elseif (ereg ('^'.$this->hostname, $string))
+//                      elseif (preg_match ("/^$this->hostname/", $string))
                         {
                                 $rstring = preg_replace("/^$this->hostname\//", '', $string);
@@ -239 +239 @@
 
                                 /* Terrible hack, decodes all /'s back to normal */  
-                                $rstring = preg_replace ("/%2F/", '/', $rstring);
+                                $rstring = preg_replace('/%2F/', '/', $rstring);
                         }
 

trunk/mobile/inc/class.ui_mobilemail.inc.php

@@ -317 +317 @@
                         // 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.

trunk/phpgwapi/inc/class.interserver.inc.php

@@ -81 +81 @@
                 function interserver($serverid='')
                 {
-                        $url = eregi_replace('https*://[^/]*/','',$GLOBALS['phpgw_info']['server']['webserver_url']);
+                        $url = preg_replace('/https*:\/\/[^\/]*\//i','',$GLOBALS['phpgw_info']['server']['webserver_url']);
                         $this->urlparts = array(
                                 'xmlrpc' => $url.'/xmlrpc.php',

trunk/phpgwapi/inc/class.sessions.inc.php

@@ -1184 +1184 @@
                                                 if( preg_match('/\[\]/i', $b[0]) )
                                                 {
-                                                        $b[0] = eregi_replace("\[\]", "[$i]", $b[0]);
+                                                        $b[0] = preg_replace('/\[\]/i', "[$i]", $b[0]);
                                                 }
                                         }

trunk/phpgwapi/inc/class.xml.inc.php

@@ -3378 +3378 @@
                         
                         // Replace the last separator.
-                        $command = eregi_replace(", $", ");", $command);
+                        $command = preg_replace('/, $/i', ');', $command);
                         
                         // Execute the command.

trunk/workflow/inc/class.bo_adminjobs.inc.php

@@ -109 +109 @@
                 foreach ($logs as $key => $value)
                 {
-                        $logs[$key]['date_time'] = ereg_replace("([[:digit:]]{4})-([[:digit:]]{2})-([[:digit:]]{2}) ([[:digit:]]{2}):([[:digit:]]{2}):00", '\3/\2/\1 \4h\5', $value['date_time']);
+                        $logs[$key]['date_time'] = preg_replace('/([[:digit:]]{4})-([[:digit:]]{2})-([[:digit:]]{2}) ([[:digit:]]{2}):([[:digit:]]{2}):00/', '\3/\2/\1 \4h\5', $value['date_time']);
                         $currentDate = $value['date_time'];
                         if (isset($writtenDates[substr($logs[$key]['date_time'], 0, 10)]))

trunk/workflow/inc/class.bo_utils.inc.php

@@ -66 +66 @@
         { 
                 // parâmetro a ser procurado no ldap
-                $cn = trim(ereg_replace(' +', ' ', $params['cn']));
+                $cn = trim(preg_replace('/ +/', ' ', $params['cn']));
 
                 $output           = array();

trunk/workflow/inc/class.powergraphic.inc.php

@@ -1143 +1143 @@
                     $this->color['line_2'] = imagecolorallocate($this->img, 220, 200,  50);
                 }
-                else if (ereg("^(5|6)$", $this->type))
+                else if (preg_match('/^(5|6)$/', $this->type))
                 {
                     $this->color['arc_1']        = imagecolorallocate($this->img, 100, 150, 200);