supernova-ws / SuperNova

language/ru/messages.mo.php

Braces +3 added lines, -1 removed lines

@@ -24,7 +24,9 @@
 * DO NOT CHANGE
 */
 
-if (!defined('INSIDE')) die();
+if (!defined('INSIDE')) {
+  die();
+}
 
 $a_lang_array = (array(
   'msg_page_header' => 'Личные сообщения',

language/ru/market.mo.php

Braces +3 added lines, -1 removed lines

@@ -24,7 +24,9 @@
 * DO NOT CHANGE
 */
 
-if (!defined('INSIDE')) die();
+if (!defined('INSIDE')) {
+  die();
+}
 
 $a_lang_array = (array(
   'eco_mrk_title' => 'Чёрный Рынок',

language/ru/fleet.mo.php

Braces +3 added lines, -1 removed lines

@@ -24,7 +24,9 @@
 * DO NOT CHANGE
 */
 
-if (!defined('INSIDE')) die();
+if (!defined('INSIDE')) {
+  die();
+}
 
 $a_lang_array = (array(
   'flt_page2_title' => 'Выбор задания',

includes/general/math.php

Spacing +20 added lines, -20 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,47 +103,47 @@ 
 }
 function linear_calc(&$linear, $from = 0, $debug = 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($debug) pdump($linear, 'Нормализовано по х' . $from);
+  if ($debug) 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($debug) pdump($linear, 'Подставили х' . $from);
+  if ($debug) pdump($linear, 'Подставили х' . $from);
 
-  if($from < count($linear) - 1)
+  if ($from < count($linear) - 1)
   {
     linear_calc($linear, $from + 1, $debug);
   }
 
-  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($debug) pdump($linear, 'Подставили обратно х' . $from);
+    if ($debug) pdump($linear, 'Подставили обратно х' . $from);
   }
   else
   {
-    if($debug) pdump($linear, 'Результат' . $from);
-    foreach($linear as $index => &$eq)
+    if ($debug) pdump($linear, 'Результат' . $from);
+    foreach ($linear as $index => &$eq)
     {
       pdump($eq[count($linear)], 'x' . $index);
     }

Braces +20 added lines, -19 removed lines

@@ -4,16 +4,14 @@ 
   return $q != 1 ? ($b1 * (pow($q, $n) - 1)/($q - 1)) : ($n * $b1);
 }
 
-function sn_floor($value)
-{
+function sn_floor($value) {
   return $value >= 0 ? floor($value) : ceil($value);
 }
 
 // Эта функция выдает нормально распределенное случайное число с матожиднием $mu и стандартным отклонением $sigma
 // $strict - количество $sigma, по которым идет округление функции. Т.е. $strict = 3 означает, что диапазон значений обрезается по +-3 * $sigma
 // Используется http://ru.wikipedia.org/wiki/Преобразование_Бокса_—_Мюллера
-function sn_rand_gauss($mu = 0, $sigma = 1, $strict = false)
-{
+function sn_rand_gauss($mu = 0, $sigma = 1, $strict = false) {
   // http://ru.wikipedia.org/wiki/Среднеквадратическое_отклонение
   // При $mu = 0 (график симметричный, цифры только для половины графика)
   // От 0 до $sigma ~ 34.1%
@@ -43,7 +41,7 @@ 
  *
  * @return float|int
  */
-function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false)  {
+function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false) {
   if($cut_extreme) {
     $range_start--;
     $range_end++;
@@ -56,8 +54,7 @@ 
   return $result;
 }
 
-function median()
-{
+function median() {
   $args = func_get_args();
 
   switch(func_num_args())
@@ -86,8 +83,7 @@ 
       if($n % 2 == 0)
       {
         $median = ($args[$h] + $args[$h-1]) / 2;
-      }
-      else
+      } else
       {
         $median = $args[$h];
       }
@@ -97,12 +93,10 @@ 
 
   return $median;
 }
-function average($arr)
-{
+function average($arr) {
   return is_array($arr) && count($arr) ? array_sum($arr) / count($arr) : 0;
 }
-function linear_calc(&$linear, $from = 0, $debug = false)
-{
+function linear_calc(&$linear, $from = 0, $debug = false) {
   for($i = $from; $i < count($linear); $i++)
   {
     $eq = &$linear[$i];
@@ -111,7 +105,9 @@ 
       $eq[$j] /= $eq[$from];
     }
   }
-  if($debug) pdump($linear, 'Нормализовано по х' . $from);
+  if($debug) {
+    pdump($linear, 'Нормализовано по х' . $from);
+  }
 
   for($i = $from + 1; $i < count($linear); $i++)
   {
@@ -121,7 +117,9 @@ 
       $eq[$j] -= $linear[$from][$j];
     }
   }
-  if($debug) pdump($linear, 'Подставили х' . $from);
+  if($debug) {
+    pdump($linear, 'Подставили х' . $from);
+  }
 
   if($from < count($linear) - 1)
   {
@@ -138,11 +136,14 @@ 
         $eq[$j] = $eq[$j] - $eq[$from] * $linear[$from][$j];
       }
     }
-    if($debug) pdump($linear, 'Подставили обратно х' . $from);
-  }
-  else
+    if($debug) {
+      pdump($linear, 'Подставили обратно х' . $from);
+    }
+  } else
   {
-    if($debug) pdump($linear, 'Результат' . $from);
+    if($debug) {
+      pdump($linear, 'Результат' . $from);
+    }
     foreach($linear as $index => &$eq)
     {
       pdump($eq[count($linear)], 'x' . $index);

includes/alliance/ali_external_search.inc

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }

includes/alliance/ali_internal_members.inc

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -10,11 +10,11 @@ 
 */
 // Changing rank for single user
 $id_user = sys_get_param_id('id_user');
-if(isset($_GET['id_rank']))
+if (isset($_GET['id_rank']))
 {
   $id_rank = sys_get_param_int('id_rank');
 }
-if($id_user && isset($id_rank) && $user_admin){
+if ($id_user && isset($id_rank) && $user_admin) {
   db_user_set_by_id($id_user, "`ally_rank_id` = {$id_rank}");
 }
 
@@ -42,7 +42,7 @@ 
 }
 
 $sort1 = sys_get_param_int('sort1');
-if($sort1>5 || $sort1<0) $sort1 = 0;
+if ($sort1 > 5 || $sort1 < 0) $sort1 = 0;
 $sort1s = array(
   0 => '`ally_rank_id` %1$s;',
   1 => '`username` %1$s;',
@@ -58,7 +58,7 @@ 
   'id, username, galaxy, system, planet, onlinetime, ally_rank_id, ally_register_time, total_points');
 
 // while ($userRow = db_fetch($userList))
-foreach($userList as $userRow)
+foreach ($userList as $userRow)
 {
   $i++;
   if (!isset($ranks[$userRow['ally_rank_id']]))
@@ -68,17 +68,17 @@ 
 
   if ($ally['ally_owner'] == $userRow['id'])
   {
-    $ally_range = ($ally['ally_owner_range'])?$ally['ally_owner_range']:$lang['Founder'];
+    $ally_range = ($ally['ally_owner_range']) ? $ally['ally_owner_range'] : $lang['Founder'];
   }
   else
   {
-    if($user_admin)
+    if ($user_admin)
     {
       $ally_range = '<select onchange="window.location=\'alliance.php?mode=admin&edit=members&id_user=' . $userRow['id'] . '&id_rank=\' + this.value">';
 
-      foreach($ranks as $rankID => $rankArray){
+      foreach ($ranks as $rankID => $rankArray) {
         $ally_range .= '<option value="' . $rankID . '"';
-        if($rankID == $userRow['ally_rank_id'])
+        if ($rankID == $userRow['ally_rank_id'])
           $ally_range .= " selected";
         $ally_range .= '>' . $rankArray['name'];
         $ally_range .= '</option>';
@@ -92,9 +92,9 @@ 
   }
 
   $last_active = time() - $userRow["onlinetime"];
-  if($user_admin)
+  if ($user_admin)
   {
-    if ( $last_active < 60 )
+    if ($last_active < 60)
     {
       $tmp = "lime>{$lang['On']}";
     }
@@ -105,12 +105,12 @@ 
     }
     elseif ($last_active < 60 * 60 * 24)
     {
-      $last_active = round( $last_active / (60 * 60));
+      $last_active = round($last_active / (60 * 60));
       $tmp = "green>{$last_active} {$lang['sys_hrs_short']}";
     }
     else
     {
-      $last_active = round( $last_active / (60 * 60 * 24));
+      $last_active = round($last_active / (60 * 60 * 24));
       if ($last_active < 7)
       {
         $tmp = "yellow";
@@ -128,9 +128,9 @@ 
   }
   else
   {
-    if($user_onlinestatus)
+    if ($user_onlinestatus)
     {
-      if ( $last_active < 60 * 5 )
+      if ($last_active < 60 * 5)
       {
         $tmp = "lime>{$lang['On']}";
       }

Braces +18 added lines, -27 removed lines

@@ -34,15 +34,16 @@ 
 {
   $sort2s = "DESC";
   $sort2 = 0;
-}
-else
+} else
 {
   $sort2s = "ASC";
   $sort2 = 1;
 }
 
 $sort1 = sys_get_param_int('sort1');
-if($sort1>5 || $sort1<0) $sort1 = 0;
+if($sort1>5 || $sort1<0) {
+  $sort1 = 0;
+}
 $sort1s = array(
   0 => '`ally_rank_id` %1$s;',
   1 => '`username` %1$s;',
@@ -69,8 +70,7 @@ 
   if ($ally['ally_owner'] == $userRow['id'])
   {
     $ally_range = ($ally['ally_owner_range'])?$ally['ally_owner_range']:$lang['Founder'];
-  }
-  else
+  } else
   {
     if($user_admin)
     {
@@ -78,14 +78,14 @@ 
 
       foreach($ranks as $rankID => $rankArray){
         $ally_range .= '<option value="' . $rankID . '"';
-        if($rankID == $userRow['ally_rank_id'])
-          $ally_range .= " selected";
+        if($rankID == $userRow['ally_rank_id']) {
+                  $ally_range .= " selected";
+        }
         $ally_range .= '>' . $rankArray['name'];
         $ally_range .= '</option>';
       }
       $ally_range .= '</select>';
-    }
-    else
+    } else
     {
       $ally_range = $ranks[$userRow['ally_rank_id']]['name'];
     }
@@ -97,53 +97,44 @@ 
     if ( $last_active < 60 )
     {
       $tmp = "lime>{$lang['On']}";
-    }
-    elseif ($last_active < 60 * 60)
+    } elseif ($last_active < 60 * 60)
     {
       $last_active = round($last_active / 60);
       $tmp = "lime>{$last_active} {$lang['sys_min_short']}";
-    }
-    elseif ($last_active < 60 * 60 * 24)
+    } elseif ($last_active < 60 * 60 * 24)
     {
       $last_active = round( $last_active / (60 * 60));
       $tmp = "green>{$last_active} {$lang['sys_hrs_short']}";
-    }
-    else
+    } else
     {
       $last_active = round( $last_active / (60 * 60 * 24));
       if ($last_active < 7)
       {
         $tmp = "yellow";
-      }
-      elseif ($last_active < 30)
+      } elseif ($last_active < 30)
       {
         $tmp = "orange";
-      }
-      else
+      } else
       {
         $tmp = "red";
       }
       $tmp .= ">{$last_active} {$lang['sys_day_short']}";
     }
-  }
-  else
+  } else
   {
     if($user_onlinestatus)
     {
       if ( $last_active < 60 * 5 )
       {
         $tmp = "lime>{$lang['On']}";
-      }
-      elseif ($last_active < 60 * 15)
+      } elseif ($last_active < 60 * 15)
       {
         $tmp = "yellow>{$lang['ali_lessThen15min']}";
-      }
-      else
+      } else
       {
         $tmp = "red>{$lang['Off']}";
       }
-    }
-    else
+    } else
     {
       $sort1 = max($sort1, 4);
       $tmp = "orange>-";

includes/alliance/ali_external_request.inc

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
   if($user_request['request_denied'])
   {
     $lang['request_text'] = sprintf($lang['ali_req_deny_msg'], $ally['ally_tag'], $user_request['request_text']);
-  }
-  else
+  } else
   {
     $lang['request_text'] = sprintf($lang['ali_req_waiting'], $ally['ally_tag']);
   }

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -20,7 +20,7 @@ 
     sys_redirect('alliance.php');
   }
 
-  if($user_request['request_denied'])
+  if ($user_request['request_denied'])
   {
     $lang['request_text'] = sprintf($lang['ali_req_deny_msg'], $ally['ally_tag'], $user_request['request_text']);
   }
@@ -43,12 +43,12 @@ 
 
 $ally = doquery("SELECT * FROM {{alliance}} WHERE `id` ='{$id_ally}'", true);
 
-if(!$ally)
+if (!$ally)
 {
   messageBox($lang['ali_sys_notFound'], $lang['ali_req_title']);
 }
 
-if($ally['ally_request_notallow'])
+if ($ally['ally_request_notallow'])
 {
   messageBox($lang['ali_req_not_allowed'], $lang['ali_req_title']);
 }

includes/alliance/ali_internal_admin_request.inc

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
@@ -9,12 +9,12 @@ 
 }
 
 $d = sys_get_param_id('d');
-if($d) {
+if ($d) {
   doquery("UPDATE {{alliance_requests}} SET `request_denied` = 1, `request_text` = '{$lang['ali_req_deny_reason']}' WHERE `id_user`= {$d} LIMIT 1;");
 }
 
 $id_user = sys_get_param_id('id_user');
-if($id_user) {
+if ($id_user) {
   $ally_name_safe = db_escape($ally['ally_name']);
   $ally_tag_safe = db_escape($ally['ally_tag']);
   db_user_set_by_id($id_user, "`ally_id` = '{$ally['id']}', `ally_name` = '{$ally_name_safe}', `ally_tag` = '{$ally_tag_safe}', `ally_register_time` = " . SN_TIME_NOW . ", `ally_rank_id` = 0");

includes/includes/uni_rename.php

Braces +1 added lines, -2 removed lines

@@ -46,8 +46,7 @@
       sn_db_transaction_commit();
       sys_redirect("galaxy.php?mode=name&galaxy={$uni_galaxy}&system={$uni_system}");
     }
-  }
-  catch (exception $e)
+  } catch (exception $e)
   {
     sn_db_transaction_rollback();
     $template->assign_block_vars('result', array(

Spacing +6 added lines, -6 removed lines

@@ -6,12 +6,12 @@ 
     $uni_galaxy = sys_get_param_int('galaxy', $planetrow['galaxy']);
     $uni_system = sys_get_param_int('system');
 
-    if($uni_galaxy < 1 || $uni_galaxy > $config->game_maxGalaxy)
+    if ($uni_galaxy < 1 || $uni_galaxy > $config->game_maxGalaxy)
     {
       throw new exception($lang['uni_msg_error_wrong_galaxy'], ERR_ERROR);
     }
 
-    if($uni_system < 0 || $uni_system > $config->game_maxSystem)
+    if ($uni_system < 0 || $uni_system > $config->game_maxSystem)
     {
       throw new exception($lang['uni_msg_error_wrong_system'], ERR_ERROR);
     }
@@ -20,12 +20,12 @@ 
     $uni_row['universe_price'] += $uni_system ? $config->uni_price_system : $config->uni_price_galaxy;
     $uni_row['universe_name'] = strip_tags($uni_row['universe_name'] ? $uni_row['universe_name'] : ($uni_system ? "{$lang['sys_system']} [{$uni_galaxy}:{$uni_system}]" : "{$lang['sys_galaxy']} {$uni_galaxy}"));
 
-    if(sys_get_param_str('uni_name_submit'))
+    if (sys_get_param_str('uni_name_submit'))
     {
       $uni_row['universe_name'] = strip_tags(sys_get_param_str('uni_name'));
 
       $uni_price = sys_get_param_float('uni_price');
-      if($uni_price < $uni_row['universe_price'])
+      if ($uni_price < $uni_row['universe_price'])
       {
         throw new exception($lang['uni_msg_error_low_price'], ERR_ERROR);
       }
@@ -34,12 +34,12 @@ 
       sn_db_transaction_start();
       $user = db_user_by_id($user['id'], true);
       // if($user[get_unit_param(RES_DARK_MATTER, P_NAME)] < $uni_price)
-      if(mrc_get_level($user, null, RES_DARK_MATTER) < $uni_price)
+      if (mrc_get_level($user, null, RES_DARK_MATTER) < $uni_price)
       {
         throw new exception($lang['uni_msg_error_no_dm'], ERR_ERROR);
       }
 
-      if(!rpg_points_change($user['id'], RPG_RENAME, -$uni_price, "Renaming [{$uni_galaxy}:{$uni_system}] to " . sys_get_param_str_unsafe('uni_name')))
+      if (!rpg_points_change($user['id'], RPG_RENAME, -$uni_price, "Renaming [{$uni_galaxy}:{$uni_system}] to " . sys_get_param_str_unsafe('uni_name')))
       {
         throw new exception($lang['sys_msg_err_update_dm'], ERR_ERROR);
       }