Changeset 69 for trunk/expressoAdmin1_2

Timestamp:

09/19/07 17:33:03 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/expressoAdmin1_2/inc

Files:

• class.ldap_functions.inc.php (modified) (4 diffs)
• class.user.inc.php (modified) (2 diffs)

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

@@ -33 +33 @@
                                 ldap_set_option($ldap_connection, LDAP_OPT_PROTOCOL_VERSION, 3);
                                 ldap_set_option($ldap_connection, LDAP_OPT_REFERRALS, true);
-                                if ( ($GLOBALS['phpgw_info']['expresso']['cc_ldap_server']['acc'] != '') && ($GLOBALS['phpgw_info']['expresso']['cc_ldap_server']['pw'] != '') )
-                                        ldap_bind($ldap_connection, $GLOBALS['phpgw_info']['expresso']['cc_ldap_server']['acc'], $GLOBALS['phpgw_info']['expresso']['cc_ldap_server']['pw']);
+                                
+                                if ( ($_SESSION['phpgw_info']['expresso']['cc_ldap_server']['acc'] != '') && ($_SESSION['phpgw_info']['expresso']['cc_ldap_server']['pw'] != '') )
+                                        ldap_bind($ldap_connection, $_SESSION['phpgw_info']['expresso']['cc_ldap_server']['acc'], $_SESSION['phpgw_info']['expresso']['cc_ldap_server']['pw']);
                                 $context = $_SESSION['phpgw_info']['expresso']['cc_ldap_server']['dn'];
                         }
@@ -84 +85 @@
                                 $filter = "(&(|(phpgwAccountType=u)(phpgwAccountType=l))(uid=$uid))";
                         }
-                        $justthese = array("uid");
+                        $justthese = array("uid", "mail", "cn");
                         $search = ldap_search($ldap_connection, $context, $filter, $justthese);
                         $count_entries = ldap_count_entries($ldap_connection,$search);
                         if ($count_entries > 0)
                         {
+                                $entries = ldap_get_entries($ldap_connection, $search);
+                                
+                                for ($i=0; $i<$entries['count']; $i++)
+                                {
+                                        $users .= $entries[$i]['cn'][0] . ' - ' . $entries[$i]['mail'][0] . "\n";
+                                }
+                                
                                 $result['status'] = false;
-                                $result['msg'] = 'LOGIN já está sendo utilizado.';
+                                $result['msg'] = "LOGIN já está sendo utilizado por:\n" . $users;
                                 return $result;
                         }
@@ -855 +863 @@
                                 $return[$uid]['mail']           = $result[$uid]['mail'];
                 }
-        }       
+        }
                 return $return;
         }
@@ -921 +929 @@
                                 if($entry[0]['memberuid']) {
                                         // Retira o count do array
-                                        array_shift($entry[0]['memberuid']);                                    
+                                        array_shift($entry[0]['memberuid']);
                                         // Vemos a diferença
                                         $array_diff = array_diff($entry[0]['memberuid'], $tmp_array);

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

@@ -51 +51 @@
                                 }
                         
-                                // Leio o ID a ser usado na criação do objecto.
+                                // Leio o ID a ser usado na criação do objecto. Esta função já incrementa o ID no BD.
                                 $next_id = ($this->db_functions->get_next_id('accounts'));
                                 if ((!is_numeric($next_id['id'])) || (!$next_id['status']))
@@ -63 +63 @@
                                         $id = $next_id['id'];
                                 }
-                                // Incrementa o id no BD.
-                                //$this->db_functions->increment_id($id,'accounts');
                         
                                 // Cria array para incluir no LDAP