harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "yet more session work"

Browse Source 
This reverts commit 51edd472c2.
This commit is contained in:
redmatrix 2016-05-18 17:02:46 -07:00
parent 166d63ff60
commit 37d14f3a1d
2 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Zotlabs/Storage/BasicAuth.php
View File

@ -73,9 +73,6 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
protected $timezone = '';
public $module_disabled = false;
/**
* @brief Validates a username and password.
*
@ -95,7 +92,7 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
intval($record['account_id']),
intval($record['account_default_channel'])
);
if($r && $this->check_module_access($r[0]['channel_id'])) {
if ($r) {
return $this->setAuthenticated($r[0]);
}
}
@ -112,17 +109,13 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
if ((($record['account_flags'] == ACCOUNT_OK) || ($record['account_flags'] == ACCOUNT_UNVERIFIED))
&& (hash('whirlpool', $record['account_salt'] . $password) === $record['account_password'])) {
logger('password verified for ' . $username);
if($this->check_module_access($r[0]['channel_id']))
return $this->setAuthenticated($r[0]);
return $this->setAuthenticated($r[0]);
}
}
}
}
if($this->module_disabled)
$error = 'module not enabled for ' . $username;
else
$error = 'password failed for ' . $username;
$error = 'password failed for ' . $username;
logger($error);
log_failed_login($error);
@ -146,17 +139,6 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
return true;
}
protected function check_module_access($channel_id) {
if($channel_id && \App::$module === 'cdav') {
$x = get_pconfig($channel_id,'cdav','enabled');
if(! $x) {
$this->module_disabled = true;
return false;
}
}
return true;
}
/**
* Sets the channel_name from the currently logged-in channel.
*

4
Zotlabs/Web/Session.php
View File

@ -13,8 +13,8 @@ namespace Zotlabs\Web;
class Session {
private $handler = null;
private $session_started = false;
static private $handler = null;
static private $session_started = false;
public function init() {