supernova-ws / SuperNova

includes/classes/Fleet.php

Spacing +29 added lines, -29 removed lines

@@ -398,31 +398,31 @@ 
 
     return doquery(
     // Блокировка самого флота
-      "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 " : '') .
 
@@ -439,11 +439,11 @@ 
   public function dbGetLockById($dbId) {
     doquery(
     // Блокировка самого флота
-      "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 ".
 
       // Без предварительной выборки неизвестно - куда летит этот флот.
       // Поэтому надо выбирать флоты, чьи координаты прибытия ИЛИ отбытия совпадают с координатами прибытия ИЛИ отбытия текущего флота.
@@ -459,9 +459,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
@@ -471,7 +471,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
@@ -488,11 +488,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
@@ -502,7 +502,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
@@ -524,7 +524,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
       " .
 
@@ -542,7 +542,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"
@@ -661,7 +661,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), ERR_ERROR);
+        throw new Exception('Trying to pass to fleet non-resource and non-ship '.var_export($unit_array, true), ERR_ERROR);
       }
     }
   }
@@ -986,7 +986,7 @@ 
    */
   public function resourcesSet($resource_list) {
     if (!empty($this->propertiesAdjusted['resource_list'])) {
-      throw new PropertyAccessException('Property "resource_list" already was adjusted so no SET is possible until dbSave in ' . get_called_class() . '::unitSetResourceList', ERR_ERROR);
+      throw new PropertyAccessException('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);
   }
@@ -1020,7 +1020,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);
       }
     }
   }
@@ -1193,7 +1193,7 @@ 
 
   protected function printErrorIfNoShips() {
     if ($this->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);
     }
   }
 
@@ -1540,7 +1540,7 @@ 
     } catch (Exception $e) {
 
       // TODO - MESSAGE BOX
-      if($e instanceof ExceptionFleetInvalid) {
+      if ($e instanceof ExceptionFleetInvalid) {
         sn_db_transaction_rollback();
         pdie(classLocale::$lang['fl_attack_error'][$e->getCode()]);
       } else {
@@ -1629,7 +1629,7 @@ 
       $validator->validate();
     } catch (Exception $e) {
       // TODO - MESSAGE BOX
-      if($e instanceof ExceptionFleetInvalid) {
+      if ($e instanceof ExceptionFleetInvalid) {
         sn_db_transaction_rollback();
         pdie(classLocale::$lang['fl_attack_error'][$e->getCode()]);
       } else {
@@ -1690,7 +1690,7 @@ 
 
 
     if (!empty($captain['unit_id'])) {
-      db_unit_set_by_id($captain['unit_id'], "`unit_location_type` = " . LOC_FLEET . ", `unit_location_id` = {$this->_dbId}");
+      db_unit_set_by_id($captain['unit_id'], "`unit_location_type` = ".LOC_FLEET.", `unit_location_id` = {$this->_dbId}");
     }
 
 //    return $this->fleet->acs['ankunft'] - $this->fleet->time_launch >= $this->fleet->travelData['duration'];
@@ -1702,7 +1702,7 @@ 
     $template_result['.']['fleets'][] = $this->renderFleet(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']),

includes/classes/DBStaticRecord.php

Spacing +10 added lines, -10 removed lines

@@ -45,11 +45,11 @@ 
             $result[] = 'NULL';
           break;
           default:
-            $string = (string)$fieldName;
-            if($string == '') {
+            $string = (string) $fieldName;
+            if ($string == '') {
               throw new ExceptionDBFieldEmpty();
             }
-            $result[] = '`' . $string . '`';
+            $result[] = '`'.$string.'`';
         }
       }
     } else {
@@ -77,10 +77,10 @@ 
     if (!empty($fieldList)) {
       $user_record = self::$dbStatic->doquery(
         (
-          "SELECT {$fieldList}" .
-          " FROM {{" . self::$_table . "}}" .
-          (!empty($where) ? " WHERE {$where}" : '') .
-          (!empty($for_update) ? " FOR UPDATE" : '') .
+          "SELECT {$fieldList}".
+          " FROM {{".self::$_table."}}".
+          (!empty($where) ? " WHERE {$where}" : '').
+          (!empty($for_update) ? " FOR UPDATE" : '').
           ($returnFirst ? ' LIMIT 1' : '')
         ),
         $returnFirst
@@ -110,7 +110,7 @@ 
    * @return int
    */
   public static function getMaxId() {
-    $maxId = self::$dbStatic->doquery("SELECT MAX(`" . static::$_idField . "`) AS `maxId` FROM `{{" . static::$_table . "}}`", true);
+    $maxId = self::$dbStatic->doquery("SELECT MAX(`".static::$_idField."`) AS `maxId` FROM `{{".static::$_table."}}`", true);
 
     return !empty($maxId['maxId']) ? $maxId['maxId'] : 0;
   }
@@ -123,7 +123,7 @@ 
    * @return array|null
    */
   public static function getRecordById($user_id, $fieldList = array(), $for_update = false) {
-    return static::getRecord(static::$_idField . ' = ' . $user_id, $fieldList, $for_update);
+    return static::getRecord(static::$_idField.' = '.$user_id, $fieldList, $for_update);
   }
 
 
@@ -135,7 +135,7 @@ 
   public static function queryExistsIdInList($idList) {
     $query = null;
     if (!empty($idList)) {
-      $query = self::$dbStatic->doquery("SELECT `" . static::$_idField . "` FROM `{{" . static::$_table . "}}` WHERE `" . static::$_idField . "` IN (" . implode(',', $idList) . ")");
+      $query = self::$dbStatic->doquery("SELECT `".static::$_idField."` FROM `{{".static::$_table."}}` WHERE `".static::$_idField."` IN (".implode(',', $idList).")");
     }
 
     return !empty($query) ? $query : null;

includes/classes/FleetValidator.php

Spacing +9 added lines, -9 removed lines

@@ -59,7 +59,7 @@ 
 //pdump($checkResult, $condition);
 
       if (is_array($action)) {
-        if(!empty($action[$checkResult])) {
+        if (!empty($action[$checkResult])) {
           $action = $action[$checkResult];
         } else {
           continue;
@@ -882,8 +882,8 @@ 
    */
   protected function checkACSInvited() {
     $playersInvited = !empty($this->fleet->acs['eingeladen']) ? explode(',', $this->fleet->acs['eingeladen']) : array();
-    foreach($playersInvited as $playerId) {
-      if(intval($playerId) == $this->fleet->dbOwnerRow['id']) {
+    foreach ($playersInvited as $playerId) {
+      if (intval($playerId) == $this->fleet->dbOwnerRow['id']) {
         return true;
       }
     }
@@ -970,9 +970,9 @@ 
 
     // Retrieving flying fleets
     $objFleetsBashing = FleetList::dbGetFleetListBashing($user['id'], $this->fleet->dbTargetRow);
-    foreach($objFleetsBashing->_container as $fleetBashing) {
+    foreach ($objFleetsBashing->_container as $fleetBashing) {
       // Checking for ACS - each ACS count only once
-      if($fleetBashing->group_id) {
+      if ($fleetBashing->group_id) {
         $bashing_list["{$user['id']}_{$fleetBashing->group_id}"] = $fleetBashing->time_arrive_to_target;
       } else {
         $bashing_list[] = $fleetBashing->time_arrive_to_target;
@@ -980,12 +980,12 @@ 
     }
 
     // Check for joining to ACS - if there are already fleets in ACS no checks should be done
-    if($this->fleet->mission_type == MT_ACS && $bashing_list["{$user['id']}_{$this->fleet->group_id}"]) {
+    if ($this->fleet->mission_type == MT_ACS && $bashing_list["{$user['id']}_{$this->fleet->group_id}"]) {
       return true;
     }
 
     $query = db_bashing_list_get($user, $this->fleet->dbTargetRow, $time_limit);
-    while($bashing_row = db_fetch($query)) {
+    while ($bashing_row = db_fetch($query)) {
       $bashing_list[] = $bashing_row['bashing_time'];
     }
 
@@ -994,9 +994,9 @@ 
     $last_attack = 0;
     $wave = 0;
     $attack = 1;
-    foreach($bashing_list as &$bash_time) {
+    foreach ($bashing_list as &$bash_time) {
       $attack++;
-      if(
+      if (
         $bash_time - $last_attack > classSupernova::$config->fleet_bashing_interval
         ||
         $attack > classSupernova::$config->fleet_bashing_attacks