supernova-ws / SuperNova

includes/general/math.php

Spacing +21 added lines, -21 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 function geometry_progression_sum($n, $b1, $q) {
-  return $q != 1 ? ($b1 * (pow($q, $n) - 1)/($q - 1)) : ($n * $b1);
+  return $q != 1 ? ($b1 * (pow($q, $n) - 1) / ($q - 1)) : ($n * $b1);
 }
 
 function sn_floor($value)
@@ -43,8 +43,8 @@ 
  *
  * @return float|int
  */
-function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false)  {
-  if($cut_extreme) {
+function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false) {
+  if ($cut_extreme) {
     $range_start--;
     $range_end++;
   }
@@ -60,7 +60,7 @@ 
 {
   $args = func_get_args();
 
-  switch(func_num_args())
+  switch (func_num_args())
   {
     case 0:
       // trigger_error('median() requires at least one parameter',E_USER_WARNING);
@@ -72,7 +72,7 @@ 
     // fallthrough
 
     default:
-      if(!is_array($args))
+      if (!is_array($args))
       {
         // trigger_error('median() requires a list of numbers to operate on or an array of numbers', E_USER_NOTICE);
         return false;
@@ -83,9 +83,9 @@ 
       $n = count($args);
       $h = intval($n / 2);
 
-      if($n % 2 == 0)
+      if ($n % 2 == 0)
       {
-        $median = ($args[$h] + $args[$h-1]) / 2;
+        $median = ($args[$h] + $args[$h - 1]) / 2;
       }
       else
       {
@@ -103,49 +103,49 @@ 
 }
 function linear_calc(&$linear, $from = 0, $logProcess = false)
 {
-  for($i = $from; $i < count($linear); $i++)
+  for ($i = $from; $i < count($linear); $i++)
   {
     $eq = &$linear[$i];
-    for($j = count($eq) - 1; $j >= $from; $j--)
+    for ($j = count($eq) - 1; $j >= $from; $j--)
     {
       $eq[$j] /= $eq[$from];
     }
   }
-  if($logProcess) pdump($linear, 'Нормализовано по х' . $from);
+  if ($logProcess) pdump($linear, 'Нормализовано по х'.$from);
 
-  for($i = $from + 1; $i < count($linear); $i++)
+  for ($i = $from + 1; $i < count($linear); $i++)
   {
     $eq = &$linear[$i];
-    for($j = count($eq) - 1; $j >= $from; $j--)
+    for ($j = count($eq) - 1; $j >= $from; $j--)
     {
       $eq[$j] -= $linear[$from][$j];
     }
   }
-  if($logProcess) pdump($linear, 'Подставили х' . $from);
+  if ($logProcess) pdump($linear, 'Подставили х'.$from);
 
-  if($from < count($linear) - 1)
+  if ($from < count($linear) - 1)
   {
     linear_calc($linear, $from + 1, $logProcess);
   }
 
-  if($from)
+  if ($from)
   {
-    for($i = 0; $i < $from; $i++)
+    for ($i = 0; $i < $from; $i++)
     {
       $eq = &$linear[$i];
-      for($j = count($eq) - 1; $j >= $from; $j--)
+      for ($j = count($eq) - 1; $j >= $from; $j--)
       {
         $eq[$j] = $eq[$j] - $eq[$from] * $linear[$from][$j];
       }
     }
-    if($logProcess) pdump($linear, 'Подставили обратно х' . $from);
+    if ($logProcess) pdump($linear, 'Подставили обратно х'.$from);
   }
   else
   {
-    if($logProcess) pdump($linear, 'Результат' . $from);
-    foreach($linear as $index => &$eq)
+    if ($logProcess) pdump($linear, 'Результат'.$from);
+    foreach ($linear as $index => &$eq)
     {
-      pdump($eq[count($linear)], 'x' . $index);
+      pdump($eq[count($linear)], 'x'.$index);
     }
   }
 }

Braces +14 added lines, -8 removed lines

@@ -86,8 +86,7 @@ 
       if($n % 2 == 0)
       {
         $median = ($args[$h] + $args[$h-1]) / 2;
-      }
-      else
+      } else
       {
         $median = $args[$h];
       }
@@ -111,7 +110,9 @@ 
       $eq[$j] /= $eq[$from];
     }
   }
-  if($logProcess) pdump($linear, 'Нормализовано по х' . $from);
+  if($logProcess) {
+    pdump($linear, 'Нормализовано по х' . $from);
+  }
 
   for($i = $from + 1; $i < count($linear); $i++)
   {
@@ -121,7 +122,9 @@ 
       $eq[$j] -= $linear[$from][$j];
     }
   }
-  if($logProcess) pdump($linear, 'Подставили х' . $from);
+  if($logProcess) {
+    pdump($linear, 'Подставили х' . $from);
+  }
 
   if($from < count($linear) - 1)
   {
@@ -138,11 +141,14 @@ 
         $eq[$j] = $eq[$j] - $eq[$from] * $linear[$from][$j];
       }
     }
-    if($logProcess) pdump($linear, 'Подставили обратно х' . $from);
-  }
-  else
+    if($logProcess) {
+      pdump($linear, 'Подставили обратно х' . $from);
+    }
+  } else
   {
-    if($logProcess) pdump($linear, 'Результат' . $from);
+    if($logProcess) {
+      pdump($linear, 'Результат' . $from);
+    }
     foreach($linear as $index => &$eq)
     {
       pdump($eq[count($linear)], 'x' . $index);

Doc Comments +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 /**
  * @param float      $range_start - Начало диапазона
  * @param float      $range_end - Конец диапазона
- * @param bool|int  $round - До скольки знаков округлять результат. False - не округлять, True - округлять до целого, 1 - округлять до десятков, 2 - до сотен итд
+ * @param boolean  $round - До скольки знаков округлять результат. False - не округлять, True - округлять до целого, 1 - округлять до десятков, 2 - до сотен итд
  * @param int        $strict - В сколько сигм надо уложить результат
  * @param bool|false $cut_extreme - надо ли обрезать крайние значения. Например, при $strict = 2 их слишком много
  *

includes/classes/UBE/UBE.php

Spacing +48 added lines, -49 removed lines

@@ -147,7 +147,7 @@ 
     $this->players->db_load_player_by_id($player_id, UBE_PLAYER_IS_DEFENDER);
 
     $player_db_row = $this->players[$player_id]->getDbRow();
-    if($fortifier_level = mrc_get_level($player_db_row, $this->combatMission->dst_planet, MRC_FORTIFIER)) {
+    if ($fortifier_level = mrc_get_level($player_db_row, $this->combatMission->dst_planet, MRC_FORTIFIER)) {
       $this->planet_bonus->add_unit_by_snid(MRC_FORTIFIER, $fortifier_level);
     }
 
@@ -179,7 +179,7 @@ 
     $this->rounds[0] = new UBERound(0);
     $this->rounds[0]->make_snapshot($this->fleet_list);
 
-    for($round = 1; $round <= 10; $round++) {
+    for ($round = 1; $round <= 10; $round++) {
       // Проводим раунд
       defined('DEBUG_UBE') ? print("Round {$round}<br>") : false;
 
@@ -192,7 +192,7 @@ 
 
       // Анализируем итоги текущего раунда и готовим данные для следующего
       $this->combat_result = $this->fleet_list->ubeAnalyzeFleetOutcome($round);
-      if($this->combat_result != UBE_COMBAT_RESULT_DRAW) {
+      if ($this->combat_result != UBE_COMBAT_RESULT_DRAW) {
         break;
       }
 
@@ -221,11 +221,11 @@ 
     // Генерируем результат боя
     $this->fleet_list->ube_analyze_fleets($this->is_simulator, $this->debris, $this->resource_exchange_rates);
 
-    if(!$this->is_ube_loaded) {
+    if (!$this->is_ube_loaded) {
       $this->moon_calculator->calculate_moon($this);
 
       // Лутаем ресурсы - если аттакер выиграл
-      if($this->combat_result == UBE_COMBAT_RESULT_WIN) {
+      if ($this->combat_result == UBE_COMBAT_RESULT_WIN) {
         $this->sn_ube_combat_analyze_loot();
       }
     }
@@ -245,7 +245,7 @@ 
       RES_DEUTERIUM => 0,
     );
 
-    if(
+    if (
       (($planet_resource_total = $this->fleet_list[0]->get_resources_amount()) > 0)
       &&
       (($total_capacity = $this->fleet_list->ube_get_capacity_attackers()) > 0)
@@ -257,9 +257,9 @@ 
       $planet_lootable_percent = $planet_lootable / $planet_resource_total;
 
       // Вычисляем сколько ресурсов вывезено
-      foreach($this->fleet_list->_container as $fleet_id => $fleet) {
+      foreach ($this->fleet_list->_container as $fleet_id => $fleet) {
         $looted_in_metal = 0;
-        foreach($this->fleet_list[0]->resource_list as $resource_id => $resource_amount) {
+        foreach ($this->fleet_list[0]->resource_list as $resource_id => $resource_amount) {
           // Вычисляем какой процент общей емкости трюмов атакующих будет задействован
           $fleet_lootable_percent = $fleet->fleet_capacity / $total_capacity;
           $looted = floor($resource_amount * $planet_lootable_percent * $fleet_lootable_percent);
@@ -325,16 +325,16 @@ 
     $destination_user_id = $this->fleet_list[0]->owner_id;
 
     // Обновляем поле обломков на планете
-    if(!$this->is_admin_in_combat && $this->debris->debris_total() > 0) {
+    if (!$this->is_admin_in_combat && $this->debris->debris_total() > 0) {
       db_planet_set_by_gspt($this->ube_planet_info[PLANET_GALAXY], $this->ube_planet_info[PLANET_SYSTEM], $this->ube_planet_info[PLANET_PLANET], PT_PLANET,
-        "`debris_metal` = `debris_metal` + " . $this->debris->debris_get_resource(RES_METAL) . ", `debris_crystal` = `debris_crystal` + " . $this->debris->debris_get_resource(RES_CRYSTAL)
+        "`debris_metal` = `debris_metal` + ".$this->debris->debris_get_resource(RES_METAL).", `debris_crystal` = `debris_crystal` + ".$this->debris->debris_get_resource(RES_CRYSTAL)
       );
     }
 
-    foreach($this->fleet_list->_container as $fleet_id => $UBEFleet) {
+    foreach ($this->fleet_list->_container as $fleet_id => $UBEFleet) {
       $ship_count_lost = $UBEFleet->unit_list->unitCountLost();
 
-      if($fleet_id) {
+      if ($fleet_id) {
         // Флот
         $UBEFleet->db_save_combat_result_fleet($this->is_small_fleet_recce, $this->moon_calculator->get_reapers_status());
       } else {
@@ -342,19 +342,19 @@ 
 
         // Сохраняем изменения ресурсов - если они есть
         $resource_delta = $UBEFleet->ube_combat_result_calculate_resources();
-        if(!empty($resource_delta)) {
+        if (!empty($resource_delta)) {
           $temp = array();
-          foreach($resource_delta as $resource_id => $resource_amount) {
+          foreach ($resource_delta as $resource_id => $resource_amount) {
             $resource_db_name = pname_resource_name($resource_id);
             $temp[] = "`{$resource_db_name}` = `{$resource_db_name}` + ({$resource_amount})";
           }
           db_planet_set_by_id($this->ube_planet_info[PLANET_ID], implode(',', $temp));
         }
 
-        if($ship_count_lost) {
+        if ($ship_count_lost) {
           $db_changeset = array();
           $planet_row_cache = $this->players[$destination_user_id]->getDbRow();
-          foreach($UBEFleet->unit_list->_container as $UBEUnit) {
+          foreach ($UBEFleet->unit_list->_container as $UBEUnit) {
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($UBEUnit->unitId, -$UBEUnit->units_lost, $planet_row_cache, $this->ube_planet_info[PLANET_ID]);
           }
           db_changeset_apply($db_changeset);
@@ -365,7 +365,7 @@ 
     // TODO: Связать сабы с флотами констраинтами ON DELETE SET NULL
     // Для САБов
     $fleet_group_id_list = $this->fleet_list->ube_get_groups();
-    if(!empty($fleet_group_id_list)) {
+    if (!empty($fleet_group_id_list)) {
       $fleet_group_id_list = implode(',', $fleet_group_id_list);
       db_acs_delete_by_list($fleet_group_id_list);
     }
@@ -374,19 +374,19 @@ 
 
     $bashing_list = array();
     $players_sides = $this->players->get_player_sides();
-    foreach($players_sides as $player_id => $player_side) {
-      if($player_side != UBE_PLAYER_IS_ATTACKER) {
+    foreach ($players_sides as $player_id => $player_side) {
+      if ($player_side != UBE_PLAYER_IS_ATTACKER) {
         continue;
       }
-      if($this->moon_calculator->get_status() != UBE_MOON_DESTROY_SUCCESS) {
+      if ($this->moon_calculator->get_status() != UBE_MOON_DESTROY_SUCCESS) {
         $bashing_list[] = "({$player_id}, {$this->ube_planet_info[PLANET_ID]}, {$this->combat_timestamp})";
       }
-      if($this->mission_type_id == MT_ATTACK && $this->is_defender_active_player) {
+      if ($this->mission_type_id == MT_ATTACK && $this->is_defender_active_player) {
         $str_loose_or_win = $this->combat_result == UBE_COMBAT_RESULT_WIN ? 'raidswin' : 'raidsloose';
         db_user_set_by_id($player_id, "`xpraid` = `xpraid` + 1, `raids` = `raids` + 1, `{$str_loose_or_win}` = `{$str_loose_or_win}` + 1");
       }
     }
-    if(!empty($bashing_list)) {
+    if (!empty($bashing_list)) {
       $bashing_list = implode(',', $bashing_list);
       db_bashing_insert($bashing_list);
     }
@@ -413,20 +413,19 @@ 
       $planet_info[PLANET_SYSTEM],
       $planet_info[PLANET_PLANET],
       htmlentities($planet_info[PLANET_NAME], ENT_COMPAT, 'UTF-8'),
-      classLocale::$lang[$this->combat_result == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' :
-        ($this->combat_result == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')]
+      classLocale::$lang[$this->combat_result == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' : ($this->combat_result == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')]
     );
 
     $text_defender = '';
     $debris = $this->debris->get_debris();
-    foreach($debris as $resource_id => $resource_amount) {
-      if($resource_id == RES_DEUTERIUM) {
+    foreach ($debris as $resource_id => $resource_amount) {
+      if ($resource_id == RES_DEUTERIUM) {
         continue;
       }
 
-      $text_defender .= "{$classLocale['tech'][$resource_id]}: " . pretty_number($resource_amount) . '<br />';
+      $text_defender .= "{$classLocale['tech'][$resource_id]}: ".pretty_number($resource_amount).'<br />';
     }
-    if($text_defender) {
+    if ($text_defender) {
       $text_defender = "{$classLocale['ube_report_msg_body_debris']}{$text_defender}<br />";
     }
 
@@ -436,8 +435,8 @@ 
 
     // TODO: Оптимизировать отсылку сообщений - отсылать пакетами
     $player_sides = $this->players->get_player_sides();
-    foreach($player_sides as $player_id => $player_side) {
-      $message = $text_common . ($this->is_small_fleet_recce && ($player_side == UBE_PLAYER_IS_ATTACKER) ? classLocale::$lang['ube_report_msg_body_sfr'] : $text_defender);
+    foreach ($player_sides as $player_id => $player_side) {
+      $message = $text_common.($this->is_small_fleet_recce && ($player_side == UBE_PLAYER_IS_ATTACKER) ? classLocale::$lang['ube_report_msg_body_sfr'] : $text_defender);
       msg_send_simple_message($player_id, '', $this->combat_timestamp, MSG_TYPE_COMBAT, classLocale::$lang['sys_mess_tower'], classLocale::$lang['sys_mess_attack_report'], $message);
     }
 
@@ -473,11 +472,11 @@ 
     $player_id = $player_id == -1 ? $this->players->count() : $player_id;
     $fleet_id = $player_id; // FOR SIMULATOR!
 
-    if(empty($this->players[$player_id])) {
+    if (empty($this->players[$player_id])) {
       $this->players[$player_id] = new UBEPlayer();
     }
 
-    foreach($side_info as $fleet_data) {
+    foreach ($side_info as $fleet_data) {
       $this->players[$player_id]->name = $player_id;
       $this->players[$player_id]->setSide($attacker);
 
@@ -485,32 +484,32 @@ 
       $this->fleet_list[$fleet_id] = $objFleet;
 
       $this->fleet_list[$fleet_id]->owner_id = $player_id;
-      foreach($fleet_data as $unit_id => $unit_count) {
-        if(!$unit_count) {
+      foreach ($fleet_data as $unit_id => $unit_count) {
+        if (!$unit_count) {
           continue;
         }
 
         $unit_type = get_unit_param($unit_id, P_UNIT_TYPE);
 
-        if($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE) {
+        if ($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE) {
           $this->fleet_list[$fleet_id]->unit_list->unitAdjustCount($unit_id, $unit_count);
-        } elseif($unit_type == UNIT_RESOURCES) {
+        } elseif ($unit_type == UNIT_RESOURCES) {
           $this->fleet_list[$fleet_id]->resource_list[$unit_id] = $unit_count;
-        } elseif($unit_type == UNIT_TECHNOLOGIES) {
-          if($unit_id == TECH_WEAPON) {
+        } elseif ($unit_type == UNIT_TECHNOLOGIES) {
+          if ($unit_id == TECH_WEAPON) {
             $this->players[$player_id]->player_bonus->add_unit_by_snid(TECH_WEAPON, $unit_count);
-          } elseif($unit_id == TECH_SHIELD) {
+          } elseif ($unit_id == TECH_SHIELD) {
             $this->players[$player_id]->player_bonus->add_unit_by_snid(TECH_SHIELD, $unit_count);
-          } elseif($unit_id == TECH_ARMOR) {
+          } elseif ($unit_id == TECH_ARMOR) {
             $this->players[$player_id]->player_bonus->add_unit_by_snid(TECH_ARMOR, $unit_count);
           }
-        } elseif($unit_type == UNIT_GOVERNORS) {
-          if($unit_id == MRC_FORTIFIER) {
+        } elseif ($unit_type == UNIT_GOVERNORS) {
+          if ($unit_id == MRC_FORTIFIER) {
             // Фортифаер даёт бонус ко всему
             $this->planet_bonus->add_unit_by_snid(MRC_FORTIFIER, $unit_count);
           }
-        } elseif($unit_type == UNIT_MERCENARIES) {
-          if($unit_id == MRC_ADMIRAL) {
+        } elseif ($unit_type == UNIT_MERCENARIES) {
+          if ($unit_id == MRC_ADMIRAL) {
             $this->players[$player_id]->player_bonus->add_unit_by_snid(MRC_ADMIRAL, $unit_count);
           }
         }
@@ -565,7 +564,7 @@ 
 
     $ube->sn_ube_message_send();
 
-    defined('DEBUG_UBE') ? die('DIE at ' . __FILE__ . ' ' . __LINE__) : false;
+    defined('DEBUG_UBE') ? die('DIE at '.__FILE__.' '.__LINE__) : false;
 
     return false;
   }
@@ -580,7 +579,7 @@ 
 
     $ube_report = new UBEReport();
     $ube = $ube_report->sn_ube_report_load(sys_get_param_str('cypher'));
-    if($ube != UBE_REPORT_NOT_FOUND) {
+    if ($ube != UBE_REPORT_NOT_FOUND) {
       $ube_report->sn_ube_report_generate($ube, $template_result);
 
       $template = gettemplate('ube_combat_report', $template);
@@ -608,9 +607,9 @@ 
     $ube->sn_ube_combat();
     $ube_report = new UBEReport();
 
-    if(sys_get_param_str('reload')) {
+    if (sys_get_param_str('reload')) {
       $ube_new = $ube_report->sn_ube_report_load($ube->get_cypher()); // $combat_data = sn_ube_report_load($combat_data[UBE_REPORT_CYPHER]);
-      if($ube_new != UBE_REPORT_NOT_FOUND && is_object($ube_new)) {
+      if ($ube_new != UBE_REPORT_NOT_FOUND && is_object($ube_new)) {
         $ube = $ube_new;
       }
     }
@@ -658,7 +657,7 @@ 
     $this->debris->load_from_report_row($report_row);
 
     $query = doquery("SELECT * FROM {{ube_report_player}} WHERE `ube_report_id` = {$report_row['ube_report_id']}");
-    while($player_row = db_fetch($query)) {
+    while ($player_row = db_fetch($query)) {
       $this->players->init_player_from_report_info($player_row);
     }
 

Doc Comments +3 added lines, -3 removed lines

@@ -459,7 +459,7 @@ 
    * Преобразовывает данные симулятора в данные для расчета боя
    *
    * @param     $side_info
-   * @param     $attacker
+   * @param     boolean $attacker
    * @param int $player_id
    *
    */
@@ -521,7 +521,7 @@ 
   }
 
   /**
-   * @return int
+   * @return double
    */
   public function get_time_spent() {
     return $this->time_spent;
@@ -564,7 +564,7 @@ 
   }
 
   /**
-   * @param $template
+   * @param null|template $template
    *
    * @return template
    */

includes/classes/UBE/UBEDebug.php

Spacing +12 added lines, -12 removed lines

@@ -11,7 +11,7 @@ 
    * @version 41a6.49
    */
   public static function unit_dump_header() {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return;
     }
 
@@ -48,7 +48,7 @@ 
    * @version 41a6.49
    */
   public static function unit_dump(UBEUnit $unit, $desc = '', UBEUnit $before = null) {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return;
     }
 
@@ -75,7 +75,7 @@ 
 //  print("<td>" . $this->units_lost . "</td>");
 //  print("<td>" . $this->units_restored . "</td>");
 //  print("<td>" . $this->capacity . "</td>");
-    print("<td>" . round($unit->share_of_side_armor, 4) . "</td>");
+    print("<td>".round($unit->share_of_side_armor, 4)."</td>");
     print('</tr>');
   }
 
@@ -86,7 +86,7 @@ 
    * @version 41a6.49
    */
   public static function unit_dump_footer() {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return;
     }
 
@@ -101,16 +101,16 @@ 
    * @return UBEUnit
    */
   public static function unit_dump_defender(UBEUnit $attacking_unit_pool, UBEUnit $defending_unit_pool, $defending_fleet_id) {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return null;
     }
 
     $classLocale = classLocale::$lang;
 
-    print("[{$attacking_unit_pool->unitId}]{$classLocale['tech'][$attacking_unit_pool->unitId]}" .
-      ' attacks ' .
-      $defending_fleet_id . '@' . "[{$defending_unit_pool->unitId}]{$classLocale['tech'][$defending_unit_pool->unitId]}" .
-      ' with ' . pretty_number($defending_unit_pool->attack_income) .
+    print("[{$attacking_unit_pool->unitId}]{$classLocale['tech'][$attacking_unit_pool->unitId]}".
+      ' attacks '.
+      $defending_fleet_id.'@'."[{$defending_unit_pool->unitId}]{$classLocale['tech'][$defending_unit_pool->unitId]}".
+      ' with '.pretty_number($defending_unit_pool->attack_income).
       '<br>'
     );
     $before = clone $defending_unit_pool;
@@ -127,7 +127,7 @@ 
    * @version 41a6.49
    */
   public static function unit_dump_delta(UBEUnit $unit, $field, UBEUnit $before = null) {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return;
     }
 
@@ -136,8 +136,8 @@ 
     print(pretty_number($unit->$field));
     print("</td>");
     print("<td>");
-    if(!empty($before)) {
-      print('' . pretty_number($unit->$field - $before->$field) . '');
+    if (!empty($before)) {
+      print(''.pretty_number($unit->$field - $before->$field).'');
     }
     print("</td>");
   }

includes/classes/db_mysql_v4.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     !mysql_select_db($settings['name'])
       ? classSupernova::$debug->error_fatal('DB error - cannot find DB on server', $this->mysql_error())
       : false;
-    !$this->mysql_query('SET SESSION TRANSACTION ISOLATION LEVEL ' . self::DB_MYSQL_TRANSACTION_REPEATABLE_READ . ';')
+    !$this->mysql_query('SET SESSION TRANSACTION ISOLATION LEVEL '.self::DB_MYSQL_TRANSACTION_REPEATABLE_READ.';')
       ? classSupernova::$debug->error_fatal('DB error - cannot set desired isolation level', $this->mysql_error())
       : false;
 

includes/classes/UnitResourceLoot.php

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
   public static function _init($group_name = '') {
     parent::_init($group_name);
 
-    foreach(static::$_group_unit_id_list as $resource_id) {
+    foreach (static::$_group_unit_id_list as $resource_id) {
       static::$_group_pnames[$resource_id] = pname_resource_name($resource_id);
     }
 
@@ -48,13 +48,13 @@ 
 
     !is_array($resource_array) ? $resource_array = array() : false;
 
-    foreach($resource_array as $resource_id => $resource_actual_delta) {
-      if(!$resource_actual_delta) {
+    foreach ($resource_array as $resource_id => $resource_actual_delta) {
+      if (!$resource_actual_delta) {
         // No delta - no changes
         continue;
       }
 
-      $result[$prefix . static::$_group_pnames[$resource_id]] = $resource_actual_delta;
+      $result[$prefix.static::$_group_pnames[$resource_id]] = $resource_actual_delta;
     }
 
     return $result;

includes/classes/db_mysql_v5.php

Spacing +5 added lines, -5 removed lines

@@ -39,19 +39,19 @@
 
     @$this->link = mysqli_connect($settings['server'], $settings['user'], $settings['pass'], $settings['name']);
     if (!is_object($this->link) || $this->link->connect_error) {
-      classSupernova::$debug->error_fatal('DB Error - cannot connect to server error #' . $this->link->connect_errno, $this->link->connect_error);
+      classSupernova::$debug->error_fatal('DB Error - cannot connect to server error #'.$this->link->connect_errno, $this->link->connect_error);
     }
 
 
     !$this->mysql_query("/*!40101 SET NAMES 'utf8' */")
-      ? classSupernova::$debug->error_fatal('DB error - cannot set names 1 error #' . $this->link->errno, $this->link->error)
+      ? classSupernova::$debug->error_fatal('DB error - cannot set names 1 error #'.$this->link->errno, $this->link->error)
       : false;
     !$this->mysql_query("SET NAMES 'utf8';")
-      ? classSupernova::$debug->error_fatal('DB error - cannot set names 2 error #' . $this->link->errno, $this->link->error)
+      ? classSupernova::$debug->error_fatal('DB error - cannot set names 2 error #'.$this->link->errno, $this->link->error)
       : false;
 
-    !$this->mysql_query('SET SESSION TRANSACTION ISOLATION LEVEL ' . self::DB_MYSQL_TRANSACTION_REPEATABLE_READ . ';')
-      ? classSupernova::$debug->error_fatal('DB error - cannot set desired isolation level error #' . $this->link->errno, $this->link->error)
+    !$this->mysql_query('SET SESSION TRANSACTION ISOLATION LEVEL '.self::DB_MYSQL_TRANSACTION_REPEATABLE_READ.';')
+      ? classSupernova::$debug->error_fatal('DB error - cannot set desired isolation level error #'.$this->link->errno, $this->link->error)
       : false;
 
     $this->connected = true;

includes/classes/PlayerToAccountTranslate.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
   protected static $is_init = false;
 
   protected static function init() {
-    if(!empty(static::$db)) {
+    if (!empty(static::$db)) {
       return;
     }
     static::$db = classSupernova::$db;
@@ -66,12 +66,12 @@ 
     $provider_id_safe = intval($provider_id_unsafe);
     !is_array($account_list) ? $account_list = array($account_list) : false;
 
-    foreach($account_list as $provider_account_id_unsafe) {
+    foreach ($account_list as $provider_account_id_unsafe) {
       $provider_account_id_safe = intval($provider_account_id_unsafe);
 
       // TODO - Здесь могут отсутствовать аккаунты - проверять провайдером
       $query = static::$db->doquery("SELECT `user_id` FROM {{account_translate}} WHERE `provider_id` = {$provider_id_safe} AND `provider_account_id` = {$provider_account_id_safe} FOR UPDATE");
-      while($row = static::$db->db_fetch($query)) {
+      while ($row = static::$db->db_fetch($query)) {
         $account_translation[$row['user_id']][$provider_id_unsafe][$provider_account_id_unsafe] = true;
       }
     }
@@ -88,10 +88,10 @@ 
     $account_translation = array();
 
     $query = static::$db->doquery(
-      "SELECT * FROM {{account_translate}} WHERE `user_id` = {$user_id_safe} " .
-      ($provider_id_unsafe ? "AND `provider_id` = {$provider_id_safe} " : '') .
+      "SELECT * FROM {{account_translate}} WHERE `user_id` = {$user_id_safe} ".
+      ($provider_id_unsafe ? "AND `provider_id` = {$provider_id_safe} " : '').
       "ORDER BY `timestamp` FOR UPDATE");
-    while($row = static::$db->db_fetch($query)) {
+    while ($row = static::$db->db_fetch($query)) {
       $account_translation[$row['user_id']][$row['provider_id']][$row['provider_account_id']] = $row;
     }
 

includes/classes/Account.php

Spacing +19 added lines, -19 removed lines

@@ -79,8 +79,8 @@ 
     $this->reset();
     $this->db = is_object($db) ? $db : classSupernova::$db;
 
-    foreach($this->table_check as $table_name) {
-      if(empty($this->db->table_list[$table_name])) {
+    foreach ($this->table_check as $table_name) {
+      if (empty($this->db->table_list[$table_name])) {
         die('Если вы видите это сообщение первый раз после обновления релиза - просто перегрузите страницу.<br />
               В противном случае - сообщите Администрации сервера об ошибке.<br/>
               Не хватает таблицы для работы системы авторизации: ' . $table_name);
@@ -104,7 +104,7 @@ 
    */
   // OK v4.6
   public function password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe = null) {
-    if(!$this->password_check($old_password_unsafe)) {
+    if (!$this->password_check($old_password_unsafe)) {
       return false;
     }
 
@@ -125,7 +125,7 @@ 
   // OK v4.5
   public function assign_from_db_row($row) {
     $this->reset();
-    if(empty($row) || !is_array($row)) {
+    if (empty($row) || !is_array($row)) {
       return false;
     }
     $this->account_id = $row['account_id'];
@@ -242,11 +242,11 @@ 
         `account_email` = LOWER('{$email_safe}'),
         `account_language` = '{$language_safe}'"
     );
-    if(!$result) {
+    if (!$result) {
       throw new Exception(REGISTER_ERROR_ACCOUNT_CREATE, ERR_ERROR);
     }
 
-    if(!($account_id = $this->db->db_insert_id())) {
+    if (!($account_id = $this->db->db_insert_id())) {
       throw new Exception(REGISTER_ERROR_ACCOUNT_CREATE, ERR_ERROR);
     }
 
@@ -276,7 +276,7 @@ 
       WHERE `account_id` = '{$account_id_safe}'"
     ) ? true : false;
 
-    if($result) {
+    if ($result) {
       $result = $this->db_get_by_id($this->account_id);
     }
 
@@ -363,7 +363,7 @@ 
   public function metamatter_change($change_type, $metamatter, $comment = '', $already_changed = false) {
     global $mm_change_legit;
 
-    if(!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
+    if (!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
       classSupernova::$debug->error('Ошибка при попытке манипуляции с ММ');
 
       return false;
@@ -373,7 +373,7 @@ 
 
     $mm_change_legit = true;
     // $sn_data_metamatter_db_name = pname_resource_name(RES_METAMATTER);
-    if($already_changed) {
+    if ($already_changed) {
       $metamatter_total_delta = 0;
       $result = -1;
     } else {
@@ -383,17 +383,17 @@ 
       $result = $this->db->doquery(
         "UPDATE {{account}}
         SET
-          `account_metamatter` = `account_metamatter` + '{$metamatter}'" .
-        ($metamatter_total_delta ? ", `account_immortal` = IF(`account_metamatter_total` + '{$metamatter_total_delta}' >= {$classConfig->player_metamatter_immortal}, NOW(), `account_immortal`), `account_metamatter_total` = `account_metamatter_total` + '{$metamatter_total_delta}'" : '') .
+          `account_metamatter` = `account_metamatter` + '{$metamatter}'".
+        ($metamatter_total_delta ? ", `account_immortal` = IF(`account_metamatter_total` + '{$metamatter_total_delta}' >= {$classConfig->player_metamatter_immortal}, NOW(), `account_immortal`), `account_metamatter_total` = `account_metamatter_total` + '{$metamatter_total_delta}'" : '').
         " WHERE `account_id` = {$account_id_safe}"
       );
-      if(!$result) {
+      if (!$result) {
         classSupernova::$debug->error("Error adjusting Metamatter for player ID {$this->account_id} (Player Not Found?) with {$metamatter}. Reason: {$comment}", 'Metamatter Change', 402);
       }
       $result = classSupernova::$db->db_affected_rows();
     }
 
-    if(empty(core_auth::$user['id'])) {
+    if (empty(core_auth::$user['id'])) {
       $user_list = PlayerToAccountTranslate::db_translate_get_users_from_account_list(core_auth::$main_provider->provider_id, $this->account_id);
       reset($user_list);
       $user_id_unsafe = key($user_list);
@@ -402,30 +402,30 @@ 
     }
     $user_id_safe = $this->db->db_escape($user_id_unsafe);
 
-    if(!$result) {
+    if (!$result) {
       classSupernova::$debug->error("Error adjusting Metamatter for player ID {$this->account_id} (Player Not Found?) with {$metamatter}. Reason: {$comment}", 'Metamatter Change', 402);
     }
 
-    if(!$already_changed) {
+    if (!$already_changed) {
       $this->account_metamatter += $metamatter;
       $this->account_metamatter_total += $metamatter_total_delta;
     }
 
-    if(is_array($comment)) {
+    if (is_array($comment)) {
       $comment = call_user_func_array('sprintf', $comment);
     }
 
     $result = $this->db_mm_log_insert($comment, $change_type, $metamatter, $user_id_unsafe);
 
-    if($metamatter > 0 && !empty($user_id_safe)) {
+    if ($metamatter > 0 && !empty($user_id_safe)) {
       $old_referral = db_referral_get_by_id($user_id_safe);
-      if($old_referral['id']) {
+      if ($old_referral['id']) {
         $dark_matter_from_metamatter = $metamatter * AFFILIATE_MM_TO_REFERRAL_DM;
         db_referral_update_dm($user_id_safe, $dark_matter_from_metamatter);
         $new_referral = db_referral_get_by_id($user_id_safe);
 
         $partner_bonus = floor($new_referral['dark_matter'] / classSupernova::$config->rpg_bonus_divisor) - ($old_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum ? floor($old_referral['dark_matter'] / classSupernova::$config->rpg_bonus_divisor) : 0);
-        if($partner_bonus > 0 && $new_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum) {
+        if ($partner_bonus > 0 && $new_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum) {
           rpg_points_change($new_referral['id_partner'], RPG_REFERRAL_BOUGHT_MM, $partner_bonus, "Incoming MM From Referral ID {$user_id_safe}");
         }
       }

includes/classes/skin.php

Spacing +26 added lines, -26 removed lines

@@ -152,7 +152,7 @@ 
    * Инициализация харнилища скинов
    */
   protected static function init() {
-    if(static::$is_init) {
+    if (static::$is_init) {
       return;
     }
 
@@ -165,7 +165,7 @@ 
 
     // Загружены ли уже данные по текущему скину?
 //pdump(static::$skin_list[$ini_path], 'static');
-    if(empty(static::$skin_list[$skin_path])) {
+    if (empty(static::$skin_list[$skin_path])) {
       // Прогружаем текущий скин
       static::$skin_list[$skin_path] = new skin($skin_path);
       static::$active = static::$skin_list[$skin_path];
@@ -191,9 +191,9 @@ 
     strpos($skin_path, 'skins/') !== false ? $skin_path = substr($skin_path, 6) : false;
     strpos($skin_path, '/') !== false ? $skin_path = str_replace('/', '', $skin_path) : false;
 
-    $this->root_http_relative = 'skins/' . $skin_path . '/'; // Пока стоит base="" в body SN_ROOT_VIRTUAL - не нужен
+    $this->root_http_relative = 'skins/'.$skin_path.'/'; // Пока стоит base="" в body SN_ROOT_VIRTUAL - не нужен
 //    $this->root_http = SN_ROOT_VIRTUAL . 'skins/' . $skin_path . '/'; // Всегда абсолютный путь от корня сайта
-    $this->root_physical_absolute = SN_ROOT_PHYSICAL . 'skins/' . $skin_path . '/';
+    $this->root_physical_absolute = SN_ROOT_PHYSICAL.'skins/'.$skin_path.'/';
     $this->name = $skin_path;
 //    pdump($this->root_folder);
     // Искать скин среди пользовательских - когда будет конструктор скинов
@@ -201,22 +201,22 @@ 
 
     $this->is_ini_present = false;
     // Проверка на корректность и существование пути
-    if(is_file($this->root_physical_absolute . 'skin.ini')) {
+    if (is_file($this->root_physical_absolute.'skin.ini')) {
       // Пытаемся распарсить файл
 
       // По секциям? images и config? Что бы не копировать конфигурацию? Или просто unset(__inherit) а затем заново записать
-      $this->config = parse_ini_file($this->root_physical_absolute . 'skin.ini');
-      if(!empty($this->config)) {
+      $this->config = parse_ini_file($this->root_physical_absolute.'skin.ini');
+      if (!empty($this->config)) {
 
         $this->is_ini_present = true;
 
-        if(!empty($this->config['_inherit'])) {
+        if (!empty($this->config['_inherit'])) {
           // Если скин наследует себя...
-          if($this->config['_inherit'] == $skin_path) {
+          if ($this->config['_inherit'] == $skin_path) {
             // TODO - определять более сложные случаи циклических ссылок в _inherit
             die('">circular skin inheritance!');
           }
-          if(empty(static::$skin_list[$this->config['_inherit']])) {
+          if (empty(static::$skin_list[$this->config['_inherit']])) {
             static::$skin_list[$this->config['_inherit']] = new skin($this->config['_inherit']);
           }
           $this->parent = static::$skin_list[$this->config['_inherit']];
@@ -232,15 +232,15 @@ 
     }
 
     // Пытаемся скомпилировать _no_image заранее
-    if(!empty($this->config[SKIN_IMAGE_MISSED_FIELD])) {
+    if (!empty($this->config[SKIN_IMAGE_MISSED_FIELD])) {
       $this->container[SKIN_IMAGE_MISSED_FIELD] = $this->compile_try_path(SKIN_IMAGE_MISSED_FIELD, $this->config[SKIN_IMAGE_MISSED_FIELD]);
     }
 
     // Если нет заглушки
-    if(empty($this->container[SKIN_IMAGE_MISSED_FIELD])) {
+    if (empty($this->container[SKIN_IMAGE_MISSED_FIELD])) {
       $this->container[SKIN_IMAGE_MISSED_FIELD] = empty($this->parent)
         // Если нет парента - берем хардкод
-        ? $this->container[SKIN_IMAGE_MISSED_FIELD] = SN_ROOT_VIRTUAL . SKIN_IMAGE_MISSED_FILE_PATH
+        ? $this->container[SKIN_IMAGE_MISSED_FIELD] = SN_ROOT_VIRTUAL.SKIN_IMAGE_MISSED_FILE_PATH
         // Если есть парент - берем у парента. У предков всегда всё есть
         : $this->parent->compile_image(SKIN_IMAGE_MISSED_FIELD, null);
     }
@@ -267,7 +267,7 @@ 
     $image_tag = $this->image_tag_parse($image_tag, $template);
 
     // Проверяем наличие ключа RIT в хранилища. В нём не может быть несуществующих файлов по построению
-    if(!empty($this->container[$image_tag[SKIN_IMAGE_TAG_RESOLVED]])) {
+    if (!empty($this->container[$image_tag[SKIN_IMAGE_TAG_RESOLVED]])) {
       return $this->container[$image_tag[SKIN_IMAGE_TAG_RESOLVED]];
     }
 
@@ -285,7 +285,7 @@ 
     // Нет - image ID не является путём к файлу. Пора обратиться к предкам за помощью...
     // Пытаемся вытащить путь из родителя и применить к нему свои параметры
     // Тащим по ID изображения, а не по ТЭГУ - мало ли что там делает с путём родитель и как преобразовывает его в строку?
-    if(empty($this->container[$image_id]) && !empty($this->parent)) {
+    if (empty($this->container[$image_id]) && !empty($this->parent)) {
       $this->container[$image_id] = $this->parent->compile_image($image_id, $template);
 
       // Если у родителя нет картинки - он вернет пустую строку. Тогда нам надо использовать заглушку - свою или родительскую
@@ -306,18 +306,18 @@ 
   protected function image_tag_parse($image_tag, $template) {
     $image_tag_ptl_resolved = $image_tag;
     // Есть переменные из темплейта ?
-    if(strpos($image_tag_ptl_resolved, '[') !== false && is_object($template)) {
+    if (strpos($image_tag_ptl_resolved, '[') !== false && is_object($template)) {
       // Что бы лишний раз не запускать регексп
       // TODO - многоуровневые вложения ?! Надо ли и где их можно применить
       preg_match_all('#(\[.+?\])#', $image_tag_ptl_resolved, $matches);
-      foreach($matches[0] as &$match) {
+      foreach ($matches[0] as &$match) {
         $var_name = str_replace(array('[', ']'), '', $match);
-        if(strpos($var_name, '.') !== false) {
+        if (strpos($var_name, '.') !== false) {
           // Вложенная переменная темплейта - на текущем уровне
           // TODO Вложенная переменная из корня через "!"
           list($block_name, $block_var) = explode('.', $var_name);
           isset($template->_block_value[$block_name][$block_var]) ? $image_tag_ptl_resolved = str_replace($match, $template->_block_value[$block_name][$block_var], $image_tag_ptl_resolved) : false;
-        } elseif(strpos($var_name, '$') !== false) {
+        } elseif (strpos($var_name, '$') !== false) {
           // Корневой DEFINE
           $define_name = substr($var_name, 1);
           isset($template->_tpldata['DEFINE']['.'][$define_name]) ? $image_tag_ptl_resolved = str_replace($match, $template->_tpldata['DEFINE']['.'][$define_name], $image_tag_ptl_resolved) : false;
@@ -328,7 +328,7 @@ 
       }
     }
 
-    if(strpos($image_tag_ptl_resolved, '|') !== false) {
+    if (strpos($image_tag_ptl_resolved, '|') !== false) {
       $params = explode('|', $image_tag_ptl_resolved);
       $image_id = $params[0];
       unset($params[0]);
@@ -358,9 +358,9 @@ 
   protected function compile_try_path($image_id, $file_path) {
     // Если первый символ пути '/' - значит это путь от HTTP-корня
     // Откусываем его и пользуем остальное
-    $relative_path = strpos($file_path, '/') !== 0 ? $this->root_http_relative . $file_path : substr($file_path, 1);
+    $relative_path = strpos($file_path, '/') !== 0 ? $this->root_http_relative.$file_path : substr($file_path, 1);
 
-    return is_file(SN_ROOT_PHYSICAL . $relative_path) ? $this->container[$image_id] = SN_ROOT_VIRTUAL . $relative_path : '';
+    return is_file(SN_ROOT_PHYSICAL.$relative_path) ? $this->container[$image_id] = SN_ROOT_VIRTUAL.$relative_path : '';
   }
 
 
@@ -392,13 +392,13 @@ 
     $image_string = $this->container[$image_tag];
 
     // Нет параметров - просто возвращаем значение по $image_name из контейнера
-    if(!empty($params) && is_array($params)) {
+    if (!empty($params) && is_array($params)) {
       // Здесь автоматически произойдёт упорядочивание параметров
 
       // Параметр 'html' - выводить изображение в виде HTML-тэга
-      if(in_array('html', $params)) {
-        $image_tag = $image_tag . '|html';
-        $image_string = '<img src="' . $image_string . '" />';
+      if (in_array('html', $params)) {
+        $image_tag = $image_tag.'|html';
+        $image_string = '<img src="'.$image_string.'" />';
         $this->container[$image_tag] = $image_string;
       }
     }