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 > 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
 
 }
 
@@ -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];
       }
     }

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/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 = '';
   }

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;

classes/classCache.php

Spacing +3 added lines, -3 removed lines

@@ -150,7 +150,7 @@ 
 
   public function unset_by_prefix($prefix_unset = '') {
     static $array_clear;
-    !$array_clear ? $array_clear = function (&$v, $k, $p) {
+    !$array_clear ? $array_clear = function(&$v, $k, $p) {
       strpos($k, $p) === 0 ? $v = null : false;
     } : false;
 
@@ -205,7 +205,7 @@ 
     if ($this->$name[0] === null) {
       for ($i = count($name) - 1; $i > 0; $i--) {
         $cName = "{$name[$i]}_COUNT";
-        $cName1 = "{$name[$i-1]}_COUNT";
+        $cName1 = "{$name[$i - 1]}_COUNT";
         if ($this->$cName1 == null || $i == 1) {
           $this->$cName++;
         }
@@ -251,7 +251,7 @@ 
     $count = count($name);
     for ($i = 1; $i < $count; $i++) {
       $cName = "{$name[$i]}_COUNT";
-      $cName1 = "{$name[$i-1]}_COUNT";
+      $cName1 = "{$name[$i - 1]}_COUNT";
 
       if ($i == 1 || $this->$cName1 === null) {
         $this->$cName--;

includes/includes/ube_report.php

Spacing +47 added lines, -47 removed lines

@@ -109,33 +109,33 @@ 
       `ube_report_time_combat` = '" . date(FMT_DATE_TIME_SQL, $combat_data[UBE_TIME]) . "',
       `ube_report_time_spent` = {$combat_data[UBE_TIME_SPENT]},
 
-      `ube_report_combat_admin` = " . (int)$combat_data[UBE_OPTIONS][UBE_COMBAT_ADMIN] . ",
+      `ube_report_combat_admin` = " . (int) $combat_data[UBE_OPTIONS][UBE_COMBAT_ADMIN] . ",
       `ube_report_mission_type` = {$combat_data[UBE_OPTIONS][UBE_MISSION_TYPE]},
 
       `ube_report_combat_result` = {$outcome[UBE_COMBAT_RESULT]},
-      `ube_report_combat_sfr` = " . (int)$outcome[UBE_SFR] . ",
+      `ube_report_combat_sfr` = " . (int) $outcome[UBE_SFR] . ",
 
-      `ube_report_debris_metal` = " . (float)$outcome[UBE_DEBRIS][RES_METAL] . ",
-      `ube_report_debris_crystal` = " . (float)$outcome[UBE_DEBRIS][RES_CRYSTAL] . ",
+      `ube_report_debris_metal` = " . (float) $outcome[UBE_DEBRIS][RES_METAL] . ",
+      `ube_report_debris_crystal` = " . (float) $outcome[UBE_DEBRIS][RES_CRYSTAL] . ",
       `ube_report_debris_total_in_metal` = " . $ube_report_debris_total_in_metal . ",
 
-      `ube_report_planet_id`          = " . (int)$outcome[UBE_PLANET][PLANET_ID] . ",
+      `ube_report_planet_id`          = " . (int) $outcome[UBE_PLANET][PLANET_ID] . ",
       `ube_report_planet_name`        = '" . db_escape($outcome[UBE_PLANET][PLANET_NAME]) . "',
-      `ube_report_planet_size`        = " . (int)$outcome[UBE_PLANET][PLANET_SIZE] . ",
-      `ube_report_planet_galaxy`      = " . (int)$outcome[UBE_PLANET][PLANET_GALAXY] . ",
-      `ube_report_planet_system`      = " . (int)$outcome[UBE_PLANET][PLANET_SYSTEM] . ",
-      `ube_report_planet_planet`      = " . (int)$outcome[UBE_PLANET][PLANET_PLANET] . ",
-      `ube_report_planet_planet_type` = " . (int)$outcome[UBE_PLANET][PLANET_TYPE] . ",
+      `ube_report_planet_size`        = " . (int) $outcome[UBE_PLANET][PLANET_SIZE] . ",
+      `ube_report_planet_galaxy`      = " . (int) $outcome[UBE_PLANET][PLANET_GALAXY] . ",
+      `ube_report_planet_system`      = " . (int) $outcome[UBE_PLANET][PLANET_SYSTEM] . ",
+      `ube_report_planet_planet`      = " . (int) $outcome[UBE_PLANET][PLANET_PLANET] . ",
+      `ube_report_planet_planet_type` = " . (int) $outcome[UBE_PLANET][PLANET_TYPE] . ",
 
-      `ube_report_moon` = " . (int)$outcome[UBE_MOON] . ",
-      `ube_report_moon_chance` = " . (int)$outcome[UBE_MOON_CHANCE] . ",
-      `ube_report_moon_size` = " . (float)$outcome[UBE_MOON_SIZE] . ",
+      `ube_report_moon` = " . (int) $outcome[UBE_MOON] . ",
+      `ube_report_moon_chance` = " . (int) $outcome[UBE_MOON_CHANCE] . ",
+      `ube_report_moon_size` = " . (float) $outcome[UBE_MOON_SIZE] . ",
 
-      `ube_report_moon_reapers` = " . (int)$outcome[UBE_MOON_REAPERS] . ",
-      `ube_report_moon_destroy_chance` = " . (int)$outcome[UBE_MOON_DESTROY_CHANCE] . ",
-      `ube_report_moon_reapers_die_chance` = " . (int)$outcome[UBE_MOON_REAPERS_DIE_CHANCE] . ",
+      `ube_report_moon_reapers` = " . (int) $outcome[UBE_MOON_REAPERS] . ",
+      `ube_report_moon_destroy_chance` = " . (int) $outcome[UBE_MOON_DESTROY_CHANCE] . ",
+      `ube_report_moon_reapers_die_chance` = " . (int) $outcome[UBE_MOON_REAPERS_DIE_CHANCE] . ",
 
-      `ube_report_capture_result` = " . (int)$outcome[UBE_CAPTURE_RESULT] . "
+      `ube_report_capture_result` = " . (int) $outcome[UBE_CAPTURE_RESULT] . "
   ");
   $ube_report_id = $combat_data[UBE_REPORT_ID] = db_insert_id();
 
@@ -146,11 +146,11 @@ 
       $player_id,
 
       "'" . db_escape($player_info[UBE_NAME]) . "'",
-      (int)$player_info[UBE_ATTACKER],
+      (int) $player_info[UBE_ATTACKER],
 
-      (float)$player_info[UBE_BONUSES][UBE_ATTACK],
-      (float)$player_info[UBE_BONUSES][UBE_SHIELD],
-      (float)$player_info[UBE_BONUSES][UBE_ARMOR],
+      (float) $player_info[UBE_BONUSES][UBE_ATTACK],
+      (float) $player_info[UBE_BONUSES][UBE_SHIELD],
+      (float) $player_info[UBE_BONUSES][UBE_ARMOR],
     );
   }
 
@@ -163,20 +163,20 @@ 
       $fleet_info[UBE_OWNER],
       $fleet_id,
 
-      (float)$fleet_info[UBE_PLANET][PLANET_ID],
+      (float) $fleet_info[UBE_PLANET][PLANET_ID],
       "'" . db_escape($fleet_info[UBE_PLANET][PLANET_NAME]) . "'",
-      (int)$fleet_info[UBE_PLANET][PLANET_GALAXY],
-      (int)$fleet_info[UBE_PLANET][PLANET_SYSTEM],
-      (int)$fleet_info[UBE_PLANET][PLANET_PLANET],
-      (int)$fleet_info[UBE_PLANET][PLANET_TYPE],
-
-      (float)$fleet_info[UBE_RESOURCES][RES_METAL],
-      (float)$fleet_info[UBE_RESOURCES][RES_CRYSTAL],
-      (float)$fleet_info[UBE_RESOURCES][RES_DEUTERIUM],
-
-      (float)$fleet_info[UBE_BONUSES][UBE_ATTACK],
-      (float)$fleet_info[UBE_BONUSES][UBE_SHIELD],
-      (float)$fleet_info[UBE_BONUSES][UBE_ARMOR],
+      (int) $fleet_info[UBE_PLANET][PLANET_GALAXY],
+      (int) $fleet_info[UBE_PLANET][PLANET_SYSTEM],
+      (int) $fleet_info[UBE_PLANET][PLANET_PLANET],
+      (int) $fleet_info[UBE_PLANET][PLANET_TYPE],
+
+      (float) $fleet_info[UBE_RESOURCES][RES_METAL],
+      (float) $fleet_info[UBE_RESOURCES][RES_CRYSTAL],
+      (float) $fleet_info[UBE_RESOURCES][RES_DEUTERIUM],
+
+      (float) $fleet_info[UBE_BONUSES][UBE_ATTACK],
+      (float) $fleet_info[UBE_BONUSES][UBE_SHIELD],
+      (float) $fleet_info[UBE_BONUSES][UBE_ARMOR],
     );
 
     // Сохраняем итоговую информацию по ресурсам флота - потеряно, выброшено, увезено
@@ -185,19 +185,19 @@ 
       $ube_report_id,
       $fleet_id,
 
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOST][RES_METAL],
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOST][RES_CRYSTAL],
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOST][RES_DEUTERIUM],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOST][RES_METAL],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOST][RES_CRYSTAL],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOST][RES_DEUTERIUM],
 
-      (float)$fleet_outcome_data[UBE_CARGO_DROPPED][RES_METAL],
-      (float)$fleet_outcome_data[UBE_CARGO_DROPPED][RES_CRYSTAL],
-      (float)$fleet_outcome_data[UBE_CARGO_DROPPED][RES_DEUTERIUM],
+      (float) $fleet_outcome_data[UBE_CARGO_DROPPED][RES_METAL],
+      (float) $fleet_outcome_data[UBE_CARGO_DROPPED][RES_CRYSTAL],
+      (float) $fleet_outcome_data[UBE_CARGO_DROPPED][RES_DEUTERIUM],
 
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_METAL],
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_CRYSTAL],
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_DEUTERIUM],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_METAL],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_CRYSTAL],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_DEUTERIUM],
 
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOST_IN_METAL][RES_METAL],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOST_IN_METAL][RES_METAL],
     );
 
     // Сохраняем результаты по юнитам - потеряно и восстановлено
@@ -209,8 +209,8 @@ 
           $fleet_id,
 
           $unit_id,
-          (float)$fleet_outcome_data[UBE_DEFENCE_RESTORE][$unit_id],
-          (float)$fleet_outcome_data[UBE_UNITS_LOST][$unit_id],
+          (float) $fleet_outcome_data[UBE_DEFENCE_RESTORE][$unit_id],
+          (float) $fleet_outcome_data[UBE_UNITS_LOST][$unit_id],
 
           $unit_sort_order,
         );
@@ -233,7 +233,7 @@ 
 
           $unit_id,
           $unit_count,
-          (int)$fleet_data[UBE_UNITS_BOOM][$unit_id],
+          (int) $fleet_data[UBE_UNITS_BOOM][$unit_id],
 
           $fleet_data[UBE_ATTACK][$unit_id],
           $fleet_data[UBE_SHIELD][$unit_id],

resources.php

Braces +1 added lines, -2 removed lines

@@ -30,8 +30,7 @@
  * @param $resource_id
  * @param ResourceCalculations $capsObj
  */
-function int_calc_storage_bar($resource_id, $capsObj)
-{
+function int_calc_storage_bar($resource_id, $capsObj) {
   global $lang, $template, $planetrow, $user;
 
   $totalProduction      = $capsObj->getProduction($resource_id);

Indentation +7 added lines, -7 removed lines

@@ -96,9 +96,9 @@ 
 
 for ($Option = 10; $Option >= 0; $Option--)
 {
- $template->assign_block_vars('option', array(
-   'VALUE' => $Option * 10,
- ));
+  $template->assign_block_vars('option', array(
+    'VALUE' => $Option * 10,
+  ));
 }
 
 $capsObj = new ResourceCalculations();
@@ -165,12 +165,12 @@ 
 int_calc_storage_bar(RES_DEUTERIUM, $capsObj);
 
 $template->assign_vars(array(
- 'PLANET_NAME'          => $planetrow['name'],
- 'PLANET_TYPE'          => $planetrow['planet_type'],
+  'PLANET_NAME'          => $planetrow['name'],
+  'PLANET_TYPE'          => $planetrow['planet_type'],
 
- 'PRODUCTION_LEVEL'     => floor($capsObj->efficiency * 100),
+  'PRODUCTION_LEVEL'     => floor($capsObj->efficiency * 100),
 
- 'PAGE_HINT'            => $lang['res_hint'],
+  'PAGE_HINT'            => $lang['res_hint'],
 ));
 
 display($template, $lang['res_planet_production']);

Spacing +9 added lines, -9 removed lines

@@ -50,11 +50,11 @@ 
   ]);
 };
 
-$ValidList['percent'] = array (  0,  10,  20,  30,  40,  50,  60,  70,  80,  90, 100 );
+$ValidList['percent'] = array(0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100);
 $template = gettemplate('resources', true);
 
 $planet = new \Planet\Planet($planetrow['id']);
-if(!empty($transmutation_result = $planet->sn_sys_planet_core_transmute($user))) {
+if (!empty($transmutation_result = $planet->sn_sys_planet_core_transmute($user))) {
   $template->assign_block_vars('result', $transmutation_result);
   $planet = new \Planet\Planet($planetrow['id']);
 }
@@ -63,20 +63,20 @@ 
 $production = $_POST['production'];
 //$SubQry     = '';
 $SubQry     = array();
-if(is_array($production)) {
-  foreach($production as $prod_id => $percent) {
-    if($percent > 100 || $percent < 0) {
+if (is_array($production)) {
+  foreach ($production as $prod_id => $percent) {
+    if ($percent > 100 || $percent < 0) {
       $debug->warning('Supplying wrong production percent (less then 0 or greater then 100)', 'Hack attempt', 302, array('base_dump' => true));
       die();
     }
 
     $prod_id = intval($prod_id);
-    if(in_array($prod_id, $sn_group_factories) && get_unit_param($prod_id, P_MINING_IS_MANAGED)) {
+    if (in_array($prod_id, $sn_group_factories) && get_unit_param($prod_id, P_MINING_IS_MANAGED)) {
       $field_name              = pname_factory_production_field_name($prod_id);
       $percent                 = floor($percent / 10);
       $planetrow[$field_name]  = $percent;
       //$SubQry                 .= "`{$field_name}` = '{$percent}',";
-      $SubQry[]                 = "`{$field_name}` = '{$percent}'";
+      $SubQry[] = "`{$field_name}` = '{$percent}'";
     } else {
       $debug->warning('Supplying wrong ID in production array - attempt to change some field - ID' . $prod_id, 'Resource Page', 301);
       continue;
@@ -113,9 +113,9 @@ 
   'ENERGY_TYPE'    => $capsObj->productionCurrentMatrix[RES_ENERGY][0],
 ));
 
-foreach($sn_group_factories as $unit_id)
+foreach ($sn_group_factories as $unit_id)
 {
-  if(mrc_get_level($user, $planetrow, $unit_id) > 0 && get_unit_param($unit_id))
+  if (mrc_get_level($user, $planetrow, $unit_id) > 0 && get_unit_param($unit_id))
   {
     $level_plain = mrc_get_level($user, $planetrow, $unit_id, false, true);
     $template->assign_block_vars('production', array(

classes/Fleet/MissionEspionage.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
       $this->target_message = "{$lang['sys_mess_spy_enemy_fleet']} {$this->src_planet['name']} " . uni_render_coordinates_href($this->src_planet, '', 3);
       $this->target_message .= " {$lang['sys_mess_spy_seen_at']} {$this->dst_planet['name']} " . uni_render_coordinates($this->dst_planet);
-      if($this->missionReport->isSpyDetected()) {
+      if ($this->missionReport->isSpyDetected()) {
         $this->target_message .= "<br />{$lang['sys_mess_spy_destroyed_enemy']}";
       }