diff --git a/app/main/controller/api/setup.php b/app/main/controller/api/setup.php index c7beed2d..3a5d45ba 100644 --- a/app/main/controller/api/setup.php +++ b/app/main/controller/api/setup.php @@ -59,7 +59,7 @@ class Setup extends Controller\Controller { $controller = new Controller\Ccp\Universe(); switch($type){ case 'Systems': - $length = 200; + $length = 100; $offset = $count * $length; $buildInfo = $controller->buildSystemsIndex($offset, $length); $return->countAll = $buildInfo['countAll']; diff --git a/app/main/model/systemapibasicmodel.php b/app/main/model/abstractsystemapibasicmodel.php similarity index 93% rename from app/main/model/systemapibasicmodel.php rename to app/main/model/abstractsystemapibasicmodel.php index 5ac6ba7d..66acce0c 100644 --- a/app/main/model/systemapibasicmodel.php +++ b/app/main/model/abstractsystemapibasicmodel.php @@ -10,10 +10,9 @@ namespace Model; use DB\SQL\Schema; -class SystemApiBasicModel extends BasicModel { +abstract class AbstractSystemApiBasicModel extends BasicModel { public function __construct($db = NULL, $table = NULL, $fluid = NULL, $ttl = 0){ - $this->addStaticKillFieldConfig(); parent::__construct($db, $table, $fluid, $ttl); @@ -23,9 +22,7 @@ class SystemApiBasicModel extends BasicModel { * extent the fieldConf Array with static fields for each table */ private function addStaticKillFieldConfig(){ - if(is_array($this->fieldConf)){ - $staticFieldConfig = []; for($i = 1; $i <= 24; $i++){ $staticFieldConfig['value' . $i] = [ diff --git a/app/main/model/systemfactionkillmodel.php b/app/main/model/systemfactionkillmodel.php index 71ec1e89..1eab973f 100644 --- a/app/main/model/systemfactionkillmodel.php +++ b/app/main/model/systemfactionkillmodel.php @@ -10,7 +10,7 @@ namespace Model; use DB\SQL\Schema; -class SystemFactionKillModel extends SystemApiBasicModel { +class SystemFactionKillModel extends AbstractSystemApiBasicModel { protected $table = 'system_kills_factions'; diff --git a/app/main/model/systemjumpmodel.php b/app/main/model/systemjumpmodel.php index ccbb0c84..afc43b25 100644 --- a/app/main/model/systemjumpmodel.php +++ b/app/main/model/systemjumpmodel.php @@ -10,7 +10,7 @@ namespace Model; use DB\SQL\Schema; -class SystemJumpModel extends SystemApiBasicModel { +class SystemJumpModel extends AbstractSystemApiBasicModel { protected $table = 'system_jumps'; diff --git a/app/main/model/systempodkillmodel.php b/app/main/model/systempodkillmodel.php index 7e4cfdeb..932f110d 100644 --- a/app/main/model/systempodkillmodel.php +++ b/app/main/model/systempodkillmodel.php @@ -10,7 +10,7 @@ namespace Model; use DB\SQL\Schema; -class SystemPodKillModel extends SystemApiBasicModel { +class SystemPodKillModel extends AbstractSystemApiBasicModel { protected $table = 'system_kills_pods'; diff --git a/app/main/model/systemshipkillmodel.php b/app/main/model/systemshipkillmodel.php index b7b07d47..082b0e49 100644 --- a/app/main/model/systemshipkillmodel.php +++ b/app/main/model/systemshipkillmodel.php @@ -10,7 +10,7 @@ namespace Model; use DB\SQL\Schema; -class SystemShipKillModel extends SystemApiBasicModel { +class SystemShipKillModel extends AbstractSystemApiBasicModel { protected $table = 'system_kills_ships'; diff --git a/export/sql/eve_universe.zip b/export/sql/eve_universe.sql.zip similarity index 99% rename from export/sql/eve_universe.zip rename to export/sql/eve_universe.sql.zip index 55627205..1ab3c3dc 100644 Binary files a/export/sql/eve_universe.zip and b/export/sql/eve_universe.sql.zip differ diff --git a/public/templates/ui/info_panel.html b/public/templates/ui/info_panel.html index c564e155..5a94f13d 100644 --- a/public/templates/ui/info_panel.html +++ b/public/templates/ui/info_panel.html @@ -1,4 +1,4 @@
-

Scheduled maintenance: Pathfinder upgrade. v1.3.4 v1.3.5; Shutdown: ~11:00 (UTC). ETA ~11:30 (UTC)

+

Scheduled maintenance: Pathfinder upgrade. v1.3.6 v1.4.0; Shutdown: ~13:00 (UTC). ETA ~14:00 (UTC)