Completed
Branch work-fleets (4d76fa)
by SuperNova.WS
05:23
created
includes/functions/sys_bbcode.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -107,23 +107,23 @@
 block discarded – undo
107 107
 
108 108
   !empty($config->url_faq) ? $msg = str_replace('faq://', $config->url_faq, $msg) : false;
109 109
 
110
-  foreach($supernova->design['bbcodes'] as $auth_level => $replaces) {
111
-    if($auth_level > $author_auth) {
110
+  foreach ($supernova->design['bbcodes'] as $auth_level => $replaces) {
111
+    if ($auth_level > $author_auth) {
112 112
       continue;
113 113
     }
114 114
 
115
-    foreach($replaces as $key => $html) {
116
-      $msg = preg_replace(''.$key.'', $html, $msg);
115
+    foreach ($replaces as $key => $html) {
116
+      $msg = preg_replace('' . $key . '', $html, $msg);
117 117
     }
118 118
   }
119 119
 
120
-  foreach($supernova->design['smiles'] as $auth_level => $replaces) {
121
-    if($auth_level > $author_auth) {
120
+  foreach ($supernova->design['smiles'] as $auth_level => $replaces) {
121
+    if ($auth_level > $author_auth) {
122 122
       continue;
123 123
     }
124 124
 
125
-    foreach($replaces as $key => $imgName) {
126
-      $msg = preg_replace("#" . addcslashes($key, '()[]{}') . "#isU","<img src=\"design/images/smileys/".$imgName.".gif\" align=\"absmiddle\" title=\"".$key."\" alt=\"".$key."\">",$msg);
125
+    foreach ($replaces as $key => $imgName) {
126
+      $msg = preg_replace("#" . addcslashes($key, '()[]{}') . "#isU", "<img src=\"design/images/smileys/" . $imgName . ".gif\" align=\"absmiddle\" title=\"" . $key . "\" alt=\"" . $key . "\">", $msg);
127 127
     }
128 128
   }
129 129
 
Please login to merge, or discard this patch.
captcha.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -2,16 +2,16 @@
 block discarded – undo
2 2
 // Captcha code for registration - really didn't work alot :(
3 3
 
4 4
 session_start();
5
-$en=100;
6
-$boy=25;
7
-$sayi = mt_rand(0,9999999);
5
+$en = 100;
6
+$boy = 25;
7
+$sayi = mt_rand(0, 9999999);
8 8
 $_SESSION['captcha'] = $sayi;
9
-$tuval = imagecreatetruecolor($en,$boy);
10
-$b = imagecolorallocate($tuval,175,238,238);
11
-$s = imagecolorallocate($tuval,0,0,0);
12
-imagefill($tuval,0,0,$s);
13
-imageline($tuval,20,50,$en,$boy,$b);
14
-imagestring($tuval,3,27,7,$sayi,$b);
9
+$tuval = imagecreatetruecolor($en, $boy);
10
+$b = imagecolorallocate($tuval, 175, 238, 238);
11
+$s = imagecolorallocate($tuval, 0, 0, 0);
12
+imagefill($tuval, 0, 0, $s);
13
+imageline($tuval, 20, 50, $en, $boy, $b);
14
+imagestring($tuval, 3, 27, 7, $sayi, $b);
15 15
 Header("content-type:image/gif");
16 16
 imagegif($tuval);
17 17
 imagedestroy($tuval);
Please login to merge, or discard this patch.
quest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,8 +7,8 @@
 block discarded – undo
7 7
  *
8 8
  */
9 9
 
10
-define('INSIDE'  , true);
11
-define('INSTALL' , false);
10
+define('INSIDE', true);
11
+define('INSTALL', false);
12 12
 
13 13
 require('common.' . substr(strrchr(__FILE__, '.'), 1));
14 14
 
Please login to merge, or discard this patch.
login.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
 
16 16
 include('includes/init.' . substr(strrchr(__FILE__, '.'), 1));
17 17
 // die();
18
-if($template_result[F_USER_IS_AUTHORIZED]) {
18
+if ($template_result[F_USER_IS_AUTHORIZED]) {
19 19
   sys_redirect('index' . DOT_PHP_EX);
20 20
 }
21 21
 lng_include('login');
Please login to merge, or discard this patch.
market.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 $newstock = $stock;
27 27
 $intError = MARKET_DEAL;
28 28
 
29
-switch($mode)
29
+switch ($mode)
30 30
 {
31 31
   case MARKET_RESOURCES: // Resource trader
32 32
     require('includes/includes/market_trader.inc');
@@ -82,12 +82,12 @@  discard block
 block discarded – undo
82 82
 }
83 83
 
84 84
 $message_id = sys_get_param_int('message');
85
-if($message_id != MARKET_NOTHING)
85
+if ($message_id != MARKET_NOTHING)
86 86
 {
87 87
   $template->assign_block_vars('result', array('MESSAGE' => $lang['eco_mrk_errors'][$message_id]));
88 88
 }
89 89
 
90
-if($message)
90
+if ($message)
91 91
 {
92 92
   $template->assign_block_vars('result', array('MESSAGE' => $message));
93 93
 }
Please login to merge, or discard this patch.
language/en/system.mo.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -961,7 +961,7 @@
 block discarded – undo
961 961
     REGISTER_ERROR_USERNAME_WRONG => 'Некорректное имя игрока',
962 962
     REGISTER_ERROR_ACCOUNT_NAME_EXISTS => 'Имя учётной записи уже занято. Попробуйте войти с этим именем и вашим паролем или воспользоваться сбросом пароля',
963 963
     REGISTER_ERROR_PASSWORD_INSECURE => 'Неправильный пароль. Пароль должен состоять минимум из ' . PASSWORD_LENGTH_MIN . ' символов',
964
-    REGISTER_ERROR_USERNAME_SHORT => 'Слишком короткое имя. Имя должно состоять минимум из ' . LOGIN_LENGTH_MIN. ' символов',
964
+    REGISTER_ERROR_USERNAME_SHORT => 'Слишком короткое имя. Имя должно состоять минимум из ' . LOGIN_LENGTH_MIN . ' символов',
965 965
     REGISTER_ERROR_PASSWORD_DIFFERENT => 'Пароль и проверочный пароль не совпадают. Проверьте правильность ввода',
966 966
     REGISTER_ERROR_EMAIL_EMPTY => 'Е-Мейл не может быть пустым',
967 967
     REGISTER_ERROR_EMAIL_WRONG => 'Введенный Е-Мейл не является допустимым адресом электронной почты. Проверьте написание Е-Мейла или используйте другой адрес почтового ящика',
Please login to merge, or discard this patch.
common.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -12,25 +12,25 @@  discard block
 block discarded – undo
12 12
 global $debug, $sn_mvc, $template_result, $user;
13 13
 
14 14
 // Напоминание для Администрации, что игра отключена
15
-if($template_result[F_GAME_DISABLE]) {
15
+if ($template_result[F_GAME_DISABLE]) {
16 16
   // $disable_reason = sys_bbcodeParse($config->game_disable_reason); // Должна быть инициализирована выше по коду - в init.php
17 17
   echo '<div class="global_admin_warning">', $template_result[F_GAME_DISABLE_REASON], '</div>';
18 18
 }
19 19
 unset($disable_reason);
20 20
 
21 21
 
22
-if(defined('IN_ADMIN') && IN_ADMIN === true) {
22
+if (defined('IN_ADMIN') && IN_ADMIN === true) {
23 23
   lng_include('admin');
24
-} elseif($sys_user_logged_in) {
24
+} elseif ($sys_user_logged_in) {
25 25
   sys_user_vacation($user);
26 26
 
27 27
   $planet_id = SetSelectedPlanet($user);
28 28
 
29 29
   // TODO НЕ НУЖНО АЛЬЯНС КАЖДЫЙ РАЗ ОБНОВЛЯТЬ!!!
30
-  if($user['ally_id']) {
30
+  if ($user['ally_id']) {
31 31
     sn_db_transaction_start();
32 32
     sn_ali_fill_user_ally($user);
33
-    if(!$user['ally']['player']['id']) {
33
+    if (!$user['ally']['player']['id']) {
34 34
       // sn_sys_logout(false, true);
35 35
       // core_auth::logout(false);
36 36
       classSupernova::$auth->logout(false);
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
   sn_db_transaction_commit();
50 50
 
51 51
   $planetrow = $global_data['planet'];
52
-  if(!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
52
+  if (!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
53 53
     // sn_sys_logout(false, true);
54 54
     // core_auth::logout(false);
55 55
     classSupernova::$auth->logout(false);
Please login to merge, or discard this patch.
banned.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 
21 21
 $query = db_banned_list_select();
22 22
 $i = 0;
23
-while($ban_row = db_fetch($query)) {
23
+while ($ban_row = db_fetch($query)) {
24 24
   $template->assign_block_vars('banlist', array(
25 25
     'USER_NAME'   => $ban_row['ban_user_name'],
26 26
     'REASON'      => $ban_row['ban_reason'],
Please login to merge, or discard this patch.
buddy.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -17,32 +17,32 @@  discard block
 block discarded – undo
17 17
 try {
18 18
   sn_db_transaction_start();
19 19
 
20
-  if($buddy_id = sys_get_param_id('buddy_id')) {
20
+  if ($buddy_id = sys_get_param_id('buddy_id')) {
21 21
     $buddy_row = db_buddy_get_row($buddy_id);
22
-    if(!is_array($buddy_row)) {
22
+    if (!is_array($buddy_row)) {
23 23
       throw new exception('buddy_err_not_exist', ERR_ERROR);
24 24
     }
25 25
 
26
-    switch($mode = sys_get_param_str('mode')) {
26
+    switch ($mode = sys_get_param_str('mode')) {
27 27
       case 'accept':
28
-        if($buddy_row['BUDDY_SENDER_ID'] == $user['id']) {
28
+        if ($buddy_row['BUDDY_SENDER_ID'] == $user['id']) {
29 29
           throw new exception('buddy_err_accept_own', ERR_ERROR);
30 30
         }
31 31
 
32
-        if($buddy_row['BUDDY_OWNER_ID'] != $user['id']) {
32
+        if ($buddy_row['BUDDY_OWNER_ID'] != $user['id']) {
33 33
           throw new exception('buddy_err_accept_alien', ERR_ERROR);
34 34
         }
35 35
 
36
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) {
36
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) {
37 37
           throw new exception('buddy_err_accept_already', ERR_WARNING);
38 38
         }
39 39
 
40
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_DENIED) {
40
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_DENIED) {
41 41
           throw new exception('buddy_err_accept_denied', ERR_ERROR);
42 42
         }
43 43
 
44 44
         db_buddy_update_status($buddy_id, BUDDY_REQUEST_ACTIVE);
45
-        if(classSupernova::$db->db_affected_rows()) {
45
+        if (classSupernova::$db->db_affected_rows()) {
46 46
           msg_send_simple_message($buddy_row['BUDDY_SENDER_ID'], $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_accept_title'],
47 47
             sprintf($lang['buddy_msg_accept_text'], $user['username']));
48 48
           sn_db_transaction_commit();
@@ -53,11 +53,11 @@  discard block
 block discarded – undo
53 53
       break;
54 54
 
55 55
       case 'delete':
56
-        if($buddy_row['BUDDY_SENDER_ID'] != $user['id'] && $buddy_row['BUDDY_OWNER_ID'] != $user['id']) {
56
+        if ($buddy_row['BUDDY_SENDER_ID'] != $user['id'] && $buddy_row['BUDDY_OWNER_ID'] != $user['id']) {
57 57
           throw new exception('buddy_err_delete_alien', ERR_ERROR);
58 58
         }
59 59
 
60
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) // Existing friendship
60
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) // Existing friendship
61 61
         {
62 62
           $ex_friend_id = $buddy_row['BUDDY_SENDER_ID'] == $user['id'] ? $buddy_row['BUDDY_OWNER_ID'] : $buddy_row['BUDDY_SENDER_ID'];
63 63
 
@@ -67,12 +67,12 @@  discard block
 block discarded – undo
67 67
           db_buddy_delete($buddy_id);
68 68
           sn_db_transaction_commit();
69 69
           throw new exception('buddy_err_unfriend_none', ERR_NONE);
70
-        } elseif($buddy_row['BUDDY_SENDER_ID'] == $user['id']) // Player's outcoming request - either denied or waiting
70
+        } elseif ($buddy_row['BUDDY_SENDER_ID'] == $user['id']) // Player's outcoming request - either denied or waiting
71 71
         {
72 72
           db_buddy_delete($buddy_id);
73 73
           sn_db_transaction_commit();
74 74
           throw new exception('buddy_err_delete_own', ERR_NONE);
75
-        } elseif($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) // Deny incoming request
75
+        } elseif ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) // Deny incoming request
76 76
         {
77 77
           msg_send_simple_message($buddy_row['BUDDY_SENDER_ID'], $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_deny_title'],
78 78
             sprintf($lang['buddy_msg_deny_text'], $user['username']));
@@ -87,22 +87,22 @@  discard block
 block discarded – undo
87 87
 
88 88
   // New request?
89 89
   // Checking for user ID - in case if it was request from outside buddy system
90
-  if($new_friend_id = sys_get_param_id('request_user_id')) {
90
+  if ($new_friend_id = sys_get_param_id('request_user_id')) {
91 91
     $new_friend_row = db_user_by_id($new_friend_id, true, '`id`, `username`');
92
-  } elseif($new_friend_name = sys_get_param_str_unsafe('request_user_name')) {
92
+  } elseif ($new_friend_name = sys_get_param_str_unsafe('request_user_name')) {
93 93
     $new_friend_row = db_user_by_username($new_friend_name, true, '`id`, `username`');
94 94
     $new_friend_name = db_escape($new_friend_name);
95 95
   }
96 96
 
97
-  if($new_friend_row['id'] == $user['id']) {
97
+  if ($new_friend_row['id'] == $user['id']) {
98 98
     unset($new_friend_row);
99 99
     throw new exception('buddy_err_adding_self', ERR_ERROR);
100 100
   }
101 101
 
102 102
   // Checking for user name & request text - in case if it was request to adding new request
103
-  if(isset($new_friend_row['id']) && ($new_request_text = sys_get_param_str('request_text'))) {
103
+  if (isset($new_friend_row['id']) && ($new_request_text = sys_get_param_str('request_text'))) {
104 104
     $check_relation = db_buddy_check_relation($user, $new_friend_row);
105
-    if(isset($check_relation['BUDDY_ID'])) {
105
+    if (isset($check_relation['BUDDY_ID'])) {
106 106
       throw new exception('buddy_err_adding_exists', ERR_WARNING);
107 107
     }
108 108
 
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
     sn_db_transaction_commit();
114 114
     throw new exception('buddy_err_adding_none', ERR_NONE);
115 115
   }
116
-} catch(Exception $e) {
116
+} catch (Exception $e) {
117 117
   $result[] = array(
118 118
     'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
119 119
     'MESSAGE' => $lang[$e->getMessage()],
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 sn_db_transaction_rollback();
124 124
 
125 125
 $query = db_buddy_list_by_user($user['id']);
126
-while($row = db_fetch($query)) {
126
+while ($row = db_fetch($query)) {
127 127
   $row['BUDDY_REQUEST'] = sys_bbcodeParse($row['BUDDY_REQUEST']);
128 128
 
129 129
   $row['BUDDY_ACTIVE'] = $row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE;
Please login to merge, or discard this patch.