Changeset 5921 for trunk/calendar

Timestamp:

04/11/12 17:21:30 (12 years ago)

Author:

marcosw

Message:

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

Location:

trunk/calendar/inc

Files:

• class.boicalendar.inc.php (modified) (11 diffs)
• class.uicalendar.inc.php (modified) (1 diff)

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

@@ -1278 +1278 @@
 
                                 $this->line = $this->line + 1;
-                        while (ereg("^[[:space:]]", $ical_text[$this->line])) {
+                        while (preg_match('/^[[:space:]]/', $ical_text[$this->line])) {
                                 $str .= substr(str_replace("\r\n", '', $ical_text[$this->line]), 1);
                                         $this->line = $this->line + 1;
@@ -1392 +1392 @@
         function parse_parameters(& $event, $majortype, $value) {
                         //$this->debug ('value: '.$value);
-                if (!ereg('[\=\;]', $value)) {
+                if (!preg_match('/[\=\;]/', $value)) {
                         $return_value[] = Array (
                                         'param' => $majortype,
@@ -1399 +1399 @@
                                 $value = '';
                         }
-                elseif (ereg('(.*(\:\\\\)?.*):(.*)', $value, $temp)) {
+                elseif (preg_match('/(.*(\:\\\\)?.*):(.*)/', $value, $temp)) {
                                 //$this->debug('Value : '._debug_array($temp,False));
                                 //$this->debug('Param '.$majortype.' Value : '.$temp[3]);
@@ -1409 +1409 @@
                                 $value = str_replace(':MAILTO', '', $temp[1]);
                                 }
-                        while (ereg('(([A-Z\-]*)[=]([[:alnum:] \_\)\(\/\$\.\,\:\\\|\*\&\^\%\#\!\~\"\?\&\@\<\>\-]*))([\;]?)(.*)', $value, $temp)) {
+                        while (preg_match('/(([A-Z\-]*)[=]([[:alnum:] \_\)\(\/\$\.\,\:\\\|\*\&\^\%\#\!\~\"\?\&\@\<\>\-]*))([\;]?)(.*)/', $value, $temp)) {
                                         //$this->debug('Value : '._debug_array($temp,False));
                                         //$this->debug('Param '.$temp[2].' Value : '.$temp[3]);
@@ -1420 +1420 @@
                                 }
                 } else {
-                        while (ereg('(([A-Z\-]*)[=]([[:alnum:] \_\)\(\/\$\.\,\:\\\|\*\&\^\%\#\!\~\"\?\&\@\<\>\-]*))([\;]?)(.*)', $value, $temp)) {
+                        while (preg_match('/(([A-Z\-]*)[=]([[:alnum:] \_\)\(\/\$\.\,\:\\\|\*\&\^\%\#\!\~\"\?\&\@\<\>\-]*))([\;]?)(.*)/', $value, $temp)) {
                                 $this->debug('Value : ' . _debug_array($temp, False));
                                 $this->debug('Param ' . $temp[2] . ' Value : ' . $temp[3]);
@@ -2347 +2347 @@
                         //                              }
 
-                        ereg($property_regexp, $text, $temp);
+                        preg_match("/$property_regexp/", $text, $temp);
                                 //$this->debug ('Majortype dump: '._debug_array($temp, false) );
                         $majortype = str_replace('-', '_', strtolower($temp[1]));
@@ -2381 +2381 @@
                                 if (isset ($_f_['day_raw']) OR $_f_['day_raw']) {
                                                 // Days
-                                        //                                              if(ereg('D', $_f_['day_raw']))
+                                        //                                              if(preg_match('/D/', $_f_['day_raw']))
                                         if (strstr($_f_['day_raw'], 'D')) {
                                                         $dur['days'] = eregi_replace("([0-9]+)D(.*)", "\\1", $_f_['day_raw']);
@@ -2387 +2387 @@
 
                                                 // Weeks
-                                        //                                              if(ereg("W", $_f_["day_raw"]))
+                                        //                                              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']);
@@ -2396 +2396 @@
                                 if (isset ($_f_['time_raw']) OR $_f_['time_raw']) {
                                                 // Hours
-                                        //                                              if(ereg("H", $_f_["time_raw"]))
+                                        //                                              if(preg_match('/H/', $_f_["time_raw"]))
                                         if (strstr($_f_['time_raw'], 'H')) {
                                                         $dur['hours'] = eregi_replace("([0-9]+)H(.*)", "\\1", $_f_['time_raw']);
@@ -2403 +2403 @@
                                                 // Minutes
                                                 /* If you find better, contact me very quickly :) */
-                                        //                                              if(ereg("M", $_f_["time_raw"]))
+                                        //                                              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']);
@@ -2410 +2410 @@
                                                 // Seconds
                                                 /* Same comment :) */
-                                        //                                              if(ereg("S", $_f_["time_raw"]) )
+                                        //                                              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']);

trunk/calendar/inc/class.uicalendar.inc.php

@@ -4593 +4593 @@
                         foreach($vars['participants']['data'] as $user => $str)
                         {
-                        if ($this->bo->check_perms(PHPGW_ACL_EDIT,0,$user) && ereg('^(.*) \((.*)\)$',$str,$parts))
+                        if ($this->bo->check_perms(PHPGW_ACL_EDIT,0,$user) && preg_match('/^(.*) \((.*)\)$/',$str,$parts))
                                 {
                                         $vars['participants']['data'][$user] = $parts[1].' (<a href="'.$this->page('edit_status','&cal_id='.$event['id'].'&owner='.$user).'">'.$parts[2].'</a>)';