supernova-ws / SuperNova

includes/debug.class.php

Spacing +74 added lines, -75 removed lines

@@ -30,10 +30,10 @@ 
 
 defined('INSIDE') || die();
 
-if(php_sapi_name() == "cli") {
+if (php_sapi_name() == "cli") {
   // In cli-mode
   define('__DEBUG_CRLF', "\r\n");
-  define('__DEBUG_LINE', '-------------------------------------------------' . __DEBUG_CRLF);
+  define('__DEBUG_LINE', '-------------------------------------------------'.__DEBUG_CRLF);
 } else {
   // Not in cli-mode
   define('__DEBUG_CRLF', '<br />');
@@ -50,17 +50,17 @@ 
   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) {
-      $this->log_file_handler = @fopen(SN_ROOT_PHYSICAL . '/.logs/supernova.log', 'a+');
+    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) {
-      @fwrite($this->log_file_handler, date(FMT_DATE_TIME_SQL, time()) . str_repeat(' ', $ident + 1) . $message . "\r\n");
+    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;
   }
@@ -80,7 +80,7 @@ 
   }
 
   function echo_log() {
-    echo '<br><table><tr><td class=k colspan=4><a href="' . SN_ROOT_PHYSICAL . "admin/settings.php\">Debug Log</a>:</td></tr>{$this->log}</table>";
+    echo '<br><table><tr><td class=k colspan=4><a href="'.SN_ROOT_PHYSICAL."admin/settings.php\">Debug Log</a>:</td></tr>{$this->log}</table>";
     die();
   }
 
@@ -90,25 +90,25 @@ 
     $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 =
         ($a_trace['type']
           ? ($a_trace['type'] == '->'
-            ? "({$a_trace['class']})" . get_class($a_trace['object'])
+            ? "({$a_trace['class']})".get_class($a_trace['object'])
             : $a_trace['class']
-          ) . $a_trace['type']
+          ).$a_trace['type']
           : ''
-        ) . $a_trace['function'] . '()';
+        ).$a_trace['function'].'()';
 
       $file = str_replace(SN_ROOT_PHYSICAL, '', str_replace('\\', '/', $a_trace['file']));
 
       // $result[] = "{$function} ({$a_trace['line']})'{$file}'";
       $result[] = "{$function} - '{$file}' Line {$a_trace['line']}";
 
-      if(!$long_comment) {
+      if (!$long_comment) {
         break;
       }
     }
@@ -122,26 +122,26 @@ 
   function dump($dump = false, $force_base = false, $deadlock = false) {
     global $user, $planetrow;
 
-    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;
@@ -149,22 +149,21 @@ 
       }
     }
 
-    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 = isset($location_data['username']) ? $location_data['username'] :
-            (isset($location_data['name']) ? $location_data['name'] : $location_id);
+      foreach ($error_backtrace['cSN_data'] as &$location) {
+        foreach ($location as $location_id => &$location_data) {
+          $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) {
-        foreach($this->log_array as $log) {
+    if ($base_dump) {
+      if (is_array($this->log_array) && count($this->log_array) > 0) {
+        foreach ($this->log_array as $log) {
           $error_backtrace['queries'][] = $log;
         }
       }
@@ -193,14 +192,14 @@ 
   function error($message = 'There is a error on page', $title = 'Internal Error', $error_code = 500, $dump = true) {
     global $sys_stop_log_hit, $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>";
     }
@@ -210,15 +209,15 @@ 
     $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) . "',
-        `log_page` = '" . db_escape(strpos($_SERVER['SCRIPT_NAME'], SN_ROOT_RELATIVE) === false ? $_SERVER['SCRIPT_NAME'] : substr($_SERVER['SCRIPT_NAME'], strlen(SN_ROOT_RELATIVE))) . "'" .
-        ($error_backtrace ? ", `log_dump` = '" . db_escape(serialize($error_backtrace)) . "'" : '') . ";";
-      doquery($query, '', false, true) or die($fatal_error . db_error());
+        `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)."',
+        `log_page` = '" . db_escape(strpos($_SERVER['SCRIPT_NAME'], SN_ROOT_RELATIVE) === false ? $_SERVER['SCRIPT_NAME'] : substr($_SERVER['SCRIPT_NAME'], strlen(SN_ROOT_RELATIVE)))."'".
+        ($error_backtrace ? ", `log_dump` = '".db_escape(serialize($error_backtrace))."'" : '').";";
+      doquery($query, '', false, true) or die($fatal_error.db_error());
 
-      $message = "Пожалуйста, свяжитесь с админом, если ошибка повторится. Ошибка №: <b>" . db_insert_id() . "</b>";
+      $message = "Пожалуйста, свяжитесь с админом, если ошибка повторится. Ошибка №: <b>".db_insert_id()."</b>";
 
       $sys_stop_log_hit = true;
       $sys_log_disabled = true;
@@ -228,7 +227,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(__DEBUG_LINE);
         pdump($value, $name);
       }
@@ -240,19 +239,19 @@ 
   function warning($message, $title = 'System Message', $log_code = 300, $dump = false) {
     global $user, $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) . "',
-        `log_page` = '" . db_escape(strpos($_SERVER['SCRIPT_NAME'], SN_ROOT_RELATIVE) === false ? $_SERVER['SCRIPT_NAME'] : substr($_SERVER['SCRIPT_NAME'], strlen(SN_ROOT_RELATIVE))) . "'" .
-        ($error_backtrace ? ", `log_dump` = '" . db_escape(serialize($error_backtrace)) . "'" : '') . ";";
+        `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)."',
+        `log_page` = '" . db_escape(strpos($_SERVER['SCRIPT_NAME'], SN_ROOT_RELATIVE) === false ? $_SERVER['SCRIPT_NAME'] : substr($_SERVER['SCRIPT_NAME'], strlen(SN_ROOT_RELATIVE)))."'".
+        ($error_backtrace ? ", `log_dump` = '".db_escape(serialize($error_backtrace))."'" : '').";";
       doquery($query, '', false, true);
     } else {
 //        // TODO Здесь надо писать в файло
@@ -265,11 +264,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;;';
@@ -278,31 +277,31 @@ 
 
     return strtr(htmlspecialchars($value), $trans);
   }
-  if($level == 0) {
+  if ($level == 0) {
 //    $dumper = '<pre>' . mt_rand(10, 99) . '|' . $varname;
-    $dumper = mt_rand(10, 99) . '|' . $varname;
+    $dumper = mt_rand(10, 99).'|'.$varname;
   }
 
   $type = gettype($value);
   $dumper .= $type;
 
-  if($type == 'string') {
-    $dumper .= '(' . strlen($value) . ')';
+  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) {
-      $dumper .= "\n" . str_repeat("\t", $level + 1) . $key . ' => ';
+    $dumper .= '('.count($props).') <u>'.get_class($value).'</u>';
+    foreach ($props as $key => $val) {
+      $dumper .= "\n".str_repeat("\t", $level + 1).$key.' => ';
       $dumper .= dump($value->$key, '', $level + 1);
     }
     $value = '';
-  } elseif($type == 'array') {
-    $dumper .= '(' . count($value) . ')';
-    foreach($value as $key => $val) {
-      $dumper .= "\n" . str_repeat("\t", $level + 1) . dump($key, '', -1) . ' => ';
+  } elseif ($type == 'array') {
+    $dumper .= '('.count($value).')';
+    foreach ($value as $key => $val) {
+      $dumper .= "\n".str_repeat("\t", $level + 1).dump($key, '', -1).' => ';
       $dumper .= dump($val, '', $level + 1);
     }
     $value = '';
@@ -321,24 +320,24 @@ 
 //  $backtrace = $backtrace[1];
 
   $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'] .
+  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'].
       (!empty($backtrace[0]['file'])
         ? (
-          ' (' . substr($backtrace[0]['file'], SN_ROOT_PHYSICAL_STR_LEN) .
-          (!empty($backtrace[0]['line']) ? ':' . $backtrace[0]['line'] : '') .
+          ' ('.substr($backtrace[0]['file'], SN_ROOT_PHYSICAL_STR_LEN).
+          (!empty($backtrace[0]['line']) ? ':'.$backtrace[0]['line'] : '').
           ')'
         )
         : ''
       );
-    $caller = "\r\n" . $caller;
+    $caller = "\r\n".$caller;
   }
 
-  print('<pre style="text-align: left; background-color: #111111; color: #0A0; font-family: Courier, monospace !important; padding: 1em 0; font-weight: 800; font-size: 14px;">' .
-    dump($value, $varname) .
-    $caller .
+  print('<pre style="text-align: left; background-color: #111111; color: #0A0; font-family: Courier, monospace !important; padding: 1em 0; font-weight: 800; font-size: 14px;">'.
+    dump($value, $varname).
+    $caller.
     '</pre>'
   );
 }
@@ -348,24 +347,24 @@ 
 }
 
 function pr($prePrint = false) {
-  if($prePrint) {
+  if ($prePrint) {
     print(__DEBUG_CRLF);
   }
-  print(mt_rand() . __DEBUG_CRLF);
+  print(mt_rand().__DEBUG_CRLF);
 }
 
 function pc($prePrint = false) {
   global $_PRINT_COUNT_VALUE;
   $_PRINT_COUNT_VALUE++;
 
-  if($prePrint) {
+  if ($prePrint) {
     print(__DEBUG_CRLF);
   }
-  print($_PRINT_COUNT_VALUE . __DEBUG_CRLF);
+  print($_PRINT_COUNT_VALUE.__DEBUG_CRLF);
 }
 
 function prep($message) {
-  print('<pre>' . $message . '</pre>');
+  print('<pre>'.$message.'</pre>');
 }
 
 function backtrace_no_arg() {
@@ -388,5 +387,5 @@ 
  */
 function pdie($message = '') {
   $backtrace = debug_backtrace();
-  die(__DEBUG_LINE . ($message ? $message . ' @ ' : '') . $backtrace[0]['file'] . ':' . $backtrace[0]['line']);
+  die(__DEBUG_LINE.($message ? $message.' @ ' : '').$backtrace[0]['file'].':'.$backtrace[0]['line']);
 }

includes/functions/eco_planet_update.php

Spacing +13 added lines, -13 removed lines

@@ -14,13 +14,13 @@ 
 
   $no_data = array('user' => false, 'planet' => false, 'que' => false);
 
-  if(!$planet) {
+  if (!$planet) {
     return $no_data;
   }
 
-  if(!$no_user_update) {
+  if (!$no_user_update) {
     $user = intval(is_array($user) && $user['id'] ? $user['id'] : $user);
-    if(!$user) {
+    if (!$user) {
       // TODO - Убрать позже
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sys_o_get_updated() - USER пустой!</h1>');
       $backtrace = debug_backtrace();
@@ -32,17 +32,17 @@ 
     $user = db_user_by_id($user, !$simulation, '*', true);
   }
 
-  if(empty($user['id'])) {
+  if (empty($user['id'])) {
     return $no_data;
   }
 
-  if(is_array($planet) && isset($planet['galaxy']) && $planet['galaxy']) {
+  if (is_array($planet) && isset($planet['galaxy']) && $planet['galaxy']) {
     $planet = db_planet_by_vector($planet, '', !$simulation);
   } else {
     $planet = intval(is_array($planet) && isset($planet['id']) ? $planet['id'] : $planet);
     $planet = db_planet_by_id($planet, !$simulation);
   }
-  if(!is_array($planet) || !isset($planet['id'])) {
+  if (!is_array($planet) || !isset($planet['id'])) {
     return $no_data;
   }
 
@@ -65,19 +65,19 @@ 
     RES_DEUTERIUM => 0,
   );
 
-  switch($planet['planet_type']) {
+  switch ($planet['planet_type']) {
     case PT_PLANET:
-      foreach($resources_increase as $resource_id => &$increment) {
+      foreach ($resources_increase as $resource_id => &$increment) {
         $resource_name = pname_resource_name($resource_id);
         $increment = $caps_real['total'][$resource_id] * $ProductionTime / 3600;
         $store_free = $caps_real['total_storage'][$resource_id] - $planet[$resource_name];
         $increment = min($increment, max(0, $store_free));
 
-        if($planet[$resource_name] + $increment < 0 && !$simulation) {
+        if ($planet[$resource_name] + $increment < 0 && !$simulation) {
           classSupernova::$debug->warning("Player ID {$user['id']} have negative resources on ID {$planet['id']}.{$planet['planet_type']} [{$planet['galaxy']}:{$planet['system']}:{$planet['planet']}]. Difference {$planet[$resource_name]} of {$resource_name}", 'Negative Resources', 501);
         }
         $planet[$resource_name] += $increment;
-        $planet[$resource_name . '_perhour'] = $caps_real['total'][$resource_id];
+        $planet[$resource_name.'_perhour'] = $caps_real['total'][$resource_id];
       }
     break;
 
@@ -94,13 +94,13 @@ 
   // TODO пересчитывать размер планеты только при постройке чего-нибудь и при покупке сектора
   $planet['field_current'] = 0;
   $sn_group_build_allow = sn_get_groups('build_allow');
-  if(is_array($sn_group_build_allow[$planet['planet_type']])) {
-    foreach($sn_group_build_allow[$planet['planet_type']] as $building_id) {
+  if (is_array($sn_group_build_allow[$planet['planet_type']])) {
+    foreach ($sn_group_build_allow[$planet['planet_type']] as $building_id) {
       $planet['field_current'] += mrc_get_level($user, $planet, $building_id, !$simulation, true);
     }
   }
 
-  if($simulation) {
+  if ($simulation) {
     return array('user' => $user, 'planet' => $planet, 'que' => $que);
   }
 

includes/functions/ali_alliances.php

Spacing +4 added lines, -4 removed lines

@@ -3,10 +3,10 @@ 
 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 . ';';
+      $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/functions/msg_send_simple_message.php

Spacing +14 added lines, -14 removed lines

@@ -22,10 +22,10 @@ 
 
   $list = '';
   $query = db_user_list(
-    "ally_id = '{$ally_id}'" . ($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
+    "ally_id = '{$ally_id}'".($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
     false, 'id, username');
   // while ($u = db_fetch($query))
-  foreach($query as $u) {
+  foreach ($query as $u) {
     $sendList[] = $u['id'];
     $list .= "<br>{$u['username']} ";
   }
@@ -38,17 +38,17 @@ 
 function msg_send_simple_message($owners, $sender, $timestamp, $message_type, $from, $subject, $text, $escaped = false, $force = false) {
   global $user, $sn_message_class_list;
 
-  if(!$owners) {
+  if (!$owners) {
     return;
   }
 
   $timestamp = $timestamp ? $timestamp : SN_TIME_NOW;
   $sender = intval($sender);
-  if(!is_array($owners)) {
+  if (!is_array($owners)) {
     $owners = array($owners);
   }
 
-  if(!$escaped) {
+  if (!$escaped) {
     $from = db_escape($from);
     $subject = db_escape($subject);
     $text = db_escape($text);
@@ -63,8 +63,8 @@ 
 
   $message_class_name_total = $sn_message_class_list[MSG_TYPE_NEW]['name'];
 
-  if($owners[0] == '*') {
-    if($user['authlevel'] < 3) {
+  if ($owners[0] == '*') {
+    if ($user['authlevel'] < 3) {
       return false;
     }
     // TODO Добавить $timestamp - рассылка может быть и отсроченной
@@ -73,26 +73,26 @@ 
     $owners = array();
   } else {
     $insert_values = array();
-    $insert_template = "('%u'," . str_replace('%', '%%', " '{$sender}', '{$timestamp}', '{$message_type}', '{$from}', '{$subject}', '{$text}')");
+    $insert_template = "('%u',".str_replace('%', '%%', " '{$sender}', '{$timestamp}', '{$message_type}', '{$from}', '{$subject}', '{$text}')");
 
-    foreach($owners as $owner) {
-      if($user['id'] != $owner) {
+    foreach ($owners as $owner) {
+      if ($user['id'] != $owner) {
         $owner_row = db_user_by_id($owner);
       } else {
         $owner_row = $user;
       }
       sys_user_options_unpack($owner_row);
 
-      if($force || !$message_class_switchable || $owner_row["opt_{$message_class_name}"]) {
+      if ($force || !$message_class_switchable || $owner_row["opt_{$message_class_name}"]) {
         $insert_values[] = sprintf($insert_template, $owner);
       }
 
-      if($message_class_email && classSupernova::$config->game_email_pm && $owner_row["opt_email_{$message_class_name}"]) {
+      if ($message_class_email && classSupernova::$config->game_email_pm && $owner_row["opt_email_{$message_class_name}"]) {
         @$result = mymail($owner_row['email'], $subject, $text_unescaped, '', true);
       }
     }
 
-    if(empty($insert_values)) {
+    if (empty($insert_values)) {
       return;
     }
 
@@ -100,7 +100,7 @@ 
   }
   db_user_list_set_mass_mail($owners, "`{$message_class_name}` = `{$message_class_name}` + 1, `{$message_class_name_total}` = `{$message_class_name_total}` + 1");
 
-  if(in_array($user['id'], $owners) || $owners[0] == '*') {
+  if (in_array($user['id'], $owners) || $owners[0] == '*') {
     $user[$message_class_name]++;
     $user[$message_class_name_total]++;
   }

includes/functions/lng_language.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 // ----------------------------------------------------------------------------------------------------------------
 function lng_try_filepath($path, $file_path_relative)
 {
-  $file_path = SN_ROOT_PHYSICAL . ($path && file_exists(SN_ROOT_PHYSICAL . $path . $file_path_relative) ? $path : '') . $file_path_relative;
+  $file_path = SN_ROOT_PHYSICAL.($path && file_exists(SN_ROOT_PHYSICAL.$path.$file_path_relative) ? $path : '').$file_path_relative;
   return file_exists($file_path) ? $file_path : false;
 }
 

includes/functions/sys_maintenance.php

Spacing +11 added lines, -11 removed lines

@@ -22,10 +22,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();
@@ -69,7 +69,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))));
 
@@ -81,21 +81,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;
+      $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));
     }
@@ -127,7 +127,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/sys_bbcode.php

Spacing +7 added lines, -7 removed lines

@@ -107,23 +107,23 @@
 
   !empty(classSupernova::$config->url_faq) ? $msg = str_replace('faq://', classSupernova::$config->url_faq, $msg) : false;
 
-  foreach($supernova->design['bbcodes'] as $auth_level => $replaces) {
-    if($auth_level > $author_auth) {
+  foreach ($supernova->design['bbcodes'] as $auth_level => $replaces) {
+    if ($auth_level > $author_auth) {
       continue;
     }
 
-    foreach($replaces as $key => $html) {
+    foreach ($replaces as $key => $html) {
       $msg = preg_replace(''.$key.'', $html, $msg);
     }
   }
 
-  foreach($supernova->design['smiles'] as $auth_level => $replaces) {
-    if($auth_level > $author_auth) {
+  foreach ($supernova->design['smiles'] as $auth_level => $replaces) {
+    if ($auth_level > $author_auth) {
       continue;
     }
 
-    foreach($replaces as $key => $imgName) {
-      $msg = preg_replace("#" . addcslashes($key, '()[]{}') . "#isU","<img src=\"design/images/smileys/".$imgName.".gif\" align=\"absmiddle\" title=\"".$key."\" alt=\"".$key."\">",$msg);
+    foreach ($replaces as $key => $imgName) {
+      $msg = preg_replace("#".addcslashes($key, '()[]{}')."#isU", "<img src=\"design/images/smileys/".$imgName.".gif\" align=\"absmiddle\" title=\"".$key."\" alt=\"".$key."\">", $msg);
     }
   }
 

includes/functions/flt_mission_missile.php

Spacing +19 added lines, -19 removed lines

@@ -13,7 +13,7 @@ 
 
   $mip_data = get_unit_param(UNIT_DEF_MISSILE_INTERPLANET);
   $MIPDamage = floor(mrc_modify_value($attackerTech, false, TECH_WEAPON, $MIPs * $mip_data[P_ATTACK] * mt_rand(80, 120) / 100));
-  foreach($structures as $key => $structure)
+  foreach ($structures as $key => $structure)
   {
     $unit_info = get_unit_param($key);
     $amplify = isset($mip_data[P_AMPLIFY][$key]) ? $mip_data[P_AMPLIFY][$key] : 1;
@@ -31,9 +31,9 @@ 
   {
     //attacking only selected structure
     $damageDone = $structures[$targetedStructure][$damageTo];
-    $structsDestroyed = min( floor($MIPDamage/$damageDone), $structures[$targetedStructure][0] );
+    $structsDestroyed = min(floor($MIPDamage / $damageDone), $structures[$targetedStructure][0]);
     $structures[$targetedStructure][0] -= $structsDestroyed;
-    $MIPDamage -= $structsDestroyed*$damageDone;
+    $MIPDamage -= $structsDestroyed * $damageDone;
   }
   else
   {
@@ -44,16 +44,16 @@ 
     do
     {
       // finding is there any structure that can be damaged with leftovers of $MIPDamage
-      foreach($can_be_damaged as $key => $unit_id)
+      foreach ($can_be_damaged as $key => $unit_id)
       {
 //debug($structures[$unit_id][0]);
 //debug($structures[$unit_id][$damageTo], $MIPDamage);
-        if($structures[$unit_id][0] <= 0 || $structures[$unit_id][$damageTo] > $MIPDamage)
+        if ($structures[$unit_id][0] <= 0 || $structures[$unit_id][$damageTo] > $MIPDamage)
         {
           unset($can_be_damaged[$key]);
         }
       }
-      if(empty($can_be_damaged))
+      if (empty($can_be_damaged))
       {
         break;
       }
@@ -72,7 +72,7 @@ 
 //debug($destroyed, 'Actually destroyed');
 
 //print('<hr>');
-    } while($MIPDamage > 0 && !empty($can_be_damaged));
+    } while ($MIPDamage > 0 && !empty($can_be_damaged));
 //debug($MIPDamage, 'MIPDamage left');
   }
 //debug($structures);//die();
@@ -87,8 +87,8 @@ 
     $crystal += $destroyed * $unit_info[P_COST][RES_CRYSTAL] / 4;
   }
 
-  $return['structures'] = $structures;     // Structures left after attack
-  $return['metal']      = floor($metal);   // Metal scraps
+  $return['structures'] = $structures; // Structures left after attack
+  $return['metal']      = floor($metal); // Metal scraps
   $return['crystal']    = floor($crystal); // Crystal scraps
 
   return $return;
@@ -112,7 +112,7 @@ 
 
   $iraks = db_missile_list_by_arrival();
 
-  while($fleetRow = db_fetch($iraks)) {
+  while ($fleetRow = db_fetch($iraks)) {
     set_time_limit(15);
     $db_changeset = array();
 
@@ -128,9 +128,9 @@ 
 
     $rowAttacker = db_user_by_id($fleetRow['fleet_owner'], true);
 
-    if($target_planet_row['id']) {
+    if ($target_planet_row['id']) {
       $planetDefense = array();
-      foreach(sn_get_groups('defense_active') as $unit_id) {
+      foreach (sn_get_groups('defense_active') as $unit_id) {
         $planetDefense[$unit_id] = array(mrc_get_level($targetUser, $target_planet_row, $unit_id, true, true));
       }
 
@@ -141,24 +141,24 @@ 
         $message = classLocale::$lang['mip_all_destroyed'];
         $db_changeset['unit'][] = sn_db_unit_changeset_prepare(UNIT_DEF_MISSILE_INTERCEPTOR, -$missiles, $targetUser, $target_planet_row['id']);
       } else {
-        if($interceptors) {
+        if ($interceptors) {
           $message = sprintf(classLocale::$lang['mip_destroyed'], $interceptors);
           $db_changeset['unit'][] = sn_db_unit_changeset_prepare(UNIT_DEF_MISSILE_INTERCEPTOR, -$interceptors, $targetUser, $target_planet_row['id']);
         }
 
         $attackResult = COE_missileAttack($targetUser, $rowAttacker, $missiles - $interceptors, $planetDefense, $fleetRow['primaer']);
 
-        foreach($attackResult['structures'] as $key => $structure) {
+        foreach ($attackResult['structures'] as $key => $structure) {
           $destroyed = $planetDefense[$key][0] - $structure[0];
-          if($destroyed) {
+          if ($destroyed) {
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($key, -$destroyed, $targetUser, $target_planet_row['id']);
 
             $message .= "&nbsp;&nbsp;{$classLocale['tech'][$key]} - {$destroyed} {$classLocale['quantity']}<br>";
           }
         }
 
-        if(!empty($message)) {
-          $message = classLocale::$lang['mip_defense_destroyed'] . $message . "{$classLocale['mip_recycled']}{$classLocale['Metal']}: {$attackResult['metal']}, {$classLocale['Crystal']}: {$attackResult['crystal']}<br>";
+        if (!empty($message)) {
+          $message = classLocale::$lang['mip_defense_destroyed'].$message."{$classLocale['mip_recycled']}{$classLocale['Metal']}: {$attackResult['metal']}, {$classLocale['Crystal']}: {$attackResult['crystal']}<br>";
 
           db_planet_set_by_id($target_planet_row['id'], "`metal` = `metal` + {$attackResult['metal']}, `crystal` = `crystal` + {$attackResult['crystal']}");
         }
@@ -175,8 +175,8 @@ 
 
       empty($message) ? $message = classLocale::$lang['mip_no_defense'] : false;
 
-      msg_send_simple_message ( $fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage . $message );
-      msg_send_simple_message ( $fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage . $message );
+      msg_send_simple_message($fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage.$message);
+      msg_send_simple_message($fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage.$message);
     }
     db_missile_delete($fleetRow);
   }

includes/functions/tpl_helpers.php

Spacing +30 added lines, -30 removed lines

@@ -2,8 +2,8 @@ 
 
 // Compare function to sort fleet in time order
 function tpl_assign_fleet_compare($a, $b) {
-  if($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET']) {
-    if($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT']) {
+  if ($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET']) {
+    if ($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT']) {
       return 0;
     }
 
@@ -19,17 +19,17 @@ 
  * @param string   $js_name
  */
 function tpl_assign_fleet(&$template, $fleets, $js_name = 'fleets') {
-  if(!$fleets) {
+  if (!$fleets) {
     return;
   }
 
   usort($fleets, 'tpl_assign_fleet_compare');
 
-  foreach($fleets as $fleet_data) {
+  foreach ($fleets as $fleet_data) {
     $template->assign_block_vars($js_name, $fleet_data['fleet']);
 
-    if($fleet_data['ships']) {
-      foreach($fleet_data['ships'] as $ship_data) {
+    if ($fleet_data['ships']) {
+      foreach ($fleet_data['ships'] as $ship_data) {
         $template->assign_block_vars("{$js_name}.ships", $ship_data);
       }
     }
@@ -50,8 +50,8 @@ 
     'DEUTERIUM' => $fleet[RES_DEUTERIUM],
   );
 
-  foreach($fleet as $ship_id => $ship_amount) {
-    if(in_array($ship_id, sn_get_groups('fleet'))) {
+  foreach ($fleet as $ship_id => $ship_amount) {
+    if (in_array($ship_id, sn_get_groups('fleet'))) {
       $single_ship_data = get_ship_data($ship_id, $user_data);
       $return['ships'][$ship_id] = array(
         'ID'          => $ship_id,
@@ -90,11 +90,11 @@ 
 
   $result = array();
 
-  if(!$user_data) {
+  if (!$user_data) {
     $user_data = $user;
   }
 
-  if(!$objFleet->isReturning() && $objFleet->mission_type == MT_ACS) {
+  if (!$objFleet->isReturning() && $objFleet->mission_type == MT_ACS) {
     $aks = db_acs_get_by_group_id($objFleet->group_id);
   }
 
@@ -113,7 +113,7 @@ 
     'MISSION'      => $objFleet->mission_type,
     'MISSION_NAME' => classLocale::$lang['type_mission'][$objFleet->mission_type],
     'ACS'          => !empty($aks['name']) ? $aks['name'] : (!empty($objFleet->group_id) ? $objFleet->group_id : ''),
-    'AMOUNT'       => $spy_level >= 4 ? (pretty_number($objFleet->shipsGetTotal()) . (array_sum($fleet_resources) ? '+' : '')) : '?',
+    'AMOUNT'       => $spy_level >= 4 ? (pretty_number($objFleet->shipsGetTotal()).(array_sum($fleet_resources) ? '+' : '')) : '?',
 
     'METAL'     => $spy_level >= 8 ? $fleet_resources[RES_METAL] : 0,
     'CRYSTAL'   => $spy_level >= 8 ? $fleet_resources[RES_CRYSTAL] : 0,
@@ -135,14 +135,14 @@ 
     'STAY_LEFT' => floor($objFleet->time_mission_job_complete + 1 - SN_TIME_NOW),
   );
 
-  if(property_exists($objFleet, 'fleet_start_name')) {
+  if (property_exists($objFleet, 'fleet_start_name')) {
     $result['START_NAME'] = $objFleet->fleet_start_name;
   }
-  if(property_exists($objFleet, 'fleet_end_name')) {
+  if (property_exists($objFleet, 'fleet_end_name')) {
     $result['END_NAME'] = $objFleet->fleet_end_name;
   }
 
-  if(property_exists($objFleet, 'event_time')) {
+  if (property_exists($objFleet, 'event_time')) {
     $result['fleet'] = array_merge($result['fleet'], array(
       'OV_LABEL'        => $objFleet->ov_label,
       'EVENT_TIME_TEXT' => property_exists($objFleet, 'event_time') ? date(FMT_DATE_TIME, $objFleet->event_time + SN_CLIENT_TIME_DIFF) : '',
@@ -155,9 +155,9 @@ 
 
   $ship_id = 0;
   $result['ships'] = array();
-  if($spy_level >= 6) {
-    foreach($ship_list_fully_parsed as $ship_sn_id => $ship_amount) {
-      if($spy_level >= 10) {
+  if ($spy_level >= 6) {
+    foreach ($ship_list_fully_parsed as $ship_sn_id => $ship_amount) {
+      if ($spy_level >= 10) {
         $single_ship_data = get_ship_data($ship_sn_id, $user_data);
         $result['ships'][$ship_sn_id] = array(
           'ID'          => $ship_sn_id,
@@ -190,8 +190,8 @@ 
 function tpl_parse_planet_que($que, $planet, $que_id) {
   $hangar_que = array();
   $que_hangar = $que['ques'][$que_id][$planet['id_owner']][$planet['id']];
-  if(!empty($que_hangar)) {
-    foreach($que_hangar as $que_item) {
+  if (!empty($que_hangar)) {
+    foreach ($que_hangar as $que_item) {
       $hangar_que['que'][] = array('id' => $que_item['que_unit_id'], 'count' => $que_item['que_unit_amount']);
       $hangar_que[$que_item['que_unit_id']] += $que_item['que_unit_amount'];
     }
@@ -251,10 +251,10 @@ 
     'PLANET_GOVERNOR_LEVEL_MAX' => get_unit_param($planet['PLANET_GOVERNOR_ID'], P_MAX_STACK),
   );
 
-  if(!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']])) {
+  if (!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']])) {
     $result['building_que'] = array();
     $building_que = &$que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']];
-    foreach($building_que as $que_element) {
+    foreach ($building_que as $que_element) {
       $result['building_que'][] = que_tpl_parse_element($que_element);
     }
   }
@@ -270,19 +270,19 @@ 
 function flt_get_fleets_to_planet_by_array_of_Fleet($array_of_Fleet) {
   global $user;
 
-  if(empty($array_of_Fleet)) {
+  if (empty($array_of_Fleet)) {
     return false;
   }
 
   $fleet_list = array();
-  foreach($array_of_Fleet as $fleet) {
-    if($fleet->playerOwnerId == $user['id']) {
-      if($fleet->mission_type == MT_MISSILE) {
+  foreach ($array_of_Fleet as $fleet) {
+    if ($fleet->playerOwnerId == $user['id']) {
+      if ($fleet->mission_type == MT_MISSILE) {
         continue;
       }
       $fleet_ownage = 'own';
     } else {
-      switch($fleet->mission_type) {
+      switch ($fleet->mission_type) {
         case MT_ATTACK:
         case MT_ACS:
         case MT_DESTROY:
@@ -299,10 +299,10 @@ 
 
     $fleet_list[$fleet_ownage]['fleets'][$fleet->dbId] = $fleet;
 
-    if($fleet->isReturning() || (!$fleet->isReturning() && $fleet->mission_type == MT_RELOCATE) || ($fleet->target_owner_id != $user['id'])) {
+    if ($fleet->isReturning() || (!$fleet->isReturning() && $fleet->mission_type == MT_RELOCATE) || ($fleet->target_owner_id != $user['id'])) {
       $fleet_sn = $fleet->shipsGetArray();
-      foreach($fleet_sn as $ship_id => $ship_amount) {
-        if(in_array($ship_id, sn_get_groups('fleet'))) {
+      foreach ($fleet_sn as $ship_id => $ship_amount) {
+        if (in_array($ship_id, sn_get_groups('fleet'))) {
           $fleet_list[$fleet_ownage]['total'][$ship_id] += $ship_amount;
         }
       }
@@ -319,7 +319,7 @@ 
   return $fleet_list;
 }
 
-function tpl_set_resource_info(template &$template, $planet_row, $fleets_to_planet = array(), $round = 0) {
+function tpl_set_resource_info(template & $template, $planet_row, $fleets_to_planet = array(), $round = 0) {
   $template->assign_vars(array(
     'RESOURCE_ROUNDING' => $round,