supernova-ws / SuperNova

scheduler.php

Spacing +2 added lines, -2 removed lines

@@ -24,11 +24,11 @@
 
 // require_once('includes/includes/scheduler_process.php');
 
-if(($result = scheduler_process()) && !defined('IN_ADMIN')) {
+if (($result = scheduler_process()) && !defined('IN_ADMIN')) {
   $result = htmlspecialchars($result, ENT_QUOTES, 'UTF-8');
   print(json_encode($result));
 }
 
-if(!defined('IN_ADMIN')) {
+if (!defined('IN_ADMIN')) {
   die();
 }

messages.php

Switch Indentation +124 added lines, -124 removed lines

@@ -48,112 +48,112 @@ 
 }
 
 switch ($mode) {
-  case 'write':
-    $error_list = array();
-    $template = gettemplate('msg_message_compose', true);
+    case 'write':
+      $error_list = array();
+      $template = gettemplate('msg_message_compose', true);
 
-    $recipient_name = sys_get_param_str_unsafe('recipient_name');
-    if($recipient_name) {
-      $recipient_row = db_user_by_username($recipient_name);
-    }
+      $recipient_name = sys_get_param_str_unsafe('recipient_name');
+      if($recipient_name) {
+        $recipient_row = db_user_by_username($recipient_name);
+      }
 
-    if(!$recipient_row) {
-      $recipient_id = sys_get_param_id('id');
-      $recipient_row = db_user_by_id($recipient_id);
       if(!$recipient_row) {
-        $recipient_id = 0;
+        $recipient_id = sys_get_param_id('id');
+        $recipient_row = db_user_by_id($recipient_id);
+        if(!$recipient_row) {
+          $recipient_id = 0;
+        }
       }
-    }
 
-    if($recipient_row) {
-      $recipient_id = $recipient_row['id'];
-      $recipient_name = $recipient_row['username'];
-    }
+      if($recipient_row) {
+        $recipient_id = $recipient_row['id'];
+        $recipient_name = $recipient_row['username'];
+      }
 
-    if($recipient_id == $user['id']) {
-      $error_list[] = array('MESSAGE' => $lang['msg_err_self_send'], 'STATUS' => ERR_ERROR);
-    }
+      if($recipient_id == $user['id']) {
+        $error_list[] = array('MESSAGE' => $lang['msg_err_self_send'], 'STATUS' => ERR_ERROR);
+      }
 
-    $re = 0;
-    $subject = sys_get_param_str('subject');
-    while(strpos($subject, $lang['msg_answer_prefix']) !== false) {
-      $subject = substr($subject, strlen($lang['msg_answer_prefix']));
-      $re++;
-    }
-    $re ? $subject = $lang['msg_answer_prefix'] . $subject : false;
+      $re = 0;
+      $subject = sys_get_param_str('subject');
+      while(strpos($subject, $lang['msg_answer_prefix']) !== false) {
+        $subject = substr($subject, strlen($lang['msg_answer_prefix']));
+        $re++;
+      }
+      $re ? $subject = $lang['msg_answer_prefix'] . $subject : false;
 
-    if(sys_get_param_str('msg_send')) {
-      $subject = $subject ? $subject : $lang['msg_subject_default'];
+      if(sys_get_param_str('msg_send')) {
+        $subject = $subject ? $subject : $lang['msg_subject_default'];
 
-      if(!$recipient_id) {
-        $error_list[] = array('MESSAGE' => $lang['msg_err_player_not_found'], 'STATUS' => ERR_ERROR);
-      }
+        if(!$recipient_id) {
+          $error_list[] = array('MESSAGE' => $lang['msg_err_player_not_found'], 'STATUS' => ERR_ERROR);
+        }
 
-      $text = sys_get_param_str('text');
-      if(!$text) {
-        $error_list[] = array('MESSAGE' => $lang['msg_err_no_text'], 'STATUS' => ERR_ERROR);
-      }
+        $text = sys_get_param_str('text');
+        if(!$text) {
+          $error_list[] = array('MESSAGE' => $lang['msg_err_no_text'], 'STATUS' => ERR_ERROR);
+        }
 
-      if(empty($error_list)) {
-        $error_list[] = array('MESSAGE' => $lang['msg_not_message_sent'], 'STATUS' => ERR_NONE);
+        if(empty($error_list)) {
+          $error_list[] = array('MESSAGE' => $lang['msg_not_message_sent'], 'STATUS' => ERR_NONE);
 
-        $user_safe_name = db_escape($user['username']);
-        $recipient_name = db_escape($recipient_name);
-        msg_send_simple_message($recipient_id, $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, "{$user_safe_name} [{$user['galaxy']}:{$user['system']}:{$user['planet']}]", $subject, $text, true);
+          $user_safe_name = db_escape($user['username']);
+          $recipient_name = db_escape($recipient_name);
+          msg_send_simple_message($recipient_id, $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, "{$user_safe_name} [{$user['galaxy']}:{$user['system']}:{$user['planet']}]", $subject, $text, true);
 
-        //$recipient_id = 0;
-        //$recipient_name = '';
-        //$subject = '';
-        $text    = '';
+          //$recipient_id = 0;
+          //$recipient_name = '';
+          //$subject = '';
+          $text    = '';
 
-        $msg_sent = true;
-      } else {
-        $subject = sys_get_param_str_unsafe('subject');
-        $text = sys_get_param_str_unsafe('text');
+          $msg_sent = true;
+        } else {
+          $subject = sys_get_param_str_unsafe('subject');
+          $text = sys_get_param_str_unsafe('text');
+        }
+        $recipient_name = sys_get_param_str_unsafe('recipient_name');
       }
-      $recipient_name = sys_get_param_str_unsafe('recipient_name');
-    }
 
-    $subject = $subject ? $subject : $lang['msg_subject_default'];
+      $subject = $subject ? $subject : $lang['msg_subject_default'];
 
-    $template->assign_vars(array(
-      'RECIPIENT_ID'   => $recipient_id,
-      'RECIPIENT_NAME' => htmlspecialchars($recipient_name),
-      'SUBJECT'        => htmlspecialchars($subject),
-      'TEXT'           => htmlspecialchars($text),
-    ));
+      $template->assign_vars(array(
+        'RECIPIENT_ID'   => $recipient_id,
+        'RECIPIENT_NAME' => htmlspecialchars($recipient_name),
+        'SUBJECT'        => htmlspecialchars($subject),
+        'TEXT'           => htmlspecialchars($text),
+      ));
 
-    foreach($error_list as $error_message) {
-      $template->assign_block_vars('result', $error_message);
-    }
+      foreach($error_list as $error_message) {
+        $template->assign_block_vars('result', $error_message);
+      }
 
-    $message_query = doquery(
-      "SELECT * FROM {{messages}}
+      $message_query = doquery(
+        "SELECT * FROM {{messages}}
         WHERE
           `message_type` = '" . MSG_TYPE_PLAYER . "' AND
           ((`message_owner` = '{$user['id']}' AND `message_sender` = '{$recipient_id}')
           OR
           (`message_sender` = '{$user['id']}' AND `message_owner` = '{$recipient_id}')) ORDER BY `message_time` DESC LIMIT 20;");
-    while ($message_row = db_fetch($message_query)) {
-      $template->assign_block_vars('messages', array(
-        'ID'             => $message_row['message_id'],
-        'DATE'           => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
-        'FROM'           => htmlspecialchars($message_row['message_from']),
-        'SUBJ'           => htmlspecialchars($message_row['message_subject']),
-        'TEXT'           => in_array($message_row['message_type'], array(MSG_TYPE_PLAYER, MSG_TYPE_ALLIANCE)) && $message_row['message_sender'] ? nl2br(htmlspecialchars($message_row['message_text'])) : nl2br($message_row['message_text']),
-
-        'FROM_ID'        => $message_row['message_sender'],
-      ));
-    }
+      while ($message_row = db_fetch($message_query)) {
+        $template->assign_block_vars('messages', array(
+          'ID'             => $message_row['message_id'],
+          'DATE'           => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
+          'FROM'           => htmlspecialchars($message_row['message_from']),
+          'SUBJ'           => htmlspecialchars($message_row['message_subject']),
+          'TEXT'           => in_array($message_row['message_type'], array(MSG_TYPE_PLAYER, MSG_TYPE_ALLIANCE)) && $message_row['message_sender'] ? nl2br(htmlspecialchars($message_row['message_text'])) : nl2br($message_row['message_text']),
+
+          'FROM_ID'        => $message_row['message_sender'],
+        ));
+      }
 
-  break;
+    break;
 
-  case 'delete':
-    $query_add = '';
+    case 'delete':
+      $query_add = '';
 
-    $message_range = sys_get_param_str('message_range');
+      $message_range = sys_get_param_str('message_range');
 
-    switch($message_range) {
+      switch($message_range) {
       case 'unchecked':
       case 'checked':
         $marked_message_list = sys_get_param('mark', array());
@@ -177,66 +177,66 @@ 
       case 'all':
         $query_add = $query_add ? $query_add : true;
       break;
-    }
+      }
 
     if($query_add) {
       $query_add = $query_add === true ? '' : $query_add;
       doquery("DELETE FROM `{{messages}}` WHERE `message_owner` = '{$user['id']}'{$query_add};");
     }
 
-  case 'show':
-    if($current_class == MSG_TYPE_OUTBOX) {
-      $message_query = db_message_list_outbox_by_user_id($user['id']);
-    } else {
-      if ($current_class == MSG_TYPE_NEW) {
-        $SubUpdateQry = array();
-        foreach($sn_message_class_list as $message_class_id => $message_class) {
-          if($message_class_id != MSG_TYPE_OUTBOX) {
-            $SubUpdateQry[] = "`{$message_class['name']}` = '0'";
-            $user[$message_class['name']] = 0;
+    case 'show':
+      if($current_class == MSG_TYPE_OUTBOX) {
+        $message_query = db_message_list_outbox_by_user_id($user['id']);
+      } else {
+        if ($current_class == MSG_TYPE_NEW) {
+          $SubUpdateQry = array();
+          foreach($sn_message_class_list as $message_class_id => $message_class) {
+            if($message_class_id != MSG_TYPE_OUTBOX) {
+              $SubUpdateQry[] = "`{$message_class['name']}` = '0'";
+              $user[$message_class['name']] = 0;
+            }
           }
+          $SubUpdateQry = implode(',', $SubUpdateQry);
+        } else {
+          $SubUpdateQry = "`{$sn_message_class_list[$current_class]['name']}` = '0', `{$sn_message_class_list[MSG_TYPE_NEW]['name']}` = `{$sn_message_class_list[MSG_TYPE_NEW]['name']}` - '{$user[$sn_message_class_list[$current_class]['name']]}'";
+          $SubSelectQry = "AND `message_type` = '{$current_class}'";
+
+          $user[$sn_message_class_list[MSG_TYPE_NEW]['name']] -= $user[$sn_message_class_list[$current_class]['name']];
+          $user[$sn_message_class_list[$current_class]['name']] = 0;
         }
-        $SubUpdateQry = implode(',', $SubUpdateQry);
-      } else {
-        $SubUpdateQry = "`{$sn_message_class_list[$current_class]['name']}` = '0', `{$sn_message_class_list[MSG_TYPE_NEW]['name']}` = `{$sn_message_class_list[MSG_TYPE_NEW]['name']}` - '{$user[$sn_message_class_list[$current_class]['name']]}'";
-        $SubSelectQry = "AND `message_type` = '{$current_class}'";
 
-        $user[$sn_message_class_list[MSG_TYPE_NEW]['name']] -= $user[$sn_message_class_list[$current_class]['name']];
-        $user[$sn_message_class_list[$current_class]['name']] = 0;
+        db_user_set_by_id($user['id'], $SubUpdateQry);
+        $message_query = "SELECT * FROM {{messages}} WHERE `message_owner` = '{$user['id']}' {$SubSelectQry} ORDER BY `message_time` DESC;";
+        $message_query = doquery($message_query);
       }
 
-      db_user_set_by_id($user['id'], $SubUpdateQry);
-      $message_query = "SELECT * FROM {{messages}} WHERE `message_owner` = '{$user['id']}' {$SubSelectQry} ORDER BY `message_time` DESC;";
-      $message_query = doquery($message_query);
-    }
-
-    if(sys_get_param_int('return')) {
-      header('Location: messages.php');
-      die();
-    }
+      if(sys_get_param_int('return')) {
+        header('Location: messages.php');
+        die();
+      }
 
-    $template = gettemplate('msg_message_list', true);
-    while ($message_row = db_fetch($message_query)) {
-      $template->assign_block_vars('messages', array(
-        'ID'             => $message_row['message_id'],
-        'DATE'           => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
-        'FROM'           => htmlspecialchars($message_row['message_from']),
-        'SUBJ'           => htmlspecialchars($message_row['message_subject']),
-        'TEXT'           => in_array($message_row['message_type'], array(MSG_TYPE_PLAYER, MSG_TYPE_ALLIANCE)) && $message_row['message_sender'] ? nl2br(htmlspecialchars($message_row['message_text'])) : nl2br($message_row['message_text']),
-
-        'FROM_ID'        => $message_row['message_sender'],
-        'SUBJ_SANITIZED' => htmlspecialchars($message_row['message_subject']),
-        'STYLE'          => $current_class == MSG_TYPE_OUTBOX ? $sn_message_class_list[MSG_TYPE_OUTBOX]['name'] : $sn_message_class_list[$message_row['message_type']]['name'],
-      ));
-    }
+      $template = gettemplate('msg_message_list', true);
+      while ($message_row = db_fetch($message_query)) {
+        $template->assign_block_vars('messages', array(
+          'ID'             => $message_row['message_id'],
+          'DATE'           => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
+          'FROM'           => htmlspecialchars($message_row['message_from']),
+          'SUBJ'           => htmlspecialchars($message_row['message_subject']),
+          'TEXT'           => in_array($message_row['message_type'], array(MSG_TYPE_PLAYER, MSG_TYPE_ALLIANCE)) && $message_row['message_sender'] ? nl2br(htmlspecialchars($message_row['message_text'])) : nl2br($message_row['message_text']),
+
+          'FROM_ID'        => $message_row['message_sender'],
+          'SUBJ_SANITIZED' => htmlspecialchars($message_row['message_subject']),
+          'STYLE'          => $current_class == MSG_TYPE_OUTBOX ? $sn_message_class_list[MSG_TYPE_OUTBOX]['name'] : $sn_message_class_list[$message_row['message_type']]['name'],
+        ));
+      }
 
-    $current_class_text = $lang['msg_class'][$current_class];
+      $current_class_text = $lang['msg_class'][$current_class];
 
-    $template->assign_vars(array(
-      "MESSAGE_CLASS"      => $current_class,
-      "MESSAGE_CLASS_TEXT" => $current_class_text,
-    ));
-  break;
+      $template->assign_vars(array(
+        "MESSAGE_CLASS"      => $current_class,
+        "MESSAGE_CLASS_TEXT" => $current_class_text,
+      ));
+    break;
 }
 
 if(!$template) {

Spacing +26 added lines, -26 removed lines

@@ -42,7 +42,7 @@ 
 
 $mode = sys_get_param_str('msg_delete') ? 'delete' : sys_get_param_str('mode');
 $current_class = sys_get_param_int('message_class');
-if(!isset($sn_message_class_list[$current_class])) {
+if (!isset($sn_message_class_list[$current_class])) {
   $current_class = 0;
   $mode = '';
 }
@@ -53,48 +53,48 @@ 
     $template = gettemplate('msg_message_compose', true);
 
     $recipient_name = sys_get_param_str_unsafe('recipient_name');
-    if($recipient_name) {
+    if ($recipient_name) {
       $recipient_row = db_user_by_username($recipient_name);
     }
 
-    if(!$recipient_row) {
+    if (!$recipient_row) {
       $recipient_id = sys_get_param_id('id');
       $recipient_row = db_user_by_id($recipient_id);
-      if(!$recipient_row) {
+      if (!$recipient_row) {
         $recipient_id = 0;
       }
     }
 
-    if($recipient_row) {
+    if ($recipient_row) {
       $recipient_id = $recipient_row['id'];
       $recipient_name = $recipient_row['username'];
     }
 
-    if($recipient_id == $user['id']) {
+    if ($recipient_id == $user['id']) {
       $error_list[] = array('MESSAGE' => $lang['msg_err_self_send'], 'STATUS' => ERR_ERROR);
     }
 
     $re = 0;
     $subject = sys_get_param_str('subject');
-    while(strpos($subject, $lang['msg_answer_prefix']) !== false) {
+    while (strpos($subject, $lang['msg_answer_prefix']) !== false) {
       $subject = substr($subject, strlen($lang['msg_answer_prefix']));
       $re++;
     }
     $re ? $subject = $lang['msg_answer_prefix'] . $subject : false;
 
-    if(sys_get_param_str('msg_send')) {
+    if (sys_get_param_str('msg_send')) {
       $subject = $subject ? $subject : $lang['msg_subject_default'];
 
-      if(!$recipient_id) {
+      if (!$recipient_id) {
         $error_list[] = array('MESSAGE' => $lang['msg_err_player_not_found'], 'STATUS' => ERR_ERROR);
       }
 
       $text = sys_get_param_str('text');
-      if(!$text) {
+      if (!$text) {
         $error_list[] = array('MESSAGE' => $lang['msg_err_no_text'], 'STATUS' => ERR_ERROR);
       }
 
-      if(empty($error_list)) {
+      if (empty($error_list)) {
         $error_list[] = array('MESSAGE' => $lang['msg_not_message_sent'], 'STATUS' => ERR_NONE);
 
         $user_safe_name = db_escape($user['username']);
@@ -104,7 +104,7 @@ 
         //$recipient_id = 0;
         //$recipient_name = '';
         //$subject = '';
-        $text    = '';
+        $text = '';
 
         $msg_sent = true;
       } else {
@@ -123,7 +123,7 @@ 
       'TEXT'           => htmlspecialchars($text),
     ));
 
-    foreach($error_list as $error_message) {
+    foreach ($error_list as $error_message) {
       $template->assign_block_vars('result', $error_message);
     }
 
@@ -153,25 +153,25 @@ 
 
     $message_range = sys_get_param_str('message_range');
 
-    switch($message_range) {
+    switch ($message_range) {
       case 'unchecked':
       case 'checked':
         $marked_message_list = sys_get_param('mark', array());
-        if($message_range == 'checked' && empty($marked_message_list)) {
+        if ($message_range == 'checked' && empty($marked_message_list)) {
           break;
         }
 
         $query_add = implode(',', $marked_message_list);
-        if($query_add) {
+        if ($query_add) {
           $query_add = "IN ({$query_add})";
-          if($message_range == 'unchecked') {
+          if ($message_range == 'unchecked') {
             $query_add = "NOT {$query_add}";
           }
           $query_add = " AND `message_id` {$query_add}";
         }
 
       case 'class':
-        if($current_class != MSG_TYPE_OUTBOX && $current_class != MSG_TYPE_NEW) {
+        if ($current_class != MSG_TYPE_OUTBOX && $current_class != MSG_TYPE_NEW) {
           $query_add .= " AND `message_type` = {$current_class}";
         }
       case 'all':
@@ -179,19 +179,19 @@ 
       break;
     }
 
-    if($query_add) {
+    if ($query_add) {
       $query_add = $query_add === true ? '' : $query_add;
       doquery("DELETE FROM `{{messages}}` WHERE `message_owner` = '{$user['id']}'{$query_add};");
     }
 
   case 'show':
-    if($current_class == MSG_TYPE_OUTBOX) {
+    if ($current_class == MSG_TYPE_OUTBOX) {
       $message_query = db_message_list_outbox_by_user_id($user['id']);
     } else {
       if ($current_class == MSG_TYPE_NEW) {
         $SubUpdateQry = array();
-        foreach($sn_message_class_list as $message_class_id => $message_class) {
-          if($message_class_id != MSG_TYPE_OUTBOX) {
+        foreach ($sn_message_class_list as $message_class_id => $message_class) {
+          if ($message_class_id != MSG_TYPE_OUTBOX) {
             $SubUpdateQry[] = "`{$message_class['name']}` = '0'";
             $user[$message_class['name']] = 0;
           }
@@ -210,7 +210,7 @@ 
       $message_query = doquery($message_query);
     }
 
-    if(sys_get_param_int('return')) {
+    if (sys_get_param_int('return')) {
       header('Location: messages.php');
       die();
     }
@@ -239,11 +239,11 @@ 
   break;
 }
 
-if(!$template) {
+if (!$template) {
   $template = gettemplate('msg_message_class', true);
 
   $query = doquery("SELECT message_owner, message_type, COUNT(message_owner) AS message_count FROM {{messages}} WHERE `message_owner` = {$user['id']} GROUP BY message_owner, message_type ORDER BY message_owner ASC, message_type;");
-  while($message_row = db_fetch($query)) {
+  while ($message_row = db_fetch($query)) {
     $messages_total[$message_row['message_type']]  = $message_row['message_count'];
     $messages_total[MSG_TYPE_NEW]                 += $message_row['message_count'];
   }
@@ -251,7 +251,7 @@ 
   $query = doquery("SELECT COUNT(message_sender) AS message_count FROM {{messages}} WHERE `message_sender` = '{$user['id']}' AND message_type = 1 GROUP BY message_sender;", '', true);
   $messages_total[MSG_TYPE_OUTBOX] = intval($query['message_count']);
 
-  foreach($sn_message_class_list as $message_class_id => $message_class) {
+  foreach ($sn_message_class_list as $message_class_id => $message_class) {
     $template->assign_block_vars('message_class', array(
       'ID'     => $message_class_id,
       'STYLE'  => $message_class['name'],

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

@@ -165,7 +165,7 @@
         if($query_add) {
           $query_add = "IN ({$query_add})";
           if($message_range == 'unchecked') {
-            $query_add = "NOT {$query_add}";
+            $query_add = "not {$query_add}";
           }
           $query_add = " AND `message_id` {$query_add}";
         }

includes/general/math.php

Spacing +20 added lines, -20 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 function geometry_progression_sum($n, $b1, $q) {
-  return $q != 1 ? ($b1 * (pow($q, $n) - 1)/($q - 1)) : ($n * $b1);
+  return $q != 1 ? ($b1 * (pow($q, $n) - 1) / ($q - 1)) : ($n * $b1);
 }
 
 function sn_floor($value)
@@ -43,8 +43,8 @@ 
  *
  * @return float|int
  */
-function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false)  {
-  if($cut_extreme) {
+function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false) {
+  if ($cut_extreme) {
     $range_start--;
     $range_end++;
   }
@@ -60,7 +60,7 @@ 
 {
   $args = func_get_args();
 
-  switch(func_num_args())
+  switch (func_num_args())
   {
     case 0:
       // trigger_error('median() requires at least one parameter',E_USER_WARNING);
@@ -72,7 +72,7 @@ 
     // fallthrough
 
     default:
-      if(!is_array($args))
+      if (!is_array($args))
       {
         // trigger_error('median() requires a list of numbers to operate on or an array of numbers', E_USER_NOTICE);
         return false;
@@ -83,9 +83,9 @@ 
       $n = count($args);
       $h = intval($n / 2);
 
-      if($n % 2 == 0)
+      if ($n % 2 == 0)
       {
-        $median = ($args[$h] + $args[$h-1]) / 2;
+        $median = ($args[$h] + $args[$h - 1]) / 2;
       }
       else
       {
@@ -103,47 +103,47 @@ 
 }
 function linear_calc(&$linear, $from = 0, $debug = false)
 {
-  for($i = $from; $i < count($linear); $i++)
+  for ($i = $from; $i < count($linear); $i++)
   {
     $eq = &$linear[$i];
-    for($j = count($eq) - 1; $j >= $from; $j--)
+    for ($j = count($eq) - 1; $j >= $from; $j--)
     {
       $eq[$j] /= $eq[$from];
     }
   }
-  if($debug) pdump($linear, 'Нормализовано по х' . $from);
+  if ($debug) pdump($linear, 'Нормализовано по х' . $from);
 
-  for($i = $from + 1; $i < count($linear); $i++)
+  for ($i = $from + 1; $i < count($linear); $i++)
   {
     $eq = &$linear[$i];
-    for($j = count($eq) - 1; $j >= $from; $j--)
+    for ($j = count($eq) - 1; $j >= $from; $j--)
     {
       $eq[$j] -= $linear[$from][$j];
     }
   }
-  if($debug) pdump($linear, 'Подставили х' . $from);
+  if ($debug) pdump($linear, 'Подставили х' . $from);
 
-  if($from < count($linear) - 1)
+  if ($from < count($linear) - 1)
   {
     linear_calc($linear, $from + 1, $debug);
   }
 
-  if($from)
+  if ($from)
   {
-    for($i = 0; $i < $from; $i++)
+    for ($i = 0; $i < $from; $i++)
     {
       $eq = &$linear[$i];
-      for($j = count($eq) - 1; $j >= $from; $j--)
+      for ($j = count($eq) - 1; $j >= $from; $j--)
       {
         $eq[$j] = $eq[$j] - $eq[$from] * $linear[$from][$j];
       }
     }
-    if($debug) pdump($linear, 'Подставили обратно х' . $from);
+    if ($debug) pdump($linear, 'Подставили обратно х' . $from);
   }
   else
   {
-    if($debug) pdump($linear, 'Результат' . $from);
-    foreach($linear as $index => &$eq)
+    if ($debug) pdump($linear, 'Результат' . $from);
+    foreach ($linear as $index => &$eq)
     {
       pdump($eq[count($linear)], 'x' . $index);
     }

Doc Comments +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 /**
  * @param float      $range_start - Начало диапазона
  * @param float      $range_end - Конец диапазона
- * @param bool|int  $round - До скольки знаков округлять результат. False - не округлять, True - округлять до целого, 1 - округлять до десятков, 2 - до сотен итд
+ * @param boolean  $round - До скольки знаков округлять результат. False - не округлять, True - округлять до целого, 1 - округлять до десятков, 2 - до сотен итд
  * @param int        $strict - В сколько сигм надо уложить результат
  * @param bool|false $cut_extreme - надо ли обрезать крайние значения. Например, при $strict = 2 их слишком много
  *

Braces +20 added lines, -19 removed lines

@@ -4,16 +4,14 @@ 
   return $q != 1 ? ($b1 * (pow($q, $n) - 1)/($q - 1)) : ($n * $b1);
 }
 
-function sn_floor($value)
-{
+function sn_floor($value) {
   return $value >= 0 ? floor($value) : ceil($value);
 }
 
 // Эта функция выдает нормально распределенное случайное число с матожиднием $mu и стандартным отклонением $sigma
 // $strict - количество $sigma, по которым идет округление функции. Т.е. $strict = 3 означает, что диапазон значений обрезается по +-3 * $sigma
 // Используется http://ru.wikipedia.org/wiki/Преобразование_Бокса_—_Мюллера
-function sn_rand_gauss($mu = 0, $sigma = 1, $strict = false)
-{
+function sn_rand_gauss($mu = 0, $sigma = 1, $strict = false) {
   // http://ru.wikipedia.org/wiki/Среднеквадратическое_отклонение
   // При $mu = 0 (график симметричный, цифры только для половины графика)
   // От 0 до $sigma ~ 34.1%
@@ -43,7 +41,7 @@ 
  *
  * @return float|int
  */
-function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false)  {
+function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false) {
   if($cut_extreme) {
     $range_start--;
     $range_end++;
@@ -56,8 +54,7 @@ 
   return $result;
 }
 
-function median()
-{
+function median() {
   $args = func_get_args();
 
   switch(func_num_args())
@@ -86,8 +83,7 @@ 
       if($n % 2 == 0)
       {
         $median = ($args[$h] + $args[$h-1]) / 2;
-      }
-      else
+      } else
       {
         $median = $args[$h];
       }
@@ -97,12 +93,10 @@ 
 
   return $median;
 }
-function average($arr)
-{
+function average($arr) {
   return is_array($arr) && count($arr) ? array_sum($arr) / count($arr) : 0;
 }
-function linear_calc(&$linear, $from = 0, $debug = false)
-{
+function linear_calc(&$linear, $from = 0, $debug = false) {
   for($i = $from; $i < count($linear); $i++)
   {
     $eq = &$linear[$i];
@@ -111,7 +105,9 @@ 
       $eq[$j] /= $eq[$from];
     }
   }
-  if($debug) pdump($linear, 'Нормализовано по х' . $from);
+  if($debug) {
+    pdump($linear, 'Нормализовано по х' . $from);
+  }
 
   for($i = $from + 1; $i < count($linear); $i++)
   {
@@ -121,7 +117,9 @@ 
       $eq[$j] -= $linear[$from][$j];
     }
   }
-  if($debug) pdump($linear, 'Подставили х' . $from);
+  if($debug) {
+    pdump($linear, 'Подставили х' . $from);
+  }
 
   if($from < count($linear) - 1)
   {
@@ -138,11 +136,14 @@ 
         $eq[$j] = $eq[$j] - $eq[$from] * $linear[$from][$j];
       }
     }
-    if($debug) pdump($linear, 'Подставили обратно х' . $from);
-  }
-  else
+    if($debug) {
+      pdump($linear, 'Подставили обратно х' . $from);
+    }
+  } else
   {
-    if($debug) pdump($linear, 'Результат' . $from);
+    if($debug) {
+      pdump($linear, 'Результат' . $from);
+    }
     foreach($linear as $index => &$eq)
     {
       pdump($eq[count($linear)], 'x' . $index);

includes/general.php

Indentation +1 added lines, -1 removed lines

@@ -815,7 +815,7 @@
       '%H' => '(?P<H>[0-9]{2})',
       '%M' => '(?P<M>[0-9]{2})',
       '%S' => '(?P<S>[0-9]{2})',
-     // usw..
+      // usw..
     );
 
     $rexep = "#".strtr(preg_quote($format), $masks)."#";

Doc Comments +26 added lines, -1 removed lines

@@ -11,6 +11,9 @@ 
 require_once('general/math.php');
 require_once('general_pname.php');
 
+/**
+ * @param string $func_name
+ */
 function sn_function_call($func_name, $func_arg = array())
 {
   global $functions; // All data in $functions should be normalized to valid 'callable' state: '<function_name>'|array('<object_name>', '<method_name>')
@@ -64,6 +67,9 @@ 
 
 // ----------------------------------------------------------------------------------------------------------------
 // Fonction de lecture / ecriture / exploitation de templates
+/**
+ * @param string $filename
+ */
 function sys_file_read($filename)
 {
   return @file_get_contents($filename);
@@ -110,7 +116,7 @@ 
 /**
  * Получение курса обмены валюты в серверную валюту
  *
- * @param $currency_symbol
+ * @param string $currency_symbol
  *
  * @return float
  */
@@ -147,6 +153,7 @@ 
    null  - standard result
    true  - return only style class for current params
    false - return array('text' => $ret, 'class' => $class), where $ret - unstyled
+ * @param boolean $style
  */
 
 function pretty_number($n, $floor = true, $color = false, $limit = false, $style = null)
@@ -266,6 +273,9 @@ 
   return preg_replace($ListCensure, '*', $String);
 }
 
+/**
+ * @param string $email
+ */
 function is_email($email) {
   return(preg_match("/^[-_.[:alnum:]]+@((([[:alnum:]]|[[:alnum:]][[:alnum:]-]*[[:alnum:]])\.)+(ad|ae|aero|af|ag|ai|al|am|an|ao|aq|ar|arpa|as|at|au|aw|az|ba|bb|bd|be|bf|bg|bh|bi|biz|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|com|coop|cr|cs|cu|cv|cx|cy|cz|de|dj|dk|dm|do|dz|ec|edu|ee|eg|eh|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gh|gi|gl|gm|gn|gov|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|in|info|int|io|iq|ir|is|it|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|mg|mh|mil|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|museum|mv|mw|mx|my|mz|na|name|nc|ne|net|nf|ng|ni|nl|no|np|nr|nt|nu|nz|om|org|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|pro|ps|pt|pw|py|qa|re|ro|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|st|su|sv|sy|sz|tc|td|tf|tg|th|tj|tk|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|um|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|za|zm|zw)$|(([0-9][0-9]?|[0-1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-5])\.){3}([0-9][0-9]?|[0-1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-5]))$/i", $email));
 }
@@ -302,6 +312,9 @@ 
   return floatval(sys_get_param($param_name, $default));
 }
 
+/**
+ * @param string $param_name
+ */
 function sys_get_param_escaped($param_name, $default = '')
 {
   return db_escape(sys_get_param($param_name, $default));
@@ -546,6 +559,9 @@ 
 }
 
 // Generates random string of $length symbols from $allowed_chars charset
+/**
+ * @param string $allowed_chars
+ */
 function sys_random_string($length = 16, $allowed_chars = SN_SYS_SEC_CHARS_ALLOWED) {
   $allowed_length = strlen($allowed_chars);
 
@@ -671,6 +687,9 @@ 
   return implode(';', $fleet_string);
 }
 
+/**
+ * @param string $body
+ */
 function mymail($email_unsafe, $title, $body, $from = '', $html = false) {
   global $config, $lang;
 
@@ -958,6 +977,9 @@ 
   return serialize($nick_array);
 }
 
+/**
+ * @param string $nick_string
+ */
 function player_nick_uncompact($nick_string) {
   try {
     $result = unserialize($nick_string);
@@ -1247,6 +1269,9 @@ 
   return $ranks;
 }
 
+/**
+ * @param boolean $planet_id
+ */
 function sys_player_new_adjust($user_id, $planet_id){return sn_function_call('sys_player_new_adjust', array($user_id, $planet_id, &$result));}
 function sn_sys_player_new_adjust($user_id, $planet_id, &$result) {
   return $result;

Spacing +170 added lines, -170 removed lines

@@ -15,7 +15,7 @@ 
 {
   global $functions; // All data in $functions should be normalized to valid 'callable' state: '<function_name>'|array('<object_name>', '<method_name>')
 
-  if(is_array($functions[$func_name]) && !is_callable($functions[$func_name]))
+  if (is_array($functions[$func_name]) && !is_callable($functions[$func_name]))
   {
     // Chain-callable functions should be made as following:
     // 1. Never use incomplete calls with parameters "by default"
@@ -23,11 +23,11 @@ 
     // 3. Use same format for original value and cumulative result (if there is original value)
     // 4. Honor cumulative result
     // 5. Return cumulative result
-    foreach($functions[$func_name] as $func_chain_name)
+    foreach ($functions[$func_name] as $func_chain_name)
     {
       // По идее - это уже тут не нужно, потому что оно все должно быть callable к этому моменту
       // Но для старых модулей...
-      if(is_callable($func_chain_name))
+      if (is_callable($func_chain_name))
       {
         $result = call_user_func_array($func_chain_name, $func_arg);
       }
@@ -37,7 +37,7 @@ 
   {
     // TODO: This is left for backward compatibility. Appropriate code should be rewrote!
     $func_name = isset($functions[$func_name]) && is_callable($functions[$func_name]) ? $functions[$func_name] : ('sn_' . $func_name);
-    if(is_callable($func_name))
+    if (is_callable($func_name))
     {
       $result = call_user_func_array($func_name, $func_arg);
     }
@@ -53,9 +53,9 @@ 
  * @param string $page_name - имя страницы, для которого должен был быть выполнен хук
  */
 function execute_hooks(&$hook_list, &$template, $hook_type = null, $page_name = null) {
-  if(!empty($hook_list)) {
-    foreach($hook_list as $hook) {
-      if(is_callable($hook_call = (is_string($hook) ? $hook : (is_array($hook) ? $hook['callable'] : $hook->callable)))) {
+  if (!empty($hook_list)) {
+    foreach ($hook_list as $hook) {
+      if (is_callable($hook_call = (is_string($hook) ? $hook : (is_array($hook) ? $hook['callable'] : $hook->callable)))) {
         $template = call_user_func($hook_call, $template, $hook_type, $page_name);
       }
     }
@@ -74,19 +74,19 @@ 
   return @file_put_contents($filename, $content, FILE_APPEND);
 }
 
-function get_game_speed($plain = false){return sn_function_call('get_game_speed', array($plain, &$result));}
+function get_game_speed($plain = false) {return sn_function_call('get_game_speed', array($plain, &$result)); }
 function sn_get_game_speed($plain = false, &$result) {
   return $result = classSupernova::$config->game_speed ? classSupernova::$config->game_speed : 1;
 }
 
-function flt_server_flight_speed_multiplier($plain = false){return sn_function_call('flt_server_flight_speed_multiplier', array($plain, &$result));}
+function flt_server_flight_speed_multiplier($plain = false) {return sn_function_call('flt_server_flight_speed_multiplier', array($plain, &$result)); }
 function sn_flt_server_flight_speed_multiplier($plain = false, &$result) {
   global $config;
 
   return $result = classSupernova::$config->fleet_speed;
 }
 
-function game_resource_multiplier($plain = false){return sn_function_call('game_resource_multiplier', array($plain,&$result));}
+function game_resource_multiplier($plain = false) {return sn_function_call('game_resource_multiplier', array($plain, &$result)); }
 function sn_game_resource_multiplier($plain = false, &$result) {
   global $config;
 
@@ -100,7 +100,7 @@ 
  *
  * @return mixed
  */
-function get_mm_cost($plain = false){return sn_function_call('get_mm_cost', array($plain, &$result));}
+function get_mm_cost($plain = false) {return sn_function_call('get_mm_cost', array($plain, &$result)); }
 function sn_get_mm_cost($plain = false, &$result) {
   global $config;
 
@@ -152,11 +152,11 @@ 
 function pretty_number($n, $floor = true, $color = false, $limit = false, $style = null)
 {
   $n = floatval($n);
-  if(is_int($floor))
+  if (is_int($floor))
   {
     $n = round($n, $floor); // , PHP_ROUND_HALF_DOWN
   }
-  elseif($floor === true)
+  elseif ($floor === true)
   {
     $n = floor($n);
     $floor = 0;
@@ -169,11 +169,11 @@ 
   $ret = $n;
 
   $suffix = '';
-  if($limit)
+  if ($limit)
   {
-    if($ret > 0)
+    if ($ret > 0)
     {
-      while($ret > $limit)
+      while ($ret > $limit)
       {
         $suffix .= 'k';
         $ret = round($ret / 1000);
@@ -181,7 +181,7 @@ 
     }
     else
     {
-      while($ret < -$limit)
+      while ($ret < -$limit)
       {
         $suffix .= 'k';
         $ret = round($ret / 1000);
@@ -192,13 +192,13 @@ 
   $ret = number_format($ret, $floor, ',', '.');
   $ret .= $suffix;
 
-  if($color !== false)
+  if ($color !== false)
   {
-    if($color === true)
+    if ($color === true)
     {
       $class = $n == 0 ? 'zero' : ($n > 0 ? 'positive' : 'negative');
     }
-    elseif($color >= 0)
+    elseif ($color >= 0)
     {
       $class = $n == $color ? 'zero' : ($n < $color ? 'positive' : 'negative');
     }
@@ -207,7 +207,7 @@ 
       $class = ($n == -$color) ? 'zero' : ($n < -$color ? 'negative' : 'positive');
     }
 
-    if(!isset($style))
+    if (!isset($style))
     {
       $ret = "<span class='{$class}'>{$ret}</span>";
     }
@@ -342,13 +342,13 @@ 
 function sys_get_param_phone($param_name, $default = '')
 {
   $phone_raw = sys_get_param_str_unsafe($param_name, $default = '');
-  if($phone_raw)
+  if ($phone_raw)
   {
     $phone = $phone_raw[0] == '+' ? '+' : '';
-    for($i = 0; $i < strlen($phone_raw); $i++)
+    for ($i = 0; $i < strlen($phone_raw); $i++)
     {
       $ord = ord($phone_raw[$i]);
-      if($ord >= 48 && $ord <= 57)
+      if ($ord >= 48 && $ord <= 57)
       {
         $phone .= $phone_raw[$i];
       }
@@ -370,7 +370,7 @@ 
 
 function CheckAbandonPlanetState(&$planet)
 {
-  if($planet['destruyed'] && $planet['destruyed'] <= SN_TIME_NOW)
+  if ($planet['destruyed'] && $planet['destruyed'] <= SN_TIME_NOW)
   {
     DBStaticPlanet::db_planet_delete_by_id($planet['id']);
   }
@@ -381,7 +381,7 @@ 
   global $config;
 
   static $rate, $sn_group_resources_all, $sn_group_resources_loot;
-  if(!$rate)
+  if (!$rate)
   {
     $sn_group_resources_all = sn_get_groups('resources_all');
     $sn_group_resources_loot = sn_get_groups('resources_loot');
@@ -392,22 +392,22 @@ 
   }
 
   $unit_cost_data = get_unit_param($unit_id, 'cost');
-  if(!is_array($unit_cost_data))
+  if (!is_array($unit_cost_data))
   {
     return array('total' => 0);
   }
   $factor = isset($unit_cost_data['factor']) ? $unit_cost_data['factor'] : 1;
   $cost_array = array(BUILD_CREATE => array(), 'total' => 0);
   $unit_level = $unit_level > 0 ? $unit_level : 0;
-  foreach($unit_cost_data as $resource_id => $resource_amount)
+  foreach ($unit_cost_data as $resource_id => $resource_amount)
   {
-    if(!in_array($resource_id, $sn_group_resources_all))
+    if (!in_array($resource_id, $sn_group_resources_all))
     {
       continue;
     }
 //    $cost_array[BUILD_CREATE][$resource_id] = $resource_amount * ($factor == 1 ? $unit_level : ((pow($factor, $unit_level) - $factor) / ($factor - 1)));
     $cost_array[BUILD_CREATE][$resource_id] = round($resource_amount * ($factor == 1 ? $unit_level : ((1 - pow($factor, $unit_level)) / (1 - $factor))));
-    if(in_array($resource_id, $sn_group_resources_loot))
+    if (in_array($resource_id, $sn_group_resources_loot))
     {
       $cost_array['total'] += $cost_array[BUILD_CREATE][$resource_id] * $rate[$resource_id];
     }
@@ -416,9 +416,9 @@ 
   return $cost_array;
 }
 
-function sn_unit_purchase($unit_id){}
+function sn_unit_purchase($unit_id) {}
 
-function sn_unit_relocate($unit_id, $from, $to){}
+function sn_unit_relocate($unit_id, $from, $to) {}
 
 /*
   ЭТО ПРОСТОЙ ВРАППЕР ДЛЯ БД! Здесь НЕТ никаких проверок! ВСЕ проверки должны быть сделаны заранее!
@@ -477,48 +477,48 @@ 
 }
 */
 
-function mrc_get_level(&$user, $planet = array(), $unit_id, $for_update = false, $plain = false){return sn_function_call(__FUNCTION__, array(&$user, $planet, $unit_id, $for_update, $plain, &$result));}
+function mrc_get_level(&$user, $planet = array(), $unit_id, $for_update = false, $plain = false) {return sn_function_call(__FUNCTION__, array(&$user, $planet, $unit_id, $for_update, $plain, &$result)); }
 function sn_mrc_get_level(&$user, $planet = array(), $unit_id, $for_update = false, $plain = false, &$result) {
   $mercenary_level = 0;
   $unit_db_name = pname_resource_name($unit_id);
 
-  if(in_array($unit_id, sn_get_groups(array('plans', 'mercenaries', 'tech', 'artifacts')))) {
+  if (in_array($unit_id, sn_get_groups(array('plans', 'mercenaries', 'tech', 'artifacts')))) {
     $unit = classSupernova::db_get_unit_by_location($user['id'], LOC_USER, $user['id'], $unit_id);
     $mercenary_level = is_array($unit) && $unit['unit_level'] ? $unit['unit_level'] : 0;
-  } elseif(in_array($unit_id, sn_get_groups(array('structures', 'fleet', 'defense')))) {
+  } elseif (in_array($unit_id, sn_get_groups(array('structures', 'fleet', 'defense')))) {
     $unit = classSupernova::db_get_unit_by_location(is_array($user) ? $user['id'] : $planet['id_owner'], LOC_PLANET, $planet['id'], $unit_id);
     $mercenary_level = is_array($unit) && $unit['unit_level'] ? $unit['unit_level'] : 0;
-  } elseif(in_array($unit_id, sn_get_groups('governors'))) {
+  } elseif (in_array($unit_id, sn_get_groups('governors'))) {
     $mercenary_level = $unit_id == $planet['PLANET_GOVERNOR_ID'] ? $planet['PLANET_GOVERNOR_LEVEL'] : 0;
-  } elseif($unit_id == RES_DARK_MATTER) {
+  } elseif ($unit_id == RES_DARK_MATTER) {
     $mercenary_level = $user[$unit_db_name] + ($plain || $user['user_as_ally'] ? 0 : classSupernova::$auth->account->account_metamatter);
-  } elseif($unit_id == RES_METAMATTER) {
+  } elseif ($unit_id == RES_METAMATTER) {
     $mercenary_level = classSupernova::$auth->account->account_metamatter; //$user[$unit_db_name];
-  } elseif(in_array($unit_id, sn_get_groups(array('resources_loot'))) || $unit_id == UNIT_SECTOR) {
+  } elseif (in_array($unit_id, sn_get_groups(array('resources_loot'))) || $unit_id == UNIT_SECTOR) {
     $mercenary_level = !empty($planet) ? $planet[$unit_db_name] : $user[$unit_db_name];
   }
 
   return $result = $mercenary_level;
 }
 
-function mrc_modify_value(&$user, $planet = array(), $mercenaries, $value) {return sn_function_call('mrc_modify_value', array(&$user, $planet, $mercenaries, $value));}
+function mrc_modify_value(&$user, $planet = array(), $mercenaries, $value) {return sn_function_call('mrc_modify_value', array(&$user, $planet, $mercenaries, $value)); }
 function sn_mrc_modify_value(&$user, $planet = array(), $mercenaries, $value, $base_value = null)
 {
-  if(!is_array($mercenaries))
+  if (!is_array($mercenaries))
   {
     $mercenaries = array($mercenaries);
   }
 
   $base_value = isset($base_value) ? $base_value : $value;
 
-  foreach($mercenaries as $mercenary_id)
+  foreach ($mercenaries as $mercenary_id)
   {
     $mercenary_level = mrc_get_level($user, $planet, $mercenary_id);
 
     $mercenary = get_unit_param($mercenary_id);
     $mercenary_bonus = $mercenary['bonus'];
 
-    switch($mercenary['bonus_type'])
+    switch ($mercenary['bonus_type'])
     {
       case BONUS_PERCENT_CUMULATIVE:
         $value *= 1 + $mercenary_level * $mercenary_bonus / 100;
@@ -550,7 +550,7 @@ 
   $allowed_length = strlen($allowed_chars);
 
   $random_string = '';
-  for($i = 0; $i < $length; $i++) {
+  for ($i = 0; $i < $length; $i++) {
     $random_string .= $allowed_chars[mt_rand(0, $allowed_length - 1)];
   }
 
@@ -573,10 +573,10 @@ 
 
   $options = '';
   $option_list = array();
-  foreach($user_option_list as $option_group_id => $option_group)
+  foreach ($user_option_list as $option_group_id => $option_group)
   {
     $option_list[$option_group_id] = array();
-    foreach($option_group as $option_name => $option_value)
+    foreach ($option_group as $option_name => $option_value)
     {
       if (!isset($user[$option_name]))
       {
@@ -602,19 +602,19 @@ 
   $option_list = array();
   $option_string_list = explode('|', $user['options']);
 
-  foreach($option_string_list as $option_string)
+  foreach ($option_string_list as $option_string)
   {
     list($option_name, $option_value) = explode('^', $option_string);
     $option_list[$option_name] = $option_value;
   }
 
   $final_list = array();
-  foreach($user_option_list as $option_group_id => $option_group)
+  foreach ($user_option_list as $option_group_id => $option_group)
   {
     $final_list[$option_group_id] = array();
-    foreach($option_group as $option_name => $option_value)
+    foreach ($option_group as $option_name => $option_value)
     {
-      if(!isset($option_list[$option_name]))
+      if (!isset($option_list[$option_name]))
       {
         $option_list[$option_name] = $option_value;
       }
@@ -630,15 +630,15 @@ 
 function sys_unit_str2arr($fleet_string)
 {
   $fleet_array = array();
-  if(!empty($fleet_string))
+  if (!empty($fleet_string))
   {
     $arrTemp = explode(';', $fleet_string);
-    foreach($arrTemp as $temp)
+    foreach ($arrTemp as $temp)
     {
-      if($temp)
+      if ($temp)
       {
         $temp = explode(',', $temp);
-        if(!empty($temp[0]) && !empty($temp[1]))
+        if (!empty($temp[0]) && !empty($temp[1]))
         {
           $fleet_array[$temp[0]] += $temp[1];
         }
@@ -652,16 +652,16 @@ 
 function sys_unit_arr2str($unit_list)
 {
   $fleet_string = array();
-  if(isset($unit_list))
+  if (isset($unit_list))
   {
-    if(!is_array($unit_list))
+    if (!is_array($unit_list))
     {
       $unit_list = array($unit_list => 1);
     }
 
-    foreach($unit_list as $unit_id => $unit_count)
+    foreach ($unit_list as $unit_id => $unit_count)
     {
-      if($unit_id && $unit_count)
+      if ($unit_id && $unit_count)
       {
         $fleet_string[] = "{$unit_id},{$unit_count}";
       }
@@ -677,7 +677,7 @@ 
   $from = trim($from ? $from : classSupernova::$config->game_adminEmail);
 
   $head  = '';
-  $head .= "Content-Type: text/" . ($html ? 'html' : 'plain'). "; charset=utf-8 \r\n";
+  $head .= "Content-Type: text/" . ($html ? 'html' : 'plain') . "; charset=utf-8 \r\n";
   $head .= "Date: " . date('r') . " \r\n";
   $head .= "Return-Path: {classSupernova::$config->game_adminEmail} \r\n";
   $head .= "From: {$from} \r\n";
@@ -689,7 +689,7 @@ 
   $body = str_replace("\r\n", "\n", $body);
   $body = str_replace("\n", "\r\n", $body);
 
-  if($html) {
+  if ($html) {
     $body = '<html><head><base href="' . SN_ROOT_VIRTUAL . '"></head><body>' . nl2br($body) . '</body></html>';
   }
 
@@ -703,15 +703,15 @@ 
   global $lang;
 
   $seconds = $time % 60;
-  $time = floor($time/60);
+  $time = floor($time / 60);
   $minutes = $time % 60;
-  $time = floor($time/60);
+  $time = floor($time / 60);
   $hours = $time % 24;
-  $time = floor($time/24);
+  $time = floor($time / 24);
 
   return
-    ($full || $time    ? "{$time} {$lang['sys_day']}&nbsp;" : '') .
-    ($full || $hours   ? "{$hours} {$lang['sys_hrs']}&nbsp;" : '') .
+    ($full || $time ? "{$time} {$lang['sys_day']}&nbsp;" : '') .
+    ($full || $hours ? "{$hours} {$lang['sys_hrs']}&nbsp;" : '') .
     ($full || $minutes ? "{$minutes} {$lang['sys_min']}&nbsp;" : '') .
     ($full || !$time || $seconds ? "{$seconds} {$lang['sys_sec']}" : '');
 }
@@ -728,35 +728,35 @@ 
 }
 
 // TODO Для полноценного функионирования апдейтера пакет функций, включая эту должен быть вынесен раньше - или грузить general.php до апдейтера
-function sys_get_unit_location($user, $planet, $unit_id){return sn_function_call('sys_get_unit_location', array($user, $planet, $unit_id));}
+function sys_get_unit_location($user, $planet, $unit_id) {return sn_function_call('sys_get_unit_location', array($user, $planet, $unit_id)); }
 function sn_sys_get_unit_location($user, $planet, $unit_id)
 {
   return get_unit_param($unit_id, 'location');
 }
 
 function sn_ali_fill_user_ally(&$user) {
-  if(!$user['ally_id']) {
+  if (!$user['ally_id']) {
     return;
   }
 
-  if(!isset($user['ally'])) {
+  if (!isset($user['ally'])) {
     $user['ally'] = doquery("SELECT * FROM {{alliance}} WHERE `id` = {$user['ally_id']} LIMIT 1;", true);
   }
 
-  if(!isset($user['ally']['player'])) {
+  if (!isset($user['ally']['player'])) {
     $user['ally']['player'] = db_user_by_id($user['ally']['ally_user_id'], true, '*', false);
   }
 }
 
 function sn_get_url_contents($url)
 {
-  if(function_exists('curl_init'))
+  if (function_exists('curl_init'))
   {
     $crl = curl_init();
     $timeout = 5;
-    curl_setopt ($crl, CURLOPT_URL,$url);
-    curl_setopt ($crl, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt ($crl, CURLOPT_CONNECTTIMEOUT, $timeout);
+    curl_setopt($crl, CURLOPT_URL, $url);
+    curl_setopt($crl, CURLOPT_RETURNTRANSFER, 1);
+    curl_setopt($crl, CURLOPT_CONNECTTIMEOUT, $timeout);
     $return = curl_exec($crl);
     curl_close($crl);
   }
@@ -790,12 +790,12 @@ 
 function get_ship_data($ship_id, $user)
 {
   $ship_data = array();
-  if(in_array($ship_id, sn_get_groups(array('fleet', 'missile'))))
+  if (in_array($ship_id, sn_get_groups(array('fleet', 'missile'))))
   {
-    foreach(get_unit_param($ship_id, 'engine') as $engine_info)
+    foreach (get_unit_param($ship_id, 'engine') as $engine_info)
     {
       $tech_level = intval(mrc_get_level($user, false, $engine_info['tech']));
-      if(empty($ship_data) || $tech_level >= $engine_info['min_level'])
+      if (empty($ship_data) || $tech_level >= $engine_info['min_level'])
       {
         $ship_data = $engine_info;
         $ship_data['tech_level'] = $tech_level;
@@ -808,7 +808,7 @@ 
   return $ship_data;
 }
 
-if(!function_exists('strptime'))
+if (!function_exists('strptime'))
 {
   function strptime($date, $format)
   {
@@ -822,8 +822,8 @@ 
      // usw..
     );
 
-    $rexep = "#".strtr(preg_quote($format), $masks)."#";
-    if(preg_match($rexep, $date, $out))
+    $rexep = "#" . strtr(preg_quote($format), $masks) . "#";
+    if (preg_match($rexep, $date, $out))
     {
       $ret = array(
         "tm_sec"  => (int) $out['S'],
@@ -845,7 +845,7 @@ 
 function sn_sys_sector_buy($redirect = 'overview.php') {
   global $lang, $user, $planetrow;
 
-  if(!sys_get_param_str('sector_buy') || $planetrow['planet_type'] != PT_PLANET) {
+  if (!sys_get_param_str('sector_buy') || $planetrow['planet_type'] != PT_PLANET) {
     return;
   }
 
@@ -858,9 +858,9 @@ 
 //  $planetrow = $planetrow['planet'];
   $sector_cost = eco_get_build_data($user, $planetrow, UNIT_SECTOR, mrc_get_level($user, $planetrow, UNIT_SECTOR), true);
   $sector_cost = $sector_cost[BUILD_CREATE][RES_DARK_MATTER];
-  if($sector_cost <= mrc_get_level($user, null, RES_DARK_MATTER)) {
+  if ($sector_cost <= mrc_get_level($user, null, RES_DARK_MATTER)) {
     $planet_name_text = uni_render_planet($planetrow);
-    if(rpg_points_change($user['id'], RPG_SECTOR, -$sector_cost, sprintf($lang['sys_sector_purchase_log'],
+    if (rpg_points_change($user['id'], RPG_SECTOR, -$sector_cost, sprintf($lang['sys_sector_purchase_log'],
         $user['username'], $user['id'], $planet_name_text, $lang['sys_planet_type'][$planetrow['planet_type']], $planetrow['id'], $sector_cost)
     )) {
       $sector_db_name = pname_resource_name(UNIT_SECTOR);
@@ -876,43 +876,43 @@ 
 
 function sn_sys_handler_add(&$functions, $handler_list, $class_module_name = '', $sub_type = '')
 {
-  if(isset($handler_list) && is_array($handler_list) && !empty($handler_list))
+  if (isset($handler_list) && is_array($handler_list) && !empty($handler_list))
   {
-    foreach($handler_list as $function_name => $function_data)
+    foreach ($handler_list as $function_name => $function_data)
     {
-      if(is_string($function_data))
+      if (is_string($function_data))
       {
         $override_with = &$function_data;
       }
-      elseif(isset($function_data['callable']))
+      elseif (isset($function_data['callable']))
       {
         $override_with = &$function_data['callable'];
       }
 
       $overwrite = $override_with[0] == '*';
-      if($overwrite)
+      if ($overwrite)
       {
         $override_with = substr($override_with, 1);
       }
 
-      if(($point_position = strpos($override_with, '.')) === false && $class_module_name)
+      if (($point_position = strpos($override_with, '.')) === false && $class_module_name)
       {
         $override_with = array($class_module_name, $override_with);
       }
-      elseif($point_position == 0)
+      elseif ($point_position == 0)
       {
         $override_with = substr($override_with, 1);
       }
-      elseif($point_position > 0)
+      elseif ($point_position > 0)
       {
         $override_with = array(substr($override_with, 0, $point_position), substr($override_with, $point_position + 1));
       }
 
-      if($overwrite)
+      if ($overwrite)
       {
         $functions[$function_name] = array();
       }
-      elseif(!isset($functions[$function_name]))
+      elseif (!isset($functions[$function_name]))
       {
         $functions[$function_name] = array();
         $sn_function_name = 'sn_' . $function_name . ($sub_type ? '_' . $sub_type : '');
@@ -929,18 +929,18 @@ 
 
 // TODO - поменять название
 // Может принимать: (array)$user, $nick_render_array, $nick_render_array_html, $nick_render_string_compact
-function player_nick_render_to_html($result, $options = false){
+function player_nick_render_to_html($result, $options = false) {
   // TODO - обрабатывать разные случаи: $user, $render_nick_array, $string
 
-  if(is_string($result) && strpos($result, ':{i:')) {
+  if (is_string($result) && strpos($result, ':{i:')) {
     $result = player_nick_uncompact($result);
   }
 
-  if(is_array($result)) {
-    if(isset($result['id'])) {
+  if (is_array($result)) {
+    if (isset($result['id'])) {
       $result = player_nick_render_current_to_array($result, $options);
     }
-    if(!isset($result[NICK_HTML])) {
+    if (!isset($result[NICK_HTML])) {
       $result = player_nick_render_array_to_html($result);
     }
     unset($result[NICK_HTML]);
@@ -962,31 +962,31 @@ 
   try {
     $result = unserialize($nick_string);
     // ksort($result); // Всегда ksort-ый в player_nick_compact()
-  } catch(exception $e) {
+  } catch (exception $e) {
     $result = strpos($nick_string, ':{i:') ? null : $nick_string; // fallback if it is already string - for old chat strings, for example
   }
   return $result;
 }
 
-function player_nick_render_array_to_html($nick_array){return sn_function_call('player_nick_render_array_to_html', array($nick_array, &$result));}
+function player_nick_render_array_to_html($nick_array) {return sn_function_call('player_nick_render_array_to_html', array($nick_array, &$result)); }
 function sn_player_nick_render_array_to_html($nick_array, &$result) {
   global $config, $user;
 
   // ALL STRING ARE UNSAFE!!!
-  if(isset($nick_array[NICK_BIRTHSDAY])) {
+  if (isset($nick_array[NICK_BIRTHSDAY])) {
     $result[NICK_BIRTHSDAY] = '<img src="design/images/birthday.png" />';
   }
 
-  if(isset($nick_array[NICK_VACATION])) {
+  if (isset($nick_array[NICK_VACATION])) {
     $result[NICK_VACATION] = '<img src="design/images/icon_vacation.png" />';
   }
 
-  if(isset($nick_array[NICK_GENDER])) {
+  if (isset($nick_array[NICK_GENDER])) {
     $result[NICK_GENDER] = '<img src="' . ($user['dpath'] ? $user['dpath'] : DEFAULT_SKINPATH) . 'images/gender_' . $nick_array[NICK_GENDER] . '.png" />';
   }
 
-  if(isset($nick_array[NICK_AUTH_LEVEL]) || isset($nick_array[NICK_PREMIUM])) {
-    switch($nick_array[NICK_AUTH_LEVEL]) {
+  if (isset($nick_array[NICK_AUTH_LEVEL]) || isset($nick_array[NICK_PREMIUM])) {
+    switch ($nick_array[NICK_AUTH_LEVEL]) {
       case 4:
         $highlight = classSupernova::$config->chat_highlight_developer;
         break;
@@ -1007,20 +1007,20 @@ 
         $highlight = isset($nick_array[NICK_PREMIUM]) ? classSupernova::$config->chat_highlight_premium : '';
     }
 
-    if($highlight) {
+    if ($highlight) {
       list($result[NICK_HIGHLIGHT], $result[NICK_HIGHLIGHT_END]) = explode('$1', $highlight);
     }
     // $result = preg_replace("#(.+)#", $highlight, $result);
   }
 
-  if(isset($nick_array[NICK_CLASS])) {
-    $result[NICK_CLASS] = '<span ' . $nick_array[NICK_CLASS] .'>';
+  if (isset($nick_array[NICK_CLASS])) {
+    $result[NICK_CLASS] = '<span ' . $nick_array[NICK_CLASS] . '>';
     $result[NICK_CLASS_END] = '</span>';
   }
 
   $result[NICK_NICK] = sys_safe_output($nick_array[NICK_NICK]);
 
-  if(isset($nick_array[NICK_ALLY])) {
+  if (isset($nick_array[NICK_ALLY])) {
     $result[NICK_ALLY] = '[' . sys_safe_output($nick_array[NICK_ALLY]) . ']';
   }
 
@@ -1029,7 +1029,7 @@ 
   return $result;
 }
 
-function player_nick_render_current_to_array($render_user, $options = false){return sn_function_call('player_nick_render_current_to_array', array($render_user, $options, &$result));}
+function player_nick_render_current_to_array($render_user, $options = false) {return sn_function_call('player_nick_render_current_to_array', array($render_user, $options, &$result)); }
 function sn_player_nick_render_current_to_array($render_user, $options = false, &$result) {
   /*
   $options = $options !== true ? $options :
@@ -1043,32 +1043,32 @@ 
   */
 
 
-  if($render_user['user_birthday'] && ($options === true || isset($options['icons']) || isset($options['birthday'])) && (date('Y', SN_TIME_NOW) . date('-m-d', strtotime($render_user['user_birthday'])) == date('Y-m-d', SN_TIME_NOW))) {
+  if ($render_user['user_birthday'] && ($options === true || isset($options['icons']) || isset($options['birthday'])) && (date('Y', SN_TIME_NOW) . date('-m-d', strtotime($render_user['user_birthday'])) == date('Y-m-d', SN_TIME_NOW))) {
     $result[NICK_BIRTHSDAY] = '';
   }
 
-  if($options === true || (isset($options['icons']) && $options['icons']) || (isset($options['gender']) && $options['gender'])) {
+  if ($options === true || (isset($options['icons']) && $options['icons']) || (isset($options['gender']) && $options['gender'])) {
     $result[NICK_GENDER] = $render_user['gender'] == GENDER_UNKNOWN ? 'unknown' : ($render_user['gender'] == GENDER_FEMALE ? 'female' : 'male');
   }
 
-  if(($options === true || (isset($options['icons']) && $options['icons']) || (isset($options['vacancy']) && $options['vacancy'])) && $render_user['vacation']) {
+  if (($options === true || (isset($options['icons']) && $options['icons']) || (isset($options['vacancy']) && $options['vacancy'])) && $render_user['vacation']) {
     $result[NICK_VACATION] = $render_user['vacation'];
   }
 
-  if($options === true || (isset($options['color']) && $options['color'])) {
-    if($user_auth_level = $render_user['authlevel']) {
+  if ($options === true || (isset($options['color']) && $options['color'])) {
+    if ($user_auth_level = $render_user['authlevel']) {
       $result[NICK_AUTH_LEVEL] = $user_auth_level;
     }
-    if($user_premium = mrc_get_level($render_user, false, UNIT_PREMIUM)) {
+    if ($user_premium = mrc_get_level($render_user, false, UNIT_PREMIUM)) {
       $result[NICK_PREMIUM] = $user_premium;
     }
   }
 
-  if((isset($options['class']) && $options['class'])) {
+  if ((isset($options['class']) && $options['class'])) {
     $result[NICK_CLASS] = (isset($result_options[NICK_CLASS]) ? ' ' . $result_options[NICK_CLASS] : '') . $options['class'];
   }
 
-  if($render_user['ally_tag'] && ($options === true || (isset($options['ally']) && $options['ally']))) {
+  if ($render_user['ally_tag'] && ($options === true || (isset($options['ally']) && $options['ally']))) {
     $result[NICK_ALLY] = $render_user['ally_tag'];
   }
 
@@ -1119,25 +1119,25 @@ 
 
   $user_skip_list = array();
 
-  if(classSupernova::$config->stats_hide_admins) {
+  if (classSupernova::$config->stats_hide_admins) {
     $user_skip_list[] = '`authlevel` > 0';
   }
 
-  if(classSupernova::$config->stats_hide_player_list) {
+  if (classSupernova::$config->stats_hide_player_list) {
     $temp = explode(',', classSupernova::$config->stats_hide_player_list);
-    foreach($temp as $user_id) {
+    foreach ($temp as $user_id) {
       $user_id = floatval($user_id);
-      if($user_id) {
+      if ($user_id) {
         $user_skip_list[] = '`id` = ' . $user_id;
       }
     }
   }
 
-  if(!empty($user_skip_list)) {
+  if (!empty($user_skip_list)) {
     $user_skip_list = implode(' OR ', $user_skip_list);
     $user_skip_query = db_user_list($user_skip_list);
-    if(!empty($user_skip_query)) {
-      foreach($user_skip_query as $user_skip_row) {
+    if (!empty($user_skip_query)) {
+      foreach ($user_skip_query as $user_skip_row) {
         $result[$user_skip_row['id']] = $user_skip_row['id'];
       }
     }
@@ -1149,7 +1149,7 @@ 
 // function player_nick_render_to_html($render_user, $options = false){return sn_function_call('player_nick_render_to_html', array($render_user, $options, &$result));}
 // function sn_render_player_nick($render_user, $options = false, &$result)
 
-function get_unit_param($unit_id, $param_name = null, $user = null, $planet = null){return sn_function_call('get_unit_param', array($unit_id, $param_name, $user, $planet, &$result));}
+function get_unit_param($unit_id, $param_name = null, $user = null, $planet = null) {return sn_function_call('get_unit_param', array($unit_id, $param_name, $user, $planet, &$result)); }
 function sn_get_unit_param($unit_id, $param_name = null, $user = null, $planet = null, &$result)
 {
   global $sn_data;
@@ -1164,11 +1164,11 @@ 
   return $result;
 }
 
-function sn_get_groups($groups){return sn_function_call('sn_get_groups', array($groups, &$result));}
+function sn_get_groups($groups) {return sn_function_call('sn_get_groups', array($groups, &$result)); }
 function sn_sn_get_groups($groups, &$result)
 {
   $result = is_array($result) ? $result : array();
-  foreach($groups = is_array($groups) ? $groups : array($groups) as $group_name)
+  foreach ($groups = is_array($groups) ? $groups : array($groups) as $group_name)
   {
     $result += is_array($a_group = get_unit_param(UNIT_GROUP, $group_name)) ? $a_group : array();
   }
@@ -1189,7 +1189,7 @@ 
   return preg_match('#^(\d*)#', $value, $matches) && $matches[1] ? floatval($matches[1]) : $default;
 }
 
-function unit_requirements_render($user, $planetrow, $unit_id, $field = 'require'){return sn_function_call('unit_requirements_render', array($user, $planetrow, $unit_id, $field, &$result));}
+function unit_requirements_render($user, $planetrow, $unit_id, $field = 'require') {return sn_function_call('unit_requirements_render', array($user, $planetrow, $unit_id, $field, &$result)); }
 function sn_unit_requirements_render($user, $planetrow, $unit_id, $field = 'require', &$result)
 {
   global $lang, $config;
@@ -1197,9 +1197,9 @@ 
   $sn_data_unit = get_unit_param($unit_id);
 
   $result = is_array($result) ? $result : array();
-  if($sn_data_unit[$field] && !($sn_data_unit[P_UNIT_TYPE] == UNIT_MERCENARIES && classSupernova::$config->empire_mercenary_temporary))
+  if ($sn_data_unit[$field] && !($sn_data_unit[P_UNIT_TYPE] == UNIT_MERCENARIES && classSupernova::$config->empire_mercenary_temporary))
   {
-    foreach($sn_data_unit[$field] as $require_id => $require_level)
+    foreach ($sn_data_unit[$field] as $require_id => $require_level)
     {
       $level_got = mrc_get_level($user, $planetrow, $require_id);
       $level_basic = mrc_get_level($user, $planetrow, $require_id, false, true);
@@ -1225,19 +1225,19 @@ 
 
   $ranks = array();
 
-  if($ally['ranklist'])
+  if ($ally['ranklist'])
   {
     $str_ranks = explode(';', $ally['ranklist']);
-    foreach($str_ranks as $str_rank)
+    foreach ($str_ranks as $str_rank)
     {
-      if(!$str_rank)
+      if (!$str_rank)
       {
         continue;
       }
 
       $tmp = explode(',', $str_rank);
       $rank_id = count($ranks);
-      foreach($ally_rights as $key => $value)
+      foreach ($ally_rights as $key => $value)
       {
         $ranks[$rank_id][$value] = $tmp[$key];
       }
@@ -1247,14 +1247,14 @@ 
   return $ranks;
 }
 
-function sys_player_new_adjust($user_id, $planet_id){return sn_function_call('sys_player_new_adjust', array($user_id, $planet_id, &$result));}
+function sys_player_new_adjust($user_id, $planet_id) {return sn_function_call('sys_player_new_adjust', array($user_id, $planet_id, &$result)); }
 function sn_sys_player_new_adjust($user_id, $planet_id, &$result) {
   return $result;
 }
 
 function array_merge_recursive_numeric($array1, $array2) {
-  if(!empty($array2) && is_array($array2)) {
-    foreach($array2 as $key => $value) {
+  if (!empty($array2) && is_array($array2)) {
+    foreach ($array2 as $key => $value) {
 //    if(!isset($array1[$key]) || !is_array($array1[$key])) {
 //      $array1[$key] = $value;
 //    } else {
@@ -1270,7 +1270,7 @@ 
 function sn_sys_array_cumulative_sum(&$array)
 {
   $accum = 0;
-  foreach($array as &$value)
+  foreach ($array as &$value)
   {
     $accum += $value;
     $value = $accum;
@@ -1281,7 +1281,7 @@ 
   $sn_data_density = sn_get_groups('planet_density');
   $density_price_chart = array();
 
-  foreach($sn_data_density as $density_id => $density_data) {
+  foreach ($sn_data_density as $density_id => $density_data) {
     // Отсекаем записи с RARITY = 0 - служебные записи и супер-ядра
     $density_data[UNIT_PLANET_DENSITY_RARITY] ? $density_price_chart[$density_id] = $density_data[UNIT_PLANET_DENSITY_RARITY] : false;
   }
@@ -1289,7 +1289,7 @@ 
 
   $total_rarity = array_sum($density_price_chart);
 
-  foreach($density_price_chart as &$density_data) {
+  foreach ($density_price_chart as &$density_data) {
     $density_data = ceil($total_rarity / $density_data * $planet_row['field_max'] * PLANET_DENSITY_TO_DARK_MATTER_RATE);
   }
 
@@ -1297,18 +1297,18 @@ 
 }
 
 function sn_sys_planet_core_transmute(&$user, &$planetrow) {
-  if(!sys_get_param_str('transmute')) {
+  if (!sys_get_param_str('transmute')) {
     return array();
   }
 
   global $lang;
 
   try {
-    if($planetrow['planet_type'] != PT_PLANET) {
+    if ($planetrow['planet_type'] != PT_PLANET) {
       throw new exception($lang['ov_core_err_not_a_planet'], ERR_ERROR);
     }
 
-    if($planetrow['density_index'] == ($new_density_index = sys_get_param_id('density_type'))) {
+    if ($planetrow['density_index'] == ($new_density_index = sys_get_param_id('density_type'))) {
       throw new exception($lang['ov_core_err_same_density'], ERR_WARNING);
     }
 
@@ -1322,7 +1322,7 @@ 
     $planet_density_index = $planetrow['density_index'];
 
     $density_price_chart = planet_density_price_chart($planetrow);
-    if(!isset($density_price_chart[$new_density_index])) {
+    if (!isset($density_price_chart[$new_density_index])) {
       // Hack attempt
       throw new exception($lang['ov_core_err_denisty_type_wrong'], ERR_ERROR);
     }
@@ -1331,13 +1331,13 @@ 
     // $transmute_cost = get_unit_param(UNIT_PLANET_DENSITY, 'cost');
     // $transmute_cost = $transmute_cost[RES_DARK_MATTER] * $density_price_chart[$new_density_index];
     $transmute_cost = $density_price_chart[$new_density_index];
-    if($user_dark_matter < $transmute_cost) {
+    if ($user_dark_matter < $transmute_cost) {
       throw new exception($lang['ov_core_err_no_dark_matter'], ERR_ERROR);
     }
 
     $sn_data_planet_density = sn_get_groups('planet_density');
-    foreach($sn_data_planet_density as $key => $value) {
-      if($key == $new_density_index) {
+    foreach ($sn_data_planet_density as $key => $value) {
+      if ($key == $new_density_index) {
         break;
       }
       $prev_density_index = $key;
@@ -1368,7 +1368,7 @@ 
       'STATUS'  => ERR_NONE,
       'MESSAGE' => sprintf($lang['ov_core_err_none'], $lang['uni_planet_density_types'][$planet_density_index], $lang['uni_planet_density_types'][$new_density_index], $new_density),
     );
-  } catch(exception $e) {
+  } catch (exception $e) {
     sn_db_transaction_rollback();
     $result = array(
       'STATUS'  => $e->getCode(),
@@ -1384,9 +1384,9 @@ 
   global $sn_module_list;
 
   $active_modules = 0;
-  if(isset($sn_module_list[$group]) && is_array($sn_module_list[$group]))
+  if (isset($sn_module_list[$group]) && is_array($sn_module_list[$group]))
   {
-    foreach($sn_module_list[$group] as $payment_module)
+    foreach ($sn_module_list[$group] as $payment_module)
     {
       $active_modules += $payment_module->manifest['active'];
     }
@@ -1399,7 +1399,7 @@ 
 {
   static $rates;
 
-  if(!$rates)
+  if (!$rates)
   {
     global $config;
 
@@ -1410,7 +1410,7 @@ 
       RES_DARK_MATTER => 'rpg_exchange_darkMatter',
     );
 
-    foreach($rates as &$rate)
+    foreach ($rates as &$rate)
     {
       $rate = classSupernova::$config->$rate;
     }
@@ -1423,13 +1423,13 @@ 
 {
   static $rates;
 
-  if(!$rates)
+  if (!$rates)
   {
     $rates = get_resource_exchange();
   }
 
   $metal_cost = 0;
-  foreach($cost as $resource_id => $resource_value)
+  foreach ($cost as $resource_id => $resource_value)
   {
     $metal_cost += $rates[$resource_id] * $resource_value;
   }
@@ -1437,11 +1437,11 @@ 
   return $metal_cost;
 }
 
-function get_player_max_expeditons(&$user, $astrotech = -1){return sn_function_call('get_player_max_expeditons', array(&$user, $astrotech, &$result));}
+function get_player_max_expeditons(&$user, $astrotech = -1) {return sn_function_call('get_player_max_expeditons', array(&$user, $astrotech, &$result)); }
 function sn_get_player_max_expeditons(&$user, $astrotech = -1, &$result = 0)
 {
-  if($astrotech == -1) {
-    if(!isset($user[UNIT_PLAYER_EXPEDITIONS_MAX]))
+  if ($astrotech == -1) {
+    if (!isset($user[UNIT_PLAYER_EXPEDITIONS_MAX]))
     {
       $astrotech = mrc_get_level($user, false, TECH_ASTROTECH);
       $user[UNIT_PLAYER_EXPEDITIONS_MAX] = $astrotech >= 1 ? floor(sqrt($astrotech - 1)) : 0;
@@ -1461,8 +1461,8 @@ 
 function get_player_max_colonies(&$user, $astrotech = -1) {
   global $config;
 
-  if($astrotech == -1) {
-    if(!isset($user[UNIT_PLAYER_COLONIES_MAX])) {
+  if ($astrotech == -1) {
+    if (!isset($user[UNIT_PLAYER_COLONIES_MAX])) {
 
       $expeditions = get_player_max_expeditons($user);
       $astrotech = mrc_get_level($user, false, TECH_ASTROTECH);
@@ -1495,7 +1495,7 @@ 
 }
 
 
-function sn_powerup_get_price_matrix($powerup_id, $powerup_unit = false, $level_max = null, $plain = false){return sn_function_call('sn_powerup_get_price_matrix', array($powerup_id, $powerup_unit, $level_max, $plain, &$result));}
+function sn_powerup_get_price_matrix($powerup_id, $powerup_unit = false, $level_max = null, $plain = false) {return sn_function_call('sn_powerup_get_price_matrix', array($powerup_id, $powerup_unit, $level_max, $plain, &$result)); }
 function sn_sn_powerup_get_price_matrix($powerup_id, $powerup_unit = false, $level_max = null, $plain = false, &$result) {
   global $sn_powerup_buy_discounts;
 
@@ -1505,10 +1505,10 @@ 
   $is_upgrade = !empty($powerup_unit) && $powerup_unit;
 
   $level_current = $term_original = $time_left = 0;
-  if($is_upgrade) {
+  if ($is_upgrade) {
     $time_finish = strtotime($powerup_unit['unit_time_finish']);
     $time_left = max(0, $time_finish - SN_TIME_NOW);
-    if($time_left > 0) {
+    if ($time_left > 0) {
       $term_original = $time_finish - strtotime($powerup_unit['unit_time_start']);
       $level_current = $powerup_unit['unit_level'];
     }
@@ -1516,17 +1516,17 @@ 
 
   $level_max = $level_max > $powerup_data[P_MAX_STACK] ? $level_max : $powerup_data[P_MAX_STACK];
   $original_cost = 0;
-  for($i = 1; $i <= $level_max; $i++) {
+  for ($i = 1; $i <= $level_max; $i++) {
     $base_cost = eco_get_total_cost($powerup_id, $i);
     $base_cost = $base_cost[BUILD_CREATE][RES_DARK_MATTER];
-    foreach($sn_powerup_buy_discounts as $period => $discount) {
+    foreach ($sn_powerup_buy_discounts as $period => $discount) {
       $upgrade_price = floor($base_cost * $discount * $period / PERIOD_MONTH);
       $result[$i][$period] = $upgrade_price;
       $original_cost = $is_upgrade && $i == $level_current && $period <= $term_original ? $upgrade_price : $original_cost;
     }
   }
 
-  if($is_upgrade && $time_left) {
+  if ($is_upgrade && $time_left) {
     $term_original = round($term_original / PERIOD_DAY);
     $time_left = min(floor($time_left / PERIOD_DAY), $term_original);
     $cost_left = $term_original > 0 ? ceil($time_left / $term_original * $original_cost) : 0;
@@ -1587,14 +1587,14 @@ 
 
 function print_rr($var, $capture = false) {
   $print = '<pre>' . htmlspecialchars(print_r($var, true)) . '</pre>';
-  if($capture) {
+  if ($capture) {
     return $print;
   } else {
     print($print);
   }
 }
 
-function can_capture_planet(){return sn_function_call('can_capture_planet', array(&$result));}
+function can_capture_planet() {return sn_function_call('can_capture_planet', array(&$result)); }
 function sn_can_capture_planet(&$result) {
   return $result = false;
 }
@@ -1625,9 +1625,9 @@ 
 
 function price_matrix_templatize(&$price_matrix_plain, &$price_matrix_original, &$price_matrix_upgrade, $user_dark_matter) {
   $prices = array();
-  foreach($price_matrix_original as $level_num => $level_data) {
+  foreach ($price_matrix_original as $level_num => $level_data) {
     $price_per_period = array();
-    foreach($level_data as $period => $price) {
+    foreach ($level_data as $period => $price) {
       $price_text = pretty_number($price, true, $user_dark_matter, false, false);
       $price_per_period[$period] = array(
         'PERIOD' => $period,
@@ -1637,7 +1637,7 @@ 
         'PRICE_UPGRADE' => $price_matrix_upgrade[$level_num][$period],
         'PRICE_UPGRADE_TEXT' => pretty_number($price_matrix_upgrade[$level_num][$period], true),
       );
-      if(isset($price_matrix_plain[$level_num][$period])) {
+      if (isset($price_matrix_plain[$level_num][$period])) {
         $price_per_period[$period] += array(
           'PRICE_PLAIN_PERCENT'  => ceil(100 - ($price / $price_matrix_plain[$level_num][$period]) * 100),
           'PRICE_PLAIN'  => $price_matrix_plain[$level_num][$period],

Braces +61 added lines, -121 removed lines

@@ -11,8 +11,7 @@ 
 require_once('general/math.php');
 require_once('general_pname.php');
 
-function sn_function_call($func_name, $func_arg = array())
-{
+function sn_function_call($func_name, $func_arg = array()) {
   global $functions; // All data in $functions should be normalized to valid 'callable' state: '<function_name>'|array('<object_name>', '<method_name>')
 
   if(is_array($functions[$func_name]) && !is_callable($functions[$func_name]))
@@ -32,8 +31,7 @@ 
         $result = call_user_func_array($func_chain_name, $func_arg);
       }
     }
-  }
-  else
+  } else
   {
     // TODO: This is left for backward compatibility. Appropriate code should be rewrote!
     $func_name = isset($functions[$func_name]) && is_callable($functions[$func_name]) ? $functions[$func_name] : ('sn_' . $func_name);
@@ -64,13 +62,11 @@ 
 
 // ----------------------------------------------------------------------------------------------------------------
 // Fonction de lecture / ecriture / exploitation de templates
-function sys_file_read($filename)
-{
+function sys_file_read($filename) {
   return @file_get_contents($filename);
 }
 
-function sys_file_write($filename, $content)
-{
+function sys_file_write($filename, $content) {
   return @file_put_contents($filename, $content, FILE_APPEND);
 }
 
@@ -149,19 +145,16 @@ 
    false - return array('text' => $ret, 'class' => $class), where $ret - unstyled
  */
 
-function pretty_number($n, $floor = true, $color = false, $limit = false, $style = null)
-{
+function pretty_number($n, $floor = true, $color = false, $limit = false, $style = null) {
   $n = floatval($n);
   if(is_int($floor))
   {
     $n = round($n, $floor); // , PHP_ROUND_HALF_DOWN
-  }
-  elseif($floor === true)
+  } elseif($floor === true)
   {
     $n = floor($n);
     $floor = 0;
-  }
-  else
+  } else
   {
     $floor = 2;
   }
@@ -178,8 +171,7 @@ 
         $suffix .= 'k';
         $ret = round($ret / 1000);
       }
-    }
-    else
+    } else
     {
       while($ret < -$limit)
       {
@@ -197,12 +189,10 @@ 
     if($color === true)
     {
       $class = $n == 0 ? 'zero' : ($n > 0 ? 'positive' : 'negative');
-    }
-    elseif($color >= 0)
+    } elseif($color >= 0)
     {
       $class = $n == $color ? 'zero' : ($n < $color ? 'positive' : 'negative');
-    }
-    else
+    } else
     {
       $class = ($n == -$color) ? 'zero' : ($n < -$color ? 'negative' : 'positive');
     }
@@ -210,8 +200,7 @@ 
     if(!isset($style))
     {
       $ret = "<span class='{$class}'>{$ret}</span>";
-    }
-    else
+    } else
     {
       $ret = $style ? $ret = $class : $ret = array('text' => $ret, 'class' => $class);
     }
@@ -259,8 +248,7 @@ 
 // ----------------------------------------------------------------------------------------------------------------
 // Check input string for forbidden words
 //
-function CheckInputStrings($String)
-{
+function CheckInputStrings($String) {
   global $ListCensure;
 
   return preg_replace($ListCensure, '*', $String);
@@ -270,8 +258,7 @@ 
   return(preg_match("/^[-_.[:alnum:]]+@((([[:alnum:]]|[[:alnum:]][[:alnum:]-]*[[:alnum:]])\.)+(ad|ae|aero|af|ag|ai|al|am|an|ao|aq|ar|arpa|as|at|au|aw|az|ba|bb|bd|be|bf|bg|bh|bi|biz|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|com|coop|cr|cs|cu|cv|cx|cy|cz|de|dj|dk|dm|do|dz|ec|edu|ee|eg|eh|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gh|gi|gl|gm|gn|gov|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|in|info|int|io|iq|ir|is|it|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|mg|mh|mil|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|museum|mv|mw|mx|my|mz|na|name|nc|ne|net|nf|ng|ni|nl|no|np|nr|nt|nu|nz|om|org|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|pro|ps|pt|pw|py|qa|re|ro|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|st|su|sv|sy|sz|tc|td|tf|tg|th|tj|tk|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|um|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|za|zm|zw)$|(([0-9][0-9]?|[0-1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-5])\.){3}([0-9][0-9]?|[0-1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-5]))$/i", $email));
 }
 
-function is_id($value)
-{
+function is_id($value) {
   return preg_match('/^\d+$/', $value) && ($value >= 0);
 }
 
@@ -281,29 +268,24 @@ 
  *
  * @return string|array
  */
-function sys_get_param($param_name, $default = '')
-{
+function sys_get_param($param_name, $default = '') {
   return $_POST[$param_name] !== NULL ? $_POST[$param_name] : ($_GET[$param_name] !== NULL ? $_GET[$param_name] : $default);
 }
 
-function sys_get_param_id($param_name, $default = 0)
-{
+function sys_get_param_id($param_name, $default = 0) {
   return is_id($value = sys_get_param($param_name, $default)) ? $value : $default;
 }
 
-function sys_get_param_int($param_name, $default = 0)
-{
+function sys_get_param_int($param_name, $default = 0) {
   $value = sys_get_param($param_name, $default);
   return $value === 'on' ? 1 : ($value === 'off' ? $default : intval($value));
 }
 
-function sys_get_param_float($param_name, $default = 0)
-{
+function sys_get_param_float($param_name, $default = 0) {
   return floatval(sys_get_param($param_name, $default));
 }
 
-function sys_get_param_escaped($param_name, $default = '')
-{
+function sys_get_param_escaped($param_name, $default = '') {
   return db_escape(sys_get_param($param_name, $default));
 }
 /*
@@ -312,24 +294,20 @@ 
   return db_escape(strip_tags(sys_get_param($param_name, $default)));
 }
 */
-function sys_get_param_date_sql($param_name, $default = '2000-01-01')
-{
+function sys_get_param_date_sql($param_name, $default = '2000-01-01') {
   $val = sys_get_param($param_name, $default);
   return preg_match(PREG_DATE_SQL_RELAXED, $val) ? $val : $default;
 }
 
-function sys_get_param_str_unsafe($param_name, $default = '')
-{
+function sys_get_param_str_unsafe($param_name, $default = '') {
   return str_raw2unsafe(sys_get_param($param_name, $default));
 }
 
-function sys_get_param_str($param_name, $default = '')
-{
+function sys_get_param_str($param_name, $default = '') {
   return db_escape(sys_get_param_str_unsafe($param_name, $default));
 }
 
-function sys_get_param_str_both($param_name, $default = '')
-{
+function sys_get_param_str_both($param_name, $default = '') {
   $param = sys_get_param($param_name, $default);
   $param_unsafe = str_raw2unsafe($param);
   return array(
@@ -339,8 +317,7 @@ 
   );
 }
 
-function sys_get_param_phone($param_name, $default = '')
-{
+function sys_get_param_phone($param_name, $default = '') {
   $phone_raw = sys_get_param_str_unsafe($param_name, $default = '');
   if($phone_raw)
   {
@@ -354,8 +331,7 @@ 
       }
     }
     $phone = strlen($phone) < 11 ? '' : $phone;
-  }
-  else
+  } else
   {
     $phone = '';
   }
@@ -363,21 +339,18 @@ 
   return array('raw' => $phone_raw, 'phone' => $phone);
 }
 
-function GetPhalanxRange($phalanx_level)
-{
+function GetPhalanxRange($phalanx_level) {
   return $phalanx_level > 1 ? pow($phalanx_level, 2) - 1 : 0;
 }
 
-function CheckAbandonPlanetState(&$planet)
-{
+function CheckAbandonPlanetState(&$planet) {
   if($planet['destruyed'] && $planet['destruyed'] <= SN_TIME_NOW)
   {
     DBStaticPlanet::db_planet_delete_by_id($planet['id']);
   }
 }
 
-function eco_get_total_cost($unit_id, $unit_level)
-{
+function eco_get_total_cost($unit_id, $unit_level) {
   global $config;
 
   static $rate, $sn_group_resources_all, $sn_group_resources_loot;
@@ -502,8 +475,7 @@ 
 }
 
 function mrc_modify_value(&$user, $planet = array(), $mercenaries, $value) {return sn_function_call('mrc_modify_value', array(&$user, $planet, $mercenaries, $value));}
-function sn_mrc_modify_value(&$user, $planet = array(), $mercenaries, $value, $base_value = null)
-{
+function sn_mrc_modify_value(&$user, $planet = array(), $mercenaries, $value, $base_value = null) {
   if(!is_array($mercenaries))
   {
     $mercenaries = array($mercenaries);
@@ -557,18 +529,15 @@ 
   return $random_string;
 }
 
-function js_safe_string($string)
-{
+function js_safe_string($string) {
   return str_replace(array("\r", "\n"), array('\r', '\n'), addslashes($string));
 }
 
-function sys_safe_output($string)
-{
+function sys_safe_output($string) {
   return str_replace(array("&", "\"", "<", ">", "'"), array("&amp;", "&quot;", "&lt;", "&gt;", "&apos;"), $string);
 }
 
-function sys_user_options_pack(&$user)
-{
+function sys_user_options_pack(&$user) {
   global $user_option_list;
 
   $options = '';
@@ -595,8 +564,7 @@ 
   return $options;
 }
 
-function sys_user_options_unpack(&$user)
-{
+function sys_user_options_unpack(&$user) {
   global $user_option_list;
 
   $option_list = array();
@@ -627,8 +595,7 @@ 
   return $final_list;
 }
 
-function sys_unit_str2arr($fleet_string)
-{
+function sys_unit_str2arr($fleet_string) {
   $fleet_array = array();
   if(!empty($fleet_string))
   {
@@ -649,8 +616,7 @@ 
   return $fleet_array;
 }
 
-function sys_unit_arr2str($unit_list)
-{
+function sys_unit_arr2str($unit_list) {
   $fleet_string = array();
   if(isset($unit_list))
   {
@@ -698,8 +664,7 @@ 
   return @mail($email_unsafe, $title, $body, $head);
 }
 
-function sys_time_human($time, $full = false)
-{
+function sys_time_human($time, $full = false) {
   global $lang;
 
   $seconds = $time % 60;
@@ -720,8 +685,7 @@ 
   return $time ? date(FMT_DATE_TIME_SQL, $time) . " ({$time}), " . sys_time_human(SN_TIME_NOW - $time) : '{NEVER}';
 }
 
-function sys_redirect($url)
-{
+function sys_redirect($url) {
   header("Location: {$url}");
   ob_end_flush();
   die();
@@ -729,8 +693,7 @@ 
 
 // TODO Для полноценного функионирования апдейтера пакет функций, включая эту должен быть вынесен раньше - или грузить general.php до апдейтера
 function sys_get_unit_location($user, $planet, $unit_id){return sn_function_call('sys_get_unit_location', array($user, $planet, $unit_id));}
-function sn_sys_get_unit_location($user, $planet, $unit_id)
-{
+function sn_sys_get_unit_location($user, $planet, $unit_id) {
   return get_unit_param($unit_id, 'location');
 }
 
@@ -748,8 +711,7 @@ 
   }
 }
 
-function sn_get_url_contents($url)
-{
+function sn_get_url_contents($url) {
   if(function_exists('curl_init'))
   {
     $crl = curl_init();
@@ -759,8 +721,7 @@ 
     curl_setopt ($crl, CURLOPT_CONNECTTIMEOUT, $timeout);
     $return = curl_exec($crl);
     curl_close($crl);
-  }
-  else
+  } else
   {
     $return = @file_get_contents($url);
   }
@@ -768,8 +729,7 @@ 
   return $return;
 }
 
-function get_engine_data($user, $engine_info)
-{
+function get_engine_data($user, $engine_info) {
   $sn_data_tech_bonus = get_unit_param($engine_info['tech'], 'bonus');
 
   $user_tech_level = intval(mrc_get_level($user, false, $engine_info['tech']));
@@ -787,8 +747,7 @@ 
   return $engine_info;
 }
 
-function get_ship_data($ship_id, $user)
-{
+function get_ship_data($ship_id, $user) {
   $ship_data = array();
   if(in_array($ship_id, sn_get_groups(array('fleet', 'missile'))))
   {
@@ -810,8 +769,7 @@ 
 
 if(!function_exists('strptime'))
 {
-  function strptime($date, $format)
-  {
+  function strptime($date, $format) {
     $masks = array(
       '%d' => '(?P<d>[0-9]{2})',
       '%m' => '(?P<m>[0-9]{2})',
@@ -833,8 +791,7 @@ 
         "tm_mon"  => $out['m'] ? $out['m'] - 1 : 0,
         "tm_year" => $out['Y'] > 1900 ? $out['Y'] - 1900 : 0,
       );
-    }
-    else
+    } else
     {
       $ret = false;
     }
@@ -874,8 +831,7 @@ 
   sys_redirect($redirect);
 }
 
-function sn_sys_handler_add(&$functions, $handler_list, $class_module_name = '', $sub_type = '')
-{
+function sn_sys_handler_add(&$functions, $handler_list, $class_module_name = '', $sub_type = '') {
   if(isset($handler_list) && is_array($handler_list) && !empty($handler_list))
   {
     foreach($handler_list as $function_name => $function_data)
@@ -883,8 +839,7 @@ 
       if(is_string($function_data))
       {
         $override_with = &$function_data;
-      }
-      elseif(isset($function_data['callable']))
+      } elseif(isset($function_data['callable']))
       {
         $override_with = &$function_data['callable'];
       }
@@ -898,12 +853,10 @@ 
       if(($point_position = strpos($override_with, '.')) === false && $class_module_name)
       {
         $override_with = array($class_module_name, $override_with);
-      }
-      elseif($point_position == 0)
+      } elseif($point_position == 0)
       {
         $override_with = substr($override_with, 1);
-      }
-      elseif($point_position > 0)
+      } elseif($point_position > 0)
       {
         $override_with = array(substr($override_with, 0, $point_position), substr($override_with, $point_position + 1));
       }
@@ -911,8 +864,7 @@ 
       if($overwrite)
       {
         $functions[$function_name] = array();
-      }
-      elseif(!isset($functions[$function_name]))
+      } elseif(!isset($functions[$function_name]))
       {
         $functions[$function_name] = array();
         $sn_function_name = 'sn_' . $function_name . ($sub_type ? '_' . $sub_type : '');
@@ -929,7 +881,7 @@ 
 
 // TODO - поменять название
 // Может принимать: (array)$user, $nick_render_array, $nick_render_array_html, $nick_render_string_compact
-function player_nick_render_to_html($result, $options = false){
+function player_nick_render_to_html($result, $options = false) {
   // TODO - обрабатывать разные случаи: $user, $render_nick_array, $string
 
   if(is_string($result) && strpos($result, ':{i:')) {
@@ -1150,8 +1102,7 @@ 
 // function sn_render_player_nick($render_user, $options = false, &$result)
 
 function get_unit_param($unit_id, $param_name = null, $user = null, $planet = null){return sn_function_call('get_unit_param', array($unit_id, $param_name, $user, $planet, &$result));}
-function sn_get_unit_param($unit_id, $param_name = null, $user = null, $planet = null, &$result)
-{
+function sn_get_unit_param($unit_id, $param_name = null, $user = null, $planet = null, &$result) {
   global $sn_data;
 
   $result = isset($sn_data[$unit_id])
@@ -1165,8 +1116,7 @@ 
 }
 
 function sn_get_groups($groups){return sn_function_call('sn_get_groups', array($groups, &$result));}
-function sn_sn_get_groups($groups, &$result)
-{
+function sn_sn_get_groups($groups, &$result) {
   $result = is_array($result) ? $result : array();
   foreach($groups = is_array($groups) ? $groups : array($groups) as $group_name)
   {
@@ -1183,15 +1133,13 @@ 
  *
  * @return float|int
  */
-function idval($value, $default = 0)
-{
+function idval($value, $default = 0) {
   $value = floatval($value);
   return preg_match('#^(\d*)#', $value, $matches) && $matches[1] ? floatval($matches[1]) : $default;
 }
 
 function unit_requirements_render($user, $planetrow, $unit_id, $field = 'require'){return sn_function_call('unit_requirements_render', array($user, $planetrow, $unit_id, $field, &$result));}
-function sn_unit_requirements_render($user, $planetrow, $unit_id, $field = 'require', &$result)
-{
+function sn_unit_requirements_render($user, $planetrow, $unit_id, $field = 'require', &$result) {
   global $lang, $config;
 
   $sn_data_unit = get_unit_param($unit_id);
@@ -1219,8 +1167,7 @@ 
   return $result;
 }
 
-function ally_get_ranks(&$ally)
-{
+function ally_get_ranks(&$ally) {
   global $ally_rights;
 
   $ranks = array();
@@ -1267,8 +1214,7 @@ 
   return $array1;
 }
 
-function sn_sys_array_cumulative_sum(&$array)
-{
+function sn_sys_array_cumulative_sum(&$array) {
   $accum = 0;
   foreach($array as &$value)
   {
@@ -1379,8 +1325,7 @@ 
   return $result;
 }
 
-function sn_module_get_active_count($group = '*')
-{
+function sn_module_get_active_count($group = '*') {
   global $sn_module_list;
 
   $active_modules = 0;
@@ -1395,8 +1340,7 @@ 
   return $active_modules;
 }
 
-function get_resource_exchange()
-{
+function get_resource_exchange() {
   static $rates;
 
   if(!$rates)
@@ -1419,8 +1363,7 @@ 
   return $rates;
 }
 
-function get_unit_cost_in(&$cost, $in_resource = RES_METAL)
-{
+function get_unit_cost_in(&$cost, $in_resource = RES_METAL) {
   static $rates;
 
   if(!$rates)
@@ -1438,8 +1381,7 @@ 
 }
 
 function get_player_max_expeditons(&$user, $astrotech = -1){return sn_function_call('get_player_max_expeditons', array(&$user, $astrotech, &$result));}
-function sn_get_player_max_expeditons(&$user, $astrotech = -1, &$result = 0)
-{
+function sn_get_player_max_expeditons(&$user, $astrotech = -1, &$result = 0) {
   if($astrotech == -1) {
     if(!isset($user[UNIT_PLAYER_EXPEDITIONS_MAX]))
     {
@@ -1453,8 +1395,7 @@ 
   }
 }
 
-function get_player_max_expedition_duration(&$user, $astrotech = -1)
-{
+function get_player_max_expedition_duration(&$user, $astrotech = -1) {
   return $astrotech == -1 ? mrc_get_level($user, false, TECH_ASTROTECH) : $astrotech;
 }
 
@@ -1481,8 +1422,7 @@ 
   }
 }
 
-function get_player_current_colonies(&$user)
-{
+function get_player_current_colonies(&$user) {
   return $user[UNIT_PLAYER_COLONIES_CURRENT] = isset($user[UNIT_PLAYER_COLONIES_CURRENT]) ? $user[UNIT_PLAYER_COLONIES_CURRENT] : max(0, DBStaticPlanet::db_planet_count_by_type($user['id']) - 1);
 }
 

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

@@ -283,7 +283,7 @@
  */
 function sys_get_param($param_name, $default = '')
 {
-  return $_POST[$param_name] !== NULL ? $_POST[$param_name] : ($_GET[$param_name] !== NULL ? $_GET[$param_name] : $default);
+  return $_POST[$param_name] !== null ? $_POST[$param_name] : ($_GET[$param_name] !== null ? $_GET[$param_name] : $default);
 }
 
 function sys_get_param_id($param_name, $default = 0)

includes/vars.php

Indentation +74 added lines, -74 removed lines

@@ -16,23 +16,23 @@ 
 $sn_menu_admin_extra = array();
 
 $sn_mvc = array(
- 'model' => array(
-   'options' => array('sn_options_model'),
-   'chat' => array('sn_chat_model'),
-   'chat_add' => array('sn_chat_add_model'),
- ),
- 'view' => array(
-   'options' => array('sn_options_view'),
-   'chat' => array('sn_chat_view'),
-   'chat_msg' => array('sn_chat_msg_view'),
- ),
- 'controller' => array(),
- 'i18n' => array(
-   'options' => array(
-     'options' => 'options',
-     'messages' => 'messages',
-   ),
- ),
+  'model' => array(
+    'options' => array('sn_options_model'),
+    'chat' => array('sn_chat_model'),
+    'chat_add' => array('sn_chat_add_model'),
+  ),
+  'view' => array(
+    'options' => array('sn_options_view'),
+    'chat' => array('sn_chat_view'),
+    'chat_msg' => array('sn_chat_msg_view'),
+  ),
+  'controller' => array(),
+  'i18n' => array(
+    'options' => array(
+      'options' => 'options',
+      'messages' => 'messages',
+    ),
+  ),
 );
 
 $note_priority_classes = array(
@@ -120,62 +120,62 @@ 
   );
 
 $sn_message_class_list = array(
-   MSG_TYPE_NEW => array(
-     'name' => 'new_message',
-     'switchable' => false,
-     'email' => false,
-   ),
-   MSG_TYPE_ADMIN => array(
-     'name' => 'msg_admin',
-     'switchable' => false,
-     'email' => true,
-   ),
-   MSG_TYPE_PLAYER => array(
-     'name' => 'mnl_joueur',
-     'switchable' => false,
-     'email' => true,
-   ),
-   MSG_TYPE_ALLIANCE => array(
-     'name' => 'mnl_alliance',
-     'switchable' => false,
-     'email' => true,
-   ),
-   MSG_TYPE_SPY => array(
-     'name' => 'mnl_spy',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_COMBAT => array(
-     'name' => 'mnl_attaque',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_TRANSPORT => array(
-     'name' => 'mnl_transport',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_RECYCLE => array(
-     'name' => 'mnl_exploit',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_EXPLORE => array(
-     'name' => 'mnl_expedition',
-     'switchable' => true,
-     'email' => true,
-   ),
-   //     97 => 'mnl_general',
-   MSG_TYPE_QUE => array(
-     'name' => 'mnl_buildlist',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_OUTBOX => array(
-     'name' => 'mnl_outbox',
-     'switchable' => false,
-     'email' => false,
-   ),
+    MSG_TYPE_NEW => array(
+      'name' => 'new_message',
+      'switchable' => false,
+      'email' => false,
+    ),
+    MSG_TYPE_ADMIN => array(
+      'name' => 'msg_admin',
+      'switchable' => false,
+      'email' => true,
+    ),
+    MSG_TYPE_PLAYER => array(
+      'name' => 'mnl_joueur',
+      'switchable' => false,
+      'email' => true,
+    ),
+    MSG_TYPE_ALLIANCE => array(
+      'name' => 'mnl_alliance',
+      'switchable' => false,
+      'email' => true,
+    ),
+    MSG_TYPE_SPY => array(
+      'name' => 'mnl_spy',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_COMBAT => array(
+      'name' => 'mnl_attaque',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_TRANSPORT => array(
+      'name' => 'mnl_transport',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_RECYCLE => array(
+      'name' => 'mnl_exploit',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_EXPLORE => array(
+      'name' => 'mnl_expedition',
+      'switchable' => true,
+      'email' => true,
+    ),
+    //     97 => 'mnl_general',
+    MSG_TYPE_QUE => array(
+      'name' => 'mnl_buildlist',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_OUTBOX => array(
+      'name' => 'mnl_outbox',
+      'switchable' => false,
+      'email' => false,
+    ),
 );
 
 $sn_message_groups = array(
@@ -1027,7 +1027,7 @@ 
       SHIP_HUGE_DEATH_STAR => SHIP_HUGE_DEATH_STAR, SHIP_HUGE_SUPERNOVA => SHIP_HUGE_SUPERNOVA,
       SHIP_CARGO_SMALL => SHIP_CARGO_SMALL, SHIP_CARGO_BIG => SHIP_CARGO_BIG, SHIP_CARGO_SUPER => SHIP_CARGO_SUPER, SHIP_CARGO_HYPER => SHIP_CARGO_HYPER,
       SHIP_RECYCLER => SHIP_RECYCLER, SHIP_COLONIZER => SHIP_COLONIZER, SHIP_SPY => SHIP_SPY, SHIP_SATTELITE_SOLAR => SHIP_SATTELITE_SOLAR
-     ),
+      ),
     // Defensive building list
     'defense'   => array (UNIT_DEF_TURRET_MISSILE => UNIT_DEF_TURRET_MISSILE, UNIT_DEF_TURRET_LASER_SMALL => UNIT_DEF_TURRET_LASER_SMALL,
                           UNIT_DEF_TURRET_LASER_BIG => UNIT_DEF_TURRET_LASER_BIG, UNIT_DEF_TURRET_GAUSS => UNIT_DEF_TURRET_GAUSS,

Spacing +23 added lines, -23 removed lines

@@ -97,7 +97,7 @@ 
   SNC_VER_ERROR_MISSMATCH_KEY_ID => 'error',
 );
 
-$tableList = array( 'aks', 'alliance', 'alliance_requests', 'announce', 'annonce', 'banned', 'buddy', 'chat', 'config', 'counter',
+$tableList = array('aks', 'alliance', 'alliance_requests', 'announce', 'annonce', 'banned', 'buddy', 'chat', 'config', 'counter',
   'errors', 'fleets', 'fleet_log', 'galaxy', 'iraks', 'logs', 'log_dark_matter', 'messages', 'notes', 'planets', 'quest',
   'quest_status', 'referrals', 'rw', 'statpoints', 'users'
 );
@@ -188,14 +188,14 @@ 
 $user_option_list = array();
 
 $user_option_list[OPT_MESSAGE] = array();
-foreach($sn_message_class_list as $message_class_id => $message_class_data)
+foreach ($sn_message_class_list as $message_class_id => $message_class_data)
 {
-  if($message_class_data['switchable'])
+  if ($message_class_data['switchable'])
   {
     $user_option_list[OPT_MESSAGE]["opt_{$message_class_data['name']}"] = 1;
   }
 
-  if($message_class_data['email'])
+  if ($message_class_data['email'])
   {
     $user_option_list[OPT_MESSAGE]["opt_email_{$message_class_data['name']}"] = 0;
   }
@@ -778,7 +778,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_ICE_HYDROGEN,
         UNIT_PLANET_DENSITY_RARITY => 30, // 1, // 40.00, // * 1/121 0,82645
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES => array(RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ),
@@ -787,7 +787,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_ICE_METHANE,
         UNIT_PLANET_DENSITY_RARITY =>  130, // 6, // 6.67, // * 6,0	4,95868
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES => array(RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ),
@@ -796,7 +796,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_ICE_WATER,
         UNIT_PLANET_DENSITY_RARITY =>  450, //20, // 2.00, // * 20,0	16,52893
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES => array(RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ),
@@ -806,7 +806,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_CRYSTAL_RAW,
         UNIT_PLANET_DENSITY_RARITY => 20, // 1, // 40.00, // *1,0	0,82645
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES => array(RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ),
@@ -815,7 +815,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_CRYSTAL_SILICATE,
         UNIT_PLANET_DENSITY_RARITY => 140, // 5.71, // * 7,0	5,78512
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES => array(RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ),
@@ -824,7 +824,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_CRYSTAL_STONE,
         UNIT_PLANET_DENSITY_RARITY => 500, // 1.90, // * 21,0	17,35537
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES => array(RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ),
@@ -834,7 +834,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_STANDARD,
         UNIT_PLANET_DENSITY_RARITY => 1000, // 1.0, // * 40,0	33,05785
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_NORMAL,
-        UNIT_RESOURCES => array(RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00, ),
+        UNIT_RESOURCES => array(RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ),
@@ -844,7 +844,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_METAL_ORE,
         UNIT_PLANET_DENSITY_RARITY => 550, // 2.11, // * 19,0	15,70248
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES => array(RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80, ),
+        UNIT_RESOURCES => array(RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ),
@@ -853,7 +853,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_METAL_PERIDOT,
         UNIT_PLANET_DENSITY_RARITY => 120, // 8.00, // * 5,0	4,13223
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES => array(RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55, ),
+        UNIT_RESOURCES => array(RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ),
@@ -862,7 +862,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_METAL_RAW,
         UNIT_PLANET_DENSITY_RARITY => 25, // 40.00, // * 1,0	0,82645
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES => array(RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25, ),
+        UNIT_RESOURCES => array(RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ),
@@ -992,7 +992,7 @@ 
     ),
 
     // Tech list
-    'tech'      => array (
+    'tech'      => array(
       TECH_ARMOR => TECH_ARMOR, TECH_WEAPON => TECH_WEAPON, TECH_SHIELD => TECH_SHIELD,
       TECH_SPY => TECH_SPY, TECH_COMPUTER => TECH_COMPUTER,
       TECH_ENERGY => TECH_ENERGY, TECH_LASER => TECH_LASER, TECH_ION => TECH_ION, TECH_PLASMA => TECH_PLASMA, TECH_HYPERSPACE => TECH_HYPERSPACE,
@@ -1003,7 +1003,7 @@ 
     ),
 
     // Mercenaries
-    'mercenaries' => array (
+    'mercenaries' => array(
       MRC_STOCKMAN => MRC_STOCKMAN, MRC_SPY => MRC_SPY, MRC_ACADEMIC => MRC_ACADEMIC,
       MRC_ADMIRAL => MRC_ADMIRAL, MRC_COORDINATOR => MRC_COORDINATOR, MRC_NAVIGATOR => MRC_NAVIGATOR,
     ),
@@ -1029,7 +1029,7 @@ 
       SHIP_RECYCLER => SHIP_RECYCLER, SHIP_COLONIZER => SHIP_COLONIZER, SHIP_SPY => SHIP_SPY, SHIP_SATTELITE_SOLAR => SHIP_SATTELITE_SOLAR
      ),
     // Defensive building list
-    'defense'   => array (UNIT_DEF_TURRET_MISSILE => UNIT_DEF_TURRET_MISSILE, UNIT_DEF_TURRET_LASER_SMALL => UNIT_DEF_TURRET_LASER_SMALL,
+    'defense'   => array(UNIT_DEF_TURRET_MISSILE => UNIT_DEF_TURRET_MISSILE, UNIT_DEF_TURRET_LASER_SMALL => UNIT_DEF_TURRET_LASER_SMALL,
                           UNIT_DEF_TURRET_LASER_BIG => UNIT_DEF_TURRET_LASER_BIG, UNIT_DEF_TURRET_GAUSS => UNIT_DEF_TURRET_GAUSS,
                           UNIT_DEF_TURRET_ION => UNIT_DEF_TURRET_ION, UNIT_DEF_TURRET_PLASMA => UNIT_DEF_TURRET_PLASMA,
 
@@ -1039,7 +1039,7 @@ 
     ),
 
     // Missiles list
-    'missile'   => array (UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET, ),
+    'missile'   => array(UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,),
 
     // Combat units list
     'combat'    => array(
@@ -1079,9 +1079,9 @@ 
     ),
 
     // Resource list
-    'resources' => array ( 0 => 'metal', 1 => 'crystal', 2 => 'deuterium', 3 => 'dark_matter'),
+    'resources' => array(0 => 'metal', 1 => 'crystal', 2 => 'deuterium', 3 => 'dark_matter'),
     // Resources all
-    'resources_all' => array(RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY, RES_DARK_MATTER => RES_DARK_MATTER, RES_METAMATTER => RES_METAMATTER, ),
+    'resources_all' => array(RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY, RES_DARK_MATTER => RES_DARK_MATTER, RES_METAMATTER => RES_METAMATTER,),
     // Resources can be produced on planet
     'resources_planet' => array(RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY),
     // Resources can be looted from planet
@@ -1100,13 +1100,13 @@ 
     ),
 
     // Resources that can be tradeable in market trader AND be a quest_rewards
-    'quest_rewards' => array(RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER, ),
+    'quest_rewards' => array(RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER,),
 
 //      // Ques list
 //      'ques' => array(QUE_STRUCTURES, QUE_HANGAR, QUE_RESEARCH),
 
-    'STAT_COMMON' => array(STAT_TOTAL => STAT_TOTAL, STAT_FLEET => STAT_FLEET, STAT_TECH => STAT_TECH, STAT_BUILDING => STAT_BUILDING, STAT_DEFENSE => STAT_DEFENSE, STAT_RESOURCE => STAT_RESOURCE, ),
-    'STAT_PLAYER' => array(STAT_RAID_TOTAL => STAT_RAID_TOTAL, STAT_RAID_WON => STAT_RAID_WON, STAT_RAID_LOST => STAT_RAID_LOST, STAT_LVL_BUILDING => STAT_LVL_BUILDING, STAT_LVL_TECH => STAT_LVL_TECH, STAT_LVL_RAID => STAT_LVL_RAID, ),
+    'STAT_COMMON' => array(STAT_TOTAL => STAT_TOTAL, STAT_FLEET => STAT_FLEET, STAT_TECH => STAT_TECH, STAT_BUILDING => STAT_BUILDING, STAT_DEFENSE => STAT_DEFENSE, STAT_RESOURCE => STAT_RESOURCE,),
+    'STAT_PLAYER' => array(STAT_RAID_TOTAL => STAT_RAID_TOTAL, STAT_RAID_WON => STAT_RAID_WON, STAT_RAID_LOST => STAT_RAID_LOST, STAT_LVL_BUILDING => STAT_LVL_BUILDING, STAT_LVL_TECH => STAT_LVL_TECH, STAT_LVL_RAID => STAT_LVL_RAID,),
   ),
 
   'pages' => array(

includes/vars_menu.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-if(!defined('INSIDE')) {
+if (!defined('INSIDE')) {
   die('Hack attempt!');
 }
 

includes/alliance/ali_internal_admin_mail.inc

Spacing +3 added lines, -3 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);
 }
@@ -17,8 +17,8 @@ 
 
 $lang['r_list'] = "<option value=\"-1\">{$lang['All_players']}</option>";
 if ($ranks) {
-  foreach($ranks as $id => $array) {
-    $lang['r_list'] .= "<option value=\"" . $id  . "\">" . $array['name'] . "</option>";
+  foreach ($ranks as $id => $array) {
+    $lang['r_list'] .= "<option value=\"" . $id . "\">" . $array['name'] . "</option>";
   }
 }
 

includes/alliance/ali_external_search.inc

Spacing +1 added lines, -1 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);
 }

includes/alliance/ali_internal_admin_rights.inc

Spacing +8 added lines, -8 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,7 +14,7 @@ 
 $new_rank_name = sys_get_param_str('newRankName');
 if ($new_rank_name)
 {
-  foreach($ally_rights as $fieldName)
+  foreach ($ally_rights as $fieldName)
   {
     $newRank[$fieldName] = 0;
   }
@@ -28,9 +28,9 @@ 
 {
   unset($ranks);
 
-  foreach($rankListInput as $rankID => $rank)
+  foreach ($rankListInput as $rankID => $rank)
   {
-    foreach($ally_rights as $rightName)
+    foreach ($ally_rights as $rightName)
     {
       $ranks[$rankID][$rightName] = $rank[$rightName] ? 1 : 0;
     }
@@ -41,7 +41,7 @@ 
 $d = sys_get_param_int('d');
 if ($d && isset($ranks[$d]))
 {
-  if(count($ranks) == 1)
+  if (count($ranks) == 1)
   {
     message($lang['ali_adm_lastRank'], $lang['ali_adm_rights_title']);
   }
@@ -53,16 +53,16 @@ 
 
 if (count($ranks))
 {
-  foreach($ranks as $rankID => $rank)
+  foreach ($ranks as $rankID => $rank)
   {
     $rank_data = array(
       'ID'   => $rankID,
       'NAME' => $rank['name'],
     );
 
-    for($i = 1; $i < count($rank); $i++)
+    for ($i = 1; $i < count($rank); $i++)
     {
-      $rank_data['R' . $i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '') ;
+      $rank_data['R' . $i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '');
       $rank_data['N' . $i] = $ally_rights[$i];
     }