[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_ldap.inc.php,1.109,1.110 class.accounts_sql.inc.php,1.88,1.89 class.sessions_db.inc.php,1.7,1.8 class.sessions_php4.inc.php,1.10,1.11

[Mark A Peters <address@hidden>]

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

Modified Files:
        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.109
retrieving revision 1.110
diff -C2 -r1.109 -r1.110
*** class.accounts_ldap.inc.php 26 May 2002 21:16:25 -0000      1.109
--- class.accounts_ldap.inc.php 2 Sep 2002 02:32:10 -0000       1.110
***************
*** 455,466 ****
                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])
                        {
--- 455,466 ----
                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])
                        {
***************
*** 836,838 ****
                        return $allValues[0]['dn'];
                }
!       }
--- 836,838 ----
                        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.88
retrieving revision 1.89
diff -C2 -r1.88 -r1.89
*** class.accounts_sql.inc.php  26 May 2002 21:16:25 -0000      1.88
--- class.accounts_sql.inc.php  2 Sep 2002 02:32:10 -0000       1.89
***************
*** 229,234 ****
                {
                        static $account_type;
- 
                        $account_id = get_account_id($accountid);
                        if(@isset($account_type[$account_id]) && 
@$account_type[$account_id])
                        {
--- 229,243 ----
                {
                        static $account_type;
                        $account_id = get_account_id($accountid);
+ 
+                       if (isset($this->account_type) && $account_id == 
$this->account_id)
+                       {
+                               return $this->account_type;
+                       }
+                       elseif($account_id == '')
+                       {
+                               return False;
+                       }
+ 
                        if(@isset($account_type[$account_id]) && 
@$account_type[$account_id])
                        {
***************
*** 423,425 ****
        /*!
         @class_end accounts
!       */
--- 432,434 ----
        /*!
         @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.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.sessions_db.inc.php   12 Aug 2002 00:59:34 -0000      1.7
--- class.sessions_db.inc.php   2 Sep 2002 02:32:10 -0000       1.8
***************
*** 331,335 ****
                        }
  
!                       if (! 
$GLOBALS['phpgw']->auth->authenticate($this->account_lid, $this->passwd, 
$this->passwd_type) || 
$GLOBALS['phpgw']->accounts->get_type($this->account_lid) == 'g')
                        {
                                return False;
--- 331,335 ----
                        }
  
!                       if 
((!$GLOBALS['phpgw']->auth->authenticate($this->account_lid, $this->passwd, 
$this->passwd_type)) || 
$GLOBALS['phpgw']->accounts->get_type($this->account_lid) == 'g')
                        {
                                return False;
***************
*** 337,341 ****
                        }
  
!                       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);
--- 337,341 ----
                        }
  
!                       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);
***************
*** 634,638 ****
                {
                        global $PHP_SELF;
!                       if(MENUACTION)
                        {
                                $action = MENUACTION;
--- 634,638 ----
                {
                        global $PHP_SELF;
!                       if(defined('MENUACTION'))
                        {
                                $action = MENUACTION;
***************
*** 974,977 ****
--- 974,978 ----
                        if (is_array($extravars))
                        {
+                               $new_extravars = '';
                                reset($extravars);
                                while(list($key,$value) = each($extravars))
***************
*** 984,991 ****
--- 985,995 ----
                                }
                                /* This needs to be explictly reset to a string 
variable type for PHP3 */
+ /*
                                settype($extravars,'string');
                                $extravars = $new_extravars;
                                unset($new_extravars);
                                return $url .= '?' . $extravars;
+ */
+                               return $url .= '?' . $new_extravars;
                        }
                        /* if no extravars then we return the cleaned up 
url/scriptname */
***************
*** 993,995 ****
                }
        }
! ?>
--- 997,999 ----
                }
        }
! ?>
\ 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.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.sessions_php4.inc.php 12 Aug 2002 00:59:34 -0000      1.10
--- class.sessions_php4.inc.php 2 Sep 2002 02:32:10 -0000       1.11
***************
*** 314,318 ****
                        }
  
!                       if (! 
$GLOBALS['phpgw']->auth->authenticate($this->account_lid, $this->passwd, 
$this->passwd_type) || 
$GLOBALS['phpgw']->accounts->get_type($this->account_lid) == 'g')
                        {
                                return False;
--- 314,318 ----
                        }
  
!                       if 
((!$GLOBALS['phpgw']->auth->authenticate($this->account_lid, $this->passwd, 
$this->passwd_type)) || 
$GLOBALS['phpgw']->accounts->get_type($this->account_lid) == 'g')
                        {
                                return False;
***************
*** 320,324 ****
                        }
  
!                       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);
--- 320,324 ----
                        }
  
!                       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);
***************
*** 955,957 ****
                }
        }
- 
--- 955,956 ----