Changeset 5934 for trunk/phpgwapi

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/phpgwapi/inc

Files:

• class.jscalendar.inc.php (modified) (1 diff)
• class.ping.inc.php (modified) (1 diff)
• class.schema_proc_mysql.inc.php (modified) (1 diff)
• class.schema_proc_pgsql.inc.php (modified) (1 diff)
• class.soap_server.inc.php (modified) (2 diffs)
• class.soapmsg.inc.php (modified) (1 diff)
• class.validator.inc.php (modified) (1 diff)
• class.vcard.inc.php (modified) (1 diff)
• xml_functions.inc.php (modified) (2 diffs)

trunk/phpgwapi/inc/class.jscalendar.inc.php

@@ -37 +37 @@
 '<link rel="stylesheet" type="text/css" media="all" href="'.$this->jscalendar_url.'/calendar-win2k-cold-1.css" title="" />
 <script type="text/javascript" src="'.$this->jscalendar_url.'/calendar.js"></script>
-<script type="text/javascript" src="'.ereg_replace('[?&]*click_history=[0-9a-f]*','',$GLOBALS['phpgw']->link('/phpgwapi/inc/jscalendar-setup.php')).'"></script>
+<script type="text/javascript" src="'.preg_replace('/[?&]*click_history=[0-9a-f]*/','',$GLOBALS['phpgw']->link('/phpgwapi/inc/jscalendar-setup.php')).'"></script>
 ';
                         }

trunk/phpgwapi/inc/class.ping.inc.php

@@ -72 +72 @@
                         $packet_tx   = str_replace(' packets transmitted','',$values[0]);
                         $packet_rx   = str_replace(' packets received','',$values[1]);
-                        $packet_loss = ereg_replace('% packet loss','',$values[2]);
+                        $packet_loss = preg_replace('/% packet loss/','',$values[2]);
 
                         $this->packet_tx   = (int)str_replace(' ','',$packet_tx);

trunk/phpgwapi/inc/class.schema_proc_mysql.inc.php

@@ -242 +242 @@
                                 /* The rest of this is used only for SQL->array */
                                 $colinfo = explode('(',$oProc->m_odb->f(1));
-                                $prec = ereg_replace('\).*','',$colinfo[1]);
+                                $prec = preg_replace('/\).*/','',$colinfo[1]);
                                 $scales = explode(',',$prec);
 

trunk/phpgwapi/inc/class.schema_proc_pgsql.inc.php

@@ -378 +378 @@
                         @$oProc->m_odb->query($sql);
                         $oProc->m_odb->next_record();
-                        $indexfields = ereg_replace("^CREATE.+\(",'',$oProc->m_odb->f($num));
-                        $indexfields = ereg_replace("\)$",'',$indexfields);
+                        $indexfields = preg_replace('/^CREATE.+\(/','',$oProc->m_odb->f($num));
+                        $indexfields = preg_replace('/\)$/','',$indexfields);
                         $aIx = explode(',',$indexfields);
                         $i = 0;

trunk/phpgwapi/inc/class.soap_server.inc.php

@@ -98 +98 @@
                                 elseif(preg_match('/.php/',$action))
                                 {
-                                        $this->service = ereg_replace('"|/','',substr(strrchr($action,".php"),4,strlen(strrchr($action,"/"))));
+                                        $this->service = preg_replace('/"|\//','',substr(strrchr($action,".php"),4,strlen(strrchr($action,"/"))));
                                 }
                                 $this->debug("got service: $this->service");
@@ -116 +116 @@
 
                         // does method exist?
-                        $test = ereg_replace("\.",'_',$this->methodname);
+                        $test = preg_replace('/\./','_',$this->methodname);
                         if(function_exists($test))
                         {

trunk/phpgwapi/inc/class.soapmsg.inc.php

@@ -121 +121 @@
                         //$this->debug(" w/ data $data");
                         // strip headers here
-                        //$clean_data = ereg_replace("\r\n","\n", $data);
+                        //$clean_data = preg_replace('/\r\n/','\n', $data);
                         if(preg_match('/^.*\r\n\r\n</',$data))
                         {
                                 $this->debug("found proper seperation of headers and document");
                                 $this->debug("getting rid of headers, stringlen: ".strlen($data));
-                                $clean_data = ereg_replace("^.*\r\n\r\n<","<", $data);
+                                $clean_data = preg_replace('/^.*\r\n\r\n</','<', $data);
                                 $this->debug("cleaned data, stringlen: ".strlen($clean_data));
                         }

trunk/phpgwapi/inc/class.validator.inc.php

@@ -50 +50 @@
                 function strip_space ($text)
                 {
-                        return ereg_replace("( |\n|\t|\r)+", '', $text);
+                        return preg_replace('/( |\n|\t|\r)+/', '', $text);
                 }
 

trunk/phpgwapi/inc/class.vcard.inc.php

@@ -217 +217 @@
                         {
                                 $field  = split(';',$name);
-                                $field[0] = ereg_replace("A\.",'',$field[0]);
-                                $field[0] = ereg_replace("B\.",'',$field[0]);
-                                $field[0] = ereg_replace("C\.",'',$field[0]);
-                                $field[0] = ereg_replace("D\.",'',$field[0]);
+                                $field[0] = preg_replace('/A\./','',$field[0]);
+                                $field[0] = preg_replace('/B\./','',$field[0]);
+                                $field[0] = preg_replace('/C\./','',$field[0]);
+                                $field[0] = preg_replace('/D\./','',$field[0]);
                                 $values = split(';',$value);
                                 if($field[1])

trunk/phpgwapi/inc/xml_functions.inc.php

@@ -153 +153 @@
                         if (preg_match('/^([#a-zA-Z0-9]+);/', $top[$i], $regs))
                         {
-                                $op .= ereg_replace("^[#a-zA-Z0-9]+;",
+                                $op .= preg_replace('/^[#a-zA-Z0-9]+;/',
                                         xmlrpc_lookup_entity($regs[1]), $top[$i]);
                         }
@@ -360 +360 @@
                                 break;
                         case 'METHODNAME':
-                                $GLOBALS['_xh'][$parser]['method']=ereg_replace("^[\n\r\t ]+", "", $GLOBALS['_xh'][$parser]['ac']);
+                                $GLOBALS['_xh'][$parser]['method']=preg_replace('/^[\n\r\t ]+/', '', $GLOBALS['_xh'][$parser]['ac']);
                                 break;
                         case 'BOOLEAN':