Completed
Push — work-fleets ( 808c81...a017ed )
by SuperNova.WS
11:34 queued 05:01
created
includes/pages/options.php 1 patch
Spacing   +48 added lines, -48 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,41 +21,41 @@  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($user['id'], "`id_level` = '{$planet_protection}'");
28 28
       DBStaticUser::db_user_set_by_id($user['id'], "`admin_protection` = '{$planet_protection}'");
29 29
       $user['admin_protection'] = $planet_protection;
30 30
     }
31 31
 
32
-    if(sys_get_param_int('vacation') && !classSupernova::$config->user_vacation_disable) {
32
+    if (sys_get_param_int('vacation') && !classSupernova::$config->user_vacation_disable) {
33 33
       sn_db_transaction_start();
34
-      if($user['authlevel'] < 3) {
35
-        if($user['vacation_next'] > SN_TIME_NOW) {
34
+      if ($user['authlevel'] < 3) {
35
+        if ($user['vacation_next'] > SN_TIME_NOW) {
36 36
           message(classLocale::$lang['opt_vacation_err_timeout'], classLocale::$lang['Error'], 'index.php?page=options', 5);
37 37
           die();
38 38
         }
39 39
 
40
-        if(FleetList::fleet_count_flying($user['id'])) {
40
+        if (FleetList::fleet_count_flying($user['id'])) {
41 41
           message(classLocale::$lang['opt_vacation_err_your_fleet'], classLocale::$lang['Error'], 'index.php?page=options', 5);
42 42
           die();
43 43
         }
44 44
 
45 45
         $que = que_get($user['id'], false);
46
-        if(!empty($que)) {
46
+        if (!empty($que)) {
47 47
           message(classLocale::$lang['opt_vacation_err_que'], classLocale::$lang['Error'], 'index.php?page=options', 5);
48 48
           die();
49 49
         }
50 50
 
51 51
         $query = classSupernova::db_get_record_list(LOC_PLANET, "`id_owner` = {$user['id']}");
52
-        foreach($query as $planet) {
52
+        foreach ($query as $planet) {
53 53
           // $planet = sys_o_get_updated($user, $planet, SN_TIME_NOW);
54 54
           // $planet = $planet['planet'];
55 55
 
56 56
           $classConfig = classSupernova::$config;
57 57
           DBStaticPlanet::db_planet_set_by_id($planet['id'],
58
-            "last_update = " . SN_TIME_NOW . ", energy_used = '0', energy_max = '0',
58
+            "last_update = ".SN_TIME_NOW.", energy_used = '0', energy_max = '0',
59 59
             metal_perhour = '{$classConfig->metal_basic_income}', crystal_perhour = '{$classConfig->crystal_basic_income}', deuterium_perhour = '{$classConfig->deuterium_basic_income}',
60 60
             metal_mine_porcent = '0', crystal_mine_porcent = '0', deuterium_sintetizer_porcent = '0', solar_plant_porcent = '0',
61 61
             fusion_plant_porcent = '0', solar_satelit_porcent = '0', ship_sattelite_sloth_porcent = 0"
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
68 68
       sn_db_transaction_commit();
69 69
     }
70 70
 
71
-    foreach($user_option_list as $option_group_id => $option_group) {
72
-      foreach($option_group as $option_name => $option_value) {
73
-        if($user[$option_name] !== null) {
71
+    foreach ($user_option_list as $option_group_id => $option_group) {
72
+      foreach ($option_group as $option_name => $option_value) {
73
+        if ($user[$option_name] !== null) {
74 74
           $user[$option_name] = sys_get_param_str($option_name);
75 75
         } else {
76 76
           $user[$option_name] = $option_value;
@@ -81,8 +81,8 @@  discard block
 block discarded – undo
81 81
 
82 82
 
83 83
     $player_options = sys_get_param('options');
84
-    if(!empty($player_options)) {
85
-      array_walk($player_options, function (&$value) {
84
+    if (!empty($player_options)) {
85
+      array_walk($player_options, function(&$value) {
86 86
         // TODO - Когда будет больше параметров - сделать больше проверок
87 87
         $value = intval($value);
88 88
       });
@@ -93,15 +93,15 @@  discard block
 block discarded – undo
93 93
 
94 94
     $username = substr(sys_get_param_str_unsafe('username'), 0, 32);
95 95
     $username_safe = db_escape($username);
96
-    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)) {
96
+    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)) {
97 97
       // проверка на корректность
98 98
       sn_db_transaction_start();
99 99
       $name_check = db_player_name_history_get_name_by_name($username_safe);
100
-      if(!$name_check || $name_check['player_id'] == $user['id']) {
100
+      if (!$name_check || $name_check['player_id'] == $user['id']) {
101 101
         $user = DBStaticUser::db_user_by_id($user['id'], true);
102
-        switch(classSupernova::$config->game_user_changename) {
102
+        switch (classSupernova::$config->game_user_changename) {
103 103
           case SERVER_PLAYER_NAME_CHANGE_PAY:
104
-            if(mrc_get_level($user, $planetrow, RES_DARK_MATTER) < classSupernova::$config->game_user_changename_cost) {
104
+            if (mrc_get_level($user, $planetrow, RES_DARK_MATTER) < classSupernova::$config->game_user_changename_cost) {
105 105
               $template_result['.']['result'][] = array(
106 106
                 'STATUS'  => ERR_ERROR,
107 107
                 'MESSAGE' => classLocale::$lang['opt_msg_name_change_err_no_dm'],
@@ -131,18 +131,18 @@  discard block
 block discarded – undo
131 131
       sn_db_transaction_commit();
132 132
     }
133 133
 
134
-    if($new_password = sys_get_param('newpass1')) {
134
+    if ($new_password = sys_get_param('newpass1')) {
135 135
       try {
136
-        if($new_password != sys_get_param('newpass2')) {
136
+        if ($new_password != sys_get_param('newpass2')) {
137 137
           throw new Exception(classLocale::$lang['opt_err_pass_unmatched'], ERR_WARNING);
138 138
         }
139 139
 
140
-        if(!classSupernova::$auth->password_change(sys_get_param('db_password'), $new_password)) {
140
+        if (!classSupernova::$auth->password_change(sys_get_param('db_password'), $new_password)) {
141 141
           throw new Exception(classLocale::$lang['opt_err_pass_wrong'], ERR_WARNING);
142 142
         }
143 143
 
144 144
         throw new Exception(classLocale::$lang['opt_msg_pass_changed'], ERR_NONE);
145
-      } catch(Exception $e) {
145
+      } catch (Exception $e) {
146 146
         $template_result['.']['result'][] = array(
147 147
           'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
148 148
           'MESSAGE' => $e->getMessage()
@@ -164,12 +164,12 @@  discard block
 block discarded – undo
164 164
     $user['gender'] = $user['gender'] == GENDER_UNKNOWN ? $gender : $user['gender'];
165 165
 
166 166
     try {
167
-      if($user['birthday']) {
167
+      if ($user['birthday']) {
168 168
         throw new exception();
169 169
       }
170 170
 
171 171
       $user_birthday = sys_get_param_str_unsafe('user_birthday');
172
-      if(!$user_birthday || $user_birthday == $FMT_DATE) {
172
+      if (!$user_birthday || $user_birthday == $FMT_DATE) {
173 173
         throw new exception();
174 174
       }
175 175
 
@@ -179,16 +179,16 @@  discard block
 block discarded – undo
179 179
       $pos['Y'] = strpos(FMT_DATE, 'Y');
180 180
       asort($pos);
181 181
       $i = 0;
182
-      foreach($pos as &$position) {
182
+      foreach ($pos as &$position) {
183 183
         $position = ++$i;
184 184
       }
185 185
 
186
-      $regexp = "/" . preg_replace(array('/\\\\/', '/\//', '/\./', '/\-/', '/d/', '/m/', '/Y/'), array('\\\\\\', '\/', '\.', '\-', '(\d?\d)', '(\d?\d)', '(\d{4})'), FMT_DATE) . "/";
187
-      if(!preg_match($regexp, $user_birthday, $match)) {
186
+      $regexp = "/".preg_replace(array('/\\\\/', '/\//', '/\./', '/\-/', '/d/', '/m/', '/Y/'), array('\\\\\\', '\/', '\.', '\-', '(\d?\d)', '(\d?\d)', '(\d{4})'), FMT_DATE)."/";
187
+      if (!preg_match($regexp, $user_birthday, $match)) {
188 188
         throw new exception();
189 189
       }
190 190
 
191
-      if(!checkdate($match[$pos['m']], $match[$pos['d']], $match[$pos['Y']])) {
191
+      if (!checkdate($match[$pos['m']], $match[$pos['d']], $match[$pos['Y']])) {
192 192
         throw new exception();
193 193
       }
194 194
 
@@ -196,13 +196,13 @@  discard block
 block discarded – undo
196 196
       // EOF black magic! Now we have valid SQL date in $user['user_birthday'] - independent of date format
197 197
 
198 198
       $year = date('Y', SN_TIME_NOW);
199
-      if(mktime(0, 0, 0, $match[$pos['m']], $match[$pos['d']], $year) > SN_TIME_NOW) {
199
+      if (mktime(0, 0, 0, $match[$pos['m']], $match[$pos['d']], $year) > SN_TIME_NOW) {
200 200
         $year--;
201 201
       }
202 202
       $user['user_birthday_celebrated'] = db_escape("{$year}-{$match[$pos['m']]}-{$match[$pos['d']]}");
203 203
 
204 204
       $user_birthday = ", `user_birthday` = '{$user['user_birthday']}', `user_birthday_celebrated` = '{$user['user_birthday_celebrated']}'";
205
-    } catch(exception $e) {
205
+    } catch (exception $e) {
206 206
       $user_birthday = '';
207 207
     }
208 208
 
@@ -212,14 +212,14 @@  discard block
 block discarded – undo
212 212
     $template_result['.']['result'][] = $avatar_upload_result;
213 213
 
214 214
     $user_time_diff = playerTimeDiff::user_time_diff_get();
215
-    if(sys_get_param_int('PLAYER_OPTION_TIME_DIFF_FORCED')) {
215
+    if (sys_get_param_int('PLAYER_OPTION_TIME_DIFF_FORCED')) {
216 216
       playerTimeDiff::user_time_diff_set(array(
217 217
         PLAYER_OPTION_TIME_DIFF              => sys_get_param_int('PLAYER_OPTION_TIME_DIFF'),
218 218
         PLAYER_OPTION_TIME_DIFF_UTC_OFFSET   => 0,
219 219
         PLAYER_OPTION_TIME_DIFF_FORCED       => 1,
220 220
         PLAYER_OPTION_TIME_DIFF_MEASURE_TIME => SN_TIME_SQL,
221 221
       ));
222
-    } elseif(sys_get_param_int('opt_time_diff_clear') || $user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
222
+    } elseif (sys_get_param_int('opt_time_diff_clear') || $user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
223 223
       playerTimeDiff::user_time_diff_set(array(
224 224
         PLAYER_OPTION_TIME_DIFF              => '',
225 225
         PLAYER_OPTION_TIME_DIFF_UTC_OFFSET   => 0,
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
       'STATUS'  => ERR_NONE,
240 240
       'MESSAGE' => classLocale::$lang['opt_msg_saved']
241 241
     );
242
-  } elseif(sys_get_param_str('result') == 'ok') {
242
+  } elseif (sys_get_param_str('result') == 'ok') {
243 243
     $template_result['.']['result'][] = array(
244 244
       'STATUS'  => ERR_NONE,
245 245
       'MESSAGE' => classLocale::$lang['opt_msg_saved']
@@ -262,9 +262,9 @@  discard block
 block discarded – undo
262 262
 
263 263
   $template = gettemplate('options', $template);
264 264
 
265
-  $dir = dir(SN_ROOT_PHYSICAL . 'skins');
266
-  while(($entry = $dir->read()) !== false) {
267
-    if(is_dir("skins/{$entry}") && $entry[0] != '.') {
265
+  $dir = dir(SN_ROOT_PHYSICAL.'skins');
266
+  while (($entry = $dir->read()) !== false) {
267
+    if (is_dir("skins/{$entry}") && $entry[0] != '.') {
268 268
       $template_result['.']['skin_list'][] = array(
269 269
         'VALUE'    => $entry,
270 270
         'NAME'     => $entry,
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
   }
275 275
   $dir->close();
276 276
 
277
-  foreach(classLocale::$lang['opt_planet_sort_options'] as $key => &$value) {
277
+  foreach (classLocale::$lang['opt_planet_sort_options'] as $key => &$value) {
278 278
     $template_result['.']['planet_sort_options'][] = array(
279 279
       'VALUE'    => $key,
280 280
       'NAME'     => $value,
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
     );
283 283
   }
284 284
 
285
-  foreach(classLocale::$lang['sys_gender_list'] as $key => $value) {
285
+  foreach (classLocale::$lang['sys_gender_list'] as $key => $value) {
286 286
     $template_result['.']['gender_list'][] = array(
287 287
       'VALUE'    => $key,
288 288
       'NAME'     => $value,
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
   }
292 292
 
293 293
   $lang_list = lng_get_list();
294
-  foreach($lang_list as $lang_id => $lang_data) {
294
+  foreach ($lang_list as $lang_id => $lang_data) {
295 295
     $template_result['.']['languages'][] = array(
296 296
       'VALUE'    => $lang_id,
297 297
       'NAME'     => $lang_data['LANG_NAME_NATIVE'],
@@ -300,8 +300,8 @@  discard block
 block discarded – undo
300 300
   }
301 301
 
302 302
 
303
-  if(isset(classLocale::$lang['menu_customize_show_hide_button_state'])) {
304
-    foreach(classLocale::$lang['menu_customize_show_hide_button_state'] as $key => $value) {
303
+  if (isset(classLocale::$lang['menu_customize_show_hide_button_state'])) {
304
+    foreach (classLocale::$lang['menu_customize_show_hide_button_state'] as $key => $value) {
305 305
       $template->assign_block_vars('menu_customize_show_hide_button_state', array(
306 306
         'ID'   => $key,
307 307
         'NAME' => $value,
@@ -408,10 +408,10 @@  discard block
 block discarded – undo
408 408
     'PAGE_HEADER' => classLocale::$lang['opt_header'],
409 409
   ));
410 410
 
411
-  foreach($user_option_list as $option_group_id => $option_group) {
412
-    if($option_group_id == OPT_MESSAGE) {
413
-      foreach(DBStaticMessages::$snMessageClassList as $message_class_id => $message_class_data) {
414
-        if($message_class_data['switchable'] || ($message_class_data['email'] && classSupernova::$config->game_email_pm)) {
411
+  foreach ($user_option_list as $option_group_id => $option_group) {
412
+    if ($option_group_id == OPT_MESSAGE) {
413
+      foreach (DBStaticMessages::$snMessageClassList as $message_class_id => $message_class_data) {
414
+        if ($message_class_data['switchable'] || ($message_class_data['email'] && classSupernova::$config->game_email_pm)) {
415 415
           $option_name = $message_class_data['name'];
416 416
 
417 417
           $template->assign_block_vars("options_{$option_group_id}", array(
@@ -423,8 +423,8 @@  discard block
 block discarded – undo
423 423
         }
424 424
       }
425 425
     } else {
426
-      foreach($option_group as $option_name => $option_value) {
427
-        if(array_key_exists($option_name, $user_option_types)) {
426
+      foreach ($option_group as $option_name => $option_value) {
427
+        if (array_key_exists($option_name, $user_option_types)) {
428 428
           $option_type = $user_option_types[$option_name];
429 429
         } else {
430 430
           $option_type = 'switch';
Please login to merge, or discard this patch.
includes/classes/DBStaticMessages.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
       $owners = array();
115 115
     } else {
116 116
       $insert_values = array();
117
-      $insert_template = "('%u'," . str_replace('%', '%%', " '{$sender}', '{$timestamp}', '{$message_type}', '{$from}', '{$subject}', '{$text}')");
117
+      $insert_template = "('%u',".str_replace('%', '%%', " '{$sender}', '{$timestamp}', '{$message_type}', '{$from}', '{$subject}', '{$text}')");
118 118
 
119 119
       foreach ($owners as $owner) {
120 120
         if ($user['id'] != $owner) {
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
     $sendList = array();
156 156
     $list = '';
157 157
     $query = DBStaticUser::db_user_list(
158
-      "ally_id = '{$ally_id}'" . ($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
158
+      "ally_id = '{$ally_id}'".($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
159 159
       false, 'id, username');
160 160
     foreach ($query as $u) {
161 161
       $sendList[] = $u['id'];
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
       $subject_unsafe = substr($subject_unsafe, strlen(classLocale::$lang['msg_answer_prefix']));
247 247
       $re++;
248 248
     }
249
-    $re ? $subject_unsafe = classLocale::$lang['msg_answer_prefix'] . $subject_unsafe : false;
249
+    $re ? $subject_unsafe = classLocale::$lang['msg_answer_prefix'].$subject_unsafe : false;
250 250
 
251 251
     $subject_unsafe = $subject_unsafe ? $subject_unsafe : classLocale::$lang['msg_subject_default'];
252 252
 
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
     return doquery(
416 416
       "SELECT * FROM {{messages}}
417 417
         WHERE
418
-          `message_type` = '" . MSG_TYPE_PLAYER . "' AND
418
+          `message_type` = '" . MSG_TYPE_PLAYER."' AND
419 419
           ((`message_owner` = '{$user['id']}' AND `message_sender` = '{$recipient_id}')
420 420
           OR
421 421
           (`message_sender` = '{$user['id']}' AND `message_owner` = '{$recipient_id}')) ORDER BY `message_time` DESC LIMIT 20;");
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
 FROM
464 464
   {{messages}} AS m
465 465
   LEFT JOIN {{users}} AS u ON u.id = m.message_owner " .
466
-      ($int_type_selected >= 0 ? "WHERE `message_type` = {$int_type_selected} " : '') .
466
+      ($int_type_selected >= 0 ? "WHERE `message_type` = {$int_type_selected} " : '').
467 467
       "ORDER BY
468 468
   `message_id` DESC
469 469
 LIMIT
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
471 471
   }
472 472
 
473 473
   public static function db_message_insert_all($message_type, $from, $subject, $text) {
474
-    return doquery($QryInsertMessage = 'INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
474
+    return doquery($QryInsertMessage = 'INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) '.
475 475
       "SELECT `id`, 0, unix_timestamp(now()), {$message_type}, '{$from}', '{$subject}', '{$text}' FROM {{users}}");
476 476
   }
477 477
 
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
481 481
    * @return array|bool|mysqli_result|null
482 482
    */
483 483
   public static function db_message_count_by_type($int_type_selected) {
484
-    $page_max = doquery('SELECT COUNT(*) AS `max` FROM {{messages}}' . ($int_type_selected >= 0 ? " WHERE `message_type` = {$int_type_selected};" : ''), true);
484
+    $page_max = doquery('SELECT COUNT(*) AS `max` FROM {{messages}}'.($int_type_selected >= 0 ? " WHERE `message_type` = {$int_type_selected};" : ''), true);
485 485
 
486 486
     return $page_max;
487 487
   }
@@ -498,15 +498,15 @@  discard block
 block discarded – undo
498 498
    * @param $int_type_selected
499 499
    */
500 500
   public static function db_message_list_delete_by_date($delete_date, $int_type_selected) {
501
-    doquery("DELETE FROM {{messages}} WHERE message_time <= UNIX_TIMESTAMP('{$delete_date}')" . ($int_type_selected >= 0 ? " AND `message_type` = {$int_type_selected}" : ''));
501
+    doquery("DELETE FROM {{messages}} WHERE message_time <= UNIX_TIMESTAMP('{$delete_date}')".($int_type_selected >= 0 ? " AND `message_type` = {$int_type_selected}" : ''));
502 502
   }
503 503
 
504 504
   /**
505 505
    * @param $insert_values
506 506
    */
507 507
   public static function db_message_insert($insert_values) {
508
-    doquery('INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
509
-      'VALUES ' . implode(',', $insert_values));
508
+    doquery('INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) '.
509
+      'VALUES '.implode(',', $insert_values));
510 510
   }
511 511
 
512 512
 }
Please login to merge, or discard this patch.
admin/adm_message_list.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -12,9 +12,9 @@  discard block
 block discarded – undo
12 12
 define('INSTALL', false);
13 13
 define('IN_ADMIN', true);
14 14
 
15
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
15
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
16 16
 
17
-if($user['authlevel'] < 3) {
17
+if ($user['authlevel'] < 3) {
18 18
   AdminMessage(classLocale::$lang['adm_err_denied']);
19 19
 }
20 20
 
@@ -28,8 +28,8 @@  discard block
 block discarded – undo
28 28
   ),
29 29
 );
30 30
 $template->assign_block_vars('int_type_selected', $allowed_types[-1]);
31
-foreach(DBStaticMessages::$snMessageClassList as $key => $value) {
32
-  if($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX) {
31
+foreach (DBStaticMessages::$snMessageClassList as $key => $value) {
32
+  if ($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX) {
33 33
     continue;
34 34
   }
35 35
 
@@ -41,17 +41,17 @@  discard block
 block discarded – undo
41 41
 
42 42
 
43 43
 $message_delete = sys_get_param_id('msg_del');
44
-if(sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete)) {
44
+if (sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete)) {
45 45
   $message_delete = implode(', ', $message_delete);
46 46
 }
47 47
 
48
-if($message_delete) {
48
+if ($message_delete) {
49 49
   DBStaticMessages::db_message_list_delete_set($message_delete);
50 50
   $template->assign_block_vars('result', array('MESSAGE' => sprintf(classLocale::$lang['mlst_messages_deleted'], $message_delete)));
51 51
 }
52 52
 
53 53
 
54
-if(sys_get_param('str_delete_date') && checkdate($month = sys_get_param_id('delete_month'), $day = sys_get_param_id('delete_day'), $year = sys_get_param_id('delete_year'))) {
54
+if (sys_get_param('str_delete_date') && checkdate($month = sys_get_param_id('delete_month'), $day = sys_get_param_id('delete_day'), $year = sys_get_param_id('delete_year'))) {
55 55
   $delete_date = "{$year}-{$month}-{$day}";
56 56
   DBStaticMessages::db_message_list_delete_by_date($delete_date, $int_type_selected);
57 57
   $template->assign_block_vars('result', array('MESSAGE' => sprintf(classLocale::$lang['mlst_messages_deleted_date'], $allowed_types[$int_type_selected]['TEXT'], $delete_date)));
@@ -63,13 +63,13 @@  discard block
 block discarded – undo
63 63
 
64 64
 $int_page_current = min(sys_get_param_id('int_page_current', 1), $page_max);
65 65
 
66
-if(sys_get_param('page_prev') && $int_page_current > 1) {
66
+if (sys_get_param('page_prev') && $int_page_current > 1) {
67 67
   $int_page_current--;
68
-} elseif(sys_get_param('page_next') && $int_page_current < $page_max) {
68
+} elseif (sys_get_param('page_next') && $int_page_current < $page_max) {
69 69
   $int_page_current++;
70 70
 }
71 71
 
72
-for($i = 1; $i <= $page_max; $i++) {
72
+for ($i = 1; $i <= $page_max; $i++) {
73 73
   $template->assign_block_vars('page', array('NUMBER' => $i));
74 74
 }
75 75
 
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 $StartRec = ($int_page_current - 1) * 25;
78 78
 
79 79
 $Messages = DBStaticMessages::db_message_list_admin_by_type($int_type_selected, $StartRec);
80
-while($row = db_fetch($Messages)) {
80
+while ($row = db_fetch($Messages)) {
81 81
   $row['FROM'] = htmlentities($row['FROM'], ENT_COMPAT, 'UTF-8');
82 82
   $row['OWNER_NAME'] = htmlentities($row['OWNER_NAME'], ENT_COMPAT, 'UTF-8');
83 83
   $row['TEXT'] = nl2br($row['TEXT']);
Please login to merge, or discard this patch.
messages.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
3
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
4 4
 
5 5
 $template = gettemplate('viewreport', true);
6 6
 $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']);
Please login to merge, or discard this patch.
includes/classes/DBRow.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
    * @param db_mysql|null $db
98 98
    */
99 99
   public static function setDb($db = null) {
100
-    if(empty($db) || !($db instanceof db_mysql)) {
100
+    if (empty($db) || !($db instanceof db_mysql)) {
101 101
       $db = null;
102 102
     }
103 103
     static::$db = !empty($db) || !class_exists('classSupernova', false) ? $db : classSupernova::$db;
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
    */
165 165
   public function __get($name) {
166 166
     // Redirecting inaccessible get to __call which will handle the rest
167
-    return $this->__call('get' . ucfirst($name), array());
167
+    return $this->__call('get'.ucfirst($name), array());
168 168
   }
169 169
 
170 170
   /**
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
   // TODO - сеттер должен параллельно изменять значение db_row - for now...
177 177
   public function __set($name, $value) {
178 178
     // Redirecting inaccessible set to __call which will handle the rest
179
-    $this->__call('set' . ucfirst($name), array($value));
179
+    $this->__call('set'.ucfirst($name), array($value));
180 180
   }
181 181
 
182 182
   /**
@@ -195,14 +195,14 @@  discard block
 block discarded – undo
195 195
     // If method is not getter or setter OR property name not exists in $_properties - raising exception
196 196
     // Descendants can catch this Exception to make own __call magic
197 197
     if (($left3 != 'get' && $left3 != 'set') || empty(static::$_properties[$propertyName])) {
198
-      throw new ExceptionPropertyNotExists('Property ' . $propertyName . ' not exists when calling getter/setter ' . get_called_class() . '::' . $name, ERR_ERROR);
198
+      throw new ExceptionPropertyNotExists('Property '.$propertyName.' not exists when calling getter/setter '.get_called_class().'::'.$name, ERR_ERROR);
199 199
     }
200 200
 
201 201
     // TODO check for read-only
202 202
 
203 203
     if ($left3 == 'set') {
204 204
       if (!empty($this->propertiesAdjusted[$propertyName])) {
205
-        throw new PropertyAccessException('Property ' . $propertyName . ' already was adjusted so no SET is possible until dbSave in ' . get_called_class() . '::' . $name, ERR_ERROR);
205
+        throw new PropertyAccessException('Property '.$propertyName.' already was adjusted so no SET is possible until dbSave in '.get_called_class().'::'.$name, ERR_ERROR);
206 206
       }
207 207
       $this->propertiesChanged[$propertyName] = 1;
208 208
     }
@@ -217,11 +217,11 @@  discard block
 block discarded – undo
217 217
 
218 218
     // Is it getter?
219 219
     if ($left3 === 'get') {
220
-      return $this->{'_' . $propertyName};
220
+      return $this->{'_'.$propertyName};
221 221
     }
222 222
 
223 223
     // Not getter? Then it's setter
224
-    $this->{'_' . $propertyName} = $arguments[0];
224
+    $this->{'_'.$propertyName} = $arguments[0];
225 225
 
226 226
     return null;
227 227
   }
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
   public function dbLoad($dbId, $lockSkip = false) {
240 240
     $dbId = idval($dbId);
241 241
     if ($dbId <= 0) {
242
-      classSupernova::$debug->error(get_called_class() . '::dbLoad $dbId not positive = ' . $dbId);
242
+      classSupernova::$debug->error(get_called_class().'::dbLoad $dbId not positive = '.$dbId);
243 243
 
244 244
       return;
245 245
     }
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
       $this->dbGetLockById($this->_dbId);
252 252
     }
253 253
 
254
-    $db_row = doquery("SELECT * FROM `{{" . static::$_table . "}}` WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId . " LIMIT 1 FOR UPDATE;", true);
254
+    $db_row = doquery("SELECT * FROM `{{".static::$_table."}}` WHERE `".static::$_dbIdFieldName."` = ".$this->_dbId." LIMIT 1 FOR UPDATE;", true);
255 255
     if (empty($db_row)) {
256 256
       return;
257 257
     }
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
     if ($this->isNew()) {
284 284
       // No DB_ID - new unit
285 285
       if ($this->isEmpty()) {
286
-        classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - object is empty on ' . get_called_class() . '::dbSave');
286
+        classSupernova::$debug->error(__FILE__.':'.__LINE__.' - object is empty on '.get_called_class().'::dbSave');
287 287
       }
288 288
       $this->dbInsert();
289 289
     } else {
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
         $this->dbDelete();
293 293
       } else {
294 294
         if (!sn_db_transaction_check(false)) {
295
-          classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - transaction should always be started on ' . get_called_class() . '::dbUpdate');
295
+          classSupernova::$debug->error(__FILE__.':'.__LINE__.' - transaction should always be started on '.get_called_class().'::dbUpdate');
296 296
         }
297 297
         $this->dbUpdate();
298 298
       }
@@ -320,12 +320,12 @@  discard block
 block discarded – undo
320 320
   // TODO - protected
321 321
   public function dbInsert() {
322 322
     if (!$this->isNew()) {
323
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - record db_id is not empty on ' . get_called_class() . '::dbInsert');
323
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - record db_id is not empty on '.get_called_class().'::dbInsert');
324 324
     }
325 325
     $this->_dbId = $this->db_field_set_create($this->dbMakeFieldSet());
326 326
 
327 327
     if (empty($this->_dbId)) {
328
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - error saving record ' . get_called_class() . '::dbInsert');
328
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - error saving record '.get_called_class().'::dbInsert');
329 329
     }
330 330
 
331 331
     return $this->_dbId;
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
   public function dbUpdate() {
339 339
     // TODO - Update
340 340
     if ($this->isNew()) {
341
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbUpdate');
341
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - unit db_id is empty on dbUpdate');
342 342
     }
343 343
     $this->db_field_update($this->dbMakeFieldSet(true));
344 344
   }
@@ -349,9 +349,9 @@  discard block
 block discarded – undo
349 349
   // TODO - protected
350 350
   public function dbDelete() {
351 351
     if ($this->isNew()) {
352
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbDelete');
352
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - unit db_id is empty on dbDelete');
353 353
     }
354
-    doquery("DELETE FROM {{" . static::$_table . "}} WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId);
354
+    doquery("DELETE FROM {{".static::$_table."}} WHERE `".static::$_dbIdFieldName."` = ".$this->_dbId);
355 355
     $this->_dbId = 0;
356 356
     // Обо всём остальном должен позаботиться контейнер
357 357
   }
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
     $fields = implode(',', array_keys($field_set));
505 505
 
506 506
     $result = 0;
507
-    if (classSupernova::db_query("INSERT INTO `{{" . static::$_table . "}}` ({$fields}) VALUES ({$values});")) {
507
+    if (classSupernova::db_query("INSERT INTO `{{".static::$_table."}}` ({$fields}) VALUES ({$values});")) {
508 508
       $result = db_insert_id();
509 509
     }
510 510
 
@@ -540,7 +540,7 @@  discard block
 block discarded – undo
540 540
 
541 541
     return empty($set_string)
542 542
       ? true
543
-      : classSupernova::db_query("UPDATE `{{" . static::$_table . "}}` SET {$set_string} WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId);
543
+      : classSupernova::db_query("UPDATE `{{".static::$_table."}}` SET {$set_string} WHERE `".static::$_dbIdFieldName."` = ".$this->_dbId);
544 544
   }
545 545
 
546 546
 }
Please login to merge, or discard this patch.