[Gforge-commits] gforge/common/include/system LDAP.class,1.2,1.3

[cbayle]

Update of /cvsroot/gforge/gforge/common/include/system
In directory db.perdue.net:/tmp/cvs-serv8220/common/include/system

Modified Files:
        LDAP.class 
Log Message:
Reintroduce ldap stuffs


Index: LDAP.class
===================================================================
RCS file: /cvsroot/gforge/gforge/common/include/system/LDAP.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- LDAP.class  26 Jul 2004 22:58:39 -0000      1.2
+++ LDAP.class  12 Sep 2004 23:11:12 -0000      1.3
@@ -251,11 +251,6 @@
                global $ldap_conn;
                global $sys_ldap_base_dn;
        
-               global $sys_use_ldap;
-               if (!$sys_use_ldap) {
-                       return true;
-               }
-       
                if (!$this->gf_ldap_connect()) {
                        return false;
                }
@@ -295,11 +290,6 @@
         *
         */
        function sys_check_create_user($user_id) {
-               global $sys_use_ldap;
-               if (!$sys_use_ldap) {
-                       return true;
-               }
-       
                if (!$this->sys_check_user($user_id)){
                        $user = &user_get_object($user_id);
                        return $this->gf_ldap_create_user_from_object($user);
@@ -317,12 +307,6 @@
        function gf_ldap_create_user_from_object(&$user) {
                global $sys_ldap_base_dn;
                global $UID_ADD;
-       
-               global $sys_use_ldap;
-               if (!$sys_use_ldap) {
-                       return true;
-               }
-       
                if (!$this->gf_ldap_connect()) {
                        return false;
                }
@@ -366,12 +350,6 @@
        function gf_ldap_create_user_from_props($username, $cn, $crypt_pw,
                                                $shell, $cvsshell, $uid, $gid, 
$email) {
                global $sys_ldap_base_dn;
-       
-               global $sys_use_ldap;
-               if (!$sys_use_ldap) {
-                       return true;
-               }
-       
                if (!$this->gf_ldap_connect()) {
                        return false;
                }
@@ -413,11 +391,6 @@
        function sys_remove_user($user_id) {
                global $sys_ldap_base_dn;
        
-               global $sys_use_ldap;
-               if (!$sys_use_ldap) {
-                       return true;
-               }
-       
                $user = &user_get_object($user_id);
                if (!$this->gf_ldap_connect()) {
                        return false;
@@ -444,11 +417,6 @@
        function sys_user_set_attribute($user_id,$attr,$value) {
                global $sys_ldap_base_dn;
        
-               global $sys_use_ldap;
-               if (!$sys_use_ldap) {
-                       return true;
-               }
-       
                $user = &user_get_object($user_id);
                if (!$this->gf_ldap_connect()) {
                        return false;
@@ -479,11 +447,6 @@
                global $ldap_conn;
                global $sys_ldap_base_dn;
        
-               global $sys_use_ldap;
-               if (!$sys_use_ldap) {
-                       return false;
-               }
-       
                $group = &group_get_object($group_id);
                if (!$group) {
                        $this->setError("ERROR: Cannot find group 
[$group_id]<br />");
@@ -513,11 +476,6 @@
                global $GID_ADD;
                global $ANONCVS_UID_ADD;
        
-               global $sys_use_ldap;
-               if (!$sys_use_ldap) {
-                       return true;
-               }
-       
                $group = &group_get_object($group_id);
                if (!$this->gf_ldap_connect()) {
                        return false;
@@ -589,11 +547,6 @@
        function sys_remove_group($group_id) {
                global $sys_ldap_base_dn;
        
-               global $sys_use_ldap;
-               if (!$sys_use_ldap) {
-                       return true;
-               }
-       
                $group = &group_get_object($group_id);
                if (!$this->gf_ldap_connect()) {
                        return false;
@@ -651,11 +604,6 @@
                global $ldap_conn;
                global $sys_ldap_base_dn;
        
-               global $sys_use_ldap;
-               if (!$sys_use_ldap) {
-                       return true;
-               }
-       
                $group = &group_get_object($group_id);
                $user  = &user_get_object($user_id);
                if (!$this->gf_ldap_connect()) {
@@ -726,11 +674,6 @@
        function sys_group_remove_user($group_id,$user_id,$cvs_only=0) {
                global $sys_ldap_base_dn;
        
-               global $sys_use_ldap;
-               if (!$sys_use_ldap) {
-                       return true;
-               }
-       
                $group = &group_get_object($group_id);
                $user  = &user_get_object($user_id);
                if (!$this->gf_ldap_connect()) {