Changeset 5593 for trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php

Timestamp:

03/01/12 10:37:23 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2398 - Compatibilizacao com PHP-5.3 no modulo ExpressoAdmin

File:

• trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php (modified) (9 diffs)

trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php

@@ -131 +131 @@
                 }
 
-                if (! eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+$", $params['mail']) )
+                if (! preg_match('/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+$/i', $params['mail']) )
                 {
                         $result['status'] = false;
@@ -235 +235 @@
                 }
 
-                if (! eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+$", $params['mail']) )
+                if (! preg_match('/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+$/i', $params['mail']) )
                 {
                         $result['status'] = false;
@@ -338 +338 @@
                 }
 
-                if (! eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+$", $params['mail']) )
+                if (! preg_match('/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+$/i', $params['mail']) )
                 {
                         $result['status'] = false;
@@ -461 +461 @@
                         }
         
-                        if (! eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+$", $params['mail']) )
+                        if (! preg_match('/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+$/i', $params['mail']) )
                         {
                                 $result['status'] = false;
@@ -656 +656 @@
                         {
                                 //Obtenho UID sem a organização. Na criação o uid já vem sem a organização
-                                $tmp_uid_without_org = split("-", $params['uid']);
+                                $tmp_uid_without_org = preg_split('/-/', $params['uid']);
                                 $tmp_reverse_uid_without_org = array_reverse($tmp_uid_without_org);
                                 array_pop($tmp_reverse_uid_without_org);
@@ -671 +671 @@
                         {
                                 //Obtenho UID sem a organização. Na criação o uid já vem sem a organização
-                                $tmp_uid_without_org = split("-", $params['uid']);
+                                $tmp_uid_without_org = preg_split('/-/', $params['uid']);
                                 $tmp_reverse_uid_without_org = array_reverse($tmp_uid_without_org);
                                 array_pop($tmp_reverse_uid_without_org);
@@ -724 +724 @@
                                 //Obtenho UID sem a organização
                                 /*
-                                $tmp_uid_without_org = split("-", $params['uid']);
+                                $tmp_uid_without_org = preg_split('/-/', $params['uid']);
                                 if (count($tmp_uid_without_org) < 2)
                                 {
@@ -2666 +2666 @@
                 else
                 {
-                        $tmp_user_context = split(",", utf8_decode($entrie[0]['dn']));
+                        $tmp_user_context = preg_split('/,/', utf8_decode($entrie[0]['dn']));
                         $tmp_reverse_user_context = array_reverse($tmp_user_context);
                         array_pop($tmp_reverse_user_context);
@@ -2760 +2760 @@
                 else
                 {
-                        $tmp_user_context = split(",", $entrie[0]['dn']);
+                        $tmp_user_context = preg_split('/,/', $entrie[0]['dn']);
                         $tmp_reverse_user_context = array_reverse($tmp_user_context);
                         array_pop($tmp_reverse_user_context);