| @@ -87,18 +87,18 @@ discard block | ||
| 87 | 87 | case 0: | 
| 88 | 88 | $objFleet->event_time = $objFleet->time_arrive_to_target; | 
| 89 | 89 | $is_this_planet = ( | 
| 90 | - ($planetrow['galaxy'] == $objFleet->fleet_end_galaxy) AND | |
| 91 | - ($planetrow['system'] == $objFleet->fleet_end_system) AND | |
| 92 | - ($planetrow['planet'] == $objFleet->fleet_end_planet) AND | |
| 90 | + ($planetrow['galaxy'] == $objFleet->fleet_end_galaxy) and | |
| 91 | + ($planetrow['system'] == $objFleet->fleet_end_system) and | |
| 92 | + ($planetrow['planet'] == $objFleet->fleet_end_planet) and | |
| 93 | 93 | ($planetrow['planet_type'] == $planet_end_type)); | 
| 94 | 94 | break; | 
| 95 | 95 | |
| 96 | 96 | case 1: | 
| 97 | 97 | $objFleet->event_time = $objFleet->time_mission_job_complete; | 
| 98 | 98 | $is_this_planet = ( | 
| 99 | - ($planetrow['galaxy'] == $objFleet->fleet_end_galaxy) AND | |
| 100 | - ($planetrow['system'] == $objFleet->fleet_end_system) AND | |
| 101 | - ($planetrow['planet'] == $objFleet->fleet_end_planet) AND | |
| 99 | + ($planetrow['galaxy'] == $objFleet->fleet_end_galaxy) and | |
| 100 | + ($planetrow['system'] == $objFleet->fleet_end_system) and | |
| 101 | + ($planetrow['planet'] == $objFleet->fleet_end_planet) and | |
| 102 | 102 | ($planetrow['planet_type'] == $planet_end_type)); | 
| 103 | 103 | break; | 
| 104 | 104 | |
| @@ -106,9 +106,9 @@ discard block | ||
| 106 | 106 | case 3: | 
| 107 | 107 | $objFleet->event_time = $objFleet->time_return_to_source; | 
| 108 | 108 | $is_this_planet = ( | 
| 109 | - ($planetrow['galaxy'] == $objFleet->fleet_start_galaxy) AND | |
| 110 | - ($planetrow['system'] == $objFleet->fleet_start_system) AND | |
| 111 | - ($planetrow['planet'] == $objFleet->fleet_start_planet) AND | |
| 109 | + ($planetrow['galaxy'] == $objFleet->fleet_start_galaxy) and | |
| 110 | + ($planetrow['system'] == $objFleet->fleet_start_system) and | |
| 111 | + ($planetrow['planet'] == $objFleet->fleet_start_planet) and | |
| 112 | 112 | ($planetrow['planet_type'] == $objFleet->fleet_start_type)); | 
| 113 | 113 | break; | 
| 114 | 114 | |
| @@ -157,7 +157,7 @@ | ||
| 157 | 157 | * @return array|bool|mysqli_result|null | 
| 158 | 158 | */ | 
| 159 | 159 |    public static function db_chat_player_get($player_id, $fields) { | 
| 160 | -    return classSupernova::$db->doSelectFetchArray("SELECT {$fields} FROM {{chat_player}} WHERE `chat_player_player_id` = {$player_id} LIMIT 1"); | |
| 160 | +    return classSupernova::$db->doSelectFetchArray("select {$fields} FROM {{chat_player}} WHERE `chat_player_player_id` = {$player_id} LIMIT 1"); | |
| 161 | 161 | } | 
| 162 | 162 | |
| 163 | 163 | |
| @@ -91,7 +91,7 @@ | ||
| 91 | 91 | |
| 92 | 92 | $result = array(); | 
| 93 | 93 | $transaction_id = classSupernova::$db->getTransaction()->getNextQueryTransactionId(); | 
| 94 | -    $result[] = "tID {$transaction_id}"; | |
| 94 | +    $result[] = "tid {$transaction_id}"; | |
| 95 | 95 |      foreach($backtrace as $a_trace) { | 
| 96 | 96 |        if(in_array($a_trace['function'], $exclude_functions)) { | 
| 97 | 97 | continue; | 
| @@ -586,7 +586,7 @@ discard block | ||
| 586 | 586 | // Search array to get correct position | 
| 587 | 587 | list($search_key, $search_value) = @each($key); | 
| 588 | 588 | |
| 589 | - $key = NULL; | |
| 589 | + $key = null; | |
| 590 | 590 | foreach ($this->_tpldata[$blockname] as $i => $val_ary) | 
| 591 | 591 |        { | 
| 592 | 592 | if ($val_ary[$search_key] === $search_value) | 
| @@ -597,7 +597,7 @@ discard block | ||
| 597 | 597 | } | 
| 598 | 598 | |
| 599 | 599 | // key/value pair not found | 
| 600 | - if ($key === NULL) | |
| 600 | + if ($key === null) | |
| 601 | 601 |        { | 
| 602 | 602 | return false; | 
| 603 | 603 | } | 
| @@ -232,7 +232,7 @@ | ||
| 232 | 232 |    public function ube_calculate_attack_results(UBE $ube) { | 
| 233 | 233 | // Каждый флот атакует все | 
| 234 | 234 |      foreach($this->_container as $attack_fleet_data) { | 
| 235 | -      defined('DEBUG_UBE') ? print("Fleet {$attack_fleet_data->db_id} attacks<br /><div style='margin-left: 30px;'>") : false; | |
| 235 | +      defined('DEBUG_UBE') ? print("fleet {$attack_fleet_data->db_id} attacks<br /><div style='margin-left: 30px;'>") : false; | |
| 236 | 236 | |
| 237 | 237 | $attack_fleet_data->attack_fleets($this, $ube->is_simulator); | 
| 238 | 238 | |
| @@ -183,7 +183,7 @@ | ||
| 183 | 183 | |
| 184 | 184 |      for($round = 1; $round <= 10; $round++) { | 
| 185 | 185 | // Проводим раунд | 
| 186 | -      defined('DEBUG_UBE') ? print("Round {$round}<br>") : false; | |
| 186 | +      defined('DEBUG_UBE') ? print("round {$round}<br>") : false; | |
| 187 | 187 | |
| 188 | 188 | $this->fleet_list->ube_calculate_attack_results($this); | 
| 189 | 189 | |