From b2ccb041647a93aab788852addc7d76e79fcd4df Mon Sep 17 00:00:00 2001 From: Exodus4D Date: Mon, 18 Jul 2016 01:39:39 +0200 Subject: [PATCH] minor bugfixes in /setup page --- app/main/controller/setup.php | 158 ++++++++++++++++------------ app/requirements.ini | 1 + package.json | 2 +- public/js/v1.1.2/app/map/overlay.js | 2 +- 4 files changed, 93 insertions(+), 70 deletions(-) diff --git a/app/main/controller/setup.php b/app/main/controller/setup.php index 2631d669..e3ea51cd 100644 --- a/app/main/controller/setup.php +++ b/app/main/controller/setup.php @@ -109,6 +109,12 @@ class Setup extends Controller { ] ]; + /** + * database error + * @var bool + */ + protected $databaseCheck = true; + /** * event handler for all "views" * some global template variables are set in here @@ -336,23 +342,23 @@ class Setup extends Controller { ], 'os' => [ 'label' => 'OS', - 'value' => php_uname('s') + 'value' => function_exists('php_uname') ? php_uname('s') : 'unknown' ], 'name' => [ 'label' => 'Host name', - 'value' => php_uname('n') + 'value' => function_exists('php_uname') ? php_uname('n') : 'unknown' ], 'release' => [ 'label' => 'Release name', - 'value' => php_uname('r') + 'value' => function_exists('php_uname') ? php_uname('r') : 'unknown' ], 'version' => [ 'label' => 'Version info', - 'value' => php_uname('v') + 'value' => function_exists('php_uname') ? php_uname('v') : 'unknown' ], 'machine' => [ 'label' => 'Machine type', - 'value' => php_uname('m') + 'value' => function_exists('php_uname') ? php_uname('m') : 'unknown' ], 'root' => [ 'label' => 'Document root', @@ -364,7 +370,7 @@ class Setup extends Controller { ], 'protocol' => [ 'label' => 'Protocol', - 'value' => $f3->get('SCHEME') + 'value' => strtoupper( $f3->get('SCHEME') ) ] ]; @@ -763,6 +769,10 @@ class Setup extends Controller { $f3->reroute('@setup'); } + if($dbStatusCheckCount !== 0){ + $this->databaseCheck = false; + } + $this->databases[$dbKey]['info'] = [ 'db' => $db, 'label' => $dbLabel, @@ -864,71 +874,83 @@ class Setup extends Controller { * @return array */ protected function getIndexData(){ - $indexInfo = [ - 'SystemNeighbourModel' => [ - 'action' => [ - [ - 'task' => 'buildIndex', - 'label' => 'build', - 'icon' => 'fa-refresh', - 'btn' => 'btn-primary' - ] + + // active DB and tables are required for obtain index data + if( $this->databaseCheck ){ + $indexInfo = [ + 'SystemNeighbourModel' => [ + 'action' => [ + [ + 'task' => 'buildIndex', + 'label' => 'build', + 'icon' => 'fa-refresh', + 'btn' => 'btn-primary' + ] + ], + 'table' => Model\BasicModel::getNew('SystemNeighbourModel')->getTable(), + 'count' => DB\Database::instance()->getRowCount( Model\BasicModel::getNew('SystemNeighbourModel')->getTable() ) ], - 'table' => Model\BasicModel::getNew('SystemNeighbourModel')->getTable(), - 'count' => DB\Database::instance()->getRowCount( Model\BasicModel::getNew('SystemNeighbourModel')->getTable() ) - ], - 'WormholeModel' => [ - 'action' => [ - [ - 'task' => 'exportTable', - 'label' => 'export', - 'icon' => 'fa-download', - 'btn' => 'btn-default' - ],[ - 'task' => 'importTable', - 'label' => 'import', - 'icon' => 'fa-upload', - 'btn' => 'btn-primary' - ] + 'WormholeModel' => [ + 'action' => [ + [ + 'task' => 'exportTable', + 'label' => 'export', + 'icon' => 'fa-download', + 'btn' => 'btn-default' + ],[ + 'task' => 'importTable', + 'label' => 'import', + 'icon' => 'fa-upload', + 'btn' => 'btn-primary' + ] + ], + 'table' => Model\BasicModel::getNew('WormholeModel')->getTable(), + 'count' => DB\Database::instance()->getRowCount( Model\BasicModel::getNew('WormholeModel')->getTable() ) ], - 'table' => Model\BasicModel::getNew('WormholeModel')->getTable(), - 'count' => DB\Database::instance()->getRowCount( Model\BasicModel::getNew('WormholeModel')->getTable() ) - ], - 'SystemWormholeModel' => [ - 'action' => [ - [ - 'task' => 'exportTable', - 'label' => 'export', - 'icon' => 'fa-download', - 'btn' => 'btn-default' - ],[ - 'task' => 'importTable', - 'label' => 'import', - 'icon' => 'fa-upload', - 'btn' => 'btn-primary' - ] + 'SystemWormholeModel' => [ + 'action' => [ + [ + 'task' => 'exportTable', + 'label' => 'export', + 'icon' => 'fa-download', + 'btn' => 'btn-default' + ],[ + 'task' => 'importTable', + 'label' => 'import', + 'icon' => 'fa-upload', + 'btn' => 'btn-primary' + ] + ], + 'table' => Model\BasicModel::getNew('SystemWormholeModel')->getTable(), + 'count' => DB\Database::instance()->getRowCount( Model\BasicModel::getNew('SystemWormholeModel')->getTable() ) ], - 'table' => Model\BasicModel::getNew('SystemWormholeModel')->getTable(), - 'count' => DB\Database::instance()->getRowCount( Model\BasicModel::getNew('SystemWormholeModel')->getTable() ) - ], - 'ConstellationWormholeModel' => [ - 'action' => [ - [ - 'task' => 'exportTable', - 'label' => 'export', - 'icon' => 'fa-download', - 'btn' => 'btn-default' - ],[ - 'task' => 'importTable', - 'label' => 'import', - 'icon' => 'fa-upload', - 'btn' => 'btn-primary' - ] - ], - 'table' => Model\BasicModel::getNew('ConstellationWormholeModel')->getTable(), - 'count' => DB\Database::instance()->getRowCount( Model\BasicModel::getNew('ConstellationWormholeModel')->getTable() ) - ] - ]; + 'ConstellationWormholeModel' => [ + 'action' => [ + [ + 'task' => 'exportTable', + 'label' => 'export', + 'icon' => 'fa-download', + 'btn' => 'btn-default' + ],[ + 'task' => 'importTable', + 'label' => 'import', + 'icon' => 'fa-upload', + 'btn' => 'btn-primary' + ] + ], + 'table' => Model\BasicModel::getNew('ConstellationWormholeModel')->getTable(), + 'count' => DB\Database::instance()->getRowCount( Model\BasicModel::getNew('ConstellationWormholeModel')->getTable() ) + ] + ]; + }else{ + $indexInfo = [ + 'SystemNeighbourModel' => [ + 'action' => [], + 'table' => 'Fix database errors first!' + ] + ]; + } + return $indexInfo; } diff --git a/app/requirements.ini b/app/requirements.ini index 48ceaf08..fcf161e7 100644 --- a/app/requirements.ini +++ b/app/requirements.ini @@ -42,5 +42,6 @@ CHARACTER_SET_CONNECTION = utf8 COLLATION_DATABASE = utf8_general_ci COLLATION_CONNECTION = utf8_general_ci FOREIGN_KEY_CHECKS = ON +LOWER_CASE_TABLE_NAMES = 2 diff --git a/package.json b/package.json index 979d1a42..efd6e869 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "pathfinder-eve", "version": "0.0.10", "engines": { - "node": "4.0.x" + "node": "6.x" }, "description": "Pathfinder is a system mapping tool for EVE ONLINE", "main": "index.php", diff --git a/public/js/v1.1.2/app/map/overlay.js b/public/js/v1.1.2/app/map/overlay.js index b9b00fa8..d6cc7a9d 100644 --- a/public/js/v1.1.2/app/map/overlay.js +++ b/public/js/v1.1.2/app/map/overlay.js @@ -67,7 +67,7 @@ define([ system.tooltip({ container: mapElement, placement: 'right', - title: function(){ console.log($(this).parent()); console.log($(this).parent().data('region')); + title: function(){ return $(this).parent().data('region'); }, trigger: 'manual'