From c99179e25ef1438986101d937bb10b4a3b47f420 Mon Sep 17 00:00:00 2001 From: Mark Friedrich Date: Fri, 20 Jul 2018 14:44:31 +0200 Subject: [PATCH] - renamed "eve_universe.zip" file - updated "info_panel.html" --- app/main/controller/api/setup.php | 2 +- ...el.php => abstractsystemapibasicmodel.php} | 5 +---- app/main/model/systemfactionkillmodel.php | 2 +- app/main/model/systemjumpmodel.php | 2 +- app/main/model/systempodkillmodel.php | 2 +- app/main/model/systemshipkillmodel.php | 2 +- ...{eve_universe.zip => eve_universe.sql.zip} | Bin 3426397 -> 3426307 bytes public/templates/ui/info_panel.html | 2 +- 8 files changed, 7 insertions(+), 10 deletions(-) rename app/main/model/{systemapibasicmodel.php => abstractsystemapibasicmodel.php} (93%) rename export/sql/{eve_universe.zip => eve_universe.sql.zip} (99%) 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 55627205ce556dc7dfe4e7da9d976f533e1f241e..1ab3c3dc98576ba3ab6ad3608be38eeb3699971a 100644 GIT binary patch delta 262 zcmY+8yDmgw0EGX8U3ZTATK0mq?)T#vR-(~;l}IGNM57?K6A}3;&32wbsrC#Kt#@&D zJ2RPYnknYD^PRlr>6Ftngb>^D>hbQj9q%9F3zA5m^vi%0q$q*MC~wDOZYhuG_j^FpyZPI6!8{npBI{sHlXOq~D# delta 347 zcmb7=%PvD<0EGX87Im#ERZ89YP`7TolT>2k0VID8PTEEz_>W2#79z9Oowc0@An_Cu zNq6E!teo%!7BiViCYj9Kw?4eD2(4_XWQ++KfxSMjHG(S_*ud4SU$0x&bhhG$fxW3( z7y4oC#JXzj!urQe=lr@o^+W#-;fW5>DY`^V#6`F05xpWI`b57N5QAb!42z@~5h*b$ z(qc@Ei;S2MSurW5L{3bL8Ic#WVouD91+gfW#Ijfst0HP&6YF9_6vU?365C=&?7mXG zEqkTM=W;Q3_ODR|cUe!EeDsSkp2?W_)B8&*(e{qM_djj2?N!oyzy9zb7XQn5<{=Vq H
-

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)