[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_ldap.inc.php,1.101.2.5,1.101.2.6 class.accounts_sql.inc.php,1.80.2.6,1.80.2.7 class.sessions_db.inc.php,1.2.2.2,1.2.2.3 class.sessions_php4.inc.php,1.6.2.1,1.6.2.2

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv23634

Modified Files:
      Tag: Version-0_9_14-branch
        class.accounts_ldap.inc.php class.accounts_sql.inc.php 
        class.sessions_db.inc.php class.sessions_php4.inc.php 
Log Message:
GNU Bug #800.

Index: class.accounts_ldap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts_ldap.inc.php,v
retrieving revision 1.101.2.5
retrieving revision 1.101.2.6
diff -C2 -r1.101.2.5 -r1.101.2.6
*** class.accounts_ldap.inc.php 26 Jun 2002 22:32:00 -0000      1.101.2.5
--- class.accounts_ldap.inc.php 2 Sep 2002 02:32:33 -0000       1.101.2.6
***************
*** 478,489 ****
                function get_type($accountid = '')
                {
!                       if (isset($this->account_type))
                        {
                                return $this->account_type;
                        }
  
-                       static $account_type;
- 
-                       $account_id = get_account_id($accountid);
                        if(@isset($account_type[$account_id]) && 
@$account_type[$account_id])
                        {
--- 478,489 ----
                function get_type($accountid = '')
                {
!                       static $account_type;
!                       $account_id = get_account_id($accountid);
! 
!                       if (isset($this->account_type) && $account_id == 
$this->account_id)
                        {
                                return $this->account_type;
                        }
  
                        if(@isset($account_type[$account_id]) && 
@$account_type[$account_id])
                        {
***************
*** 511,515 ****
                                return $account_type[$account_id];
                        }
- 
                        return $account_type[$account_id];
                }
--- 511,514 ----
***************
*** 844,846 ****
                        return $allValues[0]['dn'];
                }
!       }
--- 843,845 ----
                        return $allValues[0]['dn'];
                }
!       }
\ No newline at end of file

Index: class.accounts_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts_sql.inc.php,v
retrieving revision 1.80.2.6
retrieving revision 1.80.2.7
diff -C2 -r1.80.2.6 -r1.80.2.7
*** class.accounts_sql.inc.php  21 May 2002 03:22:08 -0000      1.80.2.6
--- class.accounts_sql.inc.php  2 Sep 2002 02:32:33 -0000       1.80.2.7
***************
*** 224,229 ****
                {
                        static $account_type;
- 
                        $account_id = get_account_id($accountid);
                        if(@isset($account_type[$account_id]) && 
@$account_type[$account_id])
                        {
--- 224,234 ----
                {
                        static $account_type;
                        $account_id = get_account_id($accountid);
+                       
+                       if (isset($this->account_type) && $account_id == 
$this->account_id)
+                       {
+                               return $this->account_type;
+                       }
+ 
                        if(@isset($account_type[$account_id]) && 
@$account_type[$account_id])
                        {
***************
*** 410,412 ****
        /*!
         @class_end accounts
!       */
--- 415,417 ----
        /*!
         @class_end accounts
!       */
\ No newline at end of file

Index: class.sessions_db.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions_db.inc.php,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** class.sessions_db.inc.php   2 Apr 2002 17:14:29 -0000       1.2.2.2
--- class.sessions_db.inc.php   2 Sep 2002 02:32:33 -0000       1.2.2.3
***************
*** 323,327 ****
                        }
  
!                       if (! 
$GLOBALS['phpgw']->auth->authenticate($this->account_lid, $this->passwd, 
$this->passwd_type) || 
$GLOBALS['phpgw']->accounts->get_type($this->account_lid) == 'g')
                        {
                                return False;
--- 323,327 ----
                        }
  
!                       if 
((!$GLOBALS['phpgw']->auth->authenticate($this->account_lid, $this->passwd, 
$this->passwd_type)) || 
$GLOBALS['phpgw']->accounts->get_type($this->account_lid) == 'g')
                        {
                                return False;
***************
*** 329,333 ****
                        }
  
!                       if 
(!$GLOBALS['phpgw']->accounts->exists($this->account_lid) && 
$GLOBALS['phpgw_info']['server']['auto_create_acct'] == True)
                        {
                                $this->account_id = 
$GLOBALS['phpgw']->accounts->auto_add($this->account_lid, $passwd);
--- 329,333 ----
                        }
  
!                       if 
((!$GLOBALS['phpgw']->accounts->exists($this->account_lid)) && 
$GLOBALS['phpgw_info']['server']['auto_create_acct'] == True)
                        {
                                $this->account_id = 
$GLOBALS['phpgw']->accounts->auto_add($this->account_lid, $passwd);
***************
*** 993,995 ****
                }
        }
! ?>
--- 993,995 ----
                }
        }
! ?>
\ No newline at end of file

Index: class.sessions_php4.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions_php4.inc.php,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** class.sessions_php4.inc.php 16 Jan 2002 02:11:20 -0000      1.6.2.1
--- class.sessions_php4.inc.php 2 Sep 2002 02:32:33 -0000       1.6.2.2
***************
*** 307,311 ****
                        }
  
!                       if (! 
$GLOBALS['phpgw']->auth->authenticate($this->account_lid, $this->passwd, 
$this->passwd_type) || 
$GLOBALS['phpgw']->accounts->get_type($this->account_lid) == 'g')
                        {
                                return False;
--- 307,311 ----
                        }
  
!                       if 
((!$GLOBALS['phpgw']->auth->authenticate($this->account_lid, $this->passwd, 
$this->passwd_type)) || 
$GLOBALS['phpgw']->accounts->get_type($this->account_lid) == 'g')
                        {
                                return False;
***************
*** 313,317 ****
                        }
  
!                       if 
(!$GLOBALS['phpgw']->accounts->exists($this->account_lid) && 
$GLOBALS['phpgw_info']['server']['auto_create_acct'] == True)
                        {
                                $this->account_id = 
$GLOBALS['phpgw']->accounts->auto_add($this->account_lid, $passwd);
--- 313,317 ----
                        }
  
!                       if 
((!$GLOBALS['phpgw']->accounts->exists($this->account_lid)) && 
$GLOBALS['phpgw_info']['server']['auto_create_acct'] == True)
                        {
                                $this->account_id = 
$GLOBALS['phpgw']->accounts->auto_add($this->account_lid, $passwd);
***************
*** 956,958 ****
                }
        }
- 
--- 956,957 ----