supernova-ws / SuperNova

includes/alliance/ali_external_create_ally.inc

Spacing +4 added lines, -4 removed lines

@@ -2,7 +2,7 @@ 
 // Pretty Safe
 // TODO: Add ally_tag to usertable
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -12,15 +12,15 @@ 
 $ally_name_raw = sys_get_param_str_unsafe('name');
 $ally_name     = db_escape($ally_name_raw);
 
-if($ally_tag)
+if ($ally_tag)
 {
-  if(!$ally_name_raw || !$ally_tag_raw)
+  if (!$ally_name_raw || !$ally_tag_raw)
   {
     messageBox($lang['have_not_name'], $lang['make_alliance']);
   }
 
   $query = doquery("SELECT ally_tag FROM {{alliance}} WHERE `ally_tag` = '{$ally_tag}' or `ally_name` = '{$ally_name}' LIMIT 1;", true);
-  if($query)
+  if ($query)
   {
     messageBox(str_replace('%s', $query['ally_tag'] == $ally_tag_raw ? $ally_tag_raw : $ally_name_raw, $lang['always_exist']), $lang['make_alliance']);
   }

_error-404.php

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

@@ -4,6 +4,6 @@
 
 // header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
 // @header("{$serverProtocol} 200 OK");
-echo "File {$redirectFrom} not found on server. Contact administration if you think that this is error";
+echo "file {$redirectFrom} not found on server. Contact administration if you think that this is error";
 die();
 ?> */

phalanx.php

Spacing +8 added lines, -8 removed lines

@@ -18,17 +18,17 @@ 
 
 $sensorLevel = mrc_get_level($user, $planetrow, STRUC_MOON_PHALANX);
 if (!intval($sensorLevel)) {
-  messageBox ($lang['phalanx_nosensoravailable'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  messageBox($lang['phalanx_nosensoravailable'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 if ($planetrow['planet_type'] != PT_MOON) {
-  messageBox ($lang['phalanx_onlyformoons'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  messageBox($lang['phalanx_onlyformoons'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 $scan_galaxy  = sys_get_param_int('galaxy');
 $scan_system  = sys_get_param_int('system');
 $scan_planet  = sys_get_param_int('planet');
-$scan_planet_type  = 1; // sys_get_param_int('planettype');
+$scan_planet_type = 1; // sys_get_param_int('planettype');
 $id = sys_get_param_id('id');
 
 $source_galaxy = $planetrow['galaxy'];
@@ -38,9 +38,9 @@ 
 $sensorRange = GetPhalanxRange($sensorLevel);
 
 $system_distance = abs($source_system - $scan_system);
-if($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
+if ($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
 {
-  messageBox ($lang['phalanx_rangeerror'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  messageBox($lang['phalanx_rangeerror'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 $cost = $sensorLevel * 1000;
@@ -51,14 +51,14 @@ 
 }
 
 $planet_scanned = DBStaticPlanet::db_planet_by_gspt($scan_galaxy, $scan_system, $scan_planet, $scan_planet_type);
-if(!$planet_scanned['id'])
+if (!$planet_scanned['id'])
 {
   messageBox($lang['phalanx_planet_not_exists'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
-if($planet_scanned['destruyed'])
+if ($planet_scanned['destruyed'])
 {
-  messageBox ($lang['phalanx_planet_destroyed'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  messageBox($lang['phalanx_planet_destroyed'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 DBStaticPlanet::db_planet_set_by_id($user['current_planet'], "deuterium = deuterium - {$cost}");

admin/adm_planet_list.php

Spacing +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
@@ -11,7 +11,7 @@ 
 messageBoxAdminAccessDenied(AUTH_LEVEL_ADMINISTRATOR);
 
 $planet_active = sys_get_param_int('planet_active');
-if(!$planet_active) {
+if (!$planet_active) {
   $planet_type = sys_get_param_int('planet_type', 1);
   $planet_type = $planet_type == 3 ? 3 : 1;
 } else {
@@ -40,8 +40,7 @@ 
 
 $page_title = 
   $lang['adm_planet_list_title'] . ': ' . 
-  ($planet_active ? $lang['adm_planet_active'] :
-    ($planet_type ? ($planet_type == 3 ? $lang['sys_moons'] : $lang['sys_planets']) : '')
+  ($planet_active ? $lang['adm_planet_active'] : ($planet_type ? ($planet_type == 3 ? $lang['sys_moons'] : $lang['sys_planets']) : '')
   );
 $template->assign_vars(array(
   'PAGE_TITLE' => $page_title,

admin/statbuilder.php

Braces +1 added lines, -2 removed lines

@@ -37,8 +37,7 @@
   </script>';
 
   messageBoxAdmin("{$script}<img src=\"design/images/progressbar.gif\"><br>{$lang['sys_wait']}", $lang['adm_stat_title'], '', 0);
-}
-else
+} else
 {
   messageBoxAdmin($lang['adm_stat_already_started'], $lang['adm_stat_title'], 'admin/overview.php');
 }

Spacing +3 added lines, -3 removed lines

@@ -9,8 +9,8 @@ 
  * @copyright 2008 by Chlorel for XNova
  */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
 require_once('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
@@ -18,7 +18,7 @@ 
 
 messageBoxAdminAccessDenied(AUTH_LEVEL_ADMINISTRATOR);
 
-if(SN_TIME_NOW >= SN::$config->pass()->var_stat_update_admin_forced && SN_TIME_NOW >= SN::$config->pass()->var_stat_update_end)
+if (SN_TIME_NOW >= SN::$config->pass()->var_stat_update_admin_forced && SN_TIME_NOW >= SN::$config->pass()->var_stat_update_end)
 {
   SN::$config->pass()->var_stat_update_admin_forced = SN_TIME_NOW + 120;
 

classes/Core/Watchdog.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     $configValue = $forceLoad ? $this->config->db_loadItem($configName) : $this->config[$configName];
     $configType == WATCHDOG_TIME_SQL ? $configValue = strtotime($configValue, SN_TIME_NOW) : false;
 
-    if(SN_TIME_NOW - $configValue > $timeDiff) {
+    if (SN_TIME_NOW - $configValue > $timeDiff) {
       $callable();
     }
 

classes/classPersistent.php

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

@@ -91,7 +91,7 @@ 
     $this->db_saveItem(array_combine(array_keys($this->defaults), array_fill(0, count($this->defaults), null)));
   }
 
-  public function db_saveItem($item_list, $value = NULL) {
+  public function db_saveItem($item_list, $value = null) {
     if(empty($item_list)) {
       return;
     }
@@ -102,7 +102,7 @@ 
     $qry = array();
     foreach($item_list as $item_name => $item_value) {
       if($item_name) {
-        $item_value = db_escape($item_value === NULL ? $this->$item_name : $item_value);
+        $item_value = db_escape($item_value === null ? $this->$item_name : $item_value);
         $item_name = db_escape($item_name);
         $qry[] = "('{$item_name}', '{$item_value}')";
       }

Spacing +12 added lines, -12 removed lines

@@ -33,7 +33,7 @@ 
     $this->sql_index_field = "{$table_name}_name";
     $this->sql_value_field = "{$table_name}_value";
 
-    if(!$this->_DB_LOADED) {
+    if (!$this->_DB_LOADED) {
       $this->db_loadAll();
     }
   }
@@ -53,10 +53,10 @@ 
    */
   public function db_loadItem($index) {
     $result = null;
-    if($index) {
+    if ($index) {
       $index_safe = db_escape($index);
       $queryResult = doquery("SELECT `{$this->sql_value_field}` FROM `{{{$this->table_name}}}` WHERE `{$this->sql_index_field}` = '{$index_safe}' FOR UPDATE", true);
-      if(is_array($queryResult) && !empty($queryResult)) {
+      if (is_array($queryResult) && !empty($queryResult)) {
         $this->$index = $result = $queryResult[$this->sql_value_field];
       }
     }
@@ -68,7 +68,7 @@ 
     $this->loadDefaults();
 
     $query = doquery("SELECT * FROM {{{$this->table_name}}} FOR UPDATE;");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $this->$row[$this->sql_index_field] = $row[$this->sql_value_field];
     }
 
@@ -76,7 +76,7 @@ 
   }
 
   public function loadDefaults() {
-    foreach($this->defaults as $defName => $defValue) {
+    foreach ($this->defaults as $defName => $defValue) {
       $this->$defName = $defValue;
     }
   }
@@ -92,7 +92,7 @@ 
   }
 
   public function db_saveItem($item_list, $value = NULL) {
-    if(empty($item_list)) {
+    if (empty($item_list)) {
       return;
     }
 
@@ -100,8 +100,8 @@ 
 
     // Сначала записываем данные в базу - что бы поймать все блокировки
     $qry = array();
-    foreach($item_list as $item_name => $item_value) {
-      if($item_name) {
+    foreach ($item_list as $item_name => $item_value) {
+      if ($item_name) {
         $item_value = db_escape($item_value === NULL ? $this->$item_name : $item_value);
         $item_name = db_escape($item_name);
         $qry[] = "('{$item_name}', '{$item_value}')";
@@ -110,8 +110,8 @@ 
     doquery("REPLACE INTO `{{" . $this->table_name . "}}` (`{$this->sql_index_field}`, `{$this->sql_value_field}`) VALUES " . implode(',', $qry) . ";");
 
     // И только после взятия блокировок - меняем значения в кэше
-    foreach($item_list as $item_name => $item_value) {
-      if($item_name && $item_value !== null) {
+    foreach ($item_list as $item_name => $item_value) {
+      if ($item_name && $item_value !== null) {
         $this->__set($item_name, $item_value);
       }
     }
@@ -126,7 +126,7 @@ 
   }
 
   public function __get($name) {
-    if($this->force) {
+    if ($this->force) {
       $this->force = false;
       $this->db_loadItem($name);
     }
@@ -135,7 +135,7 @@ 
   }
 
   public function __set($name, $value) {
-    if($this->force) {
+    if ($this->force) {
       $this->force = false;
       $this->db_saveItem($name, $value);
     }

includes/alliance/ali_internal_admin_rights.inc

Spacing +8 added lines, -8 removed lines

@@ -2,7 +2,7 @@ 
 
 global $lang, $debug;
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -15,7 +15,7 @@ 
 
 if ($new_rank_name = sys_get_param_str('newRankName'))
 {
-  foreach($ally_rights as $fieldName)
+  foreach ($ally_rights as $fieldName)
   {
     $newRank[$fieldName] = 0;
   }
@@ -28,9 +28,9 @@ 
 {
   unset($ranks);
 
-  foreach($rankListInput as $rankID => $rank)
+  foreach ($rankListInput as $rankID => $rank)
   {
-    foreach($ally_rights as $rightName)
+    foreach ($ally_rights as $rightName)
     {
       $ranks[$rankID][$rightName] = $rank[$rightName] ? 1 : 0;
     }
@@ -41,7 +41,7 @@ 
 $d = sys_get_param_int('d');
 if ($d && isset($ranks[$d]))
 {
-  if(count($ranks) == 1)
+  if (count($ranks) == 1)
   {
     messageBox($lang['ali_adm_lastRank'], $lang['ali_adm_rights_title']);
   }
@@ -53,16 +53,16 @@ 
 
 if (count($ranks))
 {
-  foreach($ranks as $rankID => $rank)
+  foreach ($ranks as $rankID => $rank)
   {
     $rank_data = array(
       'ID'   => $rankID,
       'NAME' => $rank['name'],
     );
 
-    for($i = 1; $i < count($rank); $i++)
+    for ($i = 1; $i < count($rank); $i++)
     {
-      $rank_data['R' . $i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '') ;
+      $rank_data['R' . $i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '');
       $rank_data['N' . $i] = $ally_rights[$i];
     }
 

includes/functions/_deprecated.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  * @return mixed
  * @deprecated
  */
-function RestoreFleetToPlanet(&$fleet_row, $start = true, $only_resources = false, $safe_fleet = false){return sn_function_call('RestoreFleetToPlanet', array(&$fleet_row, $start, $only_resources, $safe_fleet, &$result));}
+function RestoreFleetToPlanet(&$fleet_row, $start = true, $only_resources = false, $safe_fleet = false) {return sn_function_call('RestoreFleetToPlanet', array(&$fleet_row, $start, $only_resources, $safe_fleet, &$result)); }
 /**
  * @param array $fleet_row
  * @param bool  $start