v1.1.2 (#270)

* fixed #194 PHP 5.6 error * - closed #102 added "set waypoint/destination" context menu to route finder module - update "Select2" 4.0.0 -> 4.0.3 - update "Font Awesome" 4.6.1 -> 4.6.3 * - added *.js files for develop branch * - closed #195 fixed "BASE" dir for subDir installations - fixed "Home" menu link * - #195 improved js load path * - added "clear cache" function for manually cache clearing to /setup #200 #105 #158 - added cache size information to /setup - added current pathfinder "VERSION" to /setup - updated "requireJs" 2.1.20 ->2.2.0 - removed unnecessary page cache timings from static templates (page cache) * - added "document_root", "port", "protocol" and "PHP framework version" to /setup page - added new "shattered" wormhole types to "signature table", closed #182, #179 * - added new "delete old signatures" option to "signature reader" dialog, closed #95 * - added new housekeeping cronjob für cached files, closed #200 - added new cache size information to /setup page * - fixed signature groupId/typeId "overwriting" for already known signatures. closed #207 - improved system search dialog. Added trim(); before "api/signatures-> search" request * updated README.me * fixed PHP error "default object from empty value", closed #209 * reduced image file size * - added local storage (IndexedDB) - added local storage for map scroll position. closed #69 * - added "notice" panel for upcoming release information - improved layout for "release dialog" (GitHub API) - improved pagespeed (removed render blocking javascripts) - improved map scrollbar configuration - improved Chrome browser custom scrollbar layout - removed "sign up" buttons from "map panels", closed #214 * - fixed some session and cookie bugs * - added new requirement check for `max_input_vars` to /setup URL, closed #224 * - fixed isWormhole(); bug * -v1.1.1 added js build files * - removed IGB support #206 - removed location tracking by IGB * - added build files for upcoming version 1.1.2 - improved ajax authentication check and "logout" notification | closed #198 - improved logging, added missing log file configuration to pathfinder.ini - added logging for "unauthorized" requests | closed #198 - updated js "jQuery" 1.11.3 -> 3.0.0 | #206 - updated js "datatables" plugin 1.10.7 -> 1.10.12 | #206 - updated js "mCustomScrollbar" 3.1.14 -> 3.1.4 | #206 * - fixed some minor bugs in signature table module * - fixed type "Cataclysmic", closed #241 * - added new setup DB indexing for "system_neighbour" table to /setup route, #125 - fixed system "TrueSec" rounding in "routes module", closed #109 * - fixed system "TrueSec" rounding in "routes module", closed #109 * - added new wormhole statics for "Thera", closed #240 * - fixed missing statics for constellation "21000062" , closed #232 * - added "static" wormholes for "shattered" systems , closed #180 - added im/export function for "index" tables (*.csv import), as an alternative to the *.sql import, closed #125 * - added new system tooltip for "region name", closed #236 - updated "Bootstrap" JS-library 3.3.0 -> 3.3.5 * - removed console.log(),,, * minor bugfixes in /setup page * - added basic support for Russian signatures, closed #256 - added warning notification for invalid signature stings * - added basic support for Russian signatures, closed #256 * - added requirement check for "PDO", "PDO_MYSQL" to "/setup" route - imrpved DB PDO connection (added "TIMEOUT", forced "ERRMODE") - fixed broken "system alias" renaming dialog * - fixed "system graph" module rendering if there was no data available - improved "image gallery" initialization on landing page - added navigation to /setup page - updated "blueImpGallery" (fixed some bugs after jQuery 3.0 upgrade) 1.15.2 -> 2.21.3 - updated "blueImpGalleryBootstrap" (fixed some bugs after jQuery 3.0 upgrade) 3.1.1 -> 3.4.2 * - JS build files vor 1.1.2 * Updated pathfinder.css
exodus4d · Jul 29, 2016 · 5c1cdca · 5c1cdca
1 parent e01f299
commit 5c1cdca
Show file tree

Hide file tree

Showing 140 changed files with 9,951 additions and 8,646 deletions.
diff --git a/app/config.ini b/app/config.ini
@@ -29,15 +29,18 @@ TEMP                        =   tmp/
 ; Log file folder
 LOGS                        =   logs/
 
-; Search path for user interface files used by the View and Template classes' render() method.
+; UI/template folder
 UI                          =   public/
 
-; Search path(s) for user-defined PHP classes that the framework will attempt to autoload at runtime
+; Autoloader for user-defined PHP classes that the framework will attempt to autoload at runtime
 AUTOLOAD                    =   app/main/
 
-; path to favicons folder
+; Favicons
 FAVICON                     =   favicon/
 
+; Export folder (e.g. static table data)
+EXPORT                      =   export/
+
 ; load additional config files
 ; DO NOT load environment.ini, it is loaded automatically
 [configs]

diff --git a/app/main/controller/accesscontroller.php b/app/main/controller/accesscontroller.php
@@ -24,8 +24,19 @@ function beforeroute(\Base $f3) {
         $loginCheck = $this->checkLogTimer($f3);
 
         if( !$loginCheck ){
-            // no user found or LogIn timer expired
+            // no user found or login timer expired
             $this->logout($f3);
+
+            if( $f3->get('AJAX') ){
+                // unauthorized request
+                $f3->status(403);
+            }else{
+                // redirect to landing page
+                $f3->reroute('@login');
+            }
+
+            // die() triggers unload() function
+            die();
         }
     }
 

diff --git a/app/main/controller/api/connection.php b/app/main/controller/api/connection.php
@@ -39,56 +39,53 @@ public function save(\Base $f3){
 
             $activeCharacter = $this->getCharacter();
 
-            if($activeCharacter){
-
-                // get map model and check map access
-                /**
-                 * @var Model\MapModel $map
-                 */
-                $map = Model\BasicModel::getNew('MapModel');
-                $map->getById( (int)$mapData['id'] );
-
-                if( $map->hasAccess($activeCharacter) ){
-                    $source = $map->getSystemById( $connectionData['source'] );
-                    $target = $map->getSystemById( $connectionData['target'] );
-
-                    if(
-                        !is_null($source) &&
-                        !is_null($target)
-                    ){
-                        /**
-                         * @var $connection Model\ConnectionModel
-                         */
-                        $connection = Model\BasicModel::getNew('ConnectionModel');
-                        $connection->getById( (int)$connectionData['id'] );
-
-                        // search if systems are neighbors
-                        $routeController = new Route();
-                        $routeController->initJumpData();
-                        $route = $routeController->findRoute($connectionData['sourceName'], $connectionData['targetName'], 1);
-
-                        if($route['routePossible'] == true){
-                            // systems are next to each other
-                            $connectionData['scope'] = 'stargate';
-                            $connectionData['type'] = ['stargate'];
-                        }elseif($connectionData['scope'] == 'stargate'){
-                            // connection scope changed -> this can not be a stargate
-                            $connectionData['scope'] = 'wh';
-                            $connectionData['type'] = ['wh_fresh'];
-                        }
-
-                        $connectionData['mapId'] = $map;
-
-                        // "updated" should not be set by client e.g. after manual drag&drop
-                        unset($connectionData['updated']);
-
-                        $connection->setData($connectionData);
-
-                        if( $connection->isValid() ){
-                            $connection->save();
-
-                            $newConnectionData = $connection->getData();
-                        }
+            // get map model and check map access
+            /**
+             * @var Model\MapModel $map
+             */
+            $map = Model\BasicModel::getNew('MapModel');
+            $map->getById( (int)$mapData['id'] );
+
+            if( $map->hasAccess($activeCharacter) ){
+                $source = $map->getSystemById( $connectionData['source'] );
+                $target = $map->getSystemById( $connectionData['target'] );
+
+                if(
+                    !is_null($source) &&
+                    !is_null($target)
+                ){
+                    /**
+                     * @var $connection Model\ConnectionModel
+                     */
+                    $connection = Model\BasicModel::getNew('ConnectionModel');
+                    $connection->getById( (int)$connectionData['id'] );
+
+                    // search if systems are neighbors
+                    $routeController = new Route();
+                    $routeController->initJumpData();
+                    $route = $routeController->findRoute($connectionData['sourceName'], $connectionData['targetName'], 1);
+
+                    if($route['routePossible'] == true){
+                        // systems are next to each other
+                        $connectionData['scope'] = 'stargate';
+                        $connectionData['type'] = ['stargate'];
+                    }elseif($connectionData['scope'] == 'stargate'){
+                        // connection scope changed -> this can not be a stargate
+                        $connectionData['scope'] = 'wh';
+                        $connectionData['type'] = ['wh_fresh'];
+                    }
+
+                    $connectionData['mapId'] = $map;
+
+                    // "updated" should not be set by client e.g. after manual drag&drop
+                    unset($connectionData['updated']);
+
+                    $connection->setData($connectionData);
+
+                    if( $connection->isValid() ){
+                        $connection->save();
+
+                        $newConnectionData = $connection->getData();
                     }
                 }
             }
@@ -104,18 +101,17 @@ public function save(\Base $f3){
      */
     public function delete(\Base $f3){
         $connectionIds = $f3->get('POST.connectionIds');
+        $activeCharacter = $this->getCharacter();
 
-        if($activeCharacter = $this->getCharacter()){
-            /**
-             * @var Model\ConnectionModel $connection
-             */
-            $connection = Model\BasicModel::getNew('ConnectionModel');
-            foreach($connectionIds as $connectionId){
-                $connection->getById($connectionId);
-                $connection->delete( $activeCharacter );
+        /**
+         * @var Model\ConnectionModel $connection
+         */
+        $connection = Model\BasicModel::getNew('ConnectionModel');
+        foreach($connectionIds as $connectionId){
+            $connection->getById($connectionId);
+            $connection->delete( $activeCharacter );
 
-                $connection->reset();
-            }
+            $connection->reset();
         }
 
         echo json_encode([]);