Completed
Push — work-fleets ( 74a0d7...680ce4 )
by SuperNova.WS
05:04
created
includes/classes/Confirmation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
       // $query = static::$db->doquery("SELECT `id` FROM {{confirmations}} WHERE `code` = '{$confirm_code_safe}' AND `type` = {$confirmation_type_safe} FOR UPDATE", true);
42 42
       // Тип не нужен для проверки - код подтверждения должен быть уникален от слова "совсем"
43 43
       $query = $this->db->doquery("SELECT `id` FROM {{confirmations}} WHERE `code` = '{$confirm_code_safe}' FOR UPDATE", true);
44
-    } while($query);
44
+    } while ($query);
45 45
 
46 46
     $this->db->doquery(
47 47
       "REPLACE INTO {{confirmations}}
Please login to merge, or discard this patch.
includes/classes/db_mysql_v4.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -30,17 +30,17 @@  discard block
 block discarded – undo
30 30
 
31 31
     static $need_keys = array('server', 'user', 'pass', 'name', 'prefix');
32 32
 
33
-    if($this->connected) {
33
+    if ($this->connected) {
34 34
       return true;
35 35
     }
36 36
 
37
-    if(empty($settings) || !is_array($settings) || array_intersect($need_keys, array_keys($settings)) != $need_keys) {
37
+    if (empty($settings) || !is_array($settings) || array_intersect($need_keys, array_keys($settings)) != $need_keys) {
38 38
       $debug->error_fatal('There is missconfiguration in your config.php. Check it again', $this->mysql_error());
39 39
     }
40 40
 
41 41
     // TODO !!!!!! DEBUG -> error!!!!
42 42
     @$this->link = mysql_connect($settings['server'], $settings['user'], $settings['pass']);
43
-    if(!is_resource($this->link)) {
43
+    if (!is_resource($this->link)) {
44 44
       $debug->error_fatal('DB Error - cannot connect to server', $this->mysql_error());
45 45
     }
46 46
 
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     return mysql_real_escape_string($unescaped_string, $this->link);
69 69
   }
70 70
   function mysql_close_link() {
71
-    if($this->connected) {
71
+    if ($this->connected) {
72 72
       $this->connected = false;
73 73
       mysql_close($this->link);
74 74
       unset($this->link);
Please login to merge, or discard this patch.
includes/classes/db_mysql.php 1 patch
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -76,23 +76,23 @@  discard block
 block discarded – undo
76 76
   function sn_db_connect($external_db_settings = null) {
77 77
     $this->db_disconnect();
78 78
 
79
-    if(!empty($external_db_settings) && is_array($external_db_settings)) {
79
+    if (!empty($external_db_settings) && is_array($external_db_settings)) {
80 80
       $this->dbsettings = $external_db_settings;
81 81
     }
82 82
 
83
-    if(empty($this->dbsettings)) {
83
+    if (empty($this->dbsettings)) {
84 84
       $this->load_db_settings();
85 85
     }
86 86
 
87 87
     // TODO - фатальные (?) ошибки на каждом шагу. Хотя - скорее Эксепшны
88
-    if(!empty($this->dbsettings)) {
88
+    if (!empty($this->dbsettings)) {
89 89
       $driver_name = empty($this->dbsettings['sn_driver']) ? 'db_mysql_v5' : $this->dbsettings['sn_driver'];
90 90
       $this->driver = new $driver_name();
91 91
       $this->db_prefix = $this->dbsettings['prefix'];
92 92
 
93 93
       $this->connected = $this->connected || $this->driver_connect();
94 94
 
95
-      if($this->connected) {
95
+      if ($this->connected) {
96 96
         $this->table_list = $this->db_get_table_list();
97 97
         // TODO Проверка на пустоту
98 98
       }
@@ -106,11 +106,11 @@  discard block
 block discarded – undo
106 106
   function driver_connect() {
107 107
     global $debug;
108 108
 
109
-    if(!is_object($this->driver)) {
109
+    if (!is_object($this->driver)) {
110 110
       $debug->error_fatal('DB Error - No driver for MySQL found!');
111 111
     }
112 112
 
113
-    if(!method_exists($this->driver, 'mysql_connect')) {
113
+    if (!method_exists($this->driver, 'mysql_connect')) {
114 114
       $debug->error_fatal('DB Error - WRONG MySQL driver!');
115 115
     }
116 116
 
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
   }
119 119
 
120 120
   function db_disconnect() {
121
-    if($this->connected) {
121
+    if ($this->connected) {
122 122
       $this->connected = !$this->driver_disconnect();
123 123
       $this->connected = false;
124 124
     }
@@ -129,11 +129,11 @@  discard block
 block discarded – undo
129 129
   function doquery($query, $table = '', $fetch = false, $skip_query_check = false) {
130 130
     global $numqueries, $debug, $sn_cache, $config;
131 131
 
132
-    if(!is_string($table)) {
132
+    if (!is_string($table)) {
133 133
       $fetch = $table;
134 134
     }
135 135
 
136
-    if(!$this->connected) {
136
+    if (!$this->connected) {
137 137
       $this->sn_db_connect();
138 138
     }
139 139
 
@@ -142,31 +142,31 @@  discard block
 block discarded – undo
142 142
     $skip_query_check or $this->security_query_check_bad_words($query);
143 143
 
144 144
     $sql = $query;
145
-    if(strpos($sql, '{{') !== false) {
145
+    if (strpos($sql, '{{') !== false) {
146 146
 //     foreach($sn_cache->tables as $tableName) {
147
-      foreach($this->table_list as $tableName) {
147
+      foreach ($this->table_list as $tableName) {
148 148
         $sql = str_replace("{{{$tableName}}}", $this->db_prefix . $tableName, $sql);
149 149
       }
150 150
     }
151 151
 
152
-    if($config->debug) {
152
+    if ($config->debug) {
153 153
       $numqueries++;
154 154
       $arr = debug_backtrace();
155
-      $file = end(explode('/',$arr[0]['file']));
155
+      $file = end(explode('/', $arr[0]['file']));
156 156
       $line = $arr[0]['line'];
157 157
       $debug->add("<tr><th>Query $numqueries: </th><th>$query</th><th>$file($line)</th><th>$table</th><th>$fetch</th></tr>");
158 158
     }
159 159
 
160
-    if(defined('DEBUG_SQL_COMMENT')) {
160
+    if (defined('DEBUG_SQL_COMMENT')) {
161 161
       $backtrace = debug_backtrace();
162 162
       $sql_comment = $debug->compact_backtrace($backtrace, defined('DEBUG_SQL_COMMENT_LONG'));
163 163
 
164 164
       $sql_commented = '/* ' . implode("<br />", $sql_comment) . '<br /> */ ' . preg_replace("/\s+/", ' ', $sql);
165
-      if(defined('DEBUG_SQL_ONLINE')) {
165
+      if (defined('DEBUG_SQL_ONLINE')) {
166 166
         $debug->warning($sql_commented, 'SQL Debug', LOG_DEBUG_SQL);
167 167
       }
168 168
 
169
-      if(defined('DEBUG_SQL_ERROR')) {
169
+      if (defined('DEBUG_SQL_ERROR')) {
170 170
         array_unshift($sql_comment, preg_replace("/\s+/", ' ', $sql));
171 171
         $debug->add_to_array($sql_comment);
172 172
         // $debug->add_to_array($sql_comment . preg_replace("/\s+/", ' ', $sql));
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
       $sql = $sql_commented;
175 175
     }
176 176
 
177
-    $sqlquery = $this->db_sql_query($sql) or $debug->error(db_error()."<br />$sql<br />",'SQL Error');
177
+    $sqlquery = $this->db_sql_query($sql) or $debug->error(db_error() . "<br />$sql<br />", 'SQL Error');
178 178
 
179 179
     return $fetch ? $this->db_fetch($sqlquery) : $sqlquery;
180 180
   }
@@ -184,16 +184,16 @@  discard block
 block discarded – undo
184 184
     // TODO Заменить это на новый логгер
185 185
     global $config, $is_watching, $user, $debug;
186 186
 
187
-    if(!$is_watching && $config->game_watchlist_array && in_array($user['id'], $config->game_watchlist_array))
187
+    if (!$is_watching && $config->game_watchlist_array && in_array($user['id'], $config->game_watchlist_array))
188 188
     {
189
-      if(!preg_match('/^(select|commit|rollback|start transaction)/i', $query)) {
189
+      if (!preg_match('/^(select|commit|rollback|start transaction)/i', $query)) {
190 190
         $is_watching = true;
191 191
         $msg = "\$query = \"{$query}\"\n\r";
192
-        if(!empty($_POST)) {
193
-          $msg .= "\n\r" . dump($_POST,'$_POST');
192
+        if (!empty($_POST)) {
193
+          $msg .= "\n\r" . dump($_POST, '$_POST');
194 194
         }
195
-        if(!empty($_GET)) {
196
-          $msg .= "\n\r" . dump($_GET,'$_GET');
195
+        if (!empty($_GET)) {
196
+          $msg .= "\n\r" . dump($_GET, '$_GET');
197 197
         }
198 198
         $debug->warning($msg, "Watching user {$user['id']}", 399, array('base_dump' => true));
199 199
         $is_watching = false;
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
   function security_query_check_bad_words($query) {
206 206
     global $user, $dm_change_legit, $mm_change_legit;
207 207
 
208
-    switch(true) {
208
+    switch (true) {
209 209
       case stripos($query, 'RUNCATE TABL') != false:
210 210
       case stripos($query, 'ROP TABL') != false:
211 211
       case stripos($query, 'ENAME TABL') != false:
@@ -216,33 +216,33 @@  discard block
 block discarded – undo
216 216
       case stripos($query, 'RPG_POINTS') != false && stripos(trim($query), 'UPDATE ') === 0 && !$dm_change_legit:
217 217
       case stripos($query, 'METAMATTER') != false && stripos(trim($query), 'UPDATE ') === 0 && !$mm_change_legit:
218 218
       case stripos($query, 'AUTHLEVEL') != false && $user['authlevel'] < 3 && stripos($query, 'SELECT') !== 0:
219
-        $report  = "Hacking attempt (".date("d.m.Y H:i:s")." - [".time()."]):\n";
219
+        $report  = "Hacking attempt (" . date("d.m.Y H:i:s") . " - [" . time() . "]):\n";
220 220
         $report .= ">Database Inforamation\n";
221
-        $report .= "\tID - ".$user['id']."\n";
222
-        $report .= "\tUser - ".$user['username']."\n";
223
-        $report .= "\tAuth level - ".$user['authlevel']."\n";
224
-        $report .= "\tAdmin Notes - ".$user['adminNotes']."\n";
225
-        $report .= "\tCurrent Planet - ".$user['current_planet']."\n";
226
-        $report .= "\tUser IP - ".$user['user_lastip']."\n";
227
-        $report .= "\tUser IP at Reg - ".$user['ip_at_reg']."\n";
228
-        $report .= "\tUser Agent- ".$_SERVER['HTTP_USER_AGENT']."\n";
229
-        $report .= "\tCurrent Page - ".$user['current_page']."\n";
230
-        $report .= "\tRegister Time - ".$user['register_time']."\n";
221
+        $report .= "\tID - " . $user['id'] . "\n";
222
+        $report .= "\tUser - " . $user['username'] . "\n";
223
+        $report .= "\tAuth level - " . $user['authlevel'] . "\n";
224
+        $report .= "\tAdmin Notes - " . $user['adminNotes'] . "\n";
225
+        $report .= "\tCurrent Planet - " . $user['current_planet'] . "\n";
226
+        $report .= "\tUser IP - " . $user['user_lastip'] . "\n";
227
+        $report .= "\tUser IP at Reg - " . $user['ip_at_reg'] . "\n";
228
+        $report .= "\tUser Agent- " . $_SERVER['HTTP_USER_AGENT'] . "\n";
229
+        $report .= "\tCurrent Page - " . $user['current_page'] . "\n";
230
+        $report .= "\tRegister Time - " . $user['register_time'] . "\n";
231 231
         $report .= "\n";
232 232
 
233 233
         $report .= ">Query Information\n";
234
-        $report .= "\tQuery - ".$query."\n";
234
+        $report .= "\tQuery - " . $query . "\n";
235 235
         $report .= "\n";
236 236
 
237 237
         $report .= ">\$_SERVER Information\n";
238
-        $report .= "\tIP - ".$_SERVER['REMOTE_ADDR']."\n";
239
-        $report .= "\tHost Name - ".$_SERVER['HTTP_HOST']."\n";
240
-        $report .= "\tUser Agent - ".$_SERVER['HTTP_USER_AGENT']."\n";
241
-        $report .= "\tRequest Method - ".$_SERVER['REQUEST_METHOD']."\n";
242
-        $report .= "\tCame From - ".$_SERVER['HTTP_REFERER']."\n";
243
-        $report .= "\tPage is - ".$_SERVER['SCRIPT_NAME']."\n";
244
-        $report .= "\tUses Port - ".$_SERVER['REMOTE_PORT']."\n";
245
-        $report .= "\tServer Protocol - ".$_SERVER['SERVER_PROTOCOL']."\n";
238
+        $report .= "\tIP - " . $_SERVER['REMOTE_ADDR'] . "\n";
239
+        $report .= "\tHost Name - " . $_SERVER['HTTP_HOST'] . "\n";
240
+        $report .= "\tUser Agent - " . $_SERVER['HTTP_USER_AGENT'] . "\n";
241
+        $report .= "\tRequest Method - " . $_SERVER['REQUEST_METHOD'] . "\n";
242
+        $report .= "\tCame From - " . $_SERVER['HTTP_REFERER'] . "\n";
243
+        $report .= "\tPage is - " . $_SERVER['SCRIPT_NAME'] . "\n";
244
+        $report .= "\tUses Port - " . $_SERVER['REMOTE_PORT'] . "\n";
245
+        $report .= "\tServer Protocol - " . $_SERVER['SERVER_PROTOCOL'] . "\n";
246 246
 
247 247
         $report .= "\n--------------------------------------------------------------------------------------------------\n";
248 248
 
@@ -262,11 +262,11 @@  discard block
 block discarded – undo
262 262
     $prefix_length = strlen($this->db_prefix);
263 263
 
264 264
     $tl = array();
265
-    while($row = $this->db_fetch($query)) {
266
-      foreach($row as $table_name) {
267
-        if(strpos($table_name, $this->db_prefix) === 0) {
265
+    while ($row = $this->db_fetch($query)) {
266
+      foreach ($row as $table_name) {
267
+        if (strpos($table_name, $this->db_prefix) === 0) {
268 268
           $table_name = substr($table_name, $prefix_length);
269
-        } elseif($prefixed_only) {
269
+        } elseif ($prefixed_only) {
270 270
           continue;
271 271
         }
272 272
         // $table_name = str_replace($db_prefix, '', $table_name);
Please login to merge, or discard this patch.
includes/classes/functions_template.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -142,9 +142,9 @@  discard block
 block discarded – undo
142 142
 
143 143
     preg_match_all('#<!-- INCLUDE (\{\$?[A-Z0-9\-_]+\}|[a-zA-Z0-9\_\-\+\./]+) -->#', $code, $matches);
144 144
     $include_blocks = $matches[1];
145
-    if($include_blocks)
145
+    if ($include_blocks)
146 146
     {
147
-      foreach($include_blocks as &$included_file)
147
+      foreach ($include_blocks as &$included_file)
148 148
       {
149 149
         $included_file .= '.tpl.html';
150 150
       }
@@ -453,8 +453,8 @@  discard block
 block discarded – undo
453 453
 
454 454
     $tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){';
455 455
 //    $tag_template_php .= '$this->_block_counter["'. $tag_args . '"] = $_' . $tag_args . '_i;';
456
-    $tag_template_php .= '$_'. $tag_args . '_val = &' . $varref . '[$_'. $tag_args. '_i];';
457
-    $tag_template_php .= '$this->_block_value["'. $tag_args . '"] = &' . $varref . '[$_'. $tag_args. '_i];';
456
+    $tag_template_php .= '$_' . $tag_args . '_val = &' . $varref . '[$_' . $tag_args . '_i];';
457
+    $tag_template_php .= '$this->_block_value["' . $tag_args . '"] = &' . $varref . '[$_' . $tag_args . '_i];';
458 458
 
459 459
     return $tag_template_php;
460 460
   }
@@ -558,10 +558,10 @@  discard block
 block discarded – undo
558 558
         break;
559 559
 
560 560
         case 'is':
561
-          $is_arg_start = ($tokens[$i-1] == ')') ? array_pop($is_arg_stack) : $i-1;
561
+          $is_arg_start = ($tokens[$i - 1] == ')') ? array_pop($is_arg_stack) : $i - 1;
562 562
           $is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start));
563 563
 
564
-          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1));
564
+          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i + 1));
565 565
 
566 566
           array_splice($tokens, $is_arg_start, sizeof($tokens), $new_tokens);
567 567
 
@@ -821,11 +821,11 @@  discard block
 block discarded – undo
821 821
     }
822 822
     else if ($include_last_iterator)
823 823
     {
824
-      return '$_'. $blocks[$blockcount] . '_val';
824
+      return '$_' . $blocks[$blockcount] . '_val';
825 825
     }
826 826
     else
827 827
     {
828
-      return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
828
+      return '$_' . $blocks[$blockcount - 1] . '_val[\'' . $blocks[$blockcount] . '\']';
829 829
     }
830 830
   }
831 831
 
@@ -842,7 +842,7 @@  discard block
 block discarded – undo
842 842
     if ($fp = @fopen($filename, 'wb'))
843 843
     {
844 844
       @flock($fp, LOCK_EX);
845
-      @fwrite ($fp, $data);
845
+      @fwrite($fp, $data);
846 846
       @flock($fp, LOCK_UN);
847 847
       @fclose($fp);
848 848
 
@@ -862,7 +862,7 @@  discard block
 block discarded – undo
862 862
   {
863 863
     global $config;
864 864
 
865
-    if(!$config->tpl_minifier)
865
+    if (!$config->tpl_minifier)
866 866
     {
867 867
       return $html;
868 868
     }
@@ -874,14 +874,14 @@  discard block
 block discarded – undo
874 874
     //$html = preg_replace('/[\r\n\t]+/', ' ', $html);
875 875
     $html = preg_replace('/>[\s]*</', '><', $html); // Strip spacechars between tags
876 876
     $html = preg_replace('/[\s]+/', ' ', $html); // Replace several spacechars with one space
877
-    if(!empty($pre[0]))
877
+    if (!empty($pre[0]))
878 878
     {
879
-      foreach($pre[0] as $tag)
879
+      foreach ($pre[0] as $tag)
880 880
       {
881 881
         $tag = preg_replace('/^\ *\/\/[^\<]*?$/m', ' ', $tag); // Strips comments - except those that contains HTML comment inside
882 882
         $tag = preg_replace('/[\ \t]{2,}/', ' ', $tag); // Replace several spaces by one
883 883
         $tag = preg_replace('/\s{2,}/', "\r\n", $tag); // Replace several linefeeds by one
884
-        $html = preg_replace('/#pre#/', $tag, $html,1);
884
+        $html = preg_replace('/#pre#/', $tag, $html, 1);
885 885
       }
886 886
     }
887 887
 
Please login to merge, or discard this patch.
includes/classes/user_options.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -116,8 +116,8 @@  discard block
 block discarded – undo
116 116
 
117 117
     $update_cache = false;
118 118
 
119
-    if(!empty($this->to_write)) {
120
-      foreach($this->to_write as $key => $cork) {
119
+    if (!empty($this->to_write)) {
120
+      foreach ($this->to_write as $key => $cork) {
121 121
         $value = is_array($this->data[$key]) ? serialize($this->data[$key]) : $this->data[$key]; // Сериализация для массивов при сохранении в БД
122 122
         $this->to_write[$key] = "({$this->user_id}, '" . db_escape($key) . "', '" . db_escape($value) . "')";
123 123
       }
@@ -128,19 +128,19 @@  discard block
 block discarded – undo
128 128
       $update_cache = true;
129 129
     }
130 130
 
131
-    if(!empty($this->to_delete)) {
132
-      foreach($this->to_delete as $key => &$value) {
133
-        $value = is_string($key) ? "'". db_escape($key) . "'" : $key;
131
+    if (!empty($this->to_delete)) {
132
+      foreach ($this->to_delete as $key => &$value) {
133
+        $value = is_string($key) ? "'" . db_escape($key) . "'" : $key;
134 134
       }
135 135
 
136
-      doquery("DELETE FROM {{player_options}} WHERE `player_id` = {$this->user_id} AND `option_id` IN (". implode(',', $this->to_delete) . ") ");
136
+      doquery("DELETE FROM {{player_options}} WHERE `player_id` = {$this->user_id} AND `option_id` IN (" . implode(',', $this->to_delete) . ") ");
137 137
       // pdump("DELETE FROM {{player_options}} WHERE `player_id` = {$this->user_id} AND `option_id` IN (". implode(',', $this->to_delete) . ") ");
138 138
 
139 139
       $this->to_delete = array();
140 140
       $update_cache = true;
141 141
     }
142 142
 
143
-    if($update_cache) {
143
+    if ($update_cache) {
144 144
       global $sn_cache;
145 145
 
146 146
       $field_name = $this->cached_name();
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
   protected function load() {
168 168
     global $sn_cache;
169 169
 
170
-    if($this->loaded) {
170
+    if ($this->loaded) {
171 171
       return;
172 172
     }
173 173
 
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
     $this->to_write = array();
176 176
     $this->to_delete = array();
177 177
 
178
-    if(!$this->user_id) {
178
+    if (!$this->user_id) {
179 179
       $this->loaded = true;
180 180
       return;
181 181
     }
@@ -183,13 +183,13 @@  discard block
 block discarded – undo
183 183
     $field_name = $this->cached_name();
184 184
     $a_data = $sn_cache->$field_name;
185 185
 
186
-    if(!empty($a_data)) {
186
+    if (!empty($a_data)) {
187 187
       $this->data = array_replace_recursive($this->data, $a_data);
188 188
       return;
189 189
     }
190 190
 
191 191
     $query = doquery("SELECT * FROM `{{player_options}}` WHERE `player_id` = {$this->user_id} FOR UPDATE");
192
-    while($row = db_fetch($query)) {
192
+    while ($row = db_fetch($query)) {
193 193
       // $this->data[$row['option_id']] = $row['value'];
194 194
       $this->data[$row['option_id']] = is_string($row['value']) && ($temp = unserialize($row['value'])) !== false ? $temp : $row['value']; // Десериализация
195 195
     }
@@ -269,14 +269,14 @@  discard block
 block discarded – undo
269 269
     // Если в массиве индекса только один элемент - значит это просто индекс
270 270
     is_array($option_id) && count($option_id) == 1 ? $option_id = reset($option_id) : false;
271 271
 
272
-    if(!isset($this->data[is_array($option_id) ? reset($option_id) : $option_id])) {
272
+    if (!isset($this->data[is_array($option_id) ? reset($option_id) : $option_id])) {
273 273
       $this->load();
274 274
     }
275 275
 
276
-    if(is_array($option_id)) {
276
+    if (is_array($option_id)) {
277 277
       $result = $this->data;
278
-      foreach($option_id as $sub_key) {
279
-        if(!isset($result) || !isset($result[$sub_key])) {
278
+      foreach ($option_id as $sub_key) {
279
+        if (!isset($result) || !isset($result[$sub_key])) {
280 280
           $result = null;
281 281
           break;
282 282
         }
@@ -296,12 +296,12 @@  discard block
 block discarded – undo
296 296
   public function __set($option, $value = null) {
297 297
     global $sn_cache;
298 298
 
299
-    if(empty($option) || !$this->user_id) {
299
+    if (empty($option) || !$this->user_id) {
300 300
       return;
301 301
     }
302 302
 
303 303
     // Если в массиве индекса только один элемент - значит это просто индекс
304
-    if(is_array($option) && count($option) == 1) {
304
+    if (is_array($option) && count($option) == 1) {
305 305
       // Разворачиваем его в индекс
306 306
       $option = array(reset($option) => $value);
307 307
       unset($value);
@@ -310,13 +310,13 @@  discard block
 block discarded – undo
310 310
 
311 311
     $to_write = array();
312 312
     // Адресация многомерного массива через массив индексов в $option
313
-    if(is_array($option) && isset($value)) {
313
+    if (is_array($option) && isset($value)) {
314 314
       $a_data = &$this->data;
315
-      foreach($option as $option_id) {
315
+      foreach ($option as $option_id) {
316 316
         !is_array($a_data[$option_id]) ? $a_data[$option_id] = array() : false;
317 317
         $a_data = &$a_data[$option_id];
318 318
       }
319
-      if($a_data != $value) {
319
+      if ($a_data != $value) {
320 320
         $a_data = $value;
321 321
         $to_write[reset($option)] = null;
322 322
       }
@@ -324,10 +324,10 @@  discard block
 block discarded – undo
324 324
       // Пакетная запись из массива ключ -> значение
325 325
       !is_array($option) ? $option = array($option => $value) : false;
326 326
 
327
-      foreach($option as $option_id => $option_value) {
328
-        if($this->data[$option_id] !== $option_value) {
327
+      foreach ($option as $option_id => $option_value) {
328
+        if ($this->data[$option_id] !== $option_value) {
329 329
           // TODO - вынести отдельно в обработчик
330
-          if($option_id == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON &&  $option_value == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON_HIDDEN) {
330
+          if ($option_id == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON && $option_value == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON_HIDDEN) {
331 331
             sn_setcookie(SN_COOKIE . '_menu_hidden', '0', time() - PERIOD_WEEK, SN_ROOT_RELATIVE);
332 332
           }
333 333
 
@@ -337,11 +337,11 @@  discard block
 block discarded – undo
337 337
       }
338 338
     }
339 339
 
340
-    if(!empty($to_write)) {
340
+    if (!empty($to_write)) {
341 341
       $field_name = $this->cached_name();
342 342
       $sn_cache->$field_name = $this->data;
343 343
 
344
-      foreach($to_write as $option_id => &$option_value) {
344
+      foreach ($to_write as $option_id => &$option_value) {
345 345
         $option_value = is_array($this->data[$option_id]) ? serialize($this->data[$option_id]) : $this->data[$option_id]; // Сериализация для массивов при сохранении в БД
346 346
         $to_write[$option_id] = "({$this->user_id}, '" . db_escape($option_id) . "', '" . db_escape($option_value) . "')";
347 347
       }
@@ -353,26 +353,26 @@  discard block
 block discarded – undo
353 353
   protected function load() {
354 354
     global $sn_cache;
355 355
 
356
-    if($this->loaded) {
356
+    if ($this->loaded) {
357 357
       return;
358 358
     }
359 359
 
360 360
     $this->data = $this->defaults;
361 361
 
362
-    if(!$this->user_id) {
362
+    if (!$this->user_id) {
363 363
       return;
364 364
     }
365 365
 
366 366
     $field_name = $this->cached_name();
367 367
     $a_data = $sn_cache->$field_name;
368 368
 
369
-    if(!empty($a_data)) {
369
+    if (!empty($a_data)) {
370 370
       $this->data = array_replace($this->data, $a_data);
371 371
       return;
372 372
     }
373 373
 
374 374
     $query = doquery("SELECT * FROM `{{player_options}}` WHERE `player_id` = {$this->user_id} FOR UPDATE");
375
-    while($row = db_fetch($query)) {
375
+    while ($row = db_fetch($query)) {
376 376
       // $this->data[$row['option_id']] = $row['value'];
377 377
       $this->data[$row['option_id']] = is_string($row['value']) && ($temp = unserialize($row['value'])) !== false ? $temp : $row['value']; // Десериализация
378 378
     }
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
     return $this->__get($offset);
389 389
   }
390 390
   public function offsetSet($offset, $value) {
391
-    if(!is_null($offset)) {
391
+    if (!is_null($offset)) {
392 392
       // $this->data[$offset] = $value;
393 393
       $this->__set($offset, $value);
394 394
     } else {
Please login to merge, or discard this patch.
includes/classes/template.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
       // Re-position template blocks
629 629
       for ($i = sizeof($this->_tpldata[$blockname]); $i > $key; $i--)
630 630
       {
631
-        $this->_tpldata[$blockname][$i] = $this->_tpldata[$blockname][$i-1];
631
+        $this->_tpldata[$blockname][$i] = $this->_tpldata[$blockname][$i - 1];
632 632
         $this->_tpldata[$blockname][$i]['S_ROW_COUNT'] = $i;
633 633
       }
634 634
 
@@ -710,13 +710,13 @@  discard block
 block discarded – undo
710 710
   */
711 711
   function assign_recursive($values, $name = '')
712 712
   {
713
-    if(isset($values['.']))
713
+    if (isset($values['.']))
714 714
     {
715 715
       $values_extra = $values['.'];
716 716
       unset($values['.']);
717 717
     }
718 718
 
719
-    if(!$name)
719
+    if (!$name)
720 720
     {
721 721
       $this->assign_vars($values);
722 722
     }
@@ -725,12 +725,12 @@  discard block
 block discarded – undo
725 725
       $this->assign_block_vars($name, $values);
726 726
     }
727 727
 
728
-    if(isset($values_extra))
728
+    if (isset($values_extra))
729 729
     {
730
-      foreach($values_extra as $sub_array_name => $sub_array)
730
+      foreach ($values_extra as $sub_array_name => $sub_array)
731 731
       {
732 732
         $new_name = $name . ($name ? '.' : '') . $sub_array_name;
733
-        foreach($sub_array as $sub_element)
733
+        foreach ($sub_array as $sub_element)
734 734
         {
735 735
           $this->assign_recursive($sub_element, $new_name);
736 736
         }
Please login to merge, or discard this patch.
includes/classes/auth_abstract.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
    */
36 36
   // OK 4.9
37 37
   public function __construct($filename = __FILE__) {
38
-    if($this->provider_id == ACCOUNT_PROVIDER_NONE) {
38
+    if ($this->provider_id == ACCOUNT_PROVIDER_NONE) {
39 39
       die('У всех провайдеров должен быть $provider_id!');
40 40
     }
41 41
 
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
   // OK 4.6
134 134
   public function player_name_suggest() {
135 135
     $name = '';
136
-    if(is_object($this->account) && !empty($this->account->account_email)) {
136
+    if (is_object($this->account) && !empty($this->account->account_email)) {
137 137
       list($name) = explode('@', $this->account->account_email);
138 138
     }
139 139
 
Please login to merge, or discard this patch.
includes/classes/skin.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
    * Инициализация харнилища скинов
153 153
    */
154 154
   protected static function init() {
155
-    if(static::$is_init) {
155
+    if (static::$is_init) {
156 156
       return;
157 157
     }
158 158
 
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 
166 166
     // Загружены ли уже данные по текущему скину?
167 167
 //pdump(static::$skin_list[$ini_path], 'static');
168
-    if(empty(static::$skin_list[$skin_path])) {
168
+    if (empty(static::$skin_list[$skin_path])) {
169 169
       // Прогружаем текущий скин
170 170
       static::$skin_list[$skin_path] = new skin($skin_path);
171 171
       static::$active = static::$skin_list[$skin_path];
@@ -201,22 +201,22 @@  discard block
 block discarded – undo
201 201
 
202 202
     $this->is_ini_present = false;
203 203
     // Проверка на корректность и существование пути
204
-    if(is_file($this->root_physical_absolute . 'skin.ini')) {
204
+    if (is_file($this->root_physical_absolute . 'skin.ini')) {
205 205
       // Пытаемся распарсить файл
206 206
 
207 207
       // По секциям? images и config? Что бы не копировать конфигурацию? Или просто unset(__inherit) а затем заново записать
208 208
       $this->config = parse_ini_file($this->root_physical_absolute . 'skin.ini');
209
-      if(!empty($this->config)) {
209
+      if (!empty($this->config)) {
210 210
 
211 211
         $this->is_ini_present = true;
212 212
 
213
-        if(!empty($this->config['_inherit'])) {
213
+        if (!empty($this->config['_inherit'])) {
214 214
           // Если скин наследует себя...
215
-          if($this->config['_inherit'] == $skin_path) {
215
+          if ($this->config['_inherit'] == $skin_path) {
216 216
             // TODO - определять более сложные случаи циклических ссылок в _inherit
217 217
             die('">circular skin inheritance!');
218 218
           }
219
-          if(empty(static::$skin_list[$this->config['_inherit']])) {
219
+          if (empty(static::$skin_list[$this->config['_inherit']])) {
220 220
             static::$skin_list[$this->config['_inherit']] = new skin($this->config['_inherit']);
221 221
           }
222 222
           $this->parent = static::$skin_list[$this->config['_inherit']];
@@ -232,12 +232,12 @@  discard block
 block discarded – undo
232 232
     }
233 233
 
234 234
     // Пытаемся скомпилировать _no_image заранее
235
-    if(!empty($this->config[SKIN_IMAGE_MISSED_FIELD])) {
235
+    if (!empty($this->config[SKIN_IMAGE_MISSED_FIELD])) {
236 236
       $this->container[SKIN_IMAGE_MISSED_FIELD] = $this->compile_try_path(SKIN_IMAGE_MISSED_FIELD, $this->config[SKIN_IMAGE_MISSED_FIELD]);
237 237
     }
238 238
 
239 239
     // Если нет заглушки
240
-    if(empty($this->container[SKIN_IMAGE_MISSED_FIELD])) {
240
+    if (empty($this->container[SKIN_IMAGE_MISSED_FIELD])) {
241 241
       $this->container[SKIN_IMAGE_MISSED_FIELD] = empty($this->parent)
242 242
         // Если нет парента - берем хардкод
243 243
         ? $this->container[SKIN_IMAGE_MISSED_FIELD] = SN_ROOT_VIRTUAL . SKIN_IMAGE_MISSED_FILE_PATH
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
     $image_tag = $this->image_tag_parse($image_tag, $template);
268 268
 
269 269
     // Проверяем наличие ключа RIT в хранилища. В нём не может быть несуществующих файлов по построению
270
-    if(!empty($this->container[$image_tag[SKIN_IMAGE_TAG_RESOLVED]])) {
270
+    if (!empty($this->container[$image_tag[SKIN_IMAGE_TAG_RESOLVED]])) {
271 271
       return $this->container[$image_tag[SKIN_IMAGE_TAG_RESOLVED]];
272 272
     }
273 273
 
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
     // Нет - image ID не является путём к файлу. Пора обратиться к предкам за помощью...
286 286
     // Пытаемся вытащить путь из родителя и применить к нему свои параметры
287 287
     // Тащим по ID изображения, а не по ТЭГУ - мало ли что там делает с путём родитель и как преобразовывает его в строку?
288
-    if(empty($this->container[$image_id]) && !empty($this->parent)) {
288
+    if (empty($this->container[$image_id]) && !empty($this->parent)) {
289 289
       $this->container[$image_id] = $this->parent->compile_image($image_id, $template);
290 290
 
291 291
       // Если у родителя нет картинки - он вернет пустую строку. Тогда нам надо использовать заглушку - свою или родительскую
@@ -306,18 +306,18 @@  discard block
 block discarded – undo
306 306
   protected function image_tag_parse($image_tag, $template) {
307 307
     $image_tag_ptl_resolved = $image_tag;
308 308
     // Есть переменные из темплейта ?
309
-    if(strpos($image_tag_ptl_resolved, '[') !== false && is_object($template)) {
309
+    if (strpos($image_tag_ptl_resolved, '[') !== false && is_object($template)) {
310 310
       // Что бы лишний раз не запускать регексп
311 311
       // TODO - многоуровневые вложения ?! Надо ли и где их можно применить
312 312
       preg_match_all('#(\[.+?\])#', $image_tag_ptl_resolved, $matches);
313
-      foreach($matches[0] as &$match) {
313
+      foreach ($matches[0] as &$match) {
314 314
         $var_name = str_replace(array('[', ']'), '', $match);
315
-        if(strpos($var_name, '.') !== false) {
315
+        if (strpos($var_name, '.') !== false) {
316 316
           // Вложенная переменная темплейта - на текущем уровне
317 317
           // TODO Вложенная переменная из корня через "!"
318 318
           list($block_name, $block_var) = explode('.', $var_name);
319 319
           isset($template->_block_value[$block_name][$block_var]) ? $image_tag_ptl_resolved = str_replace($match, $template->_block_value[$block_name][$block_var], $image_tag_ptl_resolved) : false;
320
-        } elseif(strpos($var_name, '$') !== false) {
320
+        } elseif (strpos($var_name, '$') !== false) {
321 321
           // Корневой DEFINE
322 322
           $define_name = substr($var_name, 1);
323 323
           isset($template->_tpldata['DEFINE']['.'][$define_name]) ? $image_tag_ptl_resolved = str_replace($match, $template->_tpldata['DEFINE']['.'][$define_name], $image_tag_ptl_resolved) : false;
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
       }
329 329
     }
330 330
 
331
-    if(strpos($image_tag_ptl_resolved, '|') !== false) {
331
+    if (strpos($image_tag_ptl_resolved, '|') !== false) {
332 332
       $params = explode('|', $image_tag_ptl_resolved);
333 333
       $image_id = $params[0];
334 334
       unset($params[0]);
@@ -392,11 +392,11 @@  discard block
 block discarded – undo
392 392
     $image_string = $this->container[$image_tag];
393 393
 
394 394
     // Нет параметров - просто возвращаем значение по $image_name из контейнера
395
-    if(!empty($params) && is_array($params)) {
395
+    if (!empty($params) && is_array($params)) {
396 396
       // Здесь автоматически произойдёт упорядочивание параметров
397 397
 
398 398
       // Параметр 'html' - выводить изображение в виде HTML-тэга
399
-      if(in_array('html', $params)) {
399
+      if (in_array('html', $params)) {
400 400
         $image_tag = $image_tag . '|html';
401 401
         $image_string = '<img src="' . $image_string . '" />';
402 402
         $this->container[$image_tag] = $image_string;
Please login to merge, or discard this patch.
includes/update_old.php 1 patch
Spacing   +120 added lines, -120 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if(!defined('IN_UPDATE') || IN_UPDATE !== true)
3
+if (!defined('IN_UPDATE') || IN_UPDATE !== true)
4 4
 {
5 5
   die('Hack attempt');
6 6
 }
7 7
 
8
-switch($new_version)
8
+switch ($new_version)
9 9
 {
10 10
   case 0:
11 11
   case 1:
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
     );
35 35
     upd_drop_table('lunas');
36 36
 
37
-    if($update_tables['galaxy'])
37
+    if ($update_tables['galaxy'])
38 38
     {
39 39
       upd_do_query(
40 40
         'UPDATE `{{planets}}`
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
     );
86 86
     upd_add_more_time();
87 87
 
88
-    if($update_tables['users']['rpg_points'])
88
+    if ($update_tables['users']['rpg_points'])
89 89
     {
90 90
       upd_do_query(
91 91
         "UPDATE {{users}} AS u
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 
147 147
     upd_drop_table('update');
148 148
 
149
-    upd_check_key('fleet_speed', $config->fleet_speed/2500, $config->fleet_speed >= 2500);
149
+    upd_check_key('fleet_speed', $config->fleet_speed / 2500, $config->fleet_speed >= 2500);
150 150
     upd_check_key('game_counter', 0);
151 151
     upd_check_key('game_default_language', 'ru');
152 152
     upd_check_key('game_default_skin', 'skins/EpicBlue/');
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
     upd_check_key('game_news_actual', 259200);
156 156
     upd_check_key('game_noob_factor', 5, !isset($config->game_noob_factor));
157 157
     upd_check_key('game_noob_points', 5000, !isset($config->game_noob_points));
158
-    upd_check_key('game_speed', $config->game_speed/2500, $config->game_speed >= 2500);
158
+    upd_check_key('game_speed', $config->game_speed / 2500, $config->game_speed >= 2500);
159 159
     upd_check_key('int_format_date', 'd.m.Y');
160 160
     upd_check_key('int_format_time', 'H:i:s', true);
161 161
     upd_check_key('int_banner_background', 'design/images/banner.png', true);
@@ -179,22 +179,22 @@  discard block
 block discarded – undo
179 179
     upd_alter_table('planets', "ADD `governor_level` smallint unsigned NOT NULL DEFAULT '0' COMMENT 'Governor level'", !$update_tables['planets']['governor_level']);
180 180
     upd_alter_table('planets', "ADD `que` varchar(4096) NOT NULL DEFAULT '' COMMENT 'Planet que'", !$update_tables['planets']['que']);
181 181
 
182
-    if($update_tables['planets']['b_building'])
182
+    if ($update_tables['planets']['b_building'])
183 183
     {
184 184
       $planet_query = upd_do_query('SELECT * FROM {{planets}} WHERE `b_building` <> 0;');
185 185
       $const_que_structures = QUE_STRUCTURES;
186
-      while($planet_data = db_fetch($planet_query))
186
+      while ($planet_data = db_fetch($planet_query))
187 187
       {
188 188
         $old_que = explode(';', $planet_data['b_building_id']);
189
-        foreach($old_que as $old_que_item_string)
189
+        foreach ($old_que as $old_que_item_string)
190 190
         {
191
-          if(!$old_que_item_string)
191
+          if (!$old_que_item_string)
192 192
           {
193 193
             continue;
194 194
           }
195 195
 
196 196
           $old_que_item = explode(',', $old_que_item_string);
197
-          if($old_que_item[4] == 'build')
197
+          if ($old_que_item[4] == 'build')
198 198
           {
199 199
             $old_que_item[4] = BUILD_CREATE;
200 200
           }
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
231 231
     );
232 232
 
233
-    if($update_tables['users']['urlaubs_until'])
233
+    if ($update_tables['users']['urlaubs_until'])
234 234
     {
235 235
       upd_alter_table('users', "ADD `vacation` int(11) NOT NULL DEFAULT '0' COMMENT 'Time when user can leave vacation mode'", !$update_tables['users']['vacation']);
236 236
       upd_do_query('UPDATE {{users}} SET `vacation` = `urlaubs_until` WHERE `urlaubs_modus` <> 0;');
@@ -281,10 +281,10 @@  discard block
 block discarded – undo
281 281
     ), !$update_tables['logs']['log_timestamp']);
282 282
     upd_do_query('DELETE FROM `{{logs}}` WHERE `log_code` = 303;');
283 283
 
284
-    if($update_tables['errors'])
284
+    if ($update_tables['errors'])
285 285
     {
286 286
       upd_do_query('INSERT INTO `{{logs}}` (`log_code`, `log_sender`, `log_title`, `log_text`, `log_page`, `log_time`) SELECT 500, `error_sender`, `error_type`, `error_text`, `error_page`, `error_time` FROM `{{errors}}`;');
287
-      if($update_tables['errors_backup'])
287
+      if ($update_tables['errors_backup'])
288 288
       {
289 289
         upd_drop_table('errors_backup');
290 290
       }
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
 
351 351
     upd_alter_table('users', 'CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci');
352 352
 
353
-    if(!$update_tables['shortcut'])
353
+    if (!$update_tables['shortcut'])
354 354
     {
355 355
       upd_create_table('shortcut',
356 356
         "(
@@ -375,12 +375,12 @@  discard block
 block discarded – undo
375 375
       $temp_planet_types = array(PT_PLANET, PT_DEBRIS, PT_MOON);
376 376
 
377 377
       $query = upd_do_query("SELECT id, fleet_shortcut FROM {{users}} WHERE fleet_shortcut > '';");
378
-      while($user_data = db_fetch($query))
378
+      while ($user_data = db_fetch($query))
379 379
       {
380 380
         $shortcuts = explode("\r\n", $user_data['fleet_shortcut']);
381
-        foreach($shortcuts as $shortcut)
381
+        foreach ($shortcuts as $shortcut)
382 382
         {
383
-          if(!$shortcut)
383
+          if (!$shortcut)
384 384
           {
385 385
             continue;
386 386
           }
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
           $shortcut[3] = intval($shortcut[3]);
393 393
           $shortcut[4] = intval($shortcut[4]);
394 394
 
395
-          if($shortcut[0] && $shortcut[1] && $shortcut[2] && $shortcut[3] && in_array($shortcut[4], $temp_planet_types))
395
+          if ($shortcut[0] && $shortcut[1] && $shortcut[2] && $shortcut[3] && in_array($shortcut[4], $temp_planet_types))
396 396
           {
397 397
             upd_do_query("INSERT INTO {$config->db_prefix}shortcut (shortcut_user_id, shortcut_galaxy, shortcut_system, shortcut_planet, shortcut_planet_type, shortcut_text) VALUES ({$user_data['id']}, {$shortcut[1]}, {$shortcut[2]}, {$shortcut[3]}, {$shortcut[4]}, '{$shortcut[0]}');", true);
398 398
           }
@@ -546,7 +546,7 @@  discard block
 block discarded – undo
546 546
 
547 547
     upd_check_key('quest_total', 0, !isset($config->quest_total));
548 548
 
549
-    for($i = 0; $i < 25; $i++)
549
+    for ($i = 0; $i < 25; $i++)
550 550
     {
551 551
       upd_alter_table('alliance', array("DROP INDEX `id_{$i}`",), $update_indexes['alliance']["id_{$i}"]);
552 552
       upd_alter_table('users', array("DROP INDEX `id_{$i}`",), $update_indexes['users']["id_{$i}"]);
@@ -575,7 +575,7 @@  discard block
 block discarded – undo
575 575
       "ADD `msg_admin` bigint(11) unsigned DEFAULT '0' AFTER mnl_buildlist"
576 576
     ), !$update_tables['users']['msg_admin']);
577 577
 
578
-    if(!$update_foreigns['users']['FK_users_ally_id'])
578
+    if (!$update_foreigns['users']['FK_users_ally_id'])
579 579
     {
580 580
       upd_alter_table('users', array(
581 581
         'MODIFY COLUMN `ally_name` VARCHAR(32) DEFAULT NULL',
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
598 598
     ), strtoupper($update_tables['planets']['debris_metal']['Type']) != 'BIGINT(20) UNSIGNED');
599 599
 
600 600
     $illegal_moon_query = upd_do_query("SELECT id FROM `{{planets}}` WHERE `id_owner` <> 0 AND `planet_type` = 3 AND `parent_planet` <> 0 AND `parent_planet` NOT IN (SELECT `id` FROM {{planets}} WHERE `planet_type` = 1);");
601
-    while($illegal_moon_row = db_fetch($illegal_moon_query))
601
+    while ($illegal_moon_row = db_fetch($illegal_moon_query))
602 602
     {
603 603
       upd_do_query("DELETE FROM {{planets}} WHERE id = {$illegal_moon_row['id']} LIMIT 1;", true);
604 604
     }
@@ -613,8 +613,8 @@  discard block
 block discarded – undo
613 613
     upd_log_version_update();
614 614
 
615 615
     upd_check_key('game_email_pm', 0, !isset($config->game_email_pm));
616
-    upd_check_key('player_vacation_time', 2*24*60*60, !isset($config->player_vacation_time));
617
-    upd_check_key('player_delete_time', 45*24*60*60, !isset($config->player_delete_time));
616
+    upd_check_key('player_vacation_time', 2 * 24 * 60 * 60, !isset($config->player_vacation_time));
617
+    upd_check_key('player_delete_time', 45 * 24 * 60 * 60, !isset($config->player_delete_time));
618 618
 
619 619
     upd_create_table('log_dark_matter',
620 620
       "(
@@ -636,18 +636,18 @@  discard block
 block discarded – undo
636 636
     upd_do_query('COMMIT;', true);
637 637
 
638 638
     $records = 1;
639
-    while($records)
639
+    while ($records)
640 640
     {
641 641
       upd_do_query('START TRANSACTION;', true);
642 642
       $query = upd_do_query("SELECT * FROM {{logs}} WHERE log_code = 102 order by log_id LIMIT 1000;");
643 643
       $records = db_num_rows($query);
644
-      while($row = db_fetch($query))
644
+      while ($row = db_fetch($query))
645 645
       {
646 646
         $result = preg_match('/^Player ID (\d+) Dark Matter was adjusted with (\-?\d+). Reason: (.+)$/', $row['log_text'], $matches);
647 647
 
648 648
         $reason = RPG_NONE;
649 649
         $comment = $matches[3];
650
-        switch($matches[3])
650
+        switch ($matches[3])
651 651
         {
652 652
           case 'Level Up For Structure Building':
653 653
             $reason = RPG_STRUCTURE;
@@ -664,21 +664,21 @@  discard block
 block discarded – undo
664 664
           break;
665 665
 
666 666
           default:
667
-            if(preg_match('/^Using Black Market page (\d+)$/', $comment, $matches2))
667
+            if (preg_match('/^Using Black Market page (\d+)$/', $comment, $matches2))
668 668
             {
669 669
               $reason = RPG_MARKET;
670 670
             }
671
-            elseif(preg_match('/^Spent for officer (.+) ID (\d+)$/', $comment, $matches2))
671
+            elseif (preg_match('/^Spent for officer (.+) ID (\d+)$/', $comment, $matches2))
672 672
             {
673 673
               $reason = RPG_MERCENARY;
674 674
               $comment = "Spent for mercenary {$matches2[1]} GUID {$matches2[2]}";
675 675
             }
676
-            elseif(preg_match('/^Incoming From Referral ID\ ?(\d+)$/', $comment, $matches2))
676
+            elseif (preg_match('/^Incoming From Referral ID\ ?(\d+)$/', $comment, $matches2))
677 677
             {
678 678
               $reason = RPG_REFERRAL;
679 679
               $comment = "Incoming from referral ID {$matches[1]}";
680 680
             }
681
-            elseif(preg_match('/^Through admin interface for user .* ID \d+ (.*)$/', $comment, $matches2))
681
+            elseif (preg_match('/^Through admin interface for user .* ID \d+ (.*)$/', $comment, $matches2))
682 682
             {
683 683
               $reason = RPG_ADMIN;
684 684
               $comment = $matches2[1];
@@ -686,7 +686,7 @@  discard block
 block discarded – undo
686 686
           break;
687 687
         }
688 688
 
689
-        if($matches[2])
689
+        if ($matches[2])
690 690
         {
691 691
           $row['log_username'] = db_escape($row['log_username']);
692 692
           $row['log_page'] = db_escape($row['log_page']);
@@ -706,14 +706,14 @@  discard block
 block discarded – undo
706 706
       upd_do_query('COMMIT;', true);
707 707
     }
708 708
 
709
-    foreach($update_tables as $table_name => $cork)
709
+    foreach ($update_tables as $table_name => $cork)
710 710
     {
711 711
       $row = db_fetch(upd_do_query("SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA = '" . db_escape(classSupernova::$db_name) . "' AND TABLE_NAME = '{$config->db_prefix}{$table_name}';", true));
712
-      if($row['ENGINE'] != 'InnoDB')
712
+      if ($row['ENGINE'] != 'InnoDB')
713 713
       {
714 714
         upd_alter_table($table_name, 'ENGINE=InnoDB', true);
715 715
       }
716
-      if($row['TABLE_COLLATION'] != 'utf8_general_ci')
716
+      if ($row['TABLE_COLLATION'] != 'utf8_general_ci')
717 717
       {
718 718
         upd_alter_table($table_name, 'CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci', true);
719 719
       }
@@ -734,7 +734,7 @@  discard block
 block discarded – undo
734 734
       "CHANGE COLUMN `governor_level` `PLANET_GOVERNOR_LEVEL` SMALLINT(5) NOT NULL DEFAULT 0",
735 735
     ), !$update_tables['planets']['PLANET_GOVERNOR_ID']);
736 736
 
737
-    if($update_tables['users']['rpg_geologue'])
737
+    if ($update_tables['users']['rpg_geologue'])
738 738
     {
739 739
       doquery("UPDATE {{users}} SET `dark_matter` = `dark_matter` + (`rpg_geologue` + `rpg_ingenieur` + `rpg_constructeur` + `rpg_technocrate` + `rpg_scientifique` + `rpg_defenseur`) * 3;");
740 740
 
@@ -748,7 +748,7 @@  discard block
 block discarded – undo
748 748
       ), $update_tables['users']['rpg_geologue']);
749 749
     }
750 750
 
751
-    if($update_tables['users']['rpg_bunker'])
751
+    if ($update_tables['users']['rpg_bunker'])
752 752
     {
753 753
       doquery("UPDATE {{users}} SET `dark_matter` = `dark_matter` + (`rpg_bunker`) * 3;");
754 754
 
@@ -799,7 +799,7 @@  discard block
 block discarded – undo
799 799
     ), !isset($update_tables['alliance']['total_rank']));
800 800
     doquery("UPDATE {{alliance}} AS a JOIN {{statpoints}} AS sp ON sp.id_owner = a.id AND sp.stat_code = 1 AND sp.stat_type = 2 SET a.total_rank = sp.total_rank, a.total_points = sp.total_points;");
801 801
 
802
-    if(!isset($update_tables['users']['ally_tag']))
802
+    if (!isset($update_tables['users']['ally_tag']))
803 803
     {
804 804
       upd_alter_table('users', array(
805 805
         "ADD COLUMN `ally_tag` varchar(8) DEFAULT NULL AFTER `ally_id`",
@@ -815,7 +815,7 @@  discard block
 block discarded – undo
815 815
       "ADD COLUMN `player_artifact_list` TEXT",
816 816
     ), !isset($update_tables['users']['player_artifact_list']));
817 817
 
818
-    if(!isset($update_tables['users']['player_rpg_tech_xp']))
818
+    if (!isset($update_tables['users']['player_rpg_tech_xp']))
819 819
     {
820 820
       upd_check_key('eco_scale_storage', 1, !isset($config->eco_scale_storage));
821 821
 
@@ -846,7 +846,7 @@  discard block
 block discarded – undo
846 846
       "MODIFY COLUMN `ally_owner` BIGINT(20) UNSIGNED DEFAULT NULL",
847 847
     ), strtoupper($update_tables['alliance']['ally_owner']['Type']) != 'BIGINT(20) UNSIGNED');
848 848
 
849
-    if(strtoupper($update_tables['alliance_diplomacy']['alliance_diplomacy_ally_id']['Type']) != 'BIGINT(20) UNSIGNED')
849
+    if (strtoupper($update_tables['alliance_diplomacy']['alliance_diplomacy_ally_id']['Type']) != 'BIGINT(20) UNSIGNED')
850 850
     {
851 851
       upd_alter_table('alliance_diplomacy', array(
852 852
         "DROP FOREIGN KEY `FK_diplomacy_ally_id`",
@@ -862,7 +862,7 @@  discard block
 block discarded – undo
862 862
       ), true);
863 863
     }
864 864
 
865
-    if(strtoupper($update_tables['alliance_negotiation']['alliance_negotiation_ally_id']['Type']) != 'BIGINT(20) UNSIGNED')
865
+    if (strtoupper($update_tables['alliance_negotiation']['alliance_negotiation_ally_id']['Type']) != 'BIGINT(20) UNSIGNED')
866 866
     {
867 867
       upd_alter_table('alliance_negotiation', array(
868 868
         "DROP FOREIGN KEY `FK_negotiation_ally_id`",
@@ -879,7 +879,7 @@  discard block
 block discarded – undo
879 879
       ), true);
880 880
     }
881 881
 
882
-    if(strtoupper($update_tables['alliance_requests']['id_user']['Type']) != 'BIGINT(20) UNSIGNED')
882
+    if (strtoupper($update_tables['alliance_requests']['id_user']['Type']) != 'BIGINT(20) UNSIGNED')
883 883
     {
884 884
       upd_do_query('DELETE FROM {{alliance_requests}} WHERE id_user NOT IN (SELECT id FROM {{users}}) OR id_ally NOT IN (SELECT id FROM {{alliance}});', true);
885 885
 
@@ -894,7 +894,7 @@  discard block
 block discarded – undo
894 894
       ), true);
895 895
     }
896 896
 
897
-    if(strtoupper($update_tables['annonce']['id']['Type']) != 'BIGINT(20) UNSIGNED')
897
+    if (strtoupper($update_tables['annonce']['id']['Type']) != 'BIGINT(20) UNSIGNED')
898 898
     {
899 899
       upd_do_query('DELETE FROM {{annonce}} WHERE user NOT IN (SELECT username FROM {{users}});', true);
900 900
 
@@ -908,7 +908,7 @@  discard block
 block discarded – undo
908 908
       ), true);
909 909
     }
910 910
 
911
-    if(strtoupper($update_tables['bashing']['bashing_user_id']['Type']) != 'BIGINT(20) UNSIGNED')
911
+    if (strtoupper($update_tables['bashing']['bashing_user_id']['Type']) != 'BIGINT(20) UNSIGNED')
912 912
     {
913 913
       upd_alter_table('bashing', array(
914 914
         "DROP FOREIGN KEY `FK_bashing_user_id`",
@@ -924,7 +924,7 @@  discard block
 block discarded – undo
924 924
       ), true);
925 925
     }
926 926
 
927
-    if(strtoupper($update_tables['buddy']['id']['Type']) != 'BIGINT(20) UNSIGNED')
927
+    if (strtoupper($update_tables['buddy']['id']['Type']) != 'BIGINT(20) UNSIGNED')
928 928
     {
929 929
       upd_do_query('DELETE FROM {{buddy}} WHERE sender NOT IN (SELECT id FROM {{users}}) OR owner NOT IN (SELECT id FROM {{users}});', true);
930 930
 
@@ -963,7 +963,7 @@  discard block
 block discarded – undo
963 963
       "MODIFY COLUMN `fleet_resource_deuterium` DECIMAL(65,0) DEFAULT '0'",
964 964
     ), strtoupper($update_tables['fleets']['fleet_resource_metal']['Type']) != 'DECIMAL(65,0)');
965 965
 
966
-    if(strtoupper($update_tables['iraks']['fleet_owner']['Type']) != 'BIGINT(20) UNSIGNED')
966
+    if (strtoupper($update_tables['iraks']['fleet_owner']['Type']) != 'BIGINT(20) UNSIGNED')
967 967
     {
968 968
       upd_do_query('DELETE FROM {{iraks}} WHERE owner NOT IN (SELECT id FROM {{users}}) OR zielid NOT IN (SELECT id FROM {{users}});', true);
969 969
 
@@ -988,7 +988,7 @@  discard block
 block discarded – undo
988 988
       ), true);
989 989
     }
990 990
 
991
-    if(strtoupper($update_tables['notes']['owner']['Type']) != 'BIGINT(20) UNSIGNED')
991
+    if (strtoupper($update_tables['notes']['owner']['Type']) != 'BIGINT(20) UNSIGNED')
992 992
     {
993 993
       upd_do_query('DELETE FROM {{notes}} WHERE owner NOT IN (SELECT id FROM {{users}});', true);
994 994
 
@@ -1114,7 +1114,7 @@  discard block
 block discarded – undo
1114 1114
       "DROP COLUMN `b_hangar_plus`",
1115 1115
     ), isset($update_tables['planets']['b_hangar_plus']));
1116 1116
 
1117
-    if(strtoupper($update_tables['referrals']['id_partner']['Type']) != 'BIGINT(20) UNSIGNED')
1117
+    if (strtoupper($update_tables['referrals']['id_partner']['Type']) != 'BIGINT(20) UNSIGNED')
1118 1118
     {
1119 1119
       upd_do_query('DELETE FROM {{referrals}} WHERE id NOT IN (SELECT id FROM {{users}}) OR id_partner NOT IN (SELECT id FROM {{users}});', true);
1120 1120
 
@@ -1134,7 +1134,7 @@  discard block
 block discarded – undo
1134 1134
       "MODIFY COLUMN `id_owner2` BIGINT(20) UNSIGNED",
1135 1135
     ), strtoupper($update_tables['rw']['id_owner1']['Type']) != 'BIGINT(20) UNSIGNED');
1136 1136
 
1137
-    if(strtoupper($update_tables['shortcut']['shortcut_user_id']['Type']) != 'BIGINT(20) UNSIGNED')
1137
+    if (strtoupper($update_tables['shortcut']['shortcut_user_id']['Type']) != 'BIGINT(20) UNSIGNED')
1138 1138
     {
1139 1139
       upd_do_query('DELETE FROM {{shortcut}} WHERE shortcut_user_id NOT IN (SELECT id FROM {{users}}) OR shortcut_planet_id NOT IN (SELECT id FROM {{planets}});', true);
1140 1140
 
@@ -1150,7 +1150,7 @@  discard block
 block discarded – undo
1150 1150
       ), true);
1151 1151
     }
1152 1152
 
1153
-    if(strtoupper($update_tables['statpoints']['id_owner']['Type']) != 'BIGINT(20) UNSIGNED')
1153
+    if (strtoupper($update_tables['statpoints']['id_owner']['Type']) != 'BIGINT(20) UNSIGNED')
1154 1154
     {
1155 1155
       upd_do_query('DELETE FROM {{statpoints}} WHERE id_owner NOT IN (SELECT id FROM {{users}}) OR id_ally NOT IN (SELECT id FROM {{alliance}});', true);
1156 1156
 
@@ -1305,7 +1305,7 @@  discard block
 block discarded – undo
1305 1305
       "DROP COLUMN `settings_allylogo`",
1306 1306
     ), isset($update_tables['users']['settings_allylogo']));
1307 1307
 
1308
-    if(!isset($update_tables['powerup']))
1308
+    if (!isset($update_tables['powerup']))
1309 1309
     {
1310 1310
       upd_do_query("DROP TABLE IF EXISTS {$config->db_prefix}mercenaries;");
1311 1311
 
@@ -1336,13 +1336,13 @@  discard block
 block discarded – undo
1336 1336
 
1337 1337
       $update_query_template = "UPDATE {{users}} SET id = id %s WHERE id = %d LIMIT 1;";
1338 1338
       $user_list = upd_do_query("SELECT * FROM {{users}};");
1339
-      while($user_row = db_fetch($user_list))
1339
+      while ($user_row = db_fetch($user_list))
1340 1340
       {
1341 1341
         $update_query_str = '';
1342
-        foreach(sn_get_groups('mercenaries') as $mercenary_id)
1342
+        foreach (sn_get_groups('mercenaries') as $mercenary_id)
1343 1343
         {
1344 1344
           $mercenary_data_name = get_unit_param($mercenary_id, P_NAME);
1345
-          if($mercenary_level = $user_row[$mercenary_data_name])
1345
+          if ($mercenary_level = $user_row[$mercenary_data_name])
1346 1346
           {
1347 1347
             $update_query_str = ", `{$mercenary_data_name}` = 0";
1348 1348
             upd_do_query("DELETE FROM {{powerup}} WHERE powerup_user_id = {$user_row['id']} AND powerup_unit_id = {$mercenary_id} LIMIT 1;");
@@ -1350,14 +1350,14 @@  discard block
 block discarded – undo
1350 1350
           }
1351 1351
         }
1352 1352
 
1353
-        if($update_query_str)
1353
+        if ($update_query_str)
1354 1354
         {
1355 1355
           upd_do_query(sprintf($update_query_template, $update_query_str, $user_row['id']));
1356 1356
         }
1357 1357
       }
1358 1358
     }
1359 1359
 
1360
-    if(!isset($update_tables['universe']))
1360
+    if (!isset($update_tables['universe']))
1361 1361
     {
1362 1362
       upd_create_table('universe',
1363 1363
         "(
@@ -1381,7 +1381,7 @@  discard block
 block discarded – undo
1381 1381
 
1382 1382
     // ------------------------------------------------------------------------
1383 1383
     // Modifying tables
1384
-    if(strtoupper($update_tables['users']['user_as_ally']['Type']) != 'BIGINT(20) UNSIGNED')
1384
+    if (strtoupper($update_tables['users']['user_as_ally']['Type']) != 'BIGINT(20) UNSIGNED')
1385 1385
     {
1386 1386
       upd_alter_table('users', array(
1387 1387
         "ADD COLUMN user_as_ally BIGINT(20) UNSIGNED DEFAULT NULL",
@@ -1403,7 +1403,7 @@  discard block
 block discarded – undo
1403 1403
     // ------------------------------------------------------------------------
1404 1404
     // Creating players for allies
1405 1405
     $ally_row_list = doquery("SELECT `id`, `ally_tag` FROM {{alliance}} WHERE ally_user_id IS NULL;");
1406
-    while($ally_row = db_fetch($ally_row_list))
1406
+    while ($ally_row = db_fetch($ally_row_list))
1407 1407
     {
1408 1408
       $ally_user_name = db_escape("[{$ally_row['ally_tag']}]");
1409 1409
       doquery("INSERT INTO {{users}} SET `username` = '{$ally_user_name}', `register_time` = " . SN_TIME_NOW . ", `user_as_ally` = {$ally_row['id']};");
@@ -1418,7 +1418,7 @@  discard block
 block discarded – undo
1418 1418
     // ------------------------------------------------------------------------
1419 1419
     // Creating planets for allies
1420 1420
     $ally_user_list = doquery("SELECT `id`, `username` FROM {{users}} WHERE `user_as_ally` IS NOT NULL AND `id_planet` = 0;");
1421
-    while($ally_user_row = db_fetch($ally_user_list))
1421
+    while ($ally_user_row = db_fetch($ally_user_list))
1422 1422
     {
1423 1423
       $ally_planet_name = db_escape($ally_user_row['username']);
1424 1424
       doquery("INSERT INTO {{planets}} SET `name` = '{$ally_planet_name}', `last_update` = " . SN_TIME_NOW . ", `id_owner` = {$ally_user_row['id']};");
@@ -1450,10 +1450,10 @@  discard block
 block discarded – undo
1450 1450
     // Adding db field
1451 1451
     upd_alter_table('users', "ADD `que` varchar(4096) NOT NULL DEFAULT '' COMMENT 'User que'", !$update_tables['users']['que']);
1452 1452
     // Converting old data to new one and dropping old fields
1453
-    if($update_tables['users']['b_tech_planet'])
1453
+    if ($update_tables['users']['b_tech_planet'])
1454 1454
     {
1455 1455
       $query = doquery("SELECT * FROM {{planets}} WHERE `b_tech_id` <> 0;");
1456
-      while($planet_row = db_fetch($query))
1456
+      while ($planet_row = db_fetch($query))
1457 1457
       {
1458 1458
         $que_item_string = "{$planet_row['b_tech_id']},1," . max(0, $planet_row['b_tech'] - SN_TIME_NOW) . "," . BUILD_CREATE . "," . QUE_RESEARCH;
1459 1459
         doquery("UPDATE {{users}} SET `que` = '{$que_item_string}' WHERE `id` = {$planet_row['id_owner']} LIMIT 1;");
@@ -1467,7 +1467,7 @@  discard block
 block discarded – undo
1467 1467
       upd_alter_table('users', "DROP COLUMN `b_tech_planet`", $update_tables['users']['b_tech_planet']);
1468 1468
     }
1469 1469
 
1470
-    if(!$update_tables['powerup']['powerup_category'])
1470
+    if (!$update_tables['powerup']['powerup_category'])
1471 1471
     {
1472 1472
       upd_alter_table('powerup', "ADD COLUMN `powerup_category` SMALLINT NOT NULL DEFAULT 0 AFTER `powerup_planet_id`", !$update_tables['powerup']['powerup_category']);
1473 1473
 
@@ -1489,7 +1489,7 @@  discard block
 block discarded – undo
1489 1489
     upd_check_key('ali_bonus_brackets', 10, !isset($config->ali_bonus_brackets));
1490 1490
     upd_check_key('ali_bonus_brackets_divisor', 50, !isset($config->ali_bonus_brackets_divisor));
1491 1491
 
1492
-    if(!$config->db_loadItem('rpg_flt_explore'))
1492
+    if (!$config->db_loadItem('rpg_flt_explore'))
1493 1493
     {
1494 1494
       $inflation_rate = 1000;
1495 1495
 
@@ -1507,20 +1507,20 @@  discard block
 block discarded – undo
1507 1507
       doquery("UPDATE {{users}} SET `dark_matter` = `dark_matter` * {$inflation_rate};");
1508 1508
 
1509 1509
       $query = doquery("SELECT * FROM {{quest}}");
1510
-      while($row = db_fetch($query))
1510
+      while ($row = db_fetch($query))
1511 1511
       {
1512 1512
         $query_add = '';
1513 1513
         $quest_reward_list = explode(';', $row['quest_rewards']);
1514
-        foreach($quest_reward_list as &$quest_reward)
1514
+        foreach ($quest_reward_list as &$quest_reward)
1515 1515
         {
1516 1516
           list($reward_resource, $reward_amount) = explode(',', $quest_reward);
1517
-          if($reward_resource == RES_DARK_MATTER)
1517
+          if ($reward_resource == RES_DARK_MATTER)
1518 1518
           {
1519 1519
             $quest_reward = "{$reward_resource}," . $reward_amount * 1000;
1520 1520
           }
1521 1521
         }
1522 1522
         $new_rewards = implode(';', $quest_reward_list);
1523
-        if($new_rewards != $row['quest_rewards'])
1523
+        if ($new_rewards != $row['quest_rewards'])
1524 1524
         {
1525 1525
           doquery("UPDATE {{quest}} SET `quest_rewards` = '{$new_rewards}' WHERE quest_id = {$row['quest_id']} LIMIT 1;");
1526 1526
         }
@@ -1551,7 +1551,7 @@  discard block
 block discarded – undo
1551 1551
     upd_check_key('user_birthday_range', 30, !isset($config->user_birthday_range));
1552 1552
     upd_check_key('user_birthday_celebrate', 0, !isset($config->user_birthday_celebrate));
1553 1553
 
1554
-    if(!isset($update_tables['payment']))
1554
+    if (!isset($update_tables['payment']))
1555 1555
     {
1556 1556
       upd_alter_table('users', array(
1557 1557
         "ADD KEY `I_user_id_name` (`id`, `username`)",
@@ -1603,7 +1603,7 @@  discard block
 block discarded – undo
1603 1603
     ), !$update_tables['iraks']['fleet_start_type']);
1604 1604
 
1605 1605
 
1606
-    if(!$update_tables['payment']['payment_status'])
1606
+    if (!$update_tables['payment']['payment_status'])
1607 1607
     {
1608 1608
       upd_alter_table('payment', array(
1609 1609
         "ADD COLUMN `payment_status` INT DEFAULT 0 COMMENT 'Payment status' AFTER `payment_id`",
@@ -1688,7 +1688,7 @@  discard block
 block discarded – undo
1688 1688
       "ADD INDEX `I_owner_priority_time` (`owner`, `priority`, `time`)",
1689 1689
     ), !$update_indexes['notes']['I_owner_priority_time']);
1690 1690
 
1691
-    if(!$update_tables['buddy']['BUDDY_ID'])
1691
+    if (!$update_tables['buddy']['BUDDY_ID'])
1692 1692
     {
1693 1693
       upd_alter_table('buddy', array(
1694 1694
         "CHANGE COLUMN `id` `BUDDY_ID` SERIAL COMMENT 'Buddy table row ID'",
@@ -1710,10 +1710,10 @@  discard block
 block discarded – undo
1710 1710
 
1711 1711
       $query = upd_do_query("SELECT `BUDDY_ID`, `BUDDY_SENDER_ID`, `BUDDY_OWNER_ID` FROM {{buddy}} ORDER BY `BUDDY_ID`;");
1712 1712
       $found = $lost = array();
1713
-      while($row = db_fetch($query))
1713
+      while ($row = db_fetch($query))
1714 1714
       {
1715 1715
         $index = min($row['BUDDY_SENDER_ID'], $row['BUDDY_OWNER_ID']) . ';' . max($row['BUDDY_SENDER_ID'], $row['BUDDY_OWNER_ID']);
1716
-        if(!isset($found[$index]))
1716
+        if (!isset($found[$index]))
1717 1717
         {
1718 1718
           $found[$index] = $row['BUDDY_ID'];
1719 1719
         }
@@ -1723,7 +1723,7 @@  discard block
 block discarded – undo
1723 1723
         }
1724 1724
       }
1725 1725
       $lost = implode(',', $lost);
1726
-      if($lost)
1726
+      if ($lost)
1727 1727
       {
1728 1728
         upd_do_query("DELETE FROM {{buddy}} WHERE `BUDDY_ID` IN ({$lost})");
1729 1729
       }
@@ -1745,7 +1745,7 @@  discard block
 block discarded – undo
1745 1745
 
1746 1746
     upd_do_query("UPDATE {{users}} SET `ally_name` = null, `ally_tag` = null, ally_register_time = 0, ally_rank_id = 0 WHERE `ally_id` IS NULL");
1747 1747
 
1748
-    if(!$update_tables['ube_report'])
1748
+    if (!$update_tables['ube_report'])
1749 1749
     {
1750 1750
       upd_create_table('ube_report',
1751 1751
         "(
@@ -1787,7 +1787,7 @@  discard block
 block discarded – undo
1787 1787
       );
1788 1788
     }
1789 1789
 
1790
-    if(!$update_tables['ube_report_player'])
1790
+    if (!$update_tables['ube_report_player'])
1791 1791
     {
1792 1792
       upd_create_table('ube_report_player',
1793 1793
         "(
@@ -1809,7 +1809,7 @@  discard block
 block discarded – undo
1809 1809
       );
1810 1810
     }
1811 1811
 
1812
-    if(!$update_tables['ube_report_fleet'])
1812
+    if (!$update_tables['ube_report_fleet'])
1813 1813
     {
1814 1814
       upd_create_table('ube_report_fleet',
1815 1815
         "(
@@ -1840,7 +1840,7 @@  discard block
 block discarded – undo
1840 1840
       );
1841 1841
     }
1842 1842
 
1843
-    if(!$update_tables['ube_report_unit'])
1843
+    if (!$update_tables['ube_report_unit'])
1844 1844
     {
1845 1845
       // TODO: Сохранять так же имя корабля - на случай конструкторов - не, хуйня. Конструктор может давать имена разные на разных языках
1846 1846
       // Может сохранять имена удаленных кораблей долго?
@@ -1878,7 +1878,7 @@  discard block
 block discarded – undo
1878 1878
       );
1879 1879
     }
1880 1880
 
1881
-    if(!$update_tables['ube_report_outcome_fleet'])
1881
+    if (!$update_tables['ube_report_outcome_fleet'])
1882 1882
     {
1883 1883
       upd_create_table('ube_report_outcome_fleet',
1884 1884
         "(
@@ -1908,7 +1908,7 @@  discard block
 block discarded – undo
1908 1908
       );
1909 1909
     }
1910 1910
 
1911
-    if(!$update_tables['ube_report_outcome_unit'])
1911
+    if (!$update_tables['ube_report_outcome_unit'])
1912 1912
     {
1913 1913
       upd_create_table('ube_report_outcome_unit',
1914 1914
         "(
@@ -1930,7 +1930,7 @@  discard block
 block discarded – undo
1930 1930
       );
1931 1931
     }
1932 1932
 
1933
-    if(!$update_tables['unit'])
1933
+    if (!$update_tables['unit'])
1934 1934
     {
1935 1935
       upd_create_table('unit',
1936 1936
         "(
@@ -1950,7 +1950,7 @@  discard block
 block discarded – undo
1950 1950
       );
1951 1951
     }
1952 1952
 
1953
-    if(!$update_tables['captain'])
1953
+    if (!$update_tables['captain'])
1954 1954
     {
1955 1955
       upd_create_table('captain',
1956 1956
         "(
@@ -1971,7 +1971,7 @@  discard block
 block discarded – undo
1971 1971
       );
1972 1972
     }
1973 1973
 
1974
-    if(!$update_tables['fleets']['fleet_start_planet_id'])
1974
+    if (!$update_tables['fleets']['fleet_start_planet_id'])
1975 1975
     {
1976 1976
       upd_alter_table('fleets', array(
1977 1977
         "ADD `fleet_start_planet_id` BIGINT(20) UNSIGNED DEFAULT NULL COMMENT 'Fleet start planet ID' AFTER `fleet_start_time`",
@@ -1994,7 +1994,7 @@  discard block
 block discarded – undo
1994 1994
 
1995 1995
     upd_alter_table('fleets', array("DROP COLUMN `processing_start`"), $update_tables['fleets']['processing_start']);
1996 1996
 
1997
-    if(!$update_tables['chat_player'])
1997
+    if (!$update_tables['chat_player'])
1998 1998
     {
1999 1999
       upd_create_table('chat_player',
2000 2000
         "(
@@ -2057,7 +2057,7 @@  discard block
 block discarded – undo
2057 2057
       "DROP FOREIGN KEY `FK_payment_user`",
2058 2058
     ), $update_foreigns['payment']['FK_payment_user']);
2059 2059
 
2060
-    if($update_foreigns['chat']['FK_chat_message_sender_user_id'] != 'chat_message_sender_id,users,id;')
2060
+    if ($update_foreigns['chat']['FK_chat_message_sender_user_id'] != 'chat_message_sender_id,users,id;')
2061 2061
     {
2062 2062
       upd_alter_table('chat', array(
2063 2063
         "DROP FOREIGN KEY `FK_chat_message_sender_user_id`",
@@ -2091,7 +2091,7 @@  discard block
 block discarded – undo
2091 2091
       "ADD KEY `I_ube_report_time_combat` (`ube_report_time_combat`)",
2092 2092
     ), !$update_indexes['ube_report']['I_ube_report_time_combat']);
2093 2093
 
2094
-    if(!$update_tables['unit']['unit_time_start'])
2094
+    if (!$update_tables['unit']['unit_time_start'])
2095 2095
     {
2096 2096
       upd_alter_table('unit', array(
2097 2097
         "ADD COLUMN `unit_time_start` DATETIME NULL DEFAULT NULL COMMENT 'Unit activation start time'",
@@ -2108,7 +2108,7 @@  discard block
 block discarded – undo
2108 2108
       );
2109 2109
     }
2110 2110
 
2111
-    if(!$update_tables['que'])
2111
+    if (!$update_tables['que'])
2112 2112
     {
2113 2113
       upd_create_table('que',
2114 2114
         "(
@@ -2141,15 +2141,15 @@  discard block
 block discarded – undo
2141 2141
     }
2142 2142
 
2143 2143
     // Конвертирум очередь исследований
2144
-    if($update_tables['users']['que'])
2144
+    if ($update_tables['users']['que'])
2145 2145
     {
2146 2146
       $que_lines = array();
2147 2147
       $que_query = upd_do_query("SELECT * FROM {{users}} WHERE `que`");
2148
-      while($que_row = db_fetch($que_query))
2148
+      while ($que_row = db_fetch($que_query))
2149 2149
       {
2150 2150
         $que_data = explode(',', $que_row['que']);
2151 2151
 
2152
-        if(!in_array($que_data[QI_UNIT_ID], sn_get_groups('tech')))
2152
+        if (!in_array($que_data[QI_UNIT_ID], sn_get_groups('tech')))
2153 2153
         {
2154 2154
           continue;
2155 2155
         }
@@ -2157,14 +2157,14 @@  discard block
 block discarded – undo
2157 2157
         $que_data[QI_TIME] = $que_data[QI_TIME] >= 0 ? $que_data[QI_TIME] : 0;
2158 2158
         // Если планета пустая - ставим главку
2159 2159
         $que_data[QI_PLANET_ID] = $que_data[QI_PLANET_ID] ? $que_data[QI_PLANET_ID] : $que_row['id_planet'];
2160
-        if($que_data[QI_PLANET_ID])
2160
+        if ($que_data[QI_PLANET_ID])
2161 2161
         {
2162 2162
           $que_planet_check = db_fetch(upd_do_query("SELECT `id` FROM {{planets}} WHERE `id` = {$que_data[QI_PLANET_ID]}"));
2163
-          if(!$que_planet_check['id'])
2163
+          if (!$que_planet_check['id'])
2164 2164
           {
2165 2165
             $que_data[QI_PLANET_ID] = $que_row['id_planet'];
2166 2166
             $que_planet_check = db_fetch(upd_do_query("SELECT `id` FROM {{planets}} WHERE `id` = {$que_data[QI_PLANET_ID]}"));
2167
-            if(!$que_planet_check['id'])
2167
+            if (!$que_planet_check['id'])
2168 2168
             {
2169 2169
               $que_data[QI_PLANET_ID] = 'NULL';
2170 2170
             }
@@ -2181,9 +2181,9 @@  discard block
 block discarded – undo
2181 2181
         $price_increase = pow($unit_factor, $unit_level);
2182 2182
         $unit_level++;
2183 2183
         $unit_cost = array();
2184
-        foreach($unit_info[P_COST] as $resource_id => $resource_amount)
2184
+        foreach ($unit_info[P_COST] as $resource_id => $resource_amount)
2185 2185
         {
2186
-          if($resource_id === P_FACTOR || $resource_id == RES_ENERGY || !($resource_cost = $resource_amount * $price_increase))
2186
+          if ($resource_id === P_FACTOR || $resource_id == RES_ENERGY || !($resource_cost = $resource_amount * $price_increase))
2187 2187
           {
2188 2188
             continue;
2189 2189
           }
@@ -2195,7 +2195,7 @@  discard block
 block discarded – undo
2195 2195
           BUILD_CREATE . ",{$unit_level},{$que_data[QI_TIME]},'{$unit_cost}')";
2196 2196
       }
2197 2197
 
2198
-      if(!empty($que_lines))
2198
+      if (!empty($que_lines))
2199 2199
       {
2200 2200
         upd_do_query('INSERT INTO `{{que}}` (`que_player_id`,`que_planet_id_origin`,`que_type`,`que_time_left`,`que_unit_id`,`que_unit_amount`,`que_unit_mode`,`que_unit_level`,`que_unit_time`,`que_unit_price`) VALUES ' . implode(',', $que_lines));
2201 2201
       }
@@ -2210,7 +2210,7 @@  discard block
 block discarded – undo
2210 2210
 
2211 2211
 
2212 2212
     // Ковертируем технологии в таблицы
2213
-    if($update_tables['users']['graviton_tech'])
2213
+    if ($update_tables['users']['graviton_tech'])
2214 2214
     {
2215 2215
       upd_do_query("DELETE FROM {{unit}} WHERE unit_type = " . UNIT_TECHNOLOGIES);
2216 2216
 
@@ -2218,18 +2218,18 @@  discard block
 block discarded – undo
2218 2218
       $user_query = upd_do_query("SELECT * FROM {{users}}");
2219 2219
       upd_add_more_time(300);
2220 2220
       $sn_group_tech = sn_get_groups('tech');
2221
-      while($user_row = db_fetch($user_query))
2221
+      while ($user_row = db_fetch($user_query))
2222 2222
       {
2223
-        foreach($sn_group_tech as $tech_id)
2223
+        foreach ($sn_group_tech as $tech_id)
2224 2224
         {
2225
-          if($tech_level = intval($user_row[get_unit_param($tech_id, P_NAME)]))
2225
+          if ($tech_level = intval($user_row[get_unit_param($tech_id, P_NAME)]))
2226 2226
           {
2227 2227
             $que_lines[] = "({$user_row['id']}," . LOC_USER . ",{$user_row['id']}," . UNIT_TECHNOLOGIES . ",{$tech_id},{$tech_level})";
2228 2228
           }
2229 2229
         }
2230 2230
       }
2231 2231
 
2232
-      if(!empty($que_lines))
2232
+      if (!empty($que_lines))
2233 2233
       {
2234 2234
         upd_do_query("INSERT INTO {{unit}} (unit_player_id, unit_location_type, unit_location_id, unit_type, unit_snid, unit_level) VALUES " . implode(',', $que_lines));
2235 2235
       }
@@ -2239,30 +2239,30 @@  discard block
 block discarded – undo
2239 2239
       ), $update_tables['users']['graviton_tech']);
2240 2240
     }
2241 2241
 
2242
-    if(!$update_indexes['unit']['I_unit_record_search'])
2242
+    if (!$update_indexes['unit']['I_unit_record_search'])
2243 2243
     {
2244 2244
       upd_alter_table('unit', array(
2245 2245
         "ADD KEY `I_unit_record_search` (`unit_snid`,`unit_player_id`,`unit_level` DESC,`unit_id`)",
2246 2246
       ), !$update_indexes['unit']['I_unit_record_search']);
2247 2247
 
2248
-      foreach(sn_get_groups(array('structures', 'fleet', 'defense')) as $unit_id)
2248
+      foreach (sn_get_groups(array('structures', 'fleet', 'defense')) as $unit_id)
2249 2249
       {
2250 2250
         $planet_units[get_unit_param($unit_id, P_NAME)] = 1;
2251 2251
       }
2252 2252
       $drop_index = array();
2253 2253
       $create_index = &$drop_index; // array();
2254
-      foreach($planet_units as $unit_name => $unit_create)
2254
+      foreach ($planet_units as $unit_name => $unit_create)
2255 2255
       {
2256
-        if($update_indexes['planets']['I_' . $unit_name])
2256
+        if ($update_indexes['planets']['I_' . $unit_name])
2257 2257
         {
2258 2258
           $drop_index[] = "DROP KEY I_{$unit_name}";
2259 2259
         }
2260
-        if($update_indexes['planets']['i_' . $unit_name])
2260
+        if ($update_indexes['planets']['i_' . $unit_name])
2261 2261
         {
2262 2262
           $drop_index[] = "DROP KEY i_{$unit_name}";
2263 2263
         }
2264 2264
 
2265
-        if($unit_create)
2265
+        if ($unit_create)
2266 2266
         {
2267 2267
           $create_index[] = "ADD KEY `I_{$unit_name}` (`id_owner`, {$unit_name} DESC)";
2268 2268
         }
@@ -2274,7 +2274,7 @@  discard block
 block discarded – undo
2274 2274
       "ADD `user_time_utc_offset` INT(11) DEFAULT NULL COMMENT 'User time difference with server time' AFTER `user_time_diff`",
2275 2275
     ), !$update_tables['users']['user_time_utc_offset']);
2276 2276
 
2277
-    if(!$update_foreigns['alliance']['FK_alliance_owner'])
2277
+    if (!$update_foreigns['alliance']['FK_alliance_owner'])
2278 2278
     {
2279 2279
       upd_do_query("UPDATE {{alliance}} SET ally_owner = null WHERE ally_owner not in (select id from {{users}})");
2280 2280
 
@@ -2295,7 +2295,7 @@  discard block
 block discarded – undo
2295 2295
 
2296 2296
     upd_check_key('chat_highlight_developer', '<span class="nick_developer">$1</span>', !$config->chat_highlight_developer);
2297 2297
 
2298
-    if(!$update_tables['player_name_history'])
2298
+    if (!$update_tables['player_name_history'])
2299 2299
     {
2300 2300
       upd_check_key('game_user_changename_cost', 100000, !$config->game_user_changename_cost);
2301 2301
       upd_check_key('game_user_changename', SERVER_PLAYER_NAME_CHANGE_PAY, $config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_PAY);
@@ -2325,7 +2325,7 @@  discard block
 block discarded – undo
2325 2325
       "ADD `density_index` TINYINT NOT NULL DEFAULT " . PLANET_DENSITY_STANDARD . " COMMENT 'Planet cached density index'",
2326 2326
     ), !$update_tables['planets']['density_index']);
2327 2327
 
2328
-    if($update_tables['users']['player_artifact_list'])
2328
+    if ($update_tables['users']['player_artifact_list'])
2329 2329
     {
2330 2330
       upd_alter_table('unit', "DROP KEY `unit_id`", $update_indexes['unit']['unit_id']);
2331 2331
 
@@ -2336,17 +2336,17 @@  discard block
 block discarded – undo
2336 2336
       $db_changeset = array();
2337 2337
 
2338 2338
       $query = upd_do_query("SELECT `id`, `player_artifact_list` FROM {{users}} WHERE `player_artifact_list` IS NOT NULL AND `player_artifact_list` != '' FOR UPDATE");
2339
-      while($row = db_fetch($query))
2339
+      while ($row = db_fetch($query))
2340 2340
       {
2341 2341
         $artifact_list = explode(';', $row['player_artifact_list']);
2342
-        if(!$row['player_artifact_list'] || empty($artifact_list))
2342
+        if (!$row['player_artifact_list'] || empty($artifact_list))
2343 2343
         {
2344 2344
           continue;
2345 2345
         }
2346
-        foreach($artifact_list as $key => &$value)
2346
+        foreach ($artifact_list as $key => &$value)
2347 2347
         {
2348 2348
           $value = explode(',', $value);
2349
-          if(!isset($value[1]) || $value[1] <= 0 || !isset($sn_data_artifacts[$value[0]]))
2349
+          if (!isset($value[1]) || $value[1] <= 0 || !isset($sn_data_artifacts[$value[0]]))
2350 2350
           {
2351 2351
             unset($artifact_list[$key]);
2352 2352
             continue;
@@ -2378,14 +2378,14 @@  discard block
 block discarded – undo
2378 2378
       "DROP COLUMN `colonisation_tech`",
2379 2379
     ), $update_tables['users']['spy_tech']);
2380 2380
 
2381
-    upd_check_key('payment_currency_exchange_dm_', 2500,             !$config->payment_currency_exchange_dm_ || $config->payment_currency_exchange_dm_ == 1000);
2381
+    upd_check_key('payment_currency_exchange_dm_', 2500, !$config->payment_currency_exchange_dm_ || $config->payment_currency_exchange_dm_ == 1000);
2382 2382
     upd_check_key('payment_currency_exchange_eur', 0.09259259259259, !$config->payment_currency_exchange_eur);
2383
-    upd_check_key('payment_currency_exchange_rub', 4.0,              !$config->payment_currency_exchange_rub);
2384
-    upd_check_key('payment_currency_exchange_usd', 0.125,            !$config->payment_currency_exchange_usd);
2385
-    upd_check_key('payment_currency_exchange_wme', 0.0952380952381,  !$config->payment_currency_exchange_usd);
2386
-    upd_check_key('payment_currency_exchange_wmr', 4.1,              !$config->payment_currency_exchange_wmr);
2387
-    upd_check_key('payment_currency_exchange_wmu', 1.05,             !$config->payment_currency_exchange_wmu);
2388
-    upd_check_key('payment_currency_exchange_wmz', 0.126582278481,   !$config->payment_currency_exchange_wmz);
2383
+    upd_check_key('payment_currency_exchange_rub', 4.0, !$config->payment_currency_exchange_rub);
2384
+    upd_check_key('payment_currency_exchange_usd', 0.125, !$config->payment_currency_exchange_usd);
2385
+    upd_check_key('payment_currency_exchange_wme', 0.0952380952381, !$config->payment_currency_exchange_usd);
2386
+    upd_check_key('payment_currency_exchange_wmr', 4.1, !$config->payment_currency_exchange_wmr);
2387
+    upd_check_key('payment_currency_exchange_wmu', 1.05, !$config->payment_currency_exchange_wmu);
2388
+    upd_check_key('payment_currency_exchange_wmz', 0.126582278481, !$config->payment_currency_exchange_wmz);
2389 2389
 
2390 2390
     upd_do_query('COMMIT;', true);
2391 2391
     $new_version = 37;
Please login to merge, or discard this patch.