From b4aec41d3d2fa101fdf1d7b6f7581cbf77fdd1ca Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 21 Jun 2016 09:09:58 -0400
Subject: [PATCH] fix warnings and move User import up higher to where it needs
 to be

---
 web/api/app/Controller/AppController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/api/app/Controller/AppController.php b/web/api/app/Controller/AppController.php
index 190241889..6775fa846 100644
--- a/web/api/app/Controller/AppController.php
+++ b/web/api/app/Controller/AppController.php
@@ -73,8 +73,8 @@ class AppController extends Controller {
     $zmOptAuth = $config['Config']['Value'];
 
     if ( $zmOptAuth=='1' ) {
-      if ( $_REQUEST['user'] and $_REQUEST['pass'] ) {
-        $this->loadModel('User');
+      $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' => $_REQUEST['pass'],