ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'add_api_auth' into storageareas

This commit is contained in:
Isaac Connor 2016-06-07 16:33:50 -04:00
parent 94174a1fe2 dbdd1ae51e
commit 4fbab64368
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,6 @@ class AppController extends Controller {
if ( $zmOptAuth=='1' ) {
if ( $_REQUEST['user'] and $_REQUEST['pass'] ) {
$this->loadModel('User');
$this->log("have user " . $_REQUEST['user'] ." and pass " . $_REQUEST['pass'] ."!", 'error');
$user = $this->User->find('first', array ('conditions' => array (
'User.Username' => $_REQUEST['user'],
'User.Password' => $_REQUEST['pass'],
@ -84,7 +83,6 @@ class AppController extends Controller {
throw new UnauthorizedException(__('User not found'));
return;
} else {
$this->log("Found user " . $_REQUEST['user'] ." and pass " . $_REQUEST['pass'] ."!", 'error');
$this->Session->Write( 'user.Username', $user['User']['Username'] );
$this->Session->Write( 'user.Enabled', $user['User']['Enabled'] );
}
@ -98,7 +96,7 @@ class AppController extends Controller {
return;
}
$options = array ('conditions' => array ('User.Username' => $loggedinUser));
$options = array ('conditions' => array ('User.Username' => $this->Session->Read('user.Username')));
$userMonitors = $this->User->find('first', $options);
$this->Session->Write('allowedMonitors',$userMonitors['User']['MonitorIds']);
$this->Session->Write('streamPermission',$userMonitors['User']['Stream']);