supernova-ws / SuperNova

includes/functions/sys_bbcode.php

Spacing +8 added lines, -8 removed lines

@@ -107,23 +107,23 @@
 
   !empty($config->url_faq) ? $msg = str_replace('faq://', $config->url_faq, $msg) : false;
 
-  foreach($supernova->design['bbcodes'] as $auth_level => $replaces) {
-    if($auth_level > $author_auth) {
+  foreach ($supernova->design['bbcodes'] as $auth_level => $replaces) {
+    if ($auth_level > $author_auth) {
       continue;
     }
 
-    foreach($replaces as $key => $html) {
-      $msg = preg_replace(''.$key.'', $html, $msg);
+    foreach ($replaces as $key => $html) {
+      $msg = preg_replace('' . $key . '', $html, $msg);
     }
   }
 
-  foreach($supernova->design['smiles'] as $auth_level => $replaces) {
-    if($auth_level > $author_auth) {
+  foreach ($supernova->design['smiles'] as $auth_level => $replaces) {
+    if ($auth_level > $author_auth) {
       continue;
     }
 
-    foreach($replaces as $key => $imgName) {
-      $msg = preg_replace("#" . addcslashes($key, '()[]{}') . "#isU","<img src=\"design/images/smileys/".$imgName.".gif\" align=\"absmiddle\" title=\"".$key."\" alt=\"".$key."\">",$msg);
+    foreach ($replaces as $key => $imgName) {
+      $msg = preg_replace("#" . addcslashes($key, '()[]{}') . "#isU", "<img src=\"design/images/smileys/" . $imgName . ".gif\" align=\"absmiddle\" title=\"" . $key . "\" alt=\"" . $key . "\">", $msg);
     }
   }
 

search.php

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * search.php
- *
- * 1.3 copyright (c) 2009-2010 by Gorlum for http://supernova.ws
- *   [%] Fixed search of players without alliance
- * 1.2 - Security checks & tests by Gorlum for http://supernova.ws
- * @version 1.1
- * @copyright 2009 by angelus_ira for Project. XNova
- * @copyright 2008 by ??????? for XNova
- */
+   * search.php
+   *
+   * 1.3 copyright (c) 2009-2010 by Gorlum for http://supernova.ws
+   *   [%] Fixed search of players without alliance
+   * 1.2 - Security checks & tests by Gorlum for http://supernova.ws
+   * @version 1.1
+   * @copyright 2009 by angelus_ira for Project. XNova
+   * @copyright 2008 by ??????? for XNova
+   */
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(classSupernova::$config->game_mode == GAME_BLITZ) {
+if (classSupernova::$config->game_mode == GAME_BLITZ) {
   message(classLocale::$lang['sys_blitz_page_disabled'], classLocale::$lang['sys_error'], 'overview.php', 10);
   die();
 }
@@ -25,8 +25,8 @@ 
 
 $template = gettemplate('search', true);
 
-if($searchtext && $type) {
-  switch($type) {
+if ($searchtext && $type) {
+  switch ($type) {
     case "planetname":
       // $search = db_planet_list_search($searchtext);
     break;
@@ -41,8 +41,8 @@ 
     break;
   }
 
-  while($row = db_fetch($search)) {
-    if($type == 'playername' || $type == 'planetname') {
+  while ($row = db_fetch($search)) {
+    if ($type == 'playername' || $type == 'planetname') {
       $template->assign_block_vars('search_result', array(
         'PLAYER_ID'       => $row['uid'],
         'PLAYER_NAME'     => htmlentities($row['username'], ENT_COMPAT, 'UTF-8'),
@@ -57,7 +57,7 @@ 
         'ALLY_NAME'       => htmlentities($row['ally_name'], ENT_COMPAT, 'UTF-8'),
         'ALLY_TAG'        => htmlentities($row['ally_tag'], ENT_COMPAT, 'UTF-8'),
       ));
-    } elseif($type == 'ally') {
+    } elseif ($type == 'ally') {
       $template->assign_block_vars('search_result', array(
         'ALLY_NAME'     => htmlentities($row['ally_name'], ENT_COMPAT, 'UTF-8'),
         'ALLY_TAG'      => htmlentities($row['ally_tag'], ENT_COMPAT, 'UTF-8'),
@@ -75,7 +75,7 @@ 
   'ally'       => 'sys_alliance',
 );
 
-foreach($search_type as $type_id => $type_lang) {
+foreach ($search_type as $type_id => $type_lang) {
   $template->assign_block_vars('type', array(
     'ID'       => $type_id,
     'TEXT'     => classLocale::$lang[$type_lang],

captcha.php

Spacing +9 added lines, -9 removed lines

@@ -2,16 +2,16 @@
 // Captcha code for registration - really didn't work alot :(
 
 session_start();
-$en=100;
-$boy=25;
-$sayi = mt_rand(0,9999999);
+$en = 100;
+$boy = 25;
+$sayi = mt_rand(0, 9999999);
 $_SESSION['captcha'] = $sayi;
-$tuval = imagecreatetruecolor($en,$boy);
-$b = imagecolorallocate($tuval,175,238,238);
-$s = imagecolorallocate($tuval,0,0,0);
-imagefill($tuval,0,0,$s);
-imageline($tuval,20,50,$en,$boy,$b);
-imagestring($tuval,3,27,7,$sayi,$b);
+$tuval = imagecreatetruecolor($en, $boy);
+$b = imagecolorallocate($tuval, 175, 238, 238);
+$s = imagecolorallocate($tuval, 0, 0, 0);
+imagefill($tuval, 0, 0, $s);
+imageline($tuval, 20, 50, $en, $boy, $b);
+imagestring($tuval, 3, 27, 7, $sayi, $b);
 Header("content-type:image/gif");
 imagegif($tuval);
 imagedestroy($tuval);

quest.php

Spacing +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
  *
  */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 
 require('common.' . substr(strrchr(__FILE__, '.'), 1));
 

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 => 'Введенный Е-Мейл не является допустимым адресом электронной почты. Проверьте написание Е-Мейла или используйте другой адрес почтового ящика',