[Phpgroupware-cvs] qmailldap/inc class.soqmailldap.inc.php, 1.13.2.2.2.2

[ceb]

Update of qmailldap/inc

Modified Files:
     Branch: Version-0_9_16-branch
            class.soqmailldap.inc.php lines: +14 -22

Log Message:
ldap fix

====================================================
Index: qmailldap/inc/class.soqmailldap.inc.php
diff -u qmailldap/inc/class.soqmailldap.inc.php:1.13.2.2.2.1 
qmailldap/inc/class.soqmailldap.inc.php:1.13.2.2.2.2
--- qmailldap/inc/class.soqmailldap.inc.php:1.13.2.2.2.1        Tue Apr 22 
15:22:27 2003
+++ qmailldap/inc/class.soqmailldap.inc.php     Mon Feb 28 17:06:55 2005
@@ -61,13 +61,11 @@

                function getLDAPData($_serverid)
                {
-                       global $phpgw;
-
                        $storageData = $this->getLDAPStorageData($_serverid);

-                       $ldap = $phpgw->common->ldapConnect();
+                       $ldap = $GLOBALS['phpgw']->common->ldapConnect();
                        $filter = "cn=".$storageData['qmail_servername'];
-
+
                        $sri = 
@ldap_read($ldap,$storageData['ldap_basedn'],$filter);
                        if ($sri)
                        {
@@ -128,12 +126,12 @@
                        $i=0;
                        while ($this->db->next_record())
                        {
-                               $serverList[$i]['id']                   = 
$this->db->f('id');
+                               $serverList[$i]['id']                           
= $this->db->f('id');
                                $serverList[$i]['qmail_servername']     = 
$this->db->f('qmail_servername');
                                $serverList[$i]['description']          = 
$this->db->f('description');
                                $i++;
                        }
-
+
                        if ($i>0)
                        {
                                return $serverList;
@@ -146,15 +144,13 @@

                function getUserData($_accountID)
                {
-                       global $phpgw, $phpgw_info;
-
-                       $ldap = $phpgw->common->ldapConnect();
+                       $ldap = $GLOBALS['phpgw']->common->ldapConnect();
                        $filter = "(&(uidnumber=$_accountID))";
-
+
                        $mail_address           = $this->mail_address;
                        $routing_address        = $this->routing_address;

-                       $sri = 
@ldap_search($ldap,$phpgw_info['server']['ldap_context'],$filter);
+                       $sri = 
@ldap_search($ldap,$GLOBALS['phpgw_info']['server']['ldap_context'],$filter);
                        if ($sri)
                        {
                                $allValues = ldap_get_entries($ldap, $sri);
@@ -178,19 +174,17 @@
                                        return $userData;
                                }
                        }
-
+
                        // if we did not return before, return false
                        return false;
                }

                function saveUserData($_accountID, $_accountData)
                {
-                       global $phpgw, $phpgw_info;
-
-                       $ldap = $phpgw->common->ldapConnect();
+                       $ldap = $GLOBALS['phpgw']->common->ldapConnect();
                        $filter = "uidnumber=$_accountID";
-
-                       $sri = 
@ldap_search($ldap,$phpgw_info['server']['ldap_context'],$filter);
+
+                       $sri = 
@ldap_search($ldap,$GLOBALS['phpgw_info']['server']['ldap_context'],$filter);
                        if ($sri)
                        {
                                $allValues      = ldap_get_entries($ldap, $sri);
@@ -202,7 +196,7 @@
                        {
                                return false;
                        }
-
+
                        $mail_address           = $this->mail_address;
                        $routing_address        = $this->routing_address;

@@ -283,13 +277,11 @@

                function writeConfigData($_data, $_serverid)
                {
-                       global $phpgw;
-
                        $storageData = $this->getLDAPStorageData($_serverid);

                        #print "write Data for 
".$storageData['qmail_servername']."<br>";

-                       $ds = $phpgw->common->ldapConnect();
+                       $ds = $GLOBALS['phpgw']->common->ldapConnect();

                        // check if the DN exists, if not create it
                        $filter = "objectclass=*";