Completed
Push — work-fleets ( c62b27...6257a1 )
by SuperNova.WS
06:02
created
includes/alliance/ali_internal_admin.inc 1 patch
Spacing   +21 added lines, -21 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,27 +20,27 @@  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
-    DBStaticUser::db_user_set_by_id_DEPRECATED($ally['ally_user_id'], "`username`='[" . db_escape($new_tag) . "]'");
29
+    DBStaticUser::db_user_set_by_id_DEPRECATED($ally['ally_user_id'], "`username`='[".db_escape($new_tag)."]'");
30 30
   }
31
-  if(($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) != $ally['ally_name']) {
31
+  if (($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) != $ally['ally_name']) {
32 32
     $fieldChange['ally_name'] = $new_name;
33 33
   }
34 34
 
35
-  if(($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) != $ally['ally_owner_range']) {
35
+  if (($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) != $ally['ally_owner_range']) {
36 36
     $fieldChange['ally_owner_range'] = $new_owner_rank;
37 37
   }
38 38
 
39
-  if(($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) != $ally['ally_web']) {
39
+  if (($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) != $ally['ally_web']) {
40 40
     $fieldChange['ally_web'] = $new_web;
41 41
   }
42 42
 
43
-  if(($new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow'])) != $ally['ally_request_notallow']) {
43
+  if (($new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow'])) != $ally['ally_request_notallow']) {
44 44
     $fieldChange['ally_request_notallow'] = sys_get_param_int('request_notallow', $ally['ally_request_notallow']);
45 45
   }
46 46
 
@@ -50,11 +50,11 @@  discard block
 block discarded – undo
50 50
     'AVATAR_UPLOAD_STATUS'  => $avatar_upload_result['STATUS'],
51 51
     'AVATAR_UPLOAD_MESSAGE' => $avatar_upload_result['MESSAGE'],
52 52
   ));
53
-  if($new_image != $ally['ally_image']) {
53
+  if ($new_image != $ally['ally_image']) {
54 54
     $fieldChange['ally_image'] = $new_image;
55 55
   }
56 56
 
57
-  if(!empty($fieldChange)) {
57
+  if (!empty($fieldChange)) {
58 58
     classSupernova::$db->doUpdateRowSet(
59 59
       TABLE_ALLIANCE,
60 60
       $fieldChange,
@@ -65,17 +65,17 @@  discard block
 block discarded – undo
65 65
 
66 66
     sys_redirect('alliance.php?mode=admin&edit=ally');
67 67
   }
68
-} elseif(sys_get_param_str('isSaveText')) {
68
+} elseif (sys_get_param_str('isSaveText')) {
69 69
   $text_unsafe = sys_get_param_str_unsafe('text');
70 70
   DBStaticAlly::db_ally_update_texts($text_unsafe, $ally['id'], $text_list[$allyTextID]['db_field']);
71 71
   $ally[$text_list[$allyTextID]['db_field']] = db_escape($text_unsafe);
72
-} elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) {
73
-  if(!$isAllyOwner) {
72
+} elseif (sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) {
73
+  if (!$isAllyOwner) {
74 74
     message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
75 75
   }
76 76
 
77 77
   $newLeader = DBStaticUser::db_user_by_id($idNewLeader, false, `ally_id`);
78
-  if($newLeader['ally_id'] == $user['ally_id']) {
78
+  if ($newLeader['ally_id'] == $user['ally_id']) {
79 79
     sn_db_transaction_start();
80 80
     DBStaticUser::db_user_set_by_id_DEPRECATED($user['id'], "`ally_rank_id`='0'");
81 81
     DBStaticAlly::db_ally_update_owner($idNewLeader, $user['ally_id']);
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
     sn_db_transaction_commit();
84 84
     sys_redirect('alliance.php');
85 85
   }
86
-} elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) {
87
-  if(!$isAllyOwner) {
86
+} elseif (sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) {
87
+  if (!$isAllyOwner) {
88 88
     message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
89 89
   }
90 90
   sn_db_transaction_start();
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 $request = DBStaticAlly::db_ally_request_count_by_id($ally);
98 98
 
99 99
 $template->assign_vars(array(
100
-  'request_count'           => $request['request_count'] ? classLocale::$lang['ali_req_requestCount'] . ': ' . intval($request['request_count']) . '. ' . classLocale::$lang['ali_req_check'] : classLocale::$lang['ali_req_emptyList'],
100
+  'request_count'           => $request['request_count'] ? classLocale::$lang['ali_req_requestCount'].': '.intval($request['request_count']).'. '.classLocale::$lang['ali_req_check'] : classLocale::$lang['ali_req_emptyList'],
101 101
   'text'                    => $ally[$text_list[$allyTextID]['db_field']],
102 102
   'request_type'            => classLocale::$lang[$text_list[$allyTextID]['text_type']],
103 103
   't'                       => $allyTextID,
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
   $userAllyAdmins = DBStaticUser::db_user_list("`ally_id`= {$ally['id']}", false, '`id`, `username`');
131 131
   unset($tmp);
132 132
   // while ($userAllyAdmin = db_fetch($userAllyAdmins))
133
-  foreach($userAllyAdmins as $userAllyAdmin) {
133
+  foreach ($userAllyAdmins as $userAllyAdmin) {
134 134
 // pdump($userAllyAdmin);
135 135
     $tmp .= "<option value={$userAllyAdmin['id']}>{$userAllyAdmin['username']}</option>";
136 136
   }
@@ -138,8 +138,8 @@  discard block
 block discarded – undo
138 138
   $template->assign_var('adminMembers', $tmp);
139 139
 }
140 140
 
141
-foreach($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale) {
142
-  if(!$sn_ali_admin_action_locale['title']) {
141
+foreach ($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale) {
142
+  if (!$sn_ali_admin_action_locale['title']) {
143 143
     continue;
144 144
   }
145 145
   $template->assign_block_vars('admin_actions', array(
Please login to merge, or discard this patch.
includes/includes/flt_page4.inc 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -2,28 +2,28 @@  discard block
 block discarded – undo
2 2
 
3 3
 $classLocale = classLocale::$lang;
4 4
 
5
-if(SN_IN_FLEET !== true) {
5
+if (SN_IN_FLEET !== true) {
6 6
   classSupernova::$debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
7 7
 }
8 8
 
9 9
 $fleetid = sys_get_param_id('fleetid');
10 10
 
11
-if(!is_numeric($fleetid) || empty($fleetid)) {
11
+if (!is_numeric($fleetid) || empty($fleetid)) {
12 12
   header("Location: fleet.php");
13 13
   exit();
14 14
 }
15 15
 
16 16
 $objFleet = new Fleet();
17 17
 $objFleet->dbLoad($fleetid);
18
-if(!$objFleet->dbId) {
18
+if (!$objFleet->dbId) {
19 19
   message(classLocale::$lang['fl_fleet_not_exists'], classLocale::$lang['fl_error']);
20 20
 }
21 21
 
22
-if($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) {
22
+if ($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) {
23 23
   message(classLocale::$lang['fl_isback'], classLocale::$lang['fl_error']);
24 24
 }
25 25
 
26
-if($objFleet->playerOwnerId != $user['id']) {
26
+if ($objFleet->playerOwnerId != $user['id']) {
27 27
   classSupernova::$debug->warning(classLocale::$lang['fl_aks_hack_wrong_fleet'], 'Wrong Fleet Owner', 301);
28 28
   message(classLocale::$lang['fl_aks_hack_wrong_fleet'], classLocale::$lang['fl_error']);
29 29
 }
@@ -34,19 +34,19 @@  discard block
 block discarded – undo
34 34
 
35 35
 !$aks && !$userToAdd_unsafe ? $userToAdd_unsafe = $user['username'] : false;
36 36
 
37
-if($userToAdd_unsafe) {
37
+if ($userToAdd_unsafe) {
38 38
   $userToAdd = db_escape($userToAdd_unsafe);
39 39
   $userToAddID = DBStaticUser::db_user_by_username($userToAdd_unsafe, false, 'id', true, true);
40 40
   $userToAddID = $userToAddID['id'];
41 41
 
42
-  if($objFleet->target_owner_id == $userToAddID) {
42
+  if ($objFleet->target_owner_id == $userToAddID) {
43 43
     message(classLocale::$lang['flt_aks_player_same'], classLocale::$lang['fl_error']);
44 44
   }
45 45
 
46
-  if($userToAddID) {
47
-    if(!$aks) {
46
+  if ($userToAddID) {
47
+    if (!$aks) {
48 48
       // No AСS exists - making one
49
-      if(!$objFleet->group_id) {
49
+      if (!$objFleet->group_id) {
50 50
         DBStaticFleetACS::db_acs_insert($fleetid, $user['id'], $objFleet);
51 51
 
52 52
         $aks = DBStaticFleetACS::db_acs_get_by_fleet($fleetid);
@@ -61,24 +61,24 @@  discard block
 block discarded – undo
61 61
 
62 62
     $isUserExists = false;
63 63
     $invited_ar = explode(",", $aks['eingeladen']);
64
-    foreach($invited_ar as $inv) {
65
-      if($userToAddID == $inv) {
64
+    foreach ($invited_ar as $inv) {
65
+      if ($userToAddID == $inv) {
66 66
         $isUserExists = true;
67 67
       }
68 68
     }
69 69
 
70
-    if(count($invited_ar) >= 5) {
70
+    if (count($invited_ar) >= 5) {
71 71
       message(classLocale::$lang['flt_aks_error_too_much_players'], classLocale::$lang['fl_error']);
72 72
     }
73 73
 
74
-    if($isUserExists) {
74
+    if ($isUserExists) {
75 75
       $userToAdd_unsafe != $user['username'] ? $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited_already'], $userToAdd) : false;
76 76
     } else {
77 77
       $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited'], $userToAdd);
78
-      if(!(DBStaticFleetACS::db_acs_update($userToAddID, $fleetid))) {
78
+      if (!(DBStaticFleetACS::db_acs_update($userToAddID, $fleetid))) {
79 79
         die(sprintf(classLocale::$lang['fl_aks_adding_error'], classSupernova::$db->db_error()));
80 80
       }
81
-      $aks['eingeladen'] .= ',' . $userToAddID;
81
+      $aks['eingeladen'] .= ','.$userToAddID;
82 82
     }
83 83
     DBStaticMessages::msg_send_simple_message($userToAddID, $user['id'], SN_TIME_NOW, MSG_TYPE_COMBAT, $user['username'], classLocale::$lang['fl_aks_invite_message_header'], sprintf(classLocale::$lang['fl_aks_invite_message'], $user['username']));
84 84
   } else {
@@ -94,8 +94,8 @@  discard block
 block discarded – undo
94 94
   'MISSION_NAME' => classLocale::$lang['type_mission'][MT_ACS],
95 95
 ));
96 96
 
97
-if($aks['eingeladen'] && is_array($members = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
98
-  foreach($members as $row) {
97
+if ($aks['eingeladen'] && is_array($members = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
98
+  foreach ($members as $row) {
99 99
     $template->assign_block_vars('invited', array(
100 100
       'NAME' => $row['username'],
101 101
     ));
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 $fleet_data = tplParseFleetObject($objFleet, $i, $user);
121 121
 
122 122
 $template->assign_block_vars('fleets', $fleet_data['fleet']);
123
-foreach($fleet_data['ships'] as $ship_data) {
123
+foreach ($fleet_data['ships'] as $ship_data) {
124 124
   $template->assign_block_vars('fleets.ships', $ship_data);
125 125
 }
126 126
 
Please login to merge, or discard this patch.
common.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -12,24 +12,24 @@  discard block
 block discarded – undo
12 12
 global $template_result, $user;
13 13
 
14 14
 // Напоминание для Администрации, что игра отключена
15
-if($template_result[F_GAME_DISABLE]) {
15
+if ($template_result[F_GAME_DISABLE]) {
16 16
   echo '<div class="global_admin_warning">', $template_result[F_GAME_DISABLE_REASON], '</div>';
17 17
 }
18 18
 unset($disable_reason);
19 19
 
20 20
 
21
-if(defined('IN_ADMIN') && IN_ADMIN === true) {
21
+if (defined('IN_ADMIN') && IN_ADMIN === true) {
22 22
   lng_include('admin');
23
-} elseif($sys_user_logged_in) {
23
+} elseif ($sys_user_logged_in) {
24 24
   sys_user_vacation($user);
25 25
 
26 26
   $planet_id = SetSelectedPlanet($user);
27 27
 
28 28
   // TODO НЕ НУЖНО АЛЬЯНС КАЖДЫЙ РАЗ ОБНОВЛЯТЬ!!!
29
-  if($user['ally_id']) {
29
+  if ($user['ally_id']) {
30 30
     sn_db_transaction_start();
31 31
     sn_ali_fill_user_ally($user);
32
-    if(!$user['ally']['player']['id']) {
32
+    if (!$user['ally']['player']['id']) {
33 33
       // sn_sys_logout(false, true);
34 34
       // core_auth::logout(false);
35 35
       classSupernova::$auth->logout(false);
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
     }
38 38
     // TODO UNCOMMENT
39 39
     que_process($user['ally']['player']);
40
-    DBStaticUser::db_user_set_by_id_DEPRECATED($user['ally']['player']['id'], '`onlinetime` = ' . SN_TIME_NOW);
40
+    DBStaticUser::db_user_set_by_id_DEPRECATED($user['ally']['player']['id'], '`onlinetime` = '.SN_TIME_NOW);
41 41
     sn_db_transaction_commit();
42 42
   }
43 43
 
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
   sn_db_transaction_commit();
49 49
 
50 50
   $planetrow = $global_data['planet'];
51
-  if(!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
51
+  if (!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
52 52
     // sn_sys_logout(false, true);
53 53
     // core_auth::logout(false);
54 54
     classSupernova::$auth->logout(false);
Please login to merge, or discard this patch.
includes/classes/DBAL/DbQuery.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
    * @return string
91 91
    */
92 92
   protected function stringValue($value) {
93
-    return "'" . $this->escape((string)$value) . "'";
93
+    return "'".$this->escape((string) $value)."'";
94 94
   }
95 95
 
96 96
   /**
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
    * @return string
102 102
    */
103 103
   protected function quote($fieldName) {
104
-    return "`" . $this->escape((string)$fieldName) . "`";
104
+    return "`".$this->escape((string) $fieldName)."`";
105 105
   }
106 106
 
107 107
   /**
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
    * @return string
113 113
    */
114 114
   protected function quoteTable($tableName) {
115
-    return "`{{" . $this->escape((string)$tableName) . "}}`";
115
+    return "`{{".$this->escape((string) $tableName)."}}`";
116 116
   }
117 117
 
118 118
   public function table($table) {
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
     foreach ($fieldValues as $fieldName => $fieldValue) {
232 232
       // Integer $fieldName is DANGER! They skipped there!
233 233
       if (!is_int($fieldName)) {
234
-        $result[$fieldName] = $this->quote($fieldName) . " = " . $this->castAsDbValue($fieldValue);
234
+        $result[$fieldName] = $this->quote($fieldName)." = ".$this->castAsDbValue($fieldValue);
235 235
       }
236 236
     }
237 237
 
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
   protected function buildCommand() {
242 242
     switch ($this->command) {
243 243
       case static::DELETE:
244
-        $this->build[] = static::DELETE . " FROM " . $this->quoteTable($this->table) . ' ';
244
+        $this->build[] = static::DELETE." FROM ".$this->quoteTable($this->table).' ';
245 245
       break;
246 246
     }
247 247
   }
Please login to merge, or discard this patch.
includes/classes/db_mysql.php 2 patches
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
   public function load_db_settings($configFile = '') {
92 92
     $dbsettings = array();
93 93
 
94
-    empty($configFile) ? $configFile = SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX : false;
94
+    empty($configFile) ? $configFile = SN_ROOT_PHYSICAL."config".DOT_PHP_EX : false;
95 95
 
96 96
     require $configFile;
97 97
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
     }
112 112
 
113 113
     if (empty($this->dbsettings)) {
114
-      $this->load_db_settings(SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX);
114
+      $this->load_db_settings(SN_ROOT_PHYSICAL."config".DOT_PHP_EX);
115 115
     }
116 116
 
117 117
     // TODO - фатальные (?) ошибки на каждом шагу. Хотя - скорее Эксепшны
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
     $sql = $query;
164 164
     if (strpos($sql, '{{') !== false) {
165 165
       foreach ($this->table_list as $tableName) {
166
-        $sql = str_replace("{{{$tableName}}}", $this->db_prefix . $tableName, $sql);
166
+        $sql = str_replace("{{{$tableName}}}", $this->db_prefix.$tableName, $sql);
167 167
       }
168 168
     }
169 169
 
@@ -236,12 +236,12 @@  discard block
 block discarded – undo
236 236
 
237 237
     $queryResult = null;
238 238
     try {
239
-      $queryResult = $this->db_sql_query($stringQuery . DbSqlHelper::quoteComment($queryTrace));
239
+      $queryResult = $this->db_sql_query($stringQuery.DbSqlHelper::quoteComment($queryTrace));
240 240
       if (!$queryResult) {
241 241
         throw new Exception();
242 242
       }
243 243
     } catch (Exception $e) {
244
-      classSupernova::$debug->error($this->db_error() . "<br />{$query}<br />", 'SQL Error');
244
+      classSupernova::$debug->error($this->db_error()."<br />{$query}<br />", 'SQL Error');
245 245
     }
246 246
 
247 247
     return $queryResult;
@@ -579,7 +579,7 @@  discard block
 block discarded – undo
579 579
       case TYPE_EMPTY:
580 580
         // No-type defaults to string
581 581
       default:
582
-        $value = "'" . $this->db_escape((string)$value) . "'";
582
+        $value = "'".$this->db_escape((string) $value)."'";
583 583
       break;
584 584
     }
585 585
 
@@ -607,7 +607,7 @@  discard block
 block discarded – undo
607 607
       if (is_int($fieldName)) {
608 608
         $result[$fieldName] = $fieldValue;
609 609
       } else {
610
-        $result[$fieldName] = "`{$fieldName}` = " . $this->castAsDbValue($fieldValue);
610
+        $result[$fieldName] = "`{$fieldName}` = ".$this->castAsDbValue($fieldValue);
611 611
       }
612 612
     }
613 613
 
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
636 636
       if (is_int($fieldName)) {
637 637
         $result[$fieldName] = $fieldValue;
638 638
       } else {
639
-        $result[$fieldName] = "`{$fieldName}` = `{$fieldName}` + (" . $this->castAsDbValue($fieldValue) . ")";
639
+        $result[$fieldName] = "`{$fieldName}` = `{$fieldName}` + (".$this->castAsDbValue($fieldValue).")";
640 640
       }
641 641
     }
642 642
 
@@ -667,7 +667,7 @@  discard block
 block discarded – undo
667 667
     }
668 668
 
669 669
     foreach ($fields as $key => $value) {
670
-      $result[$key] = "`" . $this->db_escape($value) . "`";
670
+      $result[$key] = "`".$this->db_escape($value)."`";
671 671
     }
672 672
 
673 673
     return $result;
@@ -723,10 +723,10 @@  discard block
 block discarded – undo
723 723
       $this->isWatching = true;
724 724
       $msg = "\$query = \"{$query}\"\n\r";
725 725
       if (!empty($_POST)) {
726
-        $msg .= "\n\r" . dump($_POST, '$_POST');
726
+        $msg .= "\n\r".dump($_POST, '$_POST');
727 727
       }
728 728
       if (!empty($_GET)) {
729
-        $msg .= "\n\r" . dump($_GET, '$_GET');
729
+        $msg .= "\n\r".dump($_GET, '$_GET');
730 730
       }
731 731
       classSupernova::$debug->warning($msg, "Watching user {$user['id']}", 399, array('base_dump' => true));
732 732
       $this->isWatching = false;
@@ -752,37 +752,37 @@  discard block
 block discarded – undo
752 752
       case stripos($query, 'RPG_POINTS') != false && stripos(trim($query), 'UPDATE ') === 0 && !$dm_change_legit:
753 753
       case stripos($query, 'METAMATTER') != false && stripos(trim($query), 'UPDATE ') === 0 && !$mm_change_legit:
754 754
       case stripos($query, 'AUTHLEVEL') != false && $user['authlevel'] < 3 && stripos($query, 'SELECT') !== 0:
755
-        $report = "Hacking attempt (" . date("d.m.Y H:i:s") . " - [" . time() . "]):\n";
755
+        $report = "Hacking attempt (".date("d.m.Y H:i:s")." - [".time()."]):\n";
756 756
         $report .= ">Database Inforamation\n";
757
-        $report .= "\tID - " . $user['id'] . "\n";
758
-        $report .= "\tUser - " . $user['username'] . "\n";
759
-        $report .= "\tAuth level - " . $user['authlevel'] . "\n";
760
-        $report .= "\tAdmin Notes - " . $user['adminNotes'] . "\n";
761
-        $report .= "\tCurrent Planet - " . $user['current_planet'] . "\n";
762
-        $report .= "\tUser IP - " . $user['user_lastip'] . "\n";
763
-        $report .= "\tUser IP at Reg - " . $user['ip_at_reg'] . "\n";
764
-        $report .= "\tUser Agent- " . $_SERVER['HTTP_USER_AGENT'] . "\n";
765
-        $report .= "\tCurrent Page - " . $user['current_page'] . "\n";
766
-        $report .= "\tRegister Time - " . $user['register_time'] . "\n";
757
+        $report .= "\tID - ".$user['id']."\n";
758
+        $report .= "\tUser - ".$user['username']."\n";
759
+        $report .= "\tAuth level - ".$user['authlevel']."\n";
760
+        $report .= "\tAdmin Notes - ".$user['adminNotes']."\n";
761
+        $report .= "\tCurrent Planet - ".$user['current_planet']."\n";
762
+        $report .= "\tUser IP - ".$user['user_lastip']."\n";
763
+        $report .= "\tUser IP at Reg - ".$user['ip_at_reg']."\n";
764
+        $report .= "\tUser Agent- ".$_SERVER['HTTP_USER_AGENT']."\n";
765
+        $report .= "\tCurrent Page - ".$user['current_page']."\n";
766
+        $report .= "\tRegister Time - ".$user['register_time']."\n";
767 767
         $report .= "\n";
768 768
 
769 769
         $report .= ">Query Information\n";
770
-        $report .= "\tQuery - " . $query . "\n";
770
+        $report .= "\tQuery - ".$query."\n";
771 771
         $report .= "\n";
772 772
 
773 773
         $report .= ">\$_SERVER Information\n";
774
-        $report .= "\tIP - " . $_SERVER['REMOTE_ADDR'] . "\n";
775
-        $report .= "\tHost Name - " . $_SERVER['HTTP_HOST'] . "\n";
776
-        $report .= "\tUser Agent - " . $_SERVER['HTTP_USER_AGENT'] . "\n";
777
-        $report .= "\tRequest Method - " . $_SERVER['REQUEST_METHOD'] . "\n";
778
-        $report .= "\tCame From - " . $_SERVER['HTTP_REFERER'] . "\n";
779
-        $report .= "\tPage is - " . $_SERVER['SCRIPT_NAME'] . "\n";
780
-        $report .= "\tUses Port - " . $_SERVER['REMOTE_PORT'] . "\n";
781
-        $report .= "\tServer Protocol - " . $_SERVER['SERVER_PROTOCOL'] . "\n";
774
+        $report .= "\tIP - ".$_SERVER['REMOTE_ADDR']."\n";
775
+        $report .= "\tHost Name - ".$_SERVER['HTTP_HOST']."\n";
776
+        $report .= "\tUser Agent - ".$_SERVER['HTTP_USER_AGENT']."\n";
777
+        $report .= "\tRequest Method - ".$_SERVER['REQUEST_METHOD']."\n";
778
+        $report .= "\tCame From - ".$_SERVER['HTTP_REFERER']."\n";
779
+        $report .= "\tPage is - ".$_SERVER['SCRIPT_NAME']."\n";
780
+        $report .= "\tUses Port - ".$_SERVER['REMOTE_PORT']."\n";
781
+        $report .= "\tServer Protocol - ".$_SERVER['SERVER_PROTOCOL']."\n";
782 782
 
783 783
         $report .= "\n--------------------------------------------------------------------------------------------------\n";
784 784
 
785
-        $fp = fopen(SN_ROOT_PHYSICAL . 'badqrys.txt', 'a');
785
+        $fp = fopen(SN_ROOT_PHYSICAL.'badqrys.txt', 'a');
786 786
         fwrite($fp, $report);
787 787
         fclose($fp);
788 788
 
Please login to merge, or discard this patch.
Doc Comments   +28 added lines, -4 removed lines patch added patch discarded remove patch
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
   /**
158 158
    * @param string $query
159 159
    *
160
-   * @return mixed|string
160
+   * @return string
161 161
    */
162 162
   public function replaceTablePlaceholders($query) {
163 163
     $sql = $query;
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
   }
172 172
 
173 173
   /**
174
-   * @param $query
174
+   * @param string $query
175 175
    */
176 176
   protected function logQuery($query) {
177 177
     if (!classSupernova::$config->debug) {
@@ -301,6 +301,10 @@  discard block
 block discarded – undo
301 301
   }
302 302
 
303 303
 
304
+  /**
305
+   * @param string $table
306
+   * @param integer $replace
307
+   */
304 308
   protected function doSet($table, $fieldsAndValues, $replace = DB_INSERT_PLAIN) {
305 309
     $tableSafe = $this->db_escape($table);
306 310
     $safeFieldsAndValues = implode(',', $this->safeFieldsEqualValues($fieldsAndValues));
@@ -349,6 +353,10 @@  discard block
 block discarded – undo
349 353
 
350 354
 
351 355
   // INSERTERS
356
+
357
+  /**
358
+   * @param string $query
359
+   */
352 360
   public function doInsertComplex($query) {
353 361
     return $this->doSql($query);
354 362
   }
@@ -369,7 +377,7 @@  discard block
 block discarded – undo
369 377
    * Values should be passed as-is
370 378
    *
371 379
    * @param string   $table
372
-   * @param array    $fields
380
+   * @param string[]    $fields
373 381
    * @param string[] $values
374 382
    *
375 383
    * @return array|bool|mysqli_result|null
@@ -426,7 +434,7 @@  discard block
 block discarded – undo
426 434
    * Self-contained - means no params used
427 435
    * Such queries usually used to make large amount of in-base calculations
428 436
    *
429
-   * @param $query
437
+   * @param string $query
430 438
    *
431 439
    * @return array|bool|mysqli_result|null
432 440
    */
@@ -434,6 +442,9 @@  discard block
 block discarded – undo
434 442
     return $this->doSql($query);
435 443
   }
436 444
 
445
+  /**
446
+   * @param boolean $isOneRecord
447
+   */
437 448
   protected function doUpdateWhere($table, $fieldsSet, $fieldsAdjust = array(), $where = array(), $isOneRecord = DB_RECORDS_ALL) {
438 449
     $tableSafe = $this->db_escape($table);
439 450
 
@@ -457,10 +468,16 @@  discard block
 block discarded – undo
457 468
     return $this->doSql($query);
458 469
   }
459 470
 
471
+  /**
472
+   * @param string $table
473
+   */
460 474
   public function doUpdateRowSet($table, $fieldsAndValues, $where) {
461 475
     return $this->doUpdateWhere($table, $fieldsAndValues, array(), $where, DB_RECORD_ONE);
462 476
   }
463 477
 
478
+  /**
479
+   * @param string $table
480
+   */
464 481
   public function doUpdateTableSet($table, $fieldsAndValues, $where = array()) {
465 482
     return $this->doUpdateWhere($table, $fieldsAndValues, array(), $where, DB_RECORDS_ALL);
466 483
   }
@@ -727,6 +744,10 @@  discard block
 block discarded – undo
727 744
   }
728 745
 
729 746
   // TODO Заменить это на новый логгер
747
+
748
+  /**
749
+   * @param string $query
750
+   */
730 751
   protected function security_watch_user_queries($query) {
731 752
     global $user;
732 753
 
@@ -750,6 +771,9 @@  discard block
 block discarded – undo
750 771
   }
751 772
 
752 773
 
774
+  /**
775
+   * @param string $query
776
+   */
753 777
   public function security_query_check_bad_words($query) {
754 778
     if ($this->skipQueryCheck) {
755 779
       return;
Please login to merge, or discard this patch.