[Phpgroupware-cvs] api/auth/class.auth_ldap.php, 1.1.1.1.2.2

[nomail]

Update of /api/auth
Modified Files:
        Branch: proposal-branch
          class.auth_ldap.php

date: 2004/04/16 20:59:49;  author: seek3r;  state: Exp;  lines: +8 -8

Log Message:
bringing savannah cvs back up to date with what we were doing on our private 
cvs server. We will not be doing dev from this cvs tree
=====================================================================
No syntax errors detected in -
=====================================================================
Index: api/auth/class.auth_ldap.php
diff -u api/auth/class.auth_ldap.php:1.1.1.1.2.1 
api/auth/class.auth_ldap.php:1.1.1.1.2.2
--- api/auth/class.auth_ldap.php:1.1.1.1.2.1    Mon Nov  3 17:31:22 2003
+++ api/auth/class.auth_ldap.php        Fri Apr 16 20:59:49 2004
@@ -41,13 +41,13 @@
                        {
                                $GLOBALS['phpgw']->log->message('F-Abort, 
Failed connecting to LDAP server for authenication, execution stopped');
                                $GLOBALS['phpgw']->log->commit();
-                               return False;
+                               return false;
                        }
 
                        /* Login with the LDAP Admin. User to find the User DN. 
 */
                        if(address@hidden($ldap, 
$GLOBALS['phpgw_data']['server']['ldap_root_dn'], 
$GLOBALS['phpgw_data']['server']['ldap_root_pw']))
                        {
-                               return False;
+                               return false;
                        }
                        
                        /* find the dn for this uid, the uid is not always in 
the dn */
@@ -69,7 +69,7 @@
                                /* try to bind as the user with user suplied 
password */
                                if (@ldap_bind($ldap, $userDN, $passwd))
                                {
-                                       return True;
+                                       return true;
                                }
                        }
 
@@ -77,7 +77,7 @@
                        error_reporting(7);
 
                        /* dn not found or password wrong */
-                       return False;
+                       return false;
                }
 
                function change_password($old_passwd, $new_passwd, 
$_account_id='') 
@@ -107,7 +107,7 @@
                /* This data needs to be updated in LDAP, not SQL (jengo) */
                function old_update_lastlogin($account_id, $ip)
                {
-                       $GLOBALS['phpgw']->db->query("SELECT account_lastlogin 
FROM phpgw_accounts WHERE account_id='$account_id'",__LINE__,__FILE__);
+                       $GLOBALS['phpgw']->db->query("SELECT account_lastlogin 
FROM phpgw_accounts WHERE account_id='$account_id'");
                        $GLOBALS['phpgw']->db->next_record();
                        $this->previous_login = 
$GLOBALS['phpgw']->db->f('account_lastlogin');
 
@@ -115,7 +115,7 @@
 
                        $GLOBALS['phpgw']->db->query("UPDATE phpgw_accounts SET 
account_lastloginfrom='"
                                . "$ip', account_lastlogin='" . $now
-                               . "' WHERE 
account_id='$account_id'",__LINE__,__FILE__);
+                               . "' WHERE account_id='$account_id'");
                }
 
                function update_lastlogin($_account_id, $ip)