@@ -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 | } |
@@ -165,7 +165,7 @@ |
||
| 165 | 165 | if($query_add) { |
| 166 | 166 | $query_add = "IN ({$query_add})"; |
| 167 | 167 | if($message_range == 'unchecked') { |
| 168 | - $query_add = "NOT {$query_add}"; |
|
| 168 | + $query_add = "not {$query_add}"; |
|
| 169 | 169 | } |
| 170 | 170 | $query_add = " AND `message_id` {$query_add}"; |
| 171 | 171 | } |
@@ -76,7 +76,7 @@ |
||
| 76 | 76 | |
| 77 | 77 | $result = array(); |
| 78 | 78 | $transaction_id = classSupernova::db_transaction_check(false) ? classSupernova::$transaction_id : classSupernova::$transaction_id++; |
| 79 | - $result[] = "tID {$transaction_id}"; |
|
| 79 | + $result[] = "tid {$transaction_id}"; |
|
| 80 | 80 | foreach($backtrace as $a_trace) { |
| 81 | 81 | if(in_array($a_trace['function'], $exclude_functions)) { |
| 82 | 82 | continue; |
@@ -283,7 +283,7 @@ |
||
| 283 | 283 | */ |
| 284 | 284 | function sys_get_param($param_name, $default = '') |
| 285 | 285 | { |
| 286 | - return $_POST[$param_name] !== NULL ? $_POST[$param_name] : ($_GET[$param_name] !== NULL ? $_GET[$param_name] : $default); |
|
| 286 | + return $_POST[$param_name] !== null ? $_POST[$param_name] : ($_GET[$param_name] !== null ? $_GET[$param_name] : $default); |
|
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | function sys_get_param_id($param_name, $default = 0) |
@@ -89,18 +89,18 @@ discard block |
||
| 89 | 89 | case 0: |
| 90 | 90 | $fleet['event_time'] = $fleet['fleet_start_time']; |
| 91 | 91 | $is_this_planet = ( |
| 92 | - ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) AND |
|
| 93 | - ($planetrow['system'] == $fleet['fleet_end_system']) AND |
|
| 94 | - ($planetrow['planet'] == $fleet['fleet_end_planet']) AND |
|
| 92 | + ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) and |
|
| 93 | + ($planetrow['system'] == $fleet['fleet_end_system']) and |
|
| 94 | + ($planetrow['planet'] == $fleet['fleet_end_planet']) and |
|
| 95 | 95 | ($planetrow['planet_type'] == $planet_end_type)); |
| 96 | 96 | break; |
| 97 | 97 | |
| 98 | 98 | case 1: |
| 99 | 99 | $fleet['event_time'] = $fleet['fleet_end_stay']; |
| 100 | 100 | $is_this_planet = ( |
| 101 | - ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) AND |
|
| 102 | - ($planetrow['system'] == $fleet['fleet_end_system']) AND |
|
| 103 | - ($planetrow['planet'] == $fleet['fleet_end_planet']) AND |
|
| 101 | + ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) and |
|
| 102 | + ($planetrow['system'] == $fleet['fleet_end_system']) and |
|
| 103 | + ($planetrow['planet'] == $fleet['fleet_end_planet']) and |
|
| 104 | 104 | ($planetrow['planet_type'] == $planet_end_type)); |
| 105 | 105 | break; |
| 106 | 106 | |
@@ -108,9 +108,9 @@ discard block |
||
| 108 | 108 | case 3: |
| 109 | 109 | $fleet['event_time'] = $fleet['fleet_end_time']; |
| 110 | 110 | $is_this_planet = ( |
| 111 | - ($planetrow['galaxy'] == $fleet['fleet_start_galaxy']) AND |
|
| 112 | - ($planetrow['system'] == $fleet['fleet_start_system']) AND |
|
| 113 | - ($planetrow['planet'] == $fleet['fleet_start_planet']) AND |
|
| 111 | + ($planetrow['galaxy'] == $fleet['fleet_start_galaxy']) and |
|
| 112 | + ($planetrow['system'] == $fleet['fleet_start_system']) and |
|
| 113 | + ($planetrow['planet'] == $fleet['fleet_start_planet']) and |
|
| 114 | 114 | ($planetrow['planet_type'] == $fleet['fleet_start_type'])); |
| 115 | 115 | break; |
| 116 | 116 | |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | } |
| 59 | 59 | else |
| 60 | 60 | { |
| 61 | - if (($destination_planet["debris_metal"] > $RecyclerCapacity / 2) AND |
|
| 61 | + if (($destination_planet["debris_metal"] > $RecyclerCapacity / 2) and |
|
| 62 | 62 | ($destination_planet["debris_crystal"] > $RecyclerCapacity / 2)) |
| 63 | 63 | { |
| 64 | 64 | $RecycledGoods["metal"] = $RecyclerCapacity / 2; |
@@ -170,7 +170,7 @@ |
||
| 170 | 170 | |
| 171 | 171 | function upd_db_unit_by_location($user_id = 0, $location_type, $location_id, $unit_snid = 0, $for_update = false, $fields = '*') { |
| 172 | 172 | return db_fetch(upd_do_query( |
| 173 | - "SELECT {$fields} |
|
| 173 | + "select {$fields} |
|
| 174 | 174 | FROM {{unit}} |
| 175 | 175 | WHERE |
| 176 | 176 | `unit_location_type` = {$location_type} AND `unit_location_id` = {$location_id} AND " . DBStaticUnit::db_unit_time_restrictions() . |
@@ -4,6 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | // header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found"); |
| 6 | 6 | // @header("{$serverProtocol} 200 OK"); |
| 7 | -echo "File {$redirectFrom} not found on server. Contact administration if you think that this is error"; |
|
| 7 | +echo "file {$redirectFrom} not found on server. Contact administration if you think that this is error"; |
|
| 8 | 8 | die(); |
| 9 | 9 | ?> */ |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | $this->db_saveItem(array_combine(array_keys($this->defaults), array_fill(0, count($this->defaults), null))); |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | - public function db_saveItem($item_list, $value = NULL) { |
|
| 94 | + public function db_saveItem($item_list, $value = null) { |
|
| 95 | 95 | if(empty($item_list)) { |
| 96 | 96 | return; |
| 97 | 97 | } |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | $qry = array(); |
| 103 | 103 | foreach($item_list as $item_name => $item_value) { |
| 104 | 104 | if($item_name) { |
| 105 | - $item_value = db_escape($item_value === NULL ? $this->$item_name : $item_value); |
|
| 105 | + $item_value = db_escape($item_value === null ? $this->$item_name : $item_value); |
|
| 106 | 106 | $item_name = db_escape($item_name); |
| 107 | 107 | $qry[] = "('{$item_name}', '{$item_value}')"; |
| 108 | 108 | } |