supernova-ws / SuperNova

classes/Common/Pimple/Container.php

Spacing +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
 
         $factory = $this->values[$id];
 
-        $extended = function ($c) use ($callable, $factory) {
+        $extended = function($c) use ($callable, $factory) {
             return $callable($factory($c), $c);
         };
 

Braces +12 added lines, -24 removed lines

@@ -31,8 +31,7 @@ 
  *
  * @author  Fabien Potencier
  */
-class Container implements \ArrayAccess
-{
+class Container implements \ArrayAccess {
     private $values = array();
     private $factories;
     private $protected;
@@ -47,8 +46,7 @@ 
      *
      * @param array $values The parameters or objects.
      */
-    public function __construct(array $values = array())
-    {
+    public function __construct(array $values = array()) {
         $this->factories = new \SplObjectStorage();
         $this->protected = new \SplObjectStorage();
 
@@ -71,8 +69,7 @@ 
      *
      * @throws \RuntimeException Prevent override of a frozen service
      */
-    public function offsetSet($id, $value)
-    {
+    public function offsetSet($id, $value) {
         if (isset($this->frozen[$id])) {
             throw new \RuntimeException(sprintf('Cannot override frozen service "%s".', $id));
         }
@@ -90,8 +87,7 @@ 
      *
      * @throws \InvalidArgumentException if the identifier is not defined
      */
-    public function offsetGet($id)
-    {
+    public function offsetGet($id) {
         if (!isset($this->keys[$id])) {
             throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id));
         }
@@ -125,8 +121,7 @@ 
      *
      * @return bool
      */
-    public function offsetExists($id)
-    {
+    public function offsetExists($id) {
         return isset($this->keys[$id]);
     }
 
@@ -135,8 +130,7 @@ 
      *
      * @param string $id The unique identifier for the parameter or object
      */
-    public function offsetUnset($id)
-    {
+    public function offsetUnset($id) {
         if (isset($this->keys[$id])) {
             if (is_object($this->values[$id])) {
                 unset($this->factories[$this->values[$id]], $this->protected[$this->values[$id]]);
@@ -155,8 +149,7 @@ 
      *
      * @throws \InvalidArgumentException Service definition has to be a closure of an invokable object
      */
-    public function factory($callable)
-    {
+    public function factory($callable) {
         if (!method_exists($callable, '__invoke')) {
             throw new \InvalidArgumentException('Service definition is not a Closure or invokable object.');
         }
@@ -177,8 +170,7 @@ 
      *
      * @throws \InvalidArgumentException Service definition has to be a closure of an invokable object
      */
-    public function protect($callable)
-    {
+    public function protect($callable) {
         if (!method_exists($callable, '__invoke')) {
             throw new \InvalidArgumentException('Callable is not a Closure or invokable object.');
         }
@@ -197,8 +189,7 @@ 
      *
      * @throws \InvalidArgumentException if the identifier is not defined
      */
-    public function raw($id)
-    {
+    public function raw($id) {
         if (!isset($this->keys[$id])) {
             throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id));
         }
@@ -223,8 +214,7 @@ 
      *
      * @throws \InvalidArgumentException if the identifier is not defined or not a service definition
      */
-    public function extend($id, $callable)
-    {
+    public function extend($id, $callable) {
         if (!isset($this->keys[$id])) {
             throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id));
         }
@@ -256,8 +246,7 @@ 
      *
      * @return array An array of value names
      */
-    public function keys()
-    {
+    public function keys() {
         return array_keys($this->values);
     }
 
@@ -269,8 +258,7 @@ 
      *
      * @return static
      */
-    public function register(ServiceProviderInterface $provider, array $values = array())
-    {
+    public function register(ServiceProviderInterface $provider, array $values = array()) {
         $provider->register($this);
 
         foreach ($values as $key => $value) {

fleet.php

Switch Indentation +131 added lines, -131 removed lines

@@ -77,121 +77,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 > SN::$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 > SN::$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
 
 }
 
@@ -213,35 +213,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 \Pages\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 \Pages\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;
 }

Spacing +14 added lines, -14 removed lines

@@ -44,11 +44,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');
@@ -64,15 +64,15 @@ 
 //$FlyingFleets = doquery("SELECT COUNT(fleet_id) as Number FROM {{fleets}} WHERE `fleet_owner`='{$user['id']}'", true);
 //$FlyingFleets = $FlyingFleets['Number'];
 $FlyingFleets = DbFleetStatic::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  = DbFleetStatic::fleet_count_flying($user['id'], MT_EXPLORE);
+  $FlyingExpeditions = DbFleetStatic::fleet_count_flying($user['id'], MT_EXPLORE);
 } else {
   $FlyingExpeditions = 0;
 }
@@ -85,8 +85,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();
       }
@@ -117,11 +117,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) {
@@ -146,7 +146,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];
                 }
               }
@@ -206,14 +206,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;

classes/template_compile.php

Indentation +55 added lines, -55 removed lines

@@ -55,9 +55,9 @@ 
   }
 
   /**
-  * Load template source from file
-  * @access private
-  */
+   * Load template source from file
+   * @access private
+   */
   function _tpl_load_file($handle, $store_in_db = false)
   {
     // Try and open template for read
@@ -100,10 +100,10 @@ 
   }
 
   /**
-  * Remove any PHP tags that do not belong, these regular expressions are derived from
-  * the ones that exist in zend_language_scanner.l
-  * @access private
-  */
+   * Remove any PHP tags that do not belong, these regular expressions are derived from
+   * the ones that exist in zend_language_scanner.l
+   * @access private
+   */
   function remove_php_tags(&$code)
   {
     // This matches the information gathered from the internal PHP lexer
@@ -117,9 +117,9 @@ 
   }
 
   /**
-  * The all seeing all doing compile method. Parts are inspired by or directly from Smarty
-  * @access private
-  */
+   * The all seeing all doing compile method. Parts are inspired by or directly from Smarty
+   * @access private
+   */
   function compile($code, $no_echo = false, $echo_var = '')
   {
     if ($echo_var)
@@ -288,9 +288,9 @@ 
   }
 
   /**
-  * Compile variables
-  * @access private
-  */
+   * Compile variables
+   * @access private
+   */
   function compile_var_tags(&$text_blocks)
   {
     // including $lang variable
@@ -363,9 +363,9 @@ 
   }
 
   /**
-  * Compile blocks
-  * @access private
-  */
+   * Compile blocks
+   * @access private
+   */
   function compile_tag_block($tag_args)
   {
     $no_nesting = false;
@@ -451,14 +451,14 @@ 
     $tag_template_php .= 'if ($_' . $tag_args . '_count) {';
 
     /**
-    * The following uses foreach for iteration instead of a for loop, foreach is faster but requires PHP to make a copy of the contents of the array which uses more memory
-    * <code>
-    * if (!$offset)
-    * {
-    *   $tag_template_php .= 'foreach (' . $varref . ' as $_' . $tag_args . '_i => $_' . $tag_args . '_val){';
-    * }
-    * </code>
-    */
+     * The following uses foreach for iteration instead of a for loop, foreach is faster but requires PHP to make a copy of the contents of the array which uses more memory
+     * <code>
+     * if (!$offset)
+     * {
+     *   $tag_template_php .= 'foreach (' . $varref . ' as $_' . $tag_args . '_i => $_' . $tag_args . '_val){';
+     * }
+     * </code>
+     */
 
     $tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){';
 //    $tag_template_php .= '$this->_block_counter["'. $tag_args . '"] = $_' . $tag_args . '_i;';
@@ -469,10 +469,10 @@ 
   }
 
   /**
-  * Compile IF tags - much of this is from Smarty with
-  * some adaptions for our block level methods
-  * @access private
-  */
+   * Compile IF tags - much of this is from Smarty with
+   * some adaptions for our block level methods
+   * @access private
+   */
   function compile_tag_if($tag_args, $elseif)
   {
     // Tokenize args for 'if' tag.
@@ -627,9 +627,9 @@ 
   }
 
   /**
-  * Compile DEFINE tags
-  * @access private
-  */
+   * Compile DEFINE tags
+   * @access private
+   */
   function compile_tag_define($tag_args, $op)
   {
     preg_match('#^((?:[a-z0-9\-_]+\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (\'?)([^\']*)(\'?))?$#', $tag_args, $match);
@@ -680,9 +680,9 @@ 
   }
 
   /**
-  * Compile INCLUDE tag
-  * @access private
-  */
+   * Compile INCLUDE tag
+   * @access private
+   */
   function compile_tag_include($tag_args)
   {
     // Process dynamic includes
@@ -695,19 +695,19 @@ 
   }
 
   /**
-  * Compile INCLUDE_PHP tag
-  * @access private
-  */
+   * Compile INCLUDE_PHP tag
+   * @access private
+   */
   function compile_tag_include_php($tag_args)
   {
     return "\$this->_php_include('$tag_args');";
   }
 
   /**
-  * parse expression
-  * This is from Smarty
-  * @access private
-  */
+   * parse expression
+   * This is from Smarty
+   * @access private
+   */
   function _parse_is_expr($is_arg, $tokens)
   {
     $expr_end = 0;
@@ -800,14 +800,14 @@ 
   }
 
   /**
-  * Generates a reference to the array of data values for the given
-  * (possibly nested) block namespace. This is a string of the form:
-  * $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['$childN']
-  *
-  * If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above.
-  * NOTE: does not expect a trailing "." on the blockname.
-  * @access private
-  */
+   * Generates a reference to the array of data values for the given
+   * (possibly nested) block namespace. This is a string of the form:
+   * $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['$childN']
+   *
+   * If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above.
+   * NOTE: does not expect a trailing "." on the blockname.
+   * @access private
+   */
   function generate_block_data_ref($blockname, $include_last_iterator, $defop = false)
   {
     // Get an array of the blocks involved.
@@ -843,9 +843,9 @@ 
   }
 
   /**
-  * Write compiled file to cache directory
-  * @access private
-  */
+   * Write compiled file to cache directory
+   * @access private
+   */
   function compile_write($handle, $data)
   {
     $filename = $this->template->cachepath . str_replace('/', '.', $this->template->filename[$handle]) . DOT_PHP_EX;
@@ -868,9 +868,9 @@ 
 
   // Gorlum's minifier BOF
   /**
-  * Minifies template w/i PHP code by removing extra spaces
-  * @access private
-  */
+   * Minifies template w/i PHP code by removing extra spaces
+   * @access private
+   */
   function minify($html)
   {
     if(!SN::$config->tpl_minifier)

Spacing +14 added lines, -14 removed lines

@@ -141,9 +141,9 @@ 
 
     preg_match_all('#<!-- INCLUDE (\{\$?[A-Z0-9\-_]+\}|[a-zA-Z0-9\_\-\+\./]+) -->#', $code, $matches);
     $include_blocks = $matches[1];
-    if($include_blocks)
+    if ($include_blocks)
     {
-      foreach($include_blocks as &$included_file)
+      foreach ($include_blocks as &$included_file)
       {
         $included_file .= '.tpl.html';
       }
@@ -308,7 +308,7 @@ 
       $varname = $var_val[3];
       $new = $this->generate_block_varref($namespace, $varname, $var_val[2]);
 
-      if(!empty($var_val[4])) {
+      if (!empty($var_val[4])) {
         $new = \Ptl\PtlVariableDecorator::decorate($var_val[0], $new, $this->template);
       }
 
@@ -462,8 +462,8 @@ 
 
     $tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){';
 //    $tag_template_php .= '$this->_block_counter["'. $tag_args . '"] = $_' . $tag_args . '_i;';
-    $tag_template_php .= '$_'. $tag_args . '_val = &' . $varref . '[$_'. $tag_args. '_i];';
-    $tag_template_php .= '$this->_block_value["'. $tag_args . '"] = &' . $varref . '[$_'. $tag_args. '_i];';
+    $tag_template_php .= '$_' . $tag_args . '_val = &' . $varref . '[$_' . $tag_args . '_i];';
+    $tag_template_php .= '$this->_block_value["' . $tag_args . '"] = &' . $varref . '[$_' . $tag_args . '_i];';
 
     return $tag_template_php;
   }
@@ -567,10 +567,10 @@ 
         break;
 
         case 'is':
-          $is_arg_start = ($tokens[$i-1] == ')') ? array_pop($is_arg_stack) : $i-1;
+          $is_arg_start = ($tokens[$i - 1] == ')') ? array_pop($is_arg_stack) : $i - 1;
           $is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start));
 
-          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1));
+          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i + 1));
 
           array_splice($tokens, $is_arg_start, sizeof($tokens), $new_tokens);
 
@@ -834,11 +834,11 @@ 
     }
     else if ($include_last_iterator)
     {
-      return '$_'. $blocks[$blockcount] . '_val';
+      return '$_' . $blocks[$blockcount] . '_val';
     }
     else
     {
-      return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
+      return '$_' . $blocks[$blockcount - 1] . '_val[\'' . $blocks[$blockcount] . '\']';
     }
   }
 
@@ -855,7 +855,7 @@ 
     if ($fp = @fopen($filename, 'wb'))
     {
       @flock($fp, LOCK_EX);
-      @fwrite ($fp, $data);
+      @fwrite($fp, $data);
       @flock($fp, LOCK_UN);
       @fclose($fp);
 
@@ -873,7 +873,7 @@ 
   */
   function minify($html)
   {
-    if(!SN::$config->tpl_minifier)
+    if (!SN::$config->tpl_minifier)
     {
       return $html;
     }
@@ -885,14 +885,14 @@ 
     //$html = preg_replace('/[\r\n\t]+/', ' ', $html);
     $html = preg_replace('/>[\s]*</', '><', $html); // Strip spacechars between tags
     $html = preg_replace('/[\s]+/', ' ', $html); // Replace several spacechars with one space
-    if(!empty($pre[0]))
+    if (!empty($pre[0]))
     {
-      foreach($pre[0] as $tag)
+      foreach ($pre[0] as $tag)
       {
         $tag = preg_replace('/^\ *\/\/[^\<]*?$/m', ' ', $tag); // Strips comments - except those that contains HTML comment inside
         $tag = preg_replace('/[\ \t]{2,}/', ' ', $tag); // Replace several spaces by one
         $tag = preg_replace('/\s{2,}/', "\r\n", $tag); // Replace several linefeeds by one
-        $html = preg_replace('/#pre#/', $tag, $html,1);
+        $html = preg_replace('/#pre#/', $tag, $html, 1);
       }
     }
 

Braces +33 added lines, -66 removed lines

@@ -37,8 +37,7 @@ 
 *
 * @package phpBB3
 */
-class template_compile
-{
+class template_compile {
   var $template;
 
   // Various storage arrays
@@ -58,8 +57,7 @@ 
   * Load template source from file
   * @access private
   */
-  function _tpl_load_file($handle, $store_in_db = false)
-  {
+  function _tpl_load_file($handle, $store_in_db = false) {
     // Try and open template for read
     if (!file_exists($this->template->files[$handle]))
     {
@@ -67,8 +65,7 @@ 
       {
         return;
         trigger_error("template->_tpl_load_file(): File {$this->template->files[$handle]} does not exist or is empty", E_USER_ERROR);
-      }
-      else
+      } else
       {
         $this->template->files[$handle] = $this->template->files_inherit[$handle];
       }
@@ -104,8 +101,7 @@ 
   * the ones that exist in zend_language_scanner.l
   * @access private
   */
-  function remove_php_tags(&$code)
-  {
+  function remove_php_tags(&$code) {
     // This matches the information gathered from the internal PHP lexer
     $match = array(
       '#<([\?%])=?.*?\1>#s',
@@ -120,8 +116,7 @@ 
   * The all seeing all doing compile method. Parts are inspired by or directly from Smarty
   * @access private
   */
-  function compile($code, $no_echo = false, $echo_var = '')
-  {
+  function compile($code, $no_echo = false, $echo_var = '') {
     if ($echo_var)
     {
       global $$echo_var;
@@ -224,15 +219,13 @@ 
               $var = substr($temp, 2, -1);
               //$file = $this->template->_tpldata['DEFINE']['.'][$var];
               $temp = "\$this->_tpldata['DEFINE']['.']['$var']";
-            }
-            else
+            } else
             {
               $var = substr($temp, 1, -1);
               //$file = $this->template->_rootref[$var];
               $temp = "\$this->_rootref['$var']";
             }
-          }
-          else
+          } else
           {
             $file = $temp;
           }
@@ -291,8 +284,7 @@ 
   * Compile variables
   * @access private
   */
-  function compile_var_tags(&$text_blocks)
-  {
+  function compile_var_tags(&$text_blocks) {
     // including $lang variable
     // global $lang, $config; // NOT NEDEED - $lang now is global!
 
@@ -366,8 +358,7 @@ 
   * Compile blocks
   * @access private
   */
-  function compile_tag_block($tag_args)
-  {
+  function compile_tag_block($tag_args) {
     $no_nesting = false;
 
     // Is the designer wanting to call another loop in a loop?
@@ -390,8 +381,7 @@ 
       if ($match[2] < 0)
       {
         $loop_start = '($_' . $tag_args . '_count ' . $match[2] . ' < 0 ? 0 : $_' . $tag_args . '_count ' . $match[2] . ')';
-      }
-      else
+      } else
       {
         $loop_start = '($_' . $tag_args . '_count < ' . $match[2] . ' ? $_' . $tag_args . '_count : ' . $match[2] . ')';
       }
@@ -399,17 +389,14 @@ 
       if (strlen($match[3]) < 1 || $match[3] == -1)
       {
         $loop_end = '$_' . $tag_args . '_count';
-      }
-      else if ($match[3] >= 0)
+      } else if ($match[3] >= 0)
       {
         $loop_end = '(' . ($match[3] + 1) . ' > $_' . $tag_args . '_count ? $_' . $tag_args . '_count : ' . ($match[3] + 1) . ')';
-      }
-      else //if ($match[3] < -1)
+      } else //if ($match[3] < -1)
       {
         $loop_end = '$_' . $tag_args . '_count' . ($match[3] + 1);
       }
-    }
-    else
+    } else
     {
       $loop_start = 0;
       $loop_end = '$_' . $tag_args . '_count';
@@ -422,8 +409,7 @@ 
     {
       // We need to implode $no_nesting times from the end...
       $block = array_slice($this->block_names, -$no_nesting);
-    }
-    else
+    } else
     {
       $block = $this->block_names;
     }
@@ -433,8 +419,7 @@ 
       // Block is not nested.
       $tag_template_php = '$_' . $tag_args . "_count = (isset(\$this->_tpldata['$tag_args'])) ? sizeof(\$this->_tpldata['$tag_args']) : 0;";
       $varref = "\$this->_tpldata['$tag_args']";
-    }
-    else
+    } else
     {
       // This block is nested.
       // Generate a namespace string for this block.
@@ -473,8 +458,7 @@ 
   * some adaptions for our block level methods
   * @access private
   */
-  function compile_tag_if($tag_args, $elseif)
-  {
+  function compile_tag_if($tag_args, $elseif) {
     // Tokenize args for 'if' tag.
     preg_match_all('/(?:
       "[^"\\\\]*(?:\\\\.[^"\\\\]*)*"         |
@@ -582,8 +566,7 @@ 
           if (preg_match('#^((?:[a-z0-9\-_]+\.)+)?(\$)?(?=[A-Za-z])([A-Za-z0-9\-_]+)#s', $token, $varrefs))
           {
             $token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']' : (($varrefs[2]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[3] . '\']' : '$this->_rootref[\'' . $varrefs[3] . '\']');
-          }
-          else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs))
+          } else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs))
           {
             // Allow checking if loops are set with .loopname
             // It is also possible to check the loop count by doing <!-- IF .loopname > 1 --> for example
@@ -599,8 +582,7 @@ 
 
               // Add the block reference for the last child.
               $varref .= "['" . $block . "']";
-            }
-            else
+            } else
             {
               $varref = '$this->_tpldata';
 
@@ -608,8 +590,7 @@ 
               $varref .= "['" . $blocks[0] . "']";
             }
             $token = "sizeof($varref)";
-          }
-          else if (!empty($token))
+          } else if (!empty($token))
           {
             $token = '(' . $token . ')';
           }
@@ -630,8 +611,7 @@ 
   * Compile DEFINE tags
   * @access private
   */
-  function compile_tag_define($tag_args, $op)
-  {
+  function compile_tag_define($tag_args, $op) {
     preg_match('#^((?:[a-z0-9\-_]+\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (\'?)([^\']*)(\'?))?$#', $tag_args, $match);
 
     if (empty($match[2]) || (!isset($match[4]) && $op))
@@ -654,8 +634,7 @@ 
 
       // Now replace the php code
       $match[4] = "'" . str_replace(array('<?php echo ', '; ?>'), array("' . ", " . '"), $match[4]) . "'";
-    }
-    else
+    } else
     {
       preg_match('#true|false|\.#i', $match[4], $type);
 
@@ -683,8 +662,7 @@ 
   * Compile INCLUDE tag
   * @access private
   */
-  function compile_tag_include($tag_args)
-  {
+  function compile_tag_include($tag_args) {
     // Process dynamic includes
     if ($tag_args[0] == '$')
     {
@@ -698,8 +676,7 @@ 
   * Compile INCLUDE_PHP tag
   * @access private
   */
-  function compile_tag_include_php($tag_args)
-  {
+  function compile_tag_include_php($tag_args) {
     return "\$this->_php_include('$tag_args');";
   }
 
@@ -708,8 +685,7 @@ 
   * This is from Smarty
   * @access private
   */
-  function _parse_is_expr($is_arg, $tokens)
-  {
+  function _parse_is_expr($is_arg, $tokens) {
     $expr_end = 0;
     $negate_expr = false;
 
@@ -717,8 +693,7 @@ 
     {
       $negate_expr = true;
       $expr_type = array_shift($tokens);
-    }
-    else
+    } else
     {
       $expr_type = $first_token;
     }
@@ -731,8 +706,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "!(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "!($is_arg & 1)";
         }
@@ -744,8 +718,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "($is_arg & 1)";
         }
@@ -784,8 +757,7 @@ 
    *
    * @return string
    */
-  private function generate_block_varref($namespace, $varname, $defop = false)
-  {
+  private function generate_block_varref($namespace, $varname, $defop = false) {
     // Strip the trailing period.
     $namespace = substr($namespace, 0, -1);
 
@@ -808,8 +780,7 @@ 
   * NOTE: does not expect a trailing "." on the blockname.
   * @access private
   */
-  function generate_block_data_ref($blockname, $include_last_iterator, $defop = false)
-  {
+  function generate_block_data_ref($blockname, $include_last_iterator, $defop = false) {
     // Get an array of the blocks involved.
     $blocks = explode('.', $blockname);
     $blockcount = sizeof($blocks) - 1;
@@ -831,12 +802,10 @@ 
         $varref .= '[$_' . $blocks[$blockcount] . '_i]';
       }
       return $varref;
-    }
-    else if ($include_last_iterator)
+    } else if ($include_last_iterator)
     {
       return '$_'. $blocks[$blockcount] . '_val';
-    }
-    else
+    } else
     {
       return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
     }
@@ -846,8 +815,7 @@ 
   * Write compiled file to cache directory
   * @access private
   */
-  function compile_write($handle, $data)
-  {
+  function compile_write($handle, $data) {
     $filename = $this->template->cachepath . str_replace('/', '.', $this->template->filename[$handle]) . DOT_PHP_EX;
 
     $data = "<?php if (!defined('INSIDE')) exit;" . ((strpos($data, '<?php') === 0) ? substr($data, 5) : ' ?>' . $data);
@@ -871,8 +839,7 @@ 
   * Minifies template w/i PHP code by removing extra spaces
   * @access private
   */
-  function minify($html)
-  {
+  function minify($html) {
     if(!SN::$config->tpl_minifier)
     {
       return $html;

classes/Pages/Deprecated/PageAdminMining.php

Spacing +3 added lines, -3 removed lines

@@ -29,19 +29,19 @@
         'ID'        => self::PAGE_SORT_BY_RANK,
         'HTML_ID'   => 'byTotalRank',
         'HTML_NAME' => '{ byTotalRank }',
-        'SQL_SORT'  => ['u.total_rank',],
+        'SQL_SORT'  => ['u.total_rank', ],
       ],
       self::PAGE_SORT_BY_ID => [
         'ID'        => self::PAGE_SORT_BY_ID,
         'HTML_ID'   => 'byId',
         'HTML_NAME' => '{ byId }',
-        'SQL_SORT'  => ['u.id',],
+        'SQL_SORT'  => ['u.id', ],
       ],
       self::PAGE_SORT_BY_NAME => [
         'ID'        => self::PAGE_SORT_BY_NAME,
         'HTML_ID'   => 'byName',
         'HTML_NAME' => '{ byName }',
-        'SQL_SORT'  => ['u.username',],
+        'SQL_SORT'  => ['u.username', ],
       ],
 
       self::PAGE_SORT_BY_POINTS => [

classes/Pages/Deprecated/PageAdminModules.php

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
   const SORT_BY_ACTIVITY = 1;
 
   private static $sorting = [
-    self::SORT_BY_PACKAGE  => ['PACKAGE', 'NAME', '!ACTIVE', '!INSTALLED',],
-    self::SORT_BY_ACTIVITY => ['!ACTIVE', '!INSTALLED', 'PACKAGE', 'NAME',],
+    self::SORT_BY_PACKAGE  => ['PACKAGE', 'NAME', '!ACTIVE', '!INSTALLED', ],
+    self::SORT_BY_ACTIVITY => ['!ACTIVE', '!INSTALLED', 'PACKAGE', 'NAME', ],
   ];
 
   private static $sortFields = [];

classes/Fleet/FleetStatic.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
    * @return DbMysqliResultIterator|EmptyCountableIterator
    */
   public static function dbFleetsOnHoldOnPlanetsByIds($planetIds, $time = SN_TIME_NOW) {
-    if(empty($planetIds) || !is_array($planetIds)) {
+    if (empty($planetIds) || !is_array($planetIds)) {
       return new EmptyCountableIterator();
     }
 

admin/admin_locale.php

Spacing +29 added lines, -29 removed lines

@@ -7,9 +7,9 @@ 
  *
  */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN'  , true);
+define('INSIDE', true);
+define('INSTALL', false);
+define('IN_ADMIN', true);
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
@@ -20,12 +20,12 @@ 
 function adm_lng_assign_string($lang_id, $locale_string_name, $value) {
   global $locale_string_template, $languages_info, $languages, $domain;
 
-  if(is_array($value)) {
-    foreach($value as $sub_key => $sub_value) {
+  if (is_array($value)) {
+    foreach ($value as $sub_key => $sub_value) {
       adm_lng_assign_string($lang_id, "{$locale_string_name}[{$sub_key}]", $sub_value);
     }
-  } elseif($value) {
-    if(!isset($locale_string_template[$locale_string_name])) {
+  } elseif ($value) {
+    if (!isset($locale_string_template[$locale_string_name])) {
       $locale_string_template[$locale_string_name] = array();
     }
     $locale_string_template[$locale_string_name] = array_merge($locale_string_template[$locale_string_name], array("[{$lang_id}]" => htmlentities($value, ENT_COMPAT, 'utf-8')));
@@ -46,11 +46,11 @@ 
   global $domain, $lang_id;
 
   $return = "{$ident}'{$string_name}' => ";
-  if(isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
+  if (isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
     $return .= "'" . str_replace(array("\\", "'"), array('\\\\', "\\'"), $string_value[$lang_id]) . "',";
   } else {
     $return .= "array(\r\n";
-    foreach($string_value as $arr_name => $arr_data) {
+    foreach ($string_value as $arr_name => $arr_data) {
       $return .= adm_lng_parse_string($arr_name, $arr_data, $ident . '  ');
     }
     $return .= "{$ident}),\r\n";
@@ -103,12 +103,12 @@ 
 
   $string_name_new = false;
 
-  if(isset($honor_constants[$domain][$string_name_prefix])) {
+  if (isset($honor_constants[$domain][$string_name_prefix])) {
     $found_constants = array_keys($constants, $string_name);
-    foreach($found_constants as $constant_name) {
+    foreach ($found_constants as $constant_name) {
       $honor_prefix_list = is_array($honor_constants[$domain][$string_name_prefix]) ? $honor_constants[$domain][$string_name_prefix] : array($honor_constants[$domain][$string_name_prefix]);
-      foreach($honor_prefix_list as $honor_prefix) {
-        if(strpos($constant_name, $honor_prefix) === 0) {
+      foreach ($honor_prefix_list as $honor_prefix) {
+        if (strpos($constant_name, $honor_prefix) === 0) {
           $string_name_new = $constant_name;
           break;
         }
@@ -118,13 +118,13 @@ 
 
   $string_name_new = $string_name_new ? $string_name_new : "'{$string_name}'";
   fwrite($file_handler, "{$ident}{$string_name_new} => ");
-  if(isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
+  if (isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
     fwrite($file_handler, "'" . str_replace(array("\\", "'"), array('\\\\', "\\'"), $string_value[$lang_id]) . "',");
 //    fwrite($file_handler, "'" . addslashes($string_value[$lang_id]) . "',");
   } else {
     $string_name_prefix = $string_name_prefix . "[{$string_name}]";
     fwrite($file_handler, "array(\r\n");
-    foreach($string_value as $arr_name => $arr_data) {
+    foreach ($string_value as $arr_name => $arr_data) {
       adm_lng_write_string($arr_name, $arr_data, $ident . '  ', $string_name_prefix);
     }
     fwrite($file_handler, "{$ident}),\r\n");
@@ -144,13 +144,13 @@ 
 $languages_info = lng_get_list();
 $domain = sys_get_param_str('domain');
 
-if($domain) {
+if ($domain) {
   $lang_new = sys_get_param('lang_new');
-  if(!empty($lang_new) && is_array($lang_new)) {
+  if (!empty($lang_new) && is_array($lang_new)) {
     $constants = get_defined_constants(true);
     $constants = $constants['user'];
     ksort($constants);
-    foreach($languages_info as $lang_id => $land_data) {
+    foreach ($languages_info as $lang_id => $land_data) {
       $file_handler = fopen(SN_ROOT_PHYSICAL . "language/{$lang_id}/{$domain}.mo.php.new", 'w');
       fwrite($file_handler, "<?php\r\n\r\n/*\r\n#############################################################################
 #  Filename: {$domain}.mo.php
@@ -158,7 +158,7 @@ 
 #  Website: http://www.supernova.ws
 #  Description: Massive Multiplayer Online Browser Space Strategy Game\r\n#\r\n");
 
-      foreach($land_data['LANG_COPYRIGHT'] as $lang_copyright) {
+      foreach ($land_data['LANG_COPYRIGHT'] as $lang_copyright) {
         $lang_copyright = str_replace(array('&copy;', '&quot;', '&lt;', '&gt;'), array('©', '"', '<', '>'), $lang_copyright);
         fwrite($file_handler, "#  {$lang_copyright}\r\n");
       }
@@ -166,7 +166,7 @@ 
 /**\r\n*\r\n* @package language\r\n* @system [{$land_data['LANG_NAME_ENGLISH']}]\r\n* @version " . SN_VERSION . "\r\n*\r\n*/\r\n
 /**\r\n* DO NOT CHANGE\r\n*/\r\n\r\nif (!defined('INSIDE')) die();\r\n
 \$a_lang_array = array(\r\n");
-      foreach($lang_new as $string_name => $string_value) {
+      foreach ($lang_new as $string_name => $string_value) {
         adm_lng_write_string($string_name, $string_value);
       }
       fwrite($file_handler, ");\r\n");
@@ -176,21 +176,21 @@ 
     sys_redirect("admin_locale.php?domain={$domain}");
   }
 
-  foreach($languages_info as $lang_id => $lang_data) {
+  foreach ($languages_info as $lang_id => $lang_data) {
     $template->assign_block_vars('language', $lang_data);
     $full_filename = SN_ROOT_PHYSICAL . "language/{$lang_id}/{$domain}.mo.php";
     $languages[$lang_id] = adm_lng_load($full_filename . (file_exists($full_filename . '.new') ? '.new' : ''));
-    foreach($languages[$lang_id] as $locale_string_name => $cork) {
+    foreach ($languages[$lang_id] as $locale_string_name => $cork) {
       adm_lng_assign_string($lang_id, "[{$locale_string_name}]", $languages[$lang_id][$locale_string_name]);
     }
   }
 
-  foreach($locale_string_template as $locale_string_name => $locale_string_list) {
+  foreach ($locale_string_template as $locale_string_name => $locale_string_list) {
     $template->assign_block_vars('string', array(
       'NAME' => $locale_string_name,
     ));
 
-    foreach($languages_info as $lang_id => $cork2) {
+    foreach ($languages_info as $lang_id => $cork2) {
       $template->assign_block_vars('string.locale', array(
         'LANG' => $lang_id,
         'VALUE' => $locale_string_list["[{$lang_id}]"],
@@ -206,17 +206,17 @@ 
   $dir = dir($path);
   while (false !== ($lang_id = $dir->read())) {
     $full_path = $path . $lang_id;
-    if($lang_id[0] != "." && is_dir($full_path)) {
+    if ($lang_id[0] != "." && is_dir($full_path)) {
       $lang_file_list = dir($full_path);
       while (false !== ($filename = $lang_file_list->read())) {
         $lang_domain = strtolower(substr($filename, 0, strpos($filename, '.')));
-        if(!$lang_domain) {
+        if (!$lang_domain) {
           continue;
         }
 
         $file_ext = strtolower(substr($filename, strpos($filename, '.')));
-        if($lang_domain != 'language') {
-          if($file_ext == '.mo.php.new' || ($file_ext == '.mo.php' && empty($languages[$lang_id][$lang_domain]))) {
+        if ($lang_domain != 'language') {
+          if ($file_ext == '.mo.php.new' || ($file_ext == '.mo.php' && empty($languages[$lang_id][$lang_domain]))) {
             $language_domains[$lang_domain] = $lang_domain;
             $languages[$lang_id][$lang_domain] = $lang_domain;
           }
@@ -226,7 +226,7 @@ 
   }
   $dir->close();
 
-  foreach($language_domains as $lang_domain) {
+  foreach ($language_domains as $lang_domain) {
     $template->assign_block_vars('domain', array(
       'NAME' => $lang_domain,
     ));

includes/vars.php

Indentation +4 added lines, -4 removed lines

@@ -1175,12 +1175,12 @@
     ],
     // Defensive building list
     'defense'            => [UNIT_DEF_TURRET_MISSILE   => UNIT_DEF_TURRET_MISSILE, UNIT_DEF_TURRET_LASER_SMALL => UNIT_DEF_TURRET_LASER_SMALL,
-                             UNIT_DEF_TURRET_LASER_BIG => UNIT_DEF_TURRET_LASER_BIG, UNIT_DEF_TURRET_GAUSS => UNIT_DEF_TURRET_GAUSS,
-                             UNIT_DEF_TURRET_ION       => UNIT_DEF_TURRET_ION, UNIT_DEF_TURRET_PLASMA => UNIT_DEF_TURRET_PLASMA,
+                              UNIT_DEF_TURRET_LASER_BIG => UNIT_DEF_TURRET_LASER_BIG, UNIT_DEF_TURRET_GAUSS => UNIT_DEF_TURRET_GAUSS,
+                              UNIT_DEF_TURRET_ION       => UNIT_DEF_TURRET_ION, UNIT_DEF_TURRET_PLASMA => UNIT_DEF_TURRET_PLASMA,
 
-                             UNIT_DEF_SHIELD_SMALL => UNIT_DEF_SHIELD_SMALL, UNIT_DEF_SHIELD_BIG => UNIT_DEF_SHIELD_BIG, UNIT_DEF_SHIELD_PLANET => UNIT_DEF_SHIELD_PLANET,
+                              UNIT_DEF_SHIELD_SMALL => UNIT_DEF_SHIELD_SMALL, UNIT_DEF_SHIELD_BIG => UNIT_DEF_SHIELD_BIG, UNIT_DEF_SHIELD_PLANET => UNIT_DEF_SHIELD_PLANET,
 
-                             UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,
+                              UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,
     ],
 
     // Missiles list

Spacing +29 added lines, -29 removed lines

@@ -595,29 +595,29 @@ 
         P_MISSION_EXPEDITION_OUTCOME           => FLT_EXPEDITION_OUTCOME_FOUND_FLEET,
         P_MISSION_EXPEDITION_OUTCOME_TYPE      => FLT_EXPEDITION_OUTCOME_TYPE_GOOD,
         P_CHANCE                               => 200,
-        'percent'                              => [0 => 0.1, 1 => 0.02, 2 => 0.01,],
+        'percent'                              => [0 => 0.1, 1 => 0.02, 2 => 0.01, ],
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
-          [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2,],
-          [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1,],
-          [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0,],
+          [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2, ],
+          [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1, ],
+          [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0, ],
         ],
       ],
       FLT_EXPEDITION_OUTCOME_FOUND_RESOURCES => [
         P_MISSION_EXPEDITION_OUTCOME           => FLT_EXPEDITION_OUTCOME_FOUND_RESOURCES,
         P_MISSION_EXPEDITION_OUTCOME_TYPE      => FLT_EXPEDITION_OUTCOME_TYPE_GOOD,
         P_CHANCE                               => 300,
-        'percent'                              => [0 => 0.1, 1 => 0.050, 2 => 0.025,],
+        'percent'                              => [0 => 0.1, 1 => 0.050, 2 => 0.025, ],
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
-          [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2,],
-          [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1,],
-          [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0,],
+          [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2, ],
+          [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1, ],
+          [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0, ],
         ],
       ],
       FLT_EXPEDITION_OUTCOME_FOUND_DM        => [
         P_MISSION_EXPEDITION_OUTCOME           => FLT_EXPEDITION_OUTCOME_FOUND_DM,
         P_MISSION_EXPEDITION_OUTCOME_TYPE      => FLT_EXPEDITION_OUTCOME_TYPE_GOOD,
         P_CHANCE                               => 100,
-        'percent'                              => [0 => 0.0100, 1 => 0.0040, 2 => 0.0010,],
+        'percent'                              => [0 => 0.0100, 1 => 0.0040, 2 => 0.0010, ],
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
           [P_CHANCE => 90, P_MULTIPLIER => 0.0010, /*P_MESSAGE_ID => 2,*/],
           [P_CHANCE => 9, P_MULTIPLIER => 0.0040, /*P_MESSAGE_ID => 1,*/],
@@ -652,14 +652,14 @@ 
     ],
 
     'planet_generator' => [
-      0  => [ // HomeWorld
+      0  => [// HomeWorld
         't_max_min'     => 40, // Tmax 40
         't_max_max'     => 40,
         't_delta_min'   => 40, // Tmin 0
         't_delta_max'   => 40,
         'size_min'      => $config->initial_fields,
         'size_max'      => $config->initial_fields,
-        'core_types'    => [PLANET_DENSITY_STANDARD,],
+        'core_types'    => [PLANET_DENSITY_STANDARD, ],
         'planet_images' => ['normaltemp'],
       ],
       1  => [
@@ -889,7 +889,7 @@ 
         ],
         'planet_images' => ['eis'],
       ],
-      16 => [ // Random planet - stranger; -35 avg
+      16 => [// Random planet - stranger; -35 avg
         't_max_min'     => -90,
         't_max_max'     => +40,
         't_delta_min'   => 2,
@@ -909,7 +909,7 @@ 
           PLANET_DENSITY_METAL_PERIDOT,
           PLANET_DENSITY_METAL_RAW,
         ],
-        'planet_images' => ['trocken', 'dschjungel', 'normaltemp', 'wasser', 'eis',],
+        'planet_images' => ['trocken', 'dschjungel', 'normaltemp', 'wasser', 'eis', ],
       ],
     ],
 
@@ -932,7 +932,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_ICE_HYDROGEN,
         UNIT_PLANET_DENSITY_RARITY        => 30, // 1, // 40.00, // * 1/121 0,82645
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES                    => [RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ],
@@ -941,7 +941,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_ICE_METHANE,
         UNIT_PLANET_DENSITY_RARITY        => 130, // 6, // 6.67, // * 6,0	4,95868
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES                    => [RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ],
@@ -950,7 +950,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_ICE_WATER,
         UNIT_PLANET_DENSITY_RARITY        => 450, //20, // 2.00, // * 20,0	16,52893
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES                    => [RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ],
@@ -960,7 +960,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_CRYSTAL_RAW,
         UNIT_PLANET_DENSITY_RARITY        => 20, // 1, // 40.00, // *1,0	0,82645
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES                    => [RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ],
@@ -969,7 +969,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_CRYSTAL_SILICATE,
         UNIT_PLANET_DENSITY_RARITY        => 140, // 5.71, // * 7,0	5,78512
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES                    => [RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ],
@@ -978,7 +978,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_CRYSTAL_STONE,
         UNIT_PLANET_DENSITY_RARITY        => 500, // 1.90, // * 21,0	17,35537
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES                    => [RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ],
@@ -988,7 +988,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_STANDARD,
         UNIT_PLANET_DENSITY_RARITY        => 1000, // 1.0, // * 40,0	33,05785
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_NORMAL,
-        UNIT_RESOURCES                    => [RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00,],
+        UNIT_RESOURCES                    => [RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ],
@@ -998,7 +998,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_METAL_ORE,
         UNIT_PLANET_DENSITY_RARITY        => 550, // 2.11, // * 19,0	15,70248
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES                    => [RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80,],
+        UNIT_RESOURCES                    => [RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ],
@@ -1007,7 +1007,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_METAL_PERIDOT,
         UNIT_PLANET_DENSITY_RARITY        => 120, // 8.00, // * 5,0	4,13223
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES                    => [RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55,],
+        UNIT_RESOURCES                    => [RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ],
@@ -1016,7 +1016,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_METAL_RAW,
         UNIT_PLANET_DENSITY_RARITY        => 25, // 40.00, // * 1,0	0,82645
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES                    => [RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25,],
+        UNIT_RESOURCES                    => [RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ],
@@ -1193,7 +1193,7 @@ 
     ],
 
     // Missiles list
-    'missile'            => [UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,],
+    'missile'            => [UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET, ],
 
     // Combat units list
     'combat'             => [
@@ -1242,7 +1242,7 @@ 
     // Resource list
     'resources'          => [0 => 'metal', 1 => 'crystal', 2 => 'deuterium', 3 => 'dark_matter'],
     // Resources all
-    'resources_all'      => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY, RES_DARK_MATTER => RES_DARK_MATTER, RES_METAMATTER => RES_METAMATTER,],
+    'resources_all'      => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY, RES_DARK_MATTER => RES_DARK_MATTER, RES_METAMATTER => RES_METAMATTER, ],
     // Resources can be produced on planet
     'resources_planet'   => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY],
     // Resources can be looted from planet
@@ -1261,13 +1261,13 @@ 
     ],
 
     // Resources that can be tradeable in market trader AND be a quest_rewards
-    'quest_rewards'      => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER,],
+    'quest_rewards'      => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER, ],
 
 //      // Ques list
 //      'ques' => array(QUE_STRUCTURES, QUE_HANGAR, QUE_RESEARCH),
 
-    'STAT_COMMON' => [STAT_TOTAL => STAT_TOTAL, STAT_FLEET => STAT_FLEET, STAT_TECH => STAT_TECH, STAT_BUILDING => STAT_BUILDING, STAT_DEFENSE => STAT_DEFENSE, STAT_RESOURCE => STAT_RESOURCE,],
-    'STAT_PLAYER' => [STAT_RAID_TOTAL => STAT_RAID_TOTAL, STAT_RAID_WON => STAT_RAID_WON, STAT_RAID_LOST => STAT_RAID_LOST, STAT_LVL_BUILDING => STAT_LVL_BUILDING, STAT_LVL_TECH => STAT_LVL_TECH, STAT_LVL_RAID => STAT_LVL_RAID,],
+    'STAT_COMMON' => [STAT_TOTAL => STAT_TOTAL, STAT_FLEET => STAT_FLEET, STAT_TECH => STAT_TECH, STAT_BUILDING => STAT_BUILDING, STAT_DEFENSE => STAT_DEFENSE, STAT_RESOURCE => STAT_RESOURCE, ],
+    'STAT_PLAYER' => [STAT_RAID_TOTAL => STAT_RAID_TOTAL, STAT_RAID_WON => STAT_RAID_WON, STAT_RAID_LOST => STAT_RAID_LOST, STAT_LVL_BUILDING => STAT_LVL_BUILDING, STAT_LVL_TECH => STAT_LVL_TECH, STAT_LVL_RAID => STAT_LVL_RAID, ],
 
     GROUP_GROUP_ID_TO_NAMES => [
       UNIT_STRUCTURES   => 'structures',
@@ -1281,7 +1281,7 @@ 
       UNIT_PLANS        => 'plans',
     ],
 
-    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet',],
+    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet', ],
 
     GROUP_UNIT_COMBAT_SORT_ORDER => [
       SHIP_SPY,

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 = SN::$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'] = avg($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);
@@ -142,29 +142,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'],