Changeset 5773

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

Files:

• admin/inc/class.uiconfig.inc.php (modified) (2 diffs)
• expressoAdmin1_2/inc/class.user.inc.php (modified) (2 diffs)
• expressoMail1_2/inc/class.exporteml.inc.php (modified) (2 diffs)
• expressoMail1_2/inc/class.imapfp.inc.php (modified) (2 diffs)
• phpgwapi/inc/class.auth_ldap.inc.php (modified) (1 diff)
• phpgwapi/inc/class.sector_search_ldap.inc.php (modified) (1 diff)
• phpgwapi/inc/class.sessions_php4.inc.php (modified) (2 diffs)
• phpgwapi/inc/class.setup_detection.inc.php (modified) (3 diffs)
• prototype/api/controller.php (modified) (2 diffs)
• prototype/modules/calendar/interceptors/DBMapping.php (modified) (1 diff)
• setup/config.php (modified) (2 diffs)
• setup/inc/functions.inc.php (modified) (1 diff)

trunk/admin/inc/class.uiconfig.inc.php

@@ -118 +118 @@
                                         {
                                                 /* don't erase passwords, since we also don't print them */
-                                                if(!ereg('passwd',$key) && !ereg('password',$key) && !ereg('root_pw',$key) && !ereg('pw',$key))
+                                                if(!preg_match('/passwd/',$key) && !preg_match('/password/',$key) && !preg_match('/root_pw/',$key) && !preg_match('/pw/',$key))
                                                 {
                                                         unset($c->config_data[$key]);
@@ -339 +339 @@
                                                 $newval = str_replace(' ','_',$newval);
                                                 /* Don't show passwords in the form */
-                                                if(ereg('passwd',$value) || ereg('password',$value) || ereg('root_pw',$value))
+                                                if(preg_match('/passwd/',$value) || preg_match('/password/',$value) || preg_match('/root_pw/',$value))
                                                 {
                                                         $t->set_var($value,'');

trunk/expressoAdmin1_2/inc/class.user.inc.php

@@ -175 +175 @@
                                 {
                                         //retira caracteres que não são números.
-                                        $params['corporative_information_cpf'] = ereg_replace("[^0-9]", "", $params['corporative_information_cpf']);
+                                        $params['corporative_information_cpf'] = preg_replace('/[^0-9]/', '', $params['corporative_information_cpf']);
                                         //description
                                         $params['corporative_information_description'] = utf8_encode($params['corporative_information_description']);
@@ -289 +289 @@
 
                         //retira caracteres que não são números.
-                        $new_values['corporative_information_cpf'] = ereg_replace("[^0-9]", "", $new_values['corporative_information_cpf']);
+                        $new_values['corporative_information_cpf'] = preg_replace('/[^0-9]/', '', $new_values['corporative_information_cpf']);
 
                         $diff = array_diff($new_values, $old_values);

trunk/expressoMail1_2/inc/class.exporteml.inc.php

@@ -71 +71 @@
                         $subject = strtr($subject,$from,$to);
 
-                        $subject = eregi_replace("[^a-zA-Z0-9_]", "_", $subject); 
+                        $subject = preg_replace('/[^a-zA-Z0-9_]/i', '_', $subject); 
                         $file = $subject."_".$id.".eml"; 
                 } else{
@@ -82 +82 @@
                                 $subject = strtr($subject,$from,$to);
 
-                                $subject = eregi_replace("[^a-zA-Z0-9_]", "_", $subject); 
+                                $subject = preg_replace('/[^a-zA-Z0-9_]/i', '_', $subject); 
 
                                 // é necessário que a sessão faça parte do nome do arquivo para que o mesmo não venha vazio o.O 

trunk/expressoMail1_2/inc/class.imapfp.inc.php

@@ -105 +105 @@
                                 return false;
                         }
-                        $response_inbox_array =  split("\r\n", $response_inbox);
+                        $response_inbox_array =  preg_split('/\r\n/', $response_inbox);
                         array_pop($response_inbox_array);
                         array_shift($response_inbox_array);
@@ -126 +126 @@
                         }
                         
-                        $response_sub_array =  split("\r\n", $response_sub);
+                        $response_sub_array =  preg_split('/\r\n/', $response_sub);
                         array_pop($response_sub_array);
                         array_shift($response_sub_array);

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';

trunk/prototype/api/controller.php

@@ -636 +636 @@
                         {
                                 if( self::isConcept( $URI['concept'], $linkName ) )
-                                    $data[$linkName] = self::put( array( 'concept' => $linkTarget ), $data[$linkName], &$txIds );
+                                    $data[$linkName] = self::put( array( 'concept' => $linkTarget ), $data[$linkName], $txIds );
                             else
                             {
@@ -668 +668 @@
                           $value[ self::links( $URI['concept'], $linkNames[ $linkTarget ] ) ] = $URI['id'];
   
-                          self::put( array( 'concept' => $linkTarget ), $value, &$txIds );
+                          self::put( array( 'concept' => $linkTarget ), $value, $txIds );
                       }
                 }

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -122 +122 @@
 
          $params = array_merge( $params, $occ );
-         $params = self::deepnessFindEvent( &$uri , &$params , &$criteria , $original);
+         $params = self::deepnessFindEvent( $uri , $params , $criteria , $original);
 
          return false;

trunk/setup/config.php

@@ -65 +65 @@
 
         /* Following to ensure windows file paths are saved correctly */
-        set_magic_quotes_runtime(0);
+        magic_quotes_runtime(0);
 
         $GLOBALS['phpgw_setup']->loaddb();
@@ -112 +112 @@
                         /* echo '<br>Updating: ' . $setting . '=' . $value; */
                         /* Don't erase passwords, since we also do not print them below */
-                        if($value || (!ereg('passwd',$setting) && !ereg('password',$setting) && !ereg('root_pw',$setting)))
+                        if($value || (!preg_match('/passwd/',$setting) && !preg_match('/password/',$setting) && !preg_match('/root_pw/',$setting)))
                         {
                                 @$GLOBALS['phpgw_setup']->db->query("DELETE FROM $configtbl WHERE config_name='" . $setting . "'");

trunk/setup/inc/functions.inc.php

@@ -81 +81 @@
                 while($line = fgets($f,200))
                 {
-                        list($x,$y) = split("\t",$line);
+                        list($x,$y) = preg_split('/\t/',$line);
                         $languages[$x]['lang']  = trim($x);
                         $languages[$x]['descr'] = trim($y);