Changeset 5928 for trunk/workflow

Timestamp:

04/12/12 11:15:33 (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) (18 diffs)
• class.bo_utils.inc.php (modified) (1 diff)
• class.utils.security.php (modified) (1 diff)
• fpdf/font/makefont/makefont.php (modified) (1 diff)
• local/classes/class.wf_instance.php (modified) (1 diff)
• local/classes/class.wf_regex.php (modified) (1 diff)
• phplot/phplot.php (modified) (1 diff)

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

@@ -71 +71 @@
 
                 // find operating system
-                if (eregi("win", $agent))
+                if (preg_match('/win/i', $agent))
                         $bd['platform'] = "Windows";
-                elseif (eregi("mac", $agent))
+                elseif (preg_match('/mac/i', $agent))
                         $bd['platform'] = "MacIntosh";
-                elseif (eregi("linux", $agent))
+                elseif (preg_match('/linux/i', $agent))
                         $bd['platform'] = "Linux";
-                elseif (eregi("OS/2", $agent))
+                elseif (preg_match('/OS\/2/i', $agent))
                         $bd['platform'] = "OS/2";
-                elseif (eregi("BeOS", $agent))
+                elseif (preg_match('/BeOS/i', $agent))
                         $bd['platform'] = "BeOS";
 
                 // test for Opera
-                if (eregi("opera",$agent))
+                if (preg_match('/opera/i',$agent))
                 {
                         $val = stristr($agent, "opera");
-                        if (eregi("/", $val))
+                        if (preg_match('/\//i', $val))
                         {
                                 $val = explode("/",$val);
@@ -102 +102 @@
                 // test for WebTV
                 }
-                elseif (eregi("webtv",$agent))
+                elseif (preg_match('/webtv/i',$agent))
                 {
                         $val = explode("/",stristr($agent,"webtv"));
@@ -110 +110 @@
                 // test for MS Internet Explorer version 1
                 }
-                elseif (eregi("microsoft internet explorer", $agent))
+                elseif (preg_match('/microsoft internet explorer/i', $agent))
                 {
                         $bd['browser'] = "MSIE";
@@ -120 +120 @@
                 // test for NetPositive
                 }
-                elseif (eregi("NetPositive", $agent))
+                elseif (preg_match('/NetPositive/i', $agent))
                 {
                         $val = explode("/",stristr($agent,"NetPositive"));
@@ -129 +129 @@
                 // test for MS Internet Explorer
                 }
-                elseif (eregi("msie",$agent) && !eregi("opera",$agent))
+                elseif (preg_match('/msie/i',$agent) && !preg_match('/opera/i',$agent))
                 {
                         $val = explode(" ",stristr($agent,"msie"));
@@ -137 +137 @@
                 // test for MS Pocket Internet Explorer
                 }
-                elseif (eregi("mspie",$agent) || eregi('pocket', $agent))
+                elseif (preg_match('/mspie/i',$agent) || preg_match('/pocket/i', $agent))
                 {
                         $val = explode(" ",stristr($agent,"mspie"));
                         $bd['browser'] = "MSPIE";
                         $bd['platform'] = "WindowsCE";
-                        if (eregi("mspie", $agent))
+                        if (preg_match('/mspie/i', $agent))
                                 $bd['version'] = $val[1];
                         else
@@ -152 +152 @@
                 // test for Galeon
                 }
-                elseif (eregi("galeon",$agent))
+                elseif (preg_match('/galeon/i',$agent))
                 {
                         $val = explode(" ",stristr($agent,"galeon"));
@@ -161 +161 @@
                 // test for Konqueror
                 }
-                elseif (eregi("Konqueror",$agent))
+                elseif (preg_match('/Konqueror/i',$agent))
                 {
                         $val = explode(" ",stristr($agent,"Konqueror"));
@@ -170 +170 @@
                 // test for iCab
                 }
-                elseif (eregi("icab",$agent))
+                elseif (preg_match('/icab/i',$agent))
                 {
                         $val = explode(" ",stristr($agent,"icab"));
@@ -178 +178 @@
                 // test for OmniWeb
                 }
-                elseif (eregi("omniweb",$agent))
+                elseif (preg_match('/omniweb/i',$agent))
                 {
                         $val = explode("/",stristr($agent,"omniweb"));
@@ -186 +186 @@
                 // test for Phoenix
                 }
-                elseif (eregi("Phoenix", $agent))
+                elseif (preg_match('/Phoenix/i', $agent))
                 {
                         $bd['browser'] = "Phoenix";
@@ -194 +194 @@
                 // test for Firebird
                 }
-                elseif (eregi("firebird", $agent))
+                elseif (preg_match('/firebird/i', $agent))
                 {
                         $bd['browser']="Firebird";
@@ -203 +203 @@
                 // test for Firefox
                 }
-                elseif (eregi("Firefox", $agent))
+                elseif (preg_match('/Firefox/i', $agent))
                 {
                         $bd['browser']="Firefox";
@@ -212 +212 @@
           // test for Mozilla Alpha/Beta Versions
                 }
-                elseif (eregi("mozilla",$agent) && eregi("rv:[0-9].[0-9][a-b]",$agent) && !eregi("netscape",$agent))
+                elseif (preg_match('/mozilla/i',$agent) && preg_match('/rv:[0-9].[0-9][a-b]/i',$agent) && !preg_match('/netscape/i',$agent))
                 {
                         $bd['browser'] = "Mozilla";
                         $val = explode(" ",stristr($agent,"rv:"));
-                        eregi("rv:[0-9].[0-9][a-b]",$agent,$val);
+                        preg_match('/rv:[0-9].[0-9][a-b]/i',$agent,$val);
                         $bd['version'] = str_replace("rv:","",$val[0]);
 
                 // test for Mozilla Stable Versions
                 }
-                elseif (eregi("mozilla",$agent) && eregi("rv:[0-9]\.[0-9]",$agent) && !eregi("netscape",$agent))
+                elseif (preg_match('/mozilla/i',$agent) && preg_match('/rv:[0-9]\.[0-9]/i',$agent) && !preg_match('/netscape/i',$agent))
                 {
                         $bd['browser'] = "Mozilla";
                         $val = explode(" ",stristr($agent,"rv:"));
-                        eregi("rv:[0-9]\.[0-9]\.[0-9]",$agent,$val);
+                        preg_match('/rv:[0-9]\.[0-9]\.[0-9]/i',$agent,$val);
                         $bd['version'] = str_replace("rv:","",$val[0]);
 
                 // test for Lynx & Amaya
                 }
-                elseif (eregi("libwww", $agent))
-                {
-                        if (eregi("amaya", $agent))
+                elseif (preg_match('/libwww/i', $agent))
+                {
+                        if (preg_match('/amaya/i', $agent))
                         {
                                 $val = explode("/",stristr($agent,"amaya"));
@@ -248 +248 @@
                 // test for Safari
                 }
-                elseif (eregi("safari", $agent))
+                elseif (preg_match('/safari/i', $agent))
                 {
                         $bd['browser'] = "Safari";
@@ -255 +255 @@
                 // remaining two tests are for Netscape
                 }
-                elseif (eregi("netscape",$agent))
+                elseif (preg_match('/netscape/i',$agent))
                 {
                         $val = explode(" ",stristr($agent,"netscape"));
@@ -262 +262 @@
                         $bd['version'] = $val[1];
                 }
-                elseif (eregi("mozilla",$agent) && !eregi("rv:[0-9]\.[0-9]\.[0-9]",$agent))
+                elseif (preg_match('/mozilla/i',$agent) && !preg_match('/rv:[0-9]\.[0-9]\.[0-9]/i',$agent))
                 {
                         $val = explode(" ",stristr($agent,"mozilla"));
@@ -276 +276 @@
 
                 // check for AOL
-                if (eregi("AOL", $agent))
+                if (preg_match('/AOL/i', $agent))
                 {
                         $var = stristr($agent, "AOL");

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

@@ -74 +74 @@
 
                 // verifica se o nome digitado contém apenas letras e/ou espaços
-                if(eregi("^[a-z -]*$", $cn)){
+                if(preg_match('/^[a-z -]*$/i', $cn)){
                         if (strlen($cn) < 3)
                         {

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

@@ -142 +142 @@
                         list($attrSubSet[0]) = explode(' ', $attrSubSet[0]);
                         // removes all "non-regular" attr names AND also attr blacklisted
-                        if ((!eregi("^[a-z]*$",$attrSubSet[0])) || (($this->xssAuto) && ((in_array(strtolower($attrSubSet[0]), $this->attrBlacklist)) || (substr($attrSubSet[0], 0, 2) == 'on'))))
+                        if ((!preg_match('/^[a-z]*$/i',$attrSubSet[0])) || (($this->xssAuto) && ((in_array(strtolower($attrSubSet[0]), $this->attrBlacklist)) || (substr($attrSubSet[0], 0, 2) == 'on'))))
                                 continue;
                         // xss attr value filtering

trunk/workflow/inc/fpdf/font/makefont/makefont.php

@@ -172 +172 @@
         if(isset($fm['StdVW']))
                 $stemv=$fm['StdVW'];
-        elseif(isset($fm['Weight']) and eregi('(bold|black)',$fm['Weight']))
+        elseif(isset($fm['Weight']) and preg_match('/(bold|black)/i',$fm['Weight']))
                 $stemv=120;
         else

trunk/workflow/inc/local/classes/class.wf_instance.php

@@ -388 +388 @@
                 foreach ($users as &$user)
                 {
-                        if (!eregi('^[p]{0,1}[0-9]+$', "$user"))
+                        if (!preg_match('/^[p]{0,1}[0-9]+$/i', "$user"))
                                 trigger_error('wf_engine::getUserInstances: O usuário/perfil "' . $user . '" é inválido', E_USER_ERROR);
                         $user = "'{$user}'";

trunk/workflow/inc/local/classes/class.wf_regex.php

@@ -525 +525 @@
                         return( preg_match("/$pattern/", (string) $input ) );
                 else
-                        return( eregi( $pattern, (string) $input ) );
+                        return( preg_match("/$pattern/i", (string) $input ) );
         }
 

trunk/workflow/inc/phplot/phplot.php

@@ -1313 +1313 @@
         $asked = trim($which_opt);
 
-        // FIXME: this for backward compatibility, as eregi() fails with empty strings.
+        // FIXME: this for backward compatibility, as preg_match() fails with empty strings.
         if ($asked == '')
             return '';
 
         $asked = strtolower($asked);
-        if (@ eregi($asked, $which_acc)) {
+        if (@ preg_match("/$asked/i", $which_acc)) {
             return $asked;
         } else {