Completed
Push — work-fleets ( fdc1c4...451000 )
by SuperNova.WS
04:55
created
includes/includes/ube_zi_helpers.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,9 +27,9 @@  discard block
 block discarded – undo
27 27
   print($round);
28 28
   print('<table border=1>');
29 29
   print('<tr align="left">');
30
-  foreach($header as $key => $value)
30
+  foreach ($header as $key => $value)
31 31
   {
32
-    if(is_array($value))
32
+    if (is_array($value))
33 33
     {
34 34
       continue;
35 35
     }
@@ -61,9 +61,9 @@  discard block
 block discarded – undo
61 61
   );
62 62
 
63 63
   print('<tr align="right">');
64
-  foreach($debug_unit_crossfire_result as $key => $value)
64
+  foreach ($debug_unit_crossfire_result as $key => $value)
65 65
   {
66
-    if(is_array($value))
66
+    if (is_array($value))
67 67
     {
68 68
       continue;
69 69
     }
Please login to merge, or discard this patch.
includes/classes/core_classes.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -38,8 +38,8 @@  discard block
 block discarded – undo
38 38
     !is_array($offset) ? $offset = array($offset) : false;
39 39
 
40 40
     $current_leaf = $this->__get(reset($offset));
41
-    while(($leaf_index = next($offset)) !== false) {
42
-      if(!isset($current_leaf) || !is_array($current_leaf) || !isset($current_leaf[$leaf_index])) {
41
+    while (($leaf_index = next($offset)) !== false) {
42
+      if (!isset($current_leaf) || !is_array($current_leaf) || !isset($current_leaf[$leaf_index])) {
43 43
         unset($current_leaf);
44 44
         break;
45 45
       }
@@ -64,9 +64,9 @@  discard block
 block discarded – undo
64 64
 
65 65
     !is_array($offset) ? $offset = array($offset) : false;
66 66
 
67
-    if($this->offsetExists($offset)) {
67
+    if ($this->offsetExists($offset)) {
68 68
       $result = $this->__get(reset($offset));
69
-      while(($leaf_index = next($offset)) !== false) {
69
+      while (($leaf_index = next($offset)) !== false) {
70 70
         $result = $result[$leaf_index];
71 71
       }
72 72
     }
@@ -91,12 +91,12 @@  discard block
 block discarded – undo
91 91
    */
92 92
   public function offsetSet($offset, $value = null) {
93 93
     // Если нет никакого индекса - значит нечего записывать
94
-    if(!isset($offset) || (is_array($offset) && empty($offset))) {
94
+    if (!isset($offset) || (is_array($offset) && empty($offset))) {
95 95
       return;
96 96
     }
97 97
 
98 98
     // Если в массиве индекса только один элемент - значит это просто индекс
99
-    if(is_array($offset) && count($offset) == 1) {
99
+    if (is_array($offset) && count($offset) == 1) {
100 100
       // Разворачиваем его в индекс
101 101
       $offset = array(reset($offset) => $value);
102 102
       unset($value);
@@ -104,20 +104,20 @@  discard block
 block discarded – undo
104 104
     }
105 105
 
106 106
     // Адресация многомерного массива через массив индексов в $option
107
-    if(is_array($offset) && isset($value)) {
107
+    if (is_array($offset) && isset($value)) {
108 108
       // TODO - а не переделать ли это всё на __isset() ??
109 109
 //pdump($offset, '$offset');
110 110
 //pdump($value, '$value');
111 111
       // Вытаскиваем корневой элемент
112 112
       $root = $this->__get(reset($offset));
113 113
       $current_leaf = &$root;
114
-      while(($leaf_index = next($offset)) !== false) {
114
+      while (($leaf_index = next($offset)) !== false) {
115 115
         !is_array($current_leaf[$leaf_index]) ? $current_leaf[$leaf_index] = array() : false;
116 116
         $current_leaf = &$current_leaf[$leaf_index];
117 117
       }
118 118
 //pdump($current_leaf, '$current_leaf');
119 119
 //pdump($value, '$value');
120
-      if($current_leaf != $value) {
120
+      if ($current_leaf != $value) {
121 121
         $current_leaf = $value;
122 122
 //pdump(reset($offset), 'reset($offset)');
123 123
 //pdump($root, '$root');
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
       // Пакетная запись из массива ключ -> значение
129 129
       !is_array($offset) ? $offset = array($offset => $value) : false;
130 130
 
131
-      foreach($offset as $key => $value) {
131
+      foreach ($offset as $key => $value) {
132 132
         $this->__get($key) !== $value ? $this->__set($key, $value) : false;
133 133
       }
134 134
     }
@@ -149,13 +149,13 @@  discard block
 block discarded – undo
149 149
    */
150 150
   public function offsetUnset($offset) {
151 151
     // Если нет никакого индекса - значит нечего записывать
152
-    if(!isset($offset) || (is_array($offset) && empty($offset))) {
152
+    if (!isset($offset) || (is_array($offset) && empty($offset))) {
153 153
       return;
154 154
     }
155 155
 
156 156
     !is_array($offset) ? $offset = array($offset) : false;
157 157
 
158
-    if($this->offsetExists($offset)) {
158
+    if ($this->offsetExists($offset)) {
159 159
 //pdump($offset);
160 160
       // Перематываем массив в конец
161 161
       $key_to_delete = end($offset);
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 //pdump($key_to_delete, '$key_to_delete');
164 164
       $parent_offset = $offset;
165 165
       array_pop($parent_offset);
166
-      if(!count($parent_offset)) {
166
+      if (!count($parent_offset)) {
167 167
         // В массиве был один элемент - мы удаляем в корне. Просто удаляем элемент
168 168
         $this->__unset($key_to_delete);
169 169
       } else {
Please login to merge, or discard this patch.
includes/classes/PlayerToAccountTranslate.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
   protected static $is_init = false;
20 20
 
21 21
   protected static function init() {
22
-    if(!empty(static::$db)) {
22
+    if (!empty(static::$db)) {
23 23
       return;
24 24
     }
25 25
     static::$db = classSupernova::$db;
@@ -66,12 +66,12 @@  discard block
 block discarded – undo
66 66
     $provider_id_safe = intval($provider_id_unsafe);
67 67
     !is_array($account_list) ? $account_list = array($account_list) : false;
68 68
 
69
-    foreach($account_list as $provider_account_id_unsafe) {
69
+    foreach ($account_list as $provider_account_id_unsafe) {
70 70
       $provider_account_id_safe = intval($provider_account_id_unsafe);
71 71
 
72 72
       // TODO - Здесь могут отсутствовать аккаунты - проверять провайдером
73 73
       $query = static::$db->doquery("SELECT `user_id` FROM {{account_translate}} WHERE `provider_id` = {$provider_id_safe} AND `provider_account_id` = {$provider_account_id_safe} FOR UPDATE");
74
-      while($row = static::$db->db_fetch($query)) {
74
+      while ($row = static::$db->db_fetch($query)) {
75 75
         $account_translation[$row['user_id']][$provider_id_unsafe][$provider_account_id_unsafe] = true;
76 76
       }
77 77
     }
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
       "SELECT * FROM {{account_translate}} WHERE `user_id` = {$user_id_safe} " .
92 92
       ($provider_id_unsafe ? "AND `provider_id` = {$provider_id_safe} " : '') .
93 93
       "ORDER BY `timestamp` FOR UPDATE");
94
-    while($row = static::$db->db_fetch($query)) {
94
+    while ($row = static::$db->db_fetch($query)) {
95 95
       $account_translation[$row['user_id']][$row['provider_id']][$row['provider_account_id']] = $row;
96 96
     }
97 97
 
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/pages/imperator.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 //    $same_user = false;
54 54
 //  }
55 55
 
56
-  if(!$user_data) {
56
+  if (!$user_data) {
57 57
     message($lang['imp_imperator_none'], $lang['sys_error'], 'index.php', 10);
58 58
     die();
59 59
   }
@@ -64,15 +64,15 @@  discard block
 block discarded – undo
64 64
   $stat_array = array();
65 65
   $query = doquery("SELECT * FROM {{statpoints}} WHERE `stat_type` = 1 AND `id_owner` = {$user_id} ORDER BY `stat_code` DESC;");
66 66
   $stat_count = classSupernova::$db->db_affected_rows();
67
-  while($row = db_fetch($query)) {
68
-    foreach($stat_fields as $field_db_name => $field_template_name) {
67
+  while ($row = db_fetch($query)) {
68
+    foreach ($stat_fields as $field_db_name => $field_template_name) {
69 69
       // $stat_count - $row['stat_code'] - для реверсирования ID статы в JS
70 70
       $stat_array[$field_template_name]['DATA'][$stat_count - $row['stat_code']] = $row[$field_db_name];
71 71
     }
72 72
   }
73 73
 
74 74
   $stat_array_date = $stat_array['STAT_DATE'];
75
-  foreach($stat_array_date['DATA'] as $key => $value) {
75
+  foreach ($stat_array_date['DATA'] as $key => $value) {
76 76
     $template->assign_block_vars('stat_date', array(
77 77
       'ID' => $key,
78 78
       'VALUE' => $value,
@@ -85,17 +85,17 @@  discard block
 block discarded – undo
85 85
 
86 86
   unset($stat_array['STAT_DATE']);
87 87
   $template_data = array();
88
-  foreach($stat_array as $stat_type => &$stat_type_data) {
88
+  foreach ($stat_array as $stat_type => &$stat_type_data) {
89 89
     $reverse_min_max = strpos($stat_type, '_RANK') !== false;
90 90
     $stat_type_data['MIN'] = $reverse_min_max ? max($stat_type_data['DATA']) : min($stat_type_data['DATA']);
91 91
     $stat_type_data['MAX'] = $reverse_min_max ? min($stat_type_data['DATA']) : max($stat_type_data['DATA']);
92 92
     $stat_type_data['AVG'] = average($stat_type_data['DATA']);
93
-    foreach($stat_type_data['DATA'] as $key => $value) {
93
+    foreach ($stat_type_data['DATA'] as $key => $value) {
94 94
       // $stat_type_data['PERCENT'][$key] = $stat_type_data['MAX'] - $value ? ($stat_type_data['MAX'] - $stat_type_data['MIN']) / ($stat_type_data['MAX'] - $value) : 100;
95 95
       $stat_type_data['PERCENT'][$key] = ($stat_type_data['MAX'] - $value ? ($value - $stat_type_data['MIN']) / ($stat_type_data['MAX'] - $stat_type_data['MIN']) : 1) * 100;
96 96
       $template_data[$stat_type][$key]['ID'] = $key;
97 97
       $template_data[$stat_type][$key]['VALUE'] = $value;
98
-      $template_data[$stat_type][$key]['DELTA'] = ($reverse_min_max ? $stat_type_data['MIN']  - $value : $value - $stat_type_data['MAX']);
98
+      $template_data[$stat_type][$key]['DELTA'] = ($reverse_min_max ? $stat_type_data['MIN'] - $value : $value - $stat_type_data['MAX']);
99 99
       $template_data[$stat_type][$key]['PERCENT'] = $stat_type_data['PERCENT'][$key];
100 100
 
101 101
 //$template_data[$stat_type][$key]['PERCENT'] = $key ? $stat_type_data['PERCENT'][$key] : 50; // TODO DEBUG
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
   }
104 104
   // pdump($stat_array['RES_POINTS']);
105 105
 
106
-  foreach($template_data as $stat_type => $stat_type_data) {
106
+  foreach ($template_data as $stat_type => $stat_type_data) {
107 107
     $template->assign_block_vars('stat', array(
108 108
       'TYPE' => $stat_type,
109 109
       'TEXT' => $lang['imp_stat_types'][$stat_type],
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
       'MAX' => $stat_array[$stat_type]['MAX'],
112 112
       'AVG' => $stat_array[$stat_type]['AVG'],
113 113
     ));
114
-    foreach($stat_type_data as $stat_entry) {
114
+    foreach ($stat_type_data as $stat_entry) {
115 115
       $template->assign_block_vars('stat.entry', $stat_entry);
116 116
     }
117 117
   }
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 
120 120
   // pdump($template_data);
121 121
 
122
-  if($same_user) {
122
+  if ($same_user) {
123 123
     rpg_level_up($user, RPG_STRUCTURE);
124 124
     rpg_level_up($user, RPG_RAID);
125 125
     rpg_level_up($user, RPG_TECH);
@@ -153,29 +153,29 @@  discard block
 block discarded – undo
153 153
     'builder_xp'           => pretty_number($user_data['xpminier']),
154 154
     'builder_lvl'          => pretty_number($user_data['lvl_minier']),
155 155
     'builder_lvl_st'       => pretty_number(rpg_get_miner_xp($user_data['lvl_minier'])),
156
-    'builder_lvl_up'       => pretty_number(rpg_get_miner_xp($user_data['lvl_minier']+1)),
156
+    'builder_lvl_up'       => pretty_number(rpg_get_miner_xp($user_data['lvl_minier'] + 1)),
157 157
     'raid_xp'              => pretty_number($user_data['xpraid']),
158 158
     'raid_lvl'             => pretty_number($user_data['lvl_raid']),
159
-    'raid_lvl_up'          => pretty_number(rpg_get_raider_xp($user_data['lvl_raid']+1)),
159
+    'raid_lvl_up'          => pretty_number(rpg_get_raider_xp($user_data['lvl_raid'] + 1)),
160 160
     'raids'                => pretty_number($user_data['raids']),
161 161
     'raidswin'             => pretty_number($user_data['raidswin']),
162 162
     'raidsloose'           => pretty_number($user_data['raidsloose']),
163 163
     'tech_xp'              => pretty_number($user_data['player_rpg_tech_xp']),
164 164
     'tech_lvl'             => pretty_number($user_data['player_rpg_tech_level']),
165 165
     'tech_lvl_st'          => pretty_number(rpg_get_tech_xp($user_data['player_rpg_tech_level'])),
166
-    'tech_lvl_up'          => pretty_number(rpg_get_tech_xp($user_data['player_rpg_tech_level']+1)),
166
+    'tech_lvl_up'          => pretty_number(rpg_get_tech_xp($user_data['player_rpg_tech_level'] + 1)),
167 167
 
168 168
     'explore_xp'           => pretty_number($user_data['player_rpg_explore_xp']),
169 169
     'explore_lvl'          => pretty_number($user_data['player_rpg_explore_level']),
170 170
     'explore_lvl_st'       => pretty_number(rpg_get_explore_xp($user_data['player_rpg_explore_level'])),
171
-    'explore_lvl_up'       => pretty_number(rpg_get_explore_xp($user_data['player_rpg_explore_level']+1)),
172
-
173
-    'build_points'         => pretty_number( $StatRecord['build_points'] ),
174
-    'tech_points'          => pretty_number( $StatRecord['tech_points'] ),
175
-    'fleet_points'         => pretty_number( $StatRecord['fleet_points'] ),
176
-    'defs_points'          => pretty_number( $StatRecord['defs_points'] ),
177
-    'res_points'           => pretty_number( $StatRecord['res_points'] ),
178
-    'total_points'         => pretty_number( $StatRecord['total_points'] ),
171
+    'explore_lvl_up'       => pretty_number(rpg_get_explore_xp($user_data['player_rpg_explore_level'] + 1)),
172
+
173
+    'build_points'         => pretty_number($StatRecord['build_points']),
174
+    'tech_points'          => pretty_number($StatRecord['tech_points']),
175
+    'fleet_points'         => pretty_number($StatRecord['fleet_points']),
176
+    'defs_points'          => pretty_number($StatRecord['defs_points']),
177
+    'res_points'           => pretty_number($StatRecord['res_points']),
178
+    'total_points'         => pretty_number($StatRecord['total_points']),
179 179
     'user_rank'            => $StatRecord['total_rank'],
180 180
     'RANK_DIFF'            => $StatRecord['total_old_rank'] - $StatRecord['total_rank'],
181 181
 
Please login to merge, or discard this patch.
includes/pages/techtree.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,14 +14,14 @@
 block discarded – undo
14 14
   global $lang, $user, $planetrow;
15 15
 
16 16
   $tech_tree = array();
17
-  foreach(get_unit_param('techtree') as $unit_group_id => $unit_list)
17
+  foreach (get_unit_param('techtree') as $unit_group_id => $unit_list)
18 18
   {
19 19
     $tech_tree[] = array(
20 20
       'NAME' => $lang['tech'][$unit_group_id],
21 21
       'GROUP_ID' => $unit_group_id,
22 22
     );
23 23
 
24
-    foreach($unit_list as $unit_id)
24
+    foreach ($unit_list as $unit_id)
25 25
     {
26 26
       $sn_data_unit = get_unit_param($unit_id);
27 27
       $level_basic = $sn_data_unit[P_STACKABLE] ? 0 : mrc_get_level($user, $planetrow, $unit_id, false, true);
Please login to merge, or discard this patch.
includes/functions/eco_planet_update.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -14,13 +14,13 @@  discard block
 block discarded – undo
14 14
 
15 15
   $no_data = array('user' => false, 'planet' => false, 'que' => false);
16 16
 
17
-  if(!$planet) {
17
+  if (!$planet) {
18 18
     return $no_data;
19 19
   }
20 20
 
21
-  if(!$no_user_update) {
21
+  if (!$no_user_update) {
22 22
     $user = intval(is_array($user) && $user['id'] ? $user['id'] : $user);
23
-    if(!$user) {
23
+    if (!$user) {
24 24
       // TODO - Убрать позже
25 25
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sys_o_get_updated() - USER пустой!</h1>');
26 26
       $backtrace = debug_backtrace();
@@ -32,17 +32,17 @@  discard block
 block discarded – undo
32 32
     $user = db_user_by_id($user, !$simulation, '*', true);
33 33
   }
34 34
 
35
-  if(empty($user['id'])) {
35
+  if (empty($user['id'])) {
36 36
     return $no_data;
37 37
   }
38 38
 
39
-  if(is_array($planet) && isset($planet['galaxy']) && $planet['galaxy']) {
39
+  if (is_array($planet) && isset($planet['galaxy']) && $planet['galaxy']) {
40 40
     $planet = db_planet_by_vector($planet, '', !$simulation);
41 41
   } else {
42 42
     $planet = intval(is_array($planet) && isset($planet['id']) ? $planet['id'] : $planet);
43 43
     $planet = db_planet_by_id($planet, !$simulation);
44 44
   }
45
-  if(!is_array($planet) || !isset($planet['id'])) {
45
+  if (!is_array($planet) || !isset($planet['id'])) {
46 46
     return $no_data;
47 47
   }
48 48
 
@@ -65,15 +65,15 @@  discard block
 block discarded – undo
65 65
     RES_DEUTERIUM => 0,
66 66
   );
67 67
 
68
-  switch($planet['planet_type']) {
68
+  switch ($planet['planet_type']) {
69 69
     case PT_PLANET:
70
-      foreach($resources_increase as $resource_id => &$increment) {
70
+      foreach ($resources_increase as $resource_id => &$increment) {
71 71
         $resource_name = pname_resource_name($resource_id);
72 72
         $increment = $caps_real['total'][$resource_id] * $ProductionTime / 3600;
73 73
         $store_free = $caps_real['total_storage'][$resource_id] - $planet[$resource_name];
74 74
         $increment = min($increment, max(0, $store_free));
75 75
 
76
-        if($planet[$resource_name] + $increment < 0 && !$simulation) {
76
+        if ($planet[$resource_name] + $increment < 0 && !$simulation) {
77 77
           global $debug;
78 78
           $debug->warning("Player ID {$user['id']} have negative resources on ID {$planet['id']}.{$planet['planet_type']} [{$planet['galaxy']}:{$planet['system']}:{$planet['planet']}]. Difference {$planet[$resource_name]} of {$resource_name}", 'Negative Resources', 501);
79 79
         }
@@ -95,13 +95,13 @@  discard block
 block discarded – undo
95 95
   // TODO пересчитывать размер планеты только при постройке чего-нибудь и при покупке сектора
96 96
   $planet['field_current'] = 0;
97 97
   $sn_group_build_allow = sn_get_groups('build_allow');
98
-  if(is_array($sn_group_build_allow[$planet['planet_type']])) {
99
-    foreach($sn_group_build_allow[$planet['planet_type']] as $building_id) {
98
+  if (is_array($sn_group_build_allow[$planet['planet_type']])) {
99
+    foreach ($sn_group_build_allow[$planet['planet_type']] as $building_id) {
100 100
       $planet['field_current'] += mrc_get_level($user, $planet, $building_id, !$simulation, true);
101 101
     }
102 102
   }
103 103
 
104
-  if($simulation) {
104
+  if ($simulation) {
105 105
     return array('user' => $user, 'planet' => $planet, 'que' => $que);
106 106
   }
107 107
 
Please login to merge, or discard this patch.
includes/functions/eco_get_planet_caps.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 function eco_get_planet_caps_modify_production(&$item, $key, $data) {
4 4
   static $modifiers;
5 5
 
6
-  if(!$modifiers) {
6
+  if (!$modifiers) {
7 7
     $modifiers = sn_get_groups('modifiers');
8 8
   }
9 9
   $item = floor(mrc_modify_value($data['user'], $data['planet'], $modifiers[MODIFIER_RESOURCE_PRODUCTION], $item));
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 
16 16
   static $sn_group_modifiers, $config_resource_multiplier, $config_resource_multiplier_plain, $config_eco_scale_storage;
17 17
 
18
-  if(!$sn_group_modifiers) {
18
+  if (!$sn_group_modifiers) {
19 19
     $sn_group_modifiers = sn_get_groups('modifiers');
20 20
     $config_resource_multiplier = game_resource_multiplier();
21 21
     $config_resource_multiplier_plain = game_resource_multiplier(true);
@@ -26,15 +26,15 @@  discard block
 block discarded – undo
26 26
   $caps['storage'][RES_METAL][0] = $config->eco_planet_storage_metal;
27 27
   $caps['storage'][RES_CRYSTAL][0] = $config->eco_planet_storage_crystal;
28 28
   $caps['storage'][RES_DEUTERIUM][0] = $config->eco_planet_storage_deuterium;
29
-  foreach(sn_get_groups('storages') as $unit_id) {
30
-    foreach(get_unit_param($unit_id, P_STORAGE) as $resource_id => $function) {
29
+  foreach (sn_get_groups('storages') as $unit_id) {
30
+    foreach (get_unit_param($unit_id, P_STORAGE) as $resource_id => $function) {
31 31
       $caps['storage'][$resource_id][$unit_id] = floor($config_eco_scale_storage *
32 32
         mrc_modify_value($user, $planet_row, $sn_group_modifiers[MODIFIER_RESOURCE_CAPACITY], $function(mrc_get_level($user, $planet_row, $unit_id)))
33 33
       );
34 34
     }
35 35
   }
36 36
 
37
-  if($planet_row['planet_type'] == PT_MOON) {
37
+  if ($planet_row['planet_type'] == PT_MOON) {
38 38
     return $caps;
39 39
   }
40 40
 
@@ -46,12 +46,12 @@  discard block
 block discarded – undo
46 46
   $caps['production_full'][RES_DEUTERIUM][0] = floor($config->deuterium_basic_income * $config_resource_multiplier * (isset($planet_density[RES_DEUTERIUM]) ? $planet_density[RES_DEUTERIUM] : 1));
47 47
   $caps['production_full'][RES_ENERGY][0] = floor($config->energy_basic_income * $config_resource_multiplier_plain * (isset($planet_density[RES_ENERGY]) ? $planet_density[RES_ENERGY] : 1));
48 48
 
49
-  foreach(sn_get_groups('factories') as $unit_id) {
49
+  foreach (sn_get_groups('factories') as $unit_id) {
50 50
     $unit_data = get_unit_param($unit_id);
51 51
     $unit_level = mrc_get_level($user, $planet_row, $unit_id);
52 52
     $unit_load = $planet_row[pname_factory_production_field_name($unit_id)];
53 53
 
54
-    foreach($unit_data[P_UNIT_PRODUCTION] as $resource_id => $function) {
54
+    foreach ($unit_data[P_UNIT_PRODUCTION] as $resource_id => $function) {
55 55
       $caps['production_full'][$resource_id][$unit_id] = $function($unit_level, $unit_load, $user, $planet_row)
56 56
         * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
57 57
         * (isset($planet_density[$resource_id]) ? $planet_density[$resource_id] : 1);
@@ -60,21 +60,21 @@  discard block
 block discarded – undo
60 60
 
61 61
   array_walk_recursive($caps['production_full'], 'eco_get_planet_caps_modify_production', array('user' => $user, 'planet' => $planet_row));
62 62
 
63
-  foreach($caps['production_full'] as $resource_id => $resource_data) {
63
+  foreach ($caps['production_full'] as $resource_id => $resource_data) {
64 64
     $caps['total_production_full'][$resource_id] = array_sum($resource_data);
65 65
   }
66 66
 
67 67
   $caps['production'] = $caps['production_full'];
68 68
 
69
-  if($caps['production'][RES_ENERGY][STRUC_MINE_FUSION]) {
69
+  if ($caps['production'][RES_ENERGY][STRUC_MINE_FUSION]) {
70 70
     $deuterium_balance = array_sum($caps['production'][RES_DEUTERIUM]);
71 71
     $energy_balance = array_sum($caps['production'][RES_ENERGY]);
72
-    if($deuterium_balance < 0 || $energy_balance < 0) {
72
+    if ($deuterium_balance < 0 || $energy_balance < 0) {
73 73
       $caps['production'][RES_DEUTERIUM][STRUC_MINE_FUSION] = $caps['production'][RES_ENERGY][STRUC_MINE_FUSION] = 0;
74 74
     }
75 75
   }
76 76
 
77
-  foreach($caps['production'][RES_ENERGY] as $energy) {
77
+  foreach ($caps['production'][RES_ENERGY] as $energy) {
78 78
     $caps[RES_ENERGY][$energy >= 0 ? BUILD_CREATE : BUILD_DESTROY] += $energy;
79 79
   }
80 80
 
@@ -84,10 +84,10 @@  discard block
 block discarded – undo
84 84
     ? $caps[RES_ENERGY][BUILD_CREATE] / $caps[RES_ENERGY][BUILD_DESTROY]
85 85
     : 1;
86 86
 
87
-  foreach($caps['production'] as $resource_id => &$resource_data) {
88
-    if($caps['efficiency'] != 1) {
89
-      foreach($resource_data as $unit_id => &$resource_production) {
90
-        if(!($unit_id == STRUC_MINE_FUSION && $resource_id == RES_DEUTERIUM) && $unit_id != 0 && !($resource_id == RES_ENERGY && $resource_production >= 0)) {
87
+  foreach ($caps['production'] as $resource_id => &$resource_data) {
88
+    if ($caps['efficiency'] != 1) {
89
+      foreach ($resource_data as $unit_id => &$resource_production) {
90
+        if (!($unit_id == STRUC_MINE_FUSION && $resource_id == RES_DEUTERIUM) && $unit_id != 0 && !($resource_id == RES_ENERGY && $resource_production >= 0)) {
91 91
           $resource_production = $resource_production * $caps['efficiency'];
92 92
         }
93 93
       }
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
     $caps['total'][$resource_id] = $caps['total'][$resource_id] >= 0 ? floor($caps['total'][$resource_id]) : ceil($caps['total'][$resource_id]);
97 97
   }
98 98
 
99
-  foreach($caps['storage'] as $resource_id => &$resource_data) {
99
+  foreach ($caps['storage'] as $resource_id => &$resource_data) {
100 100
     $caps['total_storage'][$resource_id] = array_sum($resource_data);
101 101
   }
102 102
 
Please login to merge, or discard this patch.