supernova-ws / SuperNova

fleet.php

Spacing +14 added lines, -14 removed lines

@@ -39,11 +39,11 @@ 
 $planet = sys_get_param_int('planet', $planetrow['planet']);
 
 $target_mission = sys_get_param_int('target_mission');
-if($target_mission == MT_COLONIZE || $target_mission == MT_EXPLORE) {
+if ($target_mission == MT_COLONIZE || $target_mission == MT_EXPLORE) {
   $planet_type = PT_PLANET;
-} elseif($target_mission == MT_RECYCLE) {
+} elseif ($target_mission == MT_RECYCLE) {
   $planet_type = PT_DEBRIS;
-} elseif($target_mission == MT_DESTROY) {
+} elseif ($target_mission == MT_DESTROY) {
   $planet_type = PT_MOON;
 } else {
   $planet_type = sys_get_param_int('planet_type');
@@ -59,15 +59,15 @@ 
 //$FlyingFleets = doquery("SELECT COUNT(fleet_id) as Number FROM {{fleets}} WHERE `fleet_owner`='{$user['id']}'", true);
 //$FlyingFleets = $FlyingFleets['Number'];
 $FlyingFleets = fleet_count_flying($user['id']);
-if($MaxFleets <= $FlyingFleets && $fleet_page && $fleet_page != 4) {
+if ($MaxFleets <= $FlyingFleets && $fleet_page && $fleet_page != 4) {
   messageBox($lang['fl_noslotfree'], $lang['fl_error'], "fleet." . PHP_EX, 5);
 }
 
 $MaxExpeditions = get_player_max_expeditons($user);
-if($MaxExpeditions) {
+if ($MaxExpeditions) {
 //  $FlyingExpeditions  = doquery("SELECT COUNT(fleet_owner) AS `expedi` FROM {{fleets}} WHERE `fleet_owner` = {$user['id']} AND `fleet_mission` = '" . MT_EXPLORE . "';", '', true);
 //  $FlyingExpeditions  = $FlyingExpeditions['expedi'];
-  $FlyingExpeditions  = fleet_count_flying($user['id'], MT_EXPLORE);
+  $FlyingExpeditions = fleet_count_flying($user['id'], MT_EXPLORE);
 } else {
   $FlyingExpeditions = 0;
 }
@@ -80,8 +80,8 @@ 
     $fleetarray     = json_decode(base64_decode(str_rot13(sys_get_param('usedfleet'))), true);
     $fleetarray = is_array($fleetarray) ? $fleetarray : array();
 
-    foreach($fleetarray as $ship_id => &$ship_amount) {
-      if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
+    foreach ($fleetarray as $ship_id => &$ship_amount) {
+      if (!in_array($ship_id, sn_get_groups('fleet')) || (string) floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
         $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true));
         die();
       }
@@ -112,11 +112,11 @@ 
           $target_mission = MT_COLONIZE;
           $planet_type = PT_PLANET;
         } else {
-          messageBox ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']);
+          messageBox("<font color=\"red\"><b>" . $lang['fl_no_planet_type'] . "</b></font>", $lang['fl_error']);
         }
       } else {
         $recyclers = 0;
-        foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+        foreach (sn_get_groups('flt_recyclers') as $recycler_id) {
           $recyclers += $fleetarray[$recycler_id];
         }
         if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
@@ -141,7 +141,7 @@ 
 
                 $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD];
 
-                if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
+                if ($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
                   $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY];
                 }
               }
@@ -201,14 +201,14 @@ 
 );
 
 $is_transport_missions = false;
-if($missiontype) {
+if ($missiontype) {
   $sn_group_missions = sn_get_groups('missions');
-  foreach($missiontype as $mission_data_id => $mission_data) {
+  foreach ($missiontype as $mission_data_id => $mission_data) {
     $is_transport_missions = $is_transport_missions || (isset($sn_group_missions[$mission_data_id]['transport']) && $sn_group_missions[$mission_data_id]['transport']);
   }
 }
 
-switch($fleet_page) {
+switch ($fleet_page) {
   case 1:
     require('includes/includes/flt_page1.inc');
   break;

Switch Indentation +131 added lines, -131 removed lines

@@ -75,121 +75,121 @@ 
 }
 
 switch ($fleet_page) {
-  case 3:
+    case 3:
 
-  case 2:
-    $fleet_group_mr = sys_get_param_id('fleet_group');
-    $fleetarray     = json_decode(base64_decode(str_rot13(sys_get_param('usedfleet'))), true);
-    $fleetarray = is_array($fleetarray) ? $fleetarray : array();
+    case 2:
+      $fleet_group_mr = sys_get_param_id('fleet_group');
+      $fleetarray     = json_decode(base64_decode(str_rot13(sys_get_param('usedfleet'))), true);
+      $fleetarray = is_array($fleetarray) ? $fleetarray : array();
 
-    foreach($fleetarray as $ship_id => &$ship_amount) {
-      if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
-        $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true));
-        die();
-      }
-      $ship_amount = floatval($ship_amount);
-    }
-
-    $UsedPlanet = false;
-    $YourPlanet = false;
-    $missiontype = array();
-    if ($planet > classSupernova::$config->game_maxPlanet) {
-      $target_mission = MT_EXPLORE;
-      $missiontype[MT_EXPLORE] = $lang['type_mission'][MT_EXPLORE];
-    } elseif ($galaxy && $system && $planet) {
-      $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
-
-      $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type);
-
-      if ($TargetPlanet['id_owner']) {
-        $UsedPlanet = true;
-        if ($TargetPlanet['id_owner'] == $user['id']) {
-          $YourPlanet = true;
+      foreach($fleetarray as $ship_id => &$ship_amount) {
+        if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
+          $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true));
+          die();
         }
+        $ship_amount = floatval($ship_amount);
       }
 
-      if (!$UsedPlanet) {
-        if ($fleetarray[SHIP_COLONIZER]) {
-          $missiontype[MT_COLONIZE] = $lang['type_mission'][MT_COLONIZE];
-          $target_mission = MT_COLONIZE;
-          $planet_type = PT_PLANET;
-        } else {
-          messageBox ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']);
-        }
-      } else {
-        $recyclers = 0;
-        foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
-          $recyclers += $fleetarray[$recycler_id];
+      $UsedPlanet = false;
+      $YourPlanet = false;
+      $missiontype = array();
+      if ($planet > classSupernova::$config->game_maxPlanet) {
+        $target_mission = MT_EXPLORE;
+        $missiontype[MT_EXPLORE] = $lang['type_mission'][MT_EXPLORE];
+      } elseif ($galaxy && $system && $planet) {
+        $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
+
+        $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type);
+
+        if ($TargetPlanet['id_owner']) {
+          $UsedPlanet = true;
+          if ($TargetPlanet['id_owner'] == $user['id']) {
+            $YourPlanet = true;
+          }
         }
-        if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
-          $target_mission = MT_RECYCLE;
-          $missiontype[MT_RECYCLE] = $lang['type_mission'][MT_RECYCLE];
-        } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) {
-          if ($YourPlanet) {
-            $missiontype[MT_RELOCATE] = $lang['type_mission'][MT_RELOCATE];
-            $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
+
+        if (!$UsedPlanet) {
+          if ($fleetarray[SHIP_COLONIZER]) {
+            $missiontype[MT_COLONIZE] = $lang['type_mission'][MT_COLONIZE];
+            $target_mission = MT_COLONIZE;
+            $planet_type = PT_PLANET;
           } else {
-            // Not Your Planet
-            if ($fleetarray[SHIP_SPY]) {
-              // Only spy missions if any spy
-              $missiontype[MT_SPY] = $lang['type_mission'][MT_SPY];
+            messageBox ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']);
+          }
+        } else {
+          $recyclers = 0;
+          foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+            $recyclers += $fleetarray[$recycler_id];
+          }
+          if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
+            $target_mission = MT_RECYCLE;
+            $missiontype[MT_RECYCLE] = $lang['type_mission'][MT_RECYCLE];
+          } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) {
+            if ($YourPlanet) {
+              $missiontype[MT_RELOCATE] = $lang['type_mission'][MT_RELOCATE];
+              $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
             } else {
-              // If no spies...
-              if ($fleet_group_mr) {
-                $missiontype[MT_AKS] = $lang['type_mission'][MT_AKS];
+              // Not Your Planet
+              if ($fleetarray[SHIP_SPY]) {
+                // Only spy missions if any spy
+                $missiontype[MT_SPY] = $lang['type_mission'][MT_SPY];
               } else {
-                $missiontype[MT_ATTACK] = $lang['type_mission'][MT_ATTACK];
-                $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
-
-                $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD];
-
-                if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
-                  $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY];
+                // If no spies...
+                if ($fleet_group_mr) {
+                  $missiontype[MT_AKS] = $lang['type_mission'][MT_AKS];
+                } else {
+                  $missiontype[MT_ATTACK] = $lang['type_mission'][MT_ATTACK];
+                  $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
+
+                  $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD];
+
+                  if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
+                    $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY];
+                  }
                 }
               }
             }
           }
         }
       }
-    }
-
-    if (!$target_mission && is_array($missiontype)) {
-      $target_mission = MT_ATTACK;
-    }
-
-//    $sn_group_missions = sn_get_groups('missions');
-//    foreach($sn_group_missions as $mission_id => $cork) {
-//      $missiontype[$mission_id] = $lang['type_mission'][$mission_id];
-//    }
-//
-//
-    ksort($missiontype);
-
-    $speed_percent = sys_get_param_int('speed', 10);
-    $travel_data   = flt_travel_data($user, $planetrow, array('galaxy' => $galaxy, 'system' => $system, 'planet' => $planet), $fleetarray, $speed_percent);
-
-//    $fleet_speed   = flt_fleet_speed($user, $fleetarray);
-    $fleet_speed   = $travel_data['fleet_speed'];
-    $distance      = $travel_data['distance'];
-    $duration      = $travel_data['duration'];
-    $consumption   = $travel_data['consumption'];
-  // No Break
-
-  case 1:
-    if ($galaxy && $system && $planet) {
-      $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
-
-      $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type);
-    }
-
-  case 0:
-    $template_result += array(
-      'thisgalaxy'      => $planetrow['galaxy'],
-      'thissystem'      => $planetrow['system'],
-      'thisplanet'      => $planetrow['planet'],
-      'thisplanet_type' => $planetrow['planet_type'],
-    );
-  // no break
+
+      if (!$target_mission && is_array($missiontype)) {
+        $target_mission = MT_ATTACK;
+      }
+
+  //    $sn_group_missions = sn_get_groups('missions');
+  //    foreach($sn_group_missions as $mission_id => $cork) {
+  //      $missiontype[$mission_id] = $lang['type_mission'][$mission_id];
+  //    }
+  //
+  //
+      ksort($missiontype);
+
+      $speed_percent = sys_get_param_int('speed', 10);
+      $travel_data   = flt_travel_data($user, $planetrow, array('galaxy' => $galaxy, 'system' => $system, 'planet' => $planet), $fleetarray, $speed_percent);
+
+  //    $fleet_speed   = flt_fleet_speed($user, $fleetarray);
+      $fleet_speed   = $travel_data['fleet_speed'];
+      $distance      = $travel_data['distance'];
+      $duration      = $travel_data['duration'];
+      $consumption   = $travel_data['consumption'];
+    // No Break
+
+    case 1:
+      if ($galaxy && $system && $planet) {
+        $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
+
+        $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type);
+      }
+
+    case 0:
+      $template_result += array(
+        'thisgalaxy'      => $planetrow['galaxy'],
+        'thissystem'      => $planetrow['system'],
+        'thisplanet'      => $planetrow['planet'],
+        'thisplanet_type' => $planetrow['planet_type'],
+      );
+    // no break
 
 }
 
@@ -211,35 +211,35 @@ 
 }
 
 switch($fleet_page) {
-  case 1:
-    require('includes/includes/flt_page1.inc');
-  break;
-
-  case 2:
-    require_once('includes/includes/flt_page2.inc');
-    sn_fleet_page2();
-  break;
-
-  case 3:
-    require_once('includes/includes/flt_page3.inc');
-    sn_fleet_page3();
-  break;
-
-  case 4:
-    require('includes/includes/flt_page4.inc');
-  break;
-
-  case 5:
-    $template = gettemplate('fleet5', true);
-    $pageFleet5Gathering = new \Deprecated\PageFleet5Gathering();
-    $pageFleet5Gathering->modelFleet5Gathering($user, $planetrow, $template);
-    // Building list of own planets & moons
-    $pageFleet5Gathering->viewPage5Gathering($user, $planetrow, $template);
-  break;
-
-  default:
-    define('SN_RENDER_NAVBAR_PLANET', true);
-
-    require('includes/includes/flt_page0.inc');
-  break;
+    case 1:
+      require('includes/includes/flt_page1.inc');
+    break;
+
+    case 2:
+      require_once('includes/includes/flt_page2.inc');
+      sn_fleet_page2();
+    break;
+
+    case 3:
+      require_once('includes/includes/flt_page3.inc');
+      sn_fleet_page3();
+    break;
+
+    case 4:
+      require('includes/includes/flt_page4.inc');
+    break;
+
+    case 5:
+      $template = gettemplate('fleet5', true);
+      $pageFleet5Gathering = new \Deprecated\PageFleet5Gathering();
+      $pageFleet5Gathering->modelFleet5Gathering($user, $planetrow, $template);
+      // Building list of own planets & moons
+      $pageFleet5Gathering->viewPage5Gathering($user, $planetrow, $template);
+    break;
+
+    default:
+      define('SN_RENDER_NAVBAR_PLANET', true);
+
+      require('includes/includes/flt_page0.inc');
+    break;
 }

classes/Meta/Economic/EconomicHelper.php

Spacing +2 added lines, -2 removed lines

@@ -75,11 +75,11 @@
    * @return float[] - [int resourceId] -> [float ratesNormalizedToResourceCost]
    */
   public function getResourceExchangeIn($resourceId) {
-    if(empty($this->resourceExchangeRates[$resourceId])) {
+    if (empty($this->resourceExchangeRates[$resourceId])) {
       $defaultRates = $this->getResourcesExchange();
 
       $this->resourceExchangeRates[$resourceId] = [];
-      foreach($defaultRates as $defaultResourceId => $defaultRate) {
+      foreach ($defaultRates as $defaultResourceId => $defaultRate) {
         $this->resourceExchangeRates[$resourceId][$defaultResourceId] = $defaultRate / $defaultRates[$resourceId];
       }
     }

includes/init.php

Spacing +34 added lines, -34 removed lines

@@ -3,7 +3,7 @@ 
 use \Core\SnBootstrap;
 
 // Защита от двойного инита
-if(defined('INIT')) {
+if (defined('INIT')) {
   return;
 }
 
@@ -116,18 +116,18 @@ 
 // Но нужно, пока у нас есть не MVC-страницы
 $sn_page_data = $sn_mvc['pages'][$sn_page_name];
 $sn_page_name_file = 'includes/pages/' . $sn_page_data['filename'] . DOT_PHP_EX;
-if($sn_page_name) {
+if ($sn_page_name) {
   // Merging page options to global option pull
-  if(is_array($sn_page_data['options'])) {
+  if (is_array($sn_page_data['options'])) {
     classSupernova::$options = array_merge(classSupernova::$options, $sn_page_data['options']);
   }
 
-  if(isset($sn_page_data) && file_exists($sn_page_name_file)) {
+  if (isset($sn_page_data) && file_exists($sn_page_name_file)) {
     require_once($sn_page_name_file);
   }
 }
 
-if((defined('IN_AJAX') && IN_AJAX === true) || (defined('IN_ADMIN') && IN_ADMIN === true)) {
+if ((defined('IN_AJAX') && IN_AJAX === true) || (defined('IN_ADMIN') && IN_ADMIN === true)) {
   classSupernova::$options['fleet_update_skip'] = true;
 }
 
@@ -141,10 +141,10 @@ 
 $load_order = array();
 $sn_req = array();
 
-foreach($sn_module as $loaded_module_name => $module_data) {
+foreach ($sn_module as $loaded_module_name => $module_data) {
   $load_order[$loaded_module_name] = isset($module_data->manifest['load_order']) && !empty($module_data->manifest['load_order']) ? $module_data->manifest['load_order'] : 100000;
-  if(isset($module_data->manifest['require']) && !empty($module_data->manifest['require'])) {
-    foreach($module_data->manifest['require'] as $require_name) {
+  if (isset($module_data->manifest['require']) && !empty($module_data->manifest['require'])) {
+    foreach ($module_data->manifest['require'] as $require_name) {
       $sn_req[$loaded_module_name][$require_name] = 0;
     }
   }
@@ -155,10 +155,10 @@ 
 do {
   $prev_order = $load_order;
 
-  foreach($sn_req as $loaded_module_name => &$req_data) {
+  foreach ($sn_req as $loaded_module_name => &$req_data) {
     $level = 1;
-    foreach($req_data as $req_name => &$req_level) {
-      if($load_order[$req_name] == -1 || !isset($load_order[$req_name])) {
+    foreach ($req_data as $req_name => &$req_level) {
+      if ($load_order[$req_name] == -1 || !isset($load_order[$req_name])) {
         $level = $req_level = -1;
         break;
       } else {
@@ -166,21 +166,21 @@ 
       }
       $req_level = $load_order[$req_name];
     }
-    if($level > $load_order[$loaded_module_name] || $level == -1) {
+    if ($level > $load_order[$loaded_module_name] || $level == -1) {
       $load_order[$loaded_module_name] = $level;
     }
   }
 }
-while($prev_order != $load_order);
+while ($prev_order != $load_order);
 
 asort($load_order);
 
 // Инициализируем модули
 // По нормальным делам это должна быть загрузка модулей и лишь затем инициализация - что бы минимизировать размер процесса в памяти
-foreach($load_order as $loaded_module_name => $load_order_order) {
-  if($load_order_order >= 0) {
+foreach ($load_order as $loaded_module_name => $load_order_order) {
+  if ($load_order_order >= 0) {
     $sn_module[$loaded_module_name]->check_status();
-    if(!$sn_module[$loaded_module_name]->manifest['active']) {
+    if (!$sn_module[$loaded_module_name]->manifest['active']) {
       unset($sn_module[$loaded_module_name]);
       continue;
     }
@@ -198,29 +198,29 @@ 
 
 // А теперь проверяем - поддерживают ли у нас загруженный код такую страницу
 // TODO - костыль, что бы работали старые модули. Убрать!
-if(is_array($sn_data['pages'])) {
+if (is_array($sn_data['pages'])) {
   $sn_mvc['pages'] = array_merge($sn_mvc['pages'], $sn_data['pages']);
 }
-if(!isset($sn_mvc['pages'][$sn_page_name])) {
+if (!isset($sn_mvc['pages'][$sn_page_name])) {
   $sn_page_name = '';
 }
 
 $lang->lng_switch(sys_get_param_str('lang'));
 
 
-if(classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) {
+if (classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) {
   \Tools\VersionCheckerDeprecated::performCheckVersion();
 }
 
-if(classSupernova::$config->user_birthday_gift && SN_TIME_NOW - classSupernova::$config->user_birthday_celebrate > PERIOD_DAY) {
+if (classSupernova::$config->user_birthday_gift && SN_TIME_NOW - classSupernova::$config->user_birthday_celebrate > PERIOD_DAY) {
   require_once(SN_ROOT_PHYSICAL . 'includes/includes/user_birthday_celebrate.php');
   sn_user_birthday_celebrate();
 }
 
-if(!classSupernova::$config->var_online_user_count || classSupernova::$config->var_online_user_time + 30 < SN_TIME_NOW) {
+if (!classSupernova::$config->var_online_user_count || classSupernova::$config->var_online_user_time + 30 < SN_TIME_NOW) {
   classSupernova::$config->db_saveItem('var_online_user_count', db_user_count(true));
   classSupernova::$config->db_saveItem('var_online_user_time', SN_TIME_NOW);
-  if(classSupernova::$config->server_log_online) {
+  if (classSupernova::$config->server_log_online) {
     doquery("INSERT IGNORE INTO {{log_users_online}} SET online_count = " . classSupernova::$config->var_online_user_count . ";");
   }
 }
@@ -243,7 +243,7 @@ 
 
 $template_result[F_ACCOUNT_IS_AUTHORIZED] = $sys_user_logged_in = !empty($user) && isset($user['id']) && $user['id'];
 
-if(!empty($user['id'])) {
+if (!empty($user['id'])) {
   classSupernova::$user_options->user_change($user['id']);
 }
 
@@ -256,7 +256,7 @@ 
         : false
       );
 
-if($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
+if ($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
   $prohibited_characters = array_map(function($value) {
     return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'";
   }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED));
@@ -264,7 +264,7 @@ 
 }
 
 
-if(defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
+if (defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
   pdump('Отключи отладку перед продакшном!');
 }
 
@@ -278,17 +278,17 @@ 
 
 StatUpdateLauncher::unlock();
 
-if($template_result[F_GAME_DISABLE] = classSupernova::$config->game_disable) {
+if ($template_result[F_GAME_DISABLE] = classSupernova::$config->game_disable) {
   $template_result[F_GAME_DISABLE_REASON] = HelperString::nl2br(
     classSupernova::$config->game_disable == GAME_DISABLE_REASON
       ? classSupernova::$config->game_disable_reason
       : $lang['sys_game_disable_reason'][classSupernova::$config->game_disable]
   );
-  if(defined('IN_API')) {
+  if (defined('IN_API')) {
     return;
   }
 
-  if(
+  if (
     ($user['authlevel'] < 1 || !(defined('IN_ADMIN') && IN_ADMIN))
     &&
     !(defined('INSTALL_MODE') && defined('LOGIN_LOGOUT'))
@@ -301,8 +301,8 @@ 
 
 // TODO ban
 // TODO $skip_ban_check
-if($template_result[F_BANNED_STATUS] && !$skip_ban_check) {
-  if(defined('IN_API')) {
+if ($template_result[F_BANNED_STATUS] && !$skip_ban_check) {
+  if (defined('IN_API')) {
     return;
   }
 
@@ -316,10 +316,10 @@ 
 $allow_anonymous = $allow_anonymous || (isset($sn_page_data['allow_anonymous']) && $sn_page_data['allow_anonymous']);
 
 
-if($sys_user_logged_in && INITIAL_PAGE == 'login') {
+if ($sys_user_logged_in && INITIAL_PAGE == 'login') {
   sys_redirect(SN_ROOT_VIRTUAL . 'overview.php');
-} elseif($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id'])
-} elseif(!$allow_anonymous && !$sys_user_logged_in) {
+} elseif ($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id'])
+} elseif (!$allow_anonymous && !$sys_user_logged_in) {
   sys_redirect(SN_ROOT_VIRTUAL . 'login.php');
 }
 
@@ -343,7 +343,7 @@ 
   'fleet_update_last',
   classSupernova::$config->fleet_update_interval,
   // Promise
-  function () {classSupernova::$gc->fleetDispatcher->dispatch();},
+  function() {classSupernova::$gc->fleetDispatcher->dispatch(); },
   WATCHDOG_TIME_SQL,
   false
 );

classes/phpbb_hook.php

Indentation +224 added lines, -224 removed lines

@@ -16,7 +16,7 @@ 
 */
 if (!defined('IN_PHPBB'))
 {
-	exit;
+  exit;
 }
 
 /**
@@ -24,227 +24,227 @@ 
 */
 class phpbb_hook
 {
-	/**
-	* Registered hooks
-	*/
-	var $hooks = array();
-
-	/**
-	* Results returned by functions called
-	*/
-	var $hook_result = array();
-
-	/**
-	* internal pointer
-	*/
-	var $current_hook = NULL;
-
-	/**
-	* Initialize hook class.
-	*
-	* @param array $valid_hooks array containing the hookable functions/methods
-	*/
-	function phpbb_hook($valid_hooks)
-	{
-		foreach ($valid_hooks as $_null => $method)
-		{
-			$this->add_hook($method);
-		}
-
-		if (function_exists('phpbb_hook_register'))
-		{
-			phpbb_hook_register($this);
-		}
-	}
-
-	/**
-	* Register function/method to be called within hook
-	* This function is normally called by the modification/application to attach/register the functions.
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	* @param mixed $hook The replacement function/method to be called. Passing function name or array with object/class definition
-	* @param string $mode Specify the priority/chain mode. 'normal' -> hook gets appended to the chain. 'standalone' -> only the specified hook gets called - later hooks are not able to overwrite this (E_NOTICE is triggered then). 'first' -> hook is called as the first one within the chain. 'last' -> hook is called as the last one within the chain.
-	*/
-	function register($definition, $hook, $mode = 'normal')
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		// Method able to be hooked?
-		if (isset($this->hooks[$class][$function]))
-		{
-			switch ($mode)
-			{
-				case 'standalone':
-					if (!isset($this->hooks[$class][$function]['standalone']))
-					{
-						$this->hooks[$class][$function] = array('standalone' => $hook);
-					}
-					else
-					{
-						trigger_error('Hook not able to be called standalone, previous hook already standalone.', E_NOTICE);
-					}
-				break;
-
-				case 'first':
-				case 'last':
-					$this->hooks[$class][$function][$mode][] = $hook;
-				break;
-
-				case 'normal':
-				default:
-					$this->hooks[$class][$function]['normal'][] = $hook;
-				break;
-			}
-		}
-	}
-
-	/**
-	* Calling all functions/methods attached to a specified hook.
-	* Called by the function allowing hooks...
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	* @return bool False if no hook got executed, true otherwise
-	*/
-	function call_hook($definition)
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		if (!empty($this->hooks[$class][$function]))
-		{
-			// Developer tries to call a hooked function within the hooked function...
-			if ($this->current_hook !== NULL && $this->current_hook['class'] === $class && $this->current_hook['function'] === $function)
-			{
-				return false;
-			}
-
-			// Call the hook with the arguments attached and store result
-			$arguments = func_get_args();
-			$this->current_hook = array('class' => $class, 'function' => $function);
-			$arguments[0] = &$this;
-
-			// Call the hook chain...
-			if (isset($this->hooks[$class][$function]['standalone']))
-			{
-				$this->hook_result[$class][$function] = call_user_func_array($this->hooks[$class][$function]['standalone'], $arguments);
-			}
-			else
-			{
-				foreach (array('first', 'normal', 'last') as $mode)
-				{
-					if (!isset($this->hooks[$class][$function][$mode]))
-					{
-						continue;
-					}
-
-					foreach ($this->hooks[$class][$function][$mode] as $hook)
-					{
-						$this->hook_result[$class][$function] = call_user_func_array($hook, $arguments);
-					}
-				}
-			}
-
-			$this->current_hook = NULL;
-			return true;
-		}
-
-		$this->current_hook = NULL;
-		return false;
-	}
-
-	/**
-	* Get result from previously called functions/methods for the same hook
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	* @return mixed False if nothing returned if there is no result, else array('result' => ... )
-	*/
-	function previous_hook_result($definition)
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
-		{
-			return array('result' => $this->hook_result[$class][$function]);
-		}
-
-		return false;
-	}
-
-	/**
-	* Check if the called functions/methods returned something.
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	* @return bool True if results are there, false if not
-	*/
-	function hook_return($definition)
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Give actual result from called functions/methods back.
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	* @return mixed The result
-	*/
-	function hook_return_result($definition)
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
-		{
-			$result = $this->hook_result[$class][$function];
-			unset($this->hook_result[$class][$function]);
-			return $result;
-		}
-
-		return;
-	}
-
-	/**
-	* Add new function to the allowed hooks.
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	*/
-	function add_hook($definition)
-	{
-		if (!is_array($definition))
-		{
-			$definition = array('__global', $definition);
-		}
-
-		$this->hooks[$definition[0]][$definition[1]] = array();
-	}
-
-	/**
-	* Remove function from the allowed hooks.
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	*/
-	function remove_hook($definition)
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		if (isset($this->hooks[$class][$function]))
-		{
-			unset($this->hooks[$class][$function]);
-
-			if (isset($this->hook_result[$class][$function]))
-			{
-				unset($this->hook_result[$class][$function]);
-			}
-		}
-	}
+  /**
+   * Registered hooks
+   */
+  var $hooks = array();
+
+  /**
+   * Results returned by functions called
+   */
+  var $hook_result = array();
+
+  /**
+   * internal pointer
+   */
+  var $current_hook = NULL;
+
+  /**
+   * Initialize hook class.
+   *
+   * @param array $valid_hooks array containing the hookable functions/methods
+   */
+  function phpbb_hook($valid_hooks)
+  {
+    foreach ($valid_hooks as $_null => $method)
+    {
+      $this->add_hook($method);
+    }
+
+    if (function_exists('phpbb_hook_register'))
+    {
+      phpbb_hook_register($this);
+    }
+  }
+
+  /**
+   * Register function/method to be called within hook
+   * This function is normally called by the modification/application to attach/register the functions.
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   * @param mixed $hook The replacement function/method to be called. Passing function name or array with object/class definition
+   * @param string $mode Specify the priority/chain mode. 'normal' -> hook gets appended to the chain. 'standalone' -> only the specified hook gets called - later hooks are not able to overwrite this (E_NOTICE is triggered then). 'first' -> hook is called as the first one within the chain. 'last' -> hook is called as the last one within the chain.
+   */
+  function register($definition, $hook, $mode = 'normal')
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    // Method able to be hooked?
+    if (isset($this->hooks[$class][$function]))
+    {
+      switch ($mode)
+      {
+        case 'standalone':
+          if (!isset($this->hooks[$class][$function]['standalone']))
+          {
+            $this->hooks[$class][$function] = array('standalone' => $hook);
+          }
+          else
+          {
+            trigger_error('Hook not able to be called standalone, previous hook already standalone.', E_NOTICE);
+          }
+        break;
+
+        case 'first':
+        case 'last':
+          $this->hooks[$class][$function][$mode][] = $hook;
+        break;
+
+        case 'normal':
+        default:
+          $this->hooks[$class][$function]['normal'][] = $hook;
+        break;
+      }
+    }
+  }
+
+  /**
+   * Calling all functions/methods attached to a specified hook.
+   * Called by the function allowing hooks...
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   * @return bool False if no hook got executed, true otherwise
+   */
+  function call_hook($definition)
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    if (!empty($this->hooks[$class][$function]))
+    {
+      // Developer tries to call a hooked function within the hooked function...
+      if ($this->current_hook !== NULL && $this->current_hook['class'] === $class && $this->current_hook['function'] === $function)
+      {
+        return false;
+      }
+
+      // Call the hook with the arguments attached and store result
+      $arguments = func_get_args();
+      $this->current_hook = array('class' => $class, 'function' => $function);
+      $arguments[0] = &$this;
+
+      // Call the hook chain...
+      if (isset($this->hooks[$class][$function]['standalone']))
+      {
+        $this->hook_result[$class][$function] = call_user_func_array($this->hooks[$class][$function]['standalone'], $arguments);
+      }
+      else
+      {
+        foreach (array('first', 'normal', 'last') as $mode)
+        {
+          if (!isset($this->hooks[$class][$function][$mode]))
+          {
+            continue;
+          }
+
+          foreach ($this->hooks[$class][$function][$mode] as $hook)
+          {
+            $this->hook_result[$class][$function] = call_user_func_array($hook, $arguments);
+          }
+        }
+      }
+
+      $this->current_hook = NULL;
+      return true;
+    }
+
+    $this->current_hook = NULL;
+    return false;
+  }
+
+  /**
+   * Get result from previously called functions/methods for the same hook
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   * @return mixed False if nothing returned if there is no result, else array('result' => ... )
+   */
+  function previous_hook_result($definition)
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
+    {
+      return array('result' => $this->hook_result[$class][$function]);
+    }
+
+    return false;
+  }
+
+  /**
+   * Check if the called functions/methods returned something.
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   * @return bool True if results are there, false if not
+   */
+  function hook_return($definition)
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
+    {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Give actual result from called functions/methods back.
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   * @return mixed The result
+   */
+  function hook_return_result($definition)
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
+    {
+      $result = $this->hook_result[$class][$function];
+      unset($this->hook_result[$class][$function]);
+      return $result;
+    }
+
+    return;
+  }
+
+  /**
+   * Add new function to the allowed hooks.
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   */
+  function add_hook($definition)
+  {
+    if (!is_array($definition))
+    {
+      $definition = array('__global', $definition);
+    }
+
+    $this->hooks[$definition[0]][$definition[1]] = array();
+  }
+
+  /**
+   * Remove function from the allowed hooks.
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   */
+  function remove_hook($definition)
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    if (isset($this->hooks[$class][$function]))
+    {
+      unset($this->hooks[$class][$function]);
+
+      if (isset($this->hook_result[$class][$function]))
+      {
+        unset($this->hook_result[$class][$function]);
+      }
+    }
+  }
 }

Braces +11 added lines, -22 removed lines

@@ -22,8 +22,7 @@ 
 /**
 * phpBB Hook Class
 */
-class phpbb_hook
-{
+class phpbb_hook {
 	/**
 	* Registered hooks
 	*/
@@ -44,8 +43,7 @@ 
 	*
 	* @param array $valid_hooks array containing the hookable functions/methods
 	*/
-	function phpbb_hook($valid_hooks)
-	{
+	function phpbb_hook($valid_hooks) {
 		foreach ($valid_hooks as $_null => $method)
 		{
 			$this->add_hook($method);
@@ -65,8 +63,7 @@ 
 	* @param mixed $hook The replacement function/method to be called. Passing function name or array with object/class definition
 	* @param string $mode Specify the priority/chain mode. 'normal' -> hook gets appended to the chain. 'standalone' -> only the specified hook gets called - later hooks are not able to overwrite this (E_NOTICE is triggered then). 'first' -> hook is called as the first one within the chain. 'last' -> hook is called as the last one within the chain.
 	*/
-	function register($definition, $hook, $mode = 'normal')
-	{
+	function register($definition, $hook, $mode = 'normal') {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 
@@ -79,8 +76,7 @@ 
 					if (!isset($this->hooks[$class][$function]['standalone']))
 					{
 						$this->hooks[$class][$function] = array('standalone' => $hook);
-					}
-					else
+					} else
 					{
 						trigger_error('Hook not able to be called standalone, previous hook already standalone.', E_NOTICE);
 					}
@@ -106,8 +102,7 @@ 
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	* @return bool False if no hook got executed, true otherwise
 	*/
-	function call_hook($definition)
-	{
+	function call_hook($definition) {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 
@@ -128,8 +123,7 @@ 
 			if (isset($this->hooks[$class][$function]['standalone']))
 			{
 				$this->hook_result[$class][$function] = call_user_func_array($this->hooks[$class][$function]['standalone'], $arguments);
-			}
-			else
+			} else
 			{
 				foreach (array('first', 'normal', 'last') as $mode)
 				{
@@ -159,8 +153,7 @@ 
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	* @return mixed False if nothing returned if there is no result, else array('result' => ... )
 	*/
-	function previous_hook_result($definition)
-	{
+	function previous_hook_result($definition) {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 
@@ -178,8 +171,7 @@ 
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	* @return bool True if results are there, false if not
 	*/
-	function hook_return($definition)
-	{
+	function hook_return($definition) {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 
@@ -197,8 +189,7 @@ 
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	* @return mixed The result
 	*/
-	function hook_return_result($definition)
-	{
+	function hook_return_result($definition) {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 
@@ -217,8 +208,7 @@ 
 	*
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	*/
-	function add_hook($definition)
-	{
+	function add_hook($definition) {
 		if (!is_array($definition))
 		{
 			$definition = array('__global', $definition);
@@ -232,8 +222,7 @@ 
 	*
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	*/
-	function remove_hook($definition)
-	{
+	function remove_hook($definition) {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 

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

@@ -37,7 +37,7 @@ 
 	/**
 	* internal pointer
 	*/
-	var $current_hook = NULL;
+	var $current_hook = null;
 
 	/**
 	* Initialize hook class.
@@ -114,7 +114,7 @@ 
 		if (!empty($this->hooks[$class][$function]))
 		{
 			// Developer tries to call a hooked function within the hooked function...
-			if ($this->current_hook !== NULL && $this->current_hook['class'] === $class && $this->current_hook['function'] === $function)
+			if ($this->current_hook !== null && $this->current_hook['class'] === $class && $this->current_hook['function'] === $function)
 			{
 				return false;
 			}
@@ -145,11 +145,11 @@ 
 				}
 			}
 
-			$this->current_hook = NULL;
+			$this->current_hook = null;
 			return true;
 		}
 
-		$this->current_hook = NULL;
+		$this->current_hook = null;
 		return false;
 	}
 

admin/admin_analyze_matter.php

Spacing +8 added lines, -9 removed lines

@@ -15,8 +15,8 @@ 
 
 $constants = get_defined_constants(true);
 $rpgConstants = array();
-foreach($constants['user'] as $constantName => $constantValue) {
-  if(substr($constantName, 0, 4) == 'RPG_') {
+foreach ($constants['user'] as $constantName => $constantValue) {
+  if (substr($constantName, 0, 4) == 'RPG_') {
     $rpgConstants[$constantValue] = $constantName;
   }
 }
@@ -33,7 +33,7 @@ 
 GROUP BY log_dark_matter_reason, IF(sign((log_dark_matter_amount)) > 0, 1, -1) ORDER BY sum(log_dark_matter_amount) DESC;
 ");
 
-while($row = classSupernova::$db->db_fetch($result)) {
+while ($row = classSupernova::$db->db_fetch($result)) {
   $row['CONSTANT'] = $rpgConstants[$row['REASON']];
 
   $row['DM_AMOUNT_TEXT'] = HelperString::numberFloorAndFormat($row['DM_AMOUNT']);
@@ -55,8 +55,8 @@ 
 GROUP BY reason, if(sign((amount)) > 0, 1, -1) ORDER BY sum(amount) DESC;
 ");
 
-while($row = classSupernova::$db->db_fetch($result)) {
-  if(empty($spent[$row['BALANCE']])) {
+while ($row = classSupernova::$db->db_fetch($result)) {
+  if (empty($spent[$row['BALANCE']])) {
     $spent[$row['BALANCE']] = array();
   }
 
@@ -66,16 +66,15 @@ 
   $spent[$row['BALANCE']] = array_merge_recursive_numeric($spent[$row['BALANCE']], $row);
 }
 
-foreach($spent as &$row) {
+foreach ($spent as &$row) {
   @$row['TOTAL_COUNT'] = $row['MM_COUNT'] + $row['DM_COUNT'];
   @$row['TOTAL_AMOUNT'] = $row['MM_AMOUNT'] + $row['DM_AMOUNT'];
   @$row['TOTAL_AMOUNT_TEXT'] = HelperString::numberFloorAndFormat($row['TOTAL_AMOUNT']);
   @$row['TOTAL_COUNT_TEXT'] = HelperString::numberFloorAndFormat($row['TOTAL_COUNT']);
 }
 
-usort($spent, function ($a, $b) {
-  return $a['TOTAL_AMOUNT'] < $b['TOTAL_AMOUNT'] ? -1 :
-    ($a['TOTAL_AMOUNT'] > $b['TOTAL_AMOUNT'] ? 1 : 0);
+usort($spent, function($a, $b) {
+  return $a['TOTAL_AMOUNT'] < $b['TOTAL_AMOUNT'] ? -1 : ($a['TOTAL_AMOUNT'] > $b['TOTAL_AMOUNT'] ? 1 : 0);
 });
 
 

admin/includes/admin_planet_edit.inc.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list){return sn_function_call('admin_planet_edit_mode', array(&$template, &$admin_planet_edit_mode_list));}
+function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list) {return sn_function_call('admin_planet_edit_mode', array(&$template, &$admin_planet_edit_mode_list)); }
 function sn_admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list)
 {
   global $lang;
@@ -19,7 +19,7 @@ 
   return $mode;
 }
 
-function admin_planet_edit_template(&$template, $edit_planet_row, $mode){return sn_function_call('admin_planet_edit_template', array(&$template, $edit_planet_row, $mode));}
+function admin_planet_edit_template(&$template, $edit_planet_row, $mode) {return sn_function_call('admin_planet_edit_template', array(&$template, $edit_planet_row, $mode)); }
 /**
  * @param template $template
  * @param $edit_planet_row
@@ -30,13 +30,13 @@ 
   global $lang;
 
   $unit_list = sn_get_groups($mode);
-  if(empty($unit_list))
+  if (empty($unit_list))
   {
     return;
   }
   $name_list = $lang['tech'];
 
-  foreach($unit_list as $unit_id)
+  foreach ($unit_list as $unit_id)
   {
     $template->assign_block_vars('unit', array(
       'ID'    => $unit_id,
@@ -47,10 +47,10 @@ 
   }
 }
 
-function admin_planet_edit_query_string($unit_id, $unit_amount, $mode){return sn_function_call('admin_planet_edit_query_string', array($unit_id, $unit_amount, $mode));}
+function admin_planet_edit_query_string($unit_id, $unit_amount, $mode) {return sn_function_call('admin_planet_edit_query_string', array($unit_id, $unit_amount, $mode)); }
 function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode)
 {
-  if($unit_amount && in_array($unit_id, sn_get_groups($mode)))
+  if ($unit_amount && in_array($unit_id, sn_get_groups($mode)))
   {
     $unit_amount = round($unit_amount);
     $unit_name = get_unit_param($unit_id, P_NAME);

Braces +4 added lines, -8 removed lines

@@ -1,8 +1,7 @@ 
 <?php
 
 function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list){return sn_function_call('admin_planet_edit_mode', array(&$template, &$admin_planet_edit_mode_list));}
-function sn_admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list)
-{
+function sn_admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list) {
   global $lang;
 
   $admin_planet_edit_mode_list = array_merge(isset($admin_planet_edit_mode_list) ? $admin_planet_edit_mode_list : array(), array(
@@ -25,8 +24,7 @@ 
  * @param $edit_planet_row
  * @param $mode
  */
-function sn_admin_planet_edit_template(&$template, $edit_planet_row, $mode)
-{
+function sn_admin_planet_edit_template(&$template, $edit_planet_row, $mode) {
   global $lang;
 
   $unit_list = sn_get_groups($mode);
@@ -48,15 +46,13 @@ 
 }
 
 function admin_planet_edit_query_string($unit_id, $unit_amount, $mode){return sn_function_call('admin_planet_edit_query_string', array($unit_id, $unit_amount, $mode));}
-function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode)
-{
+function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode) {
   if($unit_amount && in_array($unit_id, sn_get_groups($mode)))
   {
     $unit_amount = round($unit_amount);
     $unit_name = get_unit_param($unit_id, P_NAME);
     $result = "{$unit_name} = GREATEST(0, {$unit_name} + ({$unit_amount}))";
-  }
-  else
+  } else
   {
     $result = '';
   }

includes/includes/market_fleeter.inc

Spacing +26 added lines, -26 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) {
+if (!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) {
   $debug->error("Attempt to call market page mode {$mode} directly - not from market.php", 'Forbidden', 403);
 }
 
@@ -12,8 +12,8 @@ 
   'rpg_cost' => $rpg_cost,
 ));
 
-if(is_array($shipList)) {
-  if(mrc_get_level($user, null, RES_DARK_MATTER) < $rpg_cost) {
+if (is_array($shipList)) {
+  if (mrc_get_level($user, null, RES_DARK_MATTER) < $rpg_cost) {
     $intError = MARKET_NO_DM;
   }
 
@@ -30,30 +30,30 @@ 
   $qry = array();
   $total = array();
   $db_changeset = array();
-  foreach($shipList as $shipID => &$shipCount) {
+  foreach ($shipList as $shipID => &$shipCount) {
     $shipCount = ceil(floatval($shipCount));
-    if(!$shipCount) {
+    if (!$shipCount) {
       continue;
     }
 
-    if($shipCount < 0) {
+    if ($shipCount < 0) {
       $debug->warning('User supplied negative ship count on Black Market page', 'Hack Attempt', 307);
       $intError = MARKET_NEGATIVE_SHIPS;
       break;
     }
 
-    if($mode == MARKET_SCRAPPER) {
+    if ($mode == MARKET_SCRAPPER) {
       $amount = mrc_get_level($user, $planetrow, $shipID, true, true); // $planetrow[get_unit_param($shipID, P_NAME)];
-    } elseif($mode == MARKET_STOCKMAN) {
+    } elseif ($mode == MARKET_STOCKMAN) {
       $amount = $stock[$shipID];
     }
 
-    if($amount < $shipCount) {
+    if ($amount < $shipCount) {
       $intError = $error_no_stock;
       break;
     }
 
-    if(!in_array($shipID, sn_get_groups('fleet'))) {
+    if (!in_array($shipID, sn_get_groups('fleet'))) {
       $debug->warning('Hack Attempt', 'User supplied non-ship unit ID on Black Market page', 306);
       $intError = MARKET_NOT_A_SHIP;
       break;
@@ -69,16 +69,16 @@ 
     $resTemp[RES_CRYSTAL] = floor($build_data[BUILD_CREATE][RES_CRYSTAL] * $shipCount * $config_rpg_scrape_crystal * (-$multiplier));
     $resTemp[RES_DEUTERIUM] = floor($build_data[BUILD_CREATE][RES_DEUTERIUM] * $shipCount * $config_rpg_scrape_deuterium * (-$multiplier));
 
-    foreach($resTemp as $resID => $resCount) {
+    foreach ($resTemp as $resID => $resCount) {
       $total[$resID] += $resCount;
     }
 
     $message .= "<li>{$lang['tech'][$shipID]}: " . HelperString::numberFloorAndFormat($shipCount);
   }
 
-  if($mode == MARKET_STOCKMAN && $intError == MARKET_DEAL) {
-    foreach($total as $resID => $resCount) {
-      if(mrc_get_level($user, $planetrow, $resID, true, true) < -$resCount) {
+  if ($mode == MARKET_STOCKMAN && $intError == MARKET_DEAL) {
+    foreach ($total as $resID => $resCount) {
+      if (mrc_get_level($user, $planetrow, $resID, true, true) < -$resCount) {
         $intError = MARKET_NO_RESOURCES;
         $debug->warning('Trying to use bug in s/h market', 'S/H Ship Market', 301);
         break;
@@ -88,10 +88,10 @@ 
 
   $intError = ($intError == MARKET_DEAL) && (array_sum($total) == 0) ? $error_zero_res : $intError;
 
-  if($intError == MARKET_DEAL) {
+  if ($intError == MARKET_DEAL) {
     $message .= '</ul>' . $lang["eco_mrk_{$submode}_res"] . '<ul>';
-    foreach($total as $resID => $resCount) {
-      if(!$resCount) {
+    foreach ($total as $resID => $resCount) {
+      if (!$resCount) {
         continue;
       }
 
@@ -125,38 +125,38 @@ 
       'MESSAGE' => $lang['eco_mrk_errors'][$intError],
     ));
 
-    foreach($shipList as $shipID => $shipCount) {
+    foreach ($shipList as $shipID => $shipCount) {
       $data['ships'][$shipID] = max(0, intval($shipCount));
     }
   }
 }
 $message = '';
 
-if(!$config->eco_stockman_fleet && $config->eco_stockman_fleet_populate) {
-  $config->db_saveItem('eco_stockman_fleet', sys_unit_arr2str(array_map(function($item){return mt_rand(1, 1000);}, sn_get_groups('fleet'))));
+if (!$config->eco_stockman_fleet && $config->eco_stockman_fleet_populate) {
+  $config->db_saveItem('eco_stockman_fleet', sys_unit_arr2str(array_map(function($item) {return mt_rand(1, 1000); }, sn_get_groups('fleet'))));
 }
 
 tpl_set_resource_info($template, $planetrow, array());
 
-if(!$array) {
+if (!$array) {
   $array = array();
 }
 
 $group_fleet = sn_get_groups('fleet');
-foreach($array as $key => $value) {
-  if($mode == MARKET_SCRAPPER) {
+foreach ($array as $key => $value) {
+  if ($mode == MARKET_SCRAPPER) {
     $shipID = $value;
     $amount = mrc_get_level($user, $planetrow, $shipID, false, true); // $planetrow[get_unit_param($shipID, P_NAME)];
-  } elseif($mode == MARKET_STOCKMAN) {
+  } elseif ($mode == MARKET_STOCKMAN) {
     $shipID = $key;
     $amount = $value;
   }
 
-  if(!in_array($shipID, $group_fleet)) {
+  if (!in_array($shipID, $group_fleet)) {
     continue;
   }
 
-  if($amount > 0) {
+  if ($amount > 0) {
     $build_data = eco_get_build_data($user, $planetrow, $shipID);
     $template->assign_block_vars('ships', array(
       'ID'        => $shipID,

includes/pages/imperator.php

Spacing +21 added lines, -21 removed lines

@@ -47,7 +47,7 @@ 
 //    $same_user = false;
 //  }
 
-  if(!$user_data) {
+  if (!$user_data) {
     messageBox($lang['imp_imperator_none'], $lang['sys_error'], 'index.php', 10);
     die();
   }
@@ -58,8 +58,8 @@ 
   $stat_array = array();
   $query = doquery("SELECT * FROM {{statpoints}} WHERE `stat_type` = 1 AND `id_owner` = {$user_id} ORDER BY `stat_code` DESC;");
   $stat_count = classSupernova::$db->db_affected_rows();
-  while($row = db_fetch($query)) {
-    foreach($stat_fields as $field_db_name => $field_template_name) {
+  while ($row = db_fetch($query)) {
+    foreach ($stat_fields as $field_db_name => $field_template_name) {
       // $stat_count - $row['stat_code'] - для реверсирования ID статы в JS
       $stat_array[$field_template_name]['DATA'][$stat_count - $row['stat_code']] = $row[$field_db_name];
     }
@@ -67,7 +67,7 @@ 
 
   $stat_array_date = $stat_array['STAT_DATE'];
   empty($stat_array_date['DATA']) ? $stat_array_date['DATA'] = array() : false;
-  foreach($stat_array_date['DATA'] as $key => $value) {
+  foreach ($stat_array_date['DATA'] as $key => $value) {
     $template->assign_block_vars('stat_date', array(
       'ID' => $key,
       'VALUE' => $value,
@@ -77,21 +77,21 @@ 
 
   unset($stat_array['STAT_DATE']);
   $template_data = array();
-  foreach($stat_array as $stat_type => &$stat_type_data) {
+  foreach ($stat_array as $stat_type => &$stat_type_data) {
     $reverse_min_max = strpos($stat_type, '_RANK') !== false;
     $stat_type_data['MIN'] = $reverse_min_max ? max($stat_type_data['DATA']) : min($stat_type_data['DATA']);
     $stat_type_data['MAX'] = $reverse_min_max ? min($stat_type_data['DATA']) : max($stat_type_data['DATA']);
     $stat_type_data['AVG'] = average($stat_type_data['DATA']);
-    foreach($stat_type_data['DATA'] as $key => $value) {
+    foreach ($stat_type_data['DATA'] as $key => $value) {
       $stat_type_data['PERCENT'][$key] = ($stat_type_data['MAX'] - $value ? ($value - $stat_type_data['MIN']) / ($stat_type_data['MAX'] - $stat_type_data['MIN']) : 1) * 100;
       $template_data[$stat_type][$key]['ID'] = $key;
       $template_data[$stat_type][$key]['VALUE'] = $value;
-      $template_data[$stat_type][$key]['DELTA'] = ($reverse_min_max ? $stat_type_data['MIN']  - $value : $value - $stat_type_data['MAX']);
+      $template_data[$stat_type][$key]['DELTA'] = ($reverse_min_max ? $stat_type_data['MIN'] - $value : $value - $stat_type_data['MAX']);
       $template_data[$stat_type][$key]['PERCENT'] = $stat_type_data['PERCENT'][$key];
     }
   }
 
-  foreach($template_data as $stat_type => $stat_type_data) {
+  foreach ($template_data as $stat_type => $stat_type_data) {
     $template->assign_block_vars('stat', array(
       'TYPE' => $stat_type,
       'TEXT' => $lang['imp_stat_types'][$stat_type],
@@ -99,13 +99,13 @@ 
       'MAX' => $stat_array[$stat_type]['MAX'],
       'AVG' => $stat_array[$stat_type]['AVG'],
     ));
-    foreach($stat_type_data as $stat_entry) {
+    foreach ($stat_type_data as $stat_entry) {
       $template->assign_block_vars('stat.entry', $stat_entry);
     }
   }
 
 
-  if($same_user) {
+  if ($same_user) {
     rpg_level_up($user, RPG_STRUCTURE);
     rpg_level_up($user, RPG_RAID);
     rpg_level_up($user, RPG_TECH);
@@ -139,29 +139,29 @@ 
     'builder_xp'           => HelperString::numberFloorAndFormat($user_data['xpminier']),
     'builder_lvl'          => HelperString::numberFloorAndFormat($user_data['lvl_minier']),
     'builder_lvl_st'       => HelperString::numberFloorAndFormat(rpg_get_miner_xp($user_data['lvl_minier'])),
-    'builder_lvl_up'       => HelperString::numberFloorAndFormat(rpg_get_miner_xp($user_data['lvl_minier']+1)),
+    'builder_lvl_up'       => HelperString::numberFloorAndFormat(rpg_get_miner_xp($user_data['lvl_minier'] + 1)),
     'raid_xp'              => HelperString::numberFloorAndFormat($user_data['xpraid']),
     'raid_lvl'             => HelperString::numberFloorAndFormat($user_data['lvl_raid']),
-    'raid_lvl_up'          => HelperString::numberFloorAndFormat(rpg_get_raider_xp($user_data['lvl_raid']+1)),
+    'raid_lvl_up'          => HelperString::numberFloorAndFormat(rpg_get_raider_xp($user_data['lvl_raid'] + 1)),
     'raids'                => HelperString::numberFloorAndFormat($user_data['raids']),
     'raidswin'             => HelperString::numberFloorAndFormat($user_data['raidswin']),
     'raidsloose'           => HelperString::numberFloorAndFormat($user_data['raidsloose']),
     'tech_xp'              => HelperString::numberFloorAndFormat($user_data['player_rpg_tech_xp']),
     'tech_lvl'             => HelperString::numberFloorAndFormat($user_data['player_rpg_tech_level']),
     'tech_lvl_st'          => HelperString::numberFloorAndFormat(rpg_get_tech_xp($user_data['player_rpg_tech_level'])),
-    'tech_lvl_up'          => HelperString::numberFloorAndFormat(rpg_get_tech_xp($user_data['player_rpg_tech_level']+1)),
+    'tech_lvl_up'          => HelperString::numberFloorAndFormat(rpg_get_tech_xp($user_data['player_rpg_tech_level'] + 1)),
 
     'explore_xp'           => HelperString::numberFloorAndFormat($user_data['player_rpg_explore_xp']),
     'explore_lvl'          => HelperString::numberFloorAndFormat($user_data['player_rpg_explore_level']),
     'explore_lvl_st'       => HelperString::numberFloorAndFormat(rpg_get_explore_xp($user_data['player_rpg_explore_level'])),
-    'explore_lvl_up'       => HelperString::numberFloorAndFormat(rpg_get_explore_xp($user_data['player_rpg_explore_level']+1)),
-
-    'build_points'         => HelperString::numberFloorAndFormat( $StatRecord['build_points'] ),
-    'tech_points'          => HelperString::numberFloorAndFormat( $StatRecord['tech_points'] ),
-    'fleet_points'         => HelperString::numberFloorAndFormat( $StatRecord['fleet_points'] ),
-    'defs_points'          => HelperString::numberFloorAndFormat( $StatRecord['defs_points'] ),
-    'res_points'           => HelperString::numberFloorAndFormat( $StatRecord['res_points'] ),
-    'total_points'         => HelperString::numberFloorAndFormat( $StatRecord['total_points'] ),
+    'explore_lvl_up'       => HelperString::numberFloorAndFormat(rpg_get_explore_xp($user_data['player_rpg_explore_level'] + 1)),
+
+    'build_points'         => HelperString::numberFloorAndFormat($StatRecord['build_points']),
+    'tech_points'          => HelperString::numberFloorAndFormat($StatRecord['tech_points']),
+    'fleet_points'         => HelperString::numberFloorAndFormat($StatRecord['fleet_points']),
+    'defs_points'          => HelperString::numberFloorAndFormat($StatRecord['defs_points']),
+    'res_points'           => HelperString::numberFloorAndFormat($StatRecord['res_points']),
+    'total_points'         => HelperString::numberFloorAndFormat($StatRecord['total_points']),
     'user_rank'            => $StatRecord['total_rank'],
     'RANK_DIFF'            => $StatRecord['total_old_rank'] - $StatRecord['total_rank'],
 

classes/DBAL/DbFieldDescription.php

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

@@ -29,7 +29,7 @@
     $this->Field = isset($mySqlDescription['Field']) ? $mySqlDescription['Field'] : null;
     $this->Type = isset($mySqlDescription['Type']) ? $mySqlDescription['Type'] : null;
     $this->Collation = isset($mySqlDescription['Collation']) ? $mySqlDescription['Collation'] : null;
-    $this->Null = isset($mySqlDescription['Null']) ? $mySqlDescription['Null'] : null;
+    $this->null = isset($mySqlDescription['Null']) ? $mySqlDescription['Null'] : null;
     $this->Key = isset($mySqlDescription['Key']) ? $mySqlDescription['Key'] : null;
     $this->Default = isset($mySqlDescription['Default']) ? $mySqlDescription['Default'] : null;
     $this->Extra = isset($mySqlDescription['Extra']) ? $mySqlDescription['Extra'] : null;