supernova-ws / SuperNova

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>");
   }

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]);
       }
 

classes/UBE/UBEMoonCalculator.php

Spacing +21 added lines, -21 removed lines

@@ -70,7 +70,7 @@ 
 
     $debris_for_moon = $debris->debris_total();
 
-    if(!$debris_for_moon) {
+    if (!$debris_for_moon) {
       return;
     }
 
@@ -78,12 +78,12 @@ 
     $moon_chance = min($debris_for_moon / UBE_MOON_DEBRIS_PER_PERCENT, UBE_MOON_PERCENT_MAX); // TODO Configure
     $moon_chance = $moon_chance >= UBE_MOON_PERCENT_MIN ? $moon_chance : 0;
     $this->create_chance = $moon_chance;
-    if($moon_chance) {
-      if($is_simulator || mt_rand(1, 100) <= $moon_chance) {
+    if ($moon_chance) {
+      if ($is_simulator || mt_rand(1, 100) <= $moon_chance) {
         $this->status = UBE_MOON_CREATE_SUCCESS;
         $this->moon_diameter = round($is_simulator ? $moon_chance * 150 + 1999 : mt_rand($moon_chance * 100 + 1000, $moon_chance * 200 + 2999));
 
-        if($debris_for_moon <= UBE_MOON_DEBRIS_MAX_SPENT) {
+        if ($debris_for_moon <= UBE_MOON_DEBRIS_MAX_SPENT) {
           $debris->_reset();
         } else {
           $moon_debris_left_percent = ($debris_for_moon - UBE_MOON_DEBRIS_MAX_SPENT) / $debris_for_moon;
@@ -102,7 +102,7 @@ 
    */
   protected function moon_destroy_try($reapers) {
     // TODO: $is_simulator
-    if($reapers <= 0) {
+    if ($reapers <= 0) {
       return;
     }
 
@@ -120,8 +120,8 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function calculate_moon(UBE $ube) {
-    if(UBE_MOON_EXISTS == $this->status) {
-      if($ube->mission_type_id == MT_DESTROY && $ube->combat_result == UBE_COMBAT_RESULT_WIN) {
+    if (UBE_MOON_EXISTS == $this->status) {
+      if ($ube->mission_type_id == MT_DESTROY && $ube->combat_result == UBE_COMBAT_RESULT_WIN) {
         $reapers = $ube->fleet_list->ube_calculate_attack_reapers();
         $this->moon_destroy_try($reapers);
       }
@@ -135,12 +135,12 @@ 
    */
   public function report_generate_array() {
     return array(
-      'ube_report_moon'                    => (int)$this->status,
-      'ube_report_moon_chance'             => (int)$this->create_chance,
-      'ube_report_moon_size'               => (float)$this->moon_diameter,
-      'ube_report_moon_reapers'            => (int)$this->reapers_status,
-      'ube_report_moon_destroy_chance'     => (int)$this->destroy_chance,
-      'ube_report_moon_reapers_die_chance' => (int)$this->reaper_die_chance,
+      'ube_report_moon'                    => (int) $this->status,
+      'ube_report_moon_chance'             => (int) $this->create_chance,
+      'ube_report_moon_size'               => (float) $this->moon_diameter,
+      'ube_report_moon_reapers'            => (int) $this->reapers_status,
+      'ube_report_moon_destroy_chance'     => (int) $this->destroy_chance,
+      'ube_report_moon_reapers_die_chance' => (int) $this->reaper_die_chance,
     );
   }
 
@@ -171,11 +171,11 @@ 
    * @param $planet_id
    */
   public function db_apply_result($planet_info, $destination_user_id) {
-    if($this->status == UBE_MOON_CREATE_SUCCESS) {
+    if ($this->status == UBE_MOON_CREATE_SUCCESS) {
       $moon_row = uni_create_moon($planet_info[PLANET_GALAXY], $planet_info[PLANET_SYSTEM], $planet_info[PLANET_PLANET], $destination_user_id, $this->moon_diameter, '', false);
       $this->moon_name = $moon_row['name'];
       unset($moon_row);
-    } elseif($this->status == UBE_MOON_DESTROY_SUCCESS) {
+    } elseif ($this->status == UBE_MOON_DESTROY_SUCCESS) {
       DBStaticPlanet::db_planet_delete_by_id($planet_info[PLANET_ID]);
     }
   }
@@ -184,18 +184,18 @@ 
     $classLocale = classLocale::$lang;
 
     $text_defender = '';
-    if($this->status == UBE_MOON_CREATE_SUCCESS) {
+    if ($this->status == UBE_MOON_CREATE_SUCCESS) {
       $text_defender .= "{$classLocale['ube_report_moon_created']} {$this->moon_diameter} {$classLocale['sys_kilometers_short']}<br /><br />";
-    } elseif($this->status == UBE_MOON_CREATE_FAILED) {
+    } elseif ($this->status == UBE_MOON_CREATE_FAILED) {
       $text_defender .= "{$classLocale['ube_report_moon_chance']} {$this->create_chance}%<br /><br />";
     }
 
-    if($ube->mission_type_id == MT_DESTROY) {
-      if($this->reapers_status == UBE_MOON_REAPERS_NONE) {
+    if ($ube->mission_type_id == MT_DESTROY) {
+      if ($this->reapers_status == UBE_MOON_REAPERS_NONE) {
         $text_defender .= classLocale::$lang['ube_report_moon_reapers_none'];
       } else {
         $text_defender .= "{$classLocale['ube_report_moon_reapers_wave']}. {$classLocale['ube_report_moon_reapers_chance']} {$this->destroy_chance}%. ";
-        $text_defender .= classLocale::$lang[$this->status == UBE_MOON_DESTROY_SUCCESS ? 'ube_report_moon_reapers_success' : 'ube_report_moon_reapers_failure'] . "<br />";
+        $text_defender .= classLocale::$lang[$this->status == UBE_MOON_DESTROY_SUCCESS ? 'ube_report_moon_reapers_success' : 'ube_report_moon_reapers_failure']."<br />";
 
         $text_defender .= "{$classLocale['ube_report_moon_reapers_outcome']} {$this->reaper_die_chance}%. ";
         $text_defender .= classLocale::$lang[$this->reapers_status == UBE_MOON_REAPERS_RETURNED ? 'ube_report_moon_reapers_survive' : 'ube_report_moon_reapers_died'];
@@ -220,7 +220,7 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function ubeInitLoadStatis($destination_planet) {
-    if($destination_planet['planet_type'] == PT_MOON || is_array($moon = DBStaticPlanet::db_planet_by_parent($destination_planet['id'], true, '`id`'))) {
+    if ($destination_planet['planet_type'] == PT_MOON || is_array($moon = DBStaticPlanet::db_planet_by_parent($destination_planet['id'], true, '`id`'))) {
       $this->status = UBE_MOON_EXISTS;
       $this->moon_diameter = !empty($moon['planet_type']) && $moon['planet_type'] == PT_MOON ? $moon['diameter'] : $destination_planet['diameter'];
       $this->reapers_status = UBE_MOON_REAPERS_NONE;

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);
       }

classes/UBE/UBEDebris.php

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
    */
   public function debris_add_resource($resource_id, $resource_amount) {
     // В обломках может быть только металл или кристалл
-    if($resource_id != RES_METAL && $resource_id != RES_CRYSTAL) {
+    if ($resource_id != RES_METAL && $resource_id != RES_CRYSTAL) {
       return;
     }
     $this->debris[$resource_id] += $resource_amount;
@@ -38,7 +38,7 @@ 
    * @param bool  $is_simulator
    */
   public function add_wrecks(array $wreckage, $is_simulator) {
-    foreach($wreckage as $resource_id => $resource_amount) {
+    foreach ($wreckage as $resource_id => $resource_amount) {
       $this->debris_add_resource($resource_id, floor($resource_amount *
         ($is_simulator
           ? UBE_SHIP_WRECKS_TO_DEBRIS_AVG
@@ -54,7 +54,7 @@ 
    * @param bool  $is_simulator
    */
   public function add_cargo_drop(array $dropped_resources, $is_simulator) {
-    foreach($dropped_resources as $resource_id => $resource_amount) {
+    foreach ($dropped_resources as $resource_id => $resource_amount) {
       $this->debris_add_resource($resource_id, floor($resource_amount *
         ($is_simulator
           ? UBE_CARGO_DROPPED_TO_DEBRIS_AVG
@@ -93,7 +93,7 @@ 
    * @param $moon_debris_left_part
    */
   public function debris_adjust_proportional($moon_debris_left_part) {
-    foreach($this->debris as $resource_id => &$resource_amount) {
+    foreach ($this->debris as $resource_id => &$resource_amount) {
       $resource_amount = floor($resource_amount * $moon_debris_left_part);
     }
   }
@@ -114,9 +114,9 @@ 
    */
   public function report_generate_array() {
     return array(
-      'ube_report_debris_metal'          => (float)$this->debris_get_resource(RES_METAL),
-      'ube_report_debris_crystal'        => (float)$this->debris_get_resource(RES_CRYSTAL),
-      'ube_report_debris_total_in_metal' => (float)$this->debris_in_metal(),
+      'ube_report_debris_metal'          => (float) $this->debris_get_resource(RES_METAL),
+      'ube_report_debris_crystal'        => (float) $this->debris_get_resource(RES_CRYSTAL),
+      'ube_report_debris_total_in_metal' => (float) $this->debris_in_metal(),
     );
   }
 

classes/UBE/ContainerArrayOfObject.php

Spacing +6 added lines, -6 removed lines

@@ -19,8 +19,8 @@ 
    * @param array  $arguments
    */
   public function __call($method_name, array $arguments) {
-    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(array($object, $method_name), $arguments);
       }
     }
@@ -35,8 +35,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;
       }
     }
@@ -52,8 +52,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);
       }
     }

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++;
 

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}");
         }
       }

Doc Comments +21 added lines

@@ -171,6 +171,10 @@ 
    * @return bool
    */
   // OK v4.5
+
+  /**
+   * @param string $account_name_unsafe
+   */
   public function db_get_by_name($account_name_unsafe) {
     $this->reset();
 
@@ -207,6 +211,11 @@ 
    *
    */
   // OK v4.5
+
+  /**
+   * @param string $account_name_unsafe
+   * @param string $email_unsafe
+   */
   public function db_get_by_name_or_email($account_name_unsafe, $email_unsafe) {
     $this->reset();
 
@@ -223,6 +232,13 @@ 
    * @throws Exception
    */
   // OK v4.5
+
+  /**
+   * @param string $account_name_unsafe
+   * @param string $password_raw
+   * @param string $email_unsafe
+   * @param string $language_unsafe
+   */
   public function db_create($account_name_unsafe, $password_raw, $email_unsafe, $language_unsafe = null, $salt_unsafe = null) {
     $this->reset();
 
@@ -317,6 +333,11 @@ 
    * @return int|string
    */
   // OK 4.8
+
+  /**
+   * @param integer $change_type
+   * @param double $metamatter
+   */
   protected function db_mm_log_insert($comment, $change_type, $metamatter, $user_id_unsafe) {
     $provider_id_safe = intval(core_auth::$main_provider->provider_id);
     //$account_id_safe = $this->db->db_escape($this->account_id);

classes/DbSqlAware.php

Spacing +2 added lines, -2 removed lines

@@ -45,8 +45,8 @@
    */
   protected function quoteStringAsFieldByRef(&$string) {
     $string = $this->stringEscape($string);
-    if ((string)$string && '*' != $string) {
-      $string = '`' . $string . '`';
+    if ((string) $string && '*' != $string) {
+      $string = '`'.$string.'`';
     }
   }