[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc/sessions class.sessions.inc.php
From: |
Dave Hall |
Subject: |
[Phpgroupware-cvs] phpgwapi/inc/sessions class.sessions.inc.php |
Date: |
Wed, 27 Dec 2006 06:34:49 +0000 |
CVSROOT: /sources/phpgwapi
Module name: phpgwapi
Changes by: Dave Hall <skwashd> 06/12/27 06:34:49
Modified files:
inc/sessions : class.sessions.inc.php
Log message:
fix 'known' password type, clean up read_repo code + docs
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/sessions/class.sessions.inc.php?cvsroot=phpgwapi&r1=1.6&r2=1.7
Patches:
Index: class.sessions.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/sessions/class.sessions.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- class.sessions.inc.php 26 Dec 2006 11:58:43 -0000 1.6
+++ class.sessions.inc.php 27 Dec 2006 06:34:49 -0000 1.7
@@ -10,7 +10,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.sessions.inc.php,v 1.6 2006/12/26 11:58:43
skwashd Exp $
+ * @version $Id: class.sessions.inc.php,v 1.7 2006/12/27 06:34:49
skwashd Exp $
* @link http://www.sanisoft.com/phplib/manual/session.php
*/
@@ -513,7 +513,6 @@
$blocked = false;
if ( ($blocked = $this->login_blocked($login,
$_SERVER['REMOTE_ADDR'])) // too many unsuccessful attempts
|| (
isset($GLOBALS['phpgw_info']['server']['global_denied_users'][$this->account_lid])
&& $GLOBALS['phpgw_info']['server']['global_denied_users'][$this->account_lid]
)
- || $passwd_type == 'known'
|| ($passwd_type != 'known' &&
!$GLOBALS['phpgw']->auth->authenticate($this->account_lid, $this->passwd,
$this->passwd_type) )
||
$GLOBALS['phpgw']->accounts->get_type($this->account_lid) == 'g')
{
@@ -558,7 +557,7 @@
$this->iv =
$GLOBALS['phpgw_info']['server']['mcrypt_iv'];
$GLOBALS['phpgw']->crypto->init(array($this->key,$this->iv));
- $this->read_repositories(False);
+ $this->read_repositories();
if ($this->user['expires'] != -1 &&
$this->user['expires'] < time())
{
if(is_object($GLOBALS['phpgw']->log))
@@ -897,16 +896,16 @@
*/
/**
- * Is this also useless?? (skwashd)
+ * Someone needs to document me
*/
- function read_repositories($cached='',$write_cache=True)
+ function read_repositories($cached = false, $write_cache = true)
{
$GLOBALS['phpgw']->acl->acl($this->account_id);
$GLOBALS['phpgw']->accounts->accounts($this->account_id);
$GLOBALS['phpgw']->preferences->preferences($this->account_id);
$GLOBALS['phpgw']->applications->applications($this->account_id);
- if(@$cached)
+ if($cached)
{
$this->user =
$this->appsession('phpgw_info_cache','phpgwapi');
if(!empty($this->user))
@@ -930,7 +929,7 @@
}
/**
- * Is this also useless?? (skwashd)
+ * Someone needs to document me
*/
function setup_cache($write_cache=True)
{
@@ -948,7 +947,7 @@
$this->user['account_id'] = $this->account_id;
$this->user['account_lid'] = $this->account_lid;
$this->user['userid'] = $this->account_lid;
- $this->user['passwd'] = @$this->passwd;
+ $this->user['passwd'] = $this->passwd;
if(@$GLOBALS['phpgw_info']['server']['cache_phpgw_info'] && $write_cache)
{
$this->delete_cache();