From 52957d1ac8a482a33f40e90669239daf88c69306 Mon Sep 17 00:00:00 2001 From: Exodus4D Date: Tue, 25 Aug 2015 23:04:47 +0200 Subject: [PATCH] Bug fixing, new map info dialog --- .gitignore | 1 + .htaccess | 21 +- .idea/dataSources.ids | 905 +++++++- .idea/dataSources.local.xml | 10 +- .idea/dataSources.xml | 16 +- .idea/deployment.xml | 22 +- .idea/jsLibraryMappings.xml | 1 + .idea/pathfinder.iml | 8 +- .idea/watcherTasks.xml | 6 +- .idea/workspace.xml | 1821 ++++++++++------- app/config.ini | 114 +- app/cron.ini | 2 +- app/main/controller/CcpApiController.php | 3 +- app/main/controller/Controller.php | 38 +- app/main/controller/MapController.php | 2 +- app/main/controller/api/Map.php | 4 +- app/main/controller/api/User.php | 17 +- app/main/controller/appcontroller.php | 4 - app/main/cron/ccpSystemsUpdate.php | 16 +- app/main/data/mapper/CcpSystemsMapper.php | 4 +- app/main/db/database.php | 53 +- app/main/exception/BaseException.php | 1 + app/main/exception/registrationexception.php | 18 + app/main/model/AllianceMapModel.php | 12 +- app/main/model/BasicModel.php | 19 +- app/main/model/CharacterLogModel.php | 8 +- app/main/model/CharacterModel.php | 19 +- app/main/model/ConnectionModel.php | 20 +- app/main/model/CorporationMapModel.php | 12 +- app/main/model/SystemModel.php | 36 +- app/main/model/SystemSignatureModel.php | 16 +- app/main/model/UserApiModel.php | 14 +- app/main/model/UserCharacterModel.php | 16 +- app/main/model/UserMapModel.php | 12 +- app/main/model/UserModel.php | 34 +- app/pathfinder.ini | 136 ++ app/routes.ini | 2 +- config.rb | 1 - index.php | 11 +- js/app.js | 28 +- js/app/landingpage.js | 28 +- js/app/map/contextmenu.js | 11 +- js/app/map/map.js | 69 +- js/app/mappage.js | 284 +++ js/app/module_map.js | 2 + js/app/ui/dialog/account_settings.js | 4 +- js/app/ui/dialog/credit.js | 7 +- js/app/ui/dialog/map_info.js | 375 +++- js/app/ui/header.js | 29 +- js/app/ui/logo.js | 4 +- js/app/ui/system_info.js | 8 +- js/app/ui/system_killboard.js | 2 +- js/app/ui/system_route.js | 51 +- js/app/ui/system_signature.js | 24 +- js/app/util.js | 22 +- js/lib/jquery-2.1.1.min.js | 4 - node_modules/.bin/build.js | 38 +- .../bootstrap-toggle/bootstrap2-toggle.css | 7 - public/css/pathfinder.css | 6 +- public/img/logo.png | Bin 48093 -> 0 bytes public/templates/dialog/credit.html | 86 +- public/templates/dialog/map_info.html | 7 + public/templates/modules/system_info.html | 2 +- public/templates/view/index.html | 19 +- public/templates/view/landingpage.html | 34 +- sass/_variables.scss | 2 +- sass/layout/_main.scss | 4 + sass/layout/_map.scss | 96 +- sass/layout/_system-info.scss | 52 +- sass/library/data-tables/_dataTables.scss | 12 +- 70 files changed, 3320 insertions(+), 1452 deletions(-) create mode 100644 app/main/exception/registrationexception.php create mode 100644 app/pathfinder.ini create mode 100644 js/app/mappage.js delete mode 100644 js/lib/jquery-2.1.1.min.js delete mode 100644 public/css/library/bootstrap-toggle/bootstrap2-toggle.css delete mode 100644 public/img/logo.png diff --git a/.gitignore b/.gitignore index 1cea188a..5ef3821d 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,7 @@ Temporary Items # ======================== # project files # ======================== +.idea .sass-cache .build_js .css diff --git a/.htaccess b/.htaccess index 9ff9acf7..ddf4a3bf 100644 --- a/.htaccess +++ b/.htaccess @@ -1,6 +1,21 @@ # Enable rewrite engine and route requests to framework RewriteEngine On +# HTTP to HTTPS ---------------------------------------------------------------- +RewriteCond %{HTTPS} off +RewriteCond %{HTTP_HOST} !=localhost + +# First rewrite to HTTPS: +# Don't put www. here. If it is already there it will be included, if not +# the subsequent rule will catch it. +RewriteRule .* https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] + +# Now, rewrite any request to the wrong domain to use www. +RewriteCond %{HTTP_HOST} !^www\. +RewriteCond %{HTTP_HOST} !=localhost +RewriteRule .* https://www.%{HTTP_HOST}%{REQUEST_URI} [L,R=301] + + # Some servers require you to specify the `RewriteBase` directive # In such cases, it should be the path (relative to the document root) # containing this .htaccess file @@ -16,15 +31,17 @@ RewriteCond %{REQUEST_FILENAME} !-d RewriteRule .* index.php [L,QSA] RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L] + # PHP global Vars php_value max_input_vars 5000 php_value suhosin.get.max_vars 5000 php_value suhosin.post.max_vars 5000 php_value suhosin.request.max_vars 5000 + # PHP error logs php_flag log_errors on -# php_value error_log "/www/htdocs/w0128162/pathfinder.exodus4d.de/php_errors.html" +# php_value error_log "/www/htdocs/w0128162/www.pathfinder.exodus4d.de/logs/php_errors.log" # cache images/pdf docs @@ -56,3 +73,5 @@ php_flag log_errors on ExpiresDefault "access plus 1 week" + + diff --git a/.idea/dataSources.ids b/.idea/dataSources.ids index 063c261a..c1a1daf2 100644 --- a/.idea/dataSources.ids +++ b/.idea/dataSources.ids @@ -1,14 +1,15 @@ - + #@ ` - + + - +
@@ -21,37 +22,37 @@
- +
- +
- +
- +
- +
- +
@@ -65,7 +66,7 @@
- +
@@ -74,7 +75,7 @@
- +
@@ -94,7 +95,7 @@
- +
@@ -108,7 +109,7 @@
- +
@@ -116,24 +117,24 @@
- +
- +
- +
- +
@@ -164,25 +165,25 @@
- +
- +
- +
- +
@@ -196,7 +197,7 @@
- +
@@ -224,42 +225,56 @@ +
- +
+ + + + + + + + + + + +
+
- +
- +
- +
- +
- +
@@ -268,7 +283,7 @@
- +
@@ -277,7 +292,7 @@
- +
@@ -286,16 +301,7 @@
- - - - - - - - -
- +
@@ -303,20 +309,19 @@
- +
- +
-
- +
@@ -326,12 +331,12 @@
- +
- +
@@ -340,22 +345,19 @@
- +
- +
- - - @@ -363,7 +365,7 @@
- +
@@ -374,7 +376,7 @@
- +
@@ -383,25 +385,25 @@
- +
- +
- +
- +
@@ -411,27 +413,27 @@
- +
- +
- +
- +
@@ -444,11 +446,14 @@ - + + + +
- +
@@ -456,7 +461,7 @@
- +
@@ -479,14 +484,14 @@
- +
- +
@@ -504,7 +509,7 @@
- +
@@ -521,6 +526,7 @@ + @@ -529,12 +535,12 @@
- +
- +
@@ -545,22 +551,22 @@
- +
- +
- +
- +
@@ -577,7 +583,7 @@
- +
@@ -586,7 +592,7 @@
- +
@@ -617,8 +623,9 @@ +
- +
@@ -633,25 +640,25 @@
- +
- +
- +
- +
@@ -659,7 +666,7 @@
- +
@@ -671,7 +678,7 @@
- +
@@ -679,7 +686,7 @@
- +
@@ -687,7 +694,7 @@
- +
@@ -699,13 +706,41 @@
- +
- +
+ + + + +
+ + + + + + + + + +
+ + + + + +
+ + + + + +
+ @@ -722,18 +757,18 @@
- +
- +
- +
@@ -760,7 +795,7 @@
- +
@@ -774,7 +809,7 @@
- +
@@ -782,7 +817,7 @@
- +
@@ -790,20 +825,20 @@
- +
- +
- +
@@ -811,17 +846,137 @@
- +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ @@ -925,6 +1080,7 @@ + @@ -936,6 +1092,7 @@ + @@ -1028,10 +1185,10 @@ - + - + @@ -1041,14 +1198,13 @@ - - + + - @@ -1246,7 +1402,7 @@
- + @@ -1254,19 +1410,19 @@ - +
- + - + @@ -1280,6 +1436,7 @@ + @@ -1344,4 +1501,542 @@
+ + + #@ + ` + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml index 10c46f9a..8429f892 100644 --- a/.idea/dataSources.local.xml +++ b/.idea/dataSources.local.xml @@ -3,8 +3,14 @@ root - eve_phoebe.* pathfinder.* - eve_phoebe.* pathfinder.* + eve_aegis.* eve_test.* pathfinder.* + pathfinder.* + + + master_key + d01d8636 + d01d8636.* + d01d8636.* \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 7aeb6464..7dee49de 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,6 +1,6 @@ - + mysql true @@ -12,5 +12,19 @@ + + mysql + true + com.mysql.jdbc.Driver + jdbc:mysql://exodus4d.de:3306 + + + + + + + + + \ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml index b05f9a37..5fac34b7 100644 --- a/.idea/deployment.xml +++ b/.idea/deployment.xml @@ -1,4 +1,24 @@ - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml index b8387eb1..5ebc0ea4 100644 --- a/.idea/jsLibraryMappings.xml +++ b/.idea/jsLibraryMappings.xml @@ -1,6 +1,7 @@ + \ No newline at end of file diff --git a/.idea/pathfinder.iml b/.idea/pathfinder.iml index e5631ff2..6af6f2a8 100644 --- a/.idea/pathfinder.iml +++ b/.idea/pathfinder.iml @@ -11,18 +11,14 @@ - - - - - - + + \ No newline at end of file diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml index 37585f35..8b9ad5b3 100644 --- a/.idea/watcherTasks.xml +++ b/.idea/watcherTasks.xml @@ -5,7 +5,7 @@