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

Merge branch 'master' into update_monitor_saving

This commit is contained in:
Isaac Connor 2019-09-18 11:41:16 -04:00
parent 458268d866 9889311b03
commit 2caca5f3ad
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/api/app/Controller/HostController.php
View File

@ -33,7 +33,12 @@ class HostController extends AppController {
function login() {
$username = $this->request->query('user') ? $this->request->query('user') : $this->request->data('user');
if ( !$username )
$username = $this->request->query('username') ? $this->request->query('username') : $this->request->data('username');
$password = $this->request->query('pass') ? $this->request->query('pass') : $this->request->data('pass');
if ( !$password )
$password = $this->request->query('password') ? $this->request->query('password') : $this->request->data('password');
$token = $this->request->query('token') ? $this->request->query('token') : $this->request->data('token');
if ( !($username && $password) && !$token ) {