Test Failed
Push — trunk ( cc4c01...dc8fe4 )
by SuperNova.WS
13:09
created
language/ru/options.mo.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,9 @@
 block discarded – undo
24 24
 * DO NOT CHANGE
25 25
 */
26 26
 
27
-if (!defined('INSIDE')) die();
27
+if (!defined('INSIDE')) {
28
+  die();
29
+}
28 30
 
29 31
 $a_lang_array = [
30 32
   'opt_account' => 'Профиль',
Please login to merge, or discard this patch.
language/ru/messages.mo.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,9 @@
 block discarded – undo
23 23
 * DO NOT CHANGE
24 24
 */
25 25
 
26
-if (!defined('INSIDE')) die();
26
+if (!defined('INSIDE')) {
27
+  die();
28
+}
27 29
 
28 30
 $a_lang_array = [
29 31
   'msg_page_header' => 'Личные сообщения',
Please login to merge, or discard this patch.
jumpgate.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -118,8 +118,7 @@
 block discarded – undo
118 118
     ));
119 119
 
120 120
     SnTemplate::display($template, $lang['tech'][STRUC_MOON_GATE]);
121
-  }
122
-  else
121
+  } else
123 122
   {
124 123
     SnTemplate::messageBox($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10);
125 124
   }
Please login to merge, or discard this patch.
includes/alliance/ali_info.inc 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -26,16 +26,14 @@  discard block
 block discarded – undo
26 26
     $lang['Go_out_welldone'] = str_replace("%s", $ally_name, $lang['Go_out_welldone']);
27 27
     SnTemplate::messageBox(sprintf($lang['ali_info_leave_success'], $ally['ally_name']), $lang['sys_alliance']);
28 28
   }
29
-}
30
-elseif($mode == 'ainfo')
29
+} elseif($mode == 'ainfo')
31 30
 {
32 31
   $tag = sys_get_param_str('tag');
33 32
   $id_ally = sys_get_param_id('a');
34 33
   if($tag)
35 34
   {
36 35
     $ally = doquery("SELECT * FROM {{alliance}} WHERE ally_tag='{$tag}' LIMIT 1;", '', true);
37
-  }
38
-  elseif($id_ally)
36
+  } elseif($id_ally)
39 37
   {
40 38
     $ally = doquery("SELECT * FROM {{alliance}} WHERE id='{$id_ally}' LIMIT 1;", '', true);
41 39
   }
@@ -55,20 +53,17 @@  discard block
 block discarded – undo
55 53
     'USER_ALLY_ID' => $user['ally_id'],
56 54
   ));
57 55
   $page_header          = $lang['sys_alliance'];
58
-}
59
-else
56
+} else
60 57
 {
61 58
   $page_header = $lang['your_alliance'];
62 59
 
63 60
   if($ally['ally_owner'] == $user['id'])
64 61
   {
65 62
     $range = $ally['ally_owner_range'] ? $ally['ally_owner_range'] : $lang['Founder'];
66
-  }
67
-  elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name']))
63
+  } elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name']))
68 64
   {
69 65
     $range = $ranks[$user['ally_rank_id']]['name'];
70
-  }
71
-  else
66
+  } else
72 67
   {
73 68
     $range = $lang['member'];
74 69
   }
Please login to merge, or discard this patch.
includes/alliance/ali_internal_admin_diplomacy.inc 1 patch
Braces   +7 added lines, -14 removed lines patch added patch discarded remove patch
@@ -68,8 +68,7 @@  discard block
 block discarded – undo
68 68
       ->doInsert();
69 69
 
70 70
     $accept_offer = false;
71
-  }
72
-  else
71
+  } else
73 72
   {
74 73
     $accept_offer = true;
75 74
     $autoAccept = true;
@@ -81,8 +80,7 @@  discard block
 block discarded – undo
81 80
       'alliance_negotiation_relation' => $alliance_negotiation_relation,
82 81
     );
83 82
   }
84
-}
85
-else
83
+} else
86 84
 {
87 85
   $offer_id = sys_get_param_id('offer_id');
88 86
   if($offer_id)
@@ -93,31 +91,26 @@  discard block
 block discarded – undo
93 91
     if(!$negotiation)
94 92
     {
95 93
       SnTemplate::messageBox($lang['ali_dip_err_offer_none'], $page_title);
96
-    }
97
-    elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
94
+    } elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
98 95
     {
99 96
       // TODO: Add log of hack attempt
100 97
       SnTemplate::messageBox($lang['ali_dip_err_offer_alien'], $page_title);
101
-    }
102
-    elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
98
+    } elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
103 99
     {
104 100
       if($offer_answer == 'accept')
105 101
       {
106 102
         // TODO: Add log of hack attempt
107 103
         SnTemplate::messageBox($lang['ali_dip_err_offer_accept_own'], $page_title);
108
-      }
109
-      elseif($offer_answer == 'deny')
104
+      } elseif($offer_answer == 'deny')
110 105
       {
111 106
         doquery("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;");
112 107
       }
113
-    }
114
-    else
108
+    } else
115 109
     {
116 110
       if($offer_answer == 'accept')
117 111
       {
118 112
         $accept_offer = true;
119
-      }
120
-      elseif($offer_answer == 'deny')
113
+      } elseif($offer_answer == 'deny')
121 114
       {
122 115
         DBStaticAlly::db_ally_negotiation_update_status_1($offer_id);
123 116
       }
Please login to merge, or discard this patch.
language/ru/alliance.mo.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,9 @@
 block discarded – undo
26 26
 * DO NOT CHANGE
27 27
 */
28 28
 
29
-if (!defined('INSIDE')) die();
29
+if (!defined('INSIDE')) {
30
+  die();
31
+}
30 32
 
31 33
 
32 34
 $a_lang_array = [
Please login to merge, or discard this patch.
language/ru/chat_advanced.mo.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,9 @@
 block discarded – undo
23 23
 * DO NOT CHANGE
24 24
 */
25 25
 
26
-if (!defined('INSIDE')) die();
26
+if (!defined('INSIDE')) {
27
+  die();
28
+}
27 29
 
28 30
 //$lang = array_merge($lang,
29 31
 //$lang->merge(
Please login to merge, or discard this patch.
language/en/chat_advanced.mo.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,9 @@
 block discarded – undo
23 23
 * DO NOT CHANGE
24 24
 */
25 25
 
26
-if (!defined('INSIDE')) die();
26
+if (!defined('INSIDE')) {
27
+  die();
28
+}
27 29
 
28 30
 //$lang = array_merge($lang,
29 31
 //$lang->merge(
Please login to merge, or discard this patch.
classes/SN.php 1 patch
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -457,7 +457,8 @@  discard block
 block discarded – undo
457 457
     $location_info = &static::$location_info[$location_type];
458 458
     $id_field = $location_info[P_ID];
459 459
     $table_name = $location_info[P_TABLE_NAME];
460
-    if ($result = static::db_query_update("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) // TODO Как-то вернуть может быть LIMIT 1 ?
460
+    if ($result = static::db_query_update("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) {
461
+      // TODO Как-то вернуть может быть LIMIT 1 ?
461 462
     {
462 463
       if (static::$db->db_affected_rows()) {
463 464
         // Обновляем данные только если ряд был затронут
@@ -465,6 +466,7 @@  discard block
 block discarded – undo
465 466
 
466 467
         // Тут именно так, а не cache_unset - что бы в кэшах автоматически обновилась запись. Будет нужно на будущее
467 468
         _SnCacheInternal::$data[$location_type][$record_id] = null;
469
+    }
468 470
         // Вытаскиваем обновленную запись
469 471
         static::db_get_record_by_id($location_type, $record_id);
470 472
         _SnCacheInternal::cache_clear($location_type, false); // Мягкий сброс - только $queries
@@ -498,9 +500,11 @@  discard block
 block discarded – undo
498 500
     $set = trim($set);
499 501
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
500 502
     if ($result = static::db_query_insert("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
501
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
503
+      if (static::$db->db_affected_rows()) {
504
+        // Обновляем данные только если ряд был затронут
502 505
       {
503 506
         $record_id = SN::$db->db_insert_id();
507
+      }
504 508
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
505 509
         $result = static::db_get_record_by_id($location_type, $record_id);
506 510
         // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего
@@ -521,10 +525,12 @@  discard block
 block discarded – undo
521 525
     $id_field = $location_info[P_ID];
522 526
     $table_name = $location_info[P_TABLE_NAME];
523 527
     if ($result = static::db_query_delete("DELETE FROM `{{{$table_name}}}` WHERE `{$id_field}` = {$safe_record_id}")) {
524
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
528
+      if (static::$db->db_affected_rows()) {
529
+        // Обновляем данные только если ряд был затронут
525 530
       {
526 531
         _SnCacheInternal::cache_unset($location_type, $safe_record_id);
527 532
       }
533
+      }
528 534
     }
529 535
 
530 536
     return $result;
@@ -538,11 +544,13 @@  discard block
 block discarded – undo
538 544
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
539 545
 
540 546
     if ($result = static::db_query_delete("DELETE FROM `{{{$table_name}}}` WHERE {$condition}")) {
541
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
547
+      if (static::$db->db_affected_rows()) {
548
+        // Обновляем данные только если ряд был затронут
542 549
       {
543 550
         // Обнуление кэша, потому что непонятно, что поменялось
544 551
         _SnCacheInternal::cache_clear($location_type);
545 552
       }
553
+      }
546 554
     }
547 555
 
548 556
     return $result;
Please login to merge, or discard this patch.