supernova-ws / SuperNova

classes/debug.php

Spacing +38 added lines, -39 removed lines

@@ -24,7 +24,7 @@ 
  * que esperabas!!! soy newbie!!! D':<
 */
 
-if(!defined('INSIDE')) {
+if (!defined('INSIDE')) {
   die("attemp hacking");
 }
 
@@ -37,16 +37,16 @@ 
   function log_file($message, $ident_change = 0) {
     static $ident = 0;
 
-    if(!defined('SN_DEBUG_LOG')) {
+    if (!defined('SN_DEBUG_LOG')) {
       return;
     }
 
-    if($this->log_file_handler === null) {
+    if ($this->log_file_handler === null) {
       $this->log_file_handler = @fopen(SN_ROOT_PHYSICAL . '/.logs/supernova.log', 'a+');
       @fwrite($this->log_file_handler, "\r\n\r\n");
     }
     $ident_change < 0 ? $ident += $ident_change * 2 : false;
-    if($this->log_file_handler) {
+    if ($this->log_file_handler) {
       @fwrite($this->log_file_handler, date(FMT_DATE_TIME_SQL, time()) . str_repeat(' ', $ident + 1) . $message . "\r\n");
     }
     $ident_change > 0 ? $ident += $ident_change * 2 : false;
@@ -77,8 +77,8 @@ 
     $result = array();
     $transaction_id = classSupernova::db_transaction_check(false) ? classSupernova::$transaction_id : classSupernova::$transaction_id++;
     $result[] = "tID {$transaction_id}";
-    foreach($backtrace as $a_trace) {
-      if(in_array($a_trace['function'], $exclude_functions)) {
+    foreach ($backtrace as $a_trace) {
+      if (in_array($a_trace['function'], $exclude_functions)) {
         continue;
       }
       $function =
@@ -95,7 +95,7 @@ 
       // $result[] = "{$function} ({$a_trace['line']})'{$file}'";
       $result[] = "{$function} - '{$file}' Line {$a_trace['line']}";
 
-      if(!$long_comment) {
+      if (!$long_comment) {
         break;
       }
     }
@@ -107,26 +107,26 @@ 
   }
 
   function dump($dump = false, $force_base = false, $deadlock = false) {
-    if($dump === false) {
+    if ($dump === false) {
       return;
     }
 
     $error_backtrace = array();
     $base_dump = false;
 
-    if($force_base === true) {
+    if ($force_base === true) {
       $base_dump = true;
     }
 
-    if($dump === true) {
+    if ($dump === true) {
       $base_dump = true;
     } else {
-      if(!is_array($dump)) {
+      if (!is_array($dump)) {
         $dump = array('var' => $dump);
       }
 
-      foreach($dump as $dump_var_name => $dump_var) {
-        if($dump_var_name == 'base_dump') {
+      foreach ($dump as $dump_var_name => $dump_var) {
+        if ($dump_var_name == 'base_dump') {
           $base_dump = $dump_var;
         } else {
           $error_backtrace[$dump_var_name] = $dump_var;
@@ -135,26 +135,25 @@ 
     }
 
 //    if($deadlock && ($q = db_fetch(classSupernova::$db->__db_query('SHOW ENGINE INNODB STATUS')))) {
-    if($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
+    if ($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
       $error_backtrace['deadlock'] = explode("\n", $q['Status']);
       $error_backtrace['locks'] = classSupernova::$locks;
       $error_backtrace['cSN_data'] = classSupernova::$data;
-      foreach($error_backtrace['cSN_data'] as &$location) {
-        foreach($location as $location_id => &$location_data) //          $location_data = $location_id;
+      foreach ($error_backtrace['cSN_data'] as &$location) {
+        foreach ($location as $location_id => &$location_data) //          $location_data = $location_id;
         {
-          $location_data = isset($location_data['username']) ? $location_data['username'] :
-            (isset($location_data['name']) ? $location_data['name'] : $location_id);
+          $location_data = isset($location_data['username']) ? $location_data['username'] : (isset($location_data['name']) ? $location_data['name'] : $location_id);
         }
       }
       $error_backtrace['cSN_queries'] = classSupernova::$queries;
     }
 
-    if($base_dump) {
-      if(is_array($this->log_array) && count($this->log_array) > 0) {
+    if ($base_dump) {
+      if (is_array($this->log_array) && count($this->log_array) > 0) {
         ;
       }
       {
-        foreach($this->log_array as $log) {
+        foreach ($this->log_array as $log) {
           $error_backtrace['queries'][] = $log;
         }
       }
@@ -185,14 +184,14 @@ 
   function error($message = 'There is a error on page', $title = 'Internal Error', $error_code = 500, $dump = true) {
     global $config, $sys_stop_log_hit, $lang, $sys_log_disabled, $user;
 
-    if(empty(classSupernova::$db->connected)) {
+    if (empty(classSupernova::$db->connected)) {
       // TODO - писать ошибку в файл
       die('SQL server currently unavailable. Please contact Administration...');
     }
 
     sn_db_transaction_rollback();
 
-    if(classSupernova::$config->debug == 1) {
+    if (classSupernova::$config->debug == 1) {
       echo "<h2>{$title}</h2><br><font color=red>{$message}</font><br><hr>";
       echo "<table>{$this->log}</table>";
     }
@@ -202,7 +201,7 @@ 
     $error_text = db_escape($message);
     $error_backtrace = $this->dump($dump, true, strpos($message, 'Deadlock') !== false);
 
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       $query = "INSERT INTO `{{logs}}` SET
         `log_time` = '" . time() . "', `log_code` = '" . db_escape($error_code) . "', `log_sender` = '" . db_escape($user['id']) . "',
         `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
@@ -220,7 +219,7 @@ 
       ob_start();
       print("<hr>User ID {$user['id']} raised error code {$error_code} titled '{$title}' with text '{$error_text}' on page {$_SERVER['SCRIPT_NAME']}");
 
-      foreach($error_backtrace as $name => $value) {
+      foreach ($error_backtrace as $name => $value) {
         print('<hr>');
         pdump($value, $name);
       }
@@ -232,14 +231,14 @@ 
   function warning($message, $title = 'System Message', $log_code = 300, $dump = false) {
     global $user, $lang, $sys_log_disabled;
 
-    if(empty(classSupernova::$db->connected)) {
+    if (empty(classSupernova::$db->connected)) {
       // TODO - писать ошибку в файл
       die('SQL server currently unavailable. Please contact Administration...');
     }
 
     $error_backtrace = $this->dump($dump, false);
 
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       $query = "INSERT INTO `{{logs}}` SET
         `log_time` = '" . time() . "', `log_code` = '" . db_escape($log_code) . "', `log_sender` = '" . db_escape($user['id']) . "',
         `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
@@ -257,11 +256,11 @@ 
 // Dump variables nicer then var_dump()
 
 function dump($value, $varname = null, $level = 0, $dumper = '') {
-  if(isset($varname)) {
+  if (isset($varname)) {
     $varname .= " = ";
   }
 
-  if($level == -1) {
+  if ($level == -1) {
     $trans[' '] = '&there4;';
     $trans["\t"] = '&rArr;';
     $trans["\n"] = '&para;;';
@@ -270,7 +269,7 @@ 
 
     return strtr(htmlspecialchars($value), $trans);
   }
-  if($level == 0) {
+  if ($level == 0) {
 //    $dumper = '<pre>' . mt_rand(10, 99) . '|' . $varname;
     $dumper = mt_rand(10, 99) . '|' . $varname;
   }
@@ -278,22 +277,22 @@ 
   $type = gettype($value);
   $dumper .= $type;
 
-  if($type == 'string') {
+  if ($type == 'string') {
     $dumper .= '(' . strlen($value) . ')';
     $value = dump($value, '', -1);
-  } elseif($type == 'boolean') {
+  } elseif ($type == 'boolean') {
     $value = ($value ? 'true' : 'false');
-  } elseif($type == 'object') {
+  } elseif ($type == 'object') {
     $props = get_class_vars(get_class($value));
     $dumper .= '(' . count($props) . ') <u>' . get_class($value) . '</u>';
-    foreach($props as $key => $val) {
+    foreach ($props as $key => $val) {
       $dumper .= "\n" . str_repeat("\t", $level + 1) . $key . ' => ';
       $dumper .= dump($value->$key, '', $level + 1);
     }
     $value = '';
-  } elseif($type == 'array') {
+  } elseif ($type == 'array') {
     $dumper .= '(' . count($value) . ')';
-    foreach($value as $key => $val) {
+    foreach ($value as $key => $val) {
       $dumper .= "\n" . str_repeat("\t", $level + 1) . dump($key, '', -1) . ' => ';
       $dumper .= dump($val, '', $level + 1);
     }
@@ -313,7 +312,7 @@ 
 //  $backtrace = $backtrace[1];
 
   $caller = '';
-  if(defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
+  if (defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
     $caller = (!empty($backtrace[1]['class']) ? $backtrace[1]['class'] : '') .
       (!empty($backtrace[1]['type']) ? $backtrace[1]['type'] : '') .
       $backtrace[1]['function'] .
@@ -340,7 +339,7 @@ 
 }
 
 function pr($prePrint = false) {
-  if($prePrint) {
+  if ($prePrint) {
     print("<br>");
   }
   print(mt_rand() . "<br>");
@@ -350,7 +349,7 @@ 
   global $_PRINT_COUNT_VALUE;
   $_PRINT_COUNT_VALUE++;
 
-  if($prePrint) {
+  if ($prePrint) {
     print("<br>");
   }
   print($_PRINT_COUNT_VALUE . "<br>");

Braces +3 added lines, -1 removed lines

@@ -140,11 +140,13 @@
       $error_backtrace['locks'] = classSupernova::$locks;
       $error_backtrace['cSN_data'] = classSupernova::$data;
       foreach($error_backtrace['cSN_data'] as &$location) {
-        foreach($location as $location_id => &$location_data) //          $location_data = $location_id;
+        foreach($location as $location_id => &$location_data) {
+          //          $location_data = $location_id;
         {
           $location_data = isset($location_data['username']) ? $location_data['username'] :
             (isset($location_data['name']) ? $location_data['name'] : $location_id);
         }
+        }
       }
       $error_backtrace['cSN_queries'] = classSupernova::$queries;
     }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 
     $result = array();
     $transaction_id = classSupernova::db_transaction_check(false) ? classSupernova::$transaction_id : classSupernova::$transaction_id++;
-    $result[] = "tID {$transaction_id}";
+    $result[] = "tid {$transaction_id}";
     foreach($backtrace as $a_trace) {
       if(in_array($a_trace['function'], $exclude_functions)) {
         continue;

classes/userOptionsOld.php

Spacing +19 added lines, -19 removed lines

@@ -78,14 +78,14 @@ 
     // Если в массиве индекса только один элемент - значит это просто индекс
     is_array($option_id) && count($option_id) == 1 ? $option_id = reset($option_id) : false;
 
-    if(!isset($this->data[is_array($option_id) ? reset($option_id) : $option_id])) {
+    if (!isset($this->data[is_array($option_id) ? reset($option_id) : $option_id])) {
       $this->load();
     }
 
-    if(is_array($option_id)) {
+    if (is_array($option_id)) {
       $result = $this->data;
-      foreach($option_id as $sub_key) {
-        if(!isset($result) || !isset($result[$sub_key])) {
+      foreach ($option_id as $sub_key) {
+        if (!isset($result) || !isset($result[$sub_key])) {
           $result = null;
           break;
         }
@@ -105,12 +105,12 @@ 
   public function __set($option, $value = null) {
     global $sn_cache;
 
-    if(empty($option) || !$this->user_id) {
+    if (empty($option) || !$this->user_id) {
       return;
     }
 
     // Если в массиве индекса только один элемент - значит это просто индекс
-    if(is_array($option) && count($option) == 1) {
+    if (is_array($option) && count($option) == 1) {
       // Разворачиваем его в индекс
       $option = array(reset($option) => $value);
       unset($value);
@@ -119,13 +119,13 @@ 
 
     $to_write = array();
     // Адресация многомерного массива через массив индексов в $option
-    if(is_array($option) && isset($value)) {
+    if (is_array($option) && isset($value)) {
       $a_data = &$this->data;
-      foreach($option as $option_id) {
+      foreach ($option as $option_id) {
         !is_array($a_data[$option_id]) ? $a_data[$option_id] = array() : false;
         $a_data = &$a_data[$option_id];
       }
-      if($a_data != $value) {
+      if ($a_data != $value) {
         $a_data = $value;
         $to_write[reset($option)] = null;
       }
@@ -133,10 +133,10 @@ 
       // Пакетная запись из массива ключ -> значение
       !is_array($option) ? $option = array($option => $value) : false;
 
-      foreach($option as $option_id => $option_value) {
-        if($this->data[$option_id] !== $option_value) {
+      foreach ($option as $option_id => $option_value) {
+        if ($this->data[$option_id] !== $option_value) {
           // TODO - вынести отдельно в обработчик
-          if($option_id == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON &&  $option_value == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON_HIDDEN) {
+          if ($option_id == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON && $option_value == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON_HIDDEN) {
             sn_setcookie(SN_COOKIE . '_menu_hidden', '0', time() - PERIOD_WEEK, SN_ROOT_RELATIVE);
           }
 
@@ -146,11 +146,11 @@ 
       }
     }
 
-    if(!empty($to_write)) {
+    if (!empty($to_write)) {
       $field_name = $this->cached_name();
       $sn_cache->$field_name = $this->data;
 
-      foreach($to_write as $option_id => &$option_value) {
+      foreach ($to_write as $option_id => &$option_value) {
         $option_value = is_array($this->data[$option_id]) ? serialize($this->data[$option_id]) : $this->data[$option_id]; // Сериализация для массивов при сохранении в БД
         $to_write[$option_id] = "({$this->user_id}, '" . db_escape($option_id) . "', '" . db_escape($option_value) . "')";
       }
@@ -162,26 +162,26 @@ 
   protected function load() {
     global $sn_cache;
 
-    if($this->loaded) {
+    if ($this->loaded) {
       return;
     }
 
     $this->data = $this->defaults;
 
-    if(!$this->user_id) {
+    if (!$this->user_id) {
       return;
     }
 
     $field_name = $this->cached_name();
     $a_data = $sn_cache->$field_name;
 
-    if(!empty($a_data)) {
+    if (!empty($a_data)) {
       $this->data = array_replace($this->data, $a_data);
       return;
     }
 
     $query = doquery("SELECT * FROM `{{player_options}}` WHERE `player_id` = {$this->user_id} FOR UPDATE");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       // $this->data[$row['option_id']] = $row['value'];
       $this->data[$row['option_id']] = is_string($row['value']) && ($temp = unserialize($row['value'])) !== false ? $temp : $row['value']; // Десериализация
     }
@@ -197,7 +197,7 @@ 
     return $this->__get($offset);
   }
   public function offsetSet($offset, $value) {
-    if(!is_null($offset)) {
+    if (!is_null($offset)) {
       // $this->data[$offset] = $value;
       $this->__set($offset, $value);
     } else {

flying_fleets.php

Spacing +6 added lines, -6 removed lines

@@ -2,9 +2,9 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(!empty($_POST['return']) && is_array($_POST['return'])) {
-  foreach($_POST['return'] as $fleet_id) {
-    if($fleet_id = idval($fleet_id)) {
+if (!empty($_POST['return']) && is_array($_POST['return'])) {
+  foreach ($_POST['return'] as $fleet_id) {
+    if ($fleet_id = idval($fleet_id)) {
       sn_db_transaction_start();
 //      $FleetRow = doquery("SELECT * FROM {{fleets}} WHERE `fleet_id` = '{$fleet_id}' LIMIT 1 FOR UPDATE;", true);
       $FleetRow = db_fleet_get($fleet_id);
@@ -31,7 +31,7 @@ 
 lng_include('overview');
 lng_include('fleet');
 
-if(!$planetrow) {
+if (!$planetrow) {
   message($lang['fl_noplanetrow'], $lang['fl_error']);
 }
 
@@ -51,13 +51,13 @@ 
 //}
 
 $fleet_list = fleet_list_by_owner_id($user['id']);
-foreach($fleet_list as $fleet_id => $fleet_row) {
+foreach ($fleet_list as $fleet_id => $fleet_row) {
   $i++;
   $fleet_data = tpl_parse_fleet_db($fleet_row, $i, $user);
 
   $template->assign_block_vars('fleets', $fleet_data['fleet']);
 
-  foreach($fleet_data['ships'] as $ship_data) {
+  foreach ($fleet_data['ships'] as $ship_data) {
     $template->assign_block_vars('fleets.ships', $ship_data);
   }
 }

notes.php

Spacing +20 added lines, -20 removed lines

@@ -15,34 +15,34 @@ 
 $template = gettemplate('notes', true);
 
 $result = array();
-if(($result_message = sys_get_param_str('MESSAGE')) && isset($lang[$result_message])) {
+if (($result_message = sys_get_param_str('MESSAGE')) && isset($lang[$result_message])) {
   $result[] = array('STATUS' => sys_get_param_int('STATUS'), 'MESSAGE' => $lang[$result_message]);
 }
 
 $note_id_edit = sys_get_param_id('note_id_edit');
-if(sys_get_param('note_delete')) {
+if (sys_get_param('note_delete')) {
   try {
     $not = '';
     $query_where = '';
-    switch(sys_get_param_str('note_delete_range')) {
+    switch (sys_get_param_str('note_delete_range')) {
       case 'all':
       break;
 
       case 'marked_not':
         $not = 'NOT';
       case 'marked':
-        if(!is_array($notes_marked = sys_get_param('note'))) {
+        if (!is_array($notes_marked = sys_get_param('note'))) {
           throw new exception('note_err_none_selected', ERR_WARNING);
         }
 
         $notes_marked_filtered = array();
-        foreach($notes_marked as $note_id => $note_select) {
-          if($note_select == 'on' && $note_id = idval($note_id)) {
+        foreach ($notes_marked as $note_id => $note_select) {
+          if ($note_select == 'on' && $note_id = idval($note_id)) {
             $notes_marked_filtered[] = $note_id;
           }
         }
 
-        if(empty($notes_marked_filtered)) {
+        if (empty($notes_marked_filtered)) {
           throw new exception('note_err_none_selected', ERR_WARNING);
         }
 
@@ -59,7 +59,7 @@ 
     doquery("DELETE FROM {{notes}} WHERE `owner` = {$user['id']} {$query_where};");
     sn_db_transaction_commit();
     throw new exception($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added', ERR_NONE);
-  } catch(exception $e) {
+  } catch (exception $e) {
     $note_id_edit = 0;
     sn_db_transaction_rollback();
     $result[] = array(
@@ -67,7 +67,7 @@ 
       'MESSAGE' => $lang[$e->getMessage()],
     );
   }
-} elseif(($note_title = sys_get_param_str('note_title')) || ($note_text = sys_get_param_str('note_text'))) {
+} elseif (($note_title = sys_get_param_str('note_title')) || ($note_text = sys_get_param_str('note_text'))) {
   $note_title == db_escape($lang['note_new_title']) ? $note_title = '' : false;
   ($note_text = sys_get_param_str('note_text')) == db_escape($lang['note_new_text']) ? $note_text = '' : false;
 
@@ -76,7 +76,7 @@ 
     $note_system = max(0, min(sys_get_param_id('note_system'), classSupernova::$config->game_maxSystem));
     $note_planet = max(0, min(sys_get_param_id('note_planet'), classSupernova::$config->game_maxPlanet + 1));
 
-    if(!$note_text && !$note_title && !$note_galaxy && !$note_system && !$note_planet) {
+    if (!$note_text && !$note_title && !$note_galaxy && !$note_system && !$note_planet) {
       throw new exception('note_err_note_empty', ERR_WARNING);
     }
 
@@ -85,15 +85,15 @@ 
     $note_sticky = intval(sys_get_param_id('note_sticky')) ? 1 : 0;
 
     sn_db_transaction_start();
-    if($note_id_edit) {
+    if ($note_id_edit) {
       $check_note_id = doquery("SELECT `id`, `owner` FROM {{notes}} WHERE `id` = {$note_id_edit} LIMIT 1 FOR UPDATE", true);
-      if(!$check_note_id) {
+      if (!$check_note_id) {
         throw new exception('note_err_note_not_found', ERR_ERROR);
       }
     }
 
-    if($note_id_edit) {
-      if($check_note_id['owner'] != $user['id']) {
+    if ($note_id_edit) {
+      if ($check_note_id['owner'] != $user['id']) {
         throw new exception('note_err_owner_wrong', ERR_ERROR);
       }
 
@@ -108,7 +108,7 @@ 
     sn_db_transaction_commit();
     sys_redirect('notes.php?STATUS=' . ERR_NONE . '&MESSAGE=' . ($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added'));
 //    throw new exception($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added', ERR_NONE);
-  } catch(exception $e) {
+  } catch (exception $e) {
     $note_id_edit = 0;
     sn_db_transaction_rollback();
     $result[] = array(
@@ -118,7 +118,7 @@ 
   }
 }
 
-if(!$note_id_edit) {
+if (!$note_id_edit) {
   note_assign($template, array(
     'id' => 0,
     'time' => SN_TIME_NOW,
@@ -131,13 +131,13 @@ 
 
 $note_exist = false;
 $notes_query = doquery("SELECT * FROM {{notes}} WHERE owner={$user['id']} ORDER BY priority DESC, galaxy ASC, system ASC, planet ASC, planet_type ASC, `time` DESC");
-while($note_row = db_fetch($notes_query)) {
+while ($note_row = db_fetch($notes_query)) {
   note_assign($template, $note_row);
   $note_exist = $note_exist || $note_row['id'] == $note_id_edit;
 }
 $note_id_edit = $note_exist ? $note_id_edit : 0;
 
-foreach($note_priority_classes as $note_priority_id => $note_priority_class) {
+foreach ($note_priority_classes as $note_priority_id => $note_priority_class) {
   $template->assign_block_vars('note_priority', array(
     'ID' => $note_priority_id,
     'CLASS' => $note_priority_classes[$note_priority_id],
@@ -145,14 +145,14 @@ 
   ));
 }
 
-foreach($lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
+foreach ($lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
   $template->assign_block_vars('planet_type', array(
     'ID' => $planet_type_id,
     'TEXT' => $planet_type_string,
   ));
 }
 
-foreach($result as $result_data) {
+foreach ($result as $result_data) {
   $template->assign_block_vars('result', $result_data);
 }
 

phalanx.php

Spacing +8 added lines, -8 removed lines

@@ -18,17 +18,17 @@ 
 
 $sensorLevel = mrc_get_level($user, $planetrow, STRUC_MOON_PHALANX);
 if (!intval($sensorLevel)) {
-  message ($lang['phalanx_nosensoravailable'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message($lang['phalanx_nosensoravailable'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 if ($planetrow['planet_type'] != PT_MOON) {
-  message ($lang['phalanx_onlyformoons'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message($lang['phalanx_onlyformoons'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 $scan_galaxy  = sys_get_param_int('galaxy');
 $scan_system  = sys_get_param_int('system');
 $scan_planet  = sys_get_param_int('planet');
-$scan_planet_type  = 1; // sys_get_param_int('planettype');
+$scan_planet_type = 1; // sys_get_param_int('planettype');
 $id = sys_get_param_id('id');
 
 $source_galaxy = $planetrow['galaxy'];
@@ -38,9 +38,9 @@ 
 $sensorRange = GetPhalanxRange($sensorLevel);
 
 $system_distance = abs($source_system - $scan_system);
-if($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
+if ($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
 {
-  message ($lang['phalanx_rangeerror'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message($lang['phalanx_rangeerror'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 $cost = $sensorLevel * 1000;
@@ -51,14 +51,14 @@ 
 }
 
 $planet_scanned = DBStaticPlanet::db_planet_by_gspt($scan_galaxy, $scan_system, $scan_planet, $scan_planet_type);
-if(!$planet_scanned['id'])
+if (!$planet_scanned['id'])
 {
   message($lang['phalanx_planet_not_exists'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
-if($planet_scanned['destruyed'])
+if ($planet_scanned['destruyed'])
 {
-  message ($lang['phalanx_planet_destroyed'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message($lang['phalanx_planet_destroyed'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 DBStaticPlanet::db_planet_set_by_id($user['current_planet'], "deuterium = deuterium - {$cost}");

blitz_register.php

Spacing +26 added lines, -26 removed lines

@@ -2,12 +2,12 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
+if ($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
   $error_message = classSupernova::$config->game_mode == GAME_BLITZ ? 'sys_blitz_page_disabled' : (
     !classSupernova::$config->game_blitz_register ? 'sys_blitz_registration_disabled' : ''
   );
 
-  if($error_message) {
+  if ($error_message) {
     message($lang[$error_message], $lang['sys_error'], 'overview.php', 10);
     die();
   }
@@ -17,12 +17,12 @@ 
 $current_round = intval(classSupernova::$config->db_loadItem('game_blitz_register_round'));
 $current_price = intval(classSupernova::$config->db_loadItem('game_blitz_register_price'));
 
-if(classSupernova::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
+if (classSupernova::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
   sn_db_transaction_start();
   $user = db_user_by_id($user['id'], true);
   $is_registered = doquery("SELECT `id` FROM {{blitz_registrations}} WHERE `user_id` = {$user['id']} AND `round_number` = {$current_round} FOR UPDATE;", true);
-  if(sys_get_param_str('register_me')) {
-    if(empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
+  if (sys_get_param_str('register_me')) {
+    if (empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
       doquery("INSERT IGNORE INTO {{blitz_registrations}} SET `user_id` = {$user['id']}, `round_number` = {$current_round};");
       //mm_points_change($user['id'], RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
       classSupernova::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
@@ -43,17 +43,17 @@ 
 $blitz_players = 0;
 $blitz_prize_dark_matter = 0;
 $blitz_prize_places = 0;
-if($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
-  if(sys_get_param_str('generate')) {
+if ($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
+  if (sys_get_param_str('generate')) {
     $next_id = 0;
     $query = doquery("SELECT `id` FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY RAND();");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $next_id++;
       $blitz_name = 'Игрок' . $next_id;
       $blitz_password = sys_random_string(8);
       doquery("UPDATE {{blitz_registrations}} SET blitz_name = '{$blitz_name}', blitz_password = '{$blitz_password}' WHERE `id` = {$row['id']} AND `round_number` = {$current_round};");
     }
-  } elseif(sys_get_param_str('import_generated')) {
+  } elseif (sys_get_param_str('import_generated')) {
     // ЭТО НА БЛИЦЕ!!!
     doquery("DELETE FROM {{users}} WHERE username like 'Игрок%';");
     doquery("DELETE FROM {{planets}} WHERE id_owner not in (SELECT `id` FROM {{users}});");
@@ -75,7 +75,7 @@ 
     $system = $system_step;
     $planet = round(classSupernova::$config->game_maxPlanet / 2);
 
-    foreach($imported_string as &$string_data) {
+    foreach ($imported_string as &$string_data) {
       $string_data = explode(',', $string_data);
       $username_safe = $string_data[0];
 
@@ -95,7 +95,7 @@ 
 
       $moon_row = uni_create_moon($galaxy, $system, $planet, $user_new['id'], 30, '', false);
 
-      if(($system += $system_step) >= classSupernova::$config->game_maxSystem) {
+      if (($system += $system_step) >= classSupernova::$config->game_maxSystem) {
         $galaxy++;
         $system = $system_step;
       }
@@ -104,13 +104,13 @@ 
 
     classSupernova::$config->db_saveItem('users_amount', classSupernova::$config->users_amount + $new_players);
     // generated_string
-  } elseif(sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
+  } elseif (sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
     $blitz_result = explode(';', $blitz_result_string);
     $blitz_last_update = $blitz_result[0]; // Пока не используется
     unset($blitz_result[0]);
-    foreach($blitz_result as $blitz_result_data) {
+    foreach ($blitz_result as $blitz_result_data) {
       $blitz_result_data = explode(',', $blitz_result_data);
-      if(count($blitz_result_data) == 5) {
+      if (count($blitz_result_data) == 5) {
         $blitz_result_data[1] = db_escape($blitz_result_data[1]);
         doquery(
           "UPDATE `{{blitz_registrations}}` SET
@@ -124,15 +124,15 @@ 
     $blitz_result = array();
   }
 
-  if(classSupernova::$config->game_mode == GAME_BLITZ) {
+  if (classSupernova::$config->game_mode == GAME_BLITZ) {
     $blitz_result = array(classSupernova::$config->db_loadItem('var_stat_update'));
     $query = doquery("SELECT id, username, total_rank, total_points, onlinetime FROM {{users}} ORDER BY `id`;");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $blitz_result[] = "{$row['id']},{$row['username']},{$row['onlinetime']},{$row['total_rank']},{$row['total_points']}";
     }
   } else {
     $query = doquery("SELECT blitz_name, blitz_password, blitz_online FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY `id`;");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $blitz_generated[] = "{$row['blitz_name']},{$row['blitz_password']}";
       $row['blitz_online'] ? $blitz_prize_players_active++ : false;
       $blitz_players++;
@@ -147,13 +147,13 @@ 
     'Игрок40'
     */
 
-    if(sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
+    if (sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
       // $blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter');
       $blitz_prize_places_actual = sys_get_param_int('blitz_prize_places');
       sn_db_transaction_start();
       $query = doquery("SELECT * FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY `blitz_place` FOR UPDATE;");
-      while($row = db_fetch($query)) {
-        if(!$row['blitz_place']) {
+      while ($row = db_fetch($query)) {
+        if (!$row['blitz_place']) {
           continue;
         }
 
@@ -161,15 +161,15 @@ 
         $blitz_prize_places_actual--;
 
         $reward = $blitz_prize_dark_matter_actual - $row['blitz_reward_dark_matter'];
-pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}",$row['id']);
-        if($reward) {
+pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}", $row['id']);
+        if ($reward) {
           rpg_points_change($row['user_id'], RPG_BLITZ, $reward, sprintf(
             $lang['sys_blitz_reward_log_message'], $row['blitz_place'], $row['blitz_name']
           ));
           doquery("UPDATE {{blitz_registrations}} SET blitz_reward_dark_matter = blitz_reward_dark_matter + ($reward) WHERE id = {$row['id']} AND `round_number` = {$current_round};");
         }
 
-        if(!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
+        if (!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
           break;
         }
       }
@@ -189,12 +189,12 @@ 
     JOIN {{users}} AS u ON u.id = br.user_id
   WHERE br.`round_number` = {$current_round}
   order by `blitz_place`, `timestamp`;");
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $tpl_player_data = array(
     'NAME' => player_nick_render_to_html($row, array('icons' => true, 'color' => true, 'ally' => true)),
   );
 
-  if(classSupernova::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
+  if (classSupernova::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
     // Вот так хитро, что бы не было не единого шанса попадания на страницу данных об игроках Блиц-сервера до закрытия раунда
     $tpl_player_data = array_merge($tpl_player_data, array(
       'ID' => $row['id'],
@@ -207,7 +207,7 @@ 
   }
 
   $template->assign_block_vars('registrations', $tpl_player_data);
-  if($row['id'] == $user['id']) {
+  if ($row['id'] == $user['id']) {
     $player_registered = $row;
   }
 }

fleet.php

Switch Indentation +121 added lines, -121 removed lines

@@ -73,121 +73,121 @@ 
 }
 
 switch ($fleet_page) {
-  case 3:
+    case 3:
 
-  case 2:
-    $fleet_group_mr = sys_get_param_id('fleet_group');
-    $fleetarray     = unserialize(base64_decode(str_rot13(sys_get_param('usedfleet'))));
-    $fleetarray = is_array($fleetarray) ? $fleetarray : array();
+    case 2:
+      $fleet_group_mr = sys_get_param_id('fleet_group');
+      $fleetarray     = unserialize(base64_decode(str_rot13(sys_get_param('usedfleet'))));
+      $fleetarray = is_array($fleetarray) ? $fleetarray : array();
 
-    foreach($fleetarray as $ship_id => &$ship_amount) {
-      if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
-        $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true));
-        die();
-      }
-      $ship_amount = floatval($ship_amount);
-    }
-
-    $UsedPlanet = false;
-    $YourPlanet = false;
-    $missiontype = array();
-    if ($planet > classSupernova::$config->game_maxPlanet) {
-      $target_mission = MT_EXPLORE;
-      $missiontype[MT_EXPLORE] = $lang['type_mission'][MT_EXPLORE];
-    } elseif ($galaxy && $system && $planet) {
-      $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
-
-      $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type);
-
-      if ($TargetPlanet['id_owner']) {
-        $UsedPlanet = true;
-        if ($TargetPlanet['id_owner'] == $user['id']) {
-          $YourPlanet = true;
+      foreach($fleetarray as $ship_id => &$ship_amount) {
+        if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
+          $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true));
+          die();
         }
+        $ship_amount = floatval($ship_amount);
       }
 
-      if (!$UsedPlanet) {
-        if ($fleetarray[SHIP_COLONIZER]) {
-          $missiontype[MT_COLONIZE] = $lang['type_mission'][MT_COLONIZE];
-          $target_mission = MT_COLONIZE;
-          $planet_type = PT_PLANET;
-        } else {
-          message ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']);
-        }
-      } else {
-        $recyclers = 0;
-        foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
-          $recyclers += $fleetarray[$recycler_id];
+      $UsedPlanet = false;
+      $YourPlanet = false;
+      $missiontype = array();
+      if ($planet > classSupernova::$config->game_maxPlanet) {
+        $target_mission = MT_EXPLORE;
+        $missiontype[MT_EXPLORE] = $lang['type_mission'][MT_EXPLORE];
+      } elseif ($galaxy && $system && $planet) {
+        $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
+
+        $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type);
+
+        if ($TargetPlanet['id_owner']) {
+          $UsedPlanet = true;
+          if ($TargetPlanet['id_owner'] == $user['id']) {
+            $YourPlanet = true;
+          }
         }
-        if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
-          $target_mission = MT_RECYCLE;
-          $missiontype[MT_RECYCLE] = $lang['type_mission'][MT_RECYCLE];
-        } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) {
-          if ($YourPlanet) {
-            $missiontype[MT_RELOCATE] = $lang['type_mission'][MT_RELOCATE];
-            $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
+
+        if (!$UsedPlanet) {
+          if ($fleetarray[SHIP_COLONIZER]) {
+            $missiontype[MT_COLONIZE] = $lang['type_mission'][MT_COLONIZE];
+            $target_mission = MT_COLONIZE;
+            $planet_type = PT_PLANET;
           } else {
-            // Not Your Planet
-            if ($fleetarray[SHIP_SPY]) {
-              // Only spy missions if any spy
-              $missiontype[MT_SPY] = $lang['type_mission'][MT_SPY];
+            message ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']);
+          }
+        } else {
+          $recyclers = 0;
+          foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+            $recyclers += $fleetarray[$recycler_id];
+          }
+          if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
+            $target_mission = MT_RECYCLE;
+            $missiontype[MT_RECYCLE] = $lang['type_mission'][MT_RECYCLE];
+          } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) {
+            if ($YourPlanet) {
+              $missiontype[MT_RELOCATE] = $lang['type_mission'][MT_RELOCATE];
+              $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
             } else {
-              // If no spies...
-              if ($fleet_group_mr) {
-                $missiontype[MT_AKS] = $lang['type_mission'][MT_AKS];
+              // Not Your Planet
+              if ($fleetarray[SHIP_SPY]) {
+                // Only spy missions if any spy
+                $missiontype[MT_SPY] = $lang['type_mission'][MT_SPY];
               } else {
-                $missiontype[MT_ATTACK] = $lang['type_mission'][MT_ATTACK];
-                $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
-
-                $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD];
-
-                if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
-                  $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY];
+                // If no spies...
+                if ($fleet_group_mr) {
+                  $missiontype[MT_AKS] = $lang['type_mission'][MT_AKS];
+                } else {
+                  $missiontype[MT_ATTACK] = $lang['type_mission'][MT_ATTACK];
+                  $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
+
+                  $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD];
+
+                  if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
+                    $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY];
+                  }
                 }
               }
             }
           }
         }
       }
-    }
-
-    if (!$target_mission && is_array($missiontype)) {
-      $target_mission = MT_ATTACK;
-    }
-
-//    $sn_group_missions = sn_get_groups('missions');
-//    foreach($sn_group_missions as $mission_id => $cork) {
-//      $missiontype[$mission_id] = $lang['type_mission'][$mission_id];
-//    }
-//
-//
-    ksort($missiontype);
-
-    $speed_percent = sys_get_param_int('speed', 10);
-    $travel_data   = flt_travel_data($user, $planetrow, array('galaxy' => $galaxy, 'system' => $system, 'planet' => $planet), $fleetarray, $speed_percent);
-
-//    $fleet_speed   = flt_fleet_speed($user, $fleetarray);
-    $fleet_speed   = $travel_data['fleet_speed'];
-    $distance      = $travel_data['distance'];
-    $duration      = $travel_data['duration'];
-    $consumption   = $travel_data['consumption'];
-  // No Break
-
-  case 1:
-    if ($galaxy && $system && $planet) {
-      $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
-
-      $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type);
-    }
-
-  case 0:
-    $template_result += array(
-      'thisgalaxy'      => $planetrow['galaxy'],
-      'thissystem'      => $planetrow['system'],
-      'thisplanet'      => $planetrow['planet'],
-      'thisplanet_type' => $planetrow['planet_type'],
-    );
-  // no break
+
+      if (!$target_mission && is_array($missiontype)) {
+        $target_mission = MT_ATTACK;
+      }
+
+  //    $sn_group_missions = sn_get_groups('missions');
+  //    foreach($sn_group_missions as $mission_id => $cork) {
+  //      $missiontype[$mission_id] = $lang['type_mission'][$mission_id];
+  //    }
+  //
+  //
+      ksort($missiontype);
+
+      $speed_percent = sys_get_param_int('speed', 10);
+      $travel_data   = flt_travel_data($user, $planetrow, array('galaxy' => $galaxy, 'system' => $system, 'planet' => $planet), $fleetarray, $speed_percent);
+
+  //    $fleet_speed   = flt_fleet_speed($user, $fleetarray);
+      $fleet_speed   = $travel_data['fleet_speed'];
+      $distance      = $travel_data['distance'];
+      $duration      = $travel_data['duration'];
+      $consumption   = $travel_data['consumption'];
+    // No Break
+
+    case 1:
+      if ($galaxy && $system && $planet) {
+        $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
+
+        $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type);
+      }
+
+    case 0:
+      $template_result += array(
+        'thisgalaxy'      => $planetrow['galaxy'],
+        'thissystem'      => $planetrow['system'],
+        'thisplanet'      => $planetrow['planet'],
+        'thisplanet_type' => $planetrow['planet_type'],
+      );
+    // no break
 
 }
 
@@ -209,31 +209,31 @@ 
 }
 
 switch($fleet_page) {
-  case 1:
-    require('includes/includes/flt_page1.inc');
-  break;
+    case 1:
+      require('includes/includes/flt_page1.inc');
+    break;
 
-  case 2:
-    require_once('includes/includes/flt_page2.inc');
-    sn_fleet_page2();
-  break;
+    case 2:
+      require_once('includes/includes/flt_page2.inc');
+      sn_fleet_page2();
+    break;
 
-  case 3:
-    require_once('includes/includes/flt_page3.inc');
-    sn_fleet_page3();
-  break;
+    case 3:
+      require_once('includes/includes/flt_page3.inc');
+      sn_fleet_page3();
+    break;
 
-  case 4:
-    require('includes/includes/flt_page4.inc');
-  break;
+    case 4:
+      require('includes/includes/flt_page4.inc');
+    break;
 
-  case 5:
-    require('includes/includes/flt_page5.inc');
-  break;
+    case 5:
+      require('includes/includes/flt_page5.inc');
+    break;
 
-  default:
-    define('SN_RENDER_NAVBAR_PLANET', true);
+    default:
+      define('SN_RENDER_NAVBAR_PLANET', true);
 
-    require('includes/includes/flt_page0.inc');
-  break;
+      require('includes/includes/flt_page0.inc');
+    break;
 }

Spacing +14 added lines, -14 removed lines

@@ -39,11 +39,11 @@ 
 $planet = sys_get_param_int('planet', $planetrow['planet']);
 
 $target_mission = sys_get_param_int('target_mission');
-if($target_mission == MT_COLONIZE || $target_mission == MT_EXPLORE) {
+if ($target_mission == MT_COLONIZE || $target_mission == MT_EXPLORE) {
   $planet_type = PT_PLANET;
-} elseif($target_mission == MT_RECYCLE) {
+} elseif ($target_mission == MT_RECYCLE) {
   $planet_type = PT_DEBRIS;
-} elseif($target_mission == MT_DESTROY) {
+} elseif ($target_mission == MT_DESTROY) {
   $planet_type = PT_MOON;
 } else {
   $planet_type = sys_get_param_int('planet_type');
@@ -59,15 +59,15 @@ 
 //$FlyingFleets = doquery("SELECT COUNT(fleet_id) as Number FROM {{fleets}} WHERE `fleet_owner`='{$user['id']}'", true);
 //$FlyingFleets = $FlyingFleets['Number'];
 $FlyingFleets = fleet_count_flying($user['id']);
-if($MaxFleets <= $FlyingFleets && $fleet_page && $fleet_page != 4) {
+if ($MaxFleets <= $FlyingFleets && $fleet_page && $fleet_page != 4) {
   message($lang['fl_noslotfree'], $lang['fl_error'], "fleet." . PHP_EX, 5);
 }
 
 $MaxExpeditions = get_player_max_expeditons($user);
-if($MaxExpeditions) {
+if ($MaxExpeditions) {
 //  $FlyingExpeditions  = doquery("SELECT COUNT(fleet_owner) AS `expedi` FROM {{fleets}} WHERE `fleet_owner` = {$user['id']} AND `fleet_mission` = '" . MT_EXPLORE . "';", '', true);
 //  $FlyingExpeditions  = $FlyingExpeditions['expedi'];
-  $FlyingExpeditions  = fleet_count_flying($user['id'], MT_EXPLORE);
+  $FlyingExpeditions = fleet_count_flying($user['id'], MT_EXPLORE);
 } else {
   $FlyingExpeditions = 0;
 }
@@ -80,8 +80,8 @@ 
     $fleetarray     = unserialize(base64_decode(str_rot13(sys_get_param('usedfleet'))));
     $fleetarray = is_array($fleetarray) ? $fleetarray : array();
 
-    foreach($fleetarray as $ship_id => &$ship_amount) {
-      if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
+    foreach ($fleetarray as $ship_id => &$ship_amount) {
+      if (!in_array($ship_id, sn_get_groups('fleet')) || (string) floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
         $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true));
         die();
       }
@@ -112,11 +112,11 @@ 
           $target_mission = MT_COLONIZE;
           $planet_type = PT_PLANET;
         } else {
-          message ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']);
+          message("<font color=\"red\"><b>" . $lang['fl_no_planet_type'] . "</b></font>", $lang['fl_error']);
         }
       } else {
         $recyclers = 0;
-        foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+        foreach (sn_get_groups('flt_recyclers') as $recycler_id) {
           $recyclers += $fleetarray[$recycler_id];
         }
         if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
@@ -141,7 +141,7 @@ 
 
                 $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD];
 
-                if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
+                if ($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
                   $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY];
                 }
               }
@@ -201,14 +201,14 @@ 
 );
 
 $is_transport_missions = false;
-if($missiontype) {
+if ($missiontype) {
   $sn_group_missions = sn_get_groups('missions');
-  foreach($missiontype as $mission_data_id => $mission_data) {
+  foreach ($missiontype as $mission_data_id => $mission_data) {
     $is_transport_missions = $is_transport_missions || (isset($sn_group_missions[$mission_data_id]['transport']) && $sn_group_missions[$mission_data_id]['transport']);
   }
 }
 
-switch($fleet_page) {
+switch ($fleet_page) {
   case 1:
     require('includes/includes/flt_page1.inc');
   break;

includes/alliance/ali_internal_admin_diplomacy.inc

Spacing +19 added lines, -19 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -14,28 +14,28 @@ 
 
 $ally_name_safe = db_escape($user['ally_name']);
 
-if(sys_get_param_str('ali_dip_offer_make'))
+if (sys_get_param_str('ali_dip_offer_make'))
 {
   $alliance_negotiation_relation = sys_get_param_str('alliance_negotiation_relation');
-  if(!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list))
+  if (!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list))
   {
     message($lang['ali_dip_err_wrong_offer'], $page_title);
   }
 
   $alliance_negotiation_contr_ally_id = sys_get_param_id('alliance_negotiation_contr_ally_id');
-  if($alliance_negotiation_contr_ally_id == $user['ally_id'])
+  if ($alliance_negotiation_contr_ally_id == $user['ally_id'])
   {
     message($lang['ali_dip_err_same_ally'], $page_title);
   }
 
   $contr_ally_row = doquery("SELECT `ally_name` FROM {{alliance}} WHERE `id` = {$alliance_negotiation_contr_ally_id} LIMIT 1;", '', true);
-  if(!$contr_ally_row)
+  if (!$contr_ally_row)
   {
     message($lang['ali_dip_err_no_ally'], $page_title);
   }
 
   $relation_current_id = ali_relation($user['ally_id'], $alliance_negotiation_contr_ally_id);
-  if($alliance_negotiation_relation == $relation_current_id)
+  if ($alliance_negotiation_relation == $relation_current_id)
   {
     message(sprintf($lang['ali_dip_err_offer_same'], $lang['ali_dip_relations'][$alliance_negotiation_relation]), $page_title);
   }
@@ -47,7 +47,7 @@ 
 
   $relation_new = $sn_diplomacy_relation_list[$alliance_negotiation_relation];
   $relation_current = $sn_diplomacy_relation_list[$relation_current_id];
-  if($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1)
+  if ($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1)
   {
     sn_db_perform('{{alliance_negotiation}}',
       array(
@@ -79,39 +79,39 @@ 
 else
 {
   $offer_id = sys_get_param_id('offer_id');
-  if($offer_id)
+  if ($offer_id)
   {
     $offer_answer = sys_get_param_str('answer');
 
     $negotiation = doquery("SELECT * FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;", '', true);
-    if(!$negotiation)
+    if (!$negotiation)
     {
       message($lang['ali_dip_err_offer_none'], $page_title);
     }
-    elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
+    elseif ($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
     {
       // TODO: Add log of hack attempt
       message($lang['ali_dip_err_offer_alien'], $page_title);
     }
-    elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
+    elseif ($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
     {
-      if($offer_answer == 'accept')
+      if ($offer_answer == 'accept')
       {
         // TODO: Add log of hack attempt
         message($lang['ali_dip_err_offer_accept_own'], $page_title);
       }
-      elseif($offer_answer == 'deny')
+      elseif ($offer_answer == 'deny')
       {
         doquery("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;");
       }
     }
     else
     {
-      if($offer_answer == 'accept')
+      if ($offer_answer == 'accept')
       {
         $accept_offer = true;
       }
-      elseif($offer_answer == 'deny')
+      elseif ($offer_answer == 'deny')
       {
         DBStaticAlly::db_ally_negotiation_update_status_1($offer_id);
       }
@@ -119,7 +119,7 @@ 
   }
 }
 
-if($accept_offer)
+if ($accept_offer)
 {
   sn_db_transaction_start();
 
@@ -155,7 +155,7 @@ 
   sn_db_transaction_commit();
 }
 
-foreach($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation)
+foreach ($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation)
 {
   $template->assign_block_vars('relation', array(
     'ID'   => $diplomacy_relation_id,
@@ -164,7 +164,7 @@ 
 }
 
 $query = doquery("SELECT id, ally_name, ally_tag FROM {{alliance}} WHERE `id` != {$user['ally_id']} ORDER BY ally_name;");
-while($alliance = db_fetch($query))
+while ($alliance = db_fetch($query))
 {
   $template->assign_block_vars('alliance', array(
     'ID'   => $alliance['id'],
@@ -183,7 +183,7 @@ 
   WHERE
     alliance_negotiation_ally_id = {$user['ally_id']} OR alliance_negotiation_contr_ally_id = {$user['ally_id']};"
 );
-while($offer = db_fetch($query))
+while ($offer = db_fetch($query))
 {
   $template->assign_block_vars('offer', array(
     'ID'       => $offer['alliance_negotiation_id'],

Braces +7 added lines, -14 removed lines

@@ -63,8 +63,7 @@ 
   );
 
   $accept_offer = false;
-  }
-  else
+  } else
   {
     $accept_offer = true;
     $negotiation = array(
@@ -75,8 +74,7 @@ 
       'alliance_negotiation_relation' => $alliance_negotiation_relation,
     );
   }
-}
-else
+} else
 {
   $offer_id = sys_get_param_id('offer_id');
   if($offer_id)
@@ -87,31 +85,26 @@ 
     if(!$negotiation)
     {
       message($lang['ali_dip_err_offer_none'], $page_title);
-    }
-    elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
+    } elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
     {
       // TODO: Add log of hack attempt
       message($lang['ali_dip_err_offer_alien'], $page_title);
-    }
-    elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
+    } elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
     {
       if($offer_answer == 'accept')
       {
         // TODO: Add log of hack attempt
         message($lang['ali_dip_err_offer_accept_own'], $page_title);
-      }
-      elseif($offer_answer == 'deny')
+      } elseif($offer_answer == 'deny')
       {
         doquery("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;");
       }
-    }
-    else
+    } else
     {
       if($offer_answer == 'accept')
       {
         $accept_offer = true;
-      }
-      elseif($offer_answer == 'deny')
+      } elseif($offer_answer == 'deny')
       {
         DBStaticAlly::db_ally_negotiation_update_status_1($offer_id);
       }

includes/pages/chat.php

Spacing +13 added lines, -13 removed lines

@@ -37,7 +37,7 @@ 
   $user_auth_level = isset($user['authlevel']) ? $user['authlevel'] : AUTH_LEVEL_ANONYMOUS;
 
   $mode = sys_get_param_int('mode');
-  switch($mode)
+  switch ($mode)
   {
     case CHAT_MODE_ALLY:
       $template_result['ALLY'] = intval($user['ally_id']);
@@ -51,12 +51,12 @@ 
   }
 
   $template_result['.']['smiles'] = array();
-  foreach(classSupernova::$design['smiles'] as $auth_level => $replaces) {
-    if($auth_level > $user_auth_level) {
+  foreach (classSupernova::$design['smiles'] as $auth_level => $replaces) {
+    if ($auth_level > $user_auth_level) {
       continue;
     }
 
-    foreach($replaces as $bbcode => $filename)
+    foreach ($replaces as $bbcode => $filename)
     {
       $template_result['.']['smiles'][] = array(
         'BBCODE' => $bbcode,
@@ -81,12 +81,12 @@ 
   define('IN_AJAX', true);
   $skip_fleet_update = true;
 
-  if($config->_MODE != CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout)
+  if ($config->_MODE != CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout)
   {
     die();
   }
 
-  if(($message = sys_get_param_str('message')) && $user['username'])
+  if (($message = sys_get_param_str('message')) && $user['username'])
   {
     $ally_id = sys_get_param('ally') && $user['ally_id'] ? $user['ally_id'] : 0;
     $nick = db_escape(player_nick_compact(player_nick_render_current_to_array($user, array('color' => true, 'icons' => true, 'ally' => !$ally_id))));
@@ -108,7 +108,7 @@ 
   $skip_fleet_update = true;
 
   $history = sys_get_param_str('history');
-  if(!$history)
+  if (!$history)
   {
     $config->array_set('users', $user['id'], 'chat_last_refresh', SN_TIME_MICRO);
   }
@@ -117,7 +117,7 @@ 
   $last_message = '';
   $alliance = 0;
   $template_result['.']['chat'] = array();
-  if(!$history && $config->_MODE != CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout)
+  if (!$history && $config->_MODE != CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout)
   {
     $result['disable'] = true;
     $template_result['.']['chat'][] = array(
@@ -133,12 +133,12 @@ 
 
     $where_add = '';
     $last_message = 0;
-    if($history)
+    if ($history)
     {
       $rows = doquery("SELECT count(1) AS CNT FROM {{chat}} WHERE ally_id = '{$alliance}';", true);
       $page_count = ceil($rows['CNT'] / $page_limit);
 
-      for($i = 0; $i < $page_count; $i++)
+      for ($i = 0; $i < $page_count; $i++)
       {
         $template_result['.']['page'][] = array(
           'NUMBER' => $i
@@ -160,13 +160,13 @@ 
         {{chat}} AS c
         LEFT JOIN {{users}} AS u ON u.id = c.chat_message_sender_id
       WHERE c.chat_message_recipient_id IS NULL AND c.ally_id = '{$alliance}' {$where_add} ORDER BY messageid DESC LIMIT {$start_row}, {$page_limit};");
-    while($chat_row = db_fetch($query))
+    while ($chat_row = db_fetch($query))
     {
       // Little magik here - to retain HTML codes from DB and stripping HTML codes from nick
       $chat_row['user'] = player_nick_render_to_html($chat_row['user']);
       $nick_stripped = htmlentities(strip_tags($chat_row['user']), ENT_QUOTES, 'utf-8');
       $nick = str_replace(strip_tags($chat_row['user']), $nick_stripped, $chat_row['user']);
-      if(!$history)
+      if (!$history)
       {
         $nick = "<span style=\"cursor: pointer;\" onclick=\"addSmiley('({$nick_stripped})');\">{$nick}</span>";
       }
@@ -192,7 +192,7 @@ 
   $template = gettemplate('chat_messages', $template);
   $template->assign_recursive($template_result);
 
-  if($history)
+  if ($history)
   {
     display($template, "{$lang['chat_history']} - {$lang[$alliance ? 'chat_ally' : 'chat_common']}", true, '', false, true);
   }

Braces +7 added lines, -14 removed lines

@@ -27,8 +27,7 @@ 
 $sn_mvc['view']['chat'][] = 'sn_chat_view';
 $sn_mvc['view']['chat_msg'][] = 'sn_chat_msg_view';
 */
-function sn_chat_model()
-{
+function sn_chat_model() {
   global $config, $user, $template_result, $lang;
 
   $config->array_set('users', $user['id'], 'chat_last_activity', SN_TIME_MICRO);
@@ -67,15 +66,13 @@ 
 
   $template_result['PAGE_HEADER'] = $page_title;
 }
-function sn_chat_view($template = null)
-{
+function sn_chat_view($template = null) {
   $template = gettemplate('chat_body', $template);
 
   return $template;
 }
 
-function sn_chat_add_model()
-{
+function sn_chat_add_model() {
   global $skip_fleet_update, $config, $user;
 
   define('IN_AJAX', true);
@@ -100,8 +97,7 @@ 
 
   die();
 }
-function sn_chat_msg_view($template = null)
-{
+function sn_chat_msg_view($template = null) {
   global $config, $skip_fleet_update, $user, $lang;
 
   define('IN_AJAX', true);
@@ -124,8 +120,7 @@ 
       'TIME' => date(FMT_DATE_TIME, htmlentities(SN_CLIENT_TIME_LOCAL, ENT_QUOTES, 'utf-8')),
       'DISABLE' => true,
     );
-  }
-  else
+  } else
   {
     $alliance = sys_get_param_str('ally') && $user['ally_id'] ? $user['ally_id'] : 0;
 
@@ -146,8 +141,7 @@ 
       }
 
       $page = min($page_count, max(0, sys_get_param_int('sheet')));
-    }
-    else
+    } else
     {
       $last_message = sys_get_param_id('last_message');
       $where_add = $last_message ? "AND `messageid` > {$last_message}" : '';
@@ -195,8 +189,7 @@ 
   if($history)
   {
     display($template, "{$lang['chat_history']} - {$lang[$alliance ? 'chat_ally' : 'chat_common']}", true, '', false, true);
-  }
-  else
+  } else
   {
     $result['last_message'] = $last_message;
     ob_start();