supernova-ws / SuperNova

jumpgate.php

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
     ));
 
     display($template, $lang['tech'][STRUC_MOON_GATE]);
-  }
-  else
+  } else
   {
     message($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10);
   }

Spacing +17 added lines, -17 removed lines

@@ -14,39 +14,39 @@ 
 
 lng_include('fleet');
 
-if($TargetPlanet = sys_get_param_id('jmpto'))
+if ($TargetPlanet = sys_get_param_id('jmpto'))
 {
   sn_db_transaction_start();
   db_user_by_id($user['id'], true, 'id');
   $planetrow = db_planet_by_id($planetrow['id'], true);
-  if(!($NextJumpTime = uni_get_time_to_jump($planetrow)))
+  if (!($NextJumpTime = uni_get_time_to_jump($planetrow)))
   {
     $TargetGate = db_planet_by_id($TargetPlanet, true, '`id`, `last_jump_time`');
-    if(mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
+    if (mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
     {
-      $NextDestTime = uni_get_time_to_jump ( $TargetGate );
-      if(!$NextDestTime)
+      $NextDestTime = uni_get_time_to_jump($TargetGate);
+      if (!$NextDestTime)
       {
         // $SubQueryOri = "";
         // $SubQueryDes = "";
         $ship_list = sys_get_param('ships');
         $db_changeset = array();
-        foreach($ship_list as $ship_id => $ship_count)
+        foreach ($ship_list as $ship_id => $ship_count)
         {
-          if(!in_array($ship_id, sn_get_groups('fleet')))
+          if (!in_array($ship_id, sn_get_groups('fleet')))
           {
             continue;
           }
 
           $ship_count = max(0, min(floor($ship_count), mrc_get_level($user, $planetrow, $ship_id)));
-          if($ship_count)
+          if ($ship_count)
           {
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($ship_id, -$ship_count, $user, $planetrow['id']);
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($ship_id, $ship_count, $user, $TargetGate['id']);
           }
         }
         // Dit monsieur, y avait quelque chose a envoyer ???
-        if(!empty($db_changeset))
+        if (!empty($db_changeset))
         {
           db_planet_set_by_id($TargetGate['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
           db_planet_set_by_id($planetrow['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
@@ -55,31 +55,31 @@ 
           db_user_set_by_id($user['id'], "`current_planet` = '{$TargetGate['id']}'");
 
           $planetrow['last_jump_time'] = SN_TIME_NOW;
-          $RetMessage = classLocale::$lang['gate_jump_done'] ." - ". pretty_time(uni_get_time_to_jump($planetrow));
+          $RetMessage = classLocale::$lang['gate_jump_done'] . " - " . pretty_time(uni_get_time_to_jump($planetrow));
         } else {
           $RetMessage = classLocale::$lang['gate_wait_data'];
         }
       } else {
-        $RetMessage = classLocale::$lang['gate_wait_dest'] ." - ". pretty_time($NextDestTime);
+        $RetMessage = classLocale::$lang['gate_wait_dest'] . " - " . pretty_time($NextDestTime);
       }
     } else {
       $RetMessage = classLocale::$lang['gate_no_dest_g'];
     }
   } else {
-    $RetMessage = classLocale::$lang['gate_wait_star'] ." - ". pretty_time($NextJumpTime);
+    $RetMessage = classLocale::$lang['gate_wait_star'] . " - " . pretty_time($NextJumpTime);
   }
   sn_db_transaction_commit();
   message($RetMessage, classLocale::$lang['tech'][STRUC_MOON_GATE], "jumpgate.php", 10);
 } else {
   $template = gettemplate('jumpgate', true);
-  if(mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
+  if (mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
   {
     $Combo = '';
     $MoonList = db_planet_list_moon_other($user['id'], $planetrow['id']);
     // while($CurMoon = db_fetch($MoonList))
-    foreach($MoonList as $CurMoon)
+    foreach ($MoonList as $CurMoon)
     {
-      if(mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
+      if (mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
       {
         $NextJumpTime = uni_get_time_to_jump($CurMoon);
         $template->assign_block_vars('moon', array(
@@ -93,9 +93,9 @@ 
       }
     }
 
-    foreach(sn_get_groups('fleet') as $Ship)
+    foreach (sn_get_groups('fleet') as $Ship)
     {
-      if(($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
+      if (($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
       {
         continue;
       }

simulator.php

Braces +2 added lines, -4 removed lines

@@ -21,8 +21,7 @@ 
 
   $sym_defender = $unpacked['D'];
   $sym_attacker = $unpacked['A'];
-}
-else
+} else
 {
   $sym_defender = array(0 => $sym_defender);
   $sym_attacker = array(1 => $sym_attacker);
@@ -56,8 +55,7 @@ 
   $template = gettemplate('ube_combat_report', true);
   $template->assign_recursive($template_result);
   display($template, '', false, '', false, false, true);
-}
-else
+} else
 {
   $template = gettemplate('simulator', true);
   $techs_and_officers = array(TECH_WEAPON, TECH_SHIELD, TECH_ARMOR, MRC_ADMIRAL);

Spacing +7 added lines, -7 removed lines

@@ -2,7 +2,7 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(sys_get_param_int('BE_DEBUG') && !defined('BE_DEBUG'))
+if (sys_get_param_int('BE_DEBUG') && !defined('BE_DEBUG'))
 {
   define('BE_DEBUG', true);
 }
@@ -14,7 +14,7 @@ 
 $sym_defender = $_POST['defender'] ? $_POST['defender'] : array();
 $sym_attacker = $_POST['attacker'] ? $_POST['attacker'] : array();
 
-if($replay)
+if ($replay)
 {
   $unpacked = sn_ube_simulator_decode_replay($replay);
 
@@ -27,7 +27,7 @@ 
   $sym_attacker = array(1 => $sym_attacker);
 }
 
-if($_POST['submit'] || $execute)
+if ($_POST['submit'] || $execute)
 {
   $replay = sn_ube_simulator_encode_replay($sym_defender, 'D');
   $replay .= sn_ube_simulator_encode_replay($sym_attacker, 'A');
@@ -40,9 +40,9 @@ 
   $template = gettemplate('simulator', true);
   $techs_and_officers = array(TECH_WEAPON, TECH_SHIELD, TECH_ARMOR, MRC_ADMIRAL);
 
-  foreach($techs_and_officers as $tech_id)
+  foreach ($techs_and_officers as $tech_id)
   {
-    if(!$sym_attacker[1][$tech_id])
+    if (!$sym_attacker[1][$tech_id])
     {
       $sym_attacker[1][$tech_id] = mrc_get_level($user, false, $tech_id);
     }
@@ -56,14 +56,14 @@ 
     UNIT_GOVERNORS => array(MRC_FORTIFIER),
     UNIT_DEFENCE => sn_get_groups('defense_active'),
   );
-  foreach($show_groups as $unit_group_id => $unit_group)
+  foreach ($show_groups as $unit_group_id => $unit_group)
   {
     $template->assign_block_vars('simulator', array(
       'GROUP' => $unit_group_id,
       'NAME' => $lang['tech'][$unit_group_id],
     ));
 
-    foreach($unit_group as $unit_id)
+    foreach ($unit_group as $unit_id)
     {
       $tab++;
 

login.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 
 include('includes/init.' . substr(strrchr(__FILE__, '.'), 1));
 // die();
-if($template_result[F_USER_IS_AUTHORIZED]) {
+if ($template_result[F_USER_IS_AUTHORIZED]) {
   sys_redirect('index' . DOT_PHP_EX);
 }
 lng_include('login');

market.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 $newstock = $stock;
 $intError = MARKET_DEAL;
 
-switch($mode)
+switch ($mode)
 {
   case MARKET_RESOURCES: // Resource trader
     require('includes/includes/market_trader.inc');
@@ -82,12 +82,12 @@ 
 }
 
 $message_id = sys_get_param_int('message');
-if($message_id != MARKET_NOTHING)
+if ($message_id != MARKET_NOTHING)
 {
   $template->assign_block_vars('result', array('MESSAGE' => $lang['eco_mrk_errors'][$message_id]));
 }
 
-if($message)
+if ($message)
 {
   $template->assign_block_vars('result', array('MESSAGE' => $message));
 }

language/en/system.mo.php

Spacing +1 added lines, -1 removed lines

@@ -961,7 +961,7 @@
     REGISTER_ERROR_USERNAME_WRONG => 'Некорректное имя игрока',
     REGISTER_ERROR_ACCOUNT_NAME_EXISTS => 'Имя учётной записи уже занято. Попробуйте войти с этим именем и вашим паролем или воспользоваться сбросом пароля',
     REGISTER_ERROR_PASSWORD_INSECURE => 'Неправильный пароль. Пароль должен состоять минимум из ' . PASSWORD_LENGTH_MIN . ' символов',
-    REGISTER_ERROR_USERNAME_SHORT => 'Слишком короткое имя. Имя должно состоять минимум из ' . LOGIN_LENGTH_MIN. ' символов',
+    REGISTER_ERROR_USERNAME_SHORT => 'Слишком короткое имя. Имя должно состоять минимум из ' . LOGIN_LENGTH_MIN . ' символов',
     REGISTER_ERROR_PASSWORD_DIFFERENT => 'Пароль и проверочный пароль не совпадают. Проверьте правильность ввода',
     REGISTER_ERROR_EMAIL_EMPTY => 'Е-Мейл не может быть пустым',
     REGISTER_ERROR_EMAIL_WRONG => 'Введенный Е-Мейл не является допустимым адресом электронной почты. Проверьте написание Е-Мейла или используйте другой адрес почтового ящика',

admin/planet_compensate.php

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
     ));
 
     display($template, $lang['tech'][STRUC_MOON_GATE]);
-  }
-  else
+  } else
   {
     message($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10);
   }

Spacing +24 added lines, -24 removed lines

@@ -1,11 +1,11 @@ 
 <?php
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
@@ -25,7 +25,7 @@ 
 $username_unsafe = sys_get_param_str_unsafe('username');
 $username = sys_get_param_escaped('username');
 
-if($galaxy_src)
+if ($galaxy_src)
 {
   sn_db_transaction_start();
   $errors = array();
@@ -35,41 +35,41 @@ 
   $planet = sys_o_get_updated($owner, array('galaxy' => $galaxy_src, 'system' => $system_src, 'planet' => $planet_src, 'planet_type' => 1), SN_TIME_NOW);
   $que    = $planet['que'];
   $planet = $planet['planet'];
-  if(!$planet)
+  if (!$planet)
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_0'];
   }
 
-  if($planet['destruyed'])
+  if ($planet['destruyed'])
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_1'];
   }
 
-  if($planet['id_owner'] != $owner['id'] || !$username)
+  if ($planet['id_owner'] != $owner['id'] || !$username)
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_4'];
   }
 
   $destination = sys_o_get_updated($owner, array('galaxy' => $galaxy_dst, 'system' => $system_dst, 'planet' => $planet_dst, 'planet_type' => 1), SN_TIME_NOW);
   $destination = $destination['planet'];
-  if(!$destination)
+  if (!$destination)
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_2'];
   }
 
-  if($planet['id'] == $destination['id'])
+  if ($planet['id'] == $destination['id'])
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_5'];
   }
 
-  if($planet['id_owner'] != $destination['id_owner'])
+  if ($planet['id_owner'] != $destination['id_owner'])
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_3'];
   }
 
-  if(!empty($errors))
+  if (!empty($errors))
   {
-    foreach($errors as $error)
+    foreach ($errors as $error)
     {
       $template->assign_block_vars('error', array(
         'TEXT' => $error,
@@ -83,14 +83,14 @@ 
     killer_add_planet($planet);
 
     $moon = db_planet_by_gspt($galaxy_src, $system_src, $planet_src, PT_MOON, true);
-    if($moon)
+    if ($moon)
     {
       $moon = sys_o_get_updated($owner, $moon, SN_TIME_NOW);
       $moon = $moon['planet'];
       killer_add_planet($moon);
     }
 
-    foreach(sn_get_groups('resources_loot') as $resource_id)
+    foreach (sn_get_groups('resources_loot') as $resource_id)
     {
       $resource_name = pname_resource_name($resource_id);
       $template->assign_var("{$resource_name}_cost", $final_cost[$resource_id]);
@@ -98,13 +98,13 @@ 
       $template->assign_var("{$resource_name}_bonus", $final_cost[$resource_id]);
     }
 
-    if($_GET['btn_confirm'])
+    if ($_GET['btn_confirm'])
     {
       $time = SN_TIME_NOW + PERIOD_DAY;
 
       db_unit_list_delete($planet['id_owner'], LOC_PLANET, $planet['id']);
       db_planet_set_by_id($planet['id'], "id_owner = 0, destruyed = {$time}");
-      if($moon)
+      if ($moon)
       {
         db_unit_list_delete($planet['id_owner'], LOC_PLANET, $moon['id']);
         db_planet_set_by_id($moon['id'], "id_owner = 0, destruyed = {$time}");
@@ -131,7 +131,7 @@ 
   'username' => $username,
 ));
 
-display(parsetemplate($template), classLocale::$lang['adm_pl_comp_title'], false, '', true );
+display(parsetemplate($template), classLocale::$lang['adm_pl_comp_title'], false, '', true);
 
 function killer_add_planet($planet)
 {
@@ -146,34 +146,34 @@ 
   }
   */
 
-  foreach(sn_get_groups('structures') as $unit_id)
+  foreach (sn_get_groups('structures') as $unit_id)
   {
     $build_level = mrc_get_level($user, $planet, $unit_id, true, true);
-    if($build_level > 0)
+    if ($build_level > 0)
     {
       $unit_cost = get_unit_param($unit_id, 'cost');
       $build_factor = $unit_cost['factor'] != 1 ? (1 - pow($unit_cost['factor'], $build_level)) / (1 - $unit_cost['factor']) : $unit_cost['factor'];
-      foreach($sn_group_resources_loot as $resource_id)
+      foreach ($sn_group_resources_loot as $resource_id)
       {
         $final_cost[$resource_id] += isset($unit_cost[$resource_id]) && $unit_cost[$resource_id] > 0 ? floor($unit_cost[$resource_id] * $build_factor) : 0;
       }
     }
   }
 
-  foreach(sn_get_groups(array('defense', 'fleet')) as $unit_id)
+  foreach (sn_get_groups(array('defense', 'fleet')) as $unit_id)
   {
     $unit_count = mrc_get_level($user, $planet, $unit_id, true, true);
-    if($unit_count > 0)
+    if ($unit_count > 0)
     {
       $unit_cost = get_unit_param($unit_id, 'cost');
-      foreach($sn_group_resources_loot as $resource_id)
+      foreach ($sn_group_resources_loot as $resource_id)
       {
         $final_cost[$resource_id] += isset($unit_cost[$resource_id]) && $unit_cost[$resource_id] > 0 ? floor($unit_cost[$resource_id] * $unit_count) : 0;
       }
     }
   }
 
-  foreach($sn_group_resources_loot as $resource_id)
+  foreach ($sn_group_resources_loot as $resource_id)
   {
     $final_cost[$resource_id] += floor(mrc_get_level($user, $planet, $resource_id, true, true));
   }

includes/functions/flt_mission_missile.php

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
     ));
 
     display($template, $lang['tech'][STRUC_MOON_GATE]);
-  }
-  else
+  } else
   {
     message($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10);
   }

Spacing +18 added lines, -18 removed lines

@@ -13,7 +13,7 @@ 
 
   $mip_data = get_unit_param(UNIT_DEF_MISSILE_INTERPLANET);
   $MIPDamage = floor(mrc_modify_value($attackerTech, false, TECH_WEAPON, $MIPs * $mip_data[P_ATTACK] * mt_rand(80, 120) / 100));
-  foreach($structures as $key => $structure)
+  foreach ($structures as $key => $structure)
   {
     $unit_info = get_unit_param($key);
     $amplify = isset($mip_data[P_AMPLIFY][$key]) ? $mip_data[P_AMPLIFY][$key] : 1;
@@ -31,9 +31,9 @@ 
   {
     //attacking only selected structure
     $damageDone = $structures[$targetedStructure][$damageTo];
-    $structsDestroyed = min( floor($MIPDamage/$damageDone), $structures[$targetedStructure][0] );
+    $structsDestroyed = min(floor($MIPDamage / $damageDone), $structures[$targetedStructure][0]);
     $structures[$targetedStructure][0] -= $structsDestroyed;
-    $MIPDamage -= $structsDestroyed*$damageDone;
+    $MIPDamage -= $structsDestroyed * $damageDone;
   }
   else
   {
@@ -44,16 +44,16 @@ 
     do
     {
       // finding is there any structure that can be damaged with leftovers of $MIPDamage
-      foreach($can_be_damaged as $key => $unit_id)
+      foreach ($can_be_damaged as $key => $unit_id)
       {
 //debug($structures[$unit_id][0]);
 //debug($structures[$unit_id][$damageTo], $MIPDamage);
-        if($structures[$unit_id][0] <= 0 || $structures[$unit_id][$damageTo] > $MIPDamage)
+        if ($structures[$unit_id][0] <= 0 || $structures[$unit_id][$damageTo] > $MIPDamage)
         {
           unset($can_be_damaged[$key]);
         }
       }
-      if(empty($can_be_damaged))
+      if (empty($can_be_damaged))
       {
         break;
       }
@@ -72,7 +72,7 @@ 
 //debug($destroyed, 'Actually destroyed');
 
 //print('<hr>');
-    } while($MIPDamage > 0 && !empty($can_be_damaged));
+    } while ($MIPDamage > 0 && !empty($can_be_damaged));
 //debug($MIPDamage, 'MIPDamage left');
   }
 //debug($structures);//die();
@@ -87,8 +87,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;
@@ -112,7 +112,7 @@ 
 
   $iraks = db_missile_list_by_arrival();
 
-  while($fleetRow = db_fetch($iraks)) {
+  while ($fleetRow = db_fetch($iraks)) {
     set_time_limit(15);
     $db_changeset = array();
 
@@ -128,9 +128,9 @@ 
 
     $rowAttacker = db_user_by_id($fleetRow['fleet_owner'], true);
 
-    if($target_planet_row['id']) {
+    if ($target_planet_row['id']) {
       $planetDefense = array();
-      foreach(sn_get_groups('defense_active') as $unit_id) {
+      foreach (sn_get_groups('defense_active') as $unit_id) {
         $planetDefense[$unit_id] = array(mrc_get_level($targetUser, $target_planet_row, $unit_id, true, true));
       }
 
@@ -141,7 +141,7 @@ 
         $message = classLocale::$lang['mip_all_destroyed'];
         $db_changeset['unit'][] = sn_db_unit_changeset_prepare(UNIT_DEF_MISSILE_INTERCEPTOR, -$missiles, $targetUser, $target_planet_row['id']);
       } else {
-        if($interceptors) {
+        if ($interceptors) {
           $message = sprintf(classLocale::$lang['mip_destroyed'], $interceptors);
           $db_changeset['unit'][] = sn_db_unit_changeset_prepare(UNIT_DEF_MISSILE_INTERCEPTOR, -$interceptors, $targetUser, $target_planet_row['id']);
         }
@@ -149,16 +149,16 @@ 
 
         $attackResult = COE_missileAttack($targetUser, $rowAttacker, $missiles - $interceptors, $planetDefense, $fleetRow['primaer']);
 
-        foreach($attackResult['structures'] as $key => $structure) {
+        foreach ($attackResult['structures'] as $key => $structure) {
           $destroyed = $planetDefense[$key][0] - $structure[0];
-          if($destroyed) {
+          if ($destroyed) {
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($key, -$destroyed, $targetUser, $target_planet_row['id']);
 
             $message .= "&nbsp;&nbsp;{$lang['tech'][$key]} - {$destroyed} {$lang['quantity']}<br>";
           }
         }
 
-        if(!empty($message)) {
+        if (!empty($message)) {
           $message = $lang['mip_defense_destroyed'] . $message . "{$lang['mip_recycled']}{$lang['Metal']}: {$attackResult['metal']}, {$lang['Crystal']}: {$attackResult['crystal']}<br>";
 
           db_planet_set_by_id($target_planet_row['id'], "`metal` = `metal` + {$attackResult['metal']}, `crystal` = `crystal` + {$attackResult['crystal']}");
@@ -178,8 +178,8 @@ 
       empty($message) ? $message = classLocale::$lang['mip_no_defense'] : false;
       // empty($message) && ($message = $lang['mip_no_defense']);
 
-      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 );
-      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 );
+      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);
+      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);
     }
     db_missile_delete($fleetRow);
   }

includes/functions/int_banner_create.php

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
     ));
 
     display($template, $lang['tech'][STRUC_MOON_GATE]);
-  }
-  else
+  } else
   {
     message($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10);
   }

Spacing +28 added lines, -28 removed lines

@@ -30,29 +30,29 @@ 
   }
   $size = getimagesize(SN_ROOT_PHYSICAL . $img_name);
   $im = imagecreatefrompng(SN_ROOT_PHYSICAL . $img_name);
-  $image = imagecreatetruecolor($size[0],$size[1]);
-  imagecopy($image,$im,0,0,0,0,$size[0],$size[1]);
+  $image = imagecreatetruecolor($size[0], $size[1]);
+  imagecopy($image, $im, 0, 0, 0, 0, $size[0], $size[1]);
   imagedestroy($im);
 
   // Colors
   $color = "FFFFFF";
-  $red = hexdec(substr($color,0,2));
-  $green = hexdec(substr($color,2,4));
-  $blue = hexdec(substr($color,4,6));
-  $select = imagecolorallocate($image,$red,$green,$blue);
+  $red = hexdec(substr($color, 0, 2));
+  $green = hexdec(substr($color, 2, 4));
+  $blue = hexdec(substr($color, 4, 6));
+  $select = imagecolorallocate($image, $red, $green, $blue);
   $txt_shadow = imagecolorallocatealpha($image, 255, 255, 255, 255);
   $txt_color = imagecolorallocatealpha($image, 255, 255, 255, 2);
   $txt_shadow2 = imagecolorallocatealpha($image, 255, 255, 255, 255);
   $txt_color2 = imagecolorallocatealpha($image, 255, 255, 255, 40);
 
-  $fonts = array (
+  $fonts = array(
     'userbar' => SN_ROOT_PHYSICAL . "design/fonts/" . $config->int_userbar_font,
     'universe' => SN_ROOT_PHYSICAL . "design/fonts/" . $config->int_banner_fontUniverse,
     'raids' => SN_ROOT_PHYSICAL . "design/fonts/" . $config->int_banner_fontRaids,
     'info' => SN_ROOT_PHYSICAL . "design/fonts/" . $config->int_banner_fontInfo,
   );
 
-  if($id)
+  if ($id)
   {
     // Querys
     $user = db_user_by_id($id);
@@ -62,8 +62,8 @@ 
     $b_user = $user['username'];
     $b_ally = $user['ally_name'];
     $b_planet = $planet_row['name'];
-    $b_xyz = "[".$planet_row['galaxy'].":".$planet_row['system'].":".$planet_row['planet']."]";
-    $b_lvl = ($user['total_rank'] ? $user['total_rank'] : $config->users_amount) ."/{$config->users_amount}";
+    $b_xyz = "[" . $planet_row['galaxy'] . ":" . $planet_row['system'] . ":" . $planet_row['planet'] . "]";
+    $b_lvl = ($user['total_rank'] ? $user['total_rank'] : $config->users_amount) . "/{$config->users_amount}";
   }
   else
   {
@@ -85,7 +85,7 @@ 
       imagettftext($image, 11, 0, 8, 26, $txt_shadow, $fonts['info'], $b_user);
       imagettftext($image, 11, 0, 6, 23, $txt_color, $fonts['info'], $b_user);
 
-      if($id)
+      if ($id)
       {
         // Player level - right-alligned
         $is = imagettfbbox(11, 0, $fonts['info'], $b_lvl);
@@ -94,37 +94,37 @@ 
 
         // Ally name
         $is = imagettfbbox(9, 0, $fonts['info'], $b_ally);
-        imagettftext($image, 9, 0, 412-$is[2], 37, $txt_shadow, $fonts['info'], $b_ally);
-        imagettftext($image, 9, 0, 410-$is[2], 35, $txt_color, $fonts['info'], $b_ally);
+        imagettftext($image, 9, 0, 412 - $is[2], 37, $txt_shadow, $fonts['info'], $b_ally);
+        imagettftext($image, 9, 0, 410 - $is[2], 35, $txt_color, $fonts['info'], $b_ally);
 
         // Player b_planet
-        imagettftext($image, 6, 0, 8, 10, $txt_shadow2, $fonts['raids'], $b_planet." ".$b_xyz);
-        imagettftext($image, 6, 0, 6, 9, $txt_color2, $fonts['raids'], $b_planet." ".$b_xyz);
+        imagettftext($image, 6, 0, 8, 10, $txt_shadow2, $fonts['raids'], $b_planet . " " . $b_xyz);
+        imagettftext($image, 6, 0, 6, 9, $txt_color2, $fonts['raids'], $b_planet . " " . $b_xyz);
 
         //StatPoint
-        $b_points = classLocale::$lang['ov_points'].": ".pretty_number($user['total_points']);
+        $b_points = classLocale::$lang['ov_points'] . ": " . pretty_number($user['total_points']);
         $is = imagettfbbox(8, 0, $fonts['info'], $b_points);
-        imagettftext($image, 8, 0, 412-$is[2], 11, $txt_shadow, $fonts['info'], $b_points);
-        imagettftext($image, 8, 0, 410-$is[2], 9, $txt_color, $fonts['info'], $b_points);
+        imagettftext($image, 8, 0, 412 - $is[2], 11, $txt_shadow, $fonts['info'], $b_points);
+        imagettftext($image, 8, 0, 410 - $is[2], 9, $txt_color, $fonts['info'], $b_points);
 
         //Raids Total
         imagettftext($image, 6, 0, 8, 37, $txt_shadow2, $fonts['raids'], classLocale::$lang['NumberOfRaids']);
         imagettftext($image, 6, 0, 6, 35, $txt_color2, $fonts['raids'], classLocale::$lang['NumberOfRaids']);
-        $b_points = ": ".pretty_number($user['raids']);
+        $b_points = ": " . pretty_number($user['raids']);
         imagettftext($image, 6, 0, 61, 37, $txt_shadow2, $fonts['raids'], $b_points);
         imagettftext($image, 6, 0, 59, 35, $txt_color2, $fonts['raids'], $b_points);
 
         //Raids Won
         imagettftext($image, 6, 0, 8, 47, $txt_shadow2, $fonts['raids'], classLocale::$lang['RaidsWin']);
         imagettftext($image, 6, 0, 6, 45, $txt_color2, $fonts['raids'], classLocale::$lang['RaidsWin']);
-        $b_points = ": ".pretty_number($user['raidswin']);
+        $b_points = ": " . pretty_number($user['raidswin']);
         imagettftext($image, 6, 0, 61, 47, $txt_shadow2, $fonts['raids'], $b_points);
         imagettftext($image, 6, 0, 59, 45, $txt_color2, $fonts['raids'], $b_points);
 
         //Raids Lost
         imagettftext($image, 6, 0, 8, 57, $txt_shadow2, $fonts['raids'], classLocale::$lang['RaidsLoose']);
         imagettftext($image, 6, 0, 6, 55, $txt_color2, $fonts['raids'], classLocale::$lang['RaidsLoose']);
-        $b_points = ": ".pretty_number($user['raidsloose']);
+        $b_points = ": " . pretty_number($user['raidsloose']);
         imagettftext($image, 6, 0, 61, 57, $txt_shadow2, $fonts['raids'], $b_points);
         imagettftext($image, 6, 0, 59, 55, $txt_color2, $fonts['raids'], $b_points);
       }
@@ -137,25 +137,25 @@ 
       $is = imagettfbbox(9, 0, $fonts['userbar'], $b_univ);
       $is = $size[0] - $is[2] - 2;
       imagettftext($image, 9, 0, $is, $size[1] - 3, $txt_shadow, $fonts['userbar'], $b_univ);
-      imagettftext($image, 9, 0, $is-1, $size[1] - 5, $txt_color, $fonts['userbar'], $b_univ);
-      imagettftext($image, 22, 0, $is-8, $size[1], $txt_color, $fonts['userbar'], '/');
+      imagettftext($image, 9, 0, $is - 1, $size[1] - 5, $txt_color, $fonts['userbar'], $b_univ);
+      imagettftext($image, 22, 0, $is - 8, $size[1], $txt_color, $fonts['userbar'], '/');
 
       // Player name
       imagettftext($image, 9, 0, 4, $size[1] - 4, $txt_shadow, $fonts['userbar'], $b_user);
       imagettftext($image, 9, 0, 2, $size[1] - 6, $txt_color, $fonts['userbar'], $b_user);
 
-      if($id)
+      if ($id)
       {
         // Player level - right-alligned
         $isp = imagettfbbox(9, 0, $fonts['userbar'], $b_lvl);
-        imagettftext($image, 9, 0, $is-$isp[2] - 10, $size[1] - 4, $txt_shadow, $fonts['userbar'], $b_lvl);
-        imagettftext($image, 9, 0, $is-$isp[2] - 10 - 1, $size[1] - 4 - 1, $txt_color, $fonts['userbar'], $b_lvl);
+        imagettftext($image, 9, 0, $is - $isp[2] - 10, $size[1] - 4, $txt_shadow, $fonts['userbar'], $b_lvl);
+        imagettftext($image, 9, 0, $is - $isp[2] - 10 - 1, $size[1] - 4 - 1, $txt_color, $fonts['userbar'], $b_lvl);
       }
   }
 
   //And now convert it back to PNG-8
-  $im_result = imagecreate($size[0],$size[1]);
-  imagecopy($im_result,$image,0,0,0,0,$size[0],$size[1]);
+  $im_result = imagecreate($size[0], $size[1]);
+  imagecopy($im_result, $image, 0, 0, 0, 0, $size[0], $size[1]);
   imagedestroy($image);
   //And save it
   $imagetypes = imagetypes();

includes/classes/Bonus.php

Doc Comments +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
   /**
    * Добавляет юнит к списку бонусов
    *
-   * @param $unit_id
+   * @param integer $unit_id
    * @param $unit_level
    */
   public function add_unit_by_snid($unit_id, $unit_level) {
@@ -67,7 +67,7 @@ 
    *
    * Выдает финальный бонус в виде множителя
    *
-   * @param string|int $param - ИД бонуса
+   * @param string $param - ИД бонуса
    *
    * @return float
    */

Spacing +7 added lines, -7 removed lines

@@ -28,12 +28,12 @@ 
    * @param $unit_level
    */
   public function add_unit_by_snid($unit_id, $unit_level) {
-    if(!$unit_level) {
+    if (!$unit_level) {
       return;
     }
 
-    foreach(static::$_bonus_group as $param_name => $unit_list) {
-      if(!empty($unit_list[$unit_id])) {
+    foreach (static::$_bonus_group as $param_name => $unit_list) {
+      if (!empty($unit_list[$unit_id])) {
         // Простейший вариант - мультипликатор по базе
         // Общий мультипликатор добавляется в конец
         $this->grants[$param_name][$unit_id] = $unit_level;
@@ -82,16 +82,16 @@ 
 //    $this->grants[$param_name][$unit_id] = $unit_level * get_unit_param($unit_id, P_BONUS_VALUE) / 100;;
     $value_add = floatval($base_value);
     $cumulative = 1.0; // Для случая BONUS_PERCENT
-    if(!empty($this->grants[$param]) && is_array($this->grants[$param])) {
-      foreach($this->grants[$param] as $unit_id => $unit_level) {
+    if (!empty($this->grants[$param]) && is_array($this->grants[$param])) {
+      foreach ($this->grants[$param] as $unit_id => $unit_level) {
         $unit_bonus = 0;
-        if($unit_id < 0) {
+        if ($unit_id < 0) {
           // Meta-unit - leave as is
         } else {
           // TODO - Подумать, что будет при смешивании разных бонусов и как этого избежать
           $bonus_value = get_unit_param($unit_id, P_BONUS_VALUE);
           $bonus_type = get_unit_param($unit_id, P_BONUS_TYPE);
-          switch($bonus_type) {
+          switch ($bonus_type) {
             case BONUS_PERCENT:
               $unit_bonus = $unit_level * $bonus_value / 100;
               $cumulative += $unit_bonus;