supernova-ws / SuperNova

includes/includes/flt_mission_recycle.php

Spacing +10 added lines, -10 removed lines

@@ -20,7 +20,7 @@ 
 
   $destination_planet = &$mission_data->dst_planet;
 
-  if(empty($destination_planet['id'])) {
+  if (empty($destination_planet['id'])) {
     $objFleet->mark_fleet_as_returned();
     $objFleet->flush_changes_to_db();
 
@@ -31,10 +31,10 @@ 
   $OtherFleetCapacity = 0;
 
   $fleet_array = $objFleet->get_unit_list();
-  foreach($fleet_array as $unit_id => $unit_count) {
-    if(in_array($unit_id, sn_get_groups('fleet'))) {
+  foreach ($fleet_array as $unit_id => $unit_count) {
+    if (in_array($unit_id, sn_get_groups('fleet'))) {
       $capacity = get_unit_param($unit_id, P_CAPACITY) * $unit_count;
-      if(in_array($unit_id, sn_get_groups('flt_recyclers'))) {
+      if (in_array($unit_id, sn_get_groups('flt_recyclers'))) {
         $RecyclerCapacity += $capacity;
       } else {
         $OtherFleetCapacity += $capacity;
@@ -43,33 +43,33 @@ 
   }
 
   $fleet_resources_amount = $objFleet->get_resources_amount();
-  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"];

includes/classes/UBE/UBEUnit.php

Spacing +15 added lines, -15 removed lines

@@ -50,7 +50,7 @@ 
     parent::setUnitId($unitId);
 
     // Reset combat stats??
-    if($this->_unitId) {
+    if ($this->_unitId) {
       $this->amplify = $this->info[P_AMPLIFY];
       $this->capacity = $this->info[P_CAPACITY];
       $this->price[RES_METAL] = $this->info[P_COST][RES_METAL];
@@ -72,7 +72,7 @@ 
     $this->bonus_attack = $this->info[P_ATTACK];
     $this->bonus_shield = $this->info[P_SHIELD];
     $this->bonus_armor = $this->info[P_ARMOR];
-    if(is_object($this->unit_bonus)) {
+    if (is_object($this->unit_bonus)) {
       $this->bonus_attack = floor($this->bonus_attack * $this->unit_bonus->calcBonus(P_ATTACK));
       $this->bonus_shield = floor($this->bonus_shield * $this->unit_bonus->calcBonus(P_SHIELD));
       $this->bonus_armor = floor($this->bonus_armor * $this->unit_bonus->calcBonus(P_ARMOR));
@@ -80,7 +80,7 @@ 
     $this->randomized_attack = $this->bonus_attack;
     $this->randomized_shield = $this->bonus_shield;
     $this->randomized_armor = $this->bonus_armor;
-    if(!$is_simulator) {
+    if (!$is_simulator) {
       // TODO - randomize attack if is not simulator
       $this->randomized_attack = floor($this->bonus_attack * ($is_simulator ? 1 : mt_rand(UBE_RANDOMIZE_FROM, UBE_RANDOMIZE_TO) / 100));
       $this->randomized_shield = floor($this->bonus_shield * ($is_simulator ? 1 : mt_rand(UBE_RANDOMIZE_FROM, UBE_RANDOMIZE_TO) / 100));
@@ -159,22 +159,22 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function restore_unit($is_simulator) {
-    if($this->_type != UNIT_DEFENCE || $this->units_lost <= 0) {
+    if ($this->_type != UNIT_DEFENCE || $this->units_lost <= 0) {
       return;
     }
 
-    if($is_simulator) {
+    if ($is_simulator) {
       $units_giveback = round($this->units_lost * UBE_DEFENCE_RESTORATION_CHANCE_AVG / 100); // for simulation just return 75% of loss
     } else {
       // Checking - should we trigger mass-restore
-      if($this->units_lost >= UBE_DEFENCE_RESTORATION_MASS_COUNT) {
+      if ($this->units_lost >= UBE_DEFENCE_RESTORATION_MASS_COUNT) {
         // For large amount - mass-restoring defence
         $units_giveback = round($this->units_lost * mt_rand(UBE_DEFENCE_RESTORATION_CHANCE_MIN, UBE_DEFENCE_RESTORATION_CHANCE_MAX) / 100);
       } else {
         // For small amount - restoring defence per single unit
         $units_giveback = 0;
-        for($i = 1; $i <= $this->units_lost; $i++) {
-          if(mt_rand(1, 100) <= UBE_DEFENCE_RESTORATION_CHANCE_AVG) {
+        for ($i = 1; $i <= $this->units_lost; $i++) {
+          if (mt_rand(1, 100) <= UBE_DEFENCE_RESTORATION_CHANCE_AVG) {
             $units_giveback++;
           }
         }
@@ -193,7 +193,7 @@ 
    */
   public function receive_damage($is_simulator) {
     // TODO - Добавить взрывы от полуповрежденных юнитов - т.е. заранее вычислить из убитых юнитов еще количество убитых умножить на вероятность от структуры
-    if($this->_count <= 0) {
+    if ($this->_count <= 0) {
       return;
     }
 
@@ -216,7 +216,7 @@ 
     $this->adjustCount(-$units_lost);
 
     // Проверяем - не взорвался ли текущий юнит
-    while($this->_count > 0 && $this->attack_income > 0) {
+    while ($this->_count > 0 && $this->attack_income > 0) {
       $this->attack_damaged_unit($is_simulator);
     }
 
@@ -241,7 +241,7 @@ 
     $armor_left = $this->pool_armor % $this->randomized_armor;
     // Проверка - не атакуем ли мы целый корабль
     // Такое может быть, если на прошлой итерации поврежденный корабль был взорван и еще осталась входящяя атака
-    if($shield_left == 0 && $armor_left == 0) {
+    if ($shield_left == 0 && $armor_left == 0) {
       $shield_left = $this->randomized_shield;
       $armor_left = $this->randomized_armor;
     }
@@ -255,7 +255,7 @@ 
     // Вычитаем этот дамадж из щитов пула
     $this->pool_shield -= $damage_to_shield;
     // Если весь дамадж был поглощён щитами - выходим
-    if($this->attack_income <= 0) {
+    if ($this->attack_income <= 0) {
       return;
     }
 
@@ -272,7 +272,7 @@ 
     $armor_left -= $damage_to_armor;
 
     // Проверяем - осталась ли броня на текущем корабле и вааще
-    if($this->pool_armor <= 0 || $armor_left <= 0) {
+    if ($this->pool_armor <= 0 || $armor_left <= 0) {
       // Не осталось - корабль уничтожен
       $this->adjustCount(-1);
 
@@ -283,10 +283,10 @@ 
     $armor_left_percent = $armor_left / $this->randomized_armor * 100;
     // Проверяем % здоровья
     // TODO - сделать динамический процент для каждого вида юнитов
-    if($armor_left_percent <= UBE_CRITICAL_DAMAGE_THRESHOLD) {
+    if ($armor_left_percent <= UBE_CRITICAL_DAMAGE_THRESHOLD) {
       // Дамадж пошёл по структуре. Чем более поврежден юнит - тем больше шансов у него взорваться
       $random = $is_simulator ? UBE_CRITICAL_DAMAGE_THRESHOLD / 2 : mt_rand(0, 100);
-      if($random >= $armor_left_percent) {
+      if ($random >= $armor_left_percent) {
         $this->adjustCount(-1);
         $this->unit_count_boom++;
 

includes/classes/UBE/UBEPlayerList.php

Spacing +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
       UBE_PLAYER_IS_DEFENDER => array(),
     );
 
-    foreach($this->_container as $player_id => $UBEPlayer) {
+    foreach ($this->_container as $player_id => $UBEPlayer) {
       $result[$UBEPlayer->getSide() ? UBE_PLAYER_IS_ATTACKER : UBE_PLAYER_IS_DEFENDER][$player_id] = $UBEPlayer->getDbRow();
     }
 
@@ -70,8 +70,8 @@ 
    */
   public function get_first_player_on_side($side) {
     $result = null;
-    foreach($this->_container as $player_id => $UBEPlayer) {
-      if($UBEPlayer->getSide() == $side) {
+    foreach ($this->_container as $player_id => $UBEPlayer) {
+      if ($UBEPlayer->getSide() == $side) {
         $result = $UBEPlayer;
         break;
       }
@@ -88,7 +88,7 @@ 
    */
   public function get_player_sides() {
     $result = array();
-    foreach($this->_container as $player_id => $UBEPlayer) {
+    foreach ($this->_container as $player_id => $UBEPlayer) {
       $result[$player_id] = $UBEPlayer->getSide() ? UBE_PLAYER_IS_ATTACKER : UBE_PLAYER_IS_DEFENDER;
     }
 
@@ -96,7 +96,7 @@ 
   }
 
   public function ubeLoadPlayersAndSetSideFromFleetIdList(array $added_fleets, UBEFleetList $fleetList, $side = UBE_PLAYER_IS_DEFENDER) {
-    foreach($added_fleets as $fleet_id) {
+    foreach ($added_fleets as $fleet_id) {
       $this->db_load_player_by_id($fleetList[$fleet_id]->owner_id, $side);
     }
   }

includes/classes/UBE/UBERoundList.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
    */
   public function report_render_rounds(&$template_result, UBE $ube) {
     $round_count = $this->count();
-    for($round = 1; $round <= $round_count - 1; $round++) {
+    for ($round = 1; $round <= $round_count - 1; $round++) {
       $template_result['.']['round'][] = array(
         'NUMBER' => $round,
         '.'      => array(
@@ -48,7 +48,7 @@ 
    */
   public function sql_generate_unit_array(array &$sql_perform_ube_report_unit, $ube_report_id, UBEFleetList $UBEFleetList) {
     $unit_sort_order = 1;
-    foreach($this->_container as $round_number => $UBERound) {
+    foreach ($this->_container as $round_number => $UBERound) {
       $outer_prefix = array(
         $ube_report_id,
         $round_number,
@@ -66,9 +66,9 @@ 
    */
   public function db_load_round_list_from_report_row($report_row, UBE $ube) {
     $query = doquery("SELECT * FROM {{ube_report_unit}} WHERE `ube_report_id` = {$report_row['ube_report_id']} ORDER BY `ube_report_unit_id`");
-    while($report_unit_row = db_fetch($query)) {
+    while ($report_unit_row = db_fetch($query)) {
       $round_number = $report_unit_row['ube_report_unit_round'];
-      if(!isset($this[$round_number])) {
+      if (!isset($this[$round_number])) {
         $this[$round_number] = new UBERound();
         $this[$round_number]->init_round_from_report_unit_row($report_unit_row);
       }

includes/classes/UBE/UBERound.php

Spacing +7 added lines, -7 removed lines

@@ -36,8 +36,8 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function make_snapshot(UBEFleetList $UBEFleetList) {
-    foreach($UBEFleetList->_container as $fleet_id => $UBEFleet) {
-      foreach($UBEFleet->unit_list->_container as $UBEUnit) {
+    foreach ($UBEFleetList->_container as $fleet_id => $UBEFleet) {
+      foreach ($UBEFleet->unit_list->_container as $UBEUnit) {
         $this->snapshot[$fleet_id][$UBEUnit->unitId] = new UBESnapshotUnit();
         $this->snapshot[$fleet_id][$UBEUnit->unitId]->init_from_UBEUnit($UBEUnit);
       }
@@ -53,12 +53,12 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function sql_generate_unit_array(array &$sql_perform_ube_report_unit, &$unit_sort_order, UBEFleetList $UBEFleetList, array $outer_prefix) {
-    foreach($this->snapshot as $fleet_id => $fleet_snapshot) {
+    foreach ($this->snapshot as $fleet_id => $fleet_snapshot) {
       $inner_prefix = array(
         $UBEFleetList[$fleet_id]->owner_id,
         $fleet_id,
       );
-      foreach($fleet_snapshot as $unit_id => $unit_snapshot) {
+      foreach ($fleet_snapshot as $unit_id => $unit_snapshot) {
         $sql_perform_ube_report_unit[] = array_merge(
           $outer_prefix,
           $inner_prefix,
@@ -101,7 +101,7 @@ 
       UBE_PLAYER_IS_DEFENDER => array(),
     );
 
-    foreach($this->snapshot as $fleet_id => $fleet_snapshot) {
+    foreach ($this->snapshot as $fleet_id => $fleet_snapshot) {
       $fleet_owner_id = $ube->fleet_list[$fleet_id]->owner_id;
       $planet_ube_row = $ube->fleet_list[$fleet_id]->UBE_PLANET;
 
@@ -111,13 +111,13 @@ 
         'PLAYER_NAME' => htmlentities($ube->players[$fleet_owner_id]->name, ENT_COMPAT, 'UTF-8'),
       );
 
-      if(is_array($planet_ube_row)) {
+      if (is_array($planet_ube_row)) {
         $template_fleet += $planet_ube_row;
         $template_fleet[PLANET_NAME] = $template_fleet[PLANET_NAME] ? htmlentities($template_fleet[PLANET_NAME], ENT_COMPAT, 'UTF-8') : '';
         $template_fleet['PLANET_TYPE_TEXT'] = $lang['sys_planet_type_sh'][$template_fleet['PLANET_TYPE']];
       }
 
-      foreach($fleet_snapshot as $unit_id => $unit_snapshot) {
+      foreach ($fleet_snapshot as $unit_id => $unit_snapshot) {
         $template_fleet['.']['ship'][] = $unit_snapshot->report_render_unit($prevSnapshot[$fleet_id][$unit_id]);
       }
 

includes/classes/UBE/ArrayAccessV2.php

Spacing +10 added lines, -10 removed lines

@@ -42,7 +42,7 @@ 
 
 
   public function __clone() {
-    if(static::$_clonable == ArrayAccessV2::CLONE_NONE) {
+    if (static::$_clonable == ArrayAccessV2::CLONE_NONE) {
       return;
     }
 
@@ -50,10 +50,10 @@ 
   }
 
   protected static function _deep_clone(&$array) {
-    foreach($array as &$value) {
-      if(is_object($value)) {
+    foreach ($array as &$value) {
+      if (is_object($value)) {
         $value = clone $value;
-      } elseif(is_array($value) && static::$_clonable == ArrayAccessV2::CLONE_DEEP) {
+      } elseif (is_array($value) && static::$_clonable == ArrayAccessV2::CLONE_DEEP) {
         static::_deep_clone($value);
       }
     }
@@ -67,8 +67,8 @@ 
    */
   public function __call($method_name, array $arguments) {
     $object_first = reset($this->_container);
-    if($object_first !== false && method_exists($object_first, $method_name)) {
-      foreach($this->_container as $unit_id => $object) {
+    if ($object_first !== false && method_exists($object_first, $method_name)) {
+      foreach ($this->_container as $unit_id => $object) {
         call_user_func_array(array($object, $method_name), $arguments);
       }
     }
@@ -83,8 +83,8 @@ 
    */
   public function getSumProperty($property_name) {
     $result = 0.0;
-    foreach($this->_container as $object) {
-      if(is_object($object) && property_exists($object, $property_name)) {
+    foreach ($this->_container as $object) {
+      if (is_object($object) && property_exists($object, $property_name)) {
         $result += $object->$property_name;
       }
     }
@@ -100,8 +100,8 @@ 
    * @return mixed
    */
   public function aggregateByMethod($method_name, &$result) {
-    foreach($this->_container as $object) {
-      if(is_object($object) && method_exists($object, $method_name)) {
+    foreach ($this->_container as $object) {
+      if (is_object($object) && method_exists($object, $method_name)) {
         call_user_func(array($object, $method_name), $result);
       }
     }

includes/classes/PlayerList.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
    * @version 41a6.16
    */
   protected function db_load_player_by_id($player_id) {
-    if(isset($this[$player_id])) {
+    if (isset($this[$player_id])) {
       return;
     }
 

includes/classes/Unit.php

Spacing +5 added lines, -5 removed lines

@@ -154,15 +154,15 @@ 
    * @param string $group_name
    */
   public static function _init($group_name = '') {
-    if(static::$_is_static_init) {
+    if (static::$_is_static_init) {
       return;
     }
 
-    if($group_name) {
+    if ($group_name) {
       static::$_sn_group_name = $group_name;
     }
 
-    if(static::$_sn_group_name) {
+    if (static::$_sn_group_name) {
       static::$_group_unit_id_list = sn_get_groups(static::$_sn_group_name);
       empty(static::$_group_unit_id_list) ? static::$_group_unit_id_list = array() : false;
     }
@@ -187,7 +187,7 @@ 
     // TODO - Reset combat stats??
     $this->_unitId = $unitId;
 
-    if($this->_unitId) {
+    if ($this->_unitId) {
       $this->info = get_unit_param($this->_unitId);
       $this->_type = $this->info[P_UNIT_TYPE];
     } else {
@@ -198,7 +198,7 @@ 
 
   protected function setCount($value) {
     // TODO - Reset combat stats??
-    if($value < 0) {
+    if ($value < 0) {
       classSupernova::$debug->error('Can not set Unit::$count to negative value');
     }
     $this->_count = $value;

includes/classes/DBRow.php

Doc Comments +1 added lines, -1 removed lines

@@ -411,7 +411,7 @@
   /**
    * @param array $field_set
    *
-   * @return int|string
+   * @return integer
    */
   protected function db_field_set_create(array $field_set) {
     !sn_db_field_set_is_safe($field_set) ? $field_set = sn_db_field_set_make_safe($field_set) : false;

Spacing +18 added lines, -18 removed lines

@@ -97,7 +97,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;
@@ -164,7 +164,7 @@ 
    */
   public function __get($name) {
     // Redirecting inaccessible get to __call which will handle the rest
-    return $this->__call('get' . ucfirst($name), array());
+    return $this->__call('get'.ucfirst($name), array());
   }
 
   /**
@@ -176,7 +176,7 @@ 
   // TODO - сеттер должен параллельно изменять значение db_row - for now...
   public function __set($name, $value) {
     // Redirecting inaccessible set to __call which will handle the rest
-    $this->__call('set' . ucfirst($name), array($value));
+    $this->__call('set'.ucfirst($name), array($value));
   }
 
   /**
@@ -195,14 +195,14 @@ 
     // If method is not getter or setter OR property name not exists in $_properties - raising exception
     // Descendants can catch this Exception to make own __call magic
     if (($left3 != 'get' && $left3 != 'set') || empty(static::$_properties[$propertyName])) {
-      throw new ExceptionPropertyNotExists('Property ' . $propertyName . ' not exists when calling getter/setter ' . get_called_class() . '::' . $name, ERR_ERROR);
+      throw new ExceptionPropertyNotExists('Property '.$propertyName.' not exists when calling getter/setter '.get_called_class().'::'.$name, ERR_ERROR);
     }
 
     // TODO check for read-only
 
     if ($left3 == 'set') {
       if (!empty($this->propertiesAdjusted[$propertyName])) {
-        throw new PropertyAccessException('Property ' . $propertyName . ' already was adjusted so no SET is possible until dbSave in ' . get_called_class() . '::' . $name, ERR_ERROR);
+        throw new PropertyAccessException('Property '.$propertyName.' already was adjusted so no SET is possible until dbSave in '.get_called_class().'::'.$name, ERR_ERROR);
       }
       $this->propertiesChanged[$propertyName] = 1;
     }
@@ -217,11 +217,11 @@ 
 
     // Is it getter?
     if ($left3 === 'get') {
-      return $this->{'_' . $propertyName};
+      return $this->{'_'.$propertyName};
     }
 
     // Not getter? Then it's setter
-    $this->{'_' . $propertyName} = $arguments[0];
+    $this->{'_'.$propertyName} = $arguments[0];
 
     return null;
   }
@@ -239,7 +239,7 @@ 
   public function dbLoad($dbId, $lockSkip = false) {
     $dbId = idval($dbId);
     if ($dbId <= 0) {
-      classSupernova::$debug->error(get_called_class() . '::dbLoad $dbId not positive = ' . $dbId);
+      classSupernova::$debug->error(get_called_class().'::dbLoad $dbId not positive = '.$dbId);
 
       return;
     }
@@ -251,7 +251,7 @@ 
       $this->dbGetLockById($this->_dbId);
     }
 
-    $db_row = doquery("SELECT * FROM `{{" . static::$_table . "}}` WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId . " LIMIT 1 FOR UPDATE;", true);
+    $db_row = doquery("SELECT * FROM `{{".static::$_table."}}` WHERE `".static::$_dbIdFieldName."` = ".$this->_dbId." LIMIT 1 FOR UPDATE;", true);
     if (empty($db_row)) {
       return;
     }
@@ -283,7 +283,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 {
@@ -292,7 +292,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();
       }
@@ -320,12 +320,12 @@ 
   // 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');
     }
     $this->_dbId = $this->db_field_set_create($this->dbMakeFieldSet());
 
     if (empty($this->_dbId)) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - error saving record ' . get_called_class() . '::dbInsert');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - error saving record '.get_called_class().'::dbInsert');
     }
 
     return $this->_dbId;
@@ -338,7 +338,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->dbMakeFieldSet(true));
   }
@@ -349,9 +349,9 @@ 
   // 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');
     }
-    doquery("DELETE FROM {{" . static::$_table . "}} WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId);
+    doquery("DELETE FROM {{".static::$_table."}} WHERE `".static::$_dbIdFieldName."` = ".$this->_dbId);
     $this->_dbId = 0;
     // Обо всём остальном должен позаботиться контейнер
   }
@@ -504,7 +504,7 @@ 
     $fields = implode(',', array_keys($field_set));
 
     $result = 0;
-    if (classSupernova::db_query("INSERT INTO `{{" . static::$_table . "}}` ({$fields}) VALUES ({$values});")) {
+    if (classSupernova::db_query("INSERT INTO `{{".static::$_table."}}` ({$fields}) VALUES ({$values});")) {
       $result = db_insert_id();
     }
 
@@ -540,7 +540,7 @@ 
 
     return empty($set_string)
       ? true
-      : classSupernova::db_query("UPDATE `{{" . static::$_table . "}}` SET {$set_string} WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId);
+      : classSupernova::db_query("UPDATE `{{".static::$_table."}}` SET {$set_string} WHERE `".static::$_dbIdFieldName."` = ".$this->_dbId);
   }
 
 }