@@ -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 | } |
@@ -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 | |
@@ -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 | ?> */ |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | $this->Field = isset($mySqlDescription['Field']) ? $mySqlDescription['Field'] : null; |
| 30 | 30 | $this->Type = isset($mySqlDescription['Type']) ? $mySqlDescription['Type'] : null; |
| 31 | 31 | $this->Collation = isset($mySqlDescription['Collation']) ? $mySqlDescription['Collation'] : null; |
| 32 | - $this->Null = isset($mySqlDescription['Null']) ? $mySqlDescription['Null'] : null; |
|
| 32 | + $this->null = isset($mySqlDescription['Null']) ? $mySqlDescription['Null'] : null; |
|
| 33 | 33 | $this->Key = isset($mySqlDescription['Key']) ? $mySqlDescription['Key'] : null; |
| 34 | 34 | $this->Default = isset($mySqlDescription['Default']) ? $mySqlDescription['Default'] : null; |
| 35 | 35 | $this->Extra = isset($mySqlDescription['Extra']) ? $mySqlDescription['Extra'] : null; |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | $this->Collation = isset($indexField['Collation']) ? $indexField['Collation'] : null; |
| 28 | 28 | $this->Cardinality = isset($indexField['Cardinality']) ? $indexField['Cardinality'] : null; |
| 29 | 29 | $this->Sub_part = isset($indexField['Sub_part']) ? $indexField['Sub_part'] : null; |
| 30 | - $this->Null = isset($indexField['Null']) ? $indexField['Null'] : null; |
|
| 30 | + $this->null = isset($indexField['Null']) ? $indexField['Null'] : null; |
|
| 31 | 31 | $this->Expression = isset($indexField['Expression']) ? $indexField['Expression'] : null; |
| 32 | 32 | |
| 33 | 33 | return $this; |
@@ -153,7 +153,7 @@ |
||
| 153 | 153 | |
| 154 | 154 | |
| 155 | 155 | // If this field is not null and default value is not set - then this field is mandatory |
| 156 | - if ($fieldDescription->Null === 'NO' && $fieldDescription->Default === null && !$nonMandatory) { |
|
| 156 | + if ($fieldDescription->null === 'NO' && $fieldDescription->Default === null && !$nonMandatory) { |
|
| 157 | 157 | $this->mandatory = true; |
| 158 | 158 | } |
| 159 | 159 | |
@@ -586,10 +586,10 @@ |
||
| 586 | 586 | protected function sn_chat_advanced_get_chat_player_record($player_id, $fields = '*', $return_data = true) { |
| 587 | 587 | $result = false; |
| 588 | 588 | if($player_id) { |
| 589 | - if(!($result = doquery("SELECT {$fields} FROM {{chat_player}} WHERE `chat_player_player_id` = {$player_id} LIMIT 1", true))) { |
|
| 589 | + if(!($result = doquery("select {$fields} FROM {{chat_player}} WHERE `chat_player_player_id` = {$player_id} LIMIT 1", true))) { |
|
| 590 | 590 | doquery("INSERT INTO {{chat_player}} SET `chat_player_player_id` = {$player_id}"); |
| 591 | 591 | if($return_data) { |
| 592 | - $result = doquery("SELECT {$fields} FROM {{chat_player}} WHERE `chat_player_player_id` = {$player_id} LIMIT 1", true); |
|
| 592 | + $result = doquery("select {$fields} FROM {{chat_player}} WHERE `chat_player_player_id` = {$player_id} LIMIT 1", true); |
|
| 593 | 593 | } |
| 594 | 594 | } |
| 595 | 595 | } |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | $this->db_saveItem(array_combine(array_keys($this->defaults), array_fill(0, count($this->defaults), null))); |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - public function db_saveItem($item_list, $value = NULL) { |
|
| 95 | + public function db_saveItem($item_list, $value = null) { |
|
| 96 | 96 | if(empty($item_list)) { |
| 97 | 97 | return; |
| 98 | 98 | } |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | $qry = array(); |
| 104 | 104 | foreach($item_list as $item_name => $item_value) { |
| 105 | 105 | if($item_name) { |
| 106 | - $item_value = SN::$db->db_escape($item_value === NULL ? $this->$item_name : $item_value); |
|
| 106 | + $item_value = SN::$db->db_escape($item_value === null ? $this->$item_name : $item_value); |
|
| 107 | 107 | $item_name = SN::$db->db_escape($item_name); |
| 108 | 108 | $qry[] = "('{$item_name}', '{$item_value}')"; |
| 109 | 109 | } |
@@ -692,7 +692,7 @@ |
||
| 692 | 692 | } |
| 693 | 693 | } |
| 694 | 694 | |
| 695 | - $updater->upd_log_message("Migrated {$patched}/{$total} festival configuration records"); |
|
| 695 | + $updater->upd_log_message("migrated {$patched}/{$total} festival configuration records"); |
|
| 696 | 696 | } |
| 697 | 697 | |
| 698 | 698 | $updater->upd_alter_table('que', ['DROP KEY `que_id`',], $updater->isIndexExists('que', 'que_id')); |