diff --git a/app/main/controller/api/map.php b/app/main/controller/api/map.php index a53303ac..ab77b251 100644 --- a/app/main/controller/api/map.php +++ b/app/main/controller/api/map.php @@ -167,9 +167,9 @@ class Map extends Controller\AccessController { // get max number of shared entities per map ------------------------------------------------------------------ $maxSharedCount = [ - 'character' => $f3->get('PATHFINDER.MAX_SHARED_CHARACTER'), - 'corporation' => $f3->get('PATHFINDER.MAX_SHARED_CORPORATION'), - 'alliance' => $f3->get('PATHFINDER.MAX_SHARED_ALLIANCE'), + 'character' => $f3->get('PATHFINDER.MAP.PRIVATE.MAX_SHARED'), + 'corporation' => $f3->get('PATHFINDER.MAP.CORPORATION.MAX_SHARED'), + 'alliance' => $f3->get('PATHFINDER.MAP.ALLIANCE.MAX_SHARED'), ]; $return->maxSharedCount = $maxSharedCount; @@ -359,7 +359,7 @@ class Map extends Controller\AccessController { // share map between characters -> set access if(isset($formData['mapCharacters'])){ // avoid abuse -> respect share limits - $accessCharacters = array_slice( $formData['mapCharacters'], 0, $f3->get('PATHFINDER.MAX_SHARED_CHARACTER') ); + $accessCharacters = array_slice( $formData['mapCharacters'], 0, $f3->get('PATHFINDER.MAP.PRIVATE.MAX_SHARED') ); // clear map access. In case something has removed from access list $map->clearAccess(); @@ -396,7 +396,7 @@ class Map extends Controller\AccessController { // share map between corporations -> set access if(isset($formData['mapCorporations'])){ // avoid abuse -> respect share limits - $accessCorporations = array_slice( $formData['mapCorporations'], 0, $f3->get('PATHFINDER.MAX_SHARED_CORPORATION') ); + $accessCorporations = array_slice( $formData['mapCorporations'], 0, $f3->get('PATHFINDER.MAP.CORPORATION.MAX_SHARED') ); // clear map access. In case something has removed from access list $map->clearAccess(); @@ -433,7 +433,7 @@ class Map extends Controller\AccessController { // share map between alliances -> set access if(isset($formData['mapAlliances'])){ // avoid abuse -> respect share limits - $accessAlliances = array_slice( $formData['mapAlliances'], 0, $f3->get('PATHFINDER.MAX_SHARED_ALLIANCE') ); + $accessAlliances = array_slice( $formData['mapAlliances'], 0, $f3->get('PATHFINDER.MAP.ALLIANCE.MAX_SHARED') ); // clear map access. In case something has removed from access list $map->clearAccess(); diff --git a/app/main/model/alliancemodel.php b/app/main/model/alliancemodel.php index 59d27075..76f414e6 100644 --- a/app/main/model/alliancemodel.php +++ b/app/main/model/alliancemodel.php @@ -72,7 +72,7 @@ class AllianceModel extends BasicModel { foreach($this->mapAlliances as $mapAlliance){ if( $mapAlliance->mapId->isActive() && - $mapCount < $f3->get('PATHFINDER.MAX_MAPS_ALLIANCE') + $mapCount < $f3->get('PATHFINDER.MAP.ALLIANCE.MAX_COUNT') ){ $maps[] = $mapAlliance->mapId; $mapCount++; diff --git a/app/main/model/charactermodel.php b/app/main/model/charactermodel.php index 35760d4c..cdf260cc 100644 --- a/app/main/model/charactermodel.php +++ b/app/main/model/charactermodel.php @@ -501,7 +501,7 @@ class CharacterModel extends BasicModel { $mapCountPrivate = 0; foreach($this->characterMaps as $characterMap){ if( - $mapCountPrivate < self::getF3()->get('PATHFINDER.MAX_MAPS_PRIVATE') && + $mapCountPrivate < self::getF3()->get('PATHFINDER.MAP.PRIVATE.MAX_COUNT') && $characterMap->mapId->isActive() ){ $maps[] = $characterMap->mapId; diff --git a/app/main/model/corporationmodel.php b/app/main/model/corporationmodel.php index 119eb7d0..e9148021 100644 --- a/app/main/model/corporationmodel.php +++ b/app/main/model/corporationmodel.php @@ -77,7 +77,7 @@ class CorporationModel extends BasicModel { foreach($this->mapCorporations as $mapCorporation){ if( $mapCorporation->mapId->isActive() && - $mapCount < $f3->get('PATHFINDER.MAX_MAPS_CORPORATION') + $mapCount < $f3->get('PATHFINDER.MAP.CORPORATION.MAX_COUNT') ){ $maps[] = $mapCorporation->mapId; $mapCount++; diff --git a/app/pathfinder.ini b/app/pathfinder.ini index 7fcfeec6..7408cbc9 100644 --- a/app/pathfinder.ini +++ b/app/pathfinder.ini @@ -11,16 +11,6 @@ EMAIL = ; source code [optional] REPO = https://github.com/exodus4d/pathfinder -; Max number of maps an entity can create -MAX_MAPS_PRIVATE = 3 -MAX_MAPS_CORPORATION = 3 -MAX_MAPS_ALLIANCE = 3 - -; Max number of shared entities per map -MAX_SHARED_CHARACTER = 10 -MAX_SHARED_CORPORATION = 3 -MAX_SHARED_ALLIANCE = 2 - ; show warning on "login" form if /setup route is active ; DO NOT disable this warning unless /setup route is protected by e.g. WebAuth SHOW_SETUP_WARNING = 1 @@ -54,14 +44,24 @@ LOGIN = templates/view/login.html 5XX = templates/status/5xx.html ; MAP ============================================================================================= +; Map settings for "private", "corporation" and "alliance" maps +; LIFETIME: Map will be deleted after "X" days, by cronjob +; MAX_COUNT: Users can create/view up to "X" maps of a type +; MAX_SHARED: Max number of shared entities per map [PATHFINDER.MAP.PRIVATE] -LIFETIME = 7 +LIFETIME = 14 +MAX_COUNT = 3 +MAX_SHARED = 10 [PATHFINDER.MAP.CORPORATION] LIFETIME = 99999 +MAX_COUNT = 3 +MAX_SHARED = 3 [PATHFINDER.MAP.ALLIANCE] LIFETIME = 99999 +MAX_COUNT = 3 +MAX_SHARED = 2 ; Route search ==================================================================================== [PATHFINDER.ROUTE] diff --git a/public/templates/view/setup.html b/public/templates/view/setup.html index aa8b4ffb..d783bac1 100644 --- a/public/templates/view/setup.html +++ b/public/templates/view/setup.html @@ -273,17 +273,17 @@ Max. count of private maps/user - {{ @PATHFINDER.MAX_MAPS_PRIVATE }} + {{ @PATHFINDER.MAP.PRIVATE.MAX_COUNT }} Max. count of corporation maps/user - {{ @PATHFINDER.MAX_MAPS_CORPORATION }} + {{ @PATHFINDER.MAP.CORPORATION.MAX_COUNT }} Max. count of alliance maps/user - {{ @PATHFINDER.MAX_MAPS_ALLIANCE }} + {{ @PATHFINDER.MAP.ALLIANCE.MAX_COUNT }} @@ -296,17 +296,17 @@ Max. shared users (private map) - {{ @PATHFINDER.MAX_SHARED_USER }} + {{ @PATHFINDER.MAP.PRIVATE.MAX_SHARED }} Max. shared users (corporation map) - {{ @PATHFINDER.MAX_SHARED_CORPORATION }} + {{ @PATHFINDER.MAP.CORPORATION.MAX_SHARED }} Max. shared users (alliance map) - {{ @PATHFINDER.MAX_SHARED_ALLIANCE }} + {{ @PATHFINDER.MAP.ALLIANCE.MAX_SHARED }}