Changeset 5934 for trunk/workflow

Timestamp:

04/12/12 15:18:08 (12 years ago)

Author:

marcosw

Message:

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

Location:

trunk/workflow/inc

Files:

• class.BrowserInfo.inc.php (modified) (2 diffs)
• class.utils.php (modified) (1 diff)
• class.utils.string.php (modified) (3 diffs)
• phplot/phplot.php (modified) (1 diff)

trunk/workflow/inc/class.BrowserInfo.inc.php

@@ -271 +271 @@
 
                 // clean up extraneous garbage that may be in the name
-                $bd['browser'] = ereg_replace("[^a-z,A-Z]", "", $bd['browser']);
+                $bd['browser'] = preg_replace('/[^a-z,A-Z]/', '', $bd['browser']);
                 // clean up extraneous garbage that may be in the version
-                $bd['version'] = ereg_replace("[^0-9,.,a-z,A-Z]", "", $bd['version']);
+                $bd['version'] = preg_replace('/[^0-9,.,a-z,A-Z]/', '', $bd['version']);
 
                 // check for AOL
@@ -280 +280 @@
                         $var = stristr($agent, "AOL");
                         $var = explode(" ", $var);
-                        $bd['aol'] = ereg_replace("[^0-9,.,a-z,A-Z]", "", $var[1]);
+                        $bd['aol'] = preg_replace('/[^0-9,.,a-z,A-Z]/', '', $var[1]);
                 }
 

trunk/workflow/inc/class.utils.php

@@ -389 +389 @@
                 }
                 foreach ($jsEvents as $event => $action)
-                        $scriptStr .= " $event=\"" . ereg_replace("\"", "'", $action) . "\"";
+                        $scriptStr .= " $event=\"" . preg_replace("/\"/", "'", $action) . "\"";
                 return sprintf("<a href=\"%s\"%s%s%s%s%s%s%s%s>%s</a>", htmlentities($url),
                         (!empty($name) ? " name=\"{$name}\"" : ""),

trunk/workflow/inc/class.utils.string.php

@@ -30 +30 @@
          */
         function stripBlank($str, $replace=' ') {
-                return ereg_replace("[[:blank:]]{1,}", $replace, $str);
+                return preg_replace('/[[:blank:]]{1,}/', $replace, $str);
         }
         
@@ -405 +405 @@
                 switch ($filterType) {
                         case 'alpha' :
-                                return (ereg_replace("[^a-zA-Z]", $replaceStr, $str));
+                                return (preg_replace('/[^a-zA-Z]/', $replaceStr, $str));
                         case 'alphalower' :
-                                return (ereg_replace("[^a-z]", $replaceStr, $str));
+                                return (preg_replace('/[^a-z]/', $replaceStr, $str));
                         case 'alphaupper' :
-                                return (ereg_replace("[^A-Z]", $replaceStr, $str));
+                                return (preg_replace('/[^A-Z]/', $replaceStr, $str));
                         case 'num' :
-                                return (ereg_replace("[^0-9]", $replaceStr, $str));
+                                return (preg_replace('/[^0-9]/', $replaceStr, $str));
                         case 'alphanum' :
-                                return (ereg_replace("[^0-9a-zA-Z]", $replaceStr, $str));
+                                return (preg_replace('/[^0-9a-zA-Z]/', $replaceStr, $str));
                         case 'htmlentities' :
-                                return (ereg_replace("&[[:alnum:]]{0,};", $replaceStr, $str));
+                                return (preg_replace('/&[[:alnum:]]{0,};/', $replaceStr, $str));
                         case 'blank' :
-                                return (ereg_replace("[[:blank:]]{1,}", $replaceStr, $str));
+                                return (preg_replace('/[[:blank:]]{1,}/', $replaceStr, $str));
                         default :
                                 return $str;
@@ -625 +625 @@
          */
         function wrap($str, $num, $breakString="\n") {
-                $str = ereg_replace("([^\r\n])\r\n([^\r\n])", "\\1 \\2", $str);
-                $str = ereg_replace("[\r\n]*\r\n[\r\n]*", "\r\n\r\n", $str);
-                $str = ereg_replace("[ ]* [ ]*", ' ', $str);
+                $str = preg_replace('/([^\r\n])\r\n([^\r\n])/', "\\1 \\2", $str);
+                $str = preg_replace('/[\r\n]*\r\n[\r\n]*/', "\r\n\r\n", $str);
+                $str = preg_replace('/[ ]* [ ]*/', ' ', $str);
                 $str = stripslashes($str);
                 $processed = '';

trunk/workflow/inc/phplot/phplot.php

@@ -941 +941 @@
         else {
             // Split the text by its lines, and count them
-            $which_text = ereg_replace("\r", "", $which_text);
+            $which_text = preg_replace('/\r/', '', $which_text);
             $str = split("\n", $which_text);
             $nlines = count($str);