Completed
Push — work-fleets ( 4eed65...aedb07 )
by SuperNova.WS
04:41
created
admin/statbuilder.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,18 +9,18 @@
 block discarded – undo
9 9
  * @copyright 2008 by Chlorel for XNova
10 10
  */
11 11
 
12
-define('INSIDE'  , true);
13
-define('INSTALL' , false);
12
+define('INSIDE', true);
13
+define('INSTALL', false);
14 14
 define('IN_ADMIN', true);
15 15
 require_once('../common.' . substr(strrchr(__FILE__, '.'), 1));
16 16
 
17 17
 // if($user['authlevel'] < 1)
18
-if($user['authlevel'] < 3)
18
+if ($user['authlevel'] < 3)
19 19
 {
20 20
   AdminMessage($lang['adm_err_denied']);
21 21
 }
22 22
 
23
-if(SN_TIME_NOW >= $config->db_loadAll('var_stat_update_admin_forced') && SN_TIME_NOW >= $config->db_loadAll('var_stat_update_end'))
23
+if (SN_TIME_NOW >= $config->db_loadAll('var_stat_update_admin_forced') && SN_TIME_NOW >= $config->db_loadAll('var_stat_update_end'))
24 24
 {
25 25
   $config->db_saveItem('var_stat_update_admin_forced', SN_TIME_NOW + 120);
26 26
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,8 +43,7 @@
 block discarded – undo
43 43
   doquery("UPDATE {{alliance}} SET ally_user_id = {$ally_user_id} WHERE id = {$ally_id} LIMIT 1;");
44 44
 
45 45
   message(str_replace('%s', $ally_tag_raw, $lang['ally_been_maked']), str_replace('%s', $ally_tag_raw, $lang['ally_maked']));
46
-}
47
-else
46
+} else
48 47
 {
49 48
   $page .= parsetemplate(gettemplate('ali_external_make'), $lang);
50 49
 }
Please login to merge, or discard this patch.
admin/admin_locale.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -7,25 +7,25 @@  discard block
 block discarded – undo
7 7
  *
8 8
  */
9 9
 
10
-define('INSIDE'  , true);
11
-define('INSTALL' , false);
12
-define('IN_ADMIN'  , true);
10
+define('INSIDE', true);
11
+define('INSTALL', false);
12
+define('IN_ADMIN', true);
13 13
 
14 14
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
15 15
 
16
-if($user['authlevel'] < 3) {
16
+if ($user['authlevel'] < 3) {
17 17
   AdminMessage($lang['adm_err_denied']);
18 18
 }
19 19
 
20 20
 function adm_lng_assign_string($lang_id, $locale_string_name, $value) {
21 21
   global $locale_string_template, $languages_info, $languages, $domain;
22 22
 
23
-  if(is_array($value)) {
24
-    foreach($value as $sub_key => $sub_value) {
23
+  if (is_array($value)) {
24
+    foreach ($value as $sub_key => $sub_value) {
25 25
       adm_lng_assign_string($lang_id, "{$locale_string_name}[{$sub_key}]", $sub_value);
26 26
     }
27
-  } elseif($value) {
28
-    if(!isset($locale_string_template[$locale_string_name])) {
27
+  } elseif ($value) {
28
+    if (!isset($locale_string_template[$locale_string_name])) {
29 29
       $locale_string_template[$locale_string_name] = array();
30 30
     }
31 31
     $locale_string_template[$locale_string_name] = array_merge($locale_string_template[$locale_string_name], array("[{$lang_id}]" => htmlentities($value, ENT_COMPAT, 'utf-8')));
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
   global $domain, $lang_id;
47 47
 
48 48
   $return = "{$ident}'{$string_name}' => ";
49
-  if(isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
49
+  if (isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
50 50
     $return .= "'" . str_replace(array("\\", "'"), array('\\\\', "\\'"), $string_value[$lang_id]) . "',";
51 51
   } else {
52 52
     $return .= "array(\r\n";
53
-    foreach($string_value as $arr_name => $arr_data) {
53
+    foreach ($string_value as $arr_name => $arr_data) {
54 54
       $return .= adm_lng_parse_string($arr_name, $arr_data, $ident . '  ');
55 55
     }
56 56
     $return .= "{$ident}),\r\n";
@@ -103,12 +103,12 @@  discard block
 block discarded – undo
103 103
 
104 104
   $string_name_new = false;
105 105
 
106
-  if(isset($honor_constants[$domain][$string_name_prefix])) {
106
+  if (isset($honor_constants[$domain][$string_name_prefix])) {
107 107
     $found_constants = array_keys($constants, $string_name);
108
-    foreach($found_constants as $constant_name) {
108
+    foreach ($found_constants as $constant_name) {
109 109
       $honor_prefix_list = is_array($honor_constants[$domain][$string_name_prefix]) ? $honor_constants[$domain][$string_name_prefix] : array($honor_constants[$domain][$string_name_prefix]);
110
-      foreach($honor_prefix_list as $honor_prefix) {
111
-        if(strpos($constant_name, $honor_prefix) === 0) {
110
+      foreach ($honor_prefix_list as $honor_prefix) {
111
+        if (strpos($constant_name, $honor_prefix) === 0) {
112 112
           $string_name_new = $constant_name;
113 113
           break;
114 114
         }
@@ -118,12 +118,12 @@  discard block
 block discarded – undo
118 118
 
119 119
   $string_name_new = $string_name_new ? $string_name_new : "'{$string_name}'";
120 120
   fwrite($file_handler, "{$ident}{$string_name_new} => ");
121
-  if(isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
121
+  if (isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
122 122
     fwrite($file_handler, "'" . str_replace(array("\\", "'"), array('\\\\', "\\'"), $string_value[$lang_id]) . "',");
123 123
   } else {
124 124
     $string_name_prefix = $string_name_prefix . "[{$string_name}]";
125 125
     fwrite($file_handler, "array(\r\n");
126
-    foreach($string_value as $arr_name => $arr_data) {
126
+    foreach ($string_value as $arr_name => $arr_data) {
127 127
       adm_lng_write_string($arr_name, $arr_data, $ident . '  ', $string_name_prefix);
128 128
     }
129 129
     fwrite($file_handler, "{$ident}),\r\n");
@@ -143,13 +143,13 @@  discard block
 block discarded – undo
143 143
 $languages_info = lng_get_list();
144 144
 $domain = sys_get_param_str('domain');
145 145
 
146
-if($domain) {
146
+if ($domain) {
147 147
   $lang_new = sys_get_param('lang_new');
148
-  if(!empty($lang_new)) {
148
+  if (!empty($lang_new)) {
149 149
     $constants = get_defined_constants(true);
150 150
     $constants = $constants['user'];
151 151
     ksort($constants);
152
-    foreach($languages_info as $lang_id => $land_data) {
152
+    foreach ($languages_info as $lang_id => $land_data) {
153 153
       $file_handler = fopen(SN_ROOT_PHYSICAL . "language/{$lang_id}/{$domain}.mo.php.new", 'w');
154 154
       fwrite($file_handler, "<?php\r\n\r\n/*\r\n#############################################################################
155 155
 #  Filename: {$domain}.mo.php
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 #  Website: http://www.supernova.ws
158 158
 #  Description: Massive Multiplayer Online Browser Space Startegy Game\r\n#\r\n");
159 159
 
160
-      foreach($land_data['LANG_COPYRIGHT'] as $lang_copyright) {
160
+      foreach ($land_data['LANG_COPYRIGHT'] as $lang_copyright) {
161 161
         $lang_copyright = str_replace(array('&copy;', '&quot;', '&lt;', '&gt;'), array('©', '"', '<', '>'), $lang_copyright);
162 162
         fwrite($file_handler, "#  {$lang_copyright}\r\n");
163 163
       }
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 /**\r\n*\r\n* @package language\r\n* @system [{$land_data['LANG_NAME_ENGLISH']}]\r\n* @version " . SN_VERSION . "\r\n*\r\n*/\r\n
166 166
 /**\r\n* DO NOT CHANGE\r\n*/\r\n\r\nif (!defined('INSIDE')) die();\r\n
167 167
 \$a_lang_array = array(\r\n");
168
-      foreach($lang_new as $string_name => $string_value) {
168
+      foreach ($lang_new as $string_name => $string_value) {
169 169
         adm_lng_write_string($string_name, $string_value);
170 170
       }
171 171
       fwrite($file_handler, ");\r\n");
@@ -176,21 +176,21 @@  discard block
 block discarded – undo
176 176
     die();
177 177
   }
178 178
 
179
-  foreach($languages_info as $lang_id => $lang_data) {
179
+  foreach ($languages_info as $lang_id => $lang_data) {
180 180
     $template->assign_block_vars('language', $lang_data);
181 181
     $full_filename = SN_ROOT_PHYSICAL . "language/{$lang_id}/{$domain}.mo.php";
182 182
     $languages[$lang_id] = adm_lng_load($full_filename . (file_exists($full_filename . '.new') ? '.new' : ''));
183
-    foreach($languages[$lang_id] as $locale_string_name => $cork) {
183
+    foreach ($languages[$lang_id] as $locale_string_name => $cork) {
184 184
       adm_lng_assign_string($lang_id, "[{$locale_string_name}]", $languages[$lang_id][$locale_string_name]);
185 185
     }
186 186
   }
187 187
 
188
-  foreach($locale_string_template as $locale_string_name => $locale_string_list) {
188
+  foreach ($locale_string_template as $locale_string_name => $locale_string_list) {
189 189
     $template->assign_block_vars('string', array(
190 190
       'NAME' => $locale_string_name,
191 191
     ));
192 192
 
193
-    foreach($languages_info as $lang_id => $cork2) {
193
+    foreach ($languages_info as $lang_id => $cork2) {
194 194
       $template->assign_block_vars('string.locale', array(
195 195
         'LANG' => $lang_id,
196 196
         'VALUE' => $locale_string_list["[{$lang_id}]"],
@@ -206,17 +206,17 @@  discard block
 block discarded – undo
206 206
   $dir = dir($path);
207 207
   while (false !== ($lang_id = $dir->read())) {
208 208
     $full_path = $path . $lang_id;
209
-    if($lang_id[0] != "." && is_dir($full_path)) {
209
+    if ($lang_id[0] != "." && is_dir($full_path)) {
210 210
       $lang_file_list = dir($full_path);
211 211
       while (false !== ($filename = $lang_file_list->read())) {
212 212
         $lang_domain = strtolower(substr($filename, 0, strpos($filename, '.')));
213
-        if(!$lang_domain) {
213
+        if (!$lang_domain) {
214 214
           continue;
215 215
         }
216 216
 
217 217
         $file_ext = strtolower(substr($filename, strpos($filename, '.')));
218
-        if($lang_domain != 'language') {
219
-          if($file_ext == '.mo.php.new' || ($file_ext == '.mo.php' && empty($languages[$lang_id][$lang_domain]))) {
218
+        if ($lang_domain != 'language') {
219
+          if ($file_ext == '.mo.php.new' || ($file_ext == '.mo.php' && empty($languages[$lang_id][$lang_domain]))) {
220 220
             $language_domains[$lang_domain] = $lang_domain;
221 221
             $languages[$lang_id][$lang_domain] = $lang_domain;
222 222
           }
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
   }
227 227
   $dir->close();
228 228
 
229
-  foreach($language_domains as $lang_domain) {
229
+  foreach ($language_domains as $lang_domain) {
230 230
     $template->assign_block_vars('domain', array(
231 231
       'NAME' => $lang_domain,
232 232
     ));
Please login to merge, or discard this patch.
admin/adm_metamatter.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -15,11 +15,11 @@  discard block
 block discarded – undo
15 15
 
16 16
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
17 17
 
18
-if(!sn_module_get_active_count('payment')) {
18
+if (!sn_module_get_active_count('payment')) {
19 19
   sys_redirect(SN_ROOT_VIRTUAL . 'admin/overview.php');
20 20
 }
21 21
 
22
-if($user['authlevel'] < 3) {
22
+if ($user['authlevel'] < 3) {
23 23
   AdminMessage($lang['adm_err_denied']);
24 24
 }
25 25
 
@@ -28,19 +28,19 @@  discard block
 block discarded – undo
28 28
 $message = '';
29 29
 $message_status = ERR_ERROR;
30 30
 
31
-if($points = sys_get_param_float('points')) {
31
+if ($points = sys_get_param_float('points')) {
32 32
   try {
33 33
     $username = sys_get_param_str_unsafe('id_user');
34
-    if(empty($username)) {
34
+    if (empty($username)) {
35 35
       throw new Exception($lang['adm_mm_no_dest']);
36 36
     }
37 37
 
38 38
     $an_account = new Account(classSupernova::$auth->account->db);
39
-    if(!$an_account->db_get_by_id($username) && !$an_account->db_get_by_name($username) && !$an_account->db_get_by_email($username)) {
39
+    if (!$an_account->db_get_by_id($username) && !$an_account->db_get_by_name($username) && !$an_account->db_get_by_email($username)) {
40 40
       throw new Exception(sprintf($lang['adm_mm_user_none'], $username));
41 41
     }
42 42
 
43
-    if(!$an_account->metamatter_change(RPG_ADMIN, $points, sprintf(
43
+    if (!$an_account->metamatter_change(RPG_ADMIN, $points, sprintf(
44 44
       $lang['adm_matter_change_log_record'],
45 45
       $an_account->account_id, db_escape($an_account->account_name),
46 46
       $user['id'], db_escape($user['username']),
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 //  $message = $lang['adm_mm_no_quant'];
60 60
 }
61 61
 
62
-if($message_status == ERR_ERROR) {
62
+if ($message_status == ERR_ERROR) {
63 63
   $template->assign_vars(array(
64 64
     'ID_USER' => $username,
65 65
     'POINTS' => $points,
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
   ));
68 68
 };
69 69
 
70
-if($message) {
70
+if ($message) {
71 71
   $template->assign_block_vars('result', array('MESSAGE' => $message, 'STATUS' => $message_status ? $message_status : ERR_NONE));
72 72
 }
73 73
 
Please login to merge, or discard this patch.
admin/userlist.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
16 16
 
17 17
 global $config, $lang, $user;
18
-if($user['authlevel'] < 3) {
18
+if ($user['authlevel'] < 3) {
19 19
   AdminMessage($lang['adm_err_denied']);
20 20
 }
21 21
 
@@ -39,10 +39,10 @@  discard block
 block discarded – undo
39 39
 $sort = sys_get_param_int('sort', SORT_ID);
40 40
 $sort = $sort_fields[$sort] ? $sort : SORT_ID;
41 41
 
42
-if(($action = sys_get_param_int('action')) && ($user_id = sys_get_param_id('uid'))) {
42
+if (($action = sys_get_param_int('action')) && ($user_id = sys_get_param_id('uid'))) {
43 43
   $user_selected = db_user_by_id($user_id, false, 'id, username, authlevel');
44
-  if($user_selected['authlevel'] < $user['authlevel'] && $user['authlevel'] >= 3) {
45
-    switch($action) {
44
+  if ($user_selected['authlevel'] < $user['authlevel'] && $user['authlevel'] >= 3) {
45
+    switch ($action) {
46 46
       case ACTION_DELETE:
47 47
         DeleteSelectedUser($user_id);
48 48
         sys_redirect("{$_SERVER['SCRIPT_NAME']}?sort={$sort}");
@@ -63,20 +63,20 @@  discard block
 block discarded – undo
63 63
 
64 64
 $multi_ip = array();
65 65
 $ip_query = db_user_list_admin_multiaccounts();
66
-while($ip = db_fetch($ip_query)) {
66
+while ($ip = db_fetch($ip_query)) {
67 67
   $multi_ip[$ip['user_lastip']] = $ip['ip_count'];
68 68
 }
69 69
 
70 70
 $geoip = geoip_status();
71 71
 
72 72
 $query = db_user_list_admin_sorted($sort_fields[$sort], $is_players_online_page);
73
-while($user_row = db_fetch($query)) {
74
-  if($user_row['banaday']) {
73
+while ($user_row = db_fetch($query)) {
74
+  if ($user_row['banaday']) {
75 75
     $ban_details = doquery("SELECT * FROM {{banned}} WHERE `ban_user_id` = {$user_row['id']} ORDER BY ban_id DESC LIMIT 1", true);
76 76
   }
77 77
 
78 78
   $geoip_info = $geoip ? geoip_ip_info(ip2longu($user_row['user_lastip'])) : array();
79
-  foreach($geoip_info as $key => $value) {
79
+  foreach ($geoip_info as $key => $value) {
80 80
     $geoip_info[strtoupper($key)] = $value;
81 81
     unset($geoip_info[$key]);
82 82
   }
Please login to merge, or discard this patch.
admin/admin_user.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -5,20 +5,20 @@  discard block
 block discarded – undo
5 5
 define('IN_ADMIN', true);
6 6
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
7 7
 
8
-if($user['authlevel'] < 3) {
8
+if ($user['authlevel'] < 3) {
9 9
   AdminMessage($lang['adm_err_denied']);
10 10
 }
11 11
 
12 12
 lng_include('admin');
13 13
 
14 14
 $user_id = sys_get_param_id('uid');
15
-if(!($user_row = db_user_by_id($user_id))) {
15
+if (!($user_row = db_user_by_id($user_id))) {
16 16
   AdminMessage(sprintf($lang['adm_dm_user_none'], $user_id));
17 17
 }
18 18
 
19 19
 $template = gettemplate('admin/admin_user', true);
20 20
 
21
-if(!empty($user_row['user_last_browser_id'])) {
21
+if (!empty($user_row['user_last_browser_id'])) {
22 22
   $temp = doquery("SELECT browser_user_agent FROM {{security_browser}} WHERE `browser_id` = {$user_row['user_last_browser_id']}", true);
23 23
   $user_row['browser_user_agent'] = $temp['browser_user_agent'];
24 24
 }
@@ -55,10 +55,10 @@  discard block
 block discarded – undo
55 55
     'raidsloose',
56 56
     'raidswin',
57 57
     'total_rank',
58
-    'total_points',  ),
58
+    'total_points',),
59 59
 );
60
-foreach($formats as $callable => $field_list) {
61
-  foreach($field_list as $field_name) {
60
+foreach ($formats as $callable => $field_list) {
61
+  foreach ($field_list as $field_name) {
62 62
     $user_row[$field_name] = call_user_func($callable, $user_row[$field_name]);
63 63
   }
64 64
 }
Please login to merge, or discard this patch.
admin/admin_darkmatter.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 
16 16
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
17 17
 
18
-if($user['authlevel'] < 3) {
18
+if ($user['authlevel'] < 3) {
19 19
   AdminMessage($lang['adm_err_denied']);
20 20
 }
21 21
 
@@ -24,16 +24,16 @@  discard block
 block discarded – undo
24 24
 $message = '';
25 25
 $message_status = ERR_ERROR;
26 26
 
27
-if($points = sys_get_param_float('points')) {
27
+if ($points = sys_get_param_float('points')) {
28 28
 // If points not empty...
29
-  if($username = sys_get_param_str_unsafe('id_user')) {
29
+  if ($username = sys_get_param_str_unsafe('id_user')) {
30 30
     $row = db_user_by_id($username, false, 'id, username', true, true);
31
-    if(!isset($row['id'])) {
31
+    if (!isset($row['id'])) {
32 32
       $row = db_user_by_username($username, false, 'id, username', true, true);
33 33
     }
34
-    if(is_array($row) && isset($row['id'])) {
34
+    if (is_array($row) && isset($row['id'])) {
35 35
       // Does anything post to DB?
36
-      if(rpg_points_change(
36
+      if (rpg_points_change(
37 37
         $row['id'],
38 38
         RPG_ADMIN,
39 39
         $points,
@@ -51,12 +51,12 @@  discard block
 block discarded – undo
51 51
     // Points not empty but destination is not set - this means error
52 52
     $message = $lang['adm_dm_no_dest'];
53 53
   }
54
-} elseif($id_user) {
54
+} elseif ($id_user) {
55 55
   // Points is empty but destination is set - this again means error
56 56
   $message = $lang['adm_dm_no_quant'];
57 57
 }
58 58
 
59
-if(!$isNoError) {
59
+if (!$isNoError) {
60 60
   $template->assign_vars(array(
61 61
     'ID_USER' => $id_user,
62 62
     'POINTS' => $points,
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
   ));
65 65
 };
66 66
 
67
-if($message) {
67
+if ($message) {
68 68
   $template->assign_block_vars('result', array('MESSAGE' => $message, 'STATUS' => $message_status ? $message_status : ERR_NONE));
69 69
 }
70 70
 
Please login to merge, or discard this patch.
artifacts.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -22,9 +22,9 @@  discard block
 block discarded – undo
22 22
 
23 23
 $sn_group_artifacts = sn_get_groups('artifacts');
24 24
 
25
-if(($action = sys_get_param_int('action')) && in_array($unit_id = sys_get_param_int('unit_id'), $sn_group_artifacts))
25
+if (($action = sys_get_param_int('action')) && in_array($unit_id = sys_get_param_int('unit_id'), $sn_group_artifacts))
26 26
 {
27
-  switch($action)
27
+  switch ($action)
28 28
   {
29 29
     case ACTION_BUY:
30 30
       sn_db_transaction_start();
@@ -36,10 +36,10 @@  discard block
 block discarded – undo
36 36
       $darkmater_cost = $build_data[BUILD_CREATE][RES_DARK_MATTER];
37 37
 
38 38
       // TODO: more correct check - with "FOR UPDATE"
39
-      if(mrc_get_level($user, null, RES_DARK_MATTER) >= $darkmater_cost)
39
+      if (mrc_get_level($user, null, RES_DARK_MATTER) >= $darkmater_cost)
40 40
       {
41 41
         $unit_max_stack = get_unit_param($unit_id, P_MAX_STACK);
42
-        if(!isset($unit_max_stack) || $unit_max_stack > mrc_get_level($user, $planetrow, $unit_id))
42
+        if (!isset($unit_max_stack) || $unit_max_stack > mrc_get_level($user, $planetrow, $unit_id))
43 43
         {
44 44
           $db_changeset['unit'][] = sn_db_unit_changeset_prepare($unit_id, 1, $user);
45 45
           db_changeset_apply($db_changeset);
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
 $template = gettemplate('artifacts', true);
75 75
 
76
-foreach($sn_group_artifacts as $artifact_id)
76
+foreach ($sn_group_artifacts as $artifact_id)
77 77
 {
78 78
   $artifact_level = mrc_get_level($user, array(), $artifact_id, true);
79 79
   $build_data = eco_get_build_data($user, $planetrow, $artifact_id, $artifact_level);
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
     $artifact_data = get_unit_param($artifact_id);
82 82
     $artifact_data_bonus = $artifact_data['bonus'];
83 83
     $artifact_data_bonus = $artifact_data_bonus >= 0 ? "+{$artifact_data_bonus}" : "{$artifact_data_bonus}";
84
-    switch($artifact_data['bonus_type'])
84
+    switch ($artifact_data['bonus_type'])
85 85
     {
86 86
       case BONUS_PERCENT:
87 87
         $artifact_data_bonus = "{$artifact_data_bonus}% ";
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -48,13 +48,11 @@
 block discarded – undo
48 48
           header("Location: artifacts.php#{$unit_id}");
49 49
           ob_end_flush();
50 50
           die();
51
-        }
52
-        else
51
+        } else
53 52
         {
54 53
           $Message = $lang['off_maxed_out'];
55 54
         }
56
-      }
57
-      else
55
+      } else
58 56
       {
59 57
         $Message = $lang['sys_no_points'];
60 58
       }
Please login to merge, or discard this patch.
time_probe.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -13,11 +13,11 @@  discard block
 block discarded – undo
13 13
 $time_server = $time_local  - $time_diff
14 14
 */
15 15
 
16
-if($font_size = sys_get_param_str('font_size')) {
17
-  if(strpos($font_size, '%') !== false) {
16
+if ($font_size = sys_get_param_str('font_size')) {
17
+  if (strpos($font_size, '%') !== false) {
18 18
     // Размер шрифта в процентах
19 19
     $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX) . '%';
20
-  } elseif(strpos($font_size, 'px') !== false) {
20
+  } elseif (strpos($font_size, 'px') !== false) {
21 21
     // Размер шрифта в пикселях
22 22
     $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX) . 'px';
23 23
   } else {
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
   classSupernova::$user_options[PLAYER_OPTION_BASE_FONT_SIZE] = $font_size;
30 30
 } else {
31 31
   $user_time_diff = playerTimeDiff::user_time_diff_get();
32
-  if($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
32
+  if ($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
33 33
     $time_diff = intval($user_time_diff[PLAYER_OPTION_TIME_DIFF]);
34 34
   } else {
35 35
     $user_time_diff = playerTimeDiff::user_time_diff_probe();
Please login to merge, or discard this patch.
docs/txt2html.php 2 patches
Spacing   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -1,52 +1,52 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-function dump($value,$varname = "",$level=0,$dumper = "")
3
+function dump($value, $varname = "", $level = 0, $dumper = "")
4 4
 {
5 5
   if ($varname) $varname .= " = ";
6 6
 
7
-  if ($level==-1)
7
+  if ($level == -1)
8 8
   {
9
-    $trans[' ']='&there4;';
10
-    $trans["\t"]='&rArr;';
11
-    $trans["\n"]='&para;;';
12
-    $trans["\r"]='&lArr;';
13
-    $trans["\0"]='&oplus;';
14
-    return strtr(htmlspecialchars($value),$trans);
9
+    $trans[' '] = '&there4;';
10
+    $trans["\t"] = '&rArr;';
11
+    $trans["\n"] = '&para;;';
12
+    $trans["\r"] = '&lArr;';
13
+    $trans["\0"] = '&oplus;';
14
+    return strtr(htmlspecialchars($value), $trans);
15 15
   }
16
-  if ($level==0) $dumper = '<pre>' . $varname;
16
+  if ($level == 0) $dumper = '<pre>' . $varname;
17 17
 
18 18
   $type = gettype($value);
19 19
   $dumper .= $type;
20 20
 
21
-  if ($type=='string')
21
+  if ($type == 'string')
22 22
   {
23
-    $dumper .= '('.strlen($value).')';
24
-    $value = dump($value,"",-1);
23
+    $dumper .= '(' . strlen($value) . ')';
24
+    $value = dump($value, "", -1);
25 25
   }
26
-  elseif ($type=='boolean') $value= ($value?'true':'false');
27
-  elseif ($type=='object')
26
+  elseif ($type == 'boolean') $value = ($value ? 'true' : 'false');
27
+  elseif ($type == 'object')
28 28
   {
29
-    $props= get_class_vars(get_class($value));
30
-    $dumper .= '('.count($props).') <u>'.get_class($value).'</u>';
31
-    foreach($props as $key=>$val)
29
+    $props = get_class_vars(get_class($value));
30
+    $dumper .= '(' . count($props) . ') <u>' . get_class($value) . '</u>';
31
+    foreach ($props as $key=>$val)
32 32
     {
33
-      $dumper .= "\n".str_repeat("\t",$level+1).$key.' => ';
34
-      $dumper .= dump($value->$key,"",$level+1);
33
+      $dumper .= "\n" . str_repeat("\t", $level + 1) . $key . ' => ';
34
+      $dumper .= dump($value->$key, "", $level + 1);
35 35
     }
36
-    $value= '';
36
+    $value = '';
37 37
   }
38
-  elseif ($type=='array')
38
+  elseif ($type == 'array')
39 39
   {
40
-    $dumper .= '('.count($value).')';
41
-    foreach($value as $key=>$val)
40
+    $dumper .= '(' . count($value) . ')';
41
+    foreach ($value as $key=>$val)
42 42
     {
43
-      $dumper .= "\n".str_repeat("\t",$level+1).dump($key,"",-1).' => ';
44
-      $dumper .= dump($val,"",$level+1);
43
+      $dumper .= "\n" . str_repeat("\t", $level + 1) . dump($key, "", -1) . ' => ';
44
+      $dumper .= dump($val, "", $level + 1);
45 45
     }
46
-    $value= '';
46
+    $value = '';
47 47
   }
48 48
   $dumper .= " <b>$value</b>";
49
-  if ($level==0) $dumper .= '</pre>';
49
+  if ($level == 0) $dumper .= '</pre>';
50 50
   return $dumper;
51 51
 }
52 52
 
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
   $output_buffer .= $string;
68 68
 }
69 69
 
70
-if(substr(getcwd(), -4) != 'docs')
70
+if (substr(getcwd(), -4) != 'docs')
71 71
 {
72 72
   $path_prefix = 'docs/';
73 73
 }
@@ -80,22 +80,22 @@  discard block
 block discarded – undo
80 80
 
81 81
 $filename = 'changelog';
82 82
 
83
-$input =  file_get_contents($path_prefix . $filename . '.txt');
83
+$input = file_get_contents($path_prefix . $filename . '.txt');
84 84
 //$input = iconv('CP1251', 'UTF-8', $input);
85 85
 
86 86
 $input = preg_replace("/\r\n\d\d\d\d\-\d\d\-\d\d\ \d\d\:\d\d/", "[D] $0", $input);
87 87
 
88
-while(strpos($input, "\r\n\r\n") !== false)
88
+while (strpos($input, "\r\n\r\n") !== false)
89 89
 {
90 90
   $input = str_replace("\r\n\r\n", "\r\n", $input);
91 91
 }
92
-while(strpos($input, "~~~") !== false)
92
+while (strpos($input, "~~~") !== false)
93 93
 {
94 94
   $input = str_replace("~~~", "~~", $input);
95 95
 }
96 96
 $input = str_replace("\r\n~~", "~~", $input);
97 97
 
98
-while(strpos($input, "===") !== false)
98
+while (strpos($input, "===") !== false)
99 99
 {
100 100
   $input = str_replace("===", "==", $input);
101 101
 }
@@ -106,13 +106,13 @@  discard block
 block discarded – undo
106 106
 $prev_chapter_is_header = false;
107 107
 $output = array();
108 108
 $buffer = array();
109
-foreach($input as &$chapter)
109
+foreach ($input as &$chapter)
110 110
 {
111 111
   $chapter = preg_split("/(\r\n[\[])/", $chapter, -1, PREG_SPLIT_NO_EMPTY); // , PREG_SPLIT_DELIM_CAPTURE
112 112
 
113
-  if(count($chapter) == 1 && !$prev_chapter_is_header)
113
+  if (count($chapter) == 1 && !$prev_chapter_is_header)
114 114
   {
115
-    if(!empty($chapter))
115
+    if (!empty($chapter))
116 116
     {
117 117
       $output[] = $buffer;
118 118
       $buffer = array();
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
   else
124 124
   {
125 125
     $prev_chapter_is_header = false;
126
-    foreach($chapter as &$note)
126
+    foreach ($chapter as &$note)
127 127
     {
128 128
       $note = explode("\r\n", $note);
129 129
       $new_note = true;
@@ -131,13 +131,13 @@  discard block
 block discarded – undo
131 131
 
132 132
       $note_out = array();
133 133
 
134
-      foreach($note as &$line)
134
+      foreach ($note as &$line)
135 135
       {
136
-        if(!$line)
136
+        if (!$line)
137 137
         {
138 138
           continue;
139 139
         }
140
-        if($new_note)
140
+        if ($new_note)
141 141
         {
142 142
           // 78 - 3 = 75
143 143
           $note_out['style'] = $line[0];
@@ -145,9 +145,9 @@  discard block
 block discarded – undo
145 145
         }
146 146
 
147 147
         $buf_str .= $line;
148
-        if(mb_strlen($line, 'utf-8') < ($new_note ? 75 : 79))
148
+        if (mb_strlen($line, 'utf-8') < ($new_note ? 75 : 79))
149 149
         {
150
-          if(!isset($note_out['name']))
150
+          if (!isset($note_out['name']))
151 151
           {
152 152
             $note_out['name'] = $buf_str;
153 153
           }
@@ -201,31 +201,31 @@  discard block
 block discarded – undo
201 201
   'D' => 'date',
202 202
 );
203 203
 
204
-foreach($output as $chapter)
204
+foreach ($output as $chapter)
205 205
 {
206
-  if(!$chapter)
206
+  if (!$chapter)
207 207
   {
208 208
     continue;
209 209
   }
210 210
 
211 211
   buf_print("<h1>{$chapter['name']}</h1>\r\n");
212
-  foreach($chapter['content'] as $block)
212
+  foreach ($chapter['content'] as $block)
213 213
   {
214 214
     buf_print("<div class=\"{$styles[$block['style']]}\">" . ($block['style'] != 'D' ? "[{$block['style']}]&nbsp;" : ''));
215 215
     buf_print(preg_replace("/\s{2,10}/", " ", $block['name']) . '<br />');
216
-    if(isset($block['lines']))
216
+    if (isset($block['lines']))
217 217
     {
218 218
       $last_spaces = '';
219 219
       $depth = array();
220
-      foreach($block['lines'] as $line)
220
+      foreach ($block['lines'] as $line)
221 221
       {
222
-        if(preg_match("/^(\s+)(\d*|\s)\.*\s*(.*)/", $line, $matches))
222
+        if (preg_match("/^(\s+)(\d*|\s)\.*\s*(.*)/", $line, $matches))
223 223
         {
224 224
           //$line = strlen($matches[1]) . '/' . $matches[2] . '/' . $matches[3];
225 225
           $line = $matches[3];
226
-          if(strlen($matches[1]) > strlen($last_spaces))
226
+          if (strlen($matches[1]) > strlen($last_spaces))
227 227
           {
228
-            if($matches[2])
228
+            if ($matches[2])
229 229
             {
230 230
               buf_print("<ol>\r\n");
231 231
             }
@@ -237,9 +237,9 @@  discard block
 block discarded – undo
237 237
             $last_spaces = $matches[1];
238 238
             $depth[] = $matches[2];
239 239
           }
240
-          elseif(strlen($matches[1]) < strlen($last_spaces) && count($depth))
240
+          elseif (strlen($matches[1]) < strlen($last_spaces) && count($depth))
241 241
           {
242
-            if(array_pop($depth))
242
+            if (array_pop($depth))
243 243
             {
244 244
               buf_print("</ol>\r\n");
245 245
             }
@@ -250,14 +250,14 @@  discard block
 block discarded – undo
250 250
             $last_spaces = $matches[1];
251 251
             buf_print('<li>');
252 252
           }
253
-          elseif(strlen($last_spaces) == strlen($matches[1]))
253
+          elseif (strlen($last_spaces) == strlen($matches[1]))
254 254
           {
255
-            if($matches[2] == '' && $depth[count($depth) - 1] != '')
255
+            if ($matches[2] == '' && $depth[count($depth) - 1] != '')
256 256
             {
257 257
               buf_print("</ol>\r\n");
258 258
               buf_print("<ul>\r\n");
259 259
             }
260
-            elseif($matches[2] != '' && $depth[count($depth) - 1] == '')
260
+            elseif ($matches[2] != '' && $depth[count($depth) - 1] == '')
261 261
             {
262 262
               buf_print("</ul>\r\n");
263 263
               buf_print("<ol>\r\n");
@@ -269,9 +269,9 @@  discard block
 block discarded – undo
269 269
         $line = preg_replace("/\s{2,10}/", " ", $line);
270 270
         buf_print($line . "<br />\r\n");
271 271
       }
272
-      while(count($depth))
272
+      while (count($depth))
273 273
       {
274
-        if(array_pop($depth))
274
+        if (array_pop($depth))
275 275
         {
276 276
           buf_print("</ol>\r\n");
277 277
         }
@@ -287,10 +287,10 @@  discard block
 block discarded – undo
287 287
 buf_print("</body>\r\n</html>\r\n");
288 288
 
289 289
 $html = file_get_contents($path_prefix . 'html/' . $filename . '.html');
290
-if($html != $output_buffer)
290
+if ($html != $output_buffer)
291 291
 {
292 292
   file_put_contents($path_prefix . 'html/' . $filename . '.html', $output_buffer);
293
-  if(!$path_prefix)
293
+  if (!$path_prefix)
294 294
   {
295 295
     print($output_buffer);
296 296
   }
Please login to merge, or discard this patch.
Braces   +22 added lines, -26 removed lines patch added patch discarded remove patch
@@ -2,7 +2,9 @@  discard block
 block discarded – undo
2 2
 
3 3
 function dump($value,$varname = "",$level=0,$dumper = "")
4 4
 {
5
-  if ($varname) $varname .= " = ";
5
+  if ($varname) {
6
+    $varname .= " = ";
7
+  }
6 8
 
7 9
   if ($level==-1)
8 10
   {
@@ -13,7 +15,9 @@  discard block
 block discarded – undo
13 15
     $trans["\0"]='&oplus;';
14 16
     return strtr(htmlspecialchars($value),$trans);
15 17
   }
16
-  if ($level==0) $dumper = '<pre>' . $varname;
18
+  if ($level==0) {
19
+    $dumper = '<pre>' . $varname;
20
+  }
17 21
 
18 22
   $type = gettype($value);
19 23
   $dumper .= $type;
@@ -22,9 +26,9 @@  discard block
 block discarded – undo
22 26
   {
23 27
     $dumper .= '('.strlen($value).')';
24 28
     $value = dump($value,"",-1);
25
-  }
26
-  elseif ($type=='boolean') $value= ($value?'true':'false');
27
-  elseif ($type=='object')
29
+  } elseif ($type=='boolean') {
30
+    $value= ($value?'true':'false');
31
+  } elseif ($type=='object')
28 32
   {
29 33
     $props= get_class_vars(get_class($value));
30 34
     $dumper .= '('.count($props).') <u>'.get_class($value).'</u>';
@@ -34,8 +38,7 @@  discard block
 block discarded – undo
34 38
       $dumper .= dump($value->$key,"",$level+1);
35 39
     }
36 40
     $value= '';
37
-  }
38
-  elseif ($type=='array')
41
+  } elseif ($type=='array')
39 42
   {
40 43
     $dumper .= '('.count($value).')';
41 44
     foreach($value as $key=>$val)
@@ -46,7 +49,9 @@  discard block
 block discarded – undo
46 49
     $value= '';
47 50
   }
48 51
   $dumper .= " <b>$value</b>";
49
-  if ($level==0) $dumper .= '</pre>';
52
+  if ($level==0) {
53
+    $dumper .= '</pre>';
54
+  }
50 55
   return $dumper;
51 56
 }
52 57
 
@@ -70,8 +75,7 @@  discard block
 block discarded – undo
70 75
 if(substr(getcwd(), -4) != 'docs')
71 76
 {
72 77
   $path_prefix = 'docs/';
73
-}
74
-else
78
+} else
75 79
 {
76 80
   $path_prefix = '';
77 81
 }
@@ -119,8 +123,7 @@  discard block
 block discarded – undo
119 123
       $buffer['name'] = $chapter[0];
120 124
     }
121 125
     $prev_chapter_is_header = true;
122
-  }
123
-  else
126
+  } else
124 127
   {
125 128
     $prev_chapter_is_header = false;
126 129
     foreach($chapter as &$note)
@@ -150,8 +153,7 @@  discard block
 block discarded – undo
150 153
           if(!isset($note_out['name']))
151 154
           {
152 155
             $note_out['name'] = $buf_str;
153
-          }
154
-          else
156
+          } else
155 157
           {
156 158
             $note_out['lines'][] = $buf_str;
157 159
           }
@@ -228,36 +230,31 @@  discard block
 block discarded – undo
228 230
             if($matches[2])
229 231
             {
230 232
               buf_print("<ol>\r\n");
231
-            }
232
-            else
233
+            } else
233 234
             {
234 235
               buf_print("<ul>\r\n");
235 236
             }
236 237
             buf_print('<li>');
237 238
             $last_spaces = $matches[1];
238 239
             $depth[] = $matches[2];
239
-          }
240
-          elseif(strlen($matches[1]) < strlen($last_spaces) && count($depth))
240
+          } elseif(strlen($matches[1]) < strlen($last_spaces) && count($depth))
241 241
           {
242 242
             if(array_pop($depth))
243 243
             {
244 244
               buf_print("</ol>\r\n");
245
-            }
246
-            else
245
+            } else
247 246
             {
248 247
               buf_print("</ul>\r\n");
249 248
             }
250 249
             $last_spaces = $matches[1];
251 250
             buf_print('<li>');
252
-          }
253
-          elseif(strlen($last_spaces) == strlen($matches[1]))
251
+          } elseif(strlen($last_spaces) == strlen($matches[1]))
254 252
           {
255 253
             if($matches[2] == '' && $depth[count($depth) - 1] != '')
256 254
             {
257 255
               buf_print("</ol>\r\n");
258 256
               buf_print("<ul>\r\n");
259
-            }
260
-            elseif($matches[2] != '' && $depth[count($depth) - 1] == '')
257
+            } elseif($matches[2] != '' && $depth[count($depth) - 1] == '')
261 258
             {
262 259
               buf_print("</ul>\r\n");
263 260
               buf_print("<ol>\r\n");
@@ -274,8 +271,7 @@  discard block
 block discarded – undo
274 271
         if(array_pop($depth))
275 272
         {
276 273
           buf_print("</ol>\r\n");
277
-        }
278
-        else
274
+        } else
279 275
         {
280 276
           buf_print("</ul>\r\n");
281 277
         }
Please login to merge, or discard this patch.