- added option to add custom *.ini files into /conf dir

- smaller fixes

.gitignore

@@ -50,5 +50,5 @@ Temporary Items
 .sass-cache
 .usage
 *.gz
-/composer-dev.lock
-/composer.lock
+*.lock
+/conf/

app/config.ini

@@ -55,5 +55,6 @@ LANGUAGE                    =   en-US
 [configs]
 app/routes.ini              =   true
 app/pathfinder.ini          =   true
+conf/pathfinder.ini         =   true
 app/requirements.ini        =   true
 app/cron.ini                =   true

app/main/controller/admin.php

@@ -211,7 +211,7 @@ class Admin extends Controller{
     protected function filterValidCharacters(CharacterModel $character, $characterId){
         $characters = [];
         // check if kickCharacters belong to same Corp as admin character
-        // -> remove admin char from kickCharacters...
+        // -> remove admin char from valid characters...
         if( !empty($characterIds = array_diff( [$characterId], [$character->_id])) ){
             $characters = $character->getCorporation()->getCharacters($characterIds);
         }

app/main/model/usermodel.php

@@ -123,7 +123,7 @@ class UserModel extends BasicModel {
         switch($registrationStatus){
             case 0:
                 $f3 = self::getF3();
-                throw new Exception\RegistrationException($f3->get('PATHFINDER.REGISTRATION.MSG_DISABLED'));
+                throw new Exception\RegistrationException('User registration is currently not allowed');
                 break;
             case 1:
                 return true;

app/pathfinder.ini

@@ -19,8 +19,6 @@ SHOW_SETUP_WARNING          =   1
 [PATHFINDER.REGISTRATION]
 ; registration status (for new users) (0=disabled, 1=enabled)
 STATUS                      =   1
-; disabled message
-MSG_DISABLED                =   User registration is currently not allowed
 
 [PATHFINDER.LOGIN]
 ; expire time (in days) for login cookies

js/app/map/local.js

@@ -197,7 +197,7 @@ define([
                         userData[jumps][j].jumps = jumps;
 
                         let rowData = userData[jumps][j];
-console.log(rowData)
+
                         // check for existing rows
                         let indexes = filterRows(localTable, 'id', [rowData.id]);
 

public/js/v1.2.3/app/map/local.js

@@ -197,7 +197,7 @@ define([
                         userData[jumps][j].jumps = jumps;
 
                         let rowData = userData[jumps][j];
-console.log(rowData)
+
                         // check for existing rows
                         let indexes = filterRows(localTable, 'id', [rowData.id]);
 

public/templates/view/login.html

@@ -1,7 +1,7 @@
 {* config *}
 <check if="{{ @PATHFINDER.REGISTRATION.STATUS != '1' }}">
     <set registrationStatusButton="disabled" />
-    <set registrationStatusTitle= "{{@PATHFINDER.REGISTRATION.MSG_DISABLED}}" />
+    <set registrationStatusTitle= "User registration is currently not allowed" />
 </check>
 
 {* splash page *}