Changeset 5921 for trunk/phpgwapi

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

Files:

• inc/adodb/drivers/adodb-sybase.inc.php (modified) (2 diffs)
• inc/class.soapmsg.inc.php (modified) (1 diff)
• inc/class.vfs_dav.inc.php (modified) (7 diffs)
• inc/class.vfs_shared.inc.php (modified) (2 diffs)
• inc/class.vfs_sql.inc.php (modified) (3 diffs)
• inc/fpdf/tutorial/tuto6.php (modified) (1 diff)
• templates/news/login_news.php (modified) (1 diff)

trunk/phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php

@@ -377 +377 @@
         
                 //Dec 30 2000 12:00AM
-                if (!ereg( "([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})"
+                if (!preg_match('/([A-Za-z]{3})[-\/\. ]+([0-9]{1,2})[-\/\. ]+([0-9]{4})/'
                         ,$v, $rr)) return parent::UnixDate($v);
                         
@@ -394 +394 @@
                 //11.02.2001 Toni Tunkkari toni.tunkkari@finebyte.com
                 //Changed [0-9] to [0-9 ] in day conversion
-                if (!ereg( "([A-Za-z]{3})[-/\. ]([0-9 ]{1,2})[-/\. ]([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})"
+                if (!preg_match('/([A-Za-z]{3})[-\/\. ]([0-9 ]{1,2})[-\/\. ]([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})/'
                         ,$v, $rr)) return parent::UnixTimeStamp($v);
                 if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;

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

@@ -144 +144 @@
         /*
                         // if response is a proper http response, and is not a 200
-                        if(preg_match('/^HTTP/',$clean_data) && !ereg("200$", $clean_data))
+                        if(preg_match('/^HTTP\/',$clean_data) && !preg_match('\/200$\/', $clean_data))
                         {
                                 // get error data

trunk/phpgwapi/inc/class.vfs_dav.inc.php

@@ -519 +519 @@
                         {
                                 $base_sep = $sep;
-                                if (ereg ("^$this->basedir" . $sep, $string))
+                                if (preg_match("/^$this->basedir/" . $sep, $string))
                                 {
                                         $base = $this->basedir . $sep;
@@ -585 +585 @@
                                 while (list ($num, $link_info) = each ($this->linked_dirs))
                                 {
-                                        if (ereg ("^$link_info[directory]/$link_info[name](/|$)", $rarray['fake_full_path']))
+                                        if (preg_match("/^$link_info[directory]\/$link_info[name](\/|$)/", $rarray['fake_full_path']))
                                         {
                                                 $rarray['real_full_path'] = ereg_replace ("^$this->basedir", '', $rarray['real_full_path']);
@@ -764 +764 @@
 
                         /* Let's not return // */
-                        while (ereg ($sep . $sep, $basedir))
+                        while (preg_match("/$sep"."$sep/", $basedir))
                         {
                                 $basedir = ereg_replace ($sep . $sep, $sep, $basedir);
@@ -1776 +1776 @@
                                         'relatives'     => array ($f->mask)
                                 ) == 'Directory'))
-                                && ereg ("^$f->fake_full_path", $t->fake_full_path)
+                                && preg_match("/^$f->fake_full_path/", $t->fake_full_path)
                         )
                         {
@@ -2048 +2048 @@
 
                         /* We don't allow /'s in dir names, of course */
-                        if (ereg ('/', $p->fake_name))
+                        if (preg_match('/\//', $p->fake_name))
                         {
                                 return False;
@@ -2279 +2279 @@
                                 );
                         }
-                        elseif (ereg("+^$this->fakebase\/(.*)$+U", $p->fake_full_path, $matches))
+                        elseif (preg_match("/+^$this->fakebase\/(.*)$+U/", $p->fake_full_path, $matches))
                         {
                                 $set_attributes_array = Array(
@@ -2502 +2502 @@
                                 */
 /*
-                                if (@!ereg ('^' . $file_array['directory'], $p->fake_full_path))
+                                if (@!preg_match("/^$file_array['directory']/", $p->fake_full_path))
                                 {
                                         continue;

trunk/phpgwapi/inc/class.vfs_shared.inc.php

@@ -759 +759 @@
 
                         /* Let's not return // */
-                        while (ereg ($sep . $sep, $basedir))
+                        while (preg_match("/$sep"."$sep/", $basedir))
                         {
                                 $basedir = ereg_replace ($sep . $sep, $sep, $basedir);
@@ -1028 +1028 @@
                                 while (list ($num, $link_info) = each ($this->linked_dirs))
                                 {
-                                        if (ereg ("^$link_info[directory]/$link_info[name](/|$)", $rarray['fake_full_path']))
+                                        if (preg_match("/^$link_info[directory]\/$link_info[name](\/|$)/", $rarray['fake_full_path']))
                                         {
                                                 $rarray['real_full_path'] = ereg_replace ("^$this->basedir", '', $rarray['real_full_path']);

trunk/phpgwapi/inc/class.vfs_sql.inc.php

@@ -1522 +1522 @@
                                         'relatives'     => array ($f->mask)
                                 ) == 'Directory'))
-                                && ereg ("^$f->fake_full_path", $t->fake_full_path)
+                                && preg_match("/^$f->fake_full_path/", $t->fake_full_path)
                         )
                         {
@@ -1889 +1889 @@
 
                         /* We don't allow /'s in dir names, of course */
-                        if (ereg ("/", $p->fake_name))
+                        if (preg_match('/\//', $p->fake_name))
                         {
                                 return False;
@@ -2491 +2491 @@
                                 */
 /*
-                                if (@!ereg ('^' . $file_array['directory'], $p->fake_full_path))
+                                if (@!preg_match("/^$file_array['directory']/", $p->fake_full_path))
                                 {
                                         continue;

trunk/phpgwapi/inc/fpdf/tutorial/tuto6.php

@@ -48 +48 @@
                                 $attr=array();
                                 foreach($a2 as $v)
-                                        if(ereg('^([^=]*)=["\']?([^"\']*)["\']?$',$v,$a3))
+                                        if(preg_match('/^([^=]*)=["\']?([^"\']*)["\']?$/',$v,$a3))
                                                 $attr[strtoupper($a3[1])]=$a3[2];
                                 $this->OpenTag($tag,$attr);

trunk/phpgwapi/templates/news/login_news.php

@@ -343 +343 @@
         foreach($_GET as $name => $value)
         {
-                if(ereg('phpgw_',$name))
+                if(preg_match('/phpgw_/',$name))
                 {
                         $extra_vars .= '&' . $name . '=' . urlencode($value);