supernova-ws / SuperNova

includes/alliance/ali_internal_admin_mail.inc

Spacing +5 added lines, -5 removed lines

@@ -1,21 +1,21 @@
 <?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);
 }
 
-if(!$user_can_send_mails) {
+if (!$user_can_send_mails) {
   message(classLocale::$lang['Denied_access'], classLocale::$lang['Send_circular_mail']);
 }
 
 $POST_text = sys_get_param_str('text');
-if($POST_text) {
+if ($POST_text) {
   message(classLocale::$lang['members_who_recived_message'] . msg_ali_send($POST_text, classLocale::$lang['ali_adm_msg_subject'], sys_get_param_int('r')), classLocale::$lang['Circular_sended'], "alliance.php", '');
 }
 
 $r_list = "<option value=\"-1\">" . classLocale::$lang['All_players'] . "</option>";
-if($ranks) {
-  foreach($ranks as $id => $array) {
+if ($ranks) {
+  foreach ($ranks as $id => $array) {
     $r_list .= "<option value=\"" . $id . "\">" . $array['name'] . "</option>";
   }
 }

admin/admin_chat.php

Spacing +4 added lines, -4 removed lines

@@ -14,13 +14,13 @@ 
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
-if($delete = sys_get_param_str('delete')) {
+if ($delete = sys_get_param_str('delete')) {
   db_chat_message_delete($delete);
-} elseif(sys_get_param_str('deleteall') == 'yes') {
+} elseif (sys_get_param_str('deleteall') == 'yes') {
   db_chat_message_purge();
 }
 
@@ -28,7 +28,7 @@ 
 
 $query = db_chat_message_get_last_25();
 $i = 0;
-while($e = db_fetch($query)) {
+while ($e = db_fetch($query)) {
   $i++;
   $template->assign_block_vars('messages', array(
     'ID' => $e['messageid'],

admin/banned.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 1) {
+if ($user['authlevel'] < 1) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
@@ -28,8 +28,8 @@ 
 $template = gettemplate("admin/admin_ban", true);
 
 $player_banned_row = db_user_by_username($name_unsafe);
-if($mode == 'banit' && $action) {
-  if($player_banned_row) {
+if ($mode == 'banit' && $action) {
+  if ($player_banned_row) {
     $reas = $_POST['why'];
     $days = $_POST['days'];
     $hour = $_POST['hour'];
@@ -49,7 +49,7 @@ 
     $adm_bn_thpl = classLocale::$lang['adm_bn_thpl'];
     $DoneMessage = "{$adm_bn_thpl} {$name_output} {$adm_bn_isbn}";
 
-    if($is_vacation) {
+    if ($is_vacation) {
       $DoneMessage .= classLocale::$lang['adm_bn_vctn'];
     }
 
@@ -59,7 +59,7 @@ 
   }
 
   AdminMessage($DoneMessage, classLocale::$lang['adm_ban_title']);
-} elseif($mode == 'unbanit' && $action) {
+} elseif ($mode == 'unbanit' && $action) {
   sys_admin_player_ban_unset($user, $player_banned_row, ($reason = sys_get_param_str('why')) ? $reason : classLocale::$lang['sys_unbanned']);
 
   $DoneMessage = classLocale::$lang['adm_unbn_thpl'] . " " . $name_output . " " . classLocale::$lang['adm_unbn_isbn'];

includes/includes/flt_page4.inc

Spacing +17 added lines, -17 removed lines

@@ -2,28 +2,28 @@ 
 
 $classLocale = classLocale::$lang;
 
-if(SN_IN_FLEET !== true) {
+if (SN_IN_FLEET !== true) {
   $debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
 }
 
 $fleetid = sys_get_param_id('fleetid');
 
-if(!is_numeric($fleetid) || empty($fleetid)) {
+if (!is_numeric($fleetid) || empty($fleetid)) {
   header("Location: fleet.php");
   exit();
 }
 
 $objFleet = new Fleet();
 $objFleet->dbLoad($fleetid);
-if(!$objFleet->dbId) {
+if (!$objFleet->dbId) {
   message(classLocale::$lang['fl_fleet_not_exists'], classLocale::$lang['fl_error']);
 }
 
-if($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) {
+if ($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) {
   message(classLocale::$lang['fl_isback'], classLocale::$lang['fl_error']);
 }
 
-if($objFleet->playerOwnerId != $user['id']) {
+if ($objFleet->playerOwnerId != $user['id']) {
   $debug->warning(classLocale::$lang['fl_aks_hack_wrong_fleet'], 'Wrong Fleet Owner', 301);
   message(classLocale::$lang['fl_aks_hack_wrong_fleet'], classLocale::$lang['fl_error']);
 }
@@ -34,19 +34,19 @@ 
 
 !$aks && !$userToAdd_unsafe ? $userToAdd_unsafe = $user['username'] : false;
 
-if($userToAdd_unsafe) {
+if ($userToAdd_unsafe) {
   $userToAdd = db_escape($userToAdd_unsafe);
   $userToAddID = db_user_by_username($userToAdd_unsafe, false, 'id', true, true);
   $userToAddID = $userToAddID['id'];
 
-  if($objFleet->target_owner_id == $userToAddID) {
+  if ($objFleet->target_owner_id == $userToAddID) {
     message(classLocale::$lang['flt_aks_player_same'], classLocale::$lang['fl_error']);
   }
 
-  if($userToAddID) {
-    if(!$aks) {
+  if ($userToAddID) {
+    if (!$aks) {
       // No AСS exists - making one
-      if(!$objFleet->group_id) {
+      if (!$objFleet->group_id) {
         db_acs_insert($fleetid, $user, $objFleet);
 
         $aks = db_acs_get_by_fleet($fleetid);
@@ -61,17 +61,17 @@ 
 
     $isUserExists = false;
     $invited_ar = explode(",", $aks['eingeladen']);
-    foreach($invited_ar as $inv) {
-      if($userToAddID == $inv) {
+    foreach ($invited_ar as $inv) {
+      if ($userToAddID == $inv) {
         $isUserExists = true;
       }
     }
 
-    if(count($invited_ar) >= 5) {
+    if (count($invited_ar) >= 5) {
       message(classLocale::$lang['flt_aks_error_too_much_players'], classLocale::$lang['fl_error']);
     }
 
-    if($isUserExists) {
+    if ($isUserExists) {
       $userToAdd_unsafe != $user['username'] ? $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited_already'], $userToAdd) : false;
     } else {
       $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited'], $userToAdd);
@@ -93,8 +93,8 @@ 
   'MISSION_NAME' => classLocale::$lang['type_mission'][MT_AKS],
 ));
 
-if($aks['eingeladen'] && is_array($members = classSupernova::db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
-  foreach($members as $row) {
+if ($aks['eingeladen'] && is_array($members = classSupernova::db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
+  foreach ($members as $row) {
     $template->assign_block_vars('invited', array(
       'NAME' => $row['username'],
     ));
@@ -119,7 +119,7 @@ 
 $fleet_data = tplParseFleetObject($objFleet, $i, $user);
 
 $template->assign_block_vars('fleets', $fleet_data['fleet']);
-foreach($fleet_data['ships'] as $ship_data) {
+foreach ($fleet_data['ships'] as $ship_data) {
   $template->assign_block_vars('fleets.ships', $ship_data);
 }
 

infos.php

Spacing +25 added lines, -25 removed lines

@@ -47,20 +47,20 @@ 
   ));
 
   $ActualProd = floor($Prod[$BuildID]);
-  if($BuildID != STRUC_MINE_FUSION) {
+  if ($BuildID != STRUC_MINE_FUSION) {
     $ActualNeed = floor($Prod[STRUC_MINE_SOLAR]);
   } else {
     $ActualNeed = floor($Prod[STRUC_MINE_DEUTERIUM]);
   }
 
   $BuildStartLvl = $CurrentBuildtLvl - 2;
-  if($BuildStartLvl < 1) {
+  if ($BuildStartLvl < 1) {
     $BuildStartLvl = 1;
   }
   $Table = '';
   $ProdFirst = 0;
-  for($BuildLevel = $BuildStartLvl; $BuildLevel < $BuildStartLvl + 10; $BuildLevel++) {
-    if($BuildID != STRUC_MOON_PHALANX) {
+  for ($BuildLevel = $BuildStartLvl; $BuildLevel < $BuildStartLvl + 10; $BuildLevel++) {
+    if ($BuildID != STRUC_MOON_PHALANX) {
       $Prod[STRUC_MINE_METAL] = floor(mrc_modify_value(
         $CurrentUser,
         $CurrentPlanet,
@@ -87,8 +87,8 @@ 
       ));
 
       $bloc['build_lvl'] = ($CurrentBuildtLvl == $BuildLevel) ? "<font color=\"#ff0000\">" . $BuildLevel . "</font>" : $BuildLevel;
-      if($ProdFirst > 0) {
-        if($BuildID != STRUC_MINE_FUSION) {
+      if ($ProdFirst > 0) {
+        if ($BuildID != STRUC_MINE_FUSION) {
           $bloc['build_gain'] = "<font color=\"lime\">(" . pretty_number(floor($Prod[$BuildID] - $ProdFirst)) . ")</font>";
         } else {
           $bloc['build_gain'] = "<font color=\"lime\">(" . pretty_number(floor($Prod[STRUC_MINE_SOLAR] - $ProdFirst)) . ")</font>";
@@ -96,7 +96,7 @@ 
       } else {
         $bloc['build_gain'] = '';
       }
-      if($BuildID != STRUC_MINE_FUSION) {
+      if ($BuildID != STRUC_MINE_FUSION) {
         $bloc['build_prod'] = pretty_number(floor($Prod[$BuildID]));
         $bloc['build_prod_diff'] = pretty_number(floor($Prod[$BuildID] - $ActualProd), true, true);
         $bloc['build_need'] = pretty_number(floor($Prod[STRUC_MINE_SOLAR]), true, true);
@@ -107,8 +107,8 @@ 
         $bloc['build_need'] = pretty_number(floor($Prod[STRUC_MINE_DEUTERIUM]), true, true);
         $bloc['build_need_diff'] = pretty_number(floor($Prod[STRUC_MINE_DEUTERIUM] - $ActualNeed), true, true);
       }
-      if($ProdFirst == 0) {
-        if($BuildID != STRUC_MINE_FUSION) {
+      if ($ProdFirst == 0) {
+        if ($BuildID != STRUC_MINE_FUSION) {
           $ProdFirst = floor($Prod[$BuildID]);
         } else {
           $ProdFirst = floor($Prod[STRUC_MINE_SOLAR]);
@@ -133,22 +133,22 @@ 
 
   $str_rapid_from = '';
   $str_rapid_to = '';
-  foreach(sn_get_groups(array('fleet', 'defense_active')) as $enemy_id) {
+  foreach (sn_get_groups(array('fleet', 'defense_active')) as $enemy_id) {
     $enemy_data = get_unit_param($enemy_id);
     $enemy_durability = $enemy_data['shield'] + $enemy_data['armor'];
 
     $rapid = floor($unit_data['attack'] * (isset($unit_data['amplify'][$enemy_id]) ? $unit_data['amplify'][$enemy_id] : 1) / $enemy_durability);
-    if($rapid >= 1) {
+    if ($rapid >= 1) {
       $str_rapid_to .= "{$classLocale['nfo_rf_again']} {$classLocale['tech'][$enemy_id]} <font color=\"#00ff00\">{$rapid}</font><br>";
     }
 
     $rapid = floor($enemy_data['attack'] * (isset($enemy_data['amplify'][$unit_id]) ? $enemy_data['amplify'][$unit_id] : 1) / $unit_durability);
-    if($rapid >= 1) {
+    if ($rapid >= 1) {
       $str_rapid_from .= "{$classLocale['tech'][$enemy_id]} {$classLocale['nfo_rf_from']} <font color=\"#ff0000\">{$rapid}</font><br>";
     }
   }
 
-  if($str_rapid_to && $str_rapid_from) {
+  if ($str_rapid_to && $str_rapid_from) {
     $str_rapid_to .= '<hr>';
   }
 
@@ -156,16 +156,16 @@ 
 }
 
 $unit_id = sys_get_param_id('gid');
-if($unit_id == RES_DARK_MATTER) {
+if ($unit_id == RES_DARK_MATTER) {
   sys_redirect('dark_matter.php');
 }
 
-if($unit_id == RES_METAMATTER) {
+if ($unit_id == RES_METAMATTER) {
   sys_redirect('metamatter.php');
 }
 
 lng_include('infos');
-if(!$unit_id || (!get_unit_param($unit_id) && !isset(classLocale::$lang['info'][$unit_id]))) {
+if (!$unit_id || (!get_unit_param($unit_id) && !isset(classLocale::$lang['info'][$unit_id]))) {
   sys_redirect('index.php?page=techtree');
 }
 
@@ -174,7 +174,7 @@ 
 $unit_data = get_unit_param($unit_id);
 $unit_type = $unit_data['type'];
 
-if($unit_type == UNIT_SHIPS) {
+if ($unit_type == UNIT_SHIPS) {
   $template_result['UNIT_IS_SHIP'] = true;
 
   $ship_data = get_ship_data($unit_id, $user);
@@ -190,7 +190,7 @@ 
   );
 
   $engine_template_info = array();
-  foreach($unit_data['engine'] as $unit_engine_data) {
+  foreach ($unit_data['engine'] as $unit_engine_data) {
     $unit_engine_data = get_engine_data($user, $unit_engine_data);
 
     $engine_template_info[] = array(
@@ -209,7 +209,7 @@ 
 
 
 $sn_data_group_combat = sn_get_groups('combat');
-if(in_array($unit_id, $sn_data_group_combat)) {
+if (in_array($unit_id, $sn_data_group_combat)) {
   $template_result['UNIT_IS_COMBAT'] = true;
 
   $unit_durability = $unit_data['shield'] + $unit_data['armor'];
@@ -217,21 +217,21 @@ 
   $volley_arr = $rapid_to = $rapid_from = array();
   $str_rapid_from = '';
   $str_rapid_to = '';
-  foreach($sn_data_group_combat as $enemy_id) {
+  foreach ($sn_data_group_combat as $enemy_id) {
     $enemy_data = get_unit_param($enemy_id);
     $enemy_durability = $enemy_data['shield'] + $enemy_data['armor'];
 
     $rapid = $unit_data['attack'] * (isset($unit_data['amplify'][$enemy_id]) ? $unit_data['amplify'][$enemy_id] : 1) / $enemy_durability;
-    if($rapid >= 1) {
+    if ($rapid >= 1) {
       $volley_arr[$enemy_id]['TO'] = floor($rapid);
     }
 
     $rapid = $enemy_data['attack'] * (isset($enemy_data['amplify'][$unit_id]) ? $enemy_data['amplify'][$unit_id] : 1) / $unit_durability;
-    if($rapid >= 1) {
+    if ($rapid >= 1) {
       $volley_arr[$enemy_id]['FROM'] = floor($rapid);
     }
   }
-  foreach($volley_arr as $enemy_id => &$rapid) {
+  foreach ($volley_arr as $enemy_id => &$rapid) {
     $rapid['ENEMY_ID'] = $enemy_id;
     $rapid['ENEMY_NAME'] = classLocale::$lang['tech'][$enemy_id];
   }
@@ -249,11 +249,11 @@ 
 
 }
 
-if(classLocale::$lang['info'][$unit_id]['effect']) {
+if (classLocale::$lang['info'][$unit_id]['effect']) {
   $template_result['UNIT_EFFECT'] = classLocale::$lang['info'][$unit_id]['effect'];
 }
 
-if($unit_data['bonus']) {
+if ($unit_data['bonus']) {
   $unit_bonus = !$unit_data['bonus'] || $unit_data['bonus_type'] == BONUS_ABILITY ? '' : (
     ($unit_data['bonus'] >= 0 ? '+' : '') . $unit_data['bonus'] . ($unit_data['bonus_type'] == BONUS_PERCENT ? '%' : '')
   );

includes/classes/Account.php

Doc Comments +21 added lines

@@ -171,6 +171,10 @@ 
    * @return bool
    */
   // OK v4.5
+
+  /**
+   * @param string $account_name_unsafe
+   */
   public function db_get_by_name($account_name_unsafe) {
     $this->reset();
 
@@ -207,6 +211,11 @@ 
    *
    */
   // OK v4.5
+
+  /**
+   * @param string $account_name_unsafe
+   * @param string $email_unsafe
+   */
   public function db_get_by_name_or_email($account_name_unsafe, $email_unsafe) {
     $this->reset();
 
@@ -223,6 +232,13 @@ 
    * @throws Exception
    */
   // OK v4.5
+
+  /**
+   * @param string $account_name_unsafe
+   * @param string $password_raw
+   * @param string $email_unsafe
+   * @param string $language_unsafe
+   */
   public function db_create($account_name_unsafe, $password_raw, $email_unsafe, $language_unsafe = null, $salt_unsafe = null) {
     $this->reset();
 
@@ -317,6 +333,11 @@ 
    * @return int|string
    */
   // OK 4.8
+
+  /**
+   * @param integer $change_type
+   * @param double $metamatter
+   */
   protected function db_mm_log_insert($comment, $change_type, $metamatter, $user_id_unsafe) {
     $provider_id_safe = intval(core_auth::$main_provider->provider_id);
     //$account_id_safe = $this->db->db_escape($this->account_id);

Spacing +17 added lines, -17 removed lines

@@ -79,8 +79,8 @@ 
     $this->reset();
     $this->db = is_object($db) ? $db : classSupernova::$db;
 
-    foreach($this->table_check as $table_name) {
-      if(empty($this->db->table_list[$table_name])) {
+    foreach ($this->table_check as $table_name) {
+      if (empty($this->db->table_list[$table_name])) {
         die('Если вы видите это сообщение первый раз после обновления релиза - просто перегрузите страницу.<br />
               В противном случае - сообщите Администрации сервера об ошибке.<br/>
               Не хватает таблицы для работы системы авторизации: ' . $table_name);
@@ -104,7 +104,7 @@ 
    */
   // OK v4.6
   public function password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe = null) {
-    if(!$this->password_check($old_password_unsafe)) {
+    if (!$this->password_check($old_password_unsafe)) {
       return false;
     }
 
@@ -125,7 +125,7 @@ 
   // OK v4.5
   public function assign_from_db_row($row) {
     $this->reset();
-    if(empty($row) || !is_array($row)) {
+    if (empty($row) || !is_array($row)) {
       return false;
     }
     $this->account_id = $row['account_id'];
@@ -242,11 +242,11 @@ 
         `account_email` = LOWER('{$email_safe}'),
         `account_language` = '{$language_safe}'"
     );
-    if(!$result) {
+    if (!$result) {
       throw new Exception(REGISTER_ERROR_ACCOUNT_CREATE, ERR_ERROR);
     }
 
-    if(!($account_id = $this->db->db_insert_id())) {
+    if (!($account_id = $this->db->db_insert_id())) {
       throw new Exception(REGISTER_ERROR_ACCOUNT_CREATE, ERR_ERROR);
     }
 
@@ -276,7 +276,7 @@ 
       WHERE `account_id` = '{$account_id_safe}'"
     ) ? true : false;
 
-    if($result) {
+    if ($result) {
       $result = $this->db_get_by_id($this->account_id);
     }
 
@@ -363,7 +363,7 @@ 
   public function metamatter_change($change_type, $metamatter, $comment = '', $already_changed = false) {
     global $debug, $mm_change_legit;
 
-    if(!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
+    if (!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
       $debug->error('Ошибка при попытке манипуляции с ММ');
 
       return false;
@@ -373,7 +373,7 @@ 
 
     $mm_change_legit = true;
     // $sn_data_metamatter_db_name = pname_resource_name(RES_METAMATTER);
-    if($already_changed) {
+    if ($already_changed) {
       $metamatter_total_delta = 0;
       $result = -1;
     } else {
@@ -387,13 +387,13 @@ 
         ($metamatter_total_delta ? ", `account_immortal` = IF(`account_metamatter_total` + '{$metamatter_total_delta}' >= {$classConfig->player_metamatter_immortal}, NOW(), `account_immortal`), `account_metamatter_total` = `account_metamatter_total` + '{$metamatter_total_delta}'" : '') .
         " WHERE `account_id` = {$account_id_safe}"
       );
-      if(!$result) {
+      if (!$result) {
         $debug->error("Error adjusting Metamatter for player ID {$this->account_id} (Player Not Found?) with {$metamatter}. Reason: {$comment}", 'Metamatter Change', 402);
       }
       $result = classSupernova::$db->db_affected_rows();
     }
 
-    if(empty(core_auth::$user['id'])) {
+    if (empty(core_auth::$user['id'])) {
       $user_list = PlayerToAccountTranslate::db_translate_get_users_from_account_list(core_auth::$main_provider->provider_id, $this->account_id);
       reset($user_list);
       $user_id_unsafe = key($user_list);
@@ -402,30 +402,30 @@ 
     }
     $user_id_safe = $this->db->db_escape($user_id_unsafe);
 
-    if(!$result) {
+    if (!$result) {
       $debug->error("Error adjusting Metamatter for player ID {$this->account_id} (Player Not Found?) with {$metamatter}. Reason: {$comment}", 'Metamatter Change', 402);
     }
 
-    if(!$already_changed) {
+    if (!$already_changed) {
       $this->account_metamatter += $metamatter;
       $this->account_metamatter_total += $metamatter_total_delta;
     }
 
-    if(is_array($comment)) {
+    if (is_array($comment)) {
       $comment = call_user_func_array('sprintf', $comment);
     }
 
     $result = $this->db_mm_log_insert($comment, $change_type, $metamatter, $user_id_unsafe);
 
-    if($metamatter > 0 && !empty($user_id_safe)) {
+    if ($metamatter > 0 && !empty($user_id_safe)) {
       $old_referral = db_referral_get_by_id($user_id_safe);
-      if($old_referral['id']) {
+      if ($old_referral['id']) {
         $dark_matter_from_metamatter = $metamatter * AFFILIATE_MM_TO_REFERRAL_DM;
         db_referral_update_dm($user_id_safe, $dark_matter_from_metamatter);
         $new_referral = db_referral_get_by_id($user_id_safe);
 
         $partner_bonus = floor($new_referral['dark_matter'] / classSupernova::$config->rpg_bonus_divisor) - ($old_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum ? floor($old_referral['dark_matter'] / classSupernova::$config->rpg_bonus_divisor) : 0);
-        if($partner_bonus > 0 && $new_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum) {
+        if ($partner_bonus > 0 && $new_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum) {
           rpg_points_change($new_referral['id_partner'], RPG_REFERRAL_BOUGHT_MM, $partner_bonus, "Incoming MM From Referral ID {$user_id_safe}");
         }
       }

includes/vars_structures.php

Spacing +12 added lines, -12 removed lines

@@ -15,8 +15,8 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_METAL     => function ($level, $production_factor, $user, $planet_row) {return  40 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_METAL     => function($level, $production_factor, $user, $planet_row) {return  40 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -33,8 +33,8 @@ 
       'factor' => 1.6,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_CRYSTAL   => function ($level, $production_factor, $user, $planet_row) {return  32 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_CRYSTAL   => function($level, $production_factor, $user, $planet_row) {return  32 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -51,8 +51,8 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) {return  10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) {return  10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -69,7 +69,7 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -87,8 +87,8 @@ 
       'factor' => 1.8,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) {return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return  30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, null, TECH_ENERGY), $level) * (0.1 * $production_factor);},
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) {return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return  30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, null, TECH_ENERGY), $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -105,7 +105,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_METAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_METAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 
@@ -121,7 +121,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_CRYSTAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_CRYSTAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 
@@ -137,7 +137,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_DEUTERIUM => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_DEUTERIUM => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 

includes/classes/cache.php

Doc Comments +7 added lines

@@ -81,6 +81,10 @@ 
   // -------------------------------------------------------------------------
   // Here comes low-level functions - those that directly works with cacher engines
   // -------------------------------------------------------------------------
+
+  /**
+   * @param string $name
+   */
   public function __set($name, $value) {
     switch ($name) {
       case '_MODE':
@@ -132,6 +136,9 @@ 
     return null;
   }
 
+  /**
+   * @param string $name
+   */
   public function __isset($name) {
     switch (self::$mode) {
       case CACHER_NO_CACHE:

Spacing +58 added lines, -58 removed lines

@@ -46,19 +46,19 @@ 
   protected static $cacheObject;
 
   public function __construct($prefIn = 'CACHE_', $init_mode = false) {
-    if(!($init_mode === false || $init_mode === CACHER_NO_CACHE || ($init_mode === CACHER_XCACHE && extension_loaded('xcache')))) {
+    if (!($init_mode === false || $init_mode === CACHER_NO_CACHE || ($init_mode === CACHER_XCACHE && extension_loaded('xcache')))) {
       throw new UnexpectedValueException('Wrong work mode or current mode does not supported on your server');
     }
 
     $this->prefix = $prefIn;
-    if(extension_loaded('xcache') && ($init_mode === CACHER_XCACHE || $init_mode === false)) {
-      if(self::$mode === CACHER_NOT_INIT) {
+    if (extension_loaded('xcache') && ($init_mode === CACHER_XCACHE || $init_mode === false)) {
+      if (self::$mode === CACHER_NOT_INIT) {
         self::$mode = CACHER_XCACHE;
       }
     } else {
-      if(self::$mode === CACHER_NOT_INIT) {
+      if (self::$mode === CACHER_NOT_INIT) {
         self::$mode = CACHER_NO_CACHE;
-        if(!self::$data) {
+        if (!self::$data) {
           self::$data = array();
         }
       }
@@ -66,7 +66,7 @@ 
   }
 
   public static function getInstance($prefIn = 'CACHE_', $table_name = '') {
-    if(!isset(self::$cacheObject)) {
+    if (!isset(self::$cacheObject)) {
       $className = get_class();
       self::$cacheObject = new $className($prefIn);
     }
@@ -83,7 +83,7 @@ 
   // Here comes low-level functions - those that directly works with cacher engines
   // -------------------------------------------------------------------------
   public function __set($name, $value) {
-    switch($name) {
+    switch ($name) {
       case '_MODE':
         throw new UnexpectedValueException('You can not change cacher mode on-the-fly!');
       break;
@@ -93,7 +93,7 @@ 
       break;
 
       default:
-        switch(self::$mode) {
+        switch (self::$mode) {
           case CACHER_NO_CACHE:
             self::$data[$this->prefix . $name] = $value;
           break;
@@ -107,7 +107,7 @@ 
   }
 
   public function __get($name) {
-    switch($name) {
+    switch ($name) {
       case '_MODE':
         return self::$mode;
       break;
@@ -117,7 +117,7 @@ 
       break;
 
       default:
-        switch(self::$mode) {
+        switch (self::$mode) {
           case CACHER_NO_CACHE:
             return self::$data[$this->prefix . $name];
           break;
@@ -134,7 +134,7 @@ 
   }
 
   public function __isset($name) {
-    switch(self::$mode) {
+    switch (self::$mode) {
       case CACHER_NO_CACHE:
         return isset(self::$data[$this->prefix . $name]);
       break;
@@ -148,7 +148,7 @@ 
   }
 
   public function __unset($name) {
-    switch(self::$mode) {
+    switch (self::$mode) {
       case CACHER_NO_CACHE:
         unset(self::$data[$this->prefix . $name]);
       break;
@@ -161,11 +161,11 @@ 
 
   public function unset_by_prefix($prefix_unset = '') {
     static $array_clear;
-    !$array_clear ? $array_clear = function (&$v, $k, $p) {
+    !$array_clear ? $array_clear = function(&$v, $k, $p) {
       strpos($k, $p) === 0 ? $v = null : false;
     } : false;
 
-    switch(self::$mode) {
+    switch (self::$mode) {
       case CACHER_NO_CACHE:
 //        array_walk(self::$data, create_function('&$v,$k,$p', 'if(strpos($k, $p) === 0)$v = NULL;'), $this->prefix.$prefix_unset);
         array_walk(self::$data, $array_clear, $this->prefix . $prefix_unset);
@@ -174,7 +174,7 @@ 
       break;
 
       case CACHER_XCACHE:
-        if(!function_exists('xcache_unset_by_prefix')) {
+        if (!function_exists('xcache_unset_by_prefix')) {
           return false;
         }
 
@@ -191,13 +191,13 @@ 
   protected function make_element_name($args, $diff = 0) {
     $num_args = count($args);
 
-    if($num_args < 1) {
+    if ($num_args < 1) {
       return false;
     }
 
     $name = '';
     $aName = array();
-    for($i = 0; $i <= $num_args - 1 - $diff; $i++) {
+    for ($i = 0; $i <= $num_args - 1 - $diff; $i++) {
       $name .= "[{$args[$i]}]";
       array_unshift($aName, $name);
     }
@@ -209,15 +209,15 @@ 
     $args = func_get_args();
     $name = $this->make_element_name($args, 1);
 
-    if(!$name) {
+    if (!$name) {
       return null;
     }
 
-    if($this->$name[0] === null) {
-      for($i = count($name) - 1; $i > 0; $i--) {
+    if ($this->$name[0] === null) {
+      for ($i = count($name) - 1; $i > 0; $i--) {
         $cName = "{$name[$i]}_COUNT";
-        $cName1 = "{$name[$i-1]}_COUNT";
-        if($this->$cName1 == null || $i == 1) {
+        $cName1 = "{$name[$i - 1]}_COUNT";
+        if ($this->$cName1 == null || $i == 1) {
           $this->$cName++;
         }
       }
@@ -230,7 +230,7 @@ 
 
   public function array_get() {
     $name = $this->make_element_name(func_get_args());
-    if(!$name) {
+    if (!$name) {
       return null;
     }
 
@@ -239,12 +239,12 @@ 
 
   public function array_count() {
     $name = $this->make_element_name(func_get_args());
-    if(!$name) {
+    if (!$name) {
       return 0;
     }
     $cName = "{$name[0]}_COUNT";
     $retVal = $this->$cName;
-    if(!$retVal) {
+    if (!$retVal) {
       $retVal = null;
     }
 
@@ -254,18 +254,18 @@ 
   public function array_unset() {
     $name = $this->make_element_name(func_get_args());
 
-    if(!$name) {
+    if (!$name) {
       return false;
     }
     $this->unset_by_prefix($name[0]);
 
-    for($i = 1; $i < count($name); $i++) {
+    for ($i = 1; $i < count($name); $i++) {
       $cName = "{$name[$i]}_COUNT";
-      $cName1 = "{$name[$i-1]}_COUNT";
+      $cName1 = "{$name[$i - 1]}_COUNT";
 
-      if($i == 1 || $this->$cName1 === null) {
+      if ($i == 1 || $this->$cName1 === null) {
         $this->$cName--;
-        if($this->$cName <= 0) {
+        if ($this->$cName <= 0) {
           unset($this->$cName);
         }
       }
@@ -275,7 +275,7 @@ 
   }
 
   public function dumpData() {
-    switch(self::$mode) {
+    switch (self::$mode) {
       case CACHER_NO_CACHE:
         return dump(self::$data, $this->prefix);
       break;
@@ -326,13 +326,13 @@ 
     $this->sql_index_field = "{$table_name}_name";
     $this->sql_value_field = "{$table_name}_value";
 
-    if(!$this->_DB_LOADED) {
+    if (!$this->_DB_LOADED) {
       $this->db_loadAll();
     }
   }
 
   public static function getInstance($gamePrefix = 'sn_', $table_name = '') {
-    if(!isset(self::$cacheObject)) {
+    if (!isset(self::$cacheObject)) {
       $className = get_class();
       self::$cacheObject = new $className($gamePrefix, $table_name);
     }
@@ -342,7 +342,7 @@ 
 
   public function db_loadItem($index) {
     $result = null;
-    if($index) {
+    if ($index) {
       $index_safe = db_escape($index);
       $result = doquery("SELECT `{$this->sql_value_field}` FROM `{{{$this->table_name}}}` WHERE `{$this->sql_index_field}` = '{$index_safe}' FOR UPDATE", true);
       // В две строки - что бы быть уверенным в порядке выполнения
@@ -357,7 +357,7 @@ 
     $this->loadDefaults();
 
     $query = doquery("SELECT * FROM {{{$this->table_name}}} FOR UPDATE;");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $this->$row[$this->sql_index_field] = $row[$this->sql_value_field];
     }
 
@@ -365,7 +365,7 @@ 
   }
 
   public function loadDefaults() {
-    foreach($this->defaults as $defName => $defValue) {
+    foreach ($this->defaults as $defName => $defValue) {
       $this->$defName = $defValue;
     }
   }
@@ -381,7 +381,7 @@ 
   }
 
   public function db_saveItem($item_list, $value = null) {
-    if(empty($item_list)) {
+    if (empty($item_list)) {
       return;
     }
 
@@ -389,8 +389,8 @@ 
 
     // Сначала записываем данные в базу - что бы поймать все блокировки
     $qry = array();
-    foreach($item_list as $item_name => $item_value) {
-      if($item_name) {
+    foreach ($item_list as $item_name => $item_value) {
+      if ($item_name) {
         $item_value = db_escape($item_value === null ? $this->$item_name : $item_value);
         $item_name = db_escape($item_name);
         $qry[] = "('{$item_name}', '{$item_value}')";
@@ -399,8 +399,8 @@ 
     doquery("REPLACE INTO `{{" . $this->table_name . "}}` (`{$this->sql_index_field}`, `{$this->sql_value_field}`) VALUES " . implode(',', $qry) . ";");
 
     // И только после взятия блокировок - меняем значения в кэше
-    foreach($item_list as $item_name => $item_value) {
-      if($item_name && $item_value !== null) {
+    foreach ($item_list as $item_name => $item_value) {
+      if ($item_name && $item_value !== null) {
         $this->$item_name = $item_value;
       }
     }
@@ -587,9 +587,9 @@ 
     'advGoogleLeftMenuCode'        => '(Place here code for banner)',
 
     // Alliance bonus calculations
-    'ali_bonus_algorithm'          => 0,  // Bonus calculation algorithm
+    'ali_bonus_algorithm'          => 0, // Bonus calculation algorithm
     'ali_bonus_brackets'           => 10, // Brackets count for ALI_BONUS_BY_RANK
-    'ali_bonus_brackets_divisor'   => 10,// Bonus divisor for ALI_BONUS_BY_RANK
+    'ali_bonus_brackets_divisor'   => 10, // Bonus divisor for ALI_BONUS_BY_RANK
     'ali_bonus_divisor'            => 10000000, // Rank divisor for ALI_BONUS_BY_POINTS
     'ali_bonus_members'            => 10, // Minumum alliace size to start using bonus
 
@@ -620,25 +620,25 @@ 
     'deuterium_basic_income'       => 0,
     'eco_scale_storage'            => 1,
     'eco_stockman_fleet'           => '', // Black Market - Starting amount of s/h ship merchant to sell
-    'eco_stockman_fleet_populate'  => 1,  // Populate empty Stockman fleet with ships or not
+    'eco_stockman_fleet_populate'  => 1, // Populate empty Stockman fleet with ships or not
     'empire_mercenary_base_period' => PERIOD_MONTH, // Base
     'empire_mercenary_temporary'   => 0, // Temporary empire-wide mercenaries
     'energy_basic_income'          => 0,
 
     // Bashing protection settings
-    'fleet_bashing_attacks'        => 3,      // Max amount of attack per wave - 3 by default
-    'fleet_bashing_interval'       => 1800,   // Maximum interval between attacks when they still count as one wave - 30m by default
-    'fleet_bashing_scope'          => 86400,  // Interval on which bashing waves counts - 24h by default
-    'fleet_bashing_war_delay'      => 43200,  // Delay before start bashing after declaring war to alliance - 12h by default
-    'fleet_bashing_waves'          => 3,      // Max amount of waves per day - 3 by default
+    'fleet_bashing_attacks'        => 3, // Max amount of attack per wave - 3 by default
+    'fleet_bashing_interval'       => 1800, // Maximum interval between attacks when they still count as one wave - 30m by default
+    'fleet_bashing_scope'          => 86400, // Interval on which bashing waves counts - 24h by default
+    'fleet_bashing_war_delay'      => 43200, // Delay before start bashing after declaring war to alliance - 12h by default
+    'fleet_bashing_waves'          => 3, // Max amount of waves per day - 3 by default
 
     'Fleet_Cdr'   => 30,
     'fleet_speed' => 1,
 
     'fleet_update_interval' => 4,
 
-    'game_adminEmail'       => 'root@localhost',    // Admin's email to show to users
-    'game_counter'          => 0,  // Does built-in page hit counter is on?
+    'game_adminEmail'       => 'root@localhost', // Admin's email to show to users
+    'game_counter'          => 0, // Does built-in page hit counter is on?
     // Defaults
     'game_default_language' => 'ru',
     'game_default_skin'     => 'skins/EpicBlue/',
@@ -652,13 +652,13 @@ 
     'game_maxSystem'      => 199,
     'game_maxPlanet'      => 15,
     // Game global settings
-    'game_mode'           => 0,           // 0 - SuperNova, 1 - oGame
+    'game_mode'           => 0, // 0 - SuperNova, 1 - oGame
     'game_name'           => 'SuperNova', // Server name (would be on banners and on top of left menu)
 
     'game_news_actual'   => 259200, // How long announcement would be marked as "New". In seconds. Default - 3 days
-    'game_news_overview' => 3,    // How much last news to show in Overview page
+    'game_news_overview' => 3, // How much last news to show in Overview page
     // Noob protection
-    'game_noob_factor'   => 5,    // Multiplier to divide "stronger" and "weaker" users
+    'game_noob_factor'   => 5, // Multiplier to divide "stronger" and "weaker" users
     'game_noob_points'   => 5000, // Below this point user threated as noob. 0 to disable
 
     'game_multiaccount_enabled' => 0, // 1 - allow interactions for players with same IP (multiaccounts)
@@ -707,8 +707,8 @@ 
     'payment_currency_exchange_wmu' => 30,
     'payment_currency_exchange_wmz' => 1,
 
-    'payment_lot_price' => 1,     // Lot price in default currency
-    'payment_lot_size'  => 2500,  // Lot size. Also service as minimum amount of DM that could be bought with one transaction
+    'payment_lot_price' => 1, // Lot price in default currency
+    'payment_lot_size'  => 2500, // Lot size. Also service as minimum amount of DM that could be bought with one transaction
 
     'planet_teleport_cost'    => 50000, //
     'planet_teleport_timeout' => 86400, //
@@ -726,7 +726,7 @@ 
     'resource_multiplier'     => 1,
 
     //Roleplay system
-    'rpg_bonus_divisor'       => 10,    // Amount of DM referral shoud get for partner have 1 DM bonus
+    'rpg_bonus_divisor'       => 10, // Amount of DM referral shoud get for partner have 1 DM bonus
     'rpg_bonus_minimum'       => 10000, // Minimum DM ammount for starting paying bonuses to affiliate
 
     // Black Market - General
@@ -813,7 +813,7 @@ 
   }
 
   public static function getInstance($gamePrefix = 'sn_', $table_name = 'config') {
-    if(!isset(self::$cacheObject)) {
+    if (!isset(self::$cacheObject)) {
       $className = get_class();
       self::$cacheObject = new $className($gamePrefix, $table_name);
     }

search.php

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(classSupernova::$config->game_mode == GAME_BLITZ) {
+if (classSupernova::$config->game_mode == GAME_BLITZ) {
   message(classLocale::$lang['sys_blitz_page_disabled'], classLocale::$lang['sys_error'], 'overview.php', 10);
   die();
 }
@@ -25,8 +25,8 @@ 
 
 $template = gettemplate('search', true);
 
-if($searchtext && $type) {
-  switch($type) {
+if ($searchtext && $type) {
+  switch ($type) {
     case "planetname":
       // $search = db_planet_list_search($searchtext);
     break;
@@ -41,8 +41,8 @@ 
     break;
   }
 
-  while($row = db_fetch($search)) {
-    if($type == 'playername' || $type == 'planetname') {
+  while ($row = db_fetch($search)) {
+    if ($type == 'playername' || $type == 'planetname') {
       $template->assign_block_vars('search_result', array(
         'PLAYER_ID'       => $row['uid'],
         'PLAYER_NAME'     => htmlentities($row['username'], ENT_COMPAT, 'UTF-8'),
@@ -57,7 +57,7 @@ 
         'ALLY_NAME'       => htmlentities($row['ally_name'], ENT_COMPAT, 'UTF-8'),
         'ALLY_TAG'        => htmlentities($row['ally_tag'], ENT_COMPAT, 'UTF-8'),
       ));
-    } elseif($type == 'ally') {
+    } elseif ($type == 'ally') {
       $template->assign_block_vars('search_result', array(
         'ALLY_NAME'     => htmlentities($row['ally_name'], ENT_COMPAT, 'UTF-8'),
         'ALLY_TAG'      => htmlentities($row['ally_tag'], ENT_COMPAT, 'UTF-8'),
@@ -75,7 +75,7 @@ 
   'ally'       => 'sys_alliance',
 );
 
-foreach($search_type as $type_id => $type_lang) {
+foreach ($search_type as $type_id => $type_lang) {
   $template->assign_block_vars('type', array(
     'ID'       => $type_id,
     'TEXT'     => classLocale::$lang[$type_lang],