supernova-ws / SuperNova

includes/classes/DbSqlHelper.php

Spacing +3 added lines, -3 removed lines

@@ -15,13 +15,13 @@
    * @return string
    */
   public static function quoteComment($comment) {
-    if($comment == '') {
+    if ($comment == '') {
       return '';
     }
 
-    $comment = str_replace(array('/*', '*/'), '__',$comment);
+    $comment = str_replace(array('/*', '*/'), '__', $comment);
 
-    return "\r\n/*" . $comment . "*/";
+    return "\r\n/*".$comment."*/";
   }
 
 }

includes/functions/flt_mission_missile.php

Spacing +5 added lines, -5 removed lines

@@ -77,8 +77,8 @@ 
     $crystal += $destroyed * $unit_info[P_COST][RES_CRYSTAL] / 4;
   }
 
-  $return['structures'] = $structures;     // Structures left after attack
-  $return['metal'] = floor($metal);   // Metal scraps
+  $return['structures'] = $structures; // Structures left after attack
+  $return['metal'] = floor($metal); // Metal scraps
   $return['crystal'] = floor($crystal); // Crystal scraps
 
   return $return;
@@ -148,7 +148,7 @@ 
         }
 
         if (!empty($message)) {
-          $message = classLocale::$lang['mip_defense_destroyed'] . $message . "{$classLocale['mip_recycled']}{$classLocale['Metal']}: {$attackResult['metal']}, {$classLocale['Crystal']}: {$attackResult['crystal']}<br>";
+          $message = classLocale::$lang['mip_defense_destroyed'].$message."{$classLocale['mip_recycled']}{$classLocale['Metal']}: {$attackResult['metal']}, {$classLocale['Crystal']}: {$attackResult['crystal']}<br>";
 
           DBStaticPlanet::db_planet_set_by_id($target_planet_row['id'], "`metal` = `metal` + {$attackResult['metal']}, `crystal` = `crystal` + {$attackResult['crystal']}");
         }
@@ -165,8 +165,8 @@ 
 
       empty($message) ? $message = classLocale::$lang['mip_no_defense'] : false;
 
-      DBStaticMessages::msg_send_simple_message($fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage . $message);
-      DBStaticMessages::msg_send_simple_message($fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage . $message);
+      DBStaticMessages::msg_send_simple_message($fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage.$message);
+      DBStaticMessages::msg_send_simple_message($fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage.$message);
     }
     DBStaticFleetMissile::db_missile_delete($fleetRow);
   }

messages.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 $template = gettemplate('viewreport', true);
 $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']);

blitz_register.php

Spacing +28 added lines, -28 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 global $user;
 
-if($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
+if ($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
   $error_message = classSupernova::$config->game_mode == GAME_BLITZ ? 'sys_blitz_page_disabled' : (
   !classSupernova::$config->game_blitz_register ? 'sys_blitz_registration_disabled' : ''
   );
 
-  if($error_message) {
+  if ($error_message) {
     message(classLocale::$lang[$error_message], classLocale::$lang['sys_error'], 'overview.php', 10);
     die();
   }
@@ -18,16 +18,16 @@ 
 $current_round = intval(classSupernova::$config->db_loadItem('game_blitz_register_round'));
 $current_price = intval(classSupernova::$config->db_loadItem('game_blitz_register_price'));
 
-if(classSupernova::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
+if (classSupernova::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
   sn_db_transaction_start();
   $user = DBStaticUser::db_user_by_id($user['id'], true);
   $is_registered = db_blitz_reg_get_id_by_player_and_round($user, $current_round);
-  if(sys_get_param_str('register_me')) {
-    if(empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
+  if (sys_get_param_str('register_me')) {
+    if (empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
       db_blitz_reg_insert($user, $current_round);
       classSupernova::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
     }
-  } elseif(sys_get_param_str('register_me_not') && !empty($is_registered)) {
+  } elseif (sys_get_param_str('register_me_not') && !empty($is_registered)) {
     db_blitz_reg_delete($user, $current_round);
     classSupernova::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION_CANCEL, $current_price, "Отмена регистрации в раунде {$current_round} Блица");
   }
@@ -42,17 +42,17 @@ 
 $blitz_players = 0;
 $blitz_prize_dark_matter = 0;
 $blitz_prize_places = 0;
-if($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
-  if(sys_get_param_str('generate')) {
+if ($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
+  if (sys_get_param_str('generate')) {
     $next_id = 0;
     $query = db_blitz_reg_get_random_id($current_round);
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $next_id++;
-      $blitz_name = 'Игрок' . $next_id;
+      $blitz_name = 'Игрок'.$next_id;
       $blitz_password = sys_random_string(8);
       db_blitz_reg_update_with_name_and_password($blitz_name, $blitz_password, $row, $current_round);
     }
-  } elseif(sys_get_param_str('import_generated')) {
+  } elseif (sys_get_param_str('import_generated')) {
     // ЭТО НА БЛИЦЕ!!!
     DBStaticUser::db_player_list_blitz_delete_players();
     DBStaticPlanet::db_planets_purge();
@@ -74,7 +74,7 @@ 
     $system = $system_step;
     $planet = round(Vector::$knownPlanets / 2);
 
-    foreach($imported_string as &$string_data) {
+    foreach ($imported_string as &$string_data) {
       $string_data = explode(',', $string_data);
       $username_safe = $string_data[0];
 
@@ -94,7 +94,7 @@ 
 
       $moon_row = uni_create_moon($galaxy, $system, $planet, $user_new['id'], 30, '', false);
 
-      if(($system += $system_step) >= Vector::$knownSystems) {
+      if (($system += $system_step) >= Vector::$knownSystems) {
         $galaxy++;
         $system = $system_step;
       }
@@ -104,13 +104,13 @@ 
     classSupernova::$config->db_saveItem('users_amount', classSupernova::$config->users_amount + $new_players);
     // pdump($imported_string);
     // generated_string
-  } elseif(sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
+  } elseif (sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
     $blitz_result = explode(';', $blitz_result_string);
     $blitz_last_update = $blitz_result[0]; // Пока не используется
     unset($blitz_result[0]);
-    foreach($blitz_result as $blitz_result_data) {
+    foreach ($blitz_result as $blitz_result_data) {
       $blitz_result_data = explode(',', $blitz_result_data);
-      if(count($blitz_result_data) == 5) {
+      if (count($blitz_result_data) == 5) {
         $blitz_result_data[1] = db_escape($blitz_result_data[1]);
         db_blitz_reg_update_results($blitz_result_data, $current_round);
       }
@@ -118,14 +118,14 @@ 
     $blitz_result = array();
   }
 
-  if(classSupernova::$config->game_mode == GAME_BLITZ) {
+  if (classSupernova::$config->game_mode == GAME_BLITZ) {
     $blitz_result = array(classSupernova::$config->db_loadItem('var_stat_update'));
-    foreach(DBStaticUser::db_player_list_export_blitz_info() as $row) {
+    foreach (DBStaticUser::db_player_list_export_blitz_info() as $row) {
       $blitz_result[] = "{$row['id']},{$row['username']},{$row['onlinetime']},{$row['total_rank']},{$row['total_points']}";
     }
   } else {
     $query = db_blitz_reg_get_player_list($current_round);
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $blitz_generated[] = "{$row['blitz_name']},{$row['blitz_password']}";
       $row['blitz_online'] ? $blitz_prize_players_active++ : false;
       $blitz_players++;
@@ -133,13 +133,13 @@ 
     $blitz_prize_dark_matter = $blitz_prize_players_active * 20000;
     $blitz_prize_places = ceil($blitz_prize_players_active / 5);
 
-    if(sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
+    if (sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
       // $blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter');
       $blitz_prize_places_actual = sys_get_param_int('blitz_prize_places');
       sn_db_transaction_start();
       $query = db_blitz_reg_get_player_list_order_by_place($current_round);
-      while($row = db_fetch($query)) {
-        if(!$row['blitz_place']) {
+      while ($row = db_fetch($query)) {
+        if (!$row['blitz_place']) {
           continue;
         }
 
@@ -148,14 +148,14 @@ 
 
         $reward = $blitz_prize_dark_matter_actual - $row['blitz_reward_dark_matter'];
         pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}", $row['id']);
-        if($reward) {
+        if ($reward) {
           rpg_points_change($row['user_id'], RPG_BLITZ, $reward, sprintf(
             classLocale::$lang['sys_blitz_reward_log_message'], $row['blitz_place'], $row['blitz_name']
           ));
           db_blitz_reg_update_apply_results($reward, $row, $current_round);
         }
 
-        if(!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
+        if (!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
           break;
         }
       }
@@ -170,12 +170,12 @@ 
 
 $player_registered = false;
 $query = db_blitz_reg_get_player_list_and_users($current_round);
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $tpl_player_data = array(
     'NAME' => player_nick_render_to_html($row, array('icons' => true, 'color' => true, 'ally' => true)),
   );
 
-  if(classSupernova::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
+  if (classSupernova::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
     // Вот так хитро, что бы не было не единого шанса попадания на страницу данных об игроках Блиц-сервера до закрытия раунда
     $tpl_player_data = array_merge($tpl_player_data, array(
       'ID'                       => $row['id'],
@@ -188,7 +188,7 @@ 
   }
 
   $template->assign_block_vars('registrations', $tpl_player_data);
-  if($row['id'] == $user['id']) {
+  if ($row['id'] == $user['id']) {
     $player_registered = $row;
   }
 }

includes/classes/UBE/ArrayAccessV2.php

Doc Comments +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
    * @param mixed $offset <p>
    * The offset to assign the value to.
    * </p>
-   * @param mixed $value <p>
+   * @param Unit $value <p>
    * The value to set.
    * </p>
    *

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

includes/classes/UnitList.php

Spacing +8 added lines, -8 removed lines

@@ -89,7 +89,7 @@ 
    */
   public function offsetSet($offset, $value) {
     if (isset($this->mapUnitIdToDb[$value->unitId])) {
-      classSupernova::$debug->error('UnitList::offsetSet: Unit with UnitId ' . $value->unitId . ' already exists');
+      classSupernova::$debug->error('UnitList::offsetSet: Unit with UnitId '.$value->unitId.' already exists');
     }
     $this->mapUnitIdToDb[$value->unitId] = $value;
     parent::offsetSet($offset, $value);
@@ -202,7 +202,7 @@ 
 
   public function unitGetCount($unit_id) {
     if (empty($this->mapUnitIdToDb[$unit_id])) {
-      throw new Exception('Unit [' . $unit_id . '] is not exists in UnitList');
+      throw new Exception('Unit ['.$unit_id.'] is not exists in UnitList');
     }
 
     return $this->mapUnitIdToDb[$unit_id]->count;
@@ -247,7 +247,7 @@ 
    */
   public function unitsCostInMetal($shipCostInMetalPerPiece) {
     $shipsCostInMetal = array();
-    foreach($this->mapUnitIdToDb as $ship_id => $ship) {
+    foreach ($this->mapUnitIdToDb as $ship_id => $ship) {
       $shipsCostInMetal[$ship_id] = $ship->count * $shipCostInMetalPerPiece[$ship_id];
     }
 
@@ -329,7 +329,7 @@ 
      */
     $objFleet = $this->getLocatedAt();
     if (empty($objFleet)) {
-      throw new Exception('No fleet owner on UnitList::unitsRender() in ' . __FILE__ . '@' . __LINE__);
+      throw new Exception('No fleet owner on UnitList::unitsRender() in '.__FILE__.'@'.__LINE__);
     }
 
     $tplShips = array();
@@ -472,8 +472,8 @@ 
 
   // TODO - DEBUG - REMOVE =============================================================================================
   public function _dump() {
-    print(__FILE__ . ':' . __LINE__ . "<br />");
-    print("Located at " . $this->getLocationDbId() . " type " . $this->getLocationType() . "<br />");
+    print(__FILE__.':'.__LINE__."<br />");
+    print("Located at ".$this->getLocationDbId()." type ".$this->getLocationType()."<br />");
 
     print('<table border="1">');
     print('<tr>');
@@ -529,11 +529,11 @@ 
 
       print('<td>');
       $type = $unit->getType();
-      print("[{$type}] " . classLocale::$lang['tech'][$type]);
+      print("[{$type}] ".classLocale::$lang['tech'][$type]);
       print('</td>');
 
       print('<td>');
-      print("[{$unit->unitId}] " . classLocale::$lang['tech'][$unit->unitId]);
+      print("[{$unit->unitId}] ".classLocale::$lang['tech'][$unit->unitId]);
       print('</td>');
 
       print('<td>');

includes/includes/flt_mission_recycle.php

Spacing +10 added lines, -10 removed lines

@@ -12,7 +12,7 @@ 
 function flt_mission_recycle($mission_data) {
   $objFleet = $mission_data->fleet;
   $destination_planet = &$mission_data->dst_planet;
-  if(empty($destination_planet['id'])) {
+  if (empty($destination_planet['id'])) {
     $objFleet->markReturned();
     $objFleet->dbSave();
 
@@ -22,10 +22,10 @@ 
   $RecyclerCapacity = 0;
   $OtherFleetCapacity = 0;
 
-  foreach($objFleet->shipsIterator() as $unit_id => $unit) {
-    if(in_array($unit_id, Fleet::$snGroupFleet)) {
+  foreach ($objFleet->shipsIterator() as $unit_id => $unit) {
+    if (in_array($unit_id, Fleet::$snGroupFleet)) {
       $capacity = get_unit_param($unit_id, P_CAPACITY) * $unit->count;
-      if(in_array($unit_id, Fleet::$snGroupRecyclers)) {
+      if (in_array($unit_id, Fleet::$snGroupRecyclers)) {
         $RecyclerCapacity += $capacity;
       } else {
         $OtherFleetCapacity += $capacity;
@@ -34,33 +34,33 @@ 
   }
 
   $fleet_resources_amount = $objFleet->resourcesGetTotal();
-  if($fleet_resources_amount > $OtherFleetCapacity) {
+  if ($fleet_resources_amount > $OtherFleetCapacity) {
     // Если во флоте есть другие корабли И количество ресурсов больше, чем их ёмкость трюмов - значит часть этих ресурсов лежит в трюмах переработчиков
     // Уменьшаем ёмкость переработчиков на указанную величину
     $RecyclerCapacity -= ($fleet_resources_amount - $OtherFleetCapacity);
   }
 
   $resources_recycled = array();
-  if(($destination_planet["debris_metal"] + $destination_planet["debris_crystal"]) <= $RecyclerCapacity) {
+  if (($destination_planet["debris_metal"] + $destination_planet["debris_crystal"]) <= $RecyclerCapacity) {
     $resources_recycled[RES_METAL] = $destination_planet["debris_metal"];
     $resources_recycled[RES_CRYSTAL] = $destination_planet["debris_crystal"];
   } else {
-    if(($destination_planet["debris_metal"] > $RecyclerCapacity / 2) &&
+    if (($destination_planet["debris_metal"] > $RecyclerCapacity / 2) &&
       ($destination_planet["debris_crystal"] > $RecyclerCapacity / 2)
     ) {
       $resources_recycled[RES_METAL] = $RecyclerCapacity / 2;
       $resources_recycled[RES_CRYSTAL] = $RecyclerCapacity / 2;
     } else {
-      if($destination_planet["debris_metal"] > $destination_planet["debris_crystal"]) {
+      if ($destination_planet["debris_metal"] > $destination_planet["debris_crystal"]) {
         $resources_recycled[RES_CRYSTAL] = $destination_planet["debris_crystal"];
-        if($destination_planet["debris_metal"] > ($RecyclerCapacity - $resources_recycled[RES_CRYSTAL])) {
+        if ($destination_planet["debris_metal"] > ($RecyclerCapacity - $resources_recycled[RES_CRYSTAL])) {
           $resources_recycled[RES_METAL] = $RecyclerCapacity - $resources_recycled[RES_CRYSTAL];
         } else {
           $resources_recycled[RES_METAL] = $destination_planet["debris_metal"];
         }
       } else {
         $resources_recycled[RES_METAL] = $destination_planet["debris_metal"];
-        if($destination_planet["debris_crystal"] > ($RecyclerCapacity - $resources_recycled[RES_METAL])) {
+        if ($destination_planet["debris_crystal"] > ($RecyclerCapacity - $resources_recycled[RES_METAL])) {
           $resources_recycled[RES_CRYSTAL] = $RecyclerCapacity - $resources_recycled[RES_METAL];
         } else {
           $resources_recycled[RES_CRYSTAL] = $destination_planet["debris_crystal"];

includes/includes/flt_mission_relocate.php

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 
   $destination_planet = &$mission_data->dst_planet;
 
-  if(empty($destination_planet['id_owner']) || $objFleet->playerOwnerId != $destination_planet['id_owner']) {
+  if (empty($destination_planet['id_owner']) || $objFleet->playerOwnerId != $destination_planet['id_owner']) {
     $objFleet->markReturnedAndSave();
 
     return CACHE_FLEET;
@@ -27,9 +27,9 @@ 
       $fleet_resources[RES_METAL], classLocale::$lang['Metal'],
       $fleet_resources[RES_CRYSTAL], classLocale::$lang['Crystal'],
       $fleet_resources[RES_DEUTERIUM], classLocale::$lang['Deuterium']
-    ) . '<br />' . classLocale::$lang['sys_relocate_mess_user'];
-  foreach($objFleet->shipsIterator() as $ship_id => $ship) {
-    $Message .= classLocale::$lang['tech'][$ship_id] . ' - ' . $ship->count . '<br />';
+    ).'<br />'.classLocale::$lang['sys_relocate_mess_user'];
+  foreach ($objFleet->shipsIterator() as $ship_id => $ship) {
+    $Message .= classLocale::$lang['tech'][$ship_id].' - '.$ship->count.'<br />';
   }
   DBStaticMessages::msg_send_simple_message(
     $objFleet->playerOwnerId, '', $objFleet->time_arrive_to_target, MSG_TYPE_TRANSPORT,