Test Failed
Push — trunk ( b76cfb...dfde47 )
by SuperNova.WS
03:49
created
includes/alliance/ali_internal_admin_diplomacy.inc 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 use Alliance\DBStaticAlly;
4 4
 use \DBAL\DbQuery;
5 5
 
6
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
6
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
7 7
 {
8 8
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
9 9
 }
@@ -18,28 +18,28 @@  discard block
 block discarded – undo
18 18
 $ally_name_safe = SN::$db->db_escape($user['ally_name']);
19 19
 
20 20
 $autoAccept = false;
21
-if(sys_get_param_str('ali_dip_offer_make'))
21
+if (sys_get_param_str('ali_dip_offer_make'))
22 22
 {
23 23
   $alliance_negotiation_relation = sys_get_param_str('alliance_negotiation_relation');
24
-  if(!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list))
24
+  if (!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list))
25 25
   {
26 26
     SnTemplate::messageBox($lang['ali_dip_err_wrong_offer'], $page_title);
27 27
   }
28 28
 
29 29
   $alliance_negotiation_contr_ally_id = sys_get_param_id('alliance_negotiation_contr_ally_id');
30
-  if($alliance_negotiation_contr_ally_id == $user['ally_id'])
30
+  if ($alliance_negotiation_contr_ally_id == $user['ally_id'])
31 31
   {
32 32
     SnTemplate::messageBox($lang['ali_dip_err_same_ally'], $page_title);
33 33
   }
34 34
 
35 35
   $contr_ally_row = doquery("SELECT `ally_name` FROM {{alliance}} WHERE `id` = {$alliance_negotiation_contr_ally_id} LIMIT 1;", '', true);
36
-  if(!$contr_ally_row)
36
+  if (!$contr_ally_row)
37 37
   {
38 38
     SnTemplate::messageBox($lang['ali_dip_err_no_ally'], $page_title);
39 39
   }
40 40
 
41 41
   $relation_current_id = ali_relation($user['ally_id'], $alliance_negotiation_contr_ally_id);
42
-  if($alliance_negotiation_relation == $relation_current_id)
42
+  if ($alliance_negotiation_relation == $relation_current_id)
43 43
   {
44 44
     SnTemplate::messageBox(sprintf($lang['ali_dip_err_offer_same'], $lang['ali_dip_relations'][$alliance_negotiation_relation]), $page_title);
45 45
   }
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 
52 52
   $relation_new = $sn_diplomacy_relation_list[$alliance_negotiation_relation];
53 53
   $relation_current = $sn_diplomacy_relation_list[$relation_current_id];
54
-  if($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1)
54
+  if ($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1)
55 55
   {
56 56
     DbQuery::build()
57 57
       ->setTable('alliance_negotiation')
@@ -85,39 +85,39 @@  discard block
 block discarded – undo
85 85
 else
86 86
 {
87 87
   $offer_id = sys_get_param_id('offer_id');
88
-  if($offer_id)
88
+  if ($offer_id)
89 89
   {
90 90
     $offer_answer = sys_get_param_str('answer');
91 91
 
92 92
     $negotiation = doquery("SELECT * FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;", '', true);
93
-    if(!$negotiation)
93
+    if (!$negotiation)
94 94
     {
95 95
       SnTemplate::messageBox($lang['ali_dip_err_offer_none'], $page_title);
96 96
     }
97
-    elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
97
+    elseif ($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
98 98
     {
99 99
       // TODO: Add log of hack attempt
100 100
       SnTemplate::messageBox($lang['ali_dip_err_offer_alien'], $page_title);
101 101
     }
102
-    elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
102
+    elseif ($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
103 103
     {
104
-      if($offer_answer == 'accept')
104
+      if ($offer_answer == 'accept')
105 105
       {
106 106
         // TODO: Add log of hack attempt
107 107
         SnTemplate::messageBox($lang['ali_dip_err_offer_accept_own'], $page_title);
108 108
       }
109
-      elseif($offer_answer == 'deny')
109
+      elseif ($offer_answer == 'deny')
110 110
       {
111 111
         doquery("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;");
112 112
       }
113 113
     }
114 114
     else
115 115
     {
116
-      if($offer_answer == 'accept')
116
+      if ($offer_answer == 'accept')
117 117
       {
118 118
         $accept_offer = true;
119 119
       }
120
-      elseif($offer_answer == 'deny')
120
+      elseif ($offer_answer == 'deny')
121 121
       {
122 122
         DBStaticAlly::db_ally_negotiation_update_status_1($offer_id);
123 123
       }
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
   }
126 126
 }
127 127
 
128
-if($accept_offer)
128
+if ($accept_offer)
129 129
 {
130 130
   SN::db_transaction_start();
131 131
 
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
   SN::db_transaction_commit();
186 186
 }
187 187
 
188
-foreach($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation)
188
+foreach ($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation)
189 189
 {
190 190
   $template->assign_block_vars('relation', array(
191 191
     'ID'   => $diplomacy_relation_id,
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 }
195 195
 
196 196
 $query = doquery("SELECT id, ally_name, ally_tag FROM {{alliance}} WHERE `id` != {$user['ally_id']} ORDER BY ally_name;");
197
-while($alliance = db_fetch($query))
197
+while ($alliance = db_fetch($query))
198 198
 {
199 199
   $template->assign_block_vars('alliance', array(
200 200
     'ID'   => $alliance['id'],
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
   WHERE
214 214
     alliance_negotiation_ally_id = {$user['ally_id']} OR alliance_negotiation_contr_ally_id = {$user['ally_id']};"
215 215
 );
216
-while($offer = db_fetch($query))
216
+while ($offer = db_fetch($query))
217 217
 {
218 218
   $template->assign_block_vars('offer', array(
219 219
     'ID'       => $offer['alliance_negotiation_id'],
Please login to merge, or discard this patch.
includes/alliance/ali_internal_admin.inc 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -3,26 +3,26 @@  discard block
 block discarded – undo
3 3
 use Alliance\DBStaticAlly;
4 4
 use Old\Avatar;
5 5
 
6
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
6
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
7 7
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
8 8
 }
9 9
 
10
-if(!$user_admin) {
10
+if (!$user_admin) {
11 11
   SnTemplate::messageBox($lang['Denied_access'], $lang['ally_admin']);
12 12
 }
13 13
 
14 14
 $template = SnTemplate::gettemplate('ali_admin', $template);
15 15
 
16 16
 $text_list = array(
17
-  1 => array ('db_field' => 'ally_description', 'text_type' => 'Public_text_of_alliance'),
18
-  2 => array ('db_field' => 'ally_text', 'text_type' => 'Internal_text'),
19
-  3 => array ('db_field' => 'ally_request', 'text_type' => 'Show_of_request_text'),
17
+  1 => array('db_field' => 'ally_description', 'text_type' => 'Public_text_of_alliance'),
18
+  2 => array('db_field' => 'ally_text', 'text_type' => 'Internal_text'),
19
+  3 => array('db_field' => 'ally_request', 'text_type' => 'Show_of_request_text'),
20 20
 );
21 21
 
22 22
 $allyTextID = sys_get_param_int('t', 1);
23
-$allyTextID = ($allyTextID<1 || $allyTextID>3) ? 1 : $allyTextID;
23
+$allyTextID = ($allyTextID < 1 || $allyTextID > 3) ? 1 : $allyTextID;
24 24
 
25
-if(sys_get_param_str('isSaveOptions')) {
25
+if (sys_get_param_str('isSaveOptions')) {
26 26
   $new_image = $ally['ally_image'];
27 27
   $avatar_upload_result = Avatar::sys_avatar_upload($ally['id'], $new_image, 'ally');
28 28
   $template->assign_vars([
@@ -31,32 +31,32 @@  discard block
 block discarded – undo
31 31
   ]);
32 32
 
33 33
   $ally_changeset = array();
34
-  if(($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) && $new_tag != $ally['ally_tag']) {
34
+  if (($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) && $new_tag != $ally['ally_tag']) {
35 35
     $new_tag_unsafe = $new_tag;
36 36
     $new_tag = SN::$db->db_escape($new_tag);
37 37
     $isTaggedAllyExists = DBStaticAlly::db_ally_get_by_tag($new_tag);
38
-    if(!empty($isTaggedAllyExists)) {
38
+    if (!empty($isTaggedAllyExists)) {
39 39
       SnTemplate::messageBox(sprintf($lang['ally_message_tag_exists'], $new_tag_unsafe), '', 'alliance.php?mode=admin&edit=ally');
40 40
     }
41 41
     $ally_changeset[] = "`ally_tag`='{$new_tag}'";
42 42
     db_user_set_by_id($ally['ally_user_id'], "`username`='[{$new_tag}]'");
43 43
   }
44 44
 
45
-  if(($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) && $new_name != $ally['ally_name']) {
45
+  if (($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) && $new_name != $ally['ally_name']) {
46 46
     $new_name_unsafe = $new_name;
47 47
     $new_name = SN::$db->db_escape($new_name);
48 48
     $isTaggedAllyExists = DBStaticAlly::db_ally_get_by_name($new_name);
49
-    if(!empty($isTaggedAllyExists)) {
49
+    if (!empty($isTaggedAllyExists)) {
50 50
       SnTemplate::messageBox(sprintf($lang['ally_message_name_exists'], $new_name_unsafe), '', 'alliance.php?mode=admin&edit=ally');
51 51
     }
52 52
     $ally_changeset[] = "`ally_name`='{$new_name}'";
53 53
   }
54 54
 
55
-  if(($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) && $new_owner_rank != $ally['ally_owner_range']) {
55
+  if (($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) && $new_owner_rank != $ally['ally_owner_range']) {
56 56
     $new_owner_rank = SN::$db->db_escape($new_owner_rank);
57 57
     $ally_changeset[] = "`ally_owner_range` = '{$new_owner_rank}'";
58 58
   }
59
-  if(($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) && $new_web != $ally['ally_web']) {
59
+  if (($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) && $new_web != $ally['ally_web']) {
60 60
     $new_web = SN::$db->db_escape($new_web);
61 61
     $ally_changeset[] = "`ally_web` = '{$new_web}'";
62 62
   }
@@ -65,31 +65,31 @@  discard block
 block discarded – undo
65 65
 //  if(($new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow'])) && $new_request != $ally['ally_request_notallow']) {
66 66
 //    $ally_changeset[] = "`ally_request_notallow` = '{$new_request}'";
67 67
 //  }
68
-  if($new_image != $ally['ally_image']) {
68
+  if ($new_image != $ally['ally_image']) {
69 69
     $new_image = intval($new_image);
70 70
     $ally_changeset[] = "`ally_image` = '{$new_image}'";
71 71
   }
72 72
 
73
-  if(!empty($ally_changeset)) {
73
+  if (!empty($ally_changeset)) {
74 74
     doquery("UPDATE {{alliance}} SET " . implode(',', $ally_changeset) . " WHERE `id`='{$ally['id']}' LIMIT 1;");
75 75
     sys_redirect('alliance.php?mode=admin&edit=ally');
76 76
   }
77 77
 }
78
-elseif(sys_get_param_str('isSaveText'))
78
+elseif (sys_get_param_str('isSaveText'))
79 79
 {
80 80
   $text = sys_get_param_str_both('text');
81 81
   doquery("UPDATE {{alliance}} SET `{$text_list[$allyTextID]['db_field']}`='{$text['safe']}' WHERE `id`='{$ally['id']}';");
82 82
   $ally[$text_list[$allyTextID]['db_field']] = $text['unsafe'];
83 83
 }
84
-elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader'))
84
+elseif (sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader'))
85 85
 {
86
-  if(!$isAllyOwner)
86
+  if (!$isAllyOwner)
87 87
   {
88 88
     SnTemplate::messageBox($lang['Denied_access'], $lang['ally_admin']);
89 89
   }
90 90
 
91 91
   $newLeader = db_user_by_id($idNewLeader, false, `ally_id`);
92
-  if($newLeader['ally_id'] == $user['ally_id'])
92
+  if ($newLeader['ally_id'] == $user['ally_id'])
93 93
   {
94 94
     SN::db_transaction_start();
95 95
     db_user_set_by_id($user['id'], "`ally_rank_id`='0'");
@@ -99,9 +99,9 @@  discard block
 block discarded – undo
99 99
     sys_redirect('alliance.php');
100 100
   }
101 101
 }
102
-elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband'))
102
+elseif (sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband'))
103 103
 {
104
-  if(!$isAllyOwner)
104
+  if (!$isAllyOwner)
105 105
   {
106 106
     SnTemplate::messageBox($lang['Denied_access'], $lang['ally_admin']);
107 107
   }
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
   'ally_name' => htmlspecialchars($ally['ally_name']),
125 125
   'ally_tag' => htmlspecialchars($ally['ally_tag']),
126 126
   'ally_web' => htmlspecialchars($ally['ally_web']),
127
-  'ally_request_notallow_0' => (( $ally['ally_request_notallow']) ? ' SELECTED' : ''),
127
+  'ally_request_notallow_0' => (($ally['ally_request_notallow']) ? ' SELECTED' : ''),
128 128
   'ally_request_notallow_1' => ((!$ally['ally_request_notallow']) ? ' SELECTED' : ''),
129 129
   'ally_owner_range' => htmlspecialchars($ally['ally_owner_range']),
130 130
   'hideNotOwner' => $ally['ally_owner'] != $user['id'] ? 'display: hide;' : '',
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 {
134 134
   $userAllyAdmins = db_user_list("`ally_id`= {$ally['id']}", false, '`id`, `username`');
135 135
   unset($tmp);
136
-  foreach($userAllyAdmins as $userAllyAdmin)
136
+  foreach ($userAllyAdmins as $userAllyAdmin)
137 137
   {
138 138
     $tmp .= "<option value={$userAllyAdmin['id']}>{$userAllyAdmin['username']}</option>";
139 139
   }
@@ -141,9 +141,9 @@  discard block
 block discarded – undo
141 141
   $template->assign_var('adminMembers', $tmp);
142 142
 }
143 143
 
144
-foreach($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale)
144
+foreach ($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale)
145 145
 {
146
-  if(!$sn_ali_admin_action_locale['title'])
146
+  if (!$sn_ali_admin_action_locale['title'])
147 147
   {
148 148
     continue;
149 149
   }
Please login to merge, or discard this patch.
includes/alliance/ali_internal_admin_request.inc 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 use Alliance\DBStaticAlly;
4 4
 
5
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
5
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
6 6
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
7 7
 }
8 8
 
@@ -11,12 +11,12 @@  discard block
 block discarded – undo
11 11
 }
12 12
 
13 13
 $d = sys_get_param_id('d');
14
-if($d) {
14
+if ($d) {
15 15
   doquery("UPDATE {{alliance_requests}} SET `request_denied` = 1, `request_text` = '{$lang['ali_req_deny_reason']}' WHERE `id_user`= {$d} LIMIT 1;");
16 16
 }
17 17
 
18 18
 $id_user = sys_get_param_id('id_user');
19
-if($id_user) {
19
+if ($id_user) {
20 20
   $ally_name_safe = SN::$db->db_escape($ally['ally_name']);
21 21
   $ally_tag_safe = SN::$db->db_escape($ally['ally_tag']);
22 22
   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");
Please login to merge, or discard this patch.
includes/general/general_urlAndHttp.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -116,11 +116,11 @@
 block discarded – undo
116 116
   );
117 117
 
118 118
   // Quick hack to support IPv6 at least on local host
119
-  if($ip['ip'] == '::1') {
119
+  if ($ip['ip'] == '::1') {
120 120
     $ip['ip'] = '127.0.0.1';
121 121
   }
122 122
 
123
-  foreach($ip as &$val) {
123
+  foreach ($ip as &$val) {
124 124
     $val = SN::$db->db_escape($val);
125 125
   }
126 126
 
Please login to merge, or discard this patch.
includes/constants/constants.php 1 patch
Spacing   +234 added lines, -234 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if(defined('__SN_CONSTANTS_DEFINED') && __SN_CONSTANTS_DEFINED === true) {
3
+if (defined('__SN_CONSTANTS_DEFINED') && __SN_CONSTANTS_DEFINED === true) {
4 4
   return;
5 5
 }
6 6
 
@@ -51,8 +51,8 @@  discard block
 block discarded – undo
51 51
 
52 52
 // Game type constants starts with GAME_
53 53
 define('GAME_SUPERNOVA', 0);
54
-define('GAME_OGAME'    , 1);
55
-define('GAME_BLITZ'    , 2);
54
+define('GAME_OGAME', 1);
55
+define('GAME_BLITZ', 2);
56 56
 
57 57
 // Date & time range constants
58 58
 define('DATE_FOREVER', 2000000000);
@@ -65,16 +65,16 @@  discard block
 block discarded – undo
65 65
 define('PERIOD_YEAR', PERIOD_DAY * 365);
66 66
 define('PERIOD_FOREVER', PERIOD_YEAR * 100);
67 67
 
68
-define('PERIOD_MINUTE_2' , PERIOD_MINUTE * 2);
69
-define('PERIOD_MINUTE_3' , PERIOD_MINUTE * 3);
70
-define('PERIOD_MINUTE_5' , PERIOD_MINUTE * 5);
68
+define('PERIOD_MINUTE_2', PERIOD_MINUTE * 2);
69
+define('PERIOD_MINUTE_3', PERIOD_MINUTE * 3);
70
+define('PERIOD_MINUTE_5', PERIOD_MINUTE * 5);
71 71
 define('PERIOD_MINUTE_10', PERIOD_MINUTE * 10);
72 72
 define('PERIOD_MINUTE_15', PERIOD_MINUTE * 15);
73
-define('PERIOD_DAY_3'    , PERIOD_DAY * 3);
74
-define('PERIOD_WEEK_2'   , PERIOD_WEEK * 2);
75
-define('PERIOD_WEEK_4'   , PERIOD_WEEK * 4);
76
-define('PERIOD_MONTH_2'  , PERIOD_MONTH * 2);
77
-define('PERIOD_MONTH_3'  , PERIOD_MONTH * 3);
73
+define('PERIOD_DAY_3', PERIOD_DAY * 3);
74
+define('PERIOD_WEEK_2', PERIOD_WEEK * 2);
75
+define('PERIOD_WEEK_4', PERIOD_WEEK * 4);
76
+define('PERIOD_MONTH_2', PERIOD_MONTH * 2);
77
+define('PERIOD_MONTH_3', PERIOD_MONTH * 3);
78 78
 
79 79
 define('FONT_SIZE_PERCENT_MIN', 56.25);
80 80
 define('FONT_SIZE_PERCENT_DEFAULT', 68.75);
@@ -92,11 +92,11 @@  discard block
 block discarded – undo
92 92
 define('DEFAULT_PICTURE_EXTENSION_DOTTED', '.jpg');
93 93
 
94 94
 // Operation error status HARDCODED!
95
-define('ERR_NONE'               , 0); // No error
96
-define('ERR_WARNING'            , 1); // There is warning - something altering normal operation process
97
-define('ERR_ERROR'              , 2); // There is error - something permits operation from process
98
-define('ERR_HACK'               , 4); // Operation is qualified as hack attempt
99
-define('ERR_NOTICE'             , 8); // There is notice - nothing really critical but operator should know
95
+define('ERR_NONE', 0); // No error
96
+define('ERR_WARNING', 1); // There is warning - something altering normal operation process
97
+define('ERR_ERROR', 2); // There is error - something permits operation from process
98
+define('ERR_HACK', 4); // Operation is qualified as hack attempt
99
+define('ERR_NOTICE', 8); // There is notice - nothing really critical but operator should know
100 100
 // New GLOBAL operation results
101 101
 //define('RESULT_DEFAULT' , 0); // Default result - all went OK or result really doesn't matter
102 102
 //define('RESULT_WARNING' , 1);
@@ -143,38 +143,38 @@  discard block
 block discarded – undo
143 143
 
144 144
 // Mot qui sont interdit a la saisie !
145 145
 global $ListCensure;
146
-$ListCensure = array ( '/</', '/>/', '/script/i', '/doquery/i', '/http/i', '/javascript/i');
146
+$ListCensure = array('/</', '/>/', '/script/i', '/doquery/i', '/http/i', '/javascript/i');
147 147
 
148 148
 // Confirmation record types
149
-define('CONFIRM_REGISTRATION'  , 1);
149
+define('CONFIRM_REGISTRATION', 1);
150 150
 define('CONFIRM_PASSWORD_RESET', 2);
151
-define('CONFIRM_DELETE'        , 3);
151
+define('CONFIRM_DELETE', 3);
152 152
 
153 153
 define('AFFILIATE_MM_TO_REFERRAL_DM', 2);
154 154
 
155 155
 // Ally diplomacy statuses
156
-define('ALLY_DIPLOMACY_SELF'         , 'self');
157
-define('ALLY_DIPLOMACY_NEUTRAL'      , 'neutral');
158
-define('ALLY_DIPLOMACY_WAR'          , 'war');
159
-define('ALLY_DIPLOMACY_PEACE'        , 'peace');
156
+define('ALLY_DIPLOMACY_SELF', 'self');
157
+define('ALLY_DIPLOMACY_NEUTRAL', 'neutral');
158
+define('ALLY_DIPLOMACY_WAR', 'war');
159
+define('ALLY_DIPLOMACY_PEACE', 'peace');
160 160
 define('ALLY_DIPLOMACY_CONFEDERATION', 'confederation');
161
-define('ALLY_DIPLOMACY_FEDERATION'   , 'federation');
162
-define('ALLY_DIPLOMACY_UNION'        , 'union');
163
-define('ALLY_DIPLOMACY_MASTER'       , 'master');
164
-define('ALLY_DIPLOMACY_SLAVE'        , 'slave');
161
+define('ALLY_DIPLOMACY_FEDERATION', 'federation');
162
+define('ALLY_DIPLOMACY_UNION', 'union');
163
+define('ALLY_DIPLOMACY_MASTER', 'master');
164
+define('ALLY_DIPLOMACY_SLAVE', 'slave');
165 165
 
166 166
 define('ALLY_PROPOSE_SEND', 0);
167 167
 
168 168
 // Quest types
169
-define('QUEST_TYPE_BUILD'   , 1);
169
+define('QUEST_TYPE_BUILD', 1);
170 170
 define('QUEST_TYPE_RESEARCH', 2);
171
-define('QUEST_TYPE_COMBAT'  , 3);
171
+define('QUEST_TYPE_COMBAT', 3);
172 172
 
173
-define('QUEST_STATUS_EXCEPT_COMPLETE' , -2);
174
-define('QUEST_STATUS_ALL' , -1);
175
-define('QUEST_STATUS_NOT_STARTED' , 0);
176
-define('QUEST_STATUS_STARTED'     , 1);
177
-define('QUEST_STATUS_COMPLETE'    , 2);
173
+define('QUEST_STATUS_EXCEPT_COMPLETE', -2);
174
+define('QUEST_STATUS_ALL', -1);
175
+define('QUEST_STATUS_NOT_STARTED', 0);
176
+define('QUEST_STATUS_STARTED', 1);
177
+define('QUEST_STATUS_COMPLETE', 2);
178 178
 
179 179
 define('TYPE_EMPTY', '');
180 180
 define('TYPE_INTEGER', 'integer');
@@ -187,69 +187,69 @@  discard block
 block discarded – undo
187 187
 
188 188
 // *** Combat-related constants
189 189
 // *** Mission Type constants starts with MT_
190
-define('MT_NONE'     ,  0);
191
-define('MT_ATTACK'   ,  1);
192
-define('MT_AKS'      ,  2);
193
-define('MT_TRANSPORT',  3);
194
-define('MT_RELOCATE' ,  4);
195
-define('MT_HOLD'     ,  5);
196
-define('MT_SPY'      ,  6);
197
-define('MT_COLONIZE' ,  7);
198
-define('MT_RECYCLE'  ,  8);
199
-define('MT_DESTROY'  ,  9);
200
-define('MT_MISSILE'  , 10);
201
-define('MT_EXPLORE'  , 15);
190
+define('MT_NONE', 0);
191
+define('MT_ATTACK', 1);
192
+define('MT_AKS', 2);
193
+define('MT_TRANSPORT', 3);
194
+define('MT_RELOCATE', 4);
195
+define('MT_HOLD', 5);
196
+define('MT_SPY', 6);
197
+define('MT_COLONIZE', 7);
198
+define('MT_RECYCLE', 8);
199
+define('MT_DESTROY', 9);
200
+define('MT_MISSILE', 10);
201
+define('MT_EXPLORE', 15);
202 202
 
203 203
 // *** Planet Target constants starts with PT_
204 204
 define('PT_NONE', 0);
205 205
 define('PT_ALL', 0);
206 206
 define('PT_PLANET', 1);
207 207
 define('PT_DEBRIS', 2);
208
-define('PT_MOON'  , 3);
208
+define('PT_MOON', 3);
209 209
 
210 210
 // *** Unit locations - shows db table where unit belong
211 211
 // Also cache indexes
212 212
 define('LOC_AUTODETECT', -2);
213
-define('LOC_NONE',    -1); // Deprecated
213
+define('LOC_NONE', -1); // Deprecated
214 214
 define('LOC_UNIVERSE', 0);
215
-define('LOC_PLANET',   1);
216
-define('LOC_DEBRIS',   2); // Translates to `planets` table planet_type = 1, `debris_*` fields
217
-define('LOC_MOON',     3); // Translates to `planets` table planet_type = 3
218
-define('LOC_PLAYER',   4);
219
-define('LOC_USER',     LOC_PLAYER); // Deprecated alias for LOC_PLAYER
220
-define('LOC_FLEET',    5);
221
-define('LOC_ALLY',     6);
222
-define('LOC_SERVER',   7); // Located on server
215
+define('LOC_PLANET', 1);
216
+define('LOC_DEBRIS', 2); // Translates to `planets` table planet_type = 1, `debris_*` fields
217
+define('LOC_MOON', 3); // Translates to `planets` table planet_type = 3
218
+define('LOC_PLAYER', 4);
219
+define('LOC_USER', LOC_PLAYER); // Deprecated alias for LOC_PLAYER
220
+define('LOC_FLEET', 5);
221
+define('LOC_ALLY', 6);
222
+define('LOC_SERVER', 7); // Located on server
223 223
 
224 224
 // ТОЛЬКО ВНУТРЕНЕЕ!!!
225
-define('LOC_UNIT',    'LOC_UNIT');
226
-define('LOC_QUE',     'LOC_QUE');
227
-define('LOC_LOCATION','LOC_LOCATION');
228
-define('LOC_LOCKS','LOC_LOCKS');
225
+define('LOC_UNIT', 'LOC_UNIT');
226
+define('LOC_QUE', 'LOC_QUE');
227
+define('LOC_LOCATION', 'LOC_LOCATION');
228
+define('LOC_LOCKS', 'LOC_LOCKS');
229 229
 
230 230
 // *** Caching masks
231
-define('CACHE_NOTHING'    ,  0);
232
-define('CACHE_FLEET'      ,  1);
233
-define('CACHE_PLANET'     ,  2);
234
-define('CACHE_USER'       ,  4);
235
-define('CACHE_SOURCE'     ,  8);
231
+define('CACHE_NOTHING', 0);
232
+define('CACHE_FLEET', 1);
233
+define('CACHE_PLANET', 2);
234
+define('CACHE_USER', 4);
235
+define('CACHE_SOURCE', 8);
236 236
 define('CACHE_DESTINATION', 16);
237
-define('CACHE_EVENT'      , 32);
237
+define('CACHE_EVENT', 32);
238 238
 
239
-define('CACHE_USER_SRC'  , CACHE_USER | CACHE_SOURCE);
240
-define('CACHE_USER_DST'  , CACHE_USER | CACHE_DESTINATION);
239
+define('CACHE_USER_SRC', CACHE_USER | CACHE_SOURCE);
240
+define('CACHE_USER_DST', CACHE_USER | CACHE_DESTINATION);
241 241
 define('CACHE_PLANET_SRC', CACHE_PLANET | CACHE_SOURCE);
242 242
 define('CACHE_PLANET_DST', CACHE_PLANET | CACHE_DESTINATION);
243
-define('CACHE_COMBAT'    , CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION);
243
+define('CACHE_COMBAT', CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION);
244 244
 
245
-define('CACHE_ALL'       , CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION | CACHE_EVENT);
245
+define('CACHE_ALL', CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION | CACHE_EVENT);
246 246
 
247
-define('CACHE_NONE'      , CACHE_NOTHING); // Alias for me
247
+define('CACHE_NONE', CACHE_NOTHING); // Alias for me
248 248
 
249 249
 // *** Event types
250 250
 define('EVENT_FLEET_NONE', 0);
251 251
 define('EVENT_FLEET_ARRIVE', 1);
252
-define('EVENT_FLEET_STAY'  , 2);
252
+define('EVENT_FLEET_STAY', 2);
253 253
 define('EVENT_FLEET_RETURN', 3);
254 254
 
255 255
 
@@ -421,16 +421,16 @@  discard block
 block discarded – undo
421 421
 //define('F_DEVICE_ID',     'F_DEVICE_ID');
422 422
 //define('F_DEVICE_CYPHER', 'F_DEVICE_CYPHER');
423 423
 
424
-define('F_PROVIDER_ID',   'F_PROVIDER_ID');
424
+define('F_PROVIDER_ID', 'F_PROVIDER_ID');
425 425
 // define('F_PROVIDER_LIST', 'F_PROVIDER_LIST');
426 426
 
427 427
 define('F_IMPERSONATE_STATUS', 'F_IMPERSONATE_STATUS');
428 428
 define('F_IMPERSONATE_OPERATOR', 'F_IMPERSONATE_OPERATOR');
429 429
 
430
-define('F_LOGIN_STATUS',  'F_LOGIN_STATUS');
430
+define('F_LOGIN_STATUS', 'F_LOGIN_STATUS');
431 431
 define('F_LOGIN_MESSAGE', 'F_LOGIN_MESSAGE');
432 432
 
433
-define('F_PLAYER_REGISTER_STATUS',  'F_PLAYER_REGISTER_STATUS');
433
+define('F_PLAYER_REGISTER_STATUS', 'F_PLAYER_REGISTER_STATUS');
434 434
 define('F_PLAYER_REGISTER_MESSAGE', 'F_PLAYER_REGISTER_MESSAGE');
435 435
 
436 436
 define('F_USER_ID', 'F_USER_ID');
@@ -474,66 +474,66 @@  discard block
 block discarded – undo
474 474
 
475 475
 
476 476
 // Option groups
477
-define('OPT_ALL',      0);
478
-define('OPT_MESSAGE',  1);
477
+define('OPT_ALL', 0);
478
+define('OPT_MESSAGE', 1);
479 479
 define('OPT_UNIVERSE', 2);
480 480
 define('OPT_INTERFACE', 3);
481 481
 
482 482
 // Message classes
483
-define('MSG_TYPE_OUTBOX'   ,  -1);
484
-define('MSG_TYPE_SPY'      ,   0);
485
-define('MSG_TYPE_PLAYER'   ,   1);
486
-define('MSG_TYPE_ALLIANCE' ,   2);
487
-define('MSG_TYPE_COMBAT'   ,   3);
488
-define('MSG_TYPE_RECYCLE'  ,   4);
489
-define('MSG_TYPE_TRANSPORT',   5);
490
-define('MSG_TYPE_ADMIN'    ,   6);
491
-define('MSG_TYPE_EXPLORE'  ,  15);
492
-define('MSG_TYPE_QUE'      ,  99);
493
-define('MSG_TYPE_NEW'      , 100);
483
+define('MSG_TYPE_OUTBOX', -1);
484
+define('MSG_TYPE_SPY', 0);
485
+define('MSG_TYPE_PLAYER', 1);
486
+define('MSG_TYPE_ALLIANCE', 2);
487
+define('MSG_TYPE_COMBAT', 3);
488
+define('MSG_TYPE_RECYCLE', 4);
489
+define('MSG_TYPE_TRANSPORT', 5);
490
+define('MSG_TYPE_ADMIN', 6);
491
+define('MSG_TYPE_EXPLORE', 15);
492
+define('MSG_TYPE_QUE', 99);
493
+define('MSG_TYPE_NEW', 100);
494 494
 
495 495
 // Attack verification statuses
496
-define('ATTACK_ALLOWED'           ,  0);
497
-define('ATTACK_NO_TARGET'         ,  1);
498
-define('ATTACK_OWN'               ,  2);
499
-define('ATTACK_WRONG_MISSION'     ,  3);
500
-define('ATTACK_NO_ALLY_DEPOSIT'   ,  4);
501
-define('ATTACK_NO_DEBRIS'         ,  5);
502
-define('ATTACK_VACATION'          ,  6);
503
-define('ATTACK_SAME_IP'           ,  7);
504
-define('ATTACK_BUFFING'           ,  8);
505
-define('ATTACK_ADMIN'             ,  9);
506
-define('ATTACK_NOOB'              , 10);
507
-define('ATTACK_OWN_VACATION'      , 11);
508
-define('ATTACK_NO_SILO'           , 12);
509
-define('ATTACK_NO_MISSILE'        , 13);
510
-define('ATTACK_NO_FLEET'          , 14);
511
-define('ATTACK_NO_SLOTS'          , 15);
512
-define('ATTACK_NO_SHIPS'          , 16);
513
-define('ATTACK_NO_RECYCLERS'      , 17);
514
-define('ATTACK_NO_SPIES'          , 18);
515
-define('ATTACK_NO_COLONIZER'      , 19);
516
-define('ATTACK_MISSILE_TOO_FAR'   , 20);
517
-define('ATTACK_WRONG_STRUCTURE'   , 21);
518
-define('ATTACK_NO_FUEL'           , 22);
519
-define('ATTACK_NO_RESOURCES'      , 23);
520
-define('ATTACK_NO_ACS'            , 24);
521
-define('ATTACK_ACS_MISSTARGET'    , 25);
522
-define('ATTACK_WRONG_SPEED'       , 26);
523
-define('ATTACK_ACS_TOO_LATE'      , 27);
524
-define('ATTACK_BASHING'           , 28);
525
-define('ATTACK_BASHING_WAR_DELAY' , 29);
526
-define('ATTACK_ACS_WRONG_TARGET'  , 30);
527
-define('ATTACK_SAME'              , 31);
496
+define('ATTACK_ALLOWED', 0);
497
+define('ATTACK_NO_TARGET', 1);
498
+define('ATTACK_OWN', 2);
499
+define('ATTACK_WRONG_MISSION', 3);
500
+define('ATTACK_NO_ALLY_DEPOSIT', 4);
501
+define('ATTACK_NO_DEBRIS', 5);
502
+define('ATTACK_VACATION', 6);
503
+define('ATTACK_SAME_IP', 7);
504
+define('ATTACK_BUFFING', 8);
505
+define('ATTACK_ADMIN', 9);
506
+define('ATTACK_NOOB', 10);
507
+define('ATTACK_OWN_VACATION', 11);
508
+define('ATTACK_NO_SILO', 12);
509
+define('ATTACK_NO_MISSILE', 13);
510
+define('ATTACK_NO_FLEET', 14);
511
+define('ATTACK_NO_SLOTS', 15);
512
+define('ATTACK_NO_SHIPS', 16);
513
+define('ATTACK_NO_RECYCLERS', 17);
514
+define('ATTACK_NO_SPIES', 18);
515
+define('ATTACK_NO_COLONIZER', 19);
516
+define('ATTACK_MISSILE_TOO_FAR', 20);
517
+define('ATTACK_WRONG_STRUCTURE', 21);
518
+define('ATTACK_NO_FUEL', 22);
519
+define('ATTACK_NO_RESOURCES', 23);
520
+define('ATTACK_NO_ACS', 24);
521
+define('ATTACK_ACS_MISSTARGET', 25);
522
+define('ATTACK_WRONG_SPEED', 26);
523
+define('ATTACK_ACS_TOO_LATE', 27);
524
+define('ATTACK_BASHING', 28);
525
+define('ATTACK_BASHING_WAR_DELAY', 29);
526
+define('ATTACK_ACS_WRONG_TARGET', 30);
527
+define('ATTACK_SAME', 31);
528 528
 define('ATTACK_RESOURCE_FORBIDDEN', 32);
529
-define('ATTACK_TRANSPORT_EMPTY'   , 33);
530
-define('ATTACK_SPIES_LONLY'       , 34);
531
-define('ATTACK_TOO_FAR'           , 35);
532
-define('ATTACK_OVERLOADED'        , 36);
533
-define('ATTACK_MISSION_ABSENT'    , 37);
534
-define('ATTACK_WRONG_UNIT'        , 38);
535
-define('ATTACK_ZERO_SPEED'        , 39);
536
-define('ATTACK_SHIP_COUNT_WRONG'  , 40);
529
+define('ATTACK_TRANSPORT_EMPTY', 33);
530
+define('ATTACK_SPIES_LONLY', 34);
531
+define('ATTACK_TOO_FAR', 35);
532
+define('ATTACK_OVERLOADED', 36);
533
+define('ATTACK_MISSION_ABSENT', 37);
534
+define('ATTACK_WRONG_UNIT', 38);
535
+define('ATTACK_ZERO_SPEED', 39);
536
+define('ATTACK_SHIP_COUNT_WRONG', 40);
537 537
 define('ATTACK_RESOURCE_COUNT_WRONG', 41);
538 538
 define('ATTACK_MORATORIUM', 42);
539 539
 define('ATTACK_CHILD_PROTECTION', 43);
@@ -541,12 +541,12 @@  discard block
 block discarded – undo
541 541
 
542 542
 
543 543
 // *** Races - Homeworlds
544
-define('RACE_NONE'    , 0);
545
-define('RACE_EARTH'   , 1);
546
-define('RACE_MOON'    , 2);
547
-define('RACE_MERCURY' , 3);
548
-define('RACE_VENUS'   , 4);
549
-define('RACE_MARS'    , 5);
544
+define('RACE_NONE', 0);
545
+define('RACE_EARTH', 1);
546
+define('RACE_MOON', 2);
547
+define('RACE_MERCURY', 3);
548
+define('RACE_VENUS', 4);
549
+define('RACE_MARS', 5);
550 550
 define('RACE_ASTEROID', 6);
551 551
 // define('MARKET_INFO'         , 7);
552 552
 
@@ -554,116 +554,116 @@  discard block
 block discarded – undo
554 554
 
555 555
 // *** Market variables
556 556
 // === Market blocks
557
-define('MARKET_ENTRY'        , 0);
558
-define('MARKET_RESOURCES'    , 1);
559
-define('MARKET_SCRAPPER'     , 2);
560
-define('MARKET_STOCKMAN'     , 3);
561
-define('MARKET_EXCHANGE'     , 4);
562
-define('MARKET_BANKER'       , 5);
563
-define('MARKET_PAWNSHOP'     , 6);
564
-define('MARKET_INFO'         , 7);
557
+define('MARKET_ENTRY', 0);
558
+define('MARKET_RESOURCES', 1);
559
+define('MARKET_SCRAPPER', 2);
560
+define('MARKET_STOCKMAN', 3);
561
+define('MARKET_EXCHANGE', 4);
562
+define('MARKET_BANKER', 5);
563
+define('MARKET_PAWNSHOP', 6);
564
+define('MARKET_INFO', 7);
565 565
 
566 566
 // === Market error statuses
567
-define('MARKET_NOTHING'              ,  0);
568
-define('MARKET_DEAL'                 ,  1);
569
-define('MARKET_DEAL_TRADE'           ,  2);
570
-define('MARKET_NO_DM'                ,  3);
571
-define('MARKET_NO_RESOURCES'         ,  4);
572
-define('MARKET_ZERO_DEAL'            ,  5);
573
-define('MARKET_NO_SHIPS'             ,  6);
574
-define('MARKET_NOT_A_SHIP'           ,  7);
575
-define('MARKET_NO_STOCK'             ,  8);
576
-define('MARKET_ZERO_RES_STOCK'       ,  9);
577
-define('MARKET_NEGATIVE_SHIPS'       , 10);
578
-
579
-define('MARKET_INFO_PLAYER'          , 12);
580
-define('MARKET_INFO_WRONG'           , 11);
567
+define('MARKET_NOTHING', 0);
568
+define('MARKET_DEAL', 1);
569
+define('MARKET_DEAL_TRADE', 2);
570
+define('MARKET_NO_DM', 3);
571
+define('MARKET_NO_RESOURCES', 4);
572
+define('MARKET_ZERO_DEAL', 5);
573
+define('MARKET_NO_SHIPS', 6);
574
+define('MARKET_NOT_A_SHIP', 7);
575
+define('MARKET_NO_STOCK', 8);
576
+define('MARKET_ZERO_RES_STOCK', 9);
577
+define('MARKET_NEGATIVE_SHIPS', 10);
578
+
579
+define('MARKET_INFO_PLAYER', 12);
580
+define('MARKET_INFO_WRONG', 11);
581 581
 define('MARKET_INFO_PLAYER_NOT_FOUND', 13);
582
-define('MARKET_INFO_PLAYER_WRONG'    , 14);
583
-define('MARKET_INFO_PLAYER_SAME'     , 15);
582
+define('MARKET_INFO_PLAYER_WRONG', 14);
583
+define('MARKET_INFO_PLAYER_SAME', 15);
584 584
 
585 585
 
586 586
 
587 587
 
588 588
 // *** Mercenary/talent bonus types
589
-define('BONUS_NONE'    ,            0);  // No bonus
590
-define('BONUS_PERCENT' ,            1);  // Percent on base value
591
-define('BONUS_ADD'     ,            2);  // Add
592
-define('BONUS_ABILITY' ,            3);  // Some ability
593
-define('BONUS_MULTIPLY',            4);  // Multiply by value
589
+define('BONUS_NONE', 0); // No bonus
590
+define('BONUS_PERCENT', 1); // Percent on base value
591
+define('BONUS_ADD', 2); // Add
592
+define('BONUS_ABILITY', 3); // Some ability
593
+define('BONUS_MULTIPLY', 4); // Multiply by value
594 594
 //define('BONUS_PERCENT_CUMULATIVE' , 5);  // Cumulative percent on base value
595 595
 //define('BONUS_PERCENT_DEGRADED' ,   6);  // Bonus amount degraded with increase as pow(bonus, level) (?)
596 596
 //define('BONUS_SPEED',               7);  // Speed bonus
597 597
 
598 598
 // *** Action constant (build should be replaced with ACTION)
599
-define('BUILD_CREATE' ,  1);
599
+define('BUILD_CREATE', 1);
600 600
 define('BUILD_DESTROY', -1);
601 601
 define('BUILD_AUTOCONVERT', 2);
602 602
 
603
-define('ACTION_SELL'       , -1);
604
-define('ACTION_NOTHING'    ,  0);
605
-define('ACTION_BUY'        ,  1);
606
-define('ACTION_USE'        ,  2);
607
-define('ACTION_DELETE'     ,  3);
603
+define('ACTION_SELL', -1);
604
+define('ACTION_NOTHING', 0);
605
+define('ACTION_BUY', 1);
606
+define('ACTION_USE', 2);
607
+define('ACTION_DELETE', 3);
608 608
 
609 609
 // *** Check unit availability codes
610
-define('BUILD_ALLOWED'         , 0); // HARDCODED! DO NOT CHANGE!
610
+define('BUILD_ALLOWED', 0); // HARDCODED! DO NOT CHANGE!
611 611
 define('BUILD_REQUIRE_NOT_MEET', 1);
612
-define('BUILD_AMOUNT_WRONG'    , 2);
613
-define('BUILD_QUE_WRONG'       , 3);
614
-define('BUILD_QUE_UNIT_WRONG'  , 4);
615
-define('BUILD_INDESTRUCTABLE'  , 5);
616
-define('BUILD_NO_RESOURCES'    , 6);
617
-define('BUILD_NO_UNITS'        , 7);
618
-define('BUILD_UNIT_BUSY'       , 8);
619
-define('BUILD_QUE_FULL'        , 9);
620
-define('BUILD_SILO_FULL'       ,10);
621
-define('BUILD_MAX_REACHED'     ,11);
622
-define('BUILD_SECTORS_NONE'    ,12);
612
+define('BUILD_AMOUNT_WRONG', 2);
613
+define('BUILD_QUE_WRONG', 3);
614
+define('BUILD_QUE_UNIT_WRONG', 4);
615
+define('BUILD_INDESTRUCTABLE', 5);
616
+define('BUILD_NO_RESOURCES', 6);
617
+define('BUILD_NO_UNITS', 7);
618
+define('BUILD_UNIT_BUSY', 8);
619
+define('BUILD_QUE_FULL', 9);
620
+define('BUILD_SILO_FULL', 10);
621
+define('BUILD_MAX_REACHED', 11);
622
+define('BUILD_SECTORS_NONE', 12);
623 623
 define('BUILD_AUTOCONVERT_AVAILABLE', 13);
624 624
 define('BUILD_HIGHSPOT_NOT_ACTIVE', 14);
625 625
 
626 626
 
627 627
 // *** Que types
628 628
 define('QUE_STRUCTURES', 1);
629
-define('QUE_HANGAR'    , 4);
630
-define('QUE_RESEARCH'  , 7);
631
-define('QUE_MERCENARY' , 600); // UNIT_MERCENARIES
629
+define('QUE_HANGAR', 4);
630
+define('QUE_RESEARCH', 7);
631
+define('QUE_MERCENARY', 600); // UNIT_MERCENARIES
632 632
 // *** Subque types
633
-define('SUBQUE_PLANET'  , 1);
634
-define('SUBQUE_MOON'    , 3);
635
-define('SUBQUE_FLEET'   , 4);
636
-define('SUBQUE_DEFENSE' , 6);
633
+define('SUBQUE_PLANET', 1);
634
+define('SUBQUE_MOON', 3);
635
+define('SUBQUE_FLEET', 4);
636
+define('SUBQUE_DEFENSE', 6);
637 637
 define('SUBQUE_RESEARCH', 7);
638 638
 
639 639
 // *** Que items
640
-define('QI_UNIT_ID'   , 0);
641
-define('QI_AMOUNT'    , 1);
642
-define('QI_TIME'      , 2);
643
-define('QI_MODE'      , 3);
644
-define('QI_QUE_ID'    , 4);
645
-define('QI_QUE_TYPE'  , 4);
646
-define('QI_PLANET_ID' , 5);
640
+define('QI_UNIT_ID', 0);
641
+define('QI_AMOUNT', 1);
642
+define('QI_TIME', 2);
643
+define('QI_MODE', 3);
644
+define('QI_QUE_ID', 4);
645
+define('QI_QUE_TYPE', 4);
646
+define('QI_PLANET_ID', 5);
647 647
 
648 648
 
649 649
 // *** Units
650 650
 
651 651
 // *** Sort options
652
-define('SORT_ASCENDING' , 0);
652
+define('SORT_ASCENDING', 0);
653 653
 define('SORT_DESCENDING', 1);
654 654
 
655
-define('SORT_ID'             , 0);
656
-define('SORT_LOCATION'       , 1);
657
-define('SORT_NAME'           , 2);
658
-define('SORT_SIZE'           , 3);
659
-define('SORT_EMAIL'          , 4);
660
-define('SORT_IP'             , 5);
655
+define('SORT_ID', 0);
656
+define('SORT_LOCATION', 1);
657
+define('SORT_NAME', 2);
658
+define('SORT_SIZE', 3);
659
+define('SORT_EMAIL', 4);
660
+define('SORT_IP', 5);
661 661
 define('SORT_TIME_REGISTERED', 6);
662 662
 define('SORT_TIME_LAST_VISIT', 7);
663
-define('SORT_TIME_BAN_UNTIL' , 8);
664
-define('SORT_REFERRAL_COUNT' , 9);
665
-define('SORT_REFERRAL_DM'    , 10);
666
-define('SORT_VACATION'       , 11);
663
+define('SORT_TIME_BAN_UNTIL', 8);
664
+define('SORT_REFERRAL_COUNT', 9);
665
+define('SORT_REFERRAL_DM', 10);
666
+define('SORT_VACATION', 11);
667 667
 
668 668
 
669 669
 define('HULL_SIZE_TINY', 1);
@@ -783,35 +783,35 @@  discard block
 block discarded – undo
783 783
 
784 784
 
785 785
 // define('NICK_ID',               -1);
786
-define('NICK_HTML',              0);
787
-
788
-define('NICK_FIRST',             1);
789
-define('NICK_RACE',           1000);
790
-define('NICK_GENDER',         2000);
791
-define('NICK_AWARD',          3000);
792
-define('NICK_VACATION',       3500);
793
-define('NICK_BIRTHDAY',       4000);
794
-define('NICK_RANK',           4500);
795
-define('NICK_RANK_NO_TEXT',   4750);
796
-define('NICK_PREMIUM',        5000);
797
-define('NICK_AUTH_LEVEL',     6000);
798
-
799
-define('NICK_HIGHLIGHT',      6300);
800
-define('NICK_CLASS',          6450);
801
-
802
-define('NICK_NICK_CLASS',     6600);
803
-define('NICK_NICK',           7000);
786
+define('NICK_HTML', 0);
787
+
788
+define('NICK_FIRST', 1);
789
+define('NICK_RACE', 1000);
790
+define('NICK_GENDER', 2000);
791
+define('NICK_AWARD', 3000);
792
+define('NICK_VACATION', 3500);
793
+define('NICK_BIRTHDAY', 4000);
794
+define('NICK_RANK', 4500);
795
+define('NICK_RANK_NO_TEXT', 4750);
796
+define('NICK_PREMIUM', 5000);
797
+define('NICK_AUTH_LEVEL', 6000);
798
+
799
+define('NICK_HIGHLIGHT', 6300);
800
+define('NICK_CLASS', 6450);
801
+
802
+define('NICK_NICK_CLASS', 6600);
803
+define('NICK_NICK', 7000);
804 804
 define('NICK_NICK_CLASS_END', 7300);
805 805
 
806
-define('NICK_ALLY_CLASS',     7600);
807
-define('NICK_ALLY',           8000);
806
+define('NICK_ALLY_CLASS', 7600);
807
+define('NICK_ALLY', 8000);
808 808
 define('NICK_ALLY_CLASS_END', 8300);
809 809
 
810
-define('NICK_CLASS_END',      8450);
811
-define('NICK_HIGHLIGHT_END',  8600);
810
+define('NICK_CLASS_END', 8450);
811
+define('NICK_HIGHLIGHT_END', 8600);
812 812
 
813
-define('NICK_LAST',           9999);
814
-define('NICK_SORT',          10000);
813
+define('NICK_LAST', 9999);
814
+define('NICK_SORT', 10000);
815 815
 
816 816
 // Настройки игрока
817 817
 define('PLAYER_OPTION_MENU_SORT', 1);
@@ -915,8 +915,8 @@  discard block
 block discarded – undo
915 915
 define('LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10', 1);
916 916
 
917 917
 define('BLITZ_REGISTER_DISABLED', 0);
918
-define('BLITZ_REGISTER_OPEN'    , 1);
919
-define('BLITZ_REGISTER_CLOSED'  , 2);
918
+define('BLITZ_REGISTER_OPEN', 1);
919
+define('BLITZ_REGISTER_CLOSED', 2);
920 920
 define('BLITZ_REGISTER_SHOW_LOGIN', 3);
921 921
 define('BLITZ_REGISTER_DISCLOSURE_NAMES', 4);
922 922
 
@@ -1047,8 +1047,8 @@  discard block
 block discarded – undo
1047 1047
 const MODULE_LOAD_ORDER_AUTH_VKONTAKTE        = 3;
1048 1048
 const MODULE_LOAD_ORDER_PAYMENT_SECONDARY     = 90000;
1049 1049
 const MODULE_LOAD_ORDER_UNIT_RES_METAMATTER   = 99999;
1050
-const MODULE_LOAD_ORDER_DEFAULT               = 100000;     // HARDCODED
1051
-const MODULE_LOAD_ORDER_CORE_SHIP_CONSTRUCTOR = 999999;     // RESERVED
1050
+const MODULE_LOAD_ORDER_DEFAULT               = 100000; // HARDCODED
1051
+const MODULE_LOAD_ORDER_CORE_SHIP_CONSTRUCTOR = 999999; // RESERVED
1052 1052
 const MODULE_LOAD_ORDER_MENU_CUSTOMIZE        = 200000000;
1053 1053
 const MODULE_LOAD_ORDER_LATEST                = 2000000000; // HARDCODED
1054 1054
 const MODULE_LOAD_ORDER_GAME_SKIRMISH         = 2000100000;
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
@@ -18,39 +18,39 @@  discard block
 block discarded – undo
18 18
 {
19 19
   SN::db_transaction_start();
20 20
 
21
-  if($buddy_id = sys_get_param_id('buddy_id'))
21
+  if ($buddy_id = sys_get_param_id('buddy_id'))
22 22
   {
23 23
     $buddy_row = doquery("SELECT BUDDY_SENDER_ID, BUDDY_OWNER_ID, BUDDY_STATUS FROM {{buddy}} WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1 FOR UPDATE;", true);
24
-    if(!is_array($buddy_row))
24
+    if (!is_array($buddy_row))
25 25
     {
26 26
       throw new exception('buddy_err_not_exist', ERR_ERROR);
27 27
     }
28 28
 
29
-    switch($mode = sys_get_param_str('mode'))
29
+    switch ($mode = sys_get_param_str('mode'))
30 30
     {
31 31
       case 'accept':
32
-        if($buddy_row['BUDDY_SENDER_ID'] == $user['id'])
32
+        if ($buddy_row['BUDDY_SENDER_ID'] == $user['id'])
33 33
         {
34 34
           throw new exception('buddy_err_accept_own', ERR_ERROR);
35 35
         }
36 36
 
37
-        if($buddy_row['BUDDY_OWNER_ID'] != $user['id'])
37
+        if ($buddy_row['BUDDY_OWNER_ID'] != $user['id'])
38 38
         {
39 39
           throw new exception('buddy_err_accept_alien', ERR_ERROR);
40 40
         }
41 41
 
42
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE)
42
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE)
43 43
         {
44 44
           throw new exception('buddy_err_accept_already', ERR_WARNING);
45 45
         }
46 46
 
47
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_DENIED)
47
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_DENIED)
48 48
         {
49 49
           throw new exception('buddy_err_accept_denied', ERR_ERROR);
50 50
         }
51 51
 
52 52
         doquery("UPDATE {{buddy}} SET `BUDDY_STATUS` = " . BUDDY_REQUEST_ACTIVE . " WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1;");
53
-        if(SN::$db->db_affected_rows())
53
+        if (SN::$db->db_affected_rows())
54 54
         {
55 55
           msg_send_simple_message($buddy_row['BUDDY_SENDER_ID'], $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_accept_title'],
56 56
             sprintf($lang['buddy_msg_accept_text'], $user['username']));
@@ -64,12 +64,12 @@  discard block
 block discarded – undo
64 64
       break;
65 65
 
66 66
       case 'delete':
67
-        if($buddy_row['BUDDY_SENDER_ID'] != $user['id'] && $buddy_row['BUDDY_OWNER_ID'] != $user['id'])
67
+        if ($buddy_row['BUDDY_SENDER_ID'] != $user['id'] && $buddy_row['BUDDY_OWNER_ID'] != $user['id'])
68 68
         {
69 69
           throw new exception('buddy_err_delete_alien', ERR_ERROR);
70 70
         }
71 71
 
72
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) // Existing friendship
72
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) // Existing friendship
73 73
         {
74 74
           $ex_friend_id = $buddy_row['BUDDY_SENDER_ID'] == $user['id'] ? $buddy_row['BUDDY_OWNER_ID'] : $buddy_row['BUDDY_SENDER_ID'];
75 75
 
@@ -80,13 +80,13 @@  discard block
 block discarded – undo
80 80
           SN::db_transaction_commit();
81 81
           throw new exception('buddy_err_unfriend_none', ERR_NONE);
82 82
         }
83
-        elseif($buddy_row['BUDDY_SENDER_ID'] == $user['id']) // Player's outcoming request - either denied or waiting
83
+        elseif ($buddy_row['BUDDY_SENDER_ID'] == $user['id']) // Player's outcoming request - either denied or waiting
84 84
         {
85 85
           doquery("DELETE FROM {{buddy}} WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1;");
86 86
           SN::db_transaction_commit();
87 87
           throw new exception('buddy_err_delete_own', ERR_NONE);
88 88
         }
89
-        elseif($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) // Deny incoming request
89
+        elseif ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) // Deny incoming request
90 90
         {
91 91
           msg_send_simple_message($buddy_row['BUDDY_SENDER_ID'], $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_deny_title'],
92 92
             sprintf($lang['buddy_msg_deny_text'], $user['username']));
@@ -101,24 +101,24 @@  discard block
 block discarded – undo
101 101
 
102 102
   // New request?
103 103
   // Checking for user ID - in case if it was request from outside buddy system
104
-  if($new_friend_id = sys_get_param_id('request_user_id'))
104
+  if ($new_friend_id = sys_get_param_id('request_user_id'))
105 105
   {
106 106
     $new_friend_row = db_user_by_id($new_friend_id, true, '`id`, `username`');
107 107
   }
108
-  elseif($new_friend_name = sys_get_param_str_unsafe('request_user_name'))
108
+  elseif ($new_friend_name = sys_get_param_str_unsafe('request_user_name'))
109 109
   {
110 110
     $new_friend_row = db_user_by_username($new_friend_name);
111 111
     $new_friend_name = SN::$db->db_escape($new_friend_name);
112 112
   }
113 113
 
114
-  if($new_friend_row['id'] == $user['id'])
114
+  if ($new_friend_row['id'] == $user['id'])
115 115
   {
116 116
     unset($new_friend_row);
117 117
     throw new exception('buddy_err_adding_self', ERR_ERROR);
118 118
   }
119 119
 
120 120
   // Checking for user name & request text - in case if it was request to adding new request
121
-  if(isset($new_friend_row['id']) && ($new_request_text = sys_get_param_str('request_text')))
121
+  if (isset($new_friend_row['id']) && ($new_request_text = sys_get_param_str('request_text')))
122 122
   {
123 123
     $check_relation = doquery("SELECT `BUDDY_ID` FROM {{buddy}} WHERE
124 124
       (`BUDDY_SENDER_ID` = {$user['id']} AND `BUDDY_OWNER_ID` = {$new_friend_row['id']})
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
       (`BUDDY_SENDER_ID` = {$new_friend_row['id']} AND `BUDDY_OWNER_ID` = {$user['id']})
127 127
       LIMIT 1 FOR UPDATE;"
128 128
     , true);
129
-    if(isset($check_relation['BUDDY_ID']))
129
+    if (isset($check_relation['BUDDY_ID']))
130 130
     {
131 131
       throw new exception('buddy_err_adding_exists', ERR_WARNING);
132 132
     }
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
     throw new exception('buddy_err_adding_none', ERR_NONE);
140 140
   }
141 141
 }
142
-catch(exception $e)
142
+catch (exception $e)
143 143
 {
144 144
   $result[] = array(
145 145
     'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 SN::db_transaction_rollback();
151 151
 
152 152
 $query = db_buddy_list_by_user($user['id']);
153
-while($row = db_fetch($query))
153
+while ($row = db_fetch($query))
154 154
 {
155 155
   $row['BUDDY_REQUEST'] = HelperString::nl2br($row['BUDDY_REQUEST']);
156 156
 
Please login to merge, or discard this patch.
notes.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -15,34 +15,34 @@  discard block
 block discarded – undo
15 15
 $template = SnTemplate::gettemplate('notes', true);
16 16
 
17 17
 $result = array();
18
-if(($result_message = sys_get_param_str('MESSAGE')) && isset($lang[$result_message])) {
18
+if (($result_message = sys_get_param_str('MESSAGE')) && isset($lang[$result_message])) {
19 19
   $result[] = array('STATUS' => sys_get_param_int('STATUS'), 'MESSAGE' => $lang[$result_message]);
20 20
 }
21 21
 
22 22
 $note_id_edit = sys_get_param_id('note_id_edit');
23
-if(sys_get_param('note_delete')) {
23
+if (sys_get_param('note_delete')) {
24 24
   try {
25 25
     $not = '';
26 26
     $query_where = '';
27
-    switch(sys_get_param_str('note_delete_range')) {
27
+    switch (sys_get_param_str('note_delete_range')) {
28 28
       case 'all':
29 29
       break;
30 30
 
31 31
       case 'marked_not':
32 32
         $not = 'NOT';
33 33
       case 'marked':
34
-        if(!is_array($notes_marked = sys_get_param('note'))) {
34
+        if (!is_array($notes_marked = sys_get_param('note'))) {
35 35
           throw new exception('note_err_none_selected', ERR_WARNING);
36 36
         }
37 37
 
38 38
         $notes_marked_filtered = array();
39
-        foreach($notes_marked as $note_id => $note_select) {
40
-          if($note_select == 'on' && $note_id = idval($note_id)) {
39
+        foreach ($notes_marked as $note_id => $note_select) {
40
+          if ($note_select == 'on' && $note_id = idval($note_id)) {
41 41
             $notes_marked_filtered[] = $note_id;
42 42
           }
43 43
         }
44 44
 
45
-        if(empty($notes_marked_filtered)) {
45
+        if (empty($notes_marked_filtered)) {
46 46
           throw new exception('note_err_none_selected', ERR_WARNING);
47 47
         }
48 48
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
     doquery("DELETE FROM {{notes}} WHERE `owner` = {$user['id']} {$query_where};");
60 60
     SN::db_transaction_commit();
61 61
     throw new exception($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added', ERR_NONE);
62
-  } catch(exception $e) {
62
+  } catch (exception $e) {
63 63
     $note_id_edit = 0;
64 64
     SN::db_transaction_rollback();
65 65
     $result[] = array(
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
       'MESSAGE' => $lang[$e->getMessage()],
68 68
     );
69 69
   }
70
-} elseif(($note_title = sys_get_param_str('note_title')) || ($note_text = sys_get_param_str('note_text'))) {
70
+} elseif (($note_title = sys_get_param_str('note_title')) || ($note_text = sys_get_param_str('note_text'))) {
71 71
   $note_title == SN::$db->db_escape($lang['note_new_title']) ? $note_title = '' : false;
72 72
   ($note_text = sys_get_param_str('note_text')) == SN::$db->db_escape($lang['note_new_text']) ? $note_text = '' : false;
73 73
 
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
     $note_system = max(0, min(sys_get_param_id('note_system'), SN::$config->game_maxSystem));
77 77
     $note_planet = max(0, min(sys_get_param_id('note_planet'), SN::$config->game_maxPlanet + 1));
78 78
 
79
-    if(!$note_text && !$note_title && !$note_galaxy && !$note_system && !$note_planet) {
79
+    if (!$note_text && !$note_title && !$note_galaxy && !$note_system && !$note_planet) {
80 80
       throw new exception('note_err_note_empty', ERR_WARNING);
81 81
     }
82 82
 
@@ -85,15 +85,15 @@  discard block
 block discarded – undo
85 85
     $note_sticky = intval(sys_get_param_id('note_sticky')) ? 1 : 0;
86 86
 
87 87
     SN::db_transaction_start();
88
-    if($note_id_edit) {
88
+    if ($note_id_edit) {
89 89
       $check_note_id = doquery("SELECT `id`, `owner` FROM {{notes}} WHERE `id` = {$note_id_edit} LIMIT 1 FOR UPDATE", true);
90
-      if(!$check_note_id) {
90
+      if (!$check_note_id) {
91 91
         throw new exception('note_err_note_not_found', ERR_ERROR);
92 92
       }
93 93
     }
94 94
 
95
-    if($note_id_edit) {
96
-      if($check_note_id['owner'] != $user['id']) {
95
+    if ($note_id_edit) {
96
+      if ($check_note_id['owner'] != $user['id']) {
97 97
         throw new exception('note_err_owner_wrong', ERR_ERROR);
98 98
       }
99 99
 
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
     SN::db_transaction_commit();
109 109
     sys_redirect('notes.php?STATUS=' . ERR_NONE . '&MESSAGE=' . ($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added'));
110 110
 //    throw new exception($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added', ERR_NONE);
111
-  } catch(exception $e) {
111
+  } catch (exception $e) {
112 112
     $note_id_edit = 0;
113 113
     SN::db_transaction_rollback();
114 114
     $result[] = array(
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
   }
119 119
 }
120 120
 
121
-if(!$note_id_edit) {
121
+if (!$note_id_edit) {
122 122
   \Note\Note::note_assign($template, array(
123 123
     'id' => 0,
124 124
     'time' => SN_TIME_NOW,
@@ -131,13 +131,13 @@  discard block
 block discarded – undo
131 131
 
132 132
 $note_exist = false;
133 133
 $notes_query = doquery("SELECT * FROM {{notes}} WHERE owner={$user['id']} ORDER BY priority DESC, galaxy ASC, system ASC, planet ASC, planet_type ASC, `time` DESC");
134
-while($note_row = db_fetch($notes_query)) {
134
+while ($note_row = db_fetch($notes_query)) {
135 135
   \Note\Note::note_assign($template, $note_row);
136 136
   $note_exist = $note_exist || $note_row['id'] == $note_id_edit;
137 137
 }
138 138
 $note_id_edit = $note_exist ? $note_id_edit : 0;
139 139
 
140
-foreach($note_priority_classes as $note_priority_id => $note_priority_class) {
140
+foreach ($note_priority_classes as $note_priority_id => $note_priority_class) {
141 141
   $template->assign_block_vars('note_priority', array(
142 142
     'ID' => $note_priority_id,
143 143
     'CLASS' => $note_priority_classes[$note_priority_id],
@@ -145,14 +145,14 @@  discard block
 block discarded – undo
145 145
   ));
146 146
 }
147 147
 
148
-foreach($lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
148
+foreach ($lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
149 149
   $template->assign_block_vars('planet_type', array(
150 150
     'ID' => $planet_type_id,
151 151
     'TEXT' => $planet_type_string,
152 152
   ));
153 153
 }
154 154
 
155
-foreach($result as $result_data) {
155
+foreach ($result as $result_data) {
156 156
   $template->assign_block_vars('result', $result_data);
157 157
 }
158 158
 
Please login to merge, or discard this patch.
common.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -12,24 +12,24 @@  discard block
 block discarded – undo
12 12
 global $debug, $template_result, $user, $lang, $planetrow;
13 13
 
14 14
 // Напоминание для Администрации, что игра отключена
15
-if($template_result[F_GAME_DISABLE]) {
15
+if ($template_result[F_GAME_DISABLE]) {
16 16
   echo '<div class="global_admin_warning">', $template_result[F_GAME_DISABLE_REASON], '</div>';
17 17
 }
18 18
 unset($disable_reason);
19 19
 
20 20
 
21
-if(defined('IN_ADMIN') && IN_ADMIN === true) {
21
+if (defined('IN_ADMIN') && IN_ADMIN === true) {
22 22
   lng_include('admin');
23
-} elseif($sys_user_logged_in) {
23
+} elseif ($sys_user_logged_in) {
24 24
   sys_user_vacation($user);
25 25
 
26 26
   $planet_id = SetSelectedPlanet($user);
27 27
 
28 28
   // TODO НЕ НУЖНО АЛЬЯНС КАЖДЫЙ РАЗ ОБНОВЛЯТЬ!!!
29
-  if($user['ally_id']) {
29
+  if ($user['ally_id']) {
30 30
     SN::db_transaction_start();
31 31
     \Alliance\Alliance::sn_ali_fill_user_ally($user);
32
-    if(!$user['ally']['player']['id']) {
32
+    if (!$user['ally']['player']['id']) {
33 33
       // sn_sys_logout(false, true);
34 34
       // core_auth::logout(false);
35 35
       SN::$auth->logout(false);
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
   SN::db_transaction_commit();
49 49
 
50 50
   $planetrow = $global_data['planet'];
51
-  if(!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
51
+  if (!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
52 52
     // sn_sys_logout(false, true);
53 53
     // core_auth::logout(false);
54 54
     SN::$auth->logout(false);
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 sys_user_options_unpack($user);
64 64
 
65 65
 global $sn_page_name, $sn_mvc;
66
-if(!empty($sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_EARLY_HEADER])) {
66
+if (!empty($sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_EARLY_HEADER])) {
67 67
   $title = !empty($sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_TITLE]) ? $sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_TITLE] : '';
68 68
   SnTemplate::renderHeader($page, $title, $template_result, false, $user, SN::$config, $lang, $planetrow);
69 69
 }
Please login to merge, or discard this patch.
blitz_register.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -4,12 +4,12 @@  discard block
 block discarded – undo
4 4
 
5 5
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
6 6
 
7
-if($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
7
+if ($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
8 8
   $error_message = SN::$config->game_mode == GAME_BLITZ ? 'sys_blitz_page_disabled' : (
9 9
     !SN::$config->game_blitz_register ? 'sys_blitz_registration_disabled' : ''
10 10
   );
11 11
 
12
-  if($error_message) {
12
+  if ($error_message) {
13 13
     SnTemplate::messageBox($lang[$error_message], $lang['sys_error'], 'overview.php', 10);
14 14
     die();
15 15
   }
@@ -19,12 +19,12 @@  discard block
 block discarded – undo
19 19
 $current_round = intval(SN::$config->db_loadItem('game_blitz_register_round'));
20 20
 $current_price = intval(SN::$config->db_loadItem('game_blitz_register_price'));
21 21
 
22
-if(SN::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
22
+if (SN::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
23 23
   SN::db_transaction_start();
24 24
   $user = db_user_by_id($user['id'], true);
25 25
   $is_registered = doquery("SELECT `id` FROM {{blitz_registrations}} WHERE `user_id` = {$user['id']} AND `round_number` = {$current_round} FOR UPDATE;", true);
26
-  if(sys_get_param_str('register_me')) {
27
-    if(empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
26
+  if (sys_get_param_str('register_me')) {
27
+    if (empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
28 28
       doquery("INSERT IGNORE INTO {{blitz_registrations}} SET `user_id` = {$user['id']}, `round_number` = {$current_round};");
29 29
       //mm_points_change($user['id'], RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
30 30
       SN::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
@@ -45,17 +45,17 @@  discard block
 block discarded – undo
45 45
 $blitz_players = 0;
46 46
 $blitz_prize_dark_matter = 0;
47 47
 $blitz_prize_places = 0;
48
-if($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
49
-  if(sys_get_param_str('generate')) {
48
+if ($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
49
+  if (sys_get_param_str('generate')) {
50 50
     $next_id = 0;
51 51
     $query = doquery("SELECT `id` FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY RAND();");
52
-    while($row = db_fetch($query)) {
52
+    while ($row = db_fetch($query)) {
53 53
       $next_id++;
54 54
       $blitz_name = 'Игрок' . $next_id;
55 55
       $blitz_password = sys_random_string(8);
56 56
       doquery("UPDATE {{blitz_registrations}} SET blitz_name = '{$blitz_name}', blitz_password = '{$blitz_password}' WHERE `id` = {$row['id']} AND `round_number` = {$current_round};");
57 57
     }
58
-  } elseif(sys_get_param_str('import_generated')) {
58
+  } elseif (sys_get_param_str('import_generated')) {
59 59
     // ЭТО НА БЛИЦЕ!!!
60 60
     doquery("DELETE FROM {{users}} WHERE username like 'Игрок%';");
61 61
     doquery("DELETE FROM {{planets}} WHERE id_owner not in (SELECT `id` FROM {{users}});");
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
     $system = $system_step;
78 78
     $planet = round(SN::$config->game_maxPlanet / 2);
79 79
 
80
-    foreach($imported_string as &$string_data) {
80
+    foreach ($imported_string as &$string_data) {
81 81
       $string_data = explode(',', $string_data);
82 82
       $username_safe = $string_data[0];
83 83
 
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
       $moon_row = uni_create_moon($galaxy, $system, $planet, $user_new['id'], Universe::MOON_MAX_SIZE, false);
93 93
 
94
-      if(($system += $system_step) >= SN::$config->game_maxSystem) {
94
+      if (($system += $system_step) >= SN::$config->game_maxSystem) {
95 95
         $galaxy++;
96 96
         $system = $system_step;
97 97
       }
@@ -100,13 +100,13 @@  discard block
 block discarded – undo
100 100
 
101 101
     SN::$config->db_saveItem('users_amount', SN::$config->users_amount + $new_players);
102 102
     // generated_string
103
-  } elseif(sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
103
+  } elseif (sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
104 104
     $blitz_result = explode(';', $blitz_result_string);
105 105
     $blitz_last_update = $blitz_result[0]; // Пока не используется
106 106
     unset($blitz_result[0]);
107
-    foreach($blitz_result as $blitz_result_data) {
107
+    foreach ($blitz_result as $blitz_result_data) {
108 108
       $blitz_result_data = explode(',', $blitz_result_data);
109
-      if(count($blitz_result_data) == 5) {
109
+      if (count($blitz_result_data) == 5) {
110 110
         $blitz_result_data[1] = SN::$db->db_escape($blitz_result_data[1]);
111 111
         doquery(
112 112
           "UPDATE `{{blitz_registrations}}` SET
@@ -120,15 +120,15 @@  discard block
 block discarded – undo
120 120
     $blitz_result = array();
121 121
   }
122 122
 
123
-  if(SN::$config->game_mode == GAME_BLITZ) {
123
+  if (SN::$config->game_mode == GAME_BLITZ) {
124 124
     $blitz_result = array(SN::$config->db_loadItem('var_stat_update'));
125 125
     $query = doquery("SELECT id, username, total_rank, total_points, onlinetime FROM {{users}} ORDER BY `id`;");
126
-    while($row = db_fetch($query)) {
126
+    while ($row = db_fetch($query)) {
127 127
       $blitz_result[] = "{$row['id']},{$row['username']},{$row['onlinetime']},{$row['total_rank']},{$row['total_points']}";
128 128
     }
129 129
   } else {
130 130
     $query = doquery("SELECT blitz_name, blitz_password, blitz_online FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY `id`;");
131
-    while($row = db_fetch($query)) {
131
+    while ($row = db_fetch($query)) {
132 132
       $blitz_generated[] = "{$row['blitz_name']},{$row['blitz_password']}";
133 133
       $row['blitz_online'] ? $blitz_prize_players_active++ : false;
134 134
       $blitz_players++;
@@ -143,13 +143,13 @@  discard block
 block discarded – undo
143 143
     'Игрок40'
144 144
     */
145 145
 
146
-    if(sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
146
+    if (sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
147 147
       // $blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter');
148 148
       $blitz_prize_places_actual = sys_get_param_int('blitz_prize_places');
149 149
       SN::db_transaction_start();
150 150
       $query = doquery("SELECT * FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY `blitz_place` FOR UPDATE;");
151
-      while($row = db_fetch($query)) {
152
-        if(!$row['blitz_place']) {
151
+      while ($row = db_fetch($query)) {
152
+        if (!$row['blitz_place']) {
153 153
           continue;
154 154
         }
155 155
 
@@ -157,15 +157,15 @@  discard block
 block discarded – undo
157 157
         $blitz_prize_places_actual--;
158 158
 
159 159
         $reward = $blitz_prize_dark_matter_actual - $row['blitz_reward_dark_matter'];
160
-pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}",$row['id']);
161
-        if($reward) {
160
+pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}", $row['id']);
161
+        if ($reward) {
162 162
           rpg_points_change($row['user_id'], RPG_BLITZ, $reward, sprintf(
163 163
             $lang['sys_blitz_reward_log_message'], $row['blitz_place'], $row['blitz_name']
164 164
           ));
165 165
           doquery("UPDATE {{blitz_registrations}} SET blitz_reward_dark_matter = blitz_reward_dark_matter + ($reward) WHERE id = {$row['id']} AND `round_number` = {$current_round};");
166 166
         }
167 167
 
168
-        if(!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
168
+        if (!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
169 169
           break;
170 170
         }
171 171
       }
@@ -185,12 +185,12 @@  discard block
 block discarded – undo
185 185
     JOIN {{users}} AS u ON u.id = br.user_id
186 186
   WHERE br.`round_number` = {$current_round}
187 187
   order by `blitz_place`, `timestamp`;");
188
-while($row = db_fetch($query)) {
188
+while ($row = db_fetch($query)) {
189 189
   $tpl_player_data = array(
190 190
     'NAME' => player_nick_render_to_html($row, array('icons' => true, 'color' => true, 'ally' => true)),
191 191
   );
192 192
 
193
-  if(SN::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
193
+  if (SN::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
194 194
     // Вот так хитро, что бы не было не единого шанса попадания на страницу данных об игроках Блиц-сервера до закрытия раунда
195 195
     $tpl_player_data = array_merge($tpl_player_data, array(
196 196
       'ID' => $row['id'],
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
   }
204 204
 
205 205
   $template->assign_block_vars('registrations', $tpl_player_data);
206
-  if($row['id'] == $user['id']) {
206
+  if ($row['id'] == $user['id']) {
207 207
     $player_registered = $row;
208 208
   }
209 209
 }
Please login to merge, or discard this patch.