From 9cfc032440ae641698bdec9f03ccad81a3fbe860 Mon Sep 17 00:00:00 2001
From: Exodus4D <exodus4d@gmail.com>
Date: Thu, 15 Jun 2017 21:34:08 +0200
Subject: [PATCH] - fixed bug with alliance/corporation whitelist configuration

---
 app/main/model/charactermodel.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/main/model/charactermodel.php b/app/main/model/charactermodel.php
index a72e8950..3a509861 100644
--- a/app/main/model/charactermodel.php
+++ b/app/main/model/charactermodel.php
@@ -566,14 +566,15 @@ class CharacterModel extends BasicModel {
 
                     // check if character alliance is set in whitelist
                     if(
-                        !$authStatus &&
+                        $authStatus != 'OK' &&
                         !empty($whitelistAlliance) &&
-                        $this->hasAlliance() &&
-                        in_array((int)$this->get('allianceId', true), $whitelistAlliance)
+                        $this->hasAlliance()
                     ){
-                        $authStatus =  'OK';
-                    }else{
-                        $authStatus = 'ALLIANCE';
+                        if( in_array((int)$this->get('allianceId', true), $whitelistAlliance) ){
+                            $authStatus =  'OK';
+                        }else{
+                            $authStatus = 'ALLIANCE';
+                        }
                     }
                 }
             }else{