supernova-ws / SuperNova

includes/functions/_news.php

Spacing +14 added lines, -15 removed lines

@@ -11,15 +11,15 @@ 
   $announce_list = db_news_list_get_by_query($template, $query_where, $query_limit);
 
   $users = array();
-  while($announce = db_fetch($announce_list)) {
-    if($announce['user_id'] && !isset($users[$announce['user_id']])) {
+  while ($announce = db_fetch($announce_list)) {
+    if ($announce['user_id'] && !isset($users[$announce['user_id']])) {
       $users[$announce['user_id']] = db_user_by_id($announce['user_id']);
     }
 
     $survey_vote = array('survey_vote_id' => 1);
     $survey_complete = strtotime($announce['survey_until']) < SN_TIME_NOW;
 
-    if($announce['survey_id'] && !empty($user['id'])) {
+    if ($announce['survey_id'] && !empty($user['id'])) {
       $survey_vote = !$survey_complete ? db_survey_get_vote($announce, $user) : array();
     }
 
@@ -31,8 +31,7 @@ 
       'ANNOUNCE'        => cht_message_parse($announce['strAnnounce'], false, intval($announce['authlevel'])),
       'DETAIL_URL'      => $announce['detail_url'],
       'USER_NAME'       =>
-        isset($users[$announce['user_id']]) && $users[$announce['user_id']] ? player_nick_render_to_html($users[$announce['user_id']], array('color' => true)) :
-          js_safe_string($announce['user_name']),
+        isset($users[$announce['user_id']]) && $users[$announce['user_id']] ? player_nick_render_to_html($users[$announce['user_id']], array('color' => true)) : js_safe_string($announce['user_name']),
       'NEW'             => $announce['unix_time'] + $config->game_news_actual >= SN_TIME_NOW,
       'FUTURE'          => $announce['unix_time'] > SN_TIME_NOW,
       'SURVEY_ID'       => $announce['survey_id'],
@@ -42,25 +41,25 @@ 
       'SURVEY_UNTIL'    => $announce['survey_until'],
     ));
 
-    foreach($announce_exploded as $announce_paragraph) {
+    foreach ($announce_exploded as $announce_paragraph) {
       $template->assign_block_vars('announces.paragraph', array(
         'TEXT' => $announce_paragraph,
       ));
     }
 
-    if($announce['survey_id']) {
+    if ($announce['survey_id']) {
       $survey_query = db_survey_get_answer_texts($announce);
       $survey_vote_result = array();
       $total_votes = 0;
-      while($row = db_fetch($survey_query)) {
+      while ($row = db_fetch($survey_query)) {
         $survey_vote_result[] = $row;
         $total_votes += $row['VOTES'];
       }
 
-      if(empty($survey_vote) && !$survey_complete) {
+      if (empty($survey_vote) && !$survey_complete) {
         // Can vote
         $survey_query = db_survey_answers_get_list_by_parent($announce);
-        while($row = db_fetch($survey_query)) {
+        while ($row = db_fetch($survey_query)) {
           $template->assign_block_vars('announces.survey_answers', array(
             'ID'   => $row['survey_answer_id'],
             'TEXT' => $row['survey_answer_text'],
@@ -68,7 +67,7 @@ 
         }
       } else {
         // Show result
-        foreach($survey_vote_result as &$vote_result) {
+        foreach ($survey_vote_result as &$vote_result) {
           $vote_percent = $total_votes ? $vote_result['VOTES'] / $total_votes * 100 : 0;
           $vote_result['PERCENT'] = $vote_percent;
           $vote_result['PERCENT_TEXT'] = round($vote_percent, 1);
@@ -85,7 +84,7 @@ 
 }
 
 function nws_mark_read(&$user) {
-  if(isset($user['id'])) {
+  if (isset($user['id'])) {
     db_user_set_by_id($user['id'], '`news_lastread` = ' . SN_TIME_NOW);
     $user['news_lastread'] = SN_TIME_NOW;
   }
@@ -94,17 +93,17 @@ 
 }
 
 function survey_vote(&$user) {
-  if(empty($user['id'])) {
+  if (empty($user['id'])) {
     return true;
   }
 
   sn_db_transaction_start();
   $survey_id = sys_get_param_id('survey_id');
   $is_voted = db_survey_vote_get($user, $survey_id);
-  if(empty($is_voted)) {
+  if (empty($is_voted)) {
     $survey_vote_id = sys_get_param_id('survey_vote');
     $is_answer_exists = db_survey_answer_get($survey_id, $survey_vote_id);
-    if(!empty($is_answer_exists)) {
+    if (!empty($is_answer_exists)) {
       $user_name_safe = db_escape($user['username']);
       db_survey_vote_insert($user, $survey_id, $survey_vote_id, $user_name_safe);
     }

includes/functions/sys_maintenance.php

Spacing +9 added lines, -9 removed lines

@@ -24,10 +24,10 @@ 
     ),
   );
 
-  foreach($queries as &$query) {
-    if(!empty($query['query'])) {
+  foreach ($queries as &$query) {
+    if (!empty($query['query'])) {
       $query['result'] = doquery($query['query']);
-    } elseif(!empty($query['callable']) && is_callable($query['callable'])) {
+    } elseif (!empty($query['callable']) && is_callable($query['callable'])) {
       call_user_func($query['callable']);
     }
     $query['error'] = classSupernova::$db->db_error();
@@ -71,7 +71,7 @@ 
   $today_array = array($today_array['seconds'], $today_array['minutes'], $today_array['hours'], $today_array['mday'], $today_array['mon'], $today_array['year']);
 //  pdump($prev_run_array);
   $scheduleList = explode(',', $scheduleList);
-  array_walk($scheduleList, function (&$schedule) use ($prev_run_array, $today_array, $date_part_names_reverse, &$possible_schedules) {
+  array_walk($scheduleList, function(&$schedule) use ($prev_run_array, $today_array, $date_part_names_reverse, &$possible_schedules) {
     // pdump($schedule);
     $schedule = array('schedule_array' => array_reverse(explode(':', trim($schedule))));
 
@@ -83,21 +83,21 @@ 
     */
     // pdump($schedule);
 
-    foreach($prev_run_array as $index => $date_part) {
+    foreach ($prev_run_array as $index => $date_part) {
       $schedule['array']['recorded'][$index] = isset($schedule['schedule_array'][$index]) ? intval($schedule['schedule_array'][$index]) : $date_part;
       $schedule['array']['now'][$index] = isset($schedule['schedule_array'][$index]) ? intval($schedule['schedule_array'][$index]) : $today_array[$index];
     }
-    if($schedule['array']['recorded'] == $schedule['array']['now']) {
+    if ($schedule['array']['recorded'] == $schedule['array']['now']) {
       unset($schedule['array']['now']);
     }
 
-    foreach($schedule['array'] as $name => $array) {
+    foreach ($schedule['array'] as $name => $array) {
       $schedule['string'][$name] = "{$array[5]}-{$array[4]}-{$array[3]} {$array[2]}:{$array[1]}:{$array[0]}";
       $schedule['string'][$name . '_next'] = $schedule['string'][$name] . ' +1 ' . $interval;
       $schedule['string'][$name . '_prev'] = $schedule['string'][$name] . ' -1 ' . $interval;
     }
 
-    foreach($schedule['string'] as $string) {
+    foreach ($schedule['string'] as $string) {
       $timestamp = strtotime($string);
       $schedule['timestamp'][$timestamp] = $possible_schedules[$timestamp] = date(FMT_DATE_TIME_SQL, strtotime($string));
     }
@@ -129,7 +129,7 @@ 
 
   $prev_run = 0;
   $next_run = 0;
-  foreach($possible_schedules as $timestamp => $string_date) {
+  foreach ($possible_schedules as $timestamp => $string_date) {
     $prev_run = SN_TIME_NOW >= $timestamp ? $timestamp : $prev_run;
     $next_run = SN_TIME_NOW < $timestamp && !$next_run ? $timestamp : $next_run;
 //    pdump($schedule, '$schedule ' . date(FMT_DATE_TIME_SQL, $schedule));

includes/functions/geoip.php

Spacing +2 added lines, -2 removed lines

@@ -1,11 +1,11 @@
 <?php
 
-function geoip_status(){return sn_function_call(__FUNCTION__, array(&$result));}
+function geoip_status() {return sn_function_call(__FUNCTION__, array(&$result)); }
 function sn_geoip_status(&$result) {
   return $result = false;
 }
 
-function geoip_ip_info($ip){return sn_function_call(__FUNCTION__, array($ip, &$result));}
+function geoip_ip_info($ip) {return sn_function_call(__FUNCTION__, array($ip, &$result)); }
 function sn_geoip_ip_info($ip, &$result) {
   return $result = false;
 }

includes/functions/ali_alliances.php

Spacing +3 added lines, -3 removed lines

@@ -3,8 +3,8 @@ 
 function ali_rank_list_save($ranks) {
   global $user;
 
-  if(!empty($ranks)) {
-    foreach($ranks as $rank => $rights) {
+  if (!empty($ranks)) {
+    foreach ($ranks as $rank => $rights) {
       $rights = implode(',', $rights);
       $ranklist .= $rights . ';';
     }
@@ -22,7 +22,7 @@ 
   $temp_array = array();
   $query = db_ally_diplomacy_get_relations($ally_from, $ally_to);
 
-  while($record = db_fetch($query)) {
+  while ($record = db_fetch($query)) {
     $temp_array[$record['alliance_diplomacy_contr_ally_id']] = $record;
   }
 

includes/db/db_helpers.php

Spacing +5 added lines, -5 removed lines

@@ -27,19 +27,19 @@
  */
 function db_set_make_safe_string($set, $delta = false) {
   $set_safe = array();
-  foreach($set as $field => $value) {
-    if(empty($field)) {
+  foreach ($set as $field => $value) {
+    if (empty($field)) {
       continue;
     }
 
     $field = '`' . db_escape($field) . '`';
     $new_value = $value;
-    if($value === null) {
+    if ($value === null) {
       $new_value = 'NULL';
-    } elseif(is_string($value) && (string)($new_value = floatval($value)) != (string)$value) {
+    } elseif (is_string($value) && (string) ($new_value = floatval($value)) != (string) $value) {
       // non-float
       $new_value = '"' . db_escape($value) . '"';
-    } elseif($delta) {
+    } elseif ($delta) {
       // float and DELTA-set
       $new_value = "{$field} + ({$new_value})";
     }

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Gorlum
- * Date: 26.12.2015
- * Time: 17:19
- */
+   * Created by PhpStorm.
+   * User: Gorlum
+   * Date: 26.12.2015
+   * Time: 17:19
+   */
 
 /**
  * Normalize and make ID safe

includes/includes/flt_mission_hold.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  * @copyright 2008 by Gorlum for Project "SuperNova.WS"
  */
 function flt_mission_hold($mission_data) {
-  if($mission_data->fleet->time_mission_job_complete < SN_TIME_NOW) {
+  if ($mission_data->fleet->time_mission_job_complete < SN_TIME_NOW) {
     $mission_data->fleet->mark_fleet_as_returned_and_save();
 
     return CACHE_FLEET;

includes/includes/upd_helpers.php

Spacing +34 added lines, -34 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('IN_UPDATE')) {
+if (!defined('IN_UPDATE')) {
   die('Trying to call update helpers externally!');
 }
 
@@ -8,13 +8,13 @@ 
   global $update_tables;
 
   upd_add_more_time();
-  if(!$no_log) {
+  if (!$no_log) {
     upd_log_message("Performing query '{$query}'");
   }
 
   // classSupernova::$db->sn_db_connect();
-  if(!(strpos($query, '{{') === false)) {
-    foreach($update_tables as $tableName => $cork) {
+  if (!(strpos($query, '{{') === false)) {
+    foreach ($update_tables as $tableName => $cork) {
       $query = str_replace("{{{$tableName}}}", classSupernova::$db->db_prefix . $tableName, $query);
     }
   }
@@ -27,9 +27,9 @@ 
   global $config, $sys_log_disabled;
 
   $config->db_loadItem($key);
-  if($condition || !isset($config->$key)) {
+  if ($condition || !isset($config->$key)) {
     upd_add_more_time();
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       upd_log_message("Updating config key '{$key}' with value '{$default_value}'");
     }
     $config->db_saveItem($key, $default_value);
@@ -57,7 +57,7 @@ 
 function upd_log_message($message) {
   global $sys_log_disabled, $upd_log, $debug;
 
-  if($sys_log_disabled) {
+  if ($sys_log_disabled) {
 //    print("{$message}<br />");
   } else {
     $upd_log .= "{$message}\r\n";
@@ -68,15 +68,15 @@ 
 function upd_unset_table_info($table_name) {
   global $update_tables, $update_indexes, $update_foreigns;
 
-  if(isset($update_tables[$table_name])) {
+  if (isset($update_tables[$table_name])) {
     unset($update_tables[$table_name]);
   }
 
-  if(isset($update_indexes[$table_name])) {
+  if (isset($update_indexes[$table_name])) {
     unset($update_indexes[$table_name]);
   }
 
-  if(isset($update_foreigns[$table_name])) {
+  if (isset($update_foreigns[$table_name])) {
     unset($update_foreigns[$table_name]);
   }
 }
@@ -90,18 +90,18 @@ 
   upd_unset_table_info($tableName);
 
   $q1 = upd_do_query("SHOW FULL COLUMNS FROM {$prefix_table_name};", true);
-  while($r1 = db_fetch($q1)) {
+  while ($r1 = db_fetch($q1)) {
     $update_tables[$tableName][$r1['Field']] = $r1;
   }
 
   $q1 = upd_do_query("SHOW INDEX FROM {$prefix_table_name};", true);
-  while($r1 = db_fetch($q1)) {
+  while ($r1 = db_fetch($q1)) {
     $update_indexes[$tableName][$r1['Key_name']] .= "{$r1['Column_name']},";
     $update_indexes_full[$tableName][$r1['Key_name']][$r1['Column_name']] = $r1;
   }
 
   $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);
-  while($r1 = db_fetch($q1)) {
+  while ($r1 = db_fetch($q1)) {
     $table_referenced = str_replace($config->db_prefix, '', $r1['REFERENCED_TABLE_NAME']);
 
     $update_foreigns[$tableName][$r1['CONSTRAINT_NAME']] .= "{$r1['COLUMN_NAME']},{$table_referenced},{$r1['REFERENCED_COLUMN_NAME']};";
@@ -118,7 +118,7 @@ 
 function upd_alter_table($table, $alters, $condition = true) {
   global $config;
 
-  if(!$condition) {
+  if (!$condition) {
     return;
   }
 
@@ -126,7 +126,7 @@ 
   $alters_print = is_array($alters) ? dump($alters) : $alters;
   upd_log_message("Altering table '{$table}' with alterations {$alters_print}");
 
-  if(!is_array($alters)) {
+  if (!is_array($alters)) {
     $alters = array($alters);
   }
 
@@ -137,7 +137,7 @@ 
   //$result = db_query($qry);
   $result = upd_do_query($qry);
   $error = db_error();
-  if($error) {
+  if ($error) {
     die("Altering error for table `{$table}`: {$error}<br />{$alters_print}");
   }
 
@@ -160,11 +160,11 @@ 
 function upd_create_table($table_name, $declaration) {
   global $config, $update_tables;
 
-  if(!$update_tables[$table_name]) {
+  if (!$update_tables[$table_name]) {
     upd_do_query('set foreign_key_checks = 0;', true);
     $result = upd_do_query("CREATE TABLE IF NOT EXISTS `{$config->db_prefix}{$table_name}` {$declaration}");
     $error = db_error();
-    if($error) {
+    if ($error) {
       die("Creating error for table `{$table_name}`: {$error}<br />" . dump($declaration));
     }
     upd_do_query('set foreign_key_checks = 1;', true);
@@ -190,14 +190,14 @@ 
 
 
 function upd_db_unit_changeset_prepare($unit_id, $unit_value, $user, $planet_id = null) {
-  if(!is_array($user)) {
+  if (!is_array($user)) {
     // TODO - remove later
     print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_unit_changeset_prepare() - USER is not ARRAY</h1>');
     pdump(debug_backtrace());
     die('USER is not ARRAY');
   }
 
-  if(!isset($user['id']) || !$user['id']) {
+  if (!isset($user['id']) || !$user['id']) {
     // TODO - remove later
     print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_unit_changeset_prepare() - USER[id] пустой</h1>');
     pdump($user);
@@ -212,7 +212,7 @@ 
 
   $db_changeset = array();
   $temp = upd_db_unit_by_location($user['id'], $unit_location, $location_id, $unit_id, true, 'unit_id');
-  if($temp['unit_id']) {
+  if ($temp['unit_id']) {
     // update
     $db_changeset = array(
       'action' => SQL_OP_UPDATE,
@@ -257,41 +257,41 @@ 
 
 
 function upd_db_changeset_apply($db_changeset) {
-  if(!is_array($db_changeset) || empty($db_changeset)) {
+  if (!is_array($db_changeset) || empty($db_changeset)) {
     return;
   }
 
-  foreach($db_changeset as $table_name => $table_data) {
-    foreach($table_data as $record_id => $conditions) {
+  foreach ($db_changeset as $table_name => $table_data) {
+    foreach ($table_data as $record_id => $conditions) {
       $where = '';
-      if(!empty($conditions['where'])) {
+      if (!empty($conditions['where'])) {
         $where = 'WHERE ' . implode(' AND ', $conditions['where']);
       }
 
       $fields = array();
-      if($conditions['fields']) {
-        foreach($conditions['fields'] as $field_name => $field_data) {
+      if ($conditions['fields']) {
+        foreach ($conditions['fields'] as $field_name => $field_data) {
           $condition = "`{$field_name}` = ";
           $value = '';
-          if($field_data['delta']) {
+          if ($field_data['delta']) {
             $value = "`{$field_name}`" . ($field_data['delta'] >= 0 ? '+' : '') . $field_data['delta'];
-          } elseif($field_data['set']) {
+          } elseif ($field_data['set']) {
             $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']);
           }
-          if($value) {
+          if ($value) {
             $fields[] = $condition . $value;
           }
         }
       }
       $fields = implode(',', $fields);
 
-      switch($conditions['action']) {
+      switch ($conditions['action']) {
         case SQL_OP_DELETE:
           upd_do_query("DELETE FROM {{{$table_name}}} {$where}");
         break;
 
         case SQL_OP_UPDATE:
-          if($fields) {
+          if ($fields) {
             /*if($table_name == 'unit')
             {
               pdump("UPDATE {{{$table_name}}} SET {$fields} {$where}");
@@ -302,13 +302,13 @@ 
         break;
 
         case SQL_OP_INSERT:
-          if($fields) {
+          if ($fields) {
             upd_do_query("INSERT INTO {{{$table_name}}} SET {$fields}");
           }
         break;
 
         case SQL_OP_REPLACE:
-          if($fields) {
+          if ($fields) {
             upd_do_query("REPLACE INTO {{{$table_name}}} SET {$fields}");
           }
         break;

includes/includes/flt_mission_relocate.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 
   $destination_planet = &$mission_data->dst_planet;
 
-  if(empty($destination_planet['id_owner']) || $objFleet->playerOwnerId != $destination_planet['id_owner']) {
+  if (empty($destination_planet['id_owner']) || $objFleet->playerOwnerId != $destination_planet['id_owner']) {
     $objFleet->mark_fleet_as_returned_and_save();
 
     return CACHE_FLEET;
@@ -31,7 +31,7 @@ 
       $fleet_resources[RES_DEUTERIUM], $lang['Deuterium']
     ) . '<br />' . $lang['sys_relocate_mess_user'];
   $fleet_real_array = $objFleet->get_unit_list();
-  foreach($fleet_real_array as $ship_id => $ship_count) {
+  foreach ($fleet_real_array as $ship_id => $ship_count) {
     $Message .= $lang['tech'][$ship_id] . ' - ' . $ship_count . '<br />';
   }
   msg_send_simple_message(

includes/includes/flt_mission_transport.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
   $source_planet = &$mission_data->src_planet;
   $destination_planet = &$mission_data->dst_planet;
 
-  if(!isset($destination_planet['id']) || !$destination_planet['id_owner']) {
+  if (!isset($destination_planet['id']) || !$destination_planet['id_owner']) {
     $objFleet->mark_fleet_as_returned_and_save();
 
     return CACHE_FLEET;
@@ -31,7 +31,7 @@ 
     $fleet_resources[RES_DEUTERIUM], $lang['Deuterium']);
   msg_send_simple_message($objFleet->target_owner_id, '', $objFleet->time_arrive_to_target, MSG_TYPE_TRANSPORT, $lang['sys_mess_tower'], $lang['sys_mess_transport'], $Message);
 
-  if($objFleet->target_owner_id <> $objFleet->playerOwnerId) {
+  if ($objFleet->target_owner_id <> $objFleet->playerOwnerId) {
     msg_send_simple_message($objFleet->playerOwnerId, '', $objFleet->time_arrive_to_target, MSG_TYPE_TRANSPORT, $lang['sys_mess_tower'], $lang['sys_mess_transport'], $Message);
   }
 

Doc Comments +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 /**
  * Fleet mission "Relocate"
  *
- * @param $mission_data Mission
+ * @param Mission $mission_data Mission
  *
  * @return int
  *