Changeset 8234 for sandbox/2.5.1-evolucao/expressoAdmin1_2/inc/class.ldap_functions.inc.php

Timestamp:

10/09/13 12:01:22 (11 years ago)

Author:

angelo

Message:

Ticket #3491 - Compatibilizar Expresso com novas versoes do PHP

File:

• sandbox/2.5.1-evolucao/expressoAdmin1_2/inc/class.ldap_functions.inc.php (modified) (3 diffs)

sandbox/2.5.1-evolucao/expressoAdmin1_2/inc/class.ldap_functions.inc.php

@@ -681 +681 @@
                 $uid = $params['uid'];
                 $mail = $params['mail'];
-                $mailalternateaddress = $params['mailalternateaddress'];
+                $mailalternateaddress = isset($params['mailalternateaddress']) ? $params['mailalternateaddress'] : '';
                 $cpf = $params['cpf'];
                                 
-                if ($_SESSION['phpgw_info']['expresso']['global_denied_users'][$uid])
+                if (isset($_SESSION['phpgw_info']['expresso']['global_denied_users'][$uid]))
                 {
                         $result['status'] = false;
@@ -896 +896 @@
                                 }
                         }
-                        else if ($this->current_config['expressoAdmin_cpf_obligation']) 
+                        else if (isset($this->current_config['expressoAdmin_cpf_obligation']) && $this->current_config['expressoAdmin_cpf_obligation']) 
                         {
                                 $result['status'] = false;
@@ -2175 +2175 @@
                         $search = ldap_search($this->ldap,$context, $filter, $justthese);
                         $entry = ldap_get_entries($this->ldap, $search);
-                        return $entry[0]['associateddomain'][0];
+                        return ( ($entry['count'] > 0) ? $entry[0]['associateddomain'][0] : $entry);
         }