close #36 new maps can not be created

exodus4d · Sep 29, 2015 · 962c380 · 962c380
1 parent d78fb9e
commit 962c380
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/app/main/model/alliancemodel.php b/app/main/model/alliancemodel.php
@@ -46,16 +46,18 @@ public function getMaps(){
 
         $this->filter('mapAlliances',
             ['active = ?', 1],
-            [
-                'limit' => $f3->get('PATHFINDER.MAX_MAPS_ALLIANCE'),
-                'order' => 'created'
-            ]
+            ['order' => 'created']
         );
 
         if($this->mapAlliances){
+            $mapCount = 0;
             foreach($this->mapAlliances as $mapAlliance){
-                if($mapAlliance->mapId->isActive()){
+                if(
+                    $mapAlliance->mapId->isActive() &&
+                    $mapCount < $f3->get('PATHFINDER.MAX_MAPS_ALLIANCE')
+                ){
                     $maps[] = $mapAlliance->mapId;
+                    $mapCount++;
                 }
             }
         }

diff --git a/app/main/model/corporationmodel.php b/app/main/model/corporationmodel.php
@@ -32,7 +32,6 @@ public function getData(){
         $cooperationData->name = $this->name;
         $cooperationData->sharing = $this->sharing;
 
-
         return $cooperationData;
     }
 
@@ -47,16 +46,18 @@ public function getMaps(){
 
         $this->filter('mapCorporations',
             ['active = ?', 1],
-            [
-                'limit' => $f3->get('PATHFINDER.MAX_MAPS_CORPORATION'),
-                'order' => 'created'
-            ]
+            ['order' => 'created']
         );
 
         if($this->mapCorporations){
+            $mapCount = 0;
             foreach($this->mapCorporations as $mapCorporation){
-                if($mapCorporation->mapId->isActive()){
+                if(
+                    $mapCorporation->mapId->isActive() &&
+                    $mapCount < $f3->get('PATHFINDER.MAX_MAPS_CORPORATION')
+                ){
                     $maps[] = $mapCorporation->mapId;
+                    $mapCount++;
                 }
             }
         }

diff --git a/app/main/model/usermodel.php b/app/main/model/usermodel.php
@@ -186,9 +186,7 @@ public function getMaps(){
         $this->filter(
             'userMaps',
             ['active = ?', 1],
-            [
-                'order' => 'created'
-            ]
+            ['order' => 'created']
         );
 
         $maps = [];