dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- improved configuration "pathfinder.ini" -> Moved some Map settings and grouped them)

Browse Source
This commit is contained in:
Exodus4D
2016-07-31 19:39:22 +02:00
parent cbb26ac5e3
commit 5fddcaeab3
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/main/controller/api/map.php
View File

@@ -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();

2
app/main/model/alliancemodel.php
View File

@@ -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++;

2
app/main/model/charactermodel.php
View File

@@ -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;

2
app/main/model/corporationmodel.php
View File

@@ -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++;

22
app/pathfinder.ini
View File

@@ -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]

12
public/templates/view/setup.html
View File

@@ -273,17 +273,17 @@
<thead>
<tr>
<td>Max. count of private maps/user</td>
<td class="text-right col-md-2"><kbd>{{ @PATHFINDER.MAX_MAPS_PRIVATE }}</kbd></td>
<td class="text-right col-md-2"><kbd>{{ @PATHFINDER.MAP.PRIVATE.MAX_COUNT }}</kbd></td>
</tr>
</thead>
<tbody>
<tr>
<td>Max. count of corporation maps/user</td>
<td class="text-right"><kbd>{{ @PATHFINDER.MAX_MAPS_CORPORATION }}</kbd></td>
<td class="text-right"><kbd>{{ @PATHFINDER.MAP.CORPORATION.MAX_COUNT }}</kbd></td>
</tr>
<tr>
<td>Max. count of alliance maps/user</td>
<td class="text-right"><kbd>{{ @PATHFINDER.MAX_MAPS_ALLIANCE }}</kbd></td>
<td class="text-right"><kbd>{{ @PATHFINDER.MAP.ALLIANCE.MAX_COUNT }}</kbd></td>
</tr>
</tbody>
</table>
@@ -296,17 +296,17 @@
<thead>
<tr>
<td>Max. shared users (private map)</td>
<td class="text-right col-md-2"><kbd>{{ @PATHFINDER.MAX_SHARED_USER }}</kbd></td>
<td class="text-right col-md-2"><kbd>{{ @PATHFINDER.MAP.PRIVATE.MAX_SHARED }}</kbd></td>
</tr>
</thead>
<tbody>
<tr>
<td>Max. shared users (corporation map)</td>
<td class="text-right"><kbd>{{ @PATHFINDER.MAX_SHARED_CORPORATION }}</kbd></td>
<td class="text-right"><kbd>{{ @PATHFINDER.MAP.CORPORATION.MAX_SHARED }}</kbd></td>
</tr>
<tr>
<td>Max. shared users (alliance map)</td>
<td class="text-right"><kbd>{{ @PATHFINDER.MAX_SHARED_ALLIANCE }}</kbd></td>
<td class="text-right"><kbd>{{ @PATHFINDER.MAP.ALLIANCE.MAX_SHARED }}</kbd></td>
</tr>
</tbody>
</table>