From 433c55526578e94ae6b3ca20ab2c4bfb400f5577 Mon Sep 17 00:00:00 2001
From: Exodus4D <exodus4d@gmail.com>
Date: Sat, 3 Jun 2017 19:52:56 +0200
Subject: [PATCH] - added option to add custom *.ini files into /conf dir -
 smaller fixes

---
 .gitignore                        | 4 ++--
 app/config.ini                    | 1 +
 app/main/controller/admin.php     | 2 +-
 app/main/model/usermodel.php      | 2 +-
 app/pathfinder.ini                | 2 --
 js/app/map/local.js               | 2 +-
 public/js/v1.2.3/app/map/local.js | 2 +-
 public/templates/view/login.html  | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index faeb7561..8cd235b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,5 +50,5 @@ Temporary Items
 .sass-cache
 .usage
 *.gz
-/composer-dev.lock
-/composer.lock
+*.lock
+/conf/
diff --git a/app/config.ini b/app/config.ini
index 3904003a..16b6f468 100644
--- a/app/config.ini
+++ b/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
\ No newline at end of file
diff --git a/app/main/controller/admin.php b/app/main/controller/admin.php
index a38e345c..f95cd3d0 100644
--- a/app/main/controller/admin.php
+++ b/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);
         }
diff --git a/app/main/model/usermodel.php b/app/main/model/usermodel.php
index 73ed2565..93e59c84 100644
--- a/app/main/model/usermodel.php
+++ b/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;
diff --git a/app/pathfinder.ini b/app/pathfinder.ini
index a8f444a5..cbc2ad3c 100644
--- a/app/pathfinder.ini
+++ b/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
diff --git a/js/app/map/local.js b/js/app/map/local.js
index 1417e06b..29bdf747 100644
--- a/js/app/map/local.js
+++ b/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]);
 
diff --git a/public/js/v1.2.3/app/map/local.js b/public/js/v1.2.3/app/map/local.js
index 1417e06b..29bdf747 100644
--- a/public/js/v1.2.3/app/map/local.js
+++ b/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]);
 
diff --git a/public/templates/view/login.html b/public/templates/view/login.html
index addb321d..bb67f147 100644
--- a/public/templates/view/login.html
+++ b/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 *}