ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use userLogin function from auth.php instead of cake code.

pull/2155/head
Isaac Connor 2018-07-11 10:33:49 -04:00
parent 983e3c45be
commit 4f80ca6871
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
web/api/app/Controller/AppController.php
View File

@ -80,19 +80,15 @@ class AppController extends Controller {
$this->loadModel('User');
if ( isset($_REQUEST['user']) and isset($_REQUEST['pass']) ) {
$user = $this->User->find('first', array ('conditions' => array (
'User.Username' => $_REQUEST['user'],
'User.Password' => DboSource::expression('PASSWORD(\''.$_REQUEST['pass'].'\')'),
)) );
if ( ! $user ) {
$user = userLogin($_REQUEST['user'],$_REQUEST['pass']);
if ( !$user ) {
throw new UnauthorizedException(__('User not found'));
return;
} else {
$this->Session->Write( 'user', $user['User'] );
$this->Session->Write( 'user.Username', $user['User']['Username'] );
$this->Session->Write( 'username', $user['User']['Username'] );
$this->Session->Write( 'passwordHash', $user['User']['Password'] );
$this->Session->Write( 'user.Enabled', $user['User']['Enabled'] );
if ( ! $this->Session->Write('user.Username', $user['Username']) )
$this->log("Error writing session var user.Username");
if ( ! $this->Session->Write('user.Enabled', $user['Enabled']) )
$this->log("Error writing session var user.Enabled");
}
}
@ -104,7 +100,7 @@ class AppController extends Controller {
return;
} else {
if ( ! $this->Session->Write('user.Username', $user['Username']) )
$this->log("Error writing session var user.Username");
$this->log("Error writing session var user.Username");
if ( ! $this->Session->Write('user.Enabled', $user['Enabled']) )
$this->log("Error writing session var user.Enabled");
}