Changeset 5915

Timestamp:

04/11/12 12:25:36 (12 years ago)

Author:

marcosw

Message:

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

Location:

trunk

Files:

• calendar/csv_import.php (modified) (2 diffs)
• contactcenter/inc/class.abo_catalog.inc.php (modified) (2 diffs)
• phpgwapi/inc/class.network.inc.php (modified) (1 diff)
• phpgwapi/inc/class.xml.inc.php (modified) (1 diff)

trunk/calendar/csv_import.php

@@ -373 +373 @@
                                         foreach($trans[$csv_idx] as $pattern => $replace)
                                         {
-                                                if (preg_match((string) '/'.$pattern.'/',$val))
+                                                if (preg_match("/$pattern/",$val))
                                                 {
                                                         // echo "<p>csv_idx='$csv_idx',info='$info',trans_csv=".print_r($trans_csv).",ereg_replace('$pattern','$replace','$val') = ";
@@ -380 +380 @@
 
                                                         $reg = $CPreReg.'([a-zA-Z_0-9]+)'.$CPosReg;
-                                                        while (preg_match('/'.$reg.'/',$val,$vars))
+                                                        while (preg_match("/$reg/",$val,$vars))
                                                         {       // expand all CSV fields
                                                                 $val = str_replace($CPre.$vars[1].$CPos,$val[0] == '@' ? "'".addslashes($fields[array_search($vars[1],$csv_fields)])."'" : $fields[array_search($vars[1],$csv_fields)],$val);

trunk/contactcenter/inc/class.abo_catalog.inc.php

@@ -356 +356 @@
                                                 for($k = 0; $k < $n_joins; $k++)
                                                 {
-                                                        if (preg_match('/'.$query_join_reg.'/',$query_fields_joins[$k]))
+                                                        if (preg_match("/$query_join_reg/",$query_fields_joins[$k]))
                                                         {       
                                                                 $unique = false;
@@ -430 +430 @@
                                                 for($k = 0; $k < $n_joins; $k++)
                                                 {
-                                                        if (preg_match('/'.$query_join_reg.'/',$query_restric_joins[$k]))
+                                                        if (preg_match("/$query_join_reg/",$query_restric_joins[$k]))
                                                         {       
                                                                 $unique = false;

trunk/phpgwapi/inc/class.network.inc.php

@@ -164 +164 @@
                         }
                         $response = $this->read_port();
-                        if(!preg_match('/'.strtoupper($expected_response).'/',strtoupper($response)))
+                        if(!preg_match(strtoupper("/$expected_response/"),strtoupper($response)))
                         {
                                 if(substr($expected_response,1,1) == '+')

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

@@ -2749 +2749 @@
             
         // Check whether the first string starts with the second one.
-        if ( preg_match('/'.$second.'/', $first) )
+        if ( preg_match("/$second/", $first) )
         {
             // Return true.