From 62654401cec11bb40d0acd5e3487e55204c4863a Mon Sep 17 00:00:00 2001
From: Exodus4D <exodus4d@gmail.com>
Date: Mon, 5 Oct 2015 20:57:28 +0200
Subject: [PATCH] close #41 Added support for multiple API-Keys matching the
 same character

---
 app/main/model/usermodel.php          | 27 +++++++++++++++++----------
 public/templates/dialog/settings.html |  2 +-
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/main/model/usermodel.php b/app/main/model/usermodel.php
index 1fef2e1b..74cb2e81 100644
--- a/app/main/model/usermodel.php
+++ b/app/main/model/usermodel.php
@@ -157,7 +157,7 @@ class UserModel extends BasicModel {
      * @return array|FALSE
      */
     public function getByName($name){
-        return $this->getByForeignKey('name', $name);
+        return $this->getByForeignKey('name', $name, [], 0);
     }
 
     /**
@@ -281,10 +281,11 @@ class UserModel extends BasicModel {
                     $userCharacter->save();
                 }
 
-                // set random main character
-                if(! $mainSet ){
-                    $userCharacters[0]->setMain(1);
-                    $userCharacters[0]->save();
+                // set first character as "main"
+                if( !$mainSet ){
+                    $userCharacter = reset($userCharacters);
+                    $userCharacter->setMain(1);
+                    $userCharacter->save();
                 }
             }
         }
@@ -299,6 +300,8 @@ class UserModel extends BasicModel {
 
         $this->filter('apis', ['active = ?', 1]);
 
+        // if a user has multiple API keys saved for ONE character,
+        // skip double characters!
         $userCharacters = [];
 
         if($this->apis){
@@ -306,14 +309,18 @@ class UserModel extends BasicModel {
             while($this->apis->valid()){
 
                 $this->apis->current()->filter('userCharacters', ['active = ?', 1]);
+
                 if($this->apis->current()->userCharacters){
                     $this->apis->current()->userCharacters->rewind();
                     while($this->apis->current()->userCharacters->valid()){
-                        $userCharacters[] = $this->apis->current()->userCharacters->current();
+
+                        $tempCharacterId = $this->apis->current()->userCharacters->current()->characterId->get('id');
+                        if( !isset($userCharacters[ $tempCharacterId ]) ){
+                            $userCharacters[ $tempCharacterId ] = $this->apis->current()->userCharacters->current();
+                        }
                         $this->apis->current()->userCharacters->next();
                     }
                 }
-
                 $this->apis->next();
             }
         }
@@ -347,17 +354,17 @@ class UserModel extends BasicModel {
     public function getActiveUserCharacter(){
         $activeUserCharacter = null;
 
-        $apiController = Controller\CcpApiController::getIGBHeaderData();
+        $headerData = Controller\CcpApiController::getIGBHeaderData();
 
         // check if IGB Data is available
-        if( !empty($apiController->values) ){
+        if( !empty($headerData->values) ){
             // search for the active character by IGB Header Data
 
             $this->filter('userCharacters',
                 [
                     'active = :active AND characterId = :characterId',
                     ':active' => 1,
-                    ':characterId' => intval($apiController->values['charid'])
+                    ':characterId' => intval($headerData->values['charid'])
                 ],
                 ['limit' => 1]
             );
diff --git a/public/templates/dialog/settings.html b/public/templates/dialog/settings.html
index 45df2cd6..3117d91b 100644
--- a/public/templates/dialog/settings.html
+++ b/public/templates/dialog/settings.html
@@ -227,7 +227,7 @@
                                     Don't have one? - Create a new key with an empty 'Access Mask'.
                                 </p>
                                 <small>Get your new/custom API Key from
-                                    <a href="https://support.eveonline.com/api" target="_blank">here</a>
+                                    <a href="https://community.eveonline.com/support/api-key/" target="_blank">here</a>
                                     and come back to this page.
                                 </small>
                             </blockquote>