supernova-ws / SuperNova

includes/general_pname.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 function pname_factory_production_field_name($factory_unit_id)
 {
-  return get_unit_param($factory_unit_id, P_NAME) . '_porcent';
+  return get_unit_param($factory_unit_id, P_NAME).'_porcent';
 }
 
 /**

includes/includes/ube_zi_helpers.php

Spacing +4 added lines, -4 removed lines

@@ -27,9 +27,9 @@ 
   print($round);
   print('<table border=1>');
   print('<tr align="left">');
-  foreach($header as $key => $value)
+  foreach ($header as $key => $value)
   {
-    if(is_array($value))
+    if (is_array($value))
     {
       continue;
     }
@@ -61,9 +61,9 @@ 
   );
 
   print('<tr align="right">');
-  foreach($unit_crossfire_result as $key => $value)
+  foreach ($unit_crossfire_result as $key => $value)
   {
-    if(is_array($value))
+    if (is_array($value))
     {
       continue;
     }

includes/includes/flt_mission_colonize.php

Spacing +5 added lines, -5 removed lines

@@ -20,14 +20,14 @@ 
   $TargetAddress = sprintf(classLocale::$lang['sys_adress_planet'], $fleet_end_coordinates['galaxy'], $fleet_end_coordinates['system'], $fleet_end_coordinates['planet']);
 
   $TheMessage = classLocale::$lang['sys_colo_no_colonizer'];
-  if($objFleet->shipsGetTotalById(SHIP_COLONIZER) >= 1) {
+  if ($objFleet->shipsGetTotalById(SHIP_COLONIZER) >= 1) {
     $TheMessage = classLocale::$lang['sys_colo_notfree'];
-    if(empty($mission_data->dst_planet)) {
+    if (empty($mission_data->dst_planet)) {
       $iPlanetCount = get_player_current_colonies($src_user_row);
 
       // Can we colonize more planets?
       $TheMessage = classLocale::$lang['sys_colo_maxcolo'];
-      if($iPlanetCount < get_player_max_colonies($src_user_row)) {
+      if ($iPlanetCount < get_player_max_colonies($src_user_row)) {
         // Yes, we can colonize
         $TheMessage = classLocale::$lang['sys_colo_badpos'];
 
@@ -35,8 +35,8 @@ 
           $fleet_end_coordinates['galaxy'], $fleet_end_coordinates['system'], $fleet_end_coordinates['planet'],
           $objFleet->playerOwnerId, "{$classLocale['sys_colo_defaultname']} {$iPlanetCount}", false,
           array('user_row' => $src_user_row));
-        if($NewOwnerPlanet) {
-          $TheMessage = classLocale::$lang['sys_colo_arrival'] . $TargetAddress . classLocale::$lang['sys_colo_allisok'];
+        if ($NewOwnerPlanet) {
+          $TheMessage = classLocale::$lang['sys_colo_arrival'].$TargetAddress.classLocale::$lang['sys_colo_allisok'];
           msg_send_simple_message($objFleet->playerOwnerId, '', $objFleet->time_arrive_to_target, MSG_TYPE_SPY, classLocale::$lang['sys_colo_mess_from'], classLocale::$lang['sys_colo_mess_report'], $TheMessage);
 
           $objFleet->shipAdjustCount(SHIP_COLONIZER, -1);

includes/includes/sys_avatar.php

Spacing +11 added lines, -11 removed lines

@@ -2,32 +2,32 @@ 
 
 function sys_avatar_upload($subject_id, &$avatar_field, $prefix = 'avatar') {
   try {
-    $avatar_filename = $fullsize_filename = SN_ROOT_PHYSICAL . 'images/avatar/' . $prefix . '_' . $subject_id;
+    $avatar_filename = $fullsize_filename = SN_ROOT_PHYSICAL.'images/avatar/'.$prefix.'_'.$subject_id;
     $avatar_filename .= '.png';
     $fullsize_filename .= '_full.png';
-    if(sys_get_param_int('avatar_remove')) {
-      if(file_exists($avatar_filename) && !unlink($avatar_filename)) {
+    if (sys_get_param_int('avatar_remove')) {
+      if (file_exists($avatar_filename) && !unlink($avatar_filename)) {
         throw new Exception(classLocale::$lang['opt_msg_avatar_error_delete'], ERR_ERROR);
       }
       $avatar_field = 0;
       throw new Exception(classLocale::$lang['opt_msg_avatar_removed'], ERR_NONE);
-    } elseif($_FILES['avatar']['size']) {
-      if(!in_array($_FILES['avatar']['type'], array('image/gif', 'image/jpeg', 'image/jpg', 'image/pjpeg', 'image/png')) || $_FILES['avatar']['size'] > 204800) {
+    } elseif ($_FILES['avatar']['size']) {
+      if (!in_array($_FILES['avatar']['type'], array('image/gif', 'image/jpeg', 'image/jpg', 'image/pjpeg', 'image/png')) || $_FILES['avatar']['size'] > 204800) {
         throw new Exception(classLocale::$lang['opt_msg_avatar_error_unsupported'], ERR_WARNING);
       }
 
-      if($_FILES['avatar']['error']) {
+      if ($_FILES['avatar']['error']) {
         throw new Exception(sprintf(classLocale::$lang['opt_msg_avatar_error_upload'], $_FILES['avatar']['error']), ERR_ERROR);
       }
 
-      if(!($avatar_image = imagecreatefromstring(file_get_contents($_FILES['avatar']['tmp_name'])))) {
+      if (!($avatar_image = imagecreatefromstring(file_get_contents($_FILES['avatar']['tmp_name'])))) {
         throw new Exception(classLocale::$lang['opt_msg_avatar_error_unsupported'], ERR_WARNING);
       }
 
       $avatar_size = getimagesize($_FILES['avatar']['tmp_name']);
       $avatar_max_width = classSupernova::$config->avatar_max_width;
       $avatar_max_height = classSupernova::$config->avatar_max_height;
-      if($avatar_size[0] > $avatar_max_width || $avatar_size[1] > $avatar_max_height) {
+      if ($avatar_size[0] > $avatar_max_width || $avatar_size[1] > $avatar_max_height) {
         $aspect_ratio = min($avatar_max_width / $avatar_size[0], $avatar_max_height / $avatar_size[1]);
         $avatar_image_new = imagecreatetruecolor($avatar_size[0] * $aspect_ratio, $avatar_size[0] * $aspect_ratio);
         $result = imagecopyresized($avatar_image_new, $avatar_image, 0, 0, 0, 0, $avatar_size[0] * $aspect_ratio, $avatar_size[0] * $aspect_ratio, $avatar_size[0], $avatar_size[1]);
@@ -35,11 +35,11 @@ 
         $avatar_image = $avatar_image_new;
       }
 
-      if(file_exists($avatar_filename) && !unlink($avatar_filename)) {
+      if (file_exists($avatar_filename) && !unlink($avatar_filename)) {
         throw new Exception(classLocale::$lang['opt_msg_avatar_error_delete'], ERR_ERROR);
       }
 
-      if(!imagepng($avatar_image, $avatar_filename, 9)) {
+      if (!imagepng($avatar_image, $avatar_filename, 9)) {
         throw new Exception(classLocale::$lang['opt_msg_avatar_error_writing'], ERR_ERROR);
       }
 
@@ -47,7 +47,7 @@ 
       imagedestroy($avatar_image);
       throw new Exception(classLocale::$lang['opt_msg_avatar_uploaded'], ERR_NONE);
     }
-  } catch(Exception $e) {
+  } catch (Exception $e) {
     return array(
       'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
       'MESSAGE' => $e->getMessage()

reg.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 $id_ref = $_GET['id_ref'] ? intval($_GET['id_ref']) : 0;
-$id_ref = $id_ref ? '?id_ref=' . $id_ref : '';
+$id_ref = $id_ref ? '?id_ref='.$id_ref : '';
 
 header('HTTP/1.1 301 Moved Permanently');
 header("Location: login.php{$id_ref}#tab_password_reset");

includes/general.php

Spacing +25 added lines, -25 removed lines

@@ -36,7 +36,7 @@ 
     }
   } else {
     // TODO: This is left for backward compatibility. Appropriate code should be rewrote!
-    $func_name = isset(classSupernova::$functions[$func_name]) && is_callable(classSupernova::$functions[$func_name]) ? classSupernova::$functions[$func_name] : ('sn_' . $func_name);
+    $func_name = isset(classSupernova::$functions[$func_name]) && is_callable(classSupernova::$functions[$func_name]) ? classSupernova::$functions[$func_name] : ('sn_'.$func_name);
     if (is_callable($func_name)) {
       $result = call_user_func_array($func_name, $func_arg);
     }
@@ -111,7 +111,7 @@ 
  */
 function get_exchange_rate($currency_symbol) {
   $currency_symbol = strtolower($currency_symbol);
-  $config_field = 'payment_currency_exchange_' . $currency_symbol;
+  $config_field = 'payment_currency_exchange_'.$currency_symbol;
 
   // Заворачиваем получение стоимости ММ через перекрываемую процедуру
   $exchange_rate = floatval($currency_symbol == 'mm_' ? get_mm_cost() : classSupernova::$config->$config_field);
@@ -623,8 +623,8 @@ 
   $from = trim($from ? $from : classSupernova::$config->game_adminEmail);
 
   $head = '';
-  $head .= "Content-Type: text/" . ($html ? 'html' : 'plain') . "; charset=utf-8 \r\n";
-  $head .= "Date: " . date('r') . " \r\n";
+  $head .= "Content-Type: text/".($html ? 'html' : 'plain')."; charset=utf-8 \r\n";
+  $head .= "Date: ".date('r')." \r\n";
   $classConfig = classSupernova::$config;
   $head .= "Return-Path: {$classConfig->game_adminEmail} \r\n";
   $head .= "From: {$from} \r\n";
@@ -637,10 +637,10 @@ 
   $body = str_replace("\n", "\r\n", $body);
 
   if ($html) {
-    $body = '<html><head><base href="' . SN_ROOT_VIRTUAL . '"></head><body>' . nl2br($body) . '</body></html>';
+    $body = '<html><head><base href="'.SN_ROOT_VIRTUAL.'"></head><body>'.nl2br($body).'</body></html>';
   }
 
-  $title = '=?UTF-8?B?' . base64_encode($title) . '?=';
+  $title = '=?UTF-8?B?'.base64_encode($title).'?=';
 
   return @mail($email_unsafe, $title, $body, $head);
 }
@@ -656,14 +656,14 @@ 
   $classLocale = classLocale::$lang;
 
   return
-    ($full || $time ? "{$time} {$classLocale['sys_day']}&nbsp;" : '') .
-    ($full || $hours ? "{$hours} {$classLocale['sys_hrs']}&nbsp;" : '') .
-    ($full || $minutes ? "{$minutes} {$classLocale['sys_min']}&nbsp;" : '') .
+    ($full || $time ? "{$time} {$classLocale['sys_day']}&nbsp;" : '').
+    ($full || $hours ? "{$hours} {$classLocale['sys_hrs']}&nbsp;" : '').
+    ($full || $minutes ? "{$minutes} {$classLocale['sys_min']}&nbsp;" : '').
     ($full || !$time || $seconds ? "{$seconds} {$classLocale['sys_sec']}" : '');
 }
 
 function sys_time_human_system($time) {
-  return $time ? date(FMT_DATE_TIME_SQL, $time) . " ({$time}), " . sys_time_human(SN_TIME_NOW - $time) : '{NEVER}';
+  return $time ? date(FMT_DATE_TIME_SQL, $time)." ({$time}), ".sys_time_human(SN_TIME_NOW - $time) : '{NEVER}';
 }
 
 function sys_redirect($url) {
@@ -756,13 +756,13 @@ 
       // usw..
     );
 
-    $rexep = "#" . strtr(preg_quote($format), $masks) . "#";
+    $rexep = "#".strtr(preg_quote($format), $masks)."#";
     if (preg_match($rexep, $date, $out)) {
       $ret = array(
-        "tm_sec"  => (int)$out['S'],
-        "tm_min"  => (int)$out['M'],
-        "tm_hour" => (int)$out['H'],
-        "tm_mday" => (int)$out['d'],
+        "tm_sec"  => (int) $out['S'],
+        "tm_min"  => (int) $out['M'],
+        "tm_hour" => (int) $out['H'],
+        "tm_mday" => (int) $out['d'],
         "tm_mon"  => $out['m'] ? $out['m'] - 1 : 0,
         "tm_year" => $out['Y'] > 1900 ? $out['Y'] - 1900 : 0,
       );
@@ -832,7 +832,7 @@ 
         $functions[$function_name] = array();
       } elseif (!isset($functions[$function_name])) {
         $functions[$function_name] = array();
-        $sn_function_name = 'sn_' . $function_name . ($sub_type ? '_' . $sub_type : '');
+        $sn_function_name = 'sn_'.$function_name.($sub_type ? '_'.$sub_type : '');
         $functions[$function_name][] = $sn_function_name;
       }
 
@@ -899,7 +899,7 @@ 
   }
 
   if (isset($nick_array[NICK_GENDER])) {
-    $result[NICK_GENDER] = '<img src="' . ($user['dpath'] ? $user['dpath'] : DEFAULT_SKINPATH) . 'images/gender_' . $nick_array[NICK_GENDER] . '.png" />';
+    $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])) {
@@ -931,14 +931,14 @@ 
   }
 
   if (isset($nick_array[NICK_CLASS])) {
-    $result[NICK_CLASS] = '<span ' . $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])) {
-    $result[NICK_ALLY] = '[' . sys_safe_output($nick_array[NICK_ALLY]) . ']';
+    $result[NICK_ALLY] = '['.sys_safe_output($nick_array[NICK_ALLY]).']';
   }
 
   $result[NICK_HTML] = true;
@@ -961,7 +961,7 @@ 
   */
 
 
-  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] = '';
   }
 
@@ -983,7 +983,7 @@ 
   }
 
   if ((isset($options['class']) && $options['class'])) {
-    $result[NICK_CLASS] = (isset($result_options[NICK_CLASS]) ? ' ' . $result_options[NICK_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']))) {
@@ -1011,7 +1011,7 @@ 
     foreach ($temp as $user_id) {
       $user_id = floatval($user_id);
       if ($user_id) {
-        $user_skip_list[] = '`id` = ' . $user_id;
+        $user_skip_list[] = '`id` = '.$user_id;
       }
     }
   }
@@ -1410,7 +1410,7 @@ 
     $time_left = min(floor($time_left / PERIOD_DAY), $term_original);
     $cost_left = $term_original > 0 ? ceil($time_left / $term_original * $original_cost) : 0;
 
-    array_walk_recursive($result, function (&$value) use ($cost_left) {
+    array_walk_recursive($result, function(&$value) use ($cost_left) {
       $value -= $cost_left;
     });
   }
@@ -1465,7 +1465,7 @@ 
 }
 
 function print_rr($var, $capture = false) {
-  $print = '<pre>' . htmlspecialchars(print_r($var, true)) . '</pre>';
+  $print = '<pre>'.htmlspecialchars(print_r($var, true)).'</pre>';
   if ($capture) {
     return $print;
   } else {
@@ -1567,7 +1567,7 @@ 
       break;
     }
     $sort_option_inverse_closure = $sort_option_inverse ? -1 : 1;
-    usort($ListToSort, function ($a, $b) use ($sort_option_field, $sort_option_inverse_closure) {
+    usort($ListToSort, function($a, $b) use ($sort_option_field, $sort_option_inverse_closure) {
       return $a[$sort_option_field] < $b[$sort_option_field] ? -1 * $sort_option_inverse_closure : (
       $a[$sort_option_field] > $b[$sort_option_field] ? 1 * $sort_option_inverse_closure : 0
       );

Doc Comments +34 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
 require_once('general_pname.php');
 
 /**
- * @param       $func_name
+ * @param       string $func_name
  * @param array $func_arg
  *
  * @return mixed
@@ -62,6 +62,9 @@ 
 }
 
 // ----------------------------------------------------------------------------------------------------------------
+/**
+ * @param string $filename
+ */
 function sys_file_read($filename) {
   return @file_get_contents($filename);
 }
@@ -104,7 +107,7 @@ 
 /**
  * Получение курса обмены валюты в серверную валюту
  *
- * @param $currency_symbol
+ * @param string $currency_symbol
  *
  * @return float
  */
@@ -130,7 +133,7 @@ 
  *    - true    - colors number to green if positive or zero; red if negative
  *    - 0
  *    - numeric - colors number to green if less then $color; red if greater
- * @param int|bool  $limit - generally converts "15000" to "15k", "2000000" to "2kk" etc
+ * @param boolean  $limit - generally converts "15000" to "15k", "2000000" to "2kk" etc
  *    - 0/false - proceed with $floor
  *    - numeric - divides number to segments by power of $limit and adds 'k' for each segment
  *        - makes sense for 1000, but works with any number
@@ -229,6 +232,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));
 }
@@ -266,6 +272,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));
 }
@@ -434,6 +443,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);
 
@@ -538,6 +550,10 @@ 
   return implode(';', $fleet_string);
 }
 
+/**
+ * @param string $title
+ * @param string $body
+ */
 function mymail($email_unsafe, $title, $body, $from = '', $html = false) {
   $from = trim($from ? $from : classSupernova::$config->game_adminEmail);
 
@@ -803,6 +819,9 @@ 
   return serialize($nick_array);
 }
 
+/**
+ * @param string $nick_string
+ */
 function player_nick_uncompact($nick_string) {
   try {
     $result = unserialize($nick_string);
@@ -990,6 +1009,9 @@ 
   return $result;
 }
 
+/**
+ * @param string $groups
+ */
 function isInGroup($groups, $unitId) {
   $group = sn_get_groups($groups);
 
@@ -1058,6 +1080,9 @@ 
   return $ranks;
 }
 
+/**
+ * @param boolean $planet_id
+ */
 function sys_player_new_adjust($user_id, $planet_id) { return sn_function_call(__FUNCTION__, array($user_id, $planet_id, &$result)); }
 
 function sn_sys_player_new_adjust($user_id, $planet_id, &$result) {
@@ -1216,6 +1241,9 @@ 
   return $rates;
 }
 
+/**
+ * @param integer $in_resource
+ */
 function get_unit_cost_in(&$cost, $in_resource = RES_METAL) {
   static $rates;
 
@@ -1382,6 +1410,9 @@ 
   return version_compare(sn_version_compare_extra($ver1), sn_version_compare_extra($ver2));
 }
 
+/**
+ * @param string $name
+ */
 function sn_setcookie($name, $value = null, $expire = null, $path = SN_ROOT_RELATIVE, $domain = null, $secure = null, $httponly = null) {
   $_COOKIE[$name] = $value;
 

officer.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 $template = gettemplate('viewreport', true);
 $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']);

logout.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 $template = gettemplate('viewreport', true);
 $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']);

admin/adm_metamatter.php

Spacing +2 added lines, -2 removed lines

@@ -13,10 +13,10 @@
 define('INSTALL', false);
 define('IN_ADMIN', true);
 
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
 if (!sn_module_get_active_count('payment')) {
-  sys_redirect(SN_ROOT_VIRTUAL . 'admin/overview.php');
+  sys_redirect(SN_ROOT_VIRTUAL.'admin/overview.php');
 }
 
 if ($user['authlevel'] < 3) {