Completed
Push — work-fleets ( 961997...006942 )
by SuperNova.WS
06:22
created
admin/planet_edit.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -4,16 +4,16 @@  discard block
 block discarded – undo
4 4
 define('INSTALL', false);
5 5
 define('IN_ADMIN', true);
6 6
 
7
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
7
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
8 8
 
9 9
 // if($user['authlevel'] < 2)
10
-if($user['authlevel'] < 3)
10
+if ($user['authlevel'] < 3)
11 11
 {
12 12
   AdminMessage(classLocale::$lang['adm_err_denied']);
13 13
 }
14 14
 AdminMessage('Временно не работает');
15 15
 
16
-require("includes/admin_planet_edit.inc" . DOT_PHP_EX);
16
+require("includes/admin_planet_edit.inc".DOT_PHP_EX);
17 17
 
18 18
 $template = gettemplate('admin/admin_planet_edit', true);
19 19
 
@@ -21,30 +21,30 @@  discard block
 block discarded – undo
21 21
 $planet_id = sys_get_param_id('planet_id');
22 22
 
23 23
 $unit_list = sys_get_param('unit_list');
24
-if(sys_get_param('change_data') && !empty($unit_list))
24
+if (sys_get_param('change_data') && !empty($unit_list))
25 25
 {
26 26
   $query_string = array();
27
-  foreach($unit_list as $unit_id => $unit_amount)
27
+  foreach ($unit_list as $unit_id => $unit_amount)
28 28
   {
29
-    if($unit_query_string = admin_planet_edit_query_string($unit_id, $unit_amount, $mode))
29
+    if ($unit_query_string = admin_planet_edit_query_string($unit_id, $unit_amount, $mode))
30 30
     {
31 31
       $query_string[] = $unit_query_string;
32 32
     }
33 33
   }
34 34
 
35
-  if(!empty($query_string))
35
+  if (!empty($query_string))
36 36
   {
37
-    classSupernova::$db->doUpdateReallyComplex("UPDATE {{" . TABLE_PLANETS . "}} SET " . implode(', ', $query_string) . " WHERE `id` = {$planet_id}");
37
+    classSupernova::$db->doUpdateReallyComplex("UPDATE {{".TABLE_PLANETS."}} SET ".implode(', ', $query_string)." WHERE `id` = {$planet_id}");
38 38
   }
39 39
 }
40 40
 
41
-if($planet_id)
41
+if ($planet_id)
42 42
 {
43 43
   $edit_planet_row = DBStaticPlanet::db_planet_by_id($planet_id);
44 44
   admin_planet_edit_template($template, $edit_planet_row, $mode);
45 45
 }
46 46
 
47
-foreach($admin_planet_edit_mode_list as $page_mode => $mode_locale)
47
+foreach ($admin_planet_edit_mode_list as $page_mode => $mode_locale)
48 48
 {
49 49
   $template->assign_block_vars('page_menu', array(
50 50
     'ID' => $page_mode,
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 $template->assign_vars(array(
56 56
   'MODE' => $mode,
57 57
   'PLANET_ID' => $planet_id,
58
-  'PLANET_NAME' => empty($edit_planet_row) ? '' : classLocale::$lang['sys_planet_type'][$edit_planet_row['planet_type']] . ' ' . uni_render_planet($edit_planet_row),
58
+  'PLANET_NAME' => empty($edit_planet_row) ? '' : classLocale::$lang['sys_planet_type'][$edit_planet_row['planet_type']].' '.uni_render_planet($edit_planet_row),
59 59
   'PAGE_HINT' => classLocale::$lang['adm_planet_edit_hint'],
60 60
 ));
61 61
 
Please login to merge, or discard this patch.
includes/alliance/ali_internal_admin.inc 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
3
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
4 4
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
5 5
 }
6 6
 
7
-if(!$user_admin) {
7
+if (!$user_admin) {
8 8
   message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
9 9
 }
10 10
 
@@ -20,11 +20,11 @@  discard block
 block discarded – undo
20 20
 $allyTextID = ($allyTextID < 1 || $allyTextID > 3) ? 1 : $allyTextID;
21 21
 
22 22
 
23
-if(sys_get_param_str('isSaveOptions')) {
23
+if (sys_get_param_str('isSaveOptions')) {
24 24
   require_once('includes/includes/sys_avatar.php');
25 25
 
26 26
   $fieldChange = array();
27
-  if(($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) != $ally['ally_tag']) {
27
+  if (($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) != $ally['ally_tag']) {
28 28
     $fieldChange['ally_tag'] = $new_tag;
29 29
     DBStaticUser::db_user_set_by_id(
30 30
       $ally['ally_user_id'],
@@ -33,19 +33,19 @@  discard block
 block discarded – undo
33 33
       )
34 34
     );
35 35
   }
36
-  if(($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) != $ally['ally_name']) {
36
+  if (($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) != $ally['ally_name']) {
37 37
     $fieldChange['ally_name'] = $new_name;
38 38
   }
39 39
 
40
-  if(($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) != $ally['ally_owner_range']) {
40
+  if (($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) != $ally['ally_owner_range']) {
41 41
     $fieldChange['ally_owner_range'] = $new_owner_rank;
42 42
   }
43 43
 
44
-  if(($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) != $ally['ally_web']) {
44
+  if (($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) != $ally['ally_web']) {
45 45
     $fieldChange['ally_web'] = $new_web;
46 46
   }
47 47
 
48
-  if(($new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow'])) != $ally['ally_request_notallow']) {
48
+  if (($new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow'])) != $ally['ally_request_notallow']) {
49 49
     $fieldChange['ally_request_notallow'] = sys_get_param_int('request_notallow', $ally['ally_request_notallow']);
50 50
   }
51 51
 
@@ -55,11 +55,11 @@  discard block
 block discarded – undo
55 55
     'AVATAR_UPLOAD_STATUS'  => $avatar_upload_result['STATUS'],
56 56
     'AVATAR_UPLOAD_MESSAGE' => $avatar_upload_result['MESSAGE'],
57 57
   ));
58
-  if($new_image != $ally['ally_image']) {
58
+  if ($new_image != $ally['ally_image']) {
59 59
     $fieldChange['ally_image'] = $new_image;
60 60
   }
61 61
 
62
-  if(!empty($fieldChange)) {
62
+  if (!empty($fieldChange)) {
63 63
     classSupernova::$db->doUpdateRowSet(
64 64
       TABLE_ALLIANCE,
65 65
       $fieldChange,
@@ -70,17 +70,17 @@  discard block
 block discarded – undo
70 70
 
71 71
     sys_redirect('alliance.php?mode=admin&edit=ally');
72 72
   }
73
-} elseif(sys_get_param_str('isSaveText')) {
73
+} elseif (sys_get_param_str('isSaveText')) {
74 74
   $text_unsafe = sys_get_param_str_unsafe('text');
75 75
   DBStaticAlly::db_ally_update_texts($text_unsafe, $ally['id'], $text_list[$allyTextID]['db_field']);
76 76
   $ally[$text_list[$allyTextID]['db_field']] = db_escape($text_unsafe);
77
-} elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) {
78
-  if(!$isAllyOwner) {
77
+} elseif (sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) {
78
+  if (!$isAllyOwner) {
79 79
     message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
80 80
   }
81 81
 
82 82
   $newLeader = DBStaticUser::db_user_by_id($idNewLeader, false, `ally_id`);
83
-  if($newLeader['ally_id'] == $user['ally_id']) {
83
+  if ($newLeader['ally_id'] == $user['ally_id']) {
84 84
     sn_db_transaction_start();
85 85
     DBStaticUser::db_user_set_by_id(
86 86
       $user['id'],
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
99 99
     sn_db_transaction_commit();
100 100
     sys_redirect('alliance.php');
101 101
   }
102
-} elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) {
103
-  if(!$isAllyOwner) {
102
+} elseif (sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) {
103
+  if (!$isAllyOwner) {
104 104
     message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
105 105
   }
106 106
   sn_db_transaction_start();
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 $request = DBStaticAlly::db_ally_request_count_by_id($ally);
124 124
 
125 125
 $template->assign_vars(array(
126
-  'request_count'           => $request['request_count'] ? classLocale::$lang['ali_req_requestCount'] . ': ' . intval($request['request_count']) . '. ' . classLocale::$lang['ali_req_check'] : classLocale::$lang['ali_req_emptyList'],
126
+  'request_count'           => $request['request_count'] ? classLocale::$lang['ali_req_requestCount'].': '.intval($request['request_count']).'. '.classLocale::$lang['ali_req_check'] : classLocale::$lang['ali_req_emptyList'],
127 127
   'text'                    => $ally[$text_list[$allyTextID]['db_field']],
128 128
   'request_type'            => classLocale::$lang[$text_list[$allyTextID]['text_type']],
129 129
   't'                       => $allyTextID,
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
   $userAllyAdmins = DBStaticUser::db_user_list("`ally_id`= {$ally['id']}", false, '`id`, `username`');
157 157
   unset($tmp);
158 158
   // while ($userAllyAdmin = db_fetch($userAllyAdmins))
159
-  foreach($userAllyAdmins as $userAllyAdmin) {
159
+  foreach ($userAllyAdmins as $userAllyAdmin) {
160 160
 // pdump($userAllyAdmin);
161 161
     $tmp .= "<option value={$userAllyAdmin['id']}>{$userAllyAdmin['username']}</option>";
162 162
   }
@@ -164,8 +164,8 @@  discard block
 block discarded – undo
164 164
   $template->assign_var('adminMembers', $tmp);
165 165
 }
166 166
 
167
-foreach($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale) {
168
-  if(!$sn_ali_admin_action_locale['title']) {
167
+foreach ($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale) {
168
+  if (!$sn_ali_admin_action_locale['title']) {
169 169
     continue;
170 170
   }
171 171
   $template->assign_block_vars('admin_actions', array(
Please login to merge, or discard this patch.
includes/alliance/ali_external_create_ally.inc 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 // Pretty Safe
3 3
 // TODO: Add ally_tag to usertable
4 4
 
5
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
5
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
6 6
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
7 7
 }
8 8
 
@@ -11,13 +11,13 @@  discard block
 block discarded – undo
11 11
 $ally_name_unsafe = sys_get_param_str_unsafe('name');
12 12
 $ally_name = db_escape($ally_name_unsafe);
13 13
 
14
-if($ally_tag) {
15
-  if(!$ally_name_unsafe || !$ally_tag_unsafe) {
14
+if ($ally_tag) {
15
+  if (!$ally_name_unsafe || !$ally_tag_unsafe) {
16 16
     message(classLocale::$lang['have_not_name'], classLocale::$lang['make_alliance']);
17 17
   }
18 18
 
19 19
   $query = DBStaticAlly::db_ally_get_by_name_or_tag($ally_tag, $ally_name);
20
-  if($query) {
20
+  if ($query) {
21 21
     message(str_replace('%s', $query['ally_tag'] == $ally_tag_unsafe ? $ally_tag_unsafe : $ally_name_unsafe, classLocale::$lang['always_exist']), classLocale::$lang['make_alliance']);
22 22
   }
23 23
 
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 
36 36
 
37 37
   $ally_user = classSupernova::$gc->cacheOperator->db_ins_record(LOC_USER, array(
38
-    'username'      => "[" . $ally_tag_unsafe . "]",
38
+    'username'      => "[".$ally_tag_unsafe."]",
39 39
     'register_time' => SN_TIME_NOW,
40 40
     'user_as_ally'  => $ally_id,
41 41
   ));
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
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
3
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
4 4
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
5 5
 }
6 6
 
@@ -8,13 +8,13 @@  discard block
 block discarded – undo
8 8
   message(classLocale::$lang['Denied_access'], classLocale::$lang['requests_admin']);
9 9
 }
10 10
 
11
-if($d = sys_get_param_id('d')) {
11
+if ($d = sys_get_param_id('d')) {
12 12
   DBStaticAlly::db_ally_request_deny($d);
13 13
 }
14 14
 
15 15
 $id_user = sys_get_param_id('id_user');
16 16
 
17
-if($id_user) {
17
+if ($id_user) {
18 18
   DBStaticUser::db_user_set_by_id(
19 19
     $id_user,
20 20
     array(
Please login to merge, or discard this patch.
includes/functions/rpg_points.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -54,16 +54,16 @@
 block discarded – undo
54 54
           $comment = call_user_func_array('sprintf', $comment);
55 55
         }
56 56
 //        mm_points_change($user_id, $change_type, -$metamatter_to_reduce, 'ММ в ТМ: ' . (-$dark_matter) . ' ТМ = ' . $dark_matter_exists . ' ТМ + ' . $metamatter_to_reduce . ' ММ. ' . $comment);
57
-        classSupernova::$auth->account->metamatter_change($change_type, -$metamatter_to_reduce, 'ММ в ТМ: ' . (-$dark_matter) . ' ТМ = ' . $dark_matter_exists . ' ТМ + ' . $metamatter_to_reduce . ' ММ. ' . $comment);
57
+        classSupernova::$auth->account->metamatter_change($change_type, -$metamatter_to_reduce, 'ММ в ТМ: '.(-$dark_matter).' ТМ = '.$dark_matter_exists.' ТМ + '.$metamatter_to_reduce.' ММ. '.$comment);
58 58
         $dark_matter = -$dark_matter_exists;
59 59
       }
60 60
     } else {
61 61
       $changeset['dark_matter_total'] = +$dark_matter;
62 62
     }
63
-    if($dark_matter) {
63
+    if ($dark_matter) {
64 64
       $changeset[$sn_data_dark_matter_db_name] = +$dark_matter;
65 65
     }
66
-    if(!empty($changeset)) {
66
+    if (!empty($changeset)) {
67 67
       DBStaticUser::db_user_adjust_by_id($user_id, $changeset);
68 68
     }
69 69
     $rows_affected = classSupernova::$db->db_affected_rows();
Please login to merge, or discard this patch.
includes/pages/options.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 
13 13
   $language_new = sys_get_param_str('langer', $user['lang']);
14 14
 
15
-  if($language_new != $user['lang']) {
15
+  if ($language_new != $user['lang']) {
16 16
     classLocale::$lang->lng_switch($language_new);
17 17
   }
18 18
 
@@ -21,8 +21,8 @@  discard block
 block discarded – undo
21 21
 
22 22
   $FMT_DATE = preg_replace(array('/d/', '/m/', '/Y/'), array('DD', 'MM', 'YYYY'), FMT_DATE);
23 23
 
24
-  if(sys_get_param_str('mode') == 'change') {
25
-    if($user['authlevel'] > 0) {
24
+  if (sys_get_param_str('mode') == 'change') {
25
+    if ($user['authlevel'] > 0) {
26 26
       $planet_protection = sys_get_param_int('adm_pl_prot') ? $user['authlevel'] : 0;
27 27
       DBStaticPlanet::db_planet_set_by_owner(
28 28
         $user['id'],
@@ -39,27 +39,27 @@  discard block
 block discarded – undo
39 39
       );
40 40
     }
41 41
 
42
-    if(sys_get_param_int('vacation') && !classSupernova::$config->user_vacation_disable) {
42
+    if (sys_get_param_int('vacation') && !classSupernova::$config->user_vacation_disable) {
43 43
       sn_db_transaction_start();
44
-      if($user['authlevel'] < 3) {
45
-        if($user['vacation_next'] > SN_TIME_NOW) {
44
+      if ($user['authlevel'] < 3) {
45
+        if ($user['vacation_next'] > SN_TIME_NOW) {
46 46
           message(classLocale::$lang['opt_vacation_err_timeout'], classLocale::$lang['Error'], 'index.php?page=options', 5);
47 47
           die();
48 48
         }
49 49
 
50
-        if(FleetList::fleet_count_flying($user['id'])) {
50
+        if (FleetList::fleet_count_flying($user['id'])) {
51 51
           message(classLocale::$lang['opt_vacation_err_your_fleet'], classLocale::$lang['Error'], 'index.php?page=options', 5);
52 52
           die();
53 53
         }
54 54
 
55 55
         $que = que_get($user['id'], false);
56
-        if(!empty($que)) {
56
+        if (!empty($que)) {
57 57
           message(classLocale::$lang['opt_vacation_err_que'], classLocale::$lang['Error'], 'index.php?page=options', 5);
58 58
           die();
59 59
         }
60 60
 
61 61
         $query = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_PLANET, "`id_owner` = {$user['id']}");
62
-        foreach($query as $planet) {
62
+        foreach ($query as $planet) {
63 63
           $classConfig = classSupernova::$config;
64 64
           DBStaticPlanet::db_planet_update_set_by_id(
65 65
             $planet['id'],
@@ -87,9 +87,9 @@  discard block
 block discarded – undo
87 87
       sn_db_transaction_commit();
88 88
     }
89 89
 
90
-    foreach($user_option_list as $option_group_id => $option_group) {
91
-      foreach($option_group as $option_name => $option_value) {
92
-        if($user[$option_name] !== null) {
90
+    foreach ($user_option_list as $option_group_id => $option_group) {
91
+      foreach ($option_group as $option_name => $option_value) {
92
+        if ($user[$option_name] !== null) {
93 93
           $user[$option_name] = sys_get_param_str($option_name);
94 94
         } else {
95 95
           $user[$option_name] = $option_value;
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
100 100
 
101 101
 
102 102
     $player_options = sys_get_param('options');
103
-    if(!empty($player_options)) {
104
-      array_walk($player_options, function (&$value) {
103
+    if (!empty($player_options)) {
104
+      array_walk($player_options, function(&$value) {
105 105
         // TODO - Когда будет больше параметров - сделать больше проверок
106 106
         $value = intval($value);
107 107
       });
@@ -112,15 +112,15 @@  discard block
 block discarded – undo
112 112
 
113 113
     $username = substr(sys_get_param_str_unsafe('username'), 0, 32);
114 114
     $username_safe = db_escape($username);
115
-    if($username && $user['username'] != $username && classSupernova::$config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_NONE && sys_get_param_int('username_confirm') && !strpbrk($username, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
115
+    if ($username && $user['username'] != $username && classSupernova::$config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_NONE && sys_get_param_int('username_confirm') && !strpbrk($username, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
116 116
       // проверка на корректность
117 117
       sn_db_transaction_start();
118 118
       $name_check = db_player_name_history_get_name_by_name($username_safe);
119
-      if(!$name_check || $name_check['player_id'] == $user['id']) {
119
+      if (!$name_check || $name_check['player_id'] == $user['id']) {
120 120
         $user = DBStaticUser::db_user_by_id($user['id'], true);
121
-        switch(classSupernova::$config->game_user_changename) {
121
+        switch (classSupernova::$config->game_user_changename) {
122 122
           case SERVER_PLAYER_NAME_CHANGE_PAY:
123
-            if(mrc_get_level($user, $planetrow, RES_DARK_MATTER) < classSupernova::$config->game_user_changename_cost) {
123
+            if (mrc_get_level($user, $planetrow, RES_DARK_MATTER) < classSupernova::$config->game_user_changename_cost) {
124 124
               $template_result['.']['result'][] = array(
125 125
                 'STATUS'  => ERR_ERROR,
126 126
                 'MESSAGE' => classLocale::$lang['opt_msg_name_change_err_no_dm'],
@@ -156,18 +156,18 @@  discard block
 block discarded – undo
156 156
       sn_db_transaction_commit();
157 157
     }
158 158
 
159
-    if($new_password = sys_get_param('newpass1')) {
159
+    if ($new_password = sys_get_param('newpass1')) {
160 160
       try {
161
-        if($new_password != sys_get_param('newpass2')) {
161
+        if ($new_password != sys_get_param('newpass2')) {
162 162
           throw new Exception(classLocale::$lang['opt_err_pass_unmatched'], ERR_WARNING);
163 163
         }
164 164
 
165
-        if(!classSupernova::$auth->password_change(sys_get_param('db_password'), $new_password)) {
165
+        if (!classSupernova::$auth->password_change(sys_get_param('db_password'), $new_password)) {
166 166
           throw new Exception(classLocale::$lang['opt_err_pass_wrong'], ERR_WARNING);
167 167
         }
168 168
 
169 169
         throw new Exception(classLocale::$lang['opt_msg_pass_changed'], ERR_NONE);
170
-      } catch(Exception $e) {
170
+      } catch (Exception $e) {
171 171
         $template_result['.']['result'][] = array(
172 172
           'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
173 173
           'MESSAGE' => $e->getMessage()
@@ -189,12 +189,12 @@  discard block
 block discarded – undo
189 189
     $user['gender'] = $user['gender'] == GENDER_UNKNOWN ? $gender : $user['gender'];
190 190
 
191 191
     try {
192
-      if($user['birthday']) {
192
+      if ($user['birthday']) {
193 193
         throw new exception();
194 194
       }
195 195
 
196 196
       $user_birthday = sys_get_param_str_unsafe('user_birthday');
197
-      if(!$user_birthday || $user_birthday == $FMT_DATE) {
197
+      if (!$user_birthday || $user_birthday == $FMT_DATE) {
198 198
         throw new exception();
199 199
       }
200 200
 
@@ -204,16 +204,16 @@  discard block
 block discarded – undo
204 204
       $pos['Y'] = strpos(FMT_DATE, 'Y');
205 205
       asort($pos);
206 206
       $i = 0;
207
-      foreach($pos as &$position) {
207
+      foreach ($pos as &$position) {
208 208
         $position = ++$i;
209 209
       }
210 210
 
211
-      $regexp = "/" . preg_replace(array('/\\\\/', '/\//', '/\./', '/\-/', '/d/', '/m/', '/Y/'), array('\\\\\\', '\/', '\.', '\-', '(\d?\d)', '(\d?\d)', '(\d{4})'), FMT_DATE) . "/";
212
-      if(!preg_match($regexp, $user_birthday, $match)) {
211
+      $regexp = "/".preg_replace(array('/\\\\/', '/\//', '/\./', '/\-/', '/d/', '/m/', '/Y/'), array('\\\\\\', '\/', '\.', '\-', '(\d?\d)', '(\d?\d)', '(\d{4})'), FMT_DATE)."/";
212
+      if (!preg_match($regexp, $user_birthday, $match)) {
213 213
         throw new exception();
214 214
       }
215 215
 
216
-      if(!checkdate($match[$pos['m']], $match[$pos['d']], $match[$pos['Y']])) {
216
+      if (!checkdate($match[$pos['m']], $match[$pos['d']], $match[$pos['Y']])) {
217 217
         throw new exception();
218 218
       }
219 219
 
@@ -221,12 +221,12 @@  discard block
 block discarded – undo
221 221
       // EOF black magic! Now we have valid SQL date in $user['user_birthday'] - independent of date format
222 222
 
223 223
       $year = date('Y', SN_TIME_NOW);
224
-      if(mktime(0, 0, 0, $match[$pos['m']], $match[$pos['d']], $year) > SN_TIME_NOW) {
224
+      if (mktime(0, 0, 0, $match[$pos['m']], $match[$pos['d']], $year) > SN_TIME_NOW) {
225 225
         $year--;
226 226
       }
227 227
       $user['user_birthday_celebrated'] = "{$year}-{$match[$pos['m']]}-{$match[$pos['d']]}";
228 228
 
229
-    } catch(Exception $e) {
229
+    } catch (Exception $e) {
230 230
     }
231 231
 
232 232
     require_once('includes/includes/sys_avatar.php');
@@ -235,14 +235,14 @@  discard block
 block discarded – undo
235 235
     $template_result['.']['result'][] = $avatar_upload_result;
236 236
 
237 237
     $user_time_diff = playerTimeDiff::user_time_diff_get();
238
-    if(sys_get_param_int('PLAYER_OPTION_TIME_DIFF_FORCED')) {
238
+    if (sys_get_param_int('PLAYER_OPTION_TIME_DIFF_FORCED')) {
239 239
       playerTimeDiff::user_time_diff_set(array(
240 240
         PLAYER_OPTION_TIME_DIFF              => sys_get_param_int('PLAYER_OPTION_TIME_DIFF'),
241 241
         PLAYER_OPTION_TIME_DIFF_UTC_OFFSET   => 0,
242 242
         PLAYER_OPTION_TIME_DIFF_FORCED       => 1,
243 243
         PLAYER_OPTION_TIME_DIFF_MEASURE_TIME => SN_TIME_SQL,
244 244
       ));
245
-    } elseif(sys_get_param_int('opt_time_diff_clear') || $user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
245
+    } elseif (sys_get_param_int('opt_time_diff_clear') || $user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
246 246
       playerTimeDiff::user_time_diff_set(array(
247 247
         PLAYER_OPTION_TIME_DIFF              => '',
248 248
         PLAYER_OPTION_TIME_DIFF_UTC_OFFSET   => 0,
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
       'STATUS'  => ERR_NONE,
274 274
       'MESSAGE' => classLocale::$lang['opt_msg_saved']
275 275
     );
276
-  } elseif(sys_get_param_str('result') == 'ok') {
276
+  } elseif (sys_get_param_str('result') == 'ok') {
277 277
     $template_result['.']['result'][] = array(
278 278
       'STATUS'  => ERR_NONE,
279 279
       'MESSAGE' => classLocale::$lang['opt_msg_saved']
@@ -296,9 +296,9 @@  discard block
 block discarded – undo
296 296
 
297 297
   $template = gettemplate('options', $template);
298 298
 
299
-  $dir = dir(SN_ROOT_PHYSICAL . 'skins');
300
-  while(($entry = $dir->read()) !== false) {
301
-    if(is_dir("skins/{$entry}") && $entry[0] != '.') {
299
+  $dir = dir(SN_ROOT_PHYSICAL.'skins');
300
+  while (($entry = $dir->read()) !== false) {
301
+    if (is_dir("skins/{$entry}") && $entry[0] != '.') {
302 302
       $template_result['.']['skin_list'][] = array(
303 303
         'VALUE'    => $entry,
304 304
         'NAME'     => $entry,
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
   }
309 309
   $dir->close();
310 310
 
311
-  foreach(classLocale::$lang['opt_planet_sort_options'] as $key => &$value) {
311
+  foreach (classLocale::$lang['opt_planet_sort_options'] as $key => &$value) {
312 312
     $template_result['.']['planet_sort_options'][] = array(
313 313
       'VALUE'    => $key,
314 314
       'NAME'     => $value,
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
     );
317 317
   }
318 318
 
319
-  foreach(classLocale::$lang['sys_gender_list'] as $key => $value) {
319
+  foreach (classLocale::$lang['sys_gender_list'] as $key => $value) {
320 320
     $template_result['.']['gender_list'][] = array(
321 321
       'VALUE'    => $key,
322 322
       'NAME'     => $value,
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
   }
326 326
 
327 327
   $lang_list = lng_get_list();
328
-  foreach($lang_list as $lang_id => $lang_data) {
328
+  foreach ($lang_list as $lang_id => $lang_data) {
329 329
     $template_result['.']['languages'][] = array(
330 330
       'VALUE'    => $lang_id,
331 331
       'NAME'     => $lang_data['LANG_NAME_NATIVE'],
@@ -334,8 +334,8 @@  discard block
 block discarded – undo
334 334
   }
335 335
 
336 336
 
337
-  if(isset(classLocale::$lang['menu_customize_show_hide_button_state'])) {
338
-    foreach(classLocale::$lang['menu_customize_show_hide_button_state'] as $key => $value) {
337
+  if (isset(classLocale::$lang['menu_customize_show_hide_button_state'])) {
338
+    foreach (classLocale::$lang['menu_customize_show_hide_button_state'] as $key => $value) {
339 339
       $template->assign_block_vars('menu_customize_show_hide_button_state', array(
340 340
         'ID'   => $key,
341 341
         'NAME' => $value,
@@ -442,10 +442,10 @@  discard block
 block discarded – undo
442 442
     'PAGE_HEADER' => classLocale::$lang['opt_header'],
443 443
   ));
444 444
 
445
-  foreach($user_option_list as $option_group_id => $option_group) {
446
-    if($option_group_id == OPT_MESSAGE) {
447
-      foreach(DBStaticMessages::$snMessageClassList as $message_class_id => $message_class_data) {
448
-        if($message_class_data['switchable'] || ($message_class_data['email'] && classSupernova::$config->game_email_pm)) {
445
+  foreach ($user_option_list as $option_group_id => $option_group) {
446
+    if ($option_group_id == OPT_MESSAGE) {
447
+      foreach (DBStaticMessages::$snMessageClassList as $message_class_id => $message_class_data) {
448
+        if ($message_class_data['switchable'] || ($message_class_data['email'] && classSupernova::$config->game_email_pm)) {
449 449
           $option_name = $message_class_data['name'];
450 450
 
451 451
           $template->assign_block_vars("options_{$option_group_id}", array(
@@ -457,8 +457,8 @@  discard block
 block discarded – undo
457 457
         }
458 458
       }
459 459
     } else {
460
-      foreach($option_group as $option_name => $option_value) {
461
-        if(array_key_exists($option_name, $user_option_types)) {
460
+      foreach ($option_group as $option_name => $option_value) {
461
+        if (array_key_exists($option_name, $user_option_types)) {
462 462
           $option_type = $user_option_types[$option_name];
463 463
         } else {
464 464
           $option_type = 'switch';
Please login to merge, or discard this patch.
includes/pages/chat.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
   $user_auth_level = isset($user['authlevel']) ? $user['authlevel'] : AUTH_LEVEL_ANONYMOUS;
37 37
 
38 38
   $mode = sys_get_param_int('mode');
39
-  switch($mode) {
39
+  switch ($mode) {
40 40
     case CHAT_MODE_ALLY:
41 41
       $template_result['ALLY'] = intval($user['ally_id']);
42 42
       $page_title = classLocale::$lang['chat_ally'];
@@ -49,12 +49,12 @@  discard block
 block discarded – undo
49 49
   }
50 50
 
51 51
   $template_result['.']['smiles'] = array();
52
-  foreach(classSupernova::$design['smiles'] as $auth_level => $replaces) {
53
-    if($auth_level > $user_auth_level) {
52
+  foreach (classSupernova::$design['smiles'] as $auth_level => $replaces) {
53
+    if ($auth_level > $user_auth_level) {
54 54
       continue;
55 55
     }
56 56
 
57
-    foreach($replaces as $bbcode => $filename) {
57
+    foreach ($replaces as $bbcode => $filename) {
58 58
       $template_result['.']['smiles'][] = array(
59 59
         'BBCODE'   => $bbcode,
60 60
         'FILENAME' => $filename,
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
   define('IN_AJAX', true);
78 78
   $skip_fleet_update = true;
79 79
 
80
-  if(
80
+  if (
81 81
     classSupernova::$config->getMode() != CACHER_NO_CACHE
82 82
     &&
83 83
     classSupernova::$config->chat_timeout
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
     die();
88 88
   }
89 89
 
90
-  if(($message = sys_get_param_str('message')) && $user['username']) {
90
+  if (($message = sys_get_param_str('message')) && $user['username']) {
91 91
     $ally_id = sys_get_param('ally') && $user['ally_id'] ? $user['ally_id'] : 0;
92 92
     $nickUnsafe = player_nick_compact(player_nick_render_current_to_array($user, array('color' => true, 'icons' => true, 'ally' => !$ally_id)));
93 93
 
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
   $skip_fleet_update = true;
110 110
 
111 111
   $history = sys_get_param_str('history');
112
-  if(!$history) {
112
+  if (!$history) {
113 113
     classSupernova::$config->array_set('users', $user['id'], 'chat_last_refresh', SN_TIME_MICRO);
114 114
   }
115 115
 
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
   $last_message = '';
118 118
   $alliance = 0;
119 119
   $template_result['.']['chat'] = array();
120
-  if(
120
+  if (
121 121
     !$history
122 122
     &&
123 123
     classSupernova::$config->getMode() != CACHER_NO_CACHE
@@ -138,11 +138,11 @@  discard block
 block discarded – undo
138 138
 
139 139
     $where_add = '';
140 140
     $last_message = 0;
141
-    if($history) {
141
+    if ($history) {
142 142
       $rows = DBStaticChat::db_chat_message_count_by_ally($alliance);
143 143
       $page_count = ceil($rows['CNT'] / $page_limit);
144 144
 
145
-      for($i = 0; $i < $page_count; $i++) {
145
+      for ($i = 0; $i < $page_count; $i++) {
146 146
         $template_result['.']['page'][] = array(
147 147
           'NUMBER' => $i
148 148
         );
@@ -156,12 +156,12 @@  discard block
 block discarded – undo
156 156
 
157 157
     $start_row = $page * $page_limit;
158 158
     $query = DBStaticChat::db_chat_message_get_page($alliance, $where_add, $start_row, $page_limit);
159
-    while($chat_row = db_fetch($query)) {
159
+    while ($chat_row = db_fetch($query)) {
160 160
       // Little magik here - to retain HTML codes from DB and stripping HTML codes from nick
161 161
       $chat_row['user'] = player_nick_render_to_html($chat_row['user']);
162 162
       $nick_stripped = htmlentities(strip_tags($chat_row['user']), ENT_QUOTES, 'utf-8');
163 163
       $nick = str_replace(strip_tags($chat_row['user']), $nick_stripped, $chat_row['user']);
164
-      if(!$history) {
164
+      if (!$history) {
165 165
         $nick = "<span style=\"cursor: pointer;\" onclick=\"addSmiley('({$nick_stripped})');\">{$nick}</span>";
166 166
       }
167 167
 
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
   $template = gettemplate('chat_messages', $template);
187 187
   $template->assign_recursive($template_result);
188 188
 
189
-  if($history) {
189
+  if ($history) {
190 190
     display($template, "{$classLocale['chat_history']} - {$classLocale[$alliance ? 'chat_ally' : 'chat_common']}", true, '', false, true);
191 191
   } else {
192 192
     $result['last_message'] = $last_message;
Please login to merge, or discard this patch.
includes/init/init_functions.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 // ------------------------------------------------------------------------------------------------------------------------------
4 4
 function sn_sys_load_php_files($dir_name, $load_extension = '.php', $modules = false) {
5
-  if(!file_exists($dir_name) || !is_dir($dir_name)) {
5
+  if (!file_exists($dir_name) || !is_dir($dir_name)) {
6 6
     return;
7 7
   }
8 8
 
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
       continue;
13 13
     }
14 14
 
15
-    $full_filename = $dir_name . $file;
15
+    $full_filename = $dir_name.$file;
16 16
     if ($modules && is_dir($full_filename)) {
17 17
       if (file_exists($full_filename = "{$full_filename}/{$file}{$load_extension}")) {
18 18
         require_once($full_filename);
@@ -38,12 +38,12 @@  discard block
 block discarded – undo
38 38
  *
39 39
  */
40 40
 function init_update() {
41
-  $update_file = SN_ROOT_PHYSICAL . "includes/update" . DOT_PHP_EX;
42
-  if(file_exists($update_file)) {
43
-    if(filemtime($update_file) > classSupernova::$config->db_loadItem('var_db_update') || classSupernova::$config->db_loadItem('db_version') < DB_VERSION) {
44
-      if(defined('IN_ADMIN')) {
41
+  $update_file = SN_ROOT_PHYSICAL."includes/update".DOT_PHP_EX;
42
+  if (file_exists($update_file)) {
43
+    if (filemtime($update_file) > classSupernova::$config->db_loadItem('var_db_update') || classSupernova::$config->db_loadItem('db_version') < DB_VERSION) {
44
+      if (defined('IN_ADMIN')) {
45 45
         sn_db_transaction_start(); // Для защиты от двойного запуска апдейта - начинаем транзакцию. Так запись в базе будет блокирована
46
-        if(SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_db_update_end')) {
46
+        if (SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_db_update_end')) {
47 47
           classSupernova::$config->db_saveItem('var_db_update_end', SN_TIME_NOW + (classSupernova::$config->upd_lock_time ? classSupernova::$config->upd_lock_time : 300));
48 48
           sn_db_transaction_commit();
49 49
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
           $current_time = time();
54 54
           classSupernova::$config->db_saveItem('var_db_update', $current_time);
55 55
           classSupernova::$config->db_saveItem('var_db_update_end', $current_time);
56
-        } elseif(filemtime($update_file) > classSupernova::$config->var_db_update) {
56
+        } elseif (filemtime($update_file) > classSupernova::$config->var_db_update) {
57 57
           $timeout = classSupernova::$config->var_db_update_end - SN_TIME_NOW;
58 58
           die(
59 59
             "Обновляется база данных. Рассчетное время окончания - {$timeout} секунд (время обновления может увеличиваться). Пожалуйста, подождите...<br />
Please login to merge, or discard this patch.
login.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,9 +13,9 @@
 block discarded – undo
13 13
 
14 14
 $allow_anonymous = true;
15 15
 
16
-include('includes/init.' . substr(strrchr(__FILE__, '.'), 1));
16
+include('includes/init.'.substr(strrchr(__FILE__, '.'), 1));
17 17
 // die();
18
-if($template_result[F_USER_IS_AUTHORIZED]) {
18
+if ($template_result[F_USER_IS_AUTHORIZED]) {
19 19
   sys_redirect('index.php');
20 20
 }
21 21
 lng_include('login');
Please login to merge, or discard this patch.