| @@ -15,10 +15,10 @@ discard block | ||
| 15 | 15 | // classSupernova::$db->sn_db_connect(); | 
| 16 | 16 |    if (!(strpos($query, '{{') === false)) { | 
| 17 | 17 |      foreach ($update_tables as $tableName => $cork) { | 
| 18 | -      $query = str_replace("{{{$tableName}}}", classSupernova::$db->db_prefix . $tableName, $query); | |
| 18 | +      $query = str_replace("{{{$tableName}}}", classSupernova::$db->db_prefix.$tableName, $query); | |
| 19 | 19 | } | 
| 20 | 20 | } | 
| 21 | -  !($result = classSupernova::$db->db_sql_query($query)) ? die('Query error for ' . $query . ': ' . classSupernova::$db->db_error()) : false; | |
| 21 | +  !($result = classSupernova::$db->db_sql_query($query)) ? die('Query error for '.$query.': '.classSupernova::$db->db_error()) : false; | |
| 22 | 22 | |
| 23 | 23 | return $result; | 
| 24 | 24 | } | 
| @@ -85,7 +85,7 @@ discard block | ||
| 85 | 85 | global $update_tables, $update_indexes, $update_indexes_full, $update_foreigns; | 
| 86 | 86 | |
| 87 | 87 | $tableName = $prefixed ? str_replace(classSupernova::$config->db_prefix, '', $prefix_table_name) : $prefix_table_name; | 
| 88 | - $prefix_table_name = $prefixed ? $prefix_table_name : classSupernova::$config->db_prefix . $prefix_table_name; | |
| 88 | + $prefix_table_name = $prefixed ? $prefix_table_name : classSupernova::$config->db_prefix.$prefix_table_name; | |
| 89 | 89 | |
| 90 | 90 | upd_unset_table_info($tableName); | 
| 91 | 91 | |
| @@ -100,7 +100,7 @@ discard block | ||
| 100 | 100 | $update_indexes_full[$tableName][$r1['Key_name']][$r1['Column_name']] = $r1; | 
| 101 | 101 | } | 
| 102 | 102 | |
| 103 | -  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name) . "' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true); | |
| 103 | +  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '".db_escape(classSupernova::$db_name)."' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true); | |
| 104 | 104 |    while ($r1 = db_fetch($q1)) { | 
| 105 | 105 | $table_referenced = str_replace(classSupernova::$config->db_prefix, '', $r1['REFERENCED_TABLE_NAME']); | 
| 106 | 106 | |
| @@ -160,7 +160,7 @@ discard block | ||
| 160 | 160 |      $result = upd_do_query("CREATE TABLE IF NOT EXISTS `{$db_prefix}{$table_name}` {$declaration}"); | 
| 161 | 161 | $error = classSupernova::$db->db_error(); | 
| 162 | 162 |      if ($error) { | 
| 163 | -      die("Creating error for table `{$table_name}`: {$error}<br />" . dump($declaration)); | |
| 163 | +      die("Creating error for table `{$table_name}`: {$error}<br />".dump($declaration)); | |
| 164 | 164 | } | 
| 165 | 165 |      upd_do_query('set foreign_key_checks = 1;', true); | 
| 166 | 166 | upd_load_table_info($table_name, false); | 
| @@ -7,8 +7,8 @@ discard block | ||
| 7 | 7 | |
| 8 | 8 |  function que_get_unit_que($unit_id) { | 
| 9 | 9 | $que_type = false; | 
| 10 | -  foreach(sn_get_groups('ques') as $que_id => $que_data) { | |
| 11 | -    if(in_array($unit_id, $que_data['unit_list'])) { | |
| 10 | +  foreach (sn_get_groups('ques') as $que_id => $que_data) { | |
| 11 | +    if (in_array($unit_id, $que_data['unit_list'])) { | |
| 12 | 12 | $que_type = $que_id; | 
| 13 | 13 | break; | 
| 14 | 14 | } | 
| @@ -19,14 +19,14 @@ discard block | ||
| 19 | 19 | |
| 20 | 20 | |
| 21 | 21 |  function que_get_max_que_length($user, $planet, $que_id, $que_data = null) { | 
| 22 | -  if(empty($que_data)) { | |
| 22 | +  if (empty($que_data)) { | |
| 23 | 23 |      $que_data = sn_get_groups('ques'); | 
| 24 | 24 | $que_data = $que_data[$que_id]; | 
| 25 | 25 | } | 
| 26 | 26 | |
| 27 | 27 | |
| 28 | 28 | $que_length = 1; | 
| 29 | -  switch($que_id) { | |
| 29 | +  switch ($que_id) { | |
| 30 | 30 | case QUE_RESEARCH: | 
| 31 | 31 | $que_length = classSupernova::$config->server_que_length_research + mrc_get_level($user, null, UNIT_PREMIUM); // TODO - вынести в модуль | 
| 32 | 32 | break; | 
| @@ -40,8 +40,8 @@ discard block | ||
| 40 | 40 | |
| 41 | 41 |  function eco_que_str2arr($que_str) { | 
| 42 | 42 |    $que_arr = explode(';', $que_str); | 
| 43 | -  foreach($que_arr as $que_index => &$que_item) { | |
| 44 | -    if($que_item) { | |
| 43 | +  foreach ($que_arr as $que_index => &$que_item) { | |
| 44 | +    if ($que_item) { | |
| 45 | 45 |        $que_item = explode(',', $que_item); | 
| 46 | 46 |      } else { | 
| 47 | 47 | unset($que_arr[$que_index]); | 
| @@ -52,7 +52,7 @@ discard block | ||
| 52 | 52 | } | 
| 53 | 53 | |
| 54 | 54 |  function eco_que_arr2str($que_arr) { | 
| 55 | -  foreach($que_arr as &$que_item) { | |
| 55 | +  foreach ($que_arr as &$que_item) { | |
| 56 | 56 |      $que_item = implode(',', $que_item); | 
| 57 | 57 | } | 
| 58 | 58 | |
| @@ -64,28 +64,28 @@ discard block | ||
| 64 | 64 | $classLocale = classLocale::$lang; | 
| 65 | 65 | |
| 66 | 66 | $is_autoconvert = false; | 
| 67 | -  if($build_mode == BUILD_AUTOCONVERT || sys_get_param_int('auto_convert')) { | |
| 67 | +  if ($build_mode == BUILD_AUTOCONVERT || sys_get_param_int('auto_convert')) { | |
| 68 | 68 | $build_mode = BUILD_CREATE; | 
| 69 | 69 | $is_autoconvert = true; | 
| 70 | 70 | } | 
| 71 | 71 | |
| 72 | 72 | $unit_amount_qued = 0; | 
| 73 | 73 |    try { | 
| 74 | -    if(!$user['id']) { | |
| 74 | +    if (!$user['id']) { | |
| 75 | 75 |        throw new exception('{Нет идентификатора пользователя - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION | 
| 76 | 76 | } | 
| 77 | 77 | |
| 78 | 78 |      $unit_id = sys_get_param_int('unit_id'); | 
| 79 | -    if(!$unit_id) { | |
| 79 | +    if (!$unit_id) { | |
| 80 | 80 |        throw new exception('{Нет идентификатора юнита - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION | 
| 81 | 81 | } | 
| 82 | 82 | |
| 83 | 83 | $que_id = que_get_unit_que($unit_id); | 
| 84 | -    if(!$que_id) { | |
| 84 | +    if (!$que_id) { | |
| 85 | 85 |        throw new exception('{Неправильный тип очереди - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION | 
| 86 | 86 | } | 
| 87 | 87 | |
| 88 | -    if($build_mode == BUILD_DESTROY && $que_id != QUE_STRUCTURES) { | |
| 88 | +    if ($build_mode == BUILD_DESTROY && $que_id != QUE_STRUCTURES) { | |
| 89 | 89 |        throw new exception('{Уничтожать можно только здания на планете}', ERR_ERROR); // TODO EXCEPTION | 
| 90 | 90 | } | 
| 91 | 91 | |
| @@ -93,12 +93,12 @@ discard block | ||
| 93 | 93 | $que_data = $que_data[$que_id]; | 
| 94 | 94 | |
| 95 | 95 | // TODO Переделать под подочереди | 
| 96 | -    if($que_id == QUE_STRUCTURES) { | |
| 96 | +    if ($que_id == QUE_STRUCTURES) { | |
| 97 | 97 |        $sn_groups_build_allow = sn_get_groups('build_allow'); | 
| 98 | 98 | $que_data['unit_list'] = $sn_groups_build_allow[$planet['planet_type']]; | 
| 99 | 99 | |
| 100 | -      if(!isset($que_data['unit_list'][$unit_id])) { | |
| 101 | -        throw new exception('{Это здание нельзя строить на ' . ($planet['planet_type'] == PT_PLANET ? 'планете' : 'луне'), ERR_ERROR); // TODO EXCEPTION | |
| 100 | +      if (!isset($que_data['unit_list'][$unit_id])) { | |
| 101 | +        throw new exception('{Это здание нельзя строить на '.($planet['planet_type'] == PT_PLANET ? 'планете' : 'луне'), ERR_ERROR); // TODO EXCEPTION | |
| 102 | 102 | } | 
| 103 | 103 | } | 
| 104 | 104 | // TODO Разделить очереди для Верфи и Обороны | 
| @@ -108,7 +108,7 @@ discard block | ||
| 108 | 108 | // Это нужно, что бы заблокировать пользователя и работу с очередями | 
| 109 | 109 | $user = DBStaticUser::db_user_by_id($user['id']); | 
| 110 | 110 | // Это нужно, что бы заблокировать планету от списания ресурсов | 
| 111 | -    if(isset($planet['id']) && $planet['id']) { | |
| 111 | +    if (isset($planet['id']) && $planet['id']) { | |
| 112 | 112 | $planet = DBStaticPlanet::db_planet_by_id($planet['id'], true); | 
| 113 | 113 |      } else { | 
| 114 | 114 | $planet['id'] = 0; | 
| @@ -120,12 +120,12 @@ discard block | ||
| 120 | 120 | $in_que = &$que['in_que'][$que_id][$user['id']][$planet_id]; | 
| 121 | 121 | $que_max_length = que_get_max_que_length($user, $planet, $que_id, $que_data); | 
| 122 | 122 | // TODO Добавить вызовы функций проверок текущей и максимальной длин очередей | 
| 123 | -    if(count($in_que) >= $que_max_length) { | |
| 123 | +    if (count($in_que) >= $que_max_length) { | |
| 124 | 124 |        throw new exception('{Все слоты очереди заняты}', ERR_ERROR); // TODO EXCEPTION | 
| 125 | 125 | } | 
| 126 | 126 | |
| 127 | 127 | // TODO Отдельно посмотреть на уничтожение зданий - что бы можно было уничтожать их без планов | 
| 128 | -    switch(eco_can_build_unit($user, $planet, $unit_id)) { | |
| 128 | +    switch (eco_can_build_unit($user, $planet, $unit_id)) { | |
| 129 | 129 | case BUILD_ALLOWED: | 
| 130 | 130 | break; | 
| 131 | 131 | case BUILD_UNIT_BUSY: | 
| @@ -133,7 +133,7 @@ discard block | ||
| 133 | 133 | break; // TODO EXCEPTION eco_bld_msg_err_laboratory_upgrading | 
| 134 | 134 | // case BUILD_REQUIRE_NOT_MEET: | 
| 135 | 135 | default: | 
| 136 | -        if($build_mode == BUILD_CREATE) { | |
| 136 | +        if ($build_mode == BUILD_CREATE) { | |
| 137 | 137 |            throw new exception('{Требования не удовлетворены}', ERR_ERROR); | 
| 138 | 138 | } | 
| 139 | 139 | break; // TODO EXCEPTION eco_bld_msg_err_requirements_not_meet | 
| @@ -143,33 +143,33 @@ discard block | ||
| 143 | 143 | $unit_amount_qued = $unit_amount; | 
| 144 | 144 | $units_qued = isset($in_que[$unit_id]) ? $in_que[$unit_id] : 0; | 
| 145 | 145 | $unit_level = mrc_get_level($user, $planet, $unit_id, true, true) + $units_qued; | 
| 146 | -    if($unit_max = get_unit_param($unit_id, P_MAX_STACK)) { | |
| 147 | -      if($unit_level >= $unit_max) { | |
| 146 | +    if ($unit_max = get_unit_param($unit_id, P_MAX_STACK)) { | |
| 147 | +      if ($unit_level >= $unit_max) { | |
| 148 | 148 |          throw new exception('{Максимальное количество юнитов данного типа уже достигнуто или будет достигнуто по окончанию очереди}', ERR_ERROR); // TODO EXCEPTION | 
| 149 | 149 | } | 
| 150 | 150 | $unit_amount = max(0, min($unit_amount, $unit_max - $unit_level)); | 
| 151 | 151 | } | 
| 152 | 152 | |
| 153 | -    if($unit_amount < 1) { | |
| 153 | +    if ($unit_amount < 1) { | |
| 154 | 154 |        throw new exception('{Неправильное количество юнитов - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION | 
| 155 | 155 | } | 
| 156 | 156 | |
| 157 | 157 | // TODO Переделать eco_unit_busy для всех типов зданий | 
| 158 | -    if(get_unit_param($unit_id, P_STACKABLE)) { | |
| 158 | +    if (get_unit_param($unit_id, P_STACKABLE)) { | |
| 159 | 159 | // TODO Поле 'max_Lot_size' для ограничения размера стэка в очереди - то ли в юниты, то ли в очередь | 
| 160 | -      if(in_array($unit_id, $group_missile = sn_get_groups(GROUP_STR_MISSILES))) { | |
| 160 | +      if (in_array($unit_id, $group_missile = sn_get_groups(GROUP_STR_MISSILES))) { | |
| 161 | 161 | // TODO Поле 'container' - указывает на родительску структуру, в которой хранится данный юнит и по вместительности которой нужно применять размер юнита | 
| 162 | 162 | $used_silo = 0; | 
| 163 | -        foreach($group_missile as $missile_id) { | |
| 163 | +        foreach ($group_missile as $missile_id) { | |
| 164 | 164 | $missile_qued = isset($in_que[$missile_id]) ? $in_que[$missile_id] : 0; | 
| 165 | 165 | $used_silo += (mrc_get_level($user, $planet, $missile_id, true, true) + $missile_qued) * get_unit_param($missile_id, P_UNIT_SIZE); | 
| 166 | 166 | } | 
| 167 | 167 | $free_silo = mrc_get_level($user, $planet, STRUC_SILO) * get_unit_param(STRUC_SILO, P_CAPACITY) - $used_silo; | 
| 168 | -        if($free_silo <= 0) { | |
| 168 | +        if ($free_silo <= 0) { | |
| 169 | 169 |            throw new exception('{Ракетная шахта уже заполнена или будет заполнена по окончанию очереди}', ERR_ERROR); // TODO EXCEPTION | 
| 170 | 170 | } | 
| 171 | 171 | $unit_size = get_unit_param($unit_id, P_UNIT_SIZE); | 
| 172 | -        if($free_silo < $unit_size) { | |
| 172 | +        if ($free_silo < $unit_size) { | |
| 173 | 173 |            throw new exception("{В ракетной шахте нет места для {$classLocale['tech'][$unit_id]}}", ERR_ERROR); // TODO EXCEPTION | 
| 174 | 174 | } | 
| 175 | 175 | $unit_amount = max(0, min($unit_amount, floor($free_silo / $unit_size))); | 
| @@ -177,9 +177,9 @@ discard block | ||
| 177 | 177 | $unit_level = $new_unit_level = 0; | 
| 178 | 178 |      } else { | 
| 179 | 179 | $unit_amount = 1; | 
| 180 | -      if($que_id == QUE_STRUCTURES) { | |
| 180 | +      if ($que_id == QUE_STRUCTURES) { | |
| 181 | 181 | $sectors_qued = is_array($in_que) ? array_sum($in_que) : 0; | 
| 182 | -        if($build_mode == BUILD_CREATE && eco_planet_fields_max($planet) - $planet['field_current'] - $sectors_qued <= 0) { | |
| 182 | +        if ($build_mode == BUILD_CREATE && eco_planet_fields_max($planet) - $planet['field_current'] - $sectors_qued <= 0) { | |
| 183 | 183 |            throw new exception('{Не хватает секторов на планете}', ERR_ERROR); // TODO EXCEPTION | 
| 184 | 184 | } | 
| 185 | 185 | } | 
| @@ -191,10 +191,10 @@ discard block | ||
| 191 | 191 | |
| 192 | 192 | $exchange = array(); | 
| 193 | 193 | $market_get_autoconvert_cost = market_get_autoconvert_cost(); | 
| 194 | -    if($is_autoconvert && $build_data[BUILD_AUTOCONVERT]) { | |
| 194 | +    if ($is_autoconvert && $build_data[BUILD_AUTOCONVERT]) { | |
| 195 | 195 | $dark_matter = mrc_get_level($user, null, RES_DARK_MATTER); | 
| 196 | -      if(mrc_get_level($user, null, RES_DARK_MATTER) < $market_get_autoconvert_cost) { | |
| 197 | -        throw new exception("{Нет хватает " . ($market_get_autoconvert_cost - $dark_matter) . "ТМ на постройки с автоконвертацией ресурсов}", ERR_ERROR); // TODO EXCEPTION | |
| 196 | +      if (mrc_get_level($user, null, RES_DARK_MATTER) < $market_get_autoconvert_cost) { | |
| 197 | +        throw new exception("{Нет хватает ".($market_get_autoconvert_cost - $dark_matter)."ТМ на постройки с автоконвертацией ресурсов}", ERR_ERROR); // TODO EXCEPTION | |
| 198 | 198 | } | 
| 199 | 199 | |
| 200 | 200 | !get_unit_param($unit_id, P_STACKABLE) ? $unit_amount = 1 : false; | 
| @@ -203,7 +203,7 @@ discard block | ||
| 203 | 203 | $resource_exchange_rates = array(); | 
| 204 | 204 | $resource_diff = array(); | 
| 205 | 205 | $all_positive = true; | 
| 206 | -      foreach($resources_loot as $resource_id) { | |
| 206 | +      foreach ($resources_loot as $resource_id) { | |
| 207 | 207 | $resource_db_name = pname_resource_name($resource_id); | 
| 208 | 208 | $resource_got[$resource_id] = floor(mrc_get_level($user, $planet, $resource_id)); | 
| 209 | 209 |          $resource_exchange_rates[$resource_id] = classSupernova::$config->__get("rpg_exchange_{$resource_db_name}"); | 
| @@ -211,15 +211,15 @@ discard block | ||
| 211 | 211 | $all_positive = $all_positive && ($resource_diff[$resource_id] > 0); | 
| 212 | 212 | } | 
| 213 | 213 | // Нужна автоконвертация | 
| 214 | -      if($all_positive) { | |
| 214 | +      if ($all_positive) { | |
| 215 | 215 | $is_autoconvert = false; | 
| 216 | 216 |        } else { | 
| 217 | -        foreach($resource_diff as $resource_diff_id => &$resource_diff_amount) { | |
| 218 | -          if($resource_diff_amount >= 0) { | |
| 217 | +        foreach ($resource_diff as $resource_diff_id => &$resource_diff_amount) { | |
| 218 | +          if ($resource_diff_amount >= 0) { | |
| 219 | 219 | continue; | 
| 220 | 220 | } | 
| 221 | -          foreach($resource_diff as $resource_got_id => &$resource_got_amount) { | |
| 222 | -            if($resource_got_amount <= 0) { | |
| 221 | +          foreach ($resource_diff as $resource_got_id => &$resource_got_amount) { | |
| 222 | +            if ($resource_got_amount <= 0) { | |
| 223 | 223 | continue; | 
| 224 | 224 | } | 
| 225 | 225 | $current_exchange = $resource_exchange_rates[$resource_got_id] / $resource_exchange_rates[$resource_diff_id]; | 
| @@ -235,14 +235,14 @@ discard block | ||
| 235 | 235 | } | 
| 236 | 236 | |
| 237 | 237 | $is_autoconvert_ok = true; | 
| 238 | -        foreach($resource_diff as $resource_diff_amount2) { | |
| 239 | -          if($resource_diff_amount2 < 0) { | |
| 238 | +        foreach ($resource_diff as $resource_diff_amount2) { | |
| 239 | +          if ($resource_diff_amount2 < 0) { | |
| 240 | 240 | $is_autoconvert_ok = false; | 
| 241 | 241 | break; | 
| 242 | 242 | } | 
| 243 | 243 | } | 
| 244 | 244 | |
| 245 | -        if($is_autoconvert_ok) { | |
| 245 | +        if ($is_autoconvert_ok) { | |
| 246 | 246 | $build_data['RESULT'][$build_mode] = BUILD_ALLOWED; | 
| 247 | 247 | $build_data['CAN'][$build_mode] = $unit_amount; | 
| 248 | 248 |          } else { | 
| @@ -251,19 +251,19 @@ discard block | ||
| 251 | 251 | } | 
| 252 | 252 | } | 
| 253 | 253 | $unit_amount = min($build_data['CAN'][$build_mode], $unit_amount); | 
| 254 | -    if($unit_amount <= 0) { | |
| 254 | +    if ($unit_amount <= 0) { | |
| 255 | 255 |        throw new exception('{Не хватает ресурсов}', ERR_ERROR); // TODO EXCEPTION | 
| 256 | 256 | } | 
| 257 | 257 | |
| 258 | -    if($new_unit_level < 0) { | |
| 258 | +    if ($new_unit_level < 0) { | |
| 259 | 259 |        throw new exception('{Нельзя уничтожить больше юнитов, чем есть}', ERR_ERROR); // TODO EXCEPTION | 
| 260 | 260 | } | 
| 261 | 261 | |
| 262 | -    if($build_data['RESULT'][$build_mode] != BUILD_ALLOWED) { | |
| 262 | +    if ($build_data['RESULT'][$build_mode] != BUILD_ALLOWED) { | |
| 263 | 263 |        throw new exception('{Строительство блокировано}', ERR_ERROR); // TODO EXCEPTION | 
| 264 | 264 | } | 
| 265 | 265 | |
| 266 | -    if($is_autoconvert) { | |
| 266 | +    if ($is_autoconvert) { | |
| 267 | 267 | ksort($exchange); | 
| 268 | 268 | ksort($resource_got); | 
| 269 | 269 | db_change_resources( | 
| @@ -282,7 +282,7 @@ discard block | ||
| 282 | 282 | } | 
| 283 | 283 | |
| 284 | 284 | $unit_amount_qued = 0; | 
| 285 | -    while($unit_amount > 0 && count($que['ques'][$que_id][$user['id']][$planet_id]) < $que_max_length) { | |
| 285 | +    while ($unit_amount > 0 && count($que['ques'][$que_id][$user['id']][$planet_id]) < $que_max_length) { | |
| 286 | 286 | $place = min($unit_amount, MAX_FLEET_OR_DEFS_PER_ROW); | 
| 287 | 287 | que_add_unit($unit_id, $user, $planet, $build_data, $new_unit_level, $place, $build_mode); | 
| 288 | 288 | $unit_amount -= $place; | 
| @@ -292,8 +292,8 @@ discard block | ||
| 292 | 292 | |
| 293 | 293 | sn_db_transaction_commit(); | 
| 294 | 294 | |
| 295 | -    if($redirect) { | |
| 296 | -      sys_redirect("{$_SERVER['PHP_SELF']}?mode=" . sys_get_param_str('mode') . "&ally_id=" . sys_get_param_id('ally_id')); | |
| 295 | +    if ($redirect) { | |
| 296 | +      sys_redirect("{$_SERVER['PHP_SELF']}?mode=".sys_get_param_str('mode')."&ally_id=".sys_get_param_id('ally_id')); | |
| 297 | 297 | die(); | 
| 298 | 298 | } | 
| 299 | 299 | |
| @@ -301,7 +301,7 @@ discard block | ||
| 301 | 301 | 'STATUS' => ERR_NONE, | 
| 302 | 302 |        'MESSAGE' => '{Строительство начато}', | 
| 303 | 303 | ); | 
| 304 | -  } catch(Exception $e) { | |
| 304 | +  } catch (Exception $e) { | |
| 305 | 305 | sn_db_transaction_rollback(); | 
| 306 | 306 | $operation_result = array( | 
| 307 | 307 | 'STATUS' => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR, | 
| @@ -309,8 +309,8 @@ discard block | ||
| 309 | 309 | ); | 
| 310 | 310 | } | 
| 311 | 311 | |
| 312 | -  if(!empty($operation_result['MESSAGE'])) { | |
| 313 | - $operation_result['MESSAGE'] .= ' ' . ($unit_amount_qued ? $unit_amount_qued : $unit_amount) . 'x[' . classLocale::$lang['tech'][$unit_id] . ']'; | |
| 312 | +  if (!empty($operation_result['MESSAGE'])) { | |
| 313 | + $operation_result['MESSAGE'] .= ' '.($unit_amount_qued ? $unit_amount_qued : $unit_amount).'x['.classLocale::$lang['tech'][$unit_id].']'; | |
| 314 | 314 | } | 
| 315 | 315 | |
| 316 | 316 | return $operation_result; | 
| @@ -320,11 +320,11 @@ discard block | ||
| 320 | 320 |  function que_recalculate($old_que) { | 
| 321 | 321 | $new_que = array(); | 
| 322 | 322 | |
| 323 | -  if(!is_array($old_que['items'])) { | |
| 323 | +  if (!is_array($old_que['items'])) { | |
| 324 | 324 | return $new_que; | 
| 325 | 325 | } | 
| 326 | -  foreach($old_que['items'] as $row) { | |
| 327 | -    if(!isset($row) || !$row || $row['que_unit_amount'] <= 0) { | |
| 326 | +  foreach ($old_que['items'] as $row) { | |
| 327 | +    if (!isset($row) || !$row || $row['que_unit_amount'] <= 0) { | |
| 328 | 328 | continue; | 
| 329 | 329 | } | 
| 330 | 330 | |
| @@ -335,9 +335,9 @@ discard block | ||
| 335 | 335 | |
| 336 | 336 | $last_id = count($new_que['items']) - 1; | 
| 337 | 337 | |
| 338 | -    if($row['que_planet_id']) { | |
| 338 | +    if ($row['que_planet_id']) { | |
| 339 | 339 | $new_que['planets'][$row['que_planet_id']][$row['que_type']][] = &$new_que['items'][$last_id]; | 
| 340 | -    } elseif($row['que_type'] == QUE_RESEARCH) { | |
| 340 | +    } elseif ($row['que_type'] == QUE_RESEARCH) { | |
| 341 | 341 | $new_que['players'][$row['que_player_id']][$row['que_type']][] = &$new_que['items'][$last_id]; | 
| 342 | 342 | } | 
| 343 | 343 | $new_que['ques'][$row['que_type']][$row['que_player_id']][intval($row['que_planet_id'])][] = &$new_que['items'][$last_id]; | 
| @@ -375,14 +375,14 @@ discard block | ||
| 375 | 375 | $que_type = que_get_unit_que($unit_id); | 
| 376 | 376 | $planet_id_origin = $planet['id'] ? $planet['id'] : 'NULL'; | 
| 377 | 377 | $planet_id = $que_type == QUE_RESEARCH ? 'NULL' : $planet_id_origin; | 
| 378 | -  if(is_numeric($planet_id)) { | |
| 378 | +  if (is_numeric($planet_id)) { | |
| 379 | 379 | DBStaticPlanet::db_planet_update_set_by_id( | 
| 380 | 380 | $planet_id, | 
| 381 | 381 | array( | 
| 382 | 382 | 'que_processed' => SN_TIME_NOW, | 
| 383 | 383 | ) | 
| 384 | 384 | ); | 
| 385 | -  } elseif(is_numeric($user['id'])) { | |
| 385 | +  } elseif (is_numeric($user['id'])) { | |
| 386 | 386 | DBStaticUser::db_user_set_by_id( | 
| 387 | 387 | $user['id'], | 
| 388 | 388 | array( | 
| @@ -417,17 +417,17 @@ discard block | ||
| 417 | 417 | $planet['id'] = $planet['id'] && $que_type !== QUE_RESEARCH ? $planet['id'] : 0; | 
| 418 | 418 | $global_que = que_get($user['id'], $planet['id'], $que_type, true); | 
| 419 | 419 | |
| 420 | -  if(!empty($global_que['ques'][$que_type][$user['id']][$planet['id']])) { | |
| 420 | +  if (!empty($global_que['ques'][$que_type][$user['id']][$planet['id']])) { | |
| 421 | 421 | $que = array_reverse($global_que['ques'][$que_type][$user['id']][$planet['id']]); | 
| 422 | 422 | |
| 423 | -    foreach($que as $que_item) { | |
| 423 | +    foreach ($que as $que_item) { | |
| 424 | 424 | DBStaticQue::db_que_delete_by_id($que_item['que_id']); | 
| 425 | 425 | |
| 426 | -      if($que_item['que_planet_id_origin']) { | |
| 426 | +      if ($que_item['que_planet_id_origin']) { | |
| 427 | 427 | $planet['id'] = $que_item['que_planet_id_origin']; | 
| 428 | 428 | } | 
| 429 | 429 | |
| 430 | -      if(!isset($planets_locked[$planet['id']])) { | |
| 430 | +      if (!isset($planets_locked[$planet['id']])) { | |
| 431 | 431 | $planets_locked[$planet['id']] = $planet['id'] ? DBStaticPlanet::db_planet_by_id($planet['id'], true) : $planet; | 
| 432 | 432 | } | 
| 433 | 433 | |
| @@ -443,19 +443,19 @@ discard block | ||
| 443 | 443 | ) | 
| 444 | 444 | ); | 
| 445 | 445 | |
| 446 | -      if(!$clear) { | |
| 446 | +      if (!$clear) { | |
| 447 | 447 | break; | 
| 448 | 448 | } | 
| 449 | 449 | } | 
| 450 | 450 | |
| 451 | -    if(is_numeric($planet['id'])) { | |
| 451 | +    if (is_numeric($planet['id'])) { | |
| 452 | 452 | DBStaticPlanet::db_planet_update_set_by_id( | 
| 453 | 453 | $planet['id'], | 
| 454 | 454 | array( | 
| 455 | 455 | 'que_processed' => SN_TIME_SQL, | 
| 456 | 456 | ) | 
| 457 | 457 | ); | 
| 458 | -    } elseif(is_numeric($user['id'])) { | |
| 458 | +    } elseif (is_numeric($user['id'])) { | |
| 459 | 459 | DBStaticUser::db_user_set_by_id( | 
| 460 | 460 | $user['id'], | 
| 461 | 461 | array( | 
| @@ -468,7 +468,7 @@ discard block | ||
| 468 | 468 |    } else { | 
| 469 | 469 | sn_db_transaction_rollback(); | 
| 470 | 470 | } | 
| 471 | -  header("Location: {$_SERVER['PHP_SELF']}?mode={$que_type}" . "&ally_id=" . sys_get_param_id('ally_id')); | |
| 471 | +  header("Location: {$_SERVER['PHP_SELF']}?mode={$que_type}"."&ally_id=".sys_get_param_id('ally_id')); | |
| 472 | 472 | } | 
| 473 | 473 | |
| 474 | 474 | |
| @@ -507,21 +507,21 @@ discard block | ||
| 507 | 507 | // TODO: Переделать для $que_type === false | 
| 508 | 508 | $planet['id'] = $planet['id'] ? $planet['id'] : 0; | 
| 509 | 509 | |
| 510 | -  if(!is_array($que)) { | |
| 510 | +  if (!is_array($que)) { | |
| 511 | 511 | $que = que_get($user['id'], $planet['id'], $que_type); | 
| 512 | 512 | } | 
| 513 | 513 | |
| 514 | -  if(is_array($que) && isset($que['items'])) { | |
| 514 | +  if (is_array($que) && isset($que['items'])) { | |
| 515 | 515 | $que = $que['ques'][$que_type][$user['id']][$planet['id']]; | 
| 516 | 516 | } | 
| 517 | 517 | |
| 518 | -  if($que) { | |
| 519 | -    foreach($que as $que_element) { | |
| 518 | +  if ($que) { | |
| 519 | +    foreach ($que as $que_element) { | |
| 520 | 520 |        $template->assign_block_vars('que', que_tpl_parse_element($que_element, $short_names)); | 
| 521 | 521 | } | 
| 522 | 522 | } | 
| 523 | 523 | |
| 524 | -  if($que_type == QUE_RESEARCH) { | |
| 524 | +  if ($que_type == QUE_RESEARCH) { | |
| 525 | 525 | } | 
| 526 | 526 | } | 
| 527 | 527 | |
| @@ -545,7 +545,7 @@ discard block | ||
| 545 | 545 | $user = DBStaticUser::db_user_by_id($user['id'], true); | 
| 546 | 546 | |
| 547 | 547 | $time_left[$user['id']][0] = max(0, $on_time - $user['que_processed']); | 
| 548 | -  if($planet === null && !$time_left[$user['id']][0]) { | |
| 548 | +  if ($planet === null && !$time_left[$user['id']][0]) { | |
| 549 | 549 | return $que; | 
| 550 | 550 | } | 
| 551 | 551 | |
| @@ -553,12 +553,12 @@ discard block | ||
| 553 | 553 | $que_type_id = $planet === null ? QUE_RESEARCH : false; | 
| 554 | 554 | $planet = intval(is_array($planet) ? $planet['id'] : $planet); // В $planet у нас теперь только её ID или шаблон null/0/false | 
| 555 | 555 | $que = que_get($user['id'], $planet, $que_type_id, true); | 
| 556 | -  if(empty($que['items'])) { | |
| 556 | +  if (empty($que['items'])) { | |
| 557 | 557 | return $que; | 
| 558 | 558 | } | 
| 559 | 559 | |
| 560 | 560 | $planet_list = array(); | 
| 561 | -  if($planet !== null) { | |
| 561 | +  if ($planet !== null) { | |
| 562 | 562 | // Если нужно изменять данные на планетах - блокируем планеты и получаем данные о них | 
| 563 | 563 | // TODO - от них не надо ничего, кроме ID и que_processed | 
| 564 | 564 | $planet_row = DBStaticPlanet::db_planet_list_by_user_or_planet($user['id'], $planet); | 
| @@ -567,20 +567,20 @@ discard block | ||
| 567 | 567 | } | 
| 568 | 568 | |
| 569 | 569 | // Теперь в $time_left лежит время обсчета всех очередей по каждой из планеты | 
| 570 | -  if(array_sum($time_left[$user['id']]) == 0) { | |
| 570 | +  if (array_sum($time_left[$user['id']]) == 0) { | |
| 571 | 571 | return $que; | 
| 572 | 572 | } | 
| 573 | 573 | |
| 574 | 574 | $unit_changes = array(); | 
| 575 | -  foreach($que['items'] as &$que_item) { | |
| 575 | +  foreach ($que['items'] as &$que_item) { | |
| 576 | 576 | $que_player_id = &$que_item['que_player_id']; | 
| 577 | 577 | $que_planet_id = intval($que_item['que_planet_id']); | 
| 578 | 578 | |
| 579 | 579 | $que_time_left = &$que['time_left'][$que_player_id][$que_planet_id][$que_item['que_type']]; | 
| 580 | -    if(!isset($que_time_left)) { | |
| 580 | +    if (!isset($que_time_left)) { | |
| 581 | 581 | $que_time_left = $time_left[$que_player_id][$que_planet_id]; | 
| 582 | 582 | } | 
| 583 | -    if($que_time_left <= 0 || $que_item['que_unit_amount'] <= 0) { | |
| 583 | +    if ($que_time_left <= 0 || $que_item['que_unit_amount'] <= 0) { | |
| 584 | 584 | continue; | 
| 585 | 585 | } | 
| 586 | 586 | // Дальше мы идем, если только осталось время в очереди И юниты к постройке | 
| @@ -593,7 +593,7 @@ discard block | ||
| 593 | 593 | // Теперь работаем с остатком времени на юните. Оно не может быть равно или меньше нуля | 
| 594 | 594 | |
| 595 | 595 | // Если времени в очереди осталось не меньше, чем время текущего юнита - значит мы достроили юнит | 
| 596 | -    if($que_time_left >= $que_item['que_time_left']) { | |
| 596 | +    if ($que_time_left >= $que_item['que_time_left']) { | |
| 597 | 597 | // Увеличиваем количество отстроенных юнитов | 
| 598 | 598 | $unit_processed++; | 
| 599 | 599 | // Вычитаем из времени очереди потраченное на постройку время | 
| @@ -606,12 +606,12 @@ discard block | ||
| 606 | 606 | $que_item['que_unit_amount'] -= $unit_processed; | 
| 607 | 607 | |
| 608 | 608 | // Если еще остались юниты - значит ВСЁ оставшееся время приходится на достройку следующего юнита | 
| 609 | -    if($que_item['que_unit_amount'] > 0) { | |
| 609 | +    if ($que_item['que_unit_amount'] > 0) { | |
| 610 | 610 | $que_item['que_time_left'] = $que_item['que_time_left'] - $que_time_left; | 
| 611 | 611 | $que_time_left = 0; | 
| 612 | 612 | } | 
| 613 | 613 | |
| 614 | -    if($que_item['que_unit_amount'] <= 0) { | |
| 614 | +    if ($que_item['que_unit_amount'] <= 0) { | |
| 615 | 615 | DBStaticQue::db_que_delete_by_id($que_item['que_id']); | 
| 616 | 616 |      } else { | 
| 617 | 617 | classSupernova::$gc->cacheOperator->db_upd_record_by_id( | 
| @@ -626,15 +626,15 @@ discard block | ||
| 626 | 626 | ); | 
| 627 | 627 | } | 
| 628 | 628 | |
| 629 | -    if($unit_processed) { | |
| 629 | +    if ($unit_processed) { | |
| 630 | 630 | $unit_processed_delta = $unit_processed * ($que_item['que_unit_mode'] == BUILD_CREATE ? 1 : -1); | 
| 631 | 631 | $unit_changes[$que_player_id][$que_planet_id][$que_item['que_unit_id']] += $unit_processed_delta; | 
| 632 | 632 | } | 
| 633 | 633 | } | 
| 634 | 634 | |
| 635 | -  foreach($time_left as $player_id => $planet_data) { | |
| 636 | -    foreach($planet_data as $planet_id => $time_on_planet) { | |
| 637 | -      if($planet_id) { | |
| 635 | +  foreach ($time_left as $player_id => $planet_data) { | |
| 636 | +    foreach ($planet_data as $planet_id => $time_on_planet) { | |
| 637 | +      if ($planet_id) { | |
| 638 | 638 | // update planet | 
| 639 | 639 | classSupernova::$gc->cacheOperator->db_upd_record_by_id( | 
| 640 | 640 | LOC_PLANET, | 
| @@ -656,8 +656,8 @@ discard block | ||
| 656 | 656 | ); | 
| 657 | 657 | } | 
| 658 | 658 | |
| 659 | -      if(is_array($unit_changes[$player_id][$planet_id])) { | |
| 660 | -        foreach($unit_changes[$player_id][$planet_id] as $unit_id => $unit_amount) { | |
| 659 | +      if (is_array($unit_changes[$player_id][$planet_id])) { | |
| 660 | +        foreach ($unit_changes[$player_id][$planet_id] as $unit_id => $unit_amount) { | |
| 661 | 661 | DBStaticUnit::dbUpdateOrInsertUnit($unit_id, $unit_amount, $user, $planet_id ? $planet_id : null); | 
| 662 | 662 | } | 
| 663 | 663 | } | 
| @@ -667,38 +667,38 @@ discard block | ||
| 667 | 667 | $que = que_recalculate($que); | 
| 668 | 668 | |
| 669 | 669 | // TODO: Re-enable quests for Alliances | 
| 670 | -  if(!empty($unit_changes) && !$user['user_as_ally']) { | |
| 670 | +  if (!empty($unit_changes) && !$user['user_as_ally']) { | |
| 671 | 671 | $quest_list = qst_get_quests($user['id']); | 
| 672 | 672 | $quest_triggers = qst_active_triggers($quest_list); | 
| 673 | 673 | $quest_rewards = array(); | 
| 674 | 674 | |
| 675 | 675 | |
| 676 | 676 | $xp_incoming = array(); | 
| 677 | -    foreach($unit_changes as $user_id => $planet_changes) { | |
| 678 | -      foreach($planet_changes as $planet_id => $changes) { | |
| 677 | +    foreach ($unit_changes as $user_id => $planet_changes) { | |
| 678 | +      foreach ($planet_changes as $planet_id => $changes) { | |
| 679 | 679 | $planet_this = $planet_id ? classSupernova::$gc->cacheOperator->db_get_record_by_id(LOC_PLANET, $planet_id) : array(); | 
| 680 | -        foreach($changes as $unit_id => $unit_value) { | |
| 680 | +        foreach ($changes as $unit_id => $unit_value) { | |
| 681 | 681 | $que_id = que_get_unit_que($unit_id); | 
| 682 | 682 | $unit_level_new = mrc_get_level($user, $planet_this, $unit_id, false, true) + $unit_value; | 
| 683 | -          if($que_id == QUE_STRUCTURES || $que_id == QUE_RESEARCH) { | |
| 683 | +          if ($que_id == QUE_STRUCTURES || $que_id == QUE_RESEARCH) { | |
| 684 | 684 | $build_data = eco_get_build_data($user, $planet_this, $unit_id, $unit_level_new - 1); | 
| 685 | 685 | $build_data = $build_data[BUILD_CREATE]; | 
| 686 | -            foreach(sn_get_groups('resources_loot') as $resource_id) { | |
| 686 | +            foreach (sn_get_groups('resources_loot') as $resource_id) { | |
| 687 | 687 | $xp_incoming[$que_id] += $build_data[$resource_id]; // TODO - добавить конверсию рейтов обмена | 
| 688 | 688 | } | 
| 689 | 689 | } | 
| 690 | 690 | |
| 691 | -          if(is_array($quest_triggers)) { | |
| 691 | +          if (is_array($quest_triggers)) { | |
| 692 | 692 | // TODO: Check mutiply condition quests | 
| 693 | 693 | $quest_trigger_list = array_keys($quest_triggers, $unit_id); | 
| 694 | -            if(is_array($quest_trigger_list)) { | |
| 695 | -              foreach($quest_trigger_list as $quest_id) { | |
| 694 | +            if (is_array($quest_trigger_list)) { | |
| 695 | +              foreach ($quest_trigger_list as $quest_id) { | |
| 696 | 696 | $quest_unit_level = $unit_level_new; | 
| 697 | -                if(get_unit_param($unit_id, P_UNIT_TYPE) == UNIT_SHIPS) { | |
| 697 | +                if (get_unit_param($unit_id, P_UNIT_TYPE) == UNIT_SHIPS) { | |
| 698 | 698 | $quest_unit_level = DBStaticUnit::db_unit_count_by_user_and_type_and_snid($user_id, 0, $unit_id); | 
| 699 | 699 | $quest_unit_level = $quest_unit_level[$unit_id]['qty']; | 
| 700 | 700 | } | 
| 701 | -                if($quest_list[$quest_id]['quest_status_status'] != QUEST_STATUS_COMPLETE && $quest_list[$quest_id]['quest_unit_amount'] <= $quest_unit_level) { | |
| 701 | +                if ($quest_list[$quest_id]['quest_status_status'] != QUEST_STATUS_COMPLETE && $quest_list[$quest_id]['quest_unit_amount'] <= $quest_unit_level) { | |
| 702 | 702 | $quest_rewards[$quest_id][$user_id][$planet_id] = $quest_list[$quest_id]['quest_rewards_list']; | 
| 703 | 703 | $quest_list[$quest_id]['quest_status_status'] = QUEST_STATUS_COMPLETE; | 
| 704 | 704 | } | 
| @@ -711,7 +711,7 @@ discard block | ||
| 711 | 711 | // TODO: Изменить начисление награды за квесты на ту планету, на которой происходил ресеч | 
| 712 | 712 | qst_reward($user, $quest_rewards, $quest_list); | 
| 713 | 713 | |
| 714 | -    foreach($xp_incoming as $que_id => $xp) { | |
| 714 | +    foreach ($xp_incoming as $que_id => $xp) { | |
| 715 | 715 | rpg_level_up($user, $que_id == QUE_RESEARCH ? RPG_TECH : RPG_STRUCTURE, $xp / 1000); | 
| 716 | 716 | } | 
| 717 | 717 | } |