supernova-ws / SuperNova

includes/db.php

Spacing +6 added lines, -6 removed lines

@@ -5,7 +5,7 @@ 
  * @copyright 2008-2015 Gorlum for Project "SuperNova.WS"
  */
 
-if(!defined('INSIDE')) {
+if (!defined('INSIDE')) {
   die();
 }
 
@@ -13,7 +13,7 @@ 
 
 function db_change_units_perform($query, $tablename, $object_id) {
   $query = implode(',', $query);
-  if($query && $object_id) {
+  if ($query && $object_id) {
     return classSupernova::db_upd_record_by_id($tablename == 'users' ? LOC_USER : LOC_PLANET, $object_id, $query);
   }
 }
@@ -29,15 +29,15 @@ 
 
   $group = sn_get_groups('resources_loot');
 
-  foreach($unit_list as $unit_id => $unit_amount) {
-    if(!in_array($unit_id, $group)) {
+  foreach ($unit_list as $unit_id => $unit_amount) {
+    if (!in_array($unit_id, $group)) {
       // TODO - remove later
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: db_change_units() вызван для не-ресурсов!</h1>');
       pdump(debug_backtrace());
       die('db_change_units() вызван для не-ресурсов!');
     }
 
-    if(!$unit_amount) {
+    if (!$unit_amount) {
       continue;
     }
 
@@ -46,7 +46,7 @@ 
     $unit_location = sys_get_unit_location($user, $planet, $unit_id);
 
     // Changing value in object
-    switch($unit_location) {
+    switch ($unit_location) {
       case LOC_USER:
         $user[$unit_db_name] += $unit_amount;
         break;

includes/alliance/ali_internal_admin_mail.inc

Spacing +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@ 
 
 global $lang;
 
-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);
 }
@@ -20,7 +20,7 @@ 
 $page = gettemplate('ali_admin_mail', true);
 
 if ($ranks) {
-  foreach($ranks as $id => $array) {
+  foreach ($ranks as $id => $array) {
     $page->assign_block_vars('ranks', array(
       'NAME' => $array['name'],
       'VALUE' => $id,

includes/includes/upd_helpers.php

Spacing +38 added lines, -38 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('IN_UPDATE')) {
+if (!defined('IN_UPDATE')) {
   die('Trying to call update helpers externally!');
 }
 
@@ -8,12 +8,12 @@ 
   global $update_tables;
 
   upd_add_more_time();
-  if(!$no_log) {
+  if (!$no_log) {
     upd_log_message("Performing query '{$query}'");
   }
 
-  if(strpos($query, '{{') !== false) {
-    foreach($update_tables as $tableName => $cork) {
+  if (strpos($query, '{{') !== false) {
+    foreach ($update_tables as $tableName => $cork) {
       $query = str_replace("{{{$tableName}}}", classSupernova::$db->db_prefix . $tableName, $query);
     }
   }
@@ -25,9 +25,9 @@ 
   global $config, $sys_log_disabled;
 
   $config->db_loadItem($key);
-  if($condition || !isset($config->$key)) {
+  if ($condition || !isset($config->$key)) {
     upd_add_more_time();
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       upd_log_message("Updating config key '{$key}' with value '{$default_value}'");
     }
     $config->db_saveItem($key, $default_value);
@@ -55,7 +55,7 @@ 
 function upd_log_message($message) {
   global $sys_log_disabled, $upd_log, $debug;
 
-  if($sys_log_disabled)
+  if ($sys_log_disabled)
   {
 //    print("{$message}<br />");
   } else {
@@ -67,15 +67,15 @@ 
 function upd_unset_table_info($table_name) {
   global $update_tables, $update_indexes, $update_foreigns;
 
-  if(isset($update_tables[$table_name])) {
+  if (isset($update_tables[$table_name])) {
     unset($update_tables[$table_name]);
   }
 
-  if(isset($update_indexes[$table_name])) {
+  if (isset($update_indexes[$table_name])) {
     unset($update_indexes[$table_name]);
   }
 
-  if(isset($update_foreigns[$table_name])) {
+  if (isset($update_foreigns[$table_name])) {
     unset($update_foreigns[$table_name]);
   }
 }
@@ -89,18 +89,18 @@ 
   upd_unset_table_info($tableName);
 
   $q1 = upd_do_query("SHOW FULL COLUMNS FROM {$prefix_table_name};", true);
-  while($r1 = db_fetch($q1)) {
+  while ($r1 = db_fetch($q1)) {
     $update_tables[$tableName][$r1['Field']] = $r1;
   }
 
   $q1 = upd_do_query("SHOW INDEX FROM {$prefix_table_name};", true);
-  while($r1 = db_fetch($q1)) {
+  while ($r1 = db_fetch($q1)) {
     $update_indexes[$tableName][$r1['Key_name']] .= "{$r1['Column_name']},";
     $update_indexes_full[$tableName][$r1['Key_name']][$r1['Column_name']] = $r1;
   }
 
-  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name). "' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true);
-  while($r1 = db_fetch($q1)) {
+  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name) . "' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true);
+  while ($r1 = db_fetch($q1)) {
     $table_referenced = str_replace($config->db_prefix, '', $r1['REFERENCED_TABLE_NAME']);
 
     $update_foreigns[$tableName][$r1['CONSTRAINT_NAME']] .= "{$r1['COLUMN_NAME']},{$table_referenced},{$r1['REFERENCED_COLUMN_NAME']};";
@@ -110,7 +110,7 @@ 
 function upd_alter_table($table, $alters, $condition = true) {
   global $config, $update_tables;
 
-  if(!$condition) {
+  if (!$condition) {
     return;
   }
 
@@ -118,7 +118,7 @@ 
   $alters_print = is_array($alters) ? dump($alters) : $alters;
   upd_log_message("Altering table '{$table}' with alterations {$alters_print}");
 
-  if(!is_array($alters)) {
+  if (!is_array($alters)) {
     $alters = array($alters);
   }
 
@@ -128,7 +128,7 @@ 
 
   $result = upd_do_query($qry);
   $error = db_error();
-  if($error) {
+  if ($error) {
     die("Altering error for table `{$table}`: {$error}<br />{$alters_print}");
   }
 
@@ -155,19 +155,19 @@ 
 function upd_create_table($table_name, $declaration, $tableOptions = '') {
   global $config, $update_tables;
 
-  if(!$update_tables[$table_name]) {
+  if (!$update_tables[$table_name]) {
     upd_do_query('set foreign_key_checks = 0;', true);
     $declaration = trim($declaration);
-    if(substr($declaration, 0, 1) != '(') {
+    if (substr($declaration, 0, 1) != '(') {
       $declaration = "($declaration)";
     }
     $tableOptions = trim($tableOptions);
-    if(!empty($tableOptions)) {
+    if (!empty($tableOptions)) {
       $declaration .= $tableOptions;
     }
     $result = upd_do_query("CREATE TABLE IF NOT EXISTS `{$config->db_prefix}{$table_name}` {$declaration}");
     $error = db_error();
-    if($error) {
+    if ($error) {
       die("Creating error for table `{$table_name}`: {$error}<br />" . dump($declaration));
     }
     upd_do_query('set foreign_key_checks = 1;', true);
@@ -193,14 +193,14 @@ 
 
 
 function upd_db_unit_changeset_prepare($unit_id, $unit_value, $user, $planet_id = null) {
-  if(!is_array($user)) {
+  if (!is_array($user)) {
     // TODO - remove later
     print('<h1>СООБЩИТЕ ЭТО АДМИНУ: upd_db_unit_changeset_prepare() - USER is not ARRAY</h1>');
     pdump(debug_backtrace());
     die('USER is not ARRAY');
   }
 
-  if(!isset($user['id']) || !$user['id']) {
+  if (!isset($user['id']) || !$user['id']) {
     // TODO - remove later
     print('<h1>СООБЩИТЕ ЭТО АДМИНУ: upd_db_unit_changeset_prepare() - USER[id] пустой</h1>');
     pdump($user);
@@ -215,7 +215,7 @@ 
 
   $db_changeset = array();
   $temp = upd_db_unit_by_location($user['id'], $unit_location, $location_id, $unit_id, true, 'unit_id');
-  if($temp['unit_id']) {
+  if ($temp['unit_id']) {
     // update
     $db_changeset = array(
       'action' => SQL_OP_UPDATE,
@@ -261,53 +261,53 @@ 
 
 
 function upd_db_changeset_apply($db_changeset) {
-  if(!is_array($db_changeset) || empty($db_changeset)) {
+  if (!is_array($db_changeset) || empty($db_changeset)) {
     return;
   }
 
-  foreach($db_changeset as $table_name => $table_data) {
-    foreach($table_data as $record_id => $conditions) {
+  foreach ($db_changeset as $table_name => $table_data) {
+    foreach ($table_data as $record_id => $conditions) {
       $where = '';
-      if(!empty($conditions['where'])) {
+      if (!empty($conditions['where'])) {
         $where = 'WHERE ' . implode(' AND ', $conditions['where']);
       }
 
       $fields = array();
-      if($conditions['fields']) {
-        foreach($conditions['fields'] as $field_name => $field_data) {
+      if ($conditions['fields']) {
+        foreach ($conditions['fields'] as $field_name => $field_data) {
           $condition = "`{$field_name}` = ";
           $value = '';
-          if($field_data['delta']) {
+          if ($field_data['delta']) {
             $value = "`{$field_name}`" . ($field_data['delta'] >= 0 ? '+' : '') . $field_data['delta'];
-          } elseif($field_data['set']) {
-            $value = (is_string($field_data['set']) ? "'{$field_data['set']}'": $field_data['set']);
+          } elseif ($field_data['set']) {
+            $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']);
           }
-          if($value) {
+          if ($value) {
             $fields[] = $condition . $value;
           }
         }
       }
       $fields = implode(',', $fields);
 
-      switch($conditions['action']) {
+      switch ($conditions['action']) {
         case SQL_OP_DELETE:
           upd_do_query("DELETE FROM {{{$table_name}}} {$where}");
           break;
 
         case SQL_OP_UPDATE:
-          if($fields) {
+          if ($fields) {
             upd_do_query("UPDATE {{{$table_name}}} SET {$fields} {$where}");
           }
           break;
 
         case SQL_OP_INSERT:
-          if($fields) {
+          if ($fields) {
             upd_do_query("INSERT INTO {{{$table_name}}} SET {$fields}");
           }
           break;
 
         case SQL_OP_REPLACE:
-          if($fields) {
+          if ($fields) {
             upd_do_query("REPLACE INTO {{{$table_name}}} SET {$fields}");
           }
           break;

jumpgate.php

Spacing +17 added lines, -17 removed lines

@@ -14,39 +14,39 @@ 
 
 lng_include('fleet');
 
-if($TargetPlanet = sys_get_param_id('jmpto'))
+if ($TargetPlanet = sys_get_param_id('jmpto'))
 {
   sn_db_transaction_start();
   db_user_by_id($user['id'], true, 'id');
   $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
-  if(!($NextJumpTime = uni_get_time_to_jump($planetrow)))
+  if (!($NextJumpTime = uni_get_time_to_jump($planetrow)))
   {
     $TargetGate = DBStaticPlanet::db_planet_by_id($TargetPlanet, true, '`id`, `last_jump_time`');
-    if(mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
+    if (mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
     {
-      $NextDestTime = uni_get_time_to_jump ( $TargetGate );
-      if(!$NextDestTime)
+      $NextDestTime = uni_get_time_to_jump($TargetGate);
+      if (!$NextDestTime)
       {
         // $SubQueryOri = "";
         // $SubQueryDes = "";
         $ship_list = sys_get_param('ships');
         $db_changeset = array();
-        foreach($ship_list as $ship_id => $ship_count)
+        foreach ($ship_list as $ship_id => $ship_count)
         {
-          if(!in_array($ship_id, sn_get_groups('fleet')))
+          if (!in_array($ship_id, sn_get_groups('fleet')))
           {
             continue;
           }
 
           $ship_count = max(0, min(floor($ship_count), mrc_get_level($user, $planetrow, $ship_id)));
-          if($ship_count)
+          if ($ship_count)
           {
             $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($ship_id, -$ship_count, $user, $planetrow['id']);
             $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($ship_id, $ship_count, $user, $TargetGate['id']);
           }
         }
         // Dit monsieur, y avait quelque chose a envoyer ???
-        if(!empty($db_changeset))
+        if (!empty($db_changeset))
         {
           DBStaticPlanet::db_planet_set_by_id($TargetGate['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
           DBStaticPlanet::db_planet_set_by_id($planetrow['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
@@ -55,31 +55,31 @@ 
           db_user_set_by_id($user['id'], "`current_planet` = '{$TargetGate['id']}'");
 
           $planetrow['last_jump_time'] = SN_TIME_NOW;
-          $RetMessage = $lang['gate_jump_done'] ." - ". pretty_time(uni_get_time_to_jump($planetrow));
+          $RetMessage = $lang['gate_jump_done'] . " - " . pretty_time(uni_get_time_to_jump($planetrow));
         } else {
           $RetMessage = $lang['gate_wait_data'];
         }
       } else {
-        $RetMessage = $lang['gate_wait_dest'] ." - ". pretty_time($NextDestTime);
+        $RetMessage = $lang['gate_wait_dest'] . " - " . pretty_time($NextDestTime);
       }
     } else {
       $RetMessage = $lang['gate_no_dest_g'];
     }
   } else {
-    $RetMessage = $lang['gate_wait_star'] ." - ". pretty_time($NextJumpTime);
+    $RetMessage = $lang['gate_wait_star'] . " - " . pretty_time($NextJumpTime);
   }
   sn_db_transaction_commit();
   messageBox($RetMessage, $lang['tech'][STRUC_MOON_GATE], "jumpgate.php", 10);
 } else {
   $template = gettemplate('jumpgate', true);
-  if(mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
+  if (mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
   {
     $Combo = '';
     $MoonList = DBStaticPlanet::db_planet_list_moon_other($user['id'], $planetrow['id']);
     // while($CurMoon = db_fetch($MoonList))
-    foreach($MoonList as $CurMoon)
+    foreach ($MoonList as $CurMoon)
     {
-      if(mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
+      if (mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
       {
         $NextJumpTime = uni_get_time_to_jump($CurMoon);
         $template->assign_block_vars('moon', array(
@@ -93,9 +93,9 @@ 
       }
     }
 
-    foreach(sn_get_groups('fleet') as $Ship)
+    foreach (sn_get_groups('fleet') as $Ship)
     {
-      if(($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
+      if (($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
       {
         continue;
       }

search.php

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(classSupernova::$config->game_mode == GAME_BLITZ) {
+if (classSupernova::$config->game_mode == GAME_BLITZ) {
   messageBox($lang['sys_blitz_page_disabled'], $lang['sys_error'], 'overview.php', 10);
   die();
 }
@@ -25,9 +25,9 @@ 
 
 $template = gettemplate('search', true);
 
-if($searchtext && $type)
+if ($searchtext && $type)
 {
-  switch($type)
+  switch ($type)
   {
     case "planetname":
       // $search = db_planet_list_search($searchtext);
@@ -43,9 +43,9 @@ 
     break;
   }
 
-  while($row = db_fetch($search))
+  while ($row = db_fetch($search))
   {
-    if($type=='playername' || $type=='planetname')
+    if ($type == 'playername' || $type == 'planetname')
     {
       $template->assign_block_vars('search_result', array(
         'PLAYER_ID' => $row['uid'],
@@ -62,7 +62,7 @@ 
         'ALLY_TAG' => htmlentities($row['ally_tag'], ENT_COMPAT, 'UTF-8'),
       ));
     }
-    elseif($type=='ally')
+    elseif ($type == 'ally')
     {
       $template->assign_block_vars('search_result', array(
         'ALLY_NAME' => htmlentities($row['ally_name'], ENT_COMPAT, 'UTF-8'),
@@ -81,7 +81,7 @@ 
   'ally' => 'sys_alliance',
 );
 
-foreach($search_type as $type_id => $type_lang)
+foreach ($search_type as $type_id => $type_lang)
 {
   $template->assign_block_vars('type', array(
     'ID' => $type_id,

flying_fleets.php

Spacing +6 added lines, -6 removed lines

@@ -2,9 +2,9 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(!empty($_POST['return']) && is_array($_POST['return'])) {
-  foreach($_POST['return'] as $fleet_id) {
-    if($fleet_id = idval($fleet_id)) {
+if (!empty($_POST['return']) && is_array($_POST['return'])) {
+  foreach ($_POST['return'] as $fleet_id) {
+    if ($fleet_id = idval($fleet_id)) {
       sn_db_transaction_start();
       $FleetRow = db_fleet_get($fleet_id);
 
@@ -23,7 +23,7 @@ 
 lng_include('overview');
 lng_include('fleet');
 
-if(!$planetrow) {
+if (!$planetrow) {
   messageBox($lang['fl_noplanetrow'], $lang['fl_error']);
 }
 
@@ -31,13 +31,13 @@ 
 
 $i = 0;
 $fleet_list = fleet_list_by_owner_id($user['id']);
-foreach($fleet_list as $fleet_id => $fleet_row) {
+foreach ($fleet_list as $fleet_id => $fleet_row) {
   $i++;
   $fleet_data = tpl_parse_fleet_db($fleet_row, $i, $user);
 
   $template->assign_block_vars('fleets', $fleet_data['fleet']);
 
-  foreach($fleet_data['ships'] as $ship_data) {
+  foreach ($fleet_data['ships'] as $ship_data) {
     $template->assign_block_vars('fleets.ships', $ship_data);
   }
 }

includes/alliance/ali_internal_admin.inc

Spacing +25 added lines, -25 removed lines

@@ -1,25 +1,25 @@ 
 <?php
 
-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);
 }
 
-if(!$user_admin) {
+if (!$user_admin) {
   messageBox($lang['Denied_access'], $lang['ally_admin']);
 }
 
 $template = gettemplate('ali_admin', $template);
 
 $text_list = array(
-  1 => array ('db_field' => 'ally_description', 'text_type' => 'Public_text_of_alliance'),
-  2 => array ('db_field' => 'ally_text', 'text_type' => 'Internal_text'),
-  3 => array ('db_field' => 'ally_request', 'text_type' => 'Show_of_request_text'),
+  1 => array('db_field' => 'ally_description', 'text_type' => 'Public_text_of_alliance'),
+  2 => array('db_field' => 'ally_text', 'text_type' => 'Internal_text'),
+  3 => array('db_field' => 'ally_request', 'text_type' => 'Show_of_request_text'),
 );
 
 $allyTextID = sys_get_param_int('t', 1);
-$allyTextID = ($allyTextID<1 || $allyTextID>3) ? 1 : $allyTextID;
+$allyTextID = ($allyTextID < 1 || $allyTextID > 3) ? 1 : $allyTextID;
 
-if(sys_get_param_str('isSaveOptions')) {
+if (sys_get_param_str('isSaveOptions')) {
   require_once('includes/includes/sys_avatar.php');
 
   $new_image = $ally['ally_image'];
@@ -31,32 +31,32 @@ 
 //  $template->assign_block_vars('result', $avatar_upload_result);
 
   $ally_changeset = array();
-  if(($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) && $new_tag != $ally['ally_tag']) {
+  if (($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) && $new_tag != $ally['ally_tag']) {
     $new_tag_unsafe = $new_tag;
     $new_tag = db_escape($new_tag);
     $isTaggedAllyExists = DBStaticAlly::db_ally_get_by_tag($new_tag);
-    if(!empty($isTaggedAllyExists)) {
+    if (!empty($isTaggedAllyExists)) {
       messageBox(sprintf($lang['ally_message_tag_exists'], $new_tag_unsafe), '', 'alliance.php?mode=admin&edit=ally');
     }
     $ally_changeset[] = "`ally_tag`='{$new_tag}'";
     db_user_set_by_id($ally['ally_user_id'], "`username`='[{$new_tag}]'");
   }
 
-  if(($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) && $new_name != $ally['ally_name']) {
+  if (($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) && $new_name != $ally['ally_name']) {
     $new_name_unsafe = $new_name;
     $new_name = db_escape($new_name);
     $isTaggedAllyExists = DBStaticAlly::db_ally_get_by_name($new_name);
-    if(!empty($isTaggedAllyExists)) {
+    if (!empty($isTaggedAllyExists)) {
       messageBox(sprintf($lang['ally_message_name_exists'], $new_name_unsafe), '', 'alliance.php?mode=admin&edit=ally');
     }
     $ally_changeset[] = "`ally_name`='{$new_name}'";
   }
 
-  if(($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) && $new_owner_rank != $ally['ally_owner_range']) {
+  if (($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) && $new_owner_rank != $ally['ally_owner_range']) {
     $new_owner_rank = db_escape($new_owner_rank);
     $ally_changeset[] = "`ally_owner_range` = '{$new_owner_rank}'";
   }
-  if(($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) && $new_web != $ally['ally_web']) {
+  if (($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) && $new_web != $ally['ally_web']) {
     $new_web = db_escape($new_web);
     $ally_changeset[] = "`ally_web` = '{$new_web}'";
   }
@@ -65,31 +65,31 @@ 
 //  if(($new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow'])) && $new_request != $ally['ally_request_notallow']) {
 //    $ally_changeset[] = "`ally_request_notallow` = '{$new_request}'";
 //  }
-  if($new_image != $ally['ally_image']) {
+  if ($new_image != $ally['ally_image']) {
     $new_image = intval($new_image);
     $ally_changeset[] = "`ally_image` = '{$new_image}'";
   }
 
-  if(!empty($ally_changeset)) {
+  if (!empty($ally_changeset)) {
     doquery("UPDATE {{alliance}} SET " . implode(',', $ally_changeset) . " WHERE `id`='{$ally['id']}' LIMIT 1;");
     sys_redirect('alliance.php?mode=admin&edit=ally');
   }
 }
-elseif(sys_get_param_str('isSaveText'))
+elseif (sys_get_param_str('isSaveText'))
 {
   $text = sys_get_param_str_both('text');
   doquery("UPDATE {{alliance}} SET `{$text_list[$allyTextID]['db_field']}`='{$text['safe']}' WHERE `id`='{$ally['id']}';");
   $ally[$text_list[$allyTextID]['db_field']] = $text['unsafe'];
 }
-elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader'))
+elseif (sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader'))
 {
-  if(!$isAllyOwner)
+  if (!$isAllyOwner)
   {
     messageBox($lang['Denied_access'], $lang['ally_admin']);
   }
 
   $newLeader = db_user_by_id($idNewLeader, false, `ally_id`);
-  if($newLeader['ally_id'] == $user['ally_id'])
+  if ($newLeader['ally_id'] == $user['ally_id'])
   {
     sn_db_transaction_start();
     db_user_set_by_id($user['id'], "`ally_rank_id`='0'");
@@ -99,9 +99,9 @@ 
     sys_redirect('alliance.php');
   }
 }
-elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband'))
+elseif (sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband'))
 {
-  if(!$isAllyOwner)
+  if (!$isAllyOwner)
   {
     messageBox($lang['Denied_access'], $lang['ally_admin']);
   }
@@ -124,7 +124,7 @@ 
   'ally_name' => htmlspecialchars($ally['ally_name']),
   'ally_tag' => htmlspecialchars($ally['ally_tag']),
   'ally_web' => htmlspecialchars($ally['ally_web']),
-  'ally_request_notallow_0' => (( $ally['ally_request_notallow']) ? ' SELECTED' : ''),
+  'ally_request_notallow_0' => (($ally['ally_request_notallow']) ? ' SELECTED' : ''),
   'ally_request_notallow_1' => ((!$ally['ally_request_notallow']) ? ' SELECTED' : ''),
   'ally_owner_range' => htmlspecialchars($ally['ally_owner_range']),
   'hideNotOwner' => $ally['ally_owner'] != $user['id'] ? 'display: hide;' : '',
@@ -133,7 +133,7 @@ 
 {
   $userAllyAdmins = db_user_list("`ally_id`= {$ally['id']}", false, '`id`, `username`');
   unset($tmp);
-  foreach($userAllyAdmins as $userAllyAdmin)
+  foreach ($userAllyAdmins as $userAllyAdmin)
   {
     $tmp .= "<option value={$userAllyAdmin['id']}>{$userAllyAdmin['username']}</option>";
   }
@@ -141,9 +141,9 @@ 
   $template->assign_var('adminMembers', $tmp);
 }
 
-foreach($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale)
+foreach ($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale)
 {
-  if(!$sn_ali_admin_action_locale['title'])
+  if (!$sn_ali_admin_action_locale['title'])
   {
     continue;
   }

includes/alliance/ali_info.inc

Spacing +13 added lines, -13 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 
-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);
 }
 
 $template = gettemplate('ali_info', true);
 
-if($mode == 'exit')
+if ($mode == 'exit')
 {
   if ($ally['ally_owner'] == $user['id'])
   {
@@ -24,25 +24,25 @@ 
     messageBox(sprintf($lang['ali_info_leave_success'], $ally['ally_name']), $lang['sys_alliance']);
   }
 }
-elseif($mode == 'ainfo')
+elseif ($mode == 'ainfo')
 {
   $tag = sys_get_param_str('tag');
   $id_ally = sys_get_param_id('a');
-  if($tag)
+  if ($tag)
   {
     $ally = doquery("SELECT * FROM {{alliance}} WHERE ally_tag='{$tag}' LIMIT 1;", '', true);
   }
-  elseif($id_ally)
+  elseif ($id_ally)
   {
     $ally = doquery("SELECT * FROM {{alliance}} WHERE id='{$id_ally}' LIMIT 1;", '', true);
   }
 
-  if(!$ally)
+  if (!$ally)
   {
     messageBox($lang['ali_sys_notFound'], $lang['Ally_info_1']);
   }
 
-  if(!$ally['ally_description'])
+  if (!$ally['ally_description'])
   {
     $ally['ally_description'] = $lang['Ally_nodescription'];
   }
@@ -51,17 +51,17 @@ 
     'EXTERNAL'     => true,
     'USER_ALLY_ID' => $user['ally_id'],
   ));
-  $page_header          = $lang['sys_alliance'];
+  $page_header = $lang['sys_alliance'];
 }
 else
 {
   $page_header = $lang['your_alliance'];
 
-  if($ally['ally_owner'] == $user['id'])
+  if ($ally['ally_owner'] == $user['id'])
   {
     $range = $ally['ally_owner_range'] ? $ally['ally_owner_range'] : $lang['Founder'];
   }
-  elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name']))
+  elseif ($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name']))
   {
     $range = $ranks[$user['ally_rank_id']]['name'];
   }
@@ -105,9 +105,9 @@ 
 ));
 
 $relations = ali_relations($ally['id']);
-foreach($relations as $relation)
+foreach ($relations as $relation)
 {
-  if($relation['alliance_diplomacy_contr_ally_id'] && $relation['alliance_diplomacy_ally_id'])
+  if ($relation['alliance_diplomacy_contr_ally_id'] && $relation['alliance_diplomacy_ally_id'])
   {
     $template->assign_block_vars('relation', array(
       'NAME'     => $relation['alliance_diplomacy_contr_ally_name'],
@@ -117,7 +117,7 @@ 
   }
 }
 
-function ali_render(){$func_args = func_get_args();return sn_function_call(__FUNCTION__, $func_args);}
+function ali_render() {$func_args = func_get_args(); return sn_function_call(__FUNCTION__, $func_args); }
 ali_render();
 
 display($template, "{$lang['alliance']} [{$ally['ally_name']}]");

includes/alliance/ali_external_request.inc

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-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);
 }
@@ -20,7 +20,7 @@ 
     sys_redirect('alliance.php');
   }
 
-  if($user_request['request_denied'])
+  if ($user_request['request_denied'])
   {
     $lang['request_text'] = sprintf($lang['ali_req_deny_msg'], $ally['ally_tag'], $user_request['request_text']);
   }
@@ -43,12 +43,12 @@ 
 
 $ally = doquery("SELECT * FROM {{alliance}} WHERE `id` ='{$id_ally}'", true);
 
-if(!$ally)
+if (!$ally)
 {
   messageBox($lang['ali_sys_notFound'], $lang['ali_req_title']);
 }
 
-if($ally['ally_request_notallow'])
+if ($ally['ally_request_notallow'])
 {
   messageBox($lang['ali_req_not_allowed'], $lang['ali_req_title']);
 }