supernova-ws / SuperNova

includes/vars_structures.php

Spacing +12 added lines, -12 removed lines

@@ -16,8 +16,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,
   ),
@@ -34,8 +34,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,
   ),
@@ -52,8 +52,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,
   ),
@@ -70,7 +70,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,
   ),
@@ -88,8 +88,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, "", 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, "", TECH_ENERGY), $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -106,7 +106,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); },
     ),
   ),
 
@@ -122,7 +122,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); },
     ),
   ),
 
@@ -138,7 +138,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); },
     ),
   ),
 

classes/classSupernova.php

Braces +12 added lines, -4 removed lines

@@ -419,7 +419,8 @@ 
     $location_info = &static::$location_info[$location_type];
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
-    if ($result = static::db_query_update("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) // TODO Как-то вернуть может быть LIMIT 1 ?
+    if ($result = static::db_query_update("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) {
+      // TODO Как-то вернуть может быть LIMIT 1 ?
     {
       if (static::$db->db_affected_rows()) {
         // Обновляем данные только если ряд был затронут
@@ -427,6 +428,7 @@ 
 
         // Тут именно так, а не cache_unset - что бы в кэшах автоматически обновилась запись. Будет нужно на будущее
         _SnCacheInternal::$data[$location_type][$record_id] = null;
+    }
         // Вытаскиваем обновленную запись
         static::db_get_record_by_id($location_type, $record_id);
         _SnCacheInternal::cache_clear($location_type, false); // Мягкий сброс - только $queries
@@ -460,9 +462,11 @@ 
     $set = trim($set);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
     if ($result = static::db_query_insert("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         $record_id = db_insert_id();
+      }
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
         $result = static::db_get_record_by_id($location_type, $record_id);
         // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего
@@ -483,10 +487,12 @@ 
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
     if ($result = static::db_query_delete("DELETE FROM `{{{$table_name}}}` WHERE `{$id_field}` = {$safe_record_id}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         _SnCacheInternal::cache_unset($location_type, $safe_record_id);
       }
+      }
     }
 
     return $result;
@@ -500,11 +506,13 @@ 
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
 
     if ($result = static::db_query_delete("DELETE FROM `{{{$table_name}}}` WHERE {$condition}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         // Обнуление кэша, потому что непонятно, что поменялось
         _SnCacheInternal::cache_clear($location_type);
       }
+      }
     }
 
     return $result;

classes/_SnCacheInternal.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     //print("<br />CACHE CLEAR {$cache_id} " . ($hard ? 'HARD' : 'SOFT') . "<br />");
     if ($hard && !empty(_SnCacheInternal::$data[$location_type])) {
       // Здесь нельзя делать unset - надо записывать NULL, что бы это отразилось на зависимых записях
-      array_walk(_SnCacheInternal::$data[$location_type], function (&$item) { $item = null; });
+      array_walk(_SnCacheInternal::$data[$location_type], function(&$item) { $item = null; });
     }
     _SnCacheInternal::$locator[$location_type] = [];
     _SnCacheInternal::$queries[$location_type] = [];

includes/db/db_queries_users.php

Spacing +3 added lines, -3 removed lines

@@ -180,7 +180,7 @@ 
     "SELECT `id` AS `ID`, `username` AS `NAME`, `ally_name` AS `ALLY`, `total_points` AS `STAT_POINTS`,
       `onlinetime` AS `ACTIVITY`
     FROM `{{users}}`
-    WHERE `onlinetime` >= ". (SN_TIME_NOW - $config->game_users_online_timeout) ." ORDER BY user_as_ally, `". $TypeSort ."` ASC;");
+    WHERE `onlinetime` >= ". (SN_TIME_NOW - $config->game_users_online_timeout) . " ORDER BY user_as_ally, `" . $TypeSort . "` ASC;");
 }
 
 
@@ -195,7 +195,7 @@ 
   return doquery("SELECT u.*, COUNT(r.id) AS referral_count, SUM(r.dark_matter) AS referral_dm FROM {{users}} as u
     LEFT JOIN {{referrals}} as r on r.id_partner = u.id
     WHERE" .
-    ($online ? " `onlinetime` >= ". (SN_TIME_NOW - $config->game_users_online_timeout) : ' user_as_ally IS NULL') .
+    ($online ? " `onlinetime` >= " . (SN_TIME_NOW - $config->game_users_online_timeout) : ' user_as_ally IS NULL') .
     " GROUP BY u.id
     ORDER BY user_as_ally, {$sort} ASC");
 }
@@ -211,7 +211,7 @@ 
   !is_array($user_id_list) ? $user_id_list = array($user_id_list) : false;
 
   $user_list = array();
-  foreach($user_id_list as $user_id_unsafe) {
+  foreach ($user_id_list as $user_id_unsafe) {
     $user = db_user_by_id($user_id_unsafe);
     !empty($user) ? $user_list[$user_id_unsafe] = $user : false;
   }

includes/includes/flt_page4.inc

Spacing +21 added lines, -21 removed lines

@@ -1,17 +1,17 @@ 
 <?php
 
-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)) {
   sys_redirect("fleet.php");
 }
 
 $fleet = db_fleet_get($fleetid);
-if(!$fleet) {
+if (!$fleet) {
   messageBox($lang['fl_fleet_not_exists'], $lang['fl_error']);
 }
 //$query = doquery("SELECT * FROM `{{fleets}}` WHERE fleet_id = '{$fleetid}'");
@@ -25,8 +25,8 @@ 
   messageBox($lang['fl_isback'], $lang['fl_error']);
 }
 
-if($fleet['fleet_owner'] != $user['id']) {
-  $debug->warning($lang['fl_aks_hack_wrong_fleet'],'Wrong Fleet Owner',301);
+if ($fleet['fleet_owner'] != $user['id']) {
+  $debug->warning($lang['fl_aks_hack_wrong_fleet'], 'Wrong Fleet Owner', 301);
   messageBox($lang['fl_aks_hack_wrong_fleet'], $lang['fl_error']);
 }
 
@@ -36,19 +36,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, true);
   $userToAddID = $userToAddID['id'];
 
-  if($fleet['fleet_target_owner'] == $userToAddID) {
+  if ($fleet['fleet_target_owner'] == $userToAddID) {
     messageBox($lang['flt_aks_player_same'], $lang['fl_error']);
   }
 
-  if($userToAddID) {
-    if(!$aks) {
+  if ($userToAddID) {
+    if (!$aks) {
       // No AСS exists - making one
-      if(!$fleet['fleet_group']) {
+      if (!$fleet['fleet_group']) {
         doquery("INSERT INTO {{aks}} SET
           `name` = '" . db_escape($lang['flt_acs_prefix'] . $fleetid) . "',
           `teilnehmer` = '" . $user['id'] . "',
@@ -59,7 +59,7 @@ 
           `planet` = '" . $fleet['fleet_end_planet'] . "',
           `planet_type` = '" . $fleet['fleet_end_type'] . "',
           `eingeladen` = '" . $user['id'] . "',
-          `fleet_end_time` = '" . $fleet['fleet_end_time']. "'");
+          `fleet_end_time` = '" . $fleet['fleet_end_time'] . "'");
 
         $aks = doquery("SELECT * FROM {{aks}} WHERE `flotten` = {$fleetid} LIMIT 1;", true);
 
@@ -77,26 +77,26 @@ 
 
     $isUserExists = false;
     $invited_ar = explode(",", $aks['eingeladen']);
-    foreach($invited_ar as $inv) {
+    foreach ($invited_ar as $inv) {
       if ($userToAddID == $inv) {
         $isUserExists = true;
       }
     }
 
-    if(count($invited_ar) >= 5) {
+    if (count($invited_ar) >= 5) {
       messageBox($lang['flt_aks_error_too_much_players'], $lang['fl_error']);
     }
 
-    if($isUserExists) {
+    if ($isUserExists) {
       $userToAdd_unsafe != $user['username'] ? $add_user_message_mr = sprintf($lang['fl_aks_player_invited_already'], $userToAdd) : false;
     } else {
       $add_user_message_mr = sprintf($lang['fl_aks_player_invited'], $userToAdd);
       doquery("UPDATE `{{aks}}` SET `eingeladen` = concat(`eingeladen`, ',{$userToAddID}') WHERE `flotten` = {$fleetid};")
-        or die(sprintf($lang['fl_aks_adding_error'],db_error()));
+        or die(sprintf($lang['fl_aks_adding_error'], db_error()));
       $aks['eingeladen'] .= ',' . $userToAddID;
     }
-    msg_send_simple_message ( $userToAddID, $user['id'], SN_TIME_NOW, MSG_TYPE_COMBAT, $user['username'],
-      $lang['fl_aks_invite_message_header'], sprintf( $lang['fl_aks_invite_message'], $user['username']));
+    msg_send_simple_message($userToAddID, $user['id'], SN_TIME_NOW, MSG_TYPE_COMBAT, $user['username'],
+      $lang['fl_aks_invite_message_header'], sprintf($lang['fl_aks_invite_message'], $user['username']));
   } else {
     $add_user_message_mr = sprintf($lang['fl_aks_player_error'], $userToAdd);
   }
@@ -110,8 +110,8 @@ 
   'MISSION_NAME' => $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'],
     ));
@@ -121,7 +121,7 @@ 
 $i++;
 $fleet_row = db_fleet_get($fleetid);
 
-if(is_array($fleet_row) && !empty($fleet_row)) {
+if (is_array($fleet_row) && !empty($fleet_row)) {
 $planet_start = DBStaticPlanet::db_planet_by_id($fleet_row['fleet_start_planet_id']);
 $fleet_row['fleet_start_name'] = !empty($planet_start['name']) ? $planet_start['name'] : '';
 $planet_end = DBStaticPlanet::db_planet_by_id($fleet_row['fleet_end_planet_id']);
@@ -129,7 +129,7 @@ 
 
 $fleet_data = tpl_parse_fleet_db($fleet_row, $i, $user);
 $template->assign_block_vars('fleets', $fleet_data['fleet']);
-foreach($fleet_data['ships'] as $ship_data) {
+foreach ($fleet_data['ships'] as $ship_data) {
   $template->assign_block_vars('fleets.ships', $ship_data);
 }
 }

buddy.php

Spacing +19 added lines, -19 removed lines

@@ -18,39 +18,39 @@ 
 {
   sn_db_transaction_start();
 
-  if($buddy_id = sys_get_param_id('buddy_id'))
+  if ($buddy_id = sys_get_param_id('buddy_id'))
   {
     $buddy_row = doquery("SELECT BUDDY_SENDER_ID, BUDDY_OWNER_ID, BUDDY_STATUS FROM {{buddy}} WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1 FOR UPDATE;", true);
-    if(!is_array($buddy_row))
+    if (!is_array($buddy_row))
     {
       throw new exception('buddy_err_not_exist', ERR_ERROR);
     }
 
-    switch($mode = sys_get_param_str('mode'))
+    switch ($mode = sys_get_param_str('mode'))
     {
       case 'accept':
-        if($buddy_row['BUDDY_SENDER_ID'] == $user['id'])
+        if ($buddy_row['BUDDY_SENDER_ID'] == $user['id'])
         {
           throw new exception('buddy_err_accept_own', ERR_ERROR);
         }
 
-        if($buddy_row['BUDDY_OWNER_ID'] != $user['id'])
+        if ($buddy_row['BUDDY_OWNER_ID'] != $user['id'])
         {
           throw new exception('buddy_err_accept_alien', ERR_ERROR);
         }
 
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE)
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE)
         {
           throw new exception('buddy_err_accept_already', ERR_WARNING);
         }
 
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_DENIED)
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_DENIED)
         {
           throw new exception('buddy_err_accept_denied', ERR_ERROR);
         }
 
         doquery("UPDATE {{buddy}} SET `BUDDY_STATUS` = " . BUDDY_REQUEST_ACTIVE . " WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1;");
-        if(classSupernova::$db->db_affected_rows())
+        if (classSupernova::$db->db_affected_rows())
         {
           msg_send_simple_message($buddy_row['BUDDY_SENDER_ID'], $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_accept_title'],
             sprintf($lang['buddy_msg_accept_text'], $user['username']));
@@ -64,12 +64,12 @@ 
       break;
 
       case 'delete':
-        if($buddy_row['BUDDY_SENDER_ID'] != $user['id'] && $buddy_row['BUDDY_OWNER_ID'] != $user['id'])
+        if ($buddy_row['BUDDY_SENDER_ID'] != $user['id'] && $buddy_row['BUDDY_OWNER_ID'] != $user['id'])
         {
           throw new exception('buddy_err_delete_alien', ERR_ERROR);
         }
 
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) // Existing friendship
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) // Existing friendship
         {
           $ex_friend_id = $buddy_row['BUDDY_SENDER_ID'] == $user['id'] ? $buddy_row['BUDDY_OWNER_ID'] : $buddy_row['BUDDY_SENDER_ID'];
 
@@ -80,13 +80,13 @@ 
           sn_db_transaction_commit();
           throw new exception('buddy_err_unfriend_none', ERR_NONE);
         }
-        elseif($buddy_row['BUDDY_SENDER_ID'] == $user['id']) // Player's outcoming request - either denied or waiting
+        elseif ($buddy_row['BUDDY_SENDER_ID'] == $user['id']) // Player's outcoming request - either denied or waiting
         {
           doquery("DELETE FROM {{buddy}} WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1;");
           sn_db_transaction_commit();
           throw new exception('buddy_err_delete_own', ERR_NONE);
         }
-        elseif($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) // Deny incoming request
+        elseif ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) // Deny incoming request
         {
           msg_send_simple_message($buddy_row['BUDDY_SENDER_ID'], $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_deny_title'],
             sprintf($lang['buddy_msg_deny_text'], $user['username']));
@@ -101,24 +101,24 @@ 
 
   // New request?
   // Checking for user ID - in case if it was request from outside buddy system
-  if($new_friend_id = sys_get_param_id('request_user_id'))
+  if ($new_friend_id = sys_get_param_id('request_user_id'))
   {
     $new_friend_row = db_user_by_id($new_friend_id, true, '`id`, `username`');
   }
-  elseif($new_friend_name = sys_get_param_str_unsafe('request_user_name'))
+  elseif ($new_friend_name = sys_get_param_str_unsafe('request_user_name'))
   {
     $new_friend_row = db_user_by_username($new_friend_name);
     $new_friend_name = db_escape($new_friend_name);
   }
 
-  if($new_friend_row['id'] == $user['id'])
+  if ($new_friend_row['id'] == $user['id'])
   {
     unset($new_friend_row);
     throw new exception('buddy_err_adding_self', ERR_ERROR);
   }
 
   // Checking for user name & request text - in case if it was request to adding new request
-  if(isset($new_friend_row['id']) && ($new_request_text = sys_get_param_str('request_text')))
+  if (isset($new_friend_row['id']) && ($new_request_text = sys_get_param_str('request_text')))
   {
     $check_relation = doquery("SELECT `BUDDY_ID` FROM {{buddy}} WHERE
       (`BUDDY_SENDER_ID` = {$user['id']} AND `BUDDY_OWNER_ID` = {$new_friend_row['id']})
@@ -126,7 +126,7 @@ 
       (`BUDDY_SENDER_ID` = {$new_friend_row['id']} AND `BUDDY_OWNER_ID` = {$user['id']})
       LIMIT 1 FOR UPDATE;"
     , true);
-    if(isset($check_relation['BUDDY_ID']))
+    if (isset($check_relation['BUDDY_ID']))
     {
       throw new exception('buddy_err_adding_exists', ERR_WARNING);
     }
@@ -139,7 +139,7 @@ 
     throw new exception('buddy_err_adding_none', ERR_NONE);
   }
 }
-catch(exception $e)
+catch (exception $e)
 {
   $result[] = array(
     'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
@@ -150,7 +150,7 @@ 
 sn_db_transaction_rollback();
 
 $query = db_buddy_list_by_user($user['id']);
-while($row = db_fetch($query))
+while ($row = db_fetch($query))
 {
   $row['BUDDY_REQUEST'] = HelperString::nl2br($row['BUDDY_REQUEST']);
 

Braces +12 added lines, -11 removed lines

@@ -56,8 +56,7 @@ 
             sprintf($lang['buddy_msg_accept_text'], $user['username']));
           sn_db_transaction_commit();
           throw new exception('buddy_err_accept_none', ERR_NONE);
-        }
-        else
+        } else
         {
           throw new exception('buddy_err_accept_internal', ERR_ERROR);
         }
@@ -69,9 +68,11 @@ 
           throw new exception('buddy_err_delete_alien', ERR_ERROR);
         }
 
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) // Existing friendship
+        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) {
+          // Existing friendship
         {
           $ex_friend_id = $buddy_row['BUDDY_SENDER_ID'] == $user['id'] ? $buddy_row['BUDDY_OWNER_ID'] : $buddy_row['BUDDY_SENDER_ID'];
+        }
 
           msg_send_simple_message($ex_friend_id, $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_unfriend_title'],
             sprintf($lang['buddy_msg_unfriend_text'], $user['username']));
@@ -79,17 +80,19 @@ 
           doquery("DELETE FROM {{buddy}} WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1;");
           sn_db_transaction_commit();
           throw new exception('buddy_err_unfriend_none', ERR_NONE);
-        }
-        elseif($buddy_row['BUDDY_SENDER_ID'] == $user['id']) // Player's outcoming request - either denied or waiting
+        } elseif($buddy_row['BUDDY_SENDER_ID'] == $user['id']) {
+          // Player's outcoming request - either denied or waiting
         {
           doquery("DELETE FROM {{buddy}} WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1;");
+        }
           sn_db_transaction_commit();
           throw new exception('buddy_err_delete_own', ERR_NONE);
-        }
-        elseif($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) // Deny incoming request
+        } elseif($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) {
+          // Deny incoming request
         {
           msg_send_simple_message($buddy_row['BUDDY_SENDER_ID'], $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_deny_title'],
             sprintf($lang['buddy_msg_deny_text'], $user['username']));
+        }
 
           doquery("UPDATE {{buddy}} SET `BUDDY_STATUS` = " . BUDDY_REQUEST_DENIED . " WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1;");
           sn_db_transaction_commit();
@@ -104,8 +107,7 @@ 
   if($new_friend_id = sys_get_param_id('request_user_id'))
   {
     $new_friend_row = db_user_by_id($new_friend_id, true, '`id`, `username`');
-  }
-  elseif($new_friend_name = sys_get_param_str_unsafe('request_user_name'))
+  } elseif($new_friend_name = sys_get_param_str_unsafe('request_user_name'))
   {
     $new_friend_row = db_user_by_username($new_friend_name);
     $new_friend_name = db_escape($new_friend_name);
@@ -138,8 +140,7 @@ 
     sn_db_transaction_commit();
     throw new exception('buddy_err_adding_none', ERR_NONE);
   }
-}
-catch(exception $e)
+} catch(exception $e)
 {
   $result[] = array(
     'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,

classes/sn_module.php

Spacing +36 added lines, -36 removed lines

@@ -127,13 +127,13 @@ 
     // Trying to load configuration from file
     $config_exists = false;
     // Конфигурация может лежать в config_path в манифеста или в корне модуля
-    if(isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'] . '/config.php')) {
+    if (isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'] . '/config.php')) {
       $config_exists = true;
-    } elseif(file_exists($config_filename = dirname($filename) . '/config.php')) {
+    } elseif (file_exists($config_filename = dirname($filename) . '/config.php')) {
       $config_exists = true;
     }
 
-    if($config_exists) {
+    if ($config_exists) {
       include($config_filename);
       $module_config_array = $class_module_name . '_config';
       $this->config = $$module_config_array;
@@ -144,8 +144,8 @@ 
   }
 
   protected function __patch_menu(&$sn_menu_extra, &$menu_patch) {
-    if(isset($menu_patch) && is_array($menu_patch) && !empty($menu_patch)) {
-      foreach($menu_patch as $menu_item_name => $menu_item_data) {
+    if (isset($menu_patch) && is_array($menu_patch) && !empty($menu_patch)) {
+      foreach ($menu_patch as $menu_item_name => $menu_item_data) {
         $sn_menu_extra[$menu_item_name] = $menu_item_data;
       }
     }
@@ -155,13 +155,13 @@ 
   public function initialize() {
     // Checking module status - is it installed and active
     $this->check_status();
-    if(!$this->manifest['active']) {
+    if (!$this->manifest['active']) {
       return;
     }
 
     // Setting constants - if any
-    if(isset($this->manifest['constants']) && is_array($this->manifest['constants']) && !empty($this->manifest['constants'])) {
-      foreach($this->manifest['constants'] as $constant_name => $constant_value) {
+    if (isset($this->manifest['constants']) && is_array($this->manifest['constants']) && !empty($this->manifest['constants'])) {
+      foreach ($this->manifest['constants'] as $constant_name => $constant_value) {
         defined($constant_name) or define($constant_name, $constant_value);
       }
     }
@@ -172,34 +172,34 @@ 
     // New values from module variables will overwrite previous values (for root variables) and array elements with corresponding indexes (for arrays)
     // Constants as array indexes are honored - it's make valid such declarations as 'sn_data[ques][QUE_STRUCTURES]'
     $this->manifest['vars'] = $this->__assign_vars();
-    if(!empty($this->manifest['vars'])) {
+    if (!empty($this->manifest['vars'])) {
       $vars_assigned = array();
-      foreach($this->manifest['vars'] as $var_name => $var_value) {
+      foreach ($this->manifest['vars'] as $var_name => $var_value) {
         $sub_vars = explode('[', str_replace(']', '', $var_name));
         $var_name = $sub_vars[0];
 
-        if(!isset($vars_assigned[$var_name])) {
+        if (!isset($vars_assigned[$var_name])) {
           $vars_assigned[$var_name] = true;
           global $$var_name;
         }
 
         $pointer = &$$var_name;
-        if(($n = count($sub_vars)) > 1) {
-          for($i = 1; $i < $n; $i++) {
-            if(defined($sub_vars[$i])) {
+        if (($n = count($sub_vars)) > 1) {
+          for ($i = 1; $i < $n; $i++) {
+            if (defined($sub_vars[$i])) {
               $sub_vars[$i] = constant($sub_vars[$i]);
             }
 
-            if(!isset($pointer[$sub_vars[$i]]) && $i != $n) {
+            if (!isset($pointer[$sub_vars[$i]]) && $i != $n) {
               $pointer[$sub_vars[$i]] = array();
             }
             $pointer = &$pointer[$sub_vars[$i]];
           }
         }
 
-        if(!isset($pointer) || !is_array($pointer)) {
+        if (!isset($pointer) || !is_array($pointer)) {
           $pointer = $var_value;
-        } elseif(is_array($$var_name)) {
+        } elseif (is_array($$var_name)) {
           $pointer = array_merge_recursive_numeric($pointer, $var_value);
         }
       }
@@ -209,9 +209,9 @@ 
     global $functions;
     sn_sys_handler_add($functions, $this->manifest['functions'], $this);
 
-    foreach($this->functions as $functionName => $callableList) {
+    foreach ($this->functions as $functionName => $callableList) {
       !is_array($callableList) ? $callableList = [$callableList] : false;
-      foreach($callableList as $callable) {
+      foreach ($callableList as $callable) {
         sys_handler_add_one($functions, $functionName, $callable, static::class, '');
       }
     }
@@ -222,50 +222,50 @@ 
     isset($this->manifest['menu_admin']) and $this->__patch_menu($sn_menu_admin_extra, $this->manifest['menu_admin']);
 
     global $sn_mvc;
-    foreach($sn_mvc as $handler_type => &$handler_data) {
+    foreach ($sn_mvc as $handler_type => &$handler_data) {
       sn_sys_handler_add($handler_data, $this->manifest['mvc'][$handler_type], $this, $handler_type);
     }
 
-    if(isset($this->manifest['i18n']) && is_array($this->manifest['i18n']) && !empty($this->manifest['i18n'])) {
-      foreach($this->manifest['i18n'] as $i18n_page_name => &$i18n_file_list) {
-        foreach($i18n_file_list as &$i18n_file_data) {
-          if(is_array($i18n_file_data) && !$i18n_file_data['path']) {
+    if (isset($this->manifest['i18n']) && is_array($this->manifest['i18n']) && !empty($this->manifest['i18n'])) {
+      foreach ($this->manifest['i18n'] as $i18n_page_name => &$i18n_file_list) {
+        foreach ($i18n_file_list as &$i18n_file_data) {
+          if (is_array($i18n_file_data) && !$i18n_file_data['path']) {
             $i18n_file_data['path'] = $this->manifest['root_relative'];
           }
         }
-        if(!isset($sn_mvc['i18n'][$i18n_page_name])) {
+        if (!isset($sn_mvc['i18n'][$i18n_page_name])) {
           $sn_mvc['i18n'][$i18n_page_name] = array();
         }
         $sn_mvc['i18n'][$i18n_page_name] += $i18n_file_list;
       }
     }
 
-    if(!empty($this->manifest['javascript']) && is_array($this->manifest['javascript'])) {
-      foreach($this->manifest['javascript'] as $javascript_page_name => &$javascript_list) {
+    if (!empty($this->manifest['javascript']) && is_array($this->manifest['javascript'])) {
+      foreach ($this->manifest['javascript'] as $javascript_page_name => &$javascript_list) {
         !isset($sn_mvc['javascript'][$javascript_page_name]) ? $sn_mvc['javascript'][$javascript_page_name] = array() : false;
-        foreach($javascript_list as $script_name => &$script_content) {
+        foreach ($javascript_list as $script_name => &$script_content) {
           $sn_mvc['javascript'][$javascript_page_name][$script_name] = $script_content;
         }
       }
     }
 
-    if(!empty($this->manifest['css']) && is_array($this->manifest['css'])) {
-      foreach($this->manifest['css'] as $javascript_page_name => &$javascript_list) {
+    if (!empty($this->manifest['css']) && is_array($this->manifest['css'])) {
+      foreach ($this->manifest['css'] as $javascript_page_name => &$javascript_list) {
         !isset($sn_mvc['css'][$javascript_page_name]) ? $sn_mvc['css'][$javascript_page_name] = array() : false;
-        foreach($javascript_list as $script_name => &$script_content) {
+        foreach ($javascript_list as $script_name => &$script_content) {
           $sn_mvc['css'][$javascript_page_name][$script_name] = $script_content;
         }
       }
     }
 
-    if(!empty($this->manifest['navbar_prefix_button']) && is_array($this->manifest['navbar_prefix_button'])) {
-      foreach($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
+    if (!empty($this->manifest['navbar_prefix_button']) && is_array($this->manifest['navbar_prefix_button'])) {
+      foreach ($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
         $sn_mvc['navbar_prefix_button'][$button_image] = $button_url_relative;
       }
     }
 
-    if(!empty($this->manifest['navbar_main_button']) && is_array($this->manifest['navbar_main_button'])) {
-      foreach($this->manifest['navbar_main_button'] as $button_image => $button_url_relative) {
+    if (!empty($this->manifest['navbar_main_button']) && is_array($this->manifest['navbar_main_button'])) {
+      foreach ($this->manifest['navbar_main_button'] as $button_image => $button_url_relative) {
         $sn_mvc['navbar_main_button'][$button_image] = $button_url_relative;
       }
     }
@@ -281,7 +281,7 @@ 
    */
   protected function __mvcRegisterPagesOld($pages) {
     !is_array($this->manifest['mvc']['pages']) ? $this->manifest['mvc']['pages'] = array() : false;
-    if(is_array($pages) && !empty($pages)) {
+    if (is_array($pages) && !empty($pages)) {
       $this->manifest['mvc']['pages'] = array_merge($this->manifest['mvc']['pages'], $pages);
     }
   }

admin/adm_payment.php

Spacing +5 added lines, -5 removed lines

@@ -18,13 +18,13 @@ 
 
 messageBoxAdminAccessDenied(AUTH_LEVEL_ADMINISTRATOR);
 
-$template  = gettemplate('admin/adm_payment', true);
+$template = gettemplate('admin/adm_payment', true);
 
 $payer_list = array(
   -1 => $lang['adm_pay_filter_all'],
 );
 $query = doquery("SELECT payment_user_id, payment_user_name FROM `{{payment}}` GROUP BY payment_user_id ORDER BY payment_user_name");
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $payer_list[$row['payment_user_id']] = '[' . $row['payment_user_id'] . '] ' . $row['payment_user_name'];
 }
 tpl_assign_select($template, 'payer', $payer_list);
@@ -33,7 +33,7 @@ 
   '' => $lang['adm_pay_filter_all'],
 );
 $query = doquery("SELECT distinct payment_module_name FROM `{{payment}}` ORDER BY payment_module_name");
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $module_list[$row['payment_module_name']] = $row['payment_module_name'];
 }
 tpl_assign_select($template, 'module', $module_list);
@@ -69,9 +69,9 @@ 
 
 
 //while($row = db_fetch($query)) {
-foreach($query as $row) {
+foreach ($query as $row) {
   $row2 = array();
-  foreach($row as $key => $value) {
+  foreach ($row as $key => $value) {
     $row2[strtoupper($key)] = $value;
   }
   $template->assign_block_vars('payment', $row2);

classes/Account.php

Spacing +23 added lines, -23 removed lines

@@ -89,8 +89,8 @@ 
     $this->secret_word = classSupernova::$sn_secret_word;
 
     $snTableNames = $this->db->schema()->getSnTables();
-    foreach($this->table_check as $table_name) {
-      if(empty($snTableNames[$table_name])) {
+    foreach ($this->table_check as $table_name) {
+      if (empty($snTableNames[$table_name])) {
         die('Если вы видите это сообщение первый раз после обновления релиза - просто перегрузите страницу.<br />
               В противном случае - сообщите Администрации сервера об ошибке.<br/>
               Не хватает таблицы для работы системы авторизации: ' . $table_name);
@@ -114,7 +114,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;
     }
 
@@ -135,7 +135,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'];
@@ -200,7 +200,7 @@ 
     $this->reset();
 
     $email_safe = $this->db->db_escape($email_unsafe);
-    if($email_safe) {
+    if ($email_safe) {
       $account_row = $this->db->doquery("SELECT * FROM {{account}} WHERE LOWER(`account_email`) = LOWER('{$email_safe}') FOR UPDATE;", true);
 
       return $this->assign_from_db_row($account_row);
@@ -273,11 +273,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);
     }
 
@@ -307,7 +307,7 @@ 
       WHERE `account_id` = '{$account_id_safe}'"
     ) ? true : false;
 
-    if($result) {
+    if ($result) {
       $result = $this->db_get_by_id($this->account_id);
     }
 
@@ -396,7 +396,7 @@ 
   public function metamatter_change($change_type, $metamatter, $comment = false, $already_changed = false) {
     global $debug, $mm_change_legit, $config, $sn_module;
 
-    if(!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
+    if (!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
       $debug->error('Ошибка при попытке манипуляции с ММ');
       return false;
     }
@@ -405,7 +405,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 {
@@ -418,7 +418,7 @@ 
           ($metamatter_total_delta ? ", `account_immortal` = IF(`account_metamatter_total` + '{$metamatter_total_delta}' >= {$config->player_metamatter_immortal} AND `account_immortal` IS NULL, 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();
@@ -426,7 +426,7 @@ 
       $this->awardImmortal($metamatter, $config, $sn_module);
     }
 
-    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);
@@ -435,30 +435,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 = doquery("SELECT * FROM {{referrals}} WHERE `id` = {$user_id_safe} LIMIT 1 FOR UPDATE;", '', true);
-      if($old_referral['id']) {
+      if ($old_referral['id']) {
         $dark_matter_from_metamatter = $metamatter * AFFILIATE_MM_TO_REFERRAL_DM;
         doquery("UPDATE {{referrals}} SET dark_matter = dark_matter + '{$dark_matter_from_metamatter}' WHERE `id` = {$user_id_safe} LIMIT 1;");
         $new_referral = doquery("SELECT * FROM {{referrals}} WHERE `id` = {$user_id_safe} LIMIT 1;", '', true);
 
         $partner_bonus = floor($new_referral['dark_matter'] / $config->rpg_bonus_divisor) - ($old_referral['dark_matter'] >= $config->rpg_bonus_minimum ? floor($old_referral['dark_matter'] / $config->rpg_bonus_divisor) : 0);
-        if($partner_bonus > 0 && $new_referral['dark_matter'] >= $config->rpg_bonus_minimum) {
+        if ($partner_bonus > 0 && $new_referral['dark_matter'] >= $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}");
         }
       }
@@ -474,7 +474,7 @@ 
    * @throws Exception
    */
   public function cookieSet($rememberMe = false, $domain = null) {
-    if(!$this->is_exists) {
+    if (!$this->is_exists) {
       throw new Exception(LOGIN_ERROR_NO_ACCOUNT_FOR_COOKIE_SET, ERR_ERROR);
     }
 
@@ -493,7 +493,7 @@ 
   // OK v4.1
   public function cookieClear($domain = null) {
     // Автоматически вообще-то - если установлена кука имперсонатора - то чистим обычную, а куку имперсонатора - копируем в неё
-    if(!empty($_COOKIE[$this->cookie_name_impersonate])) {
+    if (!empty($_COOKIE[$this->cookie_name_impersonate])) {
       sn_setcookie($this->cookie_name, $_COOKIE[$this->cookie_name_impersonate], SN_TIME_NOW + PERIOD_YEAR, $this->sn_root_path, $domain);
       sn_setcookie($this->cookie_name_impersonate, '', SN_TIME_NOW - PERIOD_WEEK, $this->sn_root_path, $domain);
     } else {
@@ -503,14 +503,14 @@ 
 
   public function cookieLogin(&$rememberMe = false) {
     // Пытаемся войти по куке
-    if(!empty($_COOKIE[$this->cookie_name])) {
-      if(count(explode("/%/", $_COOKIE[$this->cookie_name])) < 4) {
+    if (!empty($_COOKIE[$this->cookie_name])) {
+      if (count(explode("/%/", $_COOKIE[$this->cookie_name])) < 4) {
         list($account_id_unsafe, $cookie_password_hash_salted, $user_remember_me) = explode(AUTH_COOKIE_DELIMETER, $_COOKIE[$this->cookie_name]);
       } else {
         list($account_id_unsafe, $user_name, $cookie_password_hash_salted, $user_remember_me) = explode("/%/", $_COOKIE[$this->cookie_name]);
       }
 
-      if(
+      if (
         $this->db_get_by_id($account_id_unsafe)
         && ($this->password_encode_for_cookie($this->account_password) == $cookie_password_hash_salted)
       ) {