Changeset 5773 for trunk/phpgwapi

Timestamp:

03/21/12 14:00:25 (12 years ago)

Author:

gustavo

Message:

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

Location:

trunk/phpgwapi/inc

Files:

• class.auth_ldap.inc.php (modified) (1 diff)
• class.sector_search_ldap.inc.php (modified) (1 diff)
• class.sessions_php4.inc.php (modified) (2 diffs)
• class.setup_detection.inc.php (modified) (3 diffs)

trunk/phpgwapi/inc/class.auth_ldap.inc.php

@@ -31 +31 @@
                 function authenticate($username, $passwd)
                 {
-                        if (ereg('[()|&=*,<>!~]',$username))
+                        if (preg_match('/[()|&=*,<>!~]/',$username))
                         {
                                 return False;

trunk/phpgwapi/inc/class.sector_search_ldap.inc.php

@@ -190 +190 @@
         // Cria a primeira entrada na combo
         $first_sector_ufn = ldap_dn2ufn($context);
-        $first_sector_string = split(",", $first_sector_ufn);
+        $first_sector_string = preg_split('/,/', $first_sector_ufn);
 
         if ($context == $selected)

trunk/phpgwapi/inc/class.sessions_php4.inc.php

@@ -71 +71 @@
                         $GLOBALS['phpgw_session']['session_install_id'] = $GLOBALS['phpgw_info']['server']['install_id'];
 
-                        session_register('phpgw_session');
                         $_SESSION['phpgw_session'] = $GLOBALS['phpgw_session'];
                 }
@@ -143 +142 @@
                         $GLOBALS['phpgw_session']['phpgw_app_sessions']['phpgwapi']['phpgw_info_cache'] = '';
 
-                        session_register('phpgw_session');
                         $_SESSION['phpgw_session'] = $GLOBALS['phpgw_session'];
                 }

trunk/phpgwapi/inc/class.setup_detection.inc.php

@@ -21 +21 @@
                         while($entry=$d->read())
                         {
-                                if($entry != ".." && !ereg('setup',$entry) && is_dir(PHPGW_SERVER_ROOT . '/' . $entry))
+                                if($entry != ".." && !preg_match('/setup/',$entry) && is_dir(PHPGW_SERVER_ROOT . '/' . $entry))
                                 {
                                         $f = PHPGW_SERVER_ROOT . '/' . $entry . '/setup/setup.inc.php';
@@ -317 +317 @@
                         $config_table = $ver[0] > 0 || (int)$ver[2] > 10 ? 'phpgw_config' : 'config';
 
-                        if(ereg("([0-9]+)(pre)([0-9]+)",$ver[2],$regs))
+                        if(preg_match('/([0-9]+)(pre)([0-9]+)/',$ver[2],$regs))
                         {
                                 if(($regs[1] == '10') && ($regs[3] >= '6'))
@@ -351 +351 @@
                         }
                         if($GLOBALS['phpgw_setup']->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'], '0.9.14.501') ||
-                           ereg('0\.9\.15\.00[01]{1,1}',$GLOBALS['setup_info']['phpgwapi']['currentver']))
+                           preg_match('/0\.9\.15\.00[01]{1,1}/',$GLOBALS['setup_info']['phpgwapi']['currentver']))
                         {
                                 $langtbl  = 'lang';