supernova-ws / SuperNova

includes/includes/flt_mission_recycle.php

Spacing +9 added lines, -9 removed lines

@@ -16,10 +16,10 @@ 
   $RecyclerCapacity = 0;
   $OtherFleetCapacity = 0;
 
-  foreach($objFleet->shipsIterator() as $unit_id => $unit) {
-    if(in_array($unit_id, classSupernova::$gc->groupFleet)) {
+  foreach ($objFleet->shipsIterator() as $unit_id => $unit) {
+    if (in_array($unit_id, classSupernova::$gc->groupFleet)) {
       $capacity = get_unit_param($unit_id, P_CAPACITY) * $unit->count;
-      if(in_array($unit_id, classSupernova::$gc->groupRecyclers)) {
+      if (in_array($unit_id, classSupernova::$gc->groupRecyclers)) {
         $RecyclerCapacity += $capacity;
       } else {
         $OtherFleetCapacity += $capacity;
@@ -28,33 +28,33 @@ 
   }
 
   $fleet_resources_amount = $objFleet->resourcesGetTotal();
-  if($fleet_resources_amount > $OtherFleetCapacity) {
+  if ($fleet_resources_amount > $OtherFleetCapacity) {
     // Если во флоте есть другие корабли И количество ресурсов больше, чем их ёмкость трюмов - значит часть этих ресурсов лежит в трюмах переработчиков
     // Уменьшаем ёмкость переработчиков на указанную величину
     $RecyclerCapacity -= ($fleet_resources_amount - $OtherFleetCapacity);
   }
 
   $resources_recycled = array();
-  if(($destination_planet["debris_metal"] + $destination_planet["debris_crystal"]) <= $RecyclerCapacity) {
+  if (($destination_planet["debris_metal"] + $destination_planet["debris_crystal"]) <= $RecyclerCapacity) {
     $resources_recycled[RES_METAL] = $destination_planet["debris_metal"];
     $resources_recycled[RES_CRYSTAL] = $destination_planet["debris_crystal"];
   } else {
-    if(($destination_planet["debris_metal"] > $RecyclerCapacity / 2) &&
+    if (($destination_planet["debris_metal"] > $RecyclerCapacity / 2) &&
       ($destination_planet["debris_crystal"] > $RecyclerCapacity / 2)
     ) {
       $resources_recycled[RES_METAL] = $RecyclerCapacity / 2;
       $resources_recycled[RES_CRYSTAL] = $RecyclerCapacity / 2;
     } else {
-      if($destination_planet["debris_metal"] > $destination_planet["debris_crystal"]) {
+      if ($destination_planet["debris_metal"] > $destination_planet["debris_crystal"]) {
         $resources_recycled[RES_CRYSTAL] = $destination_planet["debris_crystal"];
-        if($destination_planet["debris_metal"] > ($RecyclerCapacity - $resources_recycled[RES_CRYSTAL])) {
+        if ($destination_planet["debris_metal"] > ($RecyclerCapacity - $resources_recycled[RES_CRYSTAL])) {
           $resources_recycled[RES_METAL] = $RecyclerCapacity - $resources_recycled[RES_CRYSTAL];
         } else {
           $resources_recycled[RES_METAL] = $destination_planet["debris_metal"];
         }
       } else {
         $resources_recycled[RES_METAL] = $destination_planet["debris_metal"];
-        if($destination_planet["debris_crystal"] > ($RecyclerCapacity - $resources_recycled[RES_METAL])) {
+        if ($destination_planet["debris_crystal"] > ($RecyclerCapacity - $resources_recycled[RES_METAL])) {
           $resources_recycled[RES_CRYSTAL] = $RecyclerCapacity - $resources_recycled[RES_METAL];
         } else {
           $resources_recycled[RES_CRYSTAL] = $destination_planet["debris_crystal"];

classes/Fleet.php

Doc Comments +2 added lines, -4 removed lines

@@ -979,7 +979,7 @@ 
   /**
    * Set current resource list from array of units
    *
-   * @param array $resource_list
+   * @param integer[] $resource_list
    */
   public function resourcesSet($resource_list) {
     if (!empty($this->propertiesAdjusted['resource_list'])) {
@@ -1027,7 +1027,7 @@ 
   }
 
   /**
-   * @param array $rate
+   * @param integer[] $rate
    *
    * @return float
    */
@@ -1058,8 +1058,6 @@ 
    * Restores fleet or resources to planet
    *
    * @param bool $start
-   * @param bool $only_resources
-   * @param int  $result
    */
   public function resourcesUnload($start = true) {
     sn_db_transaction_check(true);

Unused Use Statements -1 removed lines

@@ -1,6 +1,5 @@
 <?php
 use DBStatic\DBStaticFleetACS;
-use DBStatic\DBStaticNote;
 use DBStatic\DBStaticPlanet;
 use DBStatic\DBStaticUnit;
 use DBStatic\DBStaticUser;

Spacing +29 added lines, -29 removed lines

@@ -401,31 +401,31 @@ 
 
     return classSupernova::$db->doSelect(
     // Блокировка самого флота
-      "SELECT 1 FROM {{fleets}} AS f " .
+      "SELECT 1 FROM {{fleets}} AS f ".
 
       // Блокировка всех юнитов, принадлежащих этому флоту
-      "LEFT JOIN {{unit}} as unit ON unit.unit_location_type = " . static::$locationType . " AND unit.unit_location_id = f.fleet_id " .
+      "LEFT JOIN {{unit}} as unit ON unit.unit_location_type = ".static::$locationType." AND unit.unit_location_id = f.fleet_id ".
 
       // Блокировка всех прилетающих и улетающих флотов, если нужно
       // TODO - lock fleets by COORDINATES
-      ($mission_data['dst_fleets'] ? "LEFT JOIN {{fleets}} AS fd ON fd.fleet_end_planet_id = f.fleet_end_planet_id OR fd.fleet_start_planet_id = f.fleet_end_planet_id " : '') .
+      ($mission_data['dst_fleets'] ? "LEFT JOIN {{fleets}} AS fd ON fd.fleet_end_planet_id = f.fleet_end_planet_id OR fd.fleet_start_planet_id = f.fleet_end_planet_id " : '').
       // Блокировка всех юнитов, принадлежащих прилетающим и улетающим флотам - ufd = unit_fleet_destination
-      ($mission_data['dst_fleets'] ? "LEFT JOIN {{unit}} AS ufd ON ufd.unit_location_type = " . static::$locationType . " AND ufd.unit_location_id = fd.fleet_id " : '') .
+      ($mission_data['dst_fleets'] ? "LEFT JOIN {{unit}} AS ufd ON ufd.unit_location_type = ".static::$locationType." AND ufd.unit_location_id = fd.fleet_id " : '').
 
-      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{users}} AS ud ON ud.id = f.fleet_target_owner " : '') .
+      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{users}} AS ud ON ud.id = f.fleet_target_owner " : '').
       // Блокировка всех юнитов, принадлежащих владельцу планеты-цели
-      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS unit_player_dest ON unit_player_dest.unit_player_id = ud.id " : '') .
+      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS unit_player_dest ON unit_player_dest.unit_player_id = ud.id " : '').
       // Блокировка планеты-цели
-      ($mission_data['dst_planet'] ? "LEFT JOIN {{planets}} AS pd ON pd.id = f.fleet_end_planet_id " : '') .
+      ($mission_data['dst_planet'] ? "LEFT JOIN {{planets}} AS pd ON pd.id = f.fleet_end_planet_id " : '').
       // Блокировка всех юнитов, принадлежащих планете-цели - НЕ НУЖНО. Уже залочили ранее, как принадлежащие игроку-цели
 //      ($mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS upd ON upd.unit_location_type = " . LOC_PLANET . " AND upd.unit_location_id = pd.id " : '') .
 
 
-      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{users}} AS us ON us.id = f.fleet_owner " : '') .
+      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{users}} AS us ON us.id = f.fleet_owner " : '').
       // Блокировка всех юнитов, принадлежащих владельцу флота
-      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS unit_player_src ON unit_player_src.unit_player_id = us.id " : '') .
+      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS unit_player_src ON unit_player_src.unit_player_id = us.id " : '').
       // Блокировка планеты отправления
-      ($mission_data['src_planet'] ? "LEFT JOIN {{planets}} AS ps ON ps.id = f.fleet_start_planet_id " : '') .
+      ($mission_data['src_planet'] ? "LEFT JOIN {{planets}} AS ps ON ps.id = f.fleet_start_planet_id " : '').
       // Блокировка всех юнитов, принадлежащих планете с которой юниты были отправлены - НЕ НУЖНО. Уже залочили ранее, как принадлежащие владельцу флота
 //      ($mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS ups ON ups.unit_location_type = " . LOC_PLANET . " AND ups.unit_location_id = ps.id " : '') .
 
@@ -442,11 +442,11 @@ 
   public function dbGetLockById($dbId) {
     classSupernova::$db->doSelect(
     // Блокировка самого флота
-      "SELECT 1 FROM {{fleets}} AS FLEET0 " .
+      "SELECT 1 FROM {{fleets}} AS FLEET0 ".
       // Lock fleet owner
-      "LEFT JOIN {{users}} as USER0 on USER0.id = FLEET0.fleet_owner " .
+      "LEFT JOIN {{users}} as USER0 on USER0.id = FLEET0.fleet_owner ".
       // Блокировка всех юнитов, принадлежащих этому флоту
-      "LEFT JOIN {{unit}} as UNIT0 ON UNIT0.unit_location_type = " . LOC_FLEET . " AND UNIT0.unit_location_id = FLEET0.fleet_id " .
+      "LEFT JOIN {{unit}} as UNIT0 ON UNIT0.unit_location_type = ".LOC_FLEET." AND UNIT0.unit_location_id = FLEET0.fleet_id ".
 
       // Без предварительной выборки неизвестно - куда летит этот флот.
       // Поэтому надо выбирать флоты, чьи координаты прибытия ИЛИ отбытия совпадают с координатами прибытия ИЛИ отбытия текущего флота.
@@ -462,9 +462,9 @@ 
         FLEET1.fleet_end_planet = FLEET0.fleet_end_planet
       " .
       // Блокировка всех юнитов, принадлежащих этим флотам
-      "LEFT JOIN {{unit}} as UNIT1 ON UNIT1.unit_location_type = " . LOC_FLEET . " AND UNIT1.unit_location_id = FLEET1.fleet_id " .
+      "LEFT JOIN {{unit}} as UNIT1 ON UNIT1.unit_location_type = ".LOC_FLEET." AND UNIT1.unit_location_id = FLEET1.fleet_id ".
       // Lock fleet owner
-      "LEFT JOIN {{users}} as USER1 on USER1.id = FLEET1.fleet_owner " .
+      "LEFT JOIN {{users}} as USER1 on USER1.id = FLEET1.fleet_owner ".
 
       "LEFT JOIN {{fleets}} AS FLEET2 ON
         FLEET2.fleet_mess = 1   AND FLEET0.fleet_mess = 0 AND
@@ -474,7 +474,7 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этим флотам
       "LEFT JOIN {{unit}} as UNIT2 ON
-        UNIT2.unit_location_type = " . LOC_FLEET . " AND
+        UNIT2.unit_location_type = " . LOC_FLEET." AND
         UNIT2.unit_location_id = FLEET2.fleet_id
       " .
       // Lock fleet owner
@@ -491,11 +491,11 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этим флотам
       "LEFT JOIN {{unit}} as UNIT3 ON
-        UNIT3.unit_location_type = " . LOC_FLEET . " AND
+        UNIT3.unit_location_type = " . LOC_FLEET." AND
         UNIT3.unit_location_id = FLEET3.fleet_id
       " .
       // Lock fleet owner
-      "LEFT JOIN {{users}} as USER3 on USER3.id = FLEET3.fleet_owner " .
+      "LEFT JOIN {{users}} as USER3 on USER3.id = FLEET3.fleet_owner ".
 
       "LEFT JOIN {{fleets}} AS FLEET4 ON
         FLEET4.fleet_mess = 1   AND FLEET0.fleet_mess = 1 AND
@@ -505,7 +505,7 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этим флотам
       "LEFT JOIN {{unit}} as UNIT4 ON
-        UNIT4.unit_location_type = " . LOC_FLEET . " AND
+        UNIT4.unit_location_type = " . LOC_FLEET." AND
         UNIT4.unit_location_id = FLEET4.fleet_id
       " .
       // Lock fleet owner
@@ -527,7 +527,7 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этой планете
       "LEFT JOIN {{unit}} as UNIT5 ON
-        UNIT5.unit_location_type = " . LOC_PLANET . " AND
+        UNIT5.unit_location_type = " . LOC_PLANET." AND
         UNIT5.unit_location_id = PLANETS5.id
       " .
 
@@ -545,7 +545,7 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этой планете
       "LEFT JOIN {{unit}} as UNIT6 ON
-        UNIT6.unit_location_type = " . LOC_PLANET . " AND
+        UNIT6.unit_location_type = " . LOC_PLANET." AND
         UNIT6.unit_location_id = PLANETS6.id
       " .
       "WHERE FLEET0.fleet_id = {$dbId} GROUP BY 1 FOR UPDATE"
@@ -657,7 +657,7 @@ 
       } elseif ($this->isResource($unit_id)) {
         $this->resource_list[$unit_id] = $unit_count;
       } else {
-        throw new Exception('Trying to pass to fleet non-resource and non-ship ' . var_export($unit_array, true), FLIGHT_SHIPS_UNIT_WRONG);
+        throw new Exception('Trying to pass to fleet non-resource and non-ship '.var_export($unit_array, true), FLIGHT_SHIPS_UNIT_WRONG);
       }
     }
   }
@@ -791,7 +791,7 @@ 
    * @param int $unit_count
    */
   public function shipSetCount($unit_id, $unit_count = 0) {
-    pdump(__CLASS__ . '->' . __FUNCTION__);
+    pdump(__CLASS__.'->'.__FUNCTION__);
     $this->shipAdjustCount($unit_id, $unit_count, true);
   }
 
@@ -983,7 +983,7 @@ 
    */
   public function resourcesSet($resource_list) {
     if (!empty($this->propertiesAdjusted['resource_list'])) {
-      throw new ExceptionPropertyAccess('Property "resource_list" already was adjusted so no SET is possible until dbSave in ' . get_called_class() . '::unitSetResourceList', ERR_ERROR);
+      throw new ExceptionPropertyAccess('Property "resource_list" already was adjusted so no SET is possible until dbSave in '.get_called_class().'::unitSetResourceList', ERR_ERROR);
     }
     $this->resourcesAdjust($resource_list, true);
   }
@@ -1017,7 +1017,7 @@ 
       // Check for negative unit value
       if ($this->resource_list[$resource_id] < 0) {
         // TODO
-        throw new Exception('Resource ' . $resource_id . ' will become negative in ' . get_called_class() . '::unitAdjustResourceList', ERR_ERROR);
+        throw new Exception('Resource '.$resource_id.' will become negative in '.get_called_class().'::unitAdjustResourceList', ERR_ERROR);
       }
     }
   }
@@ -1325,14 +1325,14 @@ 
       if (FLIGHT_ALLOWED == $validateResult[$missionType]) {
         $this->allowed_missions[$missionType] = $mission;
       } else {
-        if($missionType == $this->mission_type) {
+        if ($missionType == $this->mission_type) {
         }
         unset($this->allowed_missions[$missionType]);
       }
     }
 
-    if(empty($this->allowed_missions)) {
-      if($this->mission_type != MT_NONE && isset($validateResult[$this->mission_type])) {
+    if (empty($this->allowed_missions)) {
+      if ($this->mission_type != MT_NONE && isset($validateResult[$this->mission_type])) {
         throw new ExceptionFleetInvalid($validateResult[$this->mission_type], $validateResult[$this->mission_type]);
       } else {
         throw new ExceptionFleetInvalid(FLIGHT_MISSION_IMPOSSIBLE, FLIGHT_MISSION_IMPOSSIBLE);
@@ -1570,7 +1570,7 @@ 
     $template_result['.']['fleets'][] = $this->fleetRenderer->renderFleet($this, SN_TIME_NOW, $timeMissionJob);
 
     $template_result += array(
-      'mission'         => classLocale::$lang['type_mission'][$this->_mission_type] . ($this->_mission_type == MT_EXPLORE || $this->_mission_type == MT_HOLD ? ' ' . pretty_time($timeMissionJob) : ''),
+      'mission'         => classLocale::$lang['type_mission'][$this->_mission_type].($this->_mission_type == MT_EXPLORE || $this->_mission_type == MT_HOLD ? ' '.pretty_time($timeMissionJob) : ''),
       'dist'            => pretty_number($this->travelData['distance']),
       'speed'           => pretty_number($this->travelData['fleet_speed']),
       'deute_need'      => pretty_number($this->travelData['consumption']),

classes/Common/GlobalContainer.php

Spacing +19 added lines, -19 removed lines

@@ -52,82 +52,82 @@
     $gc = $this;
 
     // Default db
-    $gc->db = function ($c) {
+    $gc->db = function($c) {
       classSupernova::$db = $db = new \db_mysql($c);
 
       return $db;
     };
 
-    $gc->debug = function ($c) {
+    $gc->debug = function($c) {
       return new \debug();
     };
 
-    $gc->types = function ($c) {
+    $gc->types = function($c) {
       return new \Common\Types();
     };
 
-    $gc->cache = function ($c) {
+    $gc->cache = function($c) {
       return new \classCache(classSupernova::$cache_prefix);
     };
 
-    $gc->config = function ($c) {
+    $gc->config = function($c) {
       return new \classConfig(classSupernova::$cache_prefix);
     };
 
-    $gc->localePlayer = function (GlobalContainer $c) {
+    $gc->localePlayer = function(GlobalContainer $c) {
       return new \classLocale($c->config->server_locale_log_usage);
     };
 
-    $gc->dbGlobalRowOperator = function (GlobalContainer $c) {
+    $gc->dbGlobalRowOperator = function(GlobalContainer $c) {
       return new \DbRowDirectOperator($c->db);
     };
 
-    $gc->query = $gc->factory(function (GlobalContainer $c) {
+    $gc->query = $gc->factory(function(GlobalContainer $c) {
       return new \DbQueryConstructor($c->db);
     });
 
-    $gc->cacheOperator = function (GlobalContainer $gc) {
+    $gc->cacheOperator = function(GlobalContainer $gc) {
       return new \SnDbCachedOperator($gc);
     };
 
     $gc->snCacheClass = 'SnCache';
-    $gc->snCache = function (GlobalContainer $gc) {
+    $gc->snCache = function(GlobalContainer $gc) {
       return $gc->db->snCache;
     };
 
     $gc->buddyClass = 'Buddy\BuddyModel';
-    $gc->buddyModel = function (GlobalContainer $c) {
+    $gc->buddyModel = function(GlobalContainer $c) {
       return new $c->buddyClass($c);
     };
 
-    $gc->unitModel = function (GlobalContainer $c) {
+    $gc->unitModel = function(GlobalContainer $c) {
       return new \V2Unit\V2UnitModel($c);
     };
-    $gc->unitList = $this->factory(function (GlobalContainer $c) {
+    $gc->unitList = $this->factory(function(GlobalContainer $c) {
       return new \V2Unit\V2UnitList($c);
     });
 
-    $gc->fleetModel = function (GlobalContainer $c) {
+    $gc->fleetModel = function(GlobalContainer $c) {
       return new V2FleetModel($c);
     };
 
-    $gc->planetRenderer = function (GlobalContainer $c) {
+    $gc->planetRenderer = function(GlobalContainer $c) {
       return new PlanetRenderer($c);
     };
 
-    $gc->fleetRenderer = function (GlobalContainer $c) {
+    $gc->fleetRenderer = function(GlobalContainer $c) {
       return new \FleetRenderer($c);
     };
 
-    $gc->groupFleet = function (GlobalContainer $c) {
+    $gc->groupFleet = function(GlobalContainer $c) {
       return sn_get_groups('fleet');
     };
 
-    $gc->groupFleetAndMissiles = function (GlobalContainer $c) {
+    $gc->groupFleetAndMissiles = function(GlobalContainer $c) {
       return sn_get_groups(array('fleet', GROUP_STR_MISSILES));
     };
 
-    $gc->groupRecyclers = function (GlobalContainer $c) {
+    $gc->groupRecyclers = function(GlobalContainer $c) {
       return sn_get_groups('flt_recyclers');
     };
 

classes/FleetRenderer.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
   public function renderFleet(Fleet $fleet, $missionStartTimeStamp = SN_TIME_NOW, $timeMissionJob = 0) {
     $unitList = $fleet->getUnitList();
     if ($unitList->unitsCount() <= 0) {
-      message(classLocale::$lang['fl_err_no_ships'], classLocale::$lang['fl_error'], 'fleet' . DOT_PHP_EX, 5);
+      message(classLocale::$lang['fl_err_no_ships'], classLocale::$lang['fl_error'], 'fleet'.DOT_PHP_EX, 5);
     }
 
     $timeToReturn = $fleet->travelData['duration'] * 2 + $timeMissionJob;

classes/DBRow.php

Spacing +10 added lines, -10 removed lines

@@ -86,7 +86,7 @@ 
    * @param db_mysql|null $db
    */
   public static function setDb($db = null) {
-    if(empty($db) || !($db instanceof db_mysql)) {
+    if (empty($db) || !($db instanceof db_mysql)) {
       $db = null;
     }
     static::$db = !empty($db) || !class_exists('classSupernova', false) ? $db : classSupernova::$db;
@@ -149,7 +149,7 @@ 
   public function dbLoad($dbId, $lockSkip = false) {
     $dbId = idval($dbId);
     if ($dbId <= 0) {
-      classSupernova::$debug->error(get_called_class() . '::' . __METHOD__ . ' $dbId not positive = ' . $dbId);
+      classSupernova::$debug->error(get_called_class().'::'.__METHOD__.' $dbId not positive = '.$dbId);
 
       return;
     }
@@ -161,7 +161,7 @@ 
       $this->dbGetLockById($this->_dbId);
     }
 
-    $db_row = classSupernova::$db->doSelectFetchArray("SELECT * FROM `{{" . static::$_table . "}}` WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId . " LIMIT 1 FOR UPDATE;");
+    $db_row = classSupernova::$db->doSelectFetchArray("SELECT * FROM `{{".static::$_table."}}` WHERE `".static::$_dbIdFieldName."` = ".$this->_dbId." LIMIT 1 FOR UPDATE;");
     if (empty($db_row)) {
       return;
     }
@@ -193,7 +193,7 @@ 
     if ($this->isNew()) {
       // No DB_ID - new unit
       if ($this->isEmpty()) {
-        classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - object is empty on ' . get_called_class() . '::dbSave');
+        classSupernova::$debug->error(__FILE__.':'.__LINE__.' - object is empty on '.get_called_class().'::dbSave');
       }
       $this->dbInsert();
     } else {
@@ -202,7 +202,7 @@ 
         $this->dbDelete();
       } else {
         if (!sn_db_transaction_check(false)) {
-          classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - transaction should always be started on ' . get_called_class() . '::dbUpdate');
+          classSupernova::$debug->error(__FILE__.':'.__LINE__.' - transaction should always be started on '.get_called_class().'::dbUpdate');
         }
         $this->dbUpdate();
       }
@@ -230,13 +230,13 @@ 
   // TODO - protected
   public function dbInsert() {
     if (!$this->isNew()) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - record db_id is not empty on ' . get_called_class() . '::dbInsert');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - record db_id is not empty on '.get_called_class().'::dbInsert');
     }
 
     $fieldSet = $this->dbMakeFieldSet(false);
 
     if (!static::$db->doInsertSet(static::$_table, $fieldSet)) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - error saving record ' . get_called_class() . '::dbInsert');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - error saving record '.get_called_class().'::dbInsert');
     }
     $this->_dbId = static::$db->db_insert_id();
 
@@ -250,7 +250,7 @@ 
   public function dbUpdate() {
     // TODO - Update
     if ($this->isNew()) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbUpdate');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - unit db_id is empty on dbUpdate');
     }
     $this->db_field_update($this->dbMakeFieldUpdate());
   }
@@ -261,7 +261,7 @@ 
   // TODO - protected
   public function dbDelete() {
     if ($this->isNew()) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbDelete');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - unit db_id is empty on dbDelete');
     }
     classSupernova::$gc->db->doDeleteRow(
       static::$_table,
@@ -452,7 +452,7 @@ 
       }
     }
 
-    if(empty($set)) {
+    if (empty($set)) {
       $theResult = true;
     } else {
       $theResult = classSupernova::$db->doUpdateRowAdjust(

classes/Entity/KeyedModel.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
   /**
    * @param KeyedContainer $cEntity
    */
-  protected function onSaveUnchanged($cEntity){
+  protected function onSaveUnchanged($cEntity) {
     // TODO - or just save nothing ?????
     // throw new \Exception('EntityModel isNotEmpty, have dbId and not CHANGED! It can\'t be!');
     // Do nothing

classes/Entity/EntityModel.php

Spacing +4 added lines, -4 removed lines

@@ -199,7 +199,7 @@ 
     // Generate changeset row
     // Foreach all rows. If there is change and no delta - then put delta. Otherwise put change
     // If row not empty - update
-    throw new \Exception(__CLASS__ . '::update() in ' . get_called_class() . 'is not yet implemented');
+    throw new \Exception(__CLASS__.'::update() in '.get_called_class().'is not yet implemented');
   }
 
   /**
@@ -208,7 +208,7 @@ 
    * @throws \Exception
    */
   protected function delete($cEntity) {
-    throw new \Exception(__CLASS__ . '::delete() in ' . get_called_class() . 'is not yet implemented');
+    throw new \Exception(__CLASS__.'::delete() in '.get_called_class().'is not yet implemented');
   }
 
   /**
@@ -224,7 +224,7 @@ 
   protected function onSaveUnchanged($cEntity) {
     // TODO - or just save nothing ?????
 //    throw new \Exception('EntityModel isNotEmpty, have dbId and not CHANGED! It can\'t be!');
-    throw new \Exception(__CLASS__ . '::unchanged() in ' . get_called_class() . 'is not yet implemented');
+    throw new \Exception(__CLASS__.'::unchanged() in '.get_called_class().'is not yet implemented');
   }
 
   /**
@@ -239,7 +239,7 @@ 
   protected function onSaveNew($cEntity) {
     // Just created container and doesn't use it
 //    throw new \Exception('EntityModel isEmpty but not loaded! It can\'t be!');
-    throw new \Exception(__CLASS__ . '::emptyAction() in ' . get_called_class() . 'is not yet implemented');
+    throw new \Exception(__CLASS__.'::emptyAction() in '.get_called_class().'is not yet implemented');
   }
 
   /**

classes/db_mysql.php

Spacing +36 added lines, -36 removed lines

@@ -98,7 +98,7 @@ 
   public function load_db_settings($configFile = '') {
     $dbsettings = array();
 
-    empty($configFile) ? $configFile = SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX : false;
+    empty($configFile) ? $configFile = SN_ROOT_PHYSICAL."config".DOT_PHP_EX : false;
 
     require $configFile;
 
@@ -118,7 +118,7 @@ 
     }
 
     if (empty($this->dbsettings)) {
-      $this->load_db_settings(SN_ROOT_PHYSICAL . "config.php");
+      $this->load_db_settings(SN_ROOT_PHYSICAL."config.php");
     }
 
     // TODO - фатальные (?) ошибки на каждом шагу. Хотя - скорее Эксепшны
@@ -170,7 +170,7 @@ 
     $sql = $query;
     if (strpos($sql, '{{') !== false) {
       foreach ($this->table_list as $tableName) {
-        $sql = str_replace("{{{$tableName}}}", $this->db_prefix . $tableName, $sql);
+        $sql = str_replace("{{{$tableName}}}", $this->db_prefix.$tableName, $sql);
       }
     }
 
@@ -241,12 +241,12 @@ 
 
     $queryResult = null;
     try {
-      $queryResult = $this->db_sql_query($stringQuery . DbSqlHelper::quoteComment($queryTrace));
+      $queryResult = $this->db_sql_query($stringQuery.DbSqlHelper::quoteComment($queryTrace));
       if (!$queryResult) {
         throw new Exception();
       }
     } catch (Exception $e) {
-      classSupernova::$debug->error($this->db_error() . "<br />{$query}<br />", 'SQL Error');
+      classSupernova::$debug->error($this->db_error()."<br />{$query}<br />", 'SQL Error');
     }
 
     return $queryResult;
@@ -300,16 +300,16 @@ 
     if (!empty($where)) {
       foreach ($where as $key => &$value) {
         if (!is_int($key)) {
-          $value = "`$key` = '" . $this->db_escape($value) . "'";
+          $value = "`$key` = '".$this->db_escape($value)."'";
         }
       }
     }
 
     $query =
-      "SELECT " . implode(',', $fields) .
-      " FROM `{{{$table}}}`" .
-      (!empty($where) ? ' WHERE ' . implode(' AND ', $where) : '') .
-      ($isOneRecord == DB_RECORD_ONE ? ' LIMIT 1' : '') .
+      "SELECT ".implode(',', $fields).
+      " FROM `{{{$table}}}`".
+      (!empty($where) ? ' WHERE '.implode(' AND ', $where) : '').
+      ($isOneRecord == DB_RECORD_ONE ? ' LIMIT 1' : '').
       ($forUpdate == DB_SELECT_FOR_UPDATE ? ' FOR UPDATE' : '');
 
     return $this->doSql($query);
@@ -603,10 +603,10 @@ 
       $this->isWatching = true;
       $msg = "\$query = \"{$query}\"\n\r";
       if (!empty($_POST)) {
-        $msg .= "\n\r" . dump($_POST, '$_POST');
+        $msg .= "\n\r".dump($_POST, '$_POST');
       }
       if (!empty($_GET)) {
-        $msg .= "\n\r" . dump($_GET, '$_GET');
+        $msg .= "\n\r".dump($_GET, '$_GET');
       }
       classSupernova::$debug->warning($msg, "Watching user {$user['id']}", 399, array('base_dump' => true));
       $this->isWatching = false;
@@ -621,7 +621,7 @@ 
 
     global $user, $dm_change_legit, $mm_change_legit;
 
-    switch(true) {
+    switch (true) {
       case stripos($query, 'RUNCATE TABL') != false:
       case stripos($query, 'ROP TABL') != false:
       case stripos($query, 'ENAME TABL') != false:
@@ -632,37 +632,37 @@ 
       case stripos($query, 'RPG_POINTS') != false && stripos(trim($query), 'UPDATE ') === 0 && !$dm_change_legit:
       case stripos($query, 'METAMATTER') != false && stripos(trim($query), 'UPDATE ') === 0 && !$mm_change_legit:
       case stripos($query, 'AUTHLEVEL') != false && $user['authlevel'] < 3 && stripos($query, 'SELECT') !== 0:
-        $report = "Hacking attempt (" . date("d.m.Y H:i:s") . " - [" . time() . "]):\n";
+        $report = "Hacking attempt (".date("d.m.Y H:i:s")." - [".time()."]):\n";
         $report .= ">Database Inforamation\n";
-        $report .= "\tID - " . $user['id'] . "\n";
-        $report .= "\tUser - " . $user['username'] . "\n";
-        $report .= "\tAuth level - " . $user['authlevel'] . "\n";
-        $report .= "\tAdmin Notes - " . $user['adminNotes'] . "\n";
-        $report .= "\tCurrent Planet - " . $user['current_planet'] . "\n";
-        $report .= "\tUser IP - " . $user['user_lastip'] . "\n";
-        $report .= "\tUser IP at Reg - " . $user['ip_at_reg'] . "\n";
-        $report .= "\tUser Agent- " . $_SERVER['HTTP_USER_AGENT'] . "\n";
-        $report .= "\tCurrent Page - " . $user['current_page'] . "\n";
-        $report .= "\tRegister Time - " . $user['register_time'] . "\n";
+        $report .= "\tID - ".$user['id']."\n";
+        $report .= "\tUser - ".$user['username']."\n";
+        $report .= "\tAuth level - ".$user['authlevel']."\n";
+        $report .= "\tAdmin Notes - ".$user['adminNotes']."\n";
+        $report .= "\tCurrent Planet - ".$user['current_planet']."\n";
+        $report .= "\tUser IP - ".$user['user_lastip']."\n";
+        $report .= "\tUser IP at Reg - ".$user['ip_at_reg']."\n";
+        $report .= "\tUser Agent- ".$_SERVER['HTTP_USER_AGENT']."\n";
+        $report .= "\tCurrent Page - ".$user['current_page']."\n";
+        $report .= "\tRegister Time - ".$user['register_time']."\n";
         $report .= "\n";
 
         $report .= ">Query Information\n";
-        $report .= "\tQuery - " . $query . "\n";
+        $report .= "\tQuery - ".$query."\n";
         $report .= "\n";
 
         $report .= ">\$_SERVER Information\n";
-        $report .= "\tIP - " . $_SERVER['REMOTE_ADDR'] . "\n";
-        $report .= "\tHost Name - " . $_SERVER['HTTP_HOST'] . "\n";
-        $report .= "\tUser Agent - " . $_SERVER['HTTP_USER_AGENT'] . "\n";
-        $report .= "\tRequest Method - " . $_SERVER['REQUEST_METHOD'] . "\n";
-        $report .= "\tCame From - " . $_SERVER['HTTP_REFERER'] . "\n";
-        $report .= "\tPage is - " . $_SERVER['SCRIPT_NAME'] . "\n";
-        $report .= "\tUses Port - " . $_SERVER['REMOTE_PORT'] . "\n";
-        $report .= "\tServer Protocol - " . $_SERVER['SERVER_PROTOCOL'] . "\n";
+        $report .= "\tIP - ".$_SERVER['REMOTE_ADDR']."\n";
+        $report .= "\tHost Name - ".$_SERVER['HTTP_HOST']."\n";
+        $report .= "\tUser Agent - ".$_SERVER['HTTP_USER_AGENT']."\n";
+        $report .= "\tRequest Method - ".$_SERVER['REQUEST_METHOD']."\n";
+        $report .= "\tCame From - ".$_SERVER['HTTP_REFERER']."\n";
+        $report .= "\tPage is - ".$_SERVER['SCRIPT_NAME']."\n";
+        $report .= "\tUses Port - ".$_SERVER['REMOTE_PORT']."\n";
+        $report .= "\tServer Protocol - ".$_SERVER['SERVER_PROTOCOL']."\n";
 
         $report .= "\n--------------------------------------------------------------------------------------------------\n";
 
-        $fp = fopen(SN_ROOT_PHYSICAL . 'badqrys.txt', 'a');
+        $fp = fopen(SN_ROOT_PHYSICAL.'badqrys.txt', 'a');
         fwrite($fp, $report);
         fclose($fp);
 
@@ -683,7 +683,7 @@ 
     $prefix_length = strlen($this->db_prefix);
 
     $tl = array();
-    while($row = $this->db_fetch($query)) {
+    while ($row = $this->db_fetch($query)) {
       foreach ($row as $table_name) {
         if (strpos($table_name, $this->db_prefix) === 0) {
           $table_name = substr($table_name, $prefix_length);
@@ -817,7 +817,7 @@ 
     if (is_bool($query)) {
       throw new Exception('Result of SHOW STATUS command is boolean - which should never happen. Connection to DB is lost?');
     }
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $result[$row['Variable_name']] = $row['Value'];
     }
 

Doc Comments +22 added lines, -4 removed lines

@@ -164,7 +164,7 @@ 
   /**
    * @param string $query
    *
-   * @return mixed|string
+   * @return string
    */
   public function replaceTablePlaceholders($query) {
     $sql = $query;
@@ -178,7 +178,7 @@ 
   }
 
   /**
-   * @param $query
+   * @param string $query
    */
   protected function logQuery($query) {
     if (!classSupernova::$config->debug) {
@@ -290,6 +290,7 @@ 
    * @param array  $fields
    * @param array  $where
    * @param bool   $isOneRecord
+   * @param boolean $forUpdate
    *
    * @return array|bool|mysqli_result|null
    *
@@ -332,6 +333,10 @@ 
 
   //
   // INSERT/REPLACE ----------------------------------------------------------------------------------------------------
+
+  /**
+   * @param string $query
+   */
   public function doInsertComplex($query) {
     return $this->doSql($query);
   }
@@ -408,7 +413,7 @@ 
    * Self-contained - means no params used
    * Such queries usually used to make large amount of in-base calculations
    *
-   * @param $query
+   * @param string $query
    *
    * @return array|bool|mysqli_result|null
    */
@@ -425,13 +430,16 @@ 
   }
 
   /**
-   * @param $DbQuery DbQuery
+   * @param DbQuery $DbQuery DbQuery
    */
   public function doUpdateDbQueryAdjust($DbQuery) {
     return $this->doUpdateDbQuery($DbQuery);
   }
 
 
+  /**
+   * @param boolean $isOneRecord
+   */
   protected function doUpdateWhere($table, $fieldsSet, $fieldsAdjust = array(), $where = array(), $isOneRecord = DB_RECORDS_ALL, $whereDanger = array()) {
     $query = DbQuery::build($this)
       ->setTable($table)
@@ -450,6 +458,9 @@ 
     return $this->doUpdateWhere($table, $fieldsAndValues, array(), $where, DB_RECORD_ONE);
   }
 
+  /**
+   * @param string $table
+   */
   public function doUpdateTableSet($table, $fieldsAndValues, $where = array()) {
     return $this->doUpdateWhere($table, $fieldsAndValues, array(), $where, DB_RECORDS_ALL);
   }
@@ -559,6 +570,10 @@ 
   //
   // OTHER FUNCTIONS ----------------------------------------------------------------------------------------------------------
   // TODO Заменить это на новый логгер
+
+  /**
+   * @param string $query
+   */
   protected function security_watch_user_queries($query) {
     global $user;
 
@@ -582,6 +597,9 @@ 
   }
 
 
+  /**
+   * @param string $query
+   */
   public function security_query_check_bad_words($query) {
     if ($this->skipQueryCheck) {
       return;

includes/includes/sys_stat.php

Spacing +26 added lines, -26 removed lines

@@ -43,23 +43,23 @@ 
 
   $sta_update_msg = db_escape($sta_update_msg);
 
-  if($next_step) {
+  if ($next_step) {
     $sta_update_step++;
   }
   $sta_update_msg = "Update in progress. Step {$sta_update_step}/14: {$sta_update_msg}.";
 
   classSupernova::$config->db_saveItem('var_stat_update_msg', $sta_update_msg);
-  if($next_step) {
+  if ($next_step) {
     classSupernova::$debug->warning($sta_update_msg, 'Stat update', LOG_INFO_STAT_PROCESS);
   }
 }
 
 function sys_stat_calculate_flush(&$data, $force = false) {
-  if(count($data) < 25 && !$force) {
+  if (count($data) < 25 && !$force) {
     return;
   }
 
-  if(!empty($data)) {
+  if (!empty($data)) {
     classSupernova::$gc->db->doInsertBatch(
       TABLE_STAT_POINTS, $data, array(
       'id_owner',
@@ -114,11 +114,11 @@ 
   classSupernova::$gc->cacheOperator->db_lock_tables('users');
   $user_list = DBStaticUser::db_user_list('', true, 'id, dark_matter, metal, crystal, deuterium, user_as_ally, ally_id');
   $row_num = count($user_list);
-  foreach($user_list as $player) {
-    if($i++ % 100 == 0) {
+  foreach ($user_list as $player) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating players stats (player {$i}/{$row_num})", false);
     }
-    if(array_key_exists($user_id = $player['id'], $user_skip_list)) {
+    if (array_key_exists($user_id = $player['id'], $user_skip_list)) {
       continue;
     }
 
@@ -127,7 +127,7 @@ 
     $counts[$user_id][UNIT_RESOURCES] += $resources;
 
     // А здесь мы фильтруем пользователей по $user_skip_list - далее не нужно этого делать, потому что
-    if(!isset($user_skip_list[$user_id])) {
+    if (!isset($user_skip_list[$user_id])) {
       $user_allies[$user_id] = $player['ally_id'];
     }
   }
@@ -139,11 +139,11 @@ 
   $i = 0;
   $query = DBStaticPlanet::db_planet_list_resources_by_owner();
   $row_num = classSupernova::$db->db_num_rows($query);
-  while($planet = db_fetch($query)) {
-    if($i++ % 100 == 0) {
+  while ($planet = db_fetch($query)) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating planets stats (planet {$i}/{$row_num})", false);
     }
-    if(array_key_exists($user_id = $planet['id_owner'], $user_skip_list)) {
+    if (array_key_exists($user_id = $planet['id_owner'], $user_skip_list)) {
       continue;
     }
 
@@ -157,22 +157,22 @@ 
   $i = 0;
   $query = FleetList::dbQueryAllId();
   $row_num = classSupernova::$db->db_num_rows($query);
-  while($fleet_row = db_fetch($query)) {
-    if($i++ % 100 == 0) {
+  while ($fleet_row = db_fetch($query)) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating flying fleets stats (fleet {$i}/{$row_num})", false);
     }
     $objFleet = new Fleet();
     // TODO - без дополнительной инициализации и перераспределений памяти на каждый new Fleet()/unset($fleet)
     // К тому же при включённом кэшировании это быстро забъёт кэш холодными данными
     $objFleet->dbRowParse($fleet_row);
-    if(array_key_exists($user_id = $objFleet->playerOwnerId, $user_skip_list)) {
+    if (array_key_exists($user_id = $objFleet->playerOwnerId, $user_skip_list)) {
       continue;
     }
 
-    foreach($objFleet->shipsIterator() as $unit_id => $unit) {
+    foreach ($objFleet->shipsIterator() as $unit_id => $unit) {
       $counts[$user_id][UNIT_SHIPS] += $unit->count;
 
-      if(!isset($unit_cost_cache[$unit_id][0])) {
+      if (!isset($unit_cost_cache[$unit_id][0])) {
         $unit_cost_cache[$unit_id][0] = get_unit_param($unit_id, P_COST);
       }
       $unit_cost_data = &$unit_cost_cache[$unit_id][0];
@@ -191,11 +191,11 @@ 
   $i = 0;
   $query = DBStaticUnit::db_unit_list_stat_calculate();
   $row_num = classSupernova::$db->db_num_rows($query);
-  while($unit = db_fetch($query)) {
-    if($i++ % 100 == 0) {
+  while ($unit = db_fetch($query)) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating unit stats (unit {$i}/{$row_num})", false);
     }
-    if(array_key_exists($user_id = $unit['unit_player_id'], $user_skip_list)) {
+    if (array_key_exists($user_id = $unit['unit_player_id'], $user_skip_list)) {
       continue;
     }
 
@@ -209,11 +209,11 @@ 
   $i = 0;
   $query = DBStaticQue::db_que_list_stat();
   $row_num = classSupernova::$db->db_num_rows($query);
-  while($que_item = db_fetch($query)) {
-    if($i++ % 100 == 0) {
+  while ($que_item = db_fetch($query)) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating ques stats (que item {$i}/{$row_num})", false);
     }
-    if(array_key_exists($user_id = $que_item['que_player_id'], $user_skip_list)) {
+    if (array_key_exists($user_id = $que_item['que_player_id'], $user_skip_list)) {
       continue;
     }
     $que_unit_amount = $que_item['que_unit_amount'];
@@ -240,7 +240,7 @@ 
 
   sta_set_time_limit('posting new user stats to DB');
   $data = array();
-  foreach($user_allies as $user_id => $ally_id) {
+  foreach ($user_allies as $user_id => $ally_id) {
     $points[$user_id][UNIT_RESOURCES] = $counts[$user_id][UNIT_RESOURCES] / 1000;
     $points[$user_id] = array_map('floor', $points[$user_id]);
     $counts[$user_id] = array_map('floor', $counts[$user_id]);
@@ -293,7 +293,7 @@ 
         SUM(u.`tech_points`)+aus.`tech_points`, SUM(u.`tech_count`)+aus.`tech_count`, SUM(u.`build_points`)+aus.`build_points`, SUM(u.`build_count`)+aus.`build_count`,
         SUM(u.`defs_points`)+aus.`defs_points`, SUM(u.`defs_count`)+aus.`defs_count`, SUM(u.`fleet_points`)+aus.`fleet_points`, SUM(u.`fleet_count`)+aus.`fleet_count`,
         SUM(u.`res_points`)+aus.`res_points`, SUM(u.`res_count`)+aus.`res_count`, SUM(u.`total_points`)+aus.`total_points`, SUM(u.`total_count`)+aus.`total_count`,
-        " . SN_TIME_NOW . ", NULL, u.`id_ally`, 2, 1,
+        " . SN_TIME_NOW.", NULL, u.`id_ally`, 2, 1,
         a.tech_rank, a.build_rank, a.defs_rank, a.fleet_rank, a.res_rank, a.total_rank
       FROM `{{statpoints}}` AS u
         JOIN `{{alliance}}` AS al ON al.id = u.id_ally
@@ -314,7 +314,7 @@ 
 
   // Updating player's ranks
   sta_set_time_limit("updating ranks for players");
-  foreach($rankNames as $rankName) {
+  foreach ($rankNames as $rankName) {
     sta_set_time_limit("updating player rank '{$rankName}'", false);
     classSupernova::$db->doSql($qryResetRowNum);
     classSupernova::$db->doUpdateReallyComplex(sprintf($qryFormat, $rankName, 1));
@@ -322,7 +322,7 @@ 
 
   sta_set_time_limit("updating ranks for Alliances");
   // Updating Allie's ranks
-  foreach($rankNames as $rankName) {
+  foreach ($rankNames as $rankName) {
     sta_set_time_limit("updating Alliances rank '{$rankName}'", false);
     classSupernova::$db->doSql($qryResetRowNum);
     classSupernova::$db->doUpdateReallyComplex(sprintf($qryFormat, $rankName, 2));