Changeset 5934 for trunk/calendar

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

File:

• trunk/calendar/csv_import.php (modified) (4 diffs)

trunk/calendar/csv_import.php

@@ -58 +58 @@
         $PSep = '||'; // Pattern-Separator, separats the pattern-replacement-pairs in trans
         $ASep = '|>'; // Assignment-Separator, separats pattern and replacesment
-        $VPre = '|#'; // Value-Prefix, is expanded to \ for ereg_replace
+        $VPre = '|#'; // Value-Prefix, is expanded to \ for preg_replace
         $CPre = '|['; $CPreReg = '\|\['; // |{csv-fieldname} is expanded to the value of the csv-field
         $CPos = ']';  $CPosReg = '\]';  // if used together with @ (replacement is eval-ed) value gets autom. quoted
@@ -244 +244 @@
                         "First example: <b>1${ASep}private${PSep}public</b><br>".
                         "This will translate a '1' in the CVS field to 'private' and everything else to 'public'.<p>".
-                        "Patterns as well as the replacement can be regular expressions (the replacement is done via ereg_replace). ".
+                        "Patterns as well as the replacement can be regular expressions (the replacement is done via preg_replace). ".
                         "If, after all replacements, the value starts with an '@' the whole value is eval()'ed, so you ".
                         "may use all php, phpgw plus your own functions. This is quiet powerfull, but <u>circumvents all ACL</u>.<p>".
@@ -375 +375 @@
                                                 if (preg_match("/$pattern/",$val))
                                                 {
-                                                        // echo "<p>csv_idx='$csv_idx',info='$info',trans_csv=".print_r($trans_csv).",ereg_replace('$pattern','$replace','$val') = ";
-                                                        $val = ereg_replace((string) $pattern,str_replace($VPre,'\\',$replace),(string) $val);
+                                                        // echo "<p>csv_idx='$csv_idx',info='$info',trans_csv=".print_r($trans_csv).",preg_replace("/$pattern/",'$replace','$val') = ";
+                                                        $val = preg_replace((string) "/$pattern/",str_replace($VPre,'\\',$replace),(string) $val);
                                                         // echo "'$val'</p>";
 
@@ -462 +462 @@
                                         {
                                                 // convert german DD.MM.YYYY format into ISO YYYY-MM-DD format
-                                                $values[$date] = ereg_replace('([0-9]{2}).([0-9]{2}).([0-9]{4})','\3-\2-\1',$values[$date]);
+                                                $values[$date] = preg_replace('/([0-9]{2}).([0-9]{2}).([0-9]{4})/','\3-\2-\1',$values[$date]);
                                                 // remove fractures of seconds if present at the end of the string
                                                 if (preg_match('/(.*)\.[0-9]+/',$values[$date],$parts)) $values[$date] = $parts[1];