supernova-ws / SuperNova

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

ajax_version_check.php

Spacing +8 added lines, -8 removed lines

@@ -20,12 +20,12 @@ 
 . '&key=' . urlencode($config->server_updater_key)
 . '&id=' . urlencode($config->server_updater_id);
 */
-switch($mode)
+switch ($mode)
 {
   case SNC_MODE_REGISTER:
-    if($config->server_updater_key || $config->server_updater_id)
+    if ($config->server_updater_key || $config->server_updater_id)
     {
-      if($ajax)
+      if ($ajax)
       {
         print(SNC_VER_REGISTER_ERROR_REGISTERED);
       }
@@ -38,11 +38,11 @@ 
 }
 
 $check_result = sn_get_url_contents($url);
-if(!$check_result)
+if (!$check_result)
 {
   $version_check = SNC_VER_ERROR_CONNECT;
 }
-elseif(($version_check = intval($check_result)) && $version_check == $check_result)
+elseif (($version_check = intval($check_result)) && $version_check == $check_result)
 {
   $version_check = $check_result;
 }
@@ -52,10 +52,10 @@ 
   $check_result = json_decode($check_result, true);
   $version_check = $check_result === null ? SNC_VER_UNKNOWN_RESPONSE : $check_result['version_check'];
 
-  switch($mode)
+  switch ($mode)
   {
     case SNC_MODE_REGISTER:
-      if($check_result['site']['site_key'] && $check_result['site']['site_id'] && $check_result['site']['result'] == SNC_VER_REGISTER_REGISTERED)
+      if ($check_result['site']['site_key'] && $check_result['site']['site_id'] && $check_result['site']['result'] == SNC_VER_REGISTER_REGISTERED)
       {
         $config->db_saveItem('server_updater_key', $check_result['site']['site_key']);
         $config->db_saveItem('server_updater_id', $check_result['site']['site_id']);
@@ -69,7 +69,7 @@ 
 $config->db_saveItem('server_updater_check_last', SN_TIME_NOW);
 $config->db_saveItem('server_updater_check_result', $version_check);
 
-if($ajax)
+if ($ajax)
 {
   define('IN_AJAX', true);
   print($version_check);

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

search.php

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($config->game_mode == GAME_BLITZ) {
+if ($config->game_mode == GAME_BLITZ) {
   message($lang['sys_blitz_page_disabled'], $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'     => $lang[$type_lang],

common.php

Spacing +6 added lines, -6 removed lines

@@ -12,25 +12,25 @@ 
 global $debug, $sn_mvc, $template_result, $user;
 
 // Напоминание для Администрации, что игра отключена
-if($template_result[F_GAME_DISABLE]) {
+if ($template_result[F_GAME_DISABLE]) {
   // $disable_reason = sys_bbcodeParse($config->game_disable_reason); // Должна быть инициализирована выше по коду - в init.php
   echo '<div class="global_admin_warning">', $template_result[F_GAME_DISABLE_REASON], '</div>';
 }
 unset($disable_reason);
 
 
-if(defined('IN_ADMIN') && IN_ADMIN === true) {
+if (defined('IN_ADMIN') && IN_ADMIN === true) {
   lng_include('admin');
-} elseif($sys_user_logged_in) {
+} elseif ($sys_user_logged_in) {
   sys_user_vacation($user);
 
   $planet_id = SetSelectedPlanet($user);
 
   // TODO НЕ НУЖНО АЛЬЯНС КАЖДЫЙ РАЗ ОБНОВЛЯТЬ!!!
-  if($user['ally_id']) {
+  if ($user['ally_id']) {
     sn_db_transaction_start();
     sn_ali_fill_user_ally($user);
-    if(!$user['ally']['player']['id']) {
+    if (!$user['ally']['player']['id']) {
       // sn_sys_logout(false, true);
       // core_auth::logout(false);
       classSupernova::$auth->logout(false);
@@ -49,7 +49,7 @@ 
   sn_db_transaction_commit();
 
   $planetrow = $global_data['planet'];
-  if(!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
+  if (!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
     // sn_sys_logout(false, true);
     // core_auth::logout(false);
     classSupernova::$auth->logout(false);

banned.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
 $query = db_banned_list_select();
 $i = 0;
-while($ban_row = db_fetch($query)) {
+while ($ban_row = db_fetch($query)) {
   $template->assign_block_vars('banlist', array(
     'USER_NAME'   => $ban_row['ban_user_name'],
     'REASON'      => $ban_row['ban_reason'],

buddy.php

Spacing +19 added lines, -19 removed lines

@@ -17,32 +17,32 @@ 
 try {
   sn_db_transaction_start();
 
-  if($buddy_id = sys_get_param_id('buddy_id')) {
+  if ($buddy_id = sys_get_param_id('buddy_id')) {
     $buddy_row = db_buddy_get_row($buddy_id);
-    if(!is_array($buddy_row)) {
+    if (!is_array($buddy_row)) {
       throw new exception('buddy_err_not_exist', ERR_ERROR);
     }
 
-    switch($mode = sys_get_param_str('mode')) {
+    switch ($mode = sys_get_param_str('mode')) {
       case 'accept':
-        if($buddy_row['BUDDY_SENDER_ID'] == $user['id']) {
+        if ($buddy_row['BUDDY_SENDER_ID'] == $user['id']) {
           throw new exception('buddy_err_accept_own', ERR_ERROR);
         }
 
-        if($buddy_row['BUDDY_OWNER_ID'] != $user['id']) {
+        if ($buddy_row['BUDDY_OWNER_ID'] != $user['id']) {
           throw new exception('buddy_err_accept_alien', ERR_ERROR);
         }
 
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) {
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) {
           throw new exception('buddy_err_accept_already', ERR_WARNING);
         }
 
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_DENIED) {
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_DENIED) {
           throw new exception('buddy_err_accept_denied', ERR_ERROR);
         }
 
         db_buddy_update_status($buddy_id, BUDDY_REQUEST_ACTIVE);
-        if(classSupernova::$db->db_affected_rows()) {
+        if (classSupernova::$db->db_affected_rows()) {
           msg_send_simple_message($buddy_row['BUDDY_SENDER_ID'], $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_accept_title'],
             sprintf($lang['buddy_msg_accept_text'], $user['username']));
           sn_db_transaction_commit();
@@ -53,11 +53,11 @@ 
       break;
 
       case 'delete':
-        if($buddy_row['BUDDY_SENDER_ID'] != $user['id'] && $buddy_row['BUDDY_OWNER_ID'] != $user['id']) {
+        if ($buddy_row['BUDDY_SENDER_ID'] != $user['id'] && $buddy_row['BUDDY_OWNER_ID'] != $user['id']) {
           throw new exception('buddy_err_delete_alien', ERR_ERROR);
         }
 
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) // Existing friendship
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) // Existing friendship
         {
           $ex_friend_id = $buddy_row['BUDDY_SENDER_ID'] == $user['id'] ? $buddy_row['BUDDY_OWNER_ID'] : $buddy_row['BUDDY_SENDER_ID'];
 
@@ -67,12 +67,12 @@ 
           db_buddy_delete($buddy_id);
           sn_db_transaction_commit();
           throw new exception('buddy_err_unfriend_none', ERR_NONE);
-        } elseif($buddy_row['BUDDY_SENDER_ID'] == $user['id']) // Player's outcoming request - either denied or waiting
+        } elseif ($buddy_row['BUDDY_SENDER_ID'] == $user['id']) // Player's outcoming request - either denied or waiting
         {
           db_buddy_delete($buddy_id);
           sn_db_transaction_commit();
           throw new exception('buddy_err_delete_own', ERR_NONE);
-        } elseif($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) // Deny incoming request
+        } elseif ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) // Deny incoming request
         {
           msg_send_simple_message($buddy_row['BUDDY_SENDER_ID'], $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_deny_title'],
             sprintf($lang['buddy_msg_deny_text'], $user['username']));
@@ -87,22 +87,22 @@ 
 
   // New request?
   // Checking for user ID - in case if it was request from outside buddy system
-  if($new_friend_id = sys_get_param_id('request_user_id')) {
+  if ($new_friend_id = sys_get_param_id('request_user_id')) {
     $new_friend_row = db_user_by_id($new_friend_id, true, '`id`, `username`');
-  } elseif($new_friend_name = sys_get_param_str_unsafe('request_user_name')) {
+  } elseif ($new_friend_name = sys_get_param_str_unsafe('request_user_name')) {
     $new_friend_row = db_user_by_username($new_friend_name, true, '`id`, `username`');
     $new_friend_name = db_escape($new_friend_name);
   }
 
-  if($new_friend_row['id'] == $user['id']) {
+  if ($new_friend_row['id'] == $user['id']) {
     unset($new_friend_row);
     throw new exception('buddy_err_adding_self', ERR_ERROR);
   }
 
   // Checking for user name & request text - in case if it was request to adding new request
-  if(isset($new_friend_row['id']) && ($new_request_text = sys_get_param_str('request_text'))) {
+  if (isset($new_friend_row['id']) && ($new_request_text = sys_get_param_str('request_text'))) {
     $check_relation = db_buddy_check_relation($user, $new_friend_row);
-    if(isset($check_relation['BUDDY_ID'])) {
+    if (isset($check_relation['BUDDY_ID'])) {
       throw new exception('buddy_err_adding_exists', ERR_WARNING);
     }
 
@@ -113,7 +113,7 @@ 
     sn_db_transaction_commit();
     throw new exception('buddy_err_adding_none', ERR_NONE);
   }
-} catch(Exception $e) {
+} catch (Exception $e) {
   $result[] = array(
     'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
     'MESSAGE' => $lang[$e->getMessage()],
@@ -123,7 +123,7 @@ 
 sn_db_transaction_rollback();
 
 $query = db_buddy_list_by_user($user['id']);
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $row['BUDDY_REQUEST'] = sys_bbcodeParse($row['BUDDY_REQUEST']);
 
   $row['BUDDY_ACTIVE'] = $row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE;