supernova-ws / SuperNova

includes/includes/ube_attack_calculate.php

Braces +45 added lines, -70 removed lines

@@ -79,8 +79,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Заполняет данные по игроку
-function ube_attack_prepare_player(&$combat_data, $player_id, $is_attacker)
-{
+function ube_attack_prepare_player(&$combat_data, $player_id, $is_attacker) {
   global $ube_convert_techs;
 
   if(!isset($combat_data[UBE_PLAYERS][$player_id]))
@@ -99,8 +98,7 @@ 
     {
       $player_info[UBE_BONUSES][$ube_id] += mrc_get_level($player_data, false, $unit_id) * get_unit_param($unit_id, P_BONUS_VALUE) / 100 + $admiral_bonus;
     }
-  }
-  else
+  } else
   {
     $combat_data[UBE_PLAYERS][$player_id][UBE_ATTACKER] = $combat_data[UBE_PLAYERS][$player_id][UBE_ATTACKER] || $is_attacker;
   }
@@ -109,8 +107,7 @@ 
 // ------------------------------------------------------------------------------------------------
 // Заполняет данные по флоту
 function ube_attack_prepare_fleet(&$combat_data, &$fleet, $is_attacker){return sn_function_call('ube_attack_prepare_fleet', array(&$combat_data, &$fleet, $is_attacker));}
-function sn_ube_attack_prepare_fleet(&$combat_data, &$fleet, $is_attacker)
-{
+function sn_ube_attack_prepare_fleet(&$combat_data, &$fleet, $is_attacker) {
   $fleet_owner_id = $fleet['fleet_owner'];
   $fleet_id = $fleet['fleet_id'];
 
@@ -257,8 +254,7 @@ 
     foreach($acs_fleet_list as $fleet) {
       ube_attack_prepare_fleet($combat_data, $fleet, true);
     }
-  }
-  else
+  } else
   {
     ube_attack_prepare_fleet($combat_data, $fleet_row, true);
   }
@@ -273,8 +269,7 @@ 
 }
 
 // ------------------------------------------------------------------------------------------------
-function sn_ube_combat_prepare_first_round(&$combat_data)
-{
+function sn_ube_combat_prepare_first_round(&$combat_data) {
   global $ube_combat_bonus_list, $ube_convert_to_techs;
 
   // Готовим информацию для первого раунда - проводим все нужные вычисления из исходных данных
@@ -339,8 +334,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Вычисление дополнительной информации для расчета раунда
-function sn_ube_combat_round_prepare(&$combat_data, $round)
-{
+function sn_ube_combat_round_prepare(&$combat_data, $round) {
   global $ube_combat_bonus_list;
 
   $is_simulator = $combat_data[UBE_OPTIONS][UBE_SIMULATOR];
@@ -401,8 +395,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Рассчитывает результат столкновения флотов ака раунд
-function sn_ube_combat_round_crossfire_fleet(&$combat_data, $round)
-{
+function sn_ube_combat_round_crossfire_fleet(&$combat_data, $round) {
   if(BE_DEBUG === true)
   {
     // sn_ube_combat_helper_round_header($round);
@@ -437,8 +430,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Рассчитывает результат столкновения двух юнитов ака ход
-function sn_ube_combat_round_crossfire_unit(&$attack_fleet_data, &$defend_fleet_data, $attack_unit_id, $defend_unit_id, &$combat_options)
-{
+function sn_ube_combat_round_crossfire_unit(&$attack_fleet_data, &$defend_fleet_data, $attack_unit_id, $defend_unit_id, &$combat_options) {
   $attack_fleet_info = &$attack_fleet_data[UBE_FLEET_INFO];
   $defend_fleet_info = &$defend_fleet_data[UBE_FLEET_INFO];
   $defend_unit_armor = $defend_fleet_info[UBE_ARMOR][$defend_unit_id];
@@ -518,8 +510,7 @@ 
   }
 }
 
-function sn_ube_combat_round_crossfire_unit_damage_current(&$defend_fleet_data, $defend_unit_id, &$amplified_damage, &$units_lost, &$units_boomed, &$combat_options)
-{
+function sn_ube_combat_round_crossfire_unit_damage_current(&$defend_fleet_data, $defend_unit_id, &$amplified_damage, &$units_lost, &$units_boomed, &$combat_options) {
   $unit_is_lost = false;
 
   $units_boomed = $units_boomed ? $units_boomed : 0;
@@ -580,8 +571,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Рассчитывает результат столкновения двух юнитов ака ход
-function sn_ube_combat_round_crossfire_unit2(&$attack_fleet_data, &$defend_fleet_data, $attack_unit_id, $defend_unit_id, &$combat_options)
-{
+function sn_ube_combat_round_crossfire_unit2(&$attack_fleet_data, &$defend_fleet_data, $attack_unit_id, $defend_unit_id, &$combat_options) {
   if($defend_fleet_data[UBE_COUNT][$defend_unit_id] <= 0)
   {
     return;
@@ -618,8 +608,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Анализирует результаты раунда и генерирует данные для следующего раунда
-function sn_ube_combat_round_analyze(&$combat_data, $round)
-{
+function sn_ube_combat_round_analyze(&$combat_data, $round) {
   $round_data = &$combat_data[UBE_ROUNDS][$round];
   $round_data[UBE_OUTCOME] = UBE_COMBAT_RESULT_DRAW;
 
@@ -649,12 +638,10 @@ 
   if(count($outcome) == 0 || $round == 10)
   {
     $round_data[UBE_OUTCOME] = UBE_COMBAT_RESULT_DRAW_END;
-  }
-  elseif(count($outcome) == 1)
+  } elseif(count($outcome) == 1)
   {
     $round_data[UBE_OUTCOME] = isset($outcome[UBE_ATTACKERS]) ? UBE_COMBAT_RESULT_WIN : UBE_COMBAT_RESULT_LOSS;
-  }
-  elseif(count($outcome) == 2)
+  } elseif(count($outcome) == 2)
   {
     if($round < 10)
     {
@@ -667,8 +654,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Общий алгоритм расчета боя
-function sn_ube_combat(&$combat_data)
-{
+function sn_ube_combat(&$combat_data) {
   // TODO: Сделать атаку по типам,  когда они будут
 
   $start = microtime(true);
@@ -696,8 +682,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Разбирает данные боя для генерации отчета
-function sn_ube_combat_analyze(&$combat_data)
-{
+function sn_ube_combat_analyze(&$combat_data) {
   global $config;
 
 //  $combat_data[UBE_OUTCOME] = array();
@@ -742,14 +727,12 @@ 
         if($combat_data[UBE_OPTIONS][UBE_SIMULATOR])
         { // for simulation just return 75% of loss
           $units_giveback = round($units_lost * $giveback_chance / 100);
-        }
-        else
+        } else
         {
           if($unit_count > 10)
           { // if there were more then 10 defense elements - mass-calculating giveback
             $units_giveback = round($units_lost * mt_rand($giveback_chance * 0.8, $giveback_chance * 1.2) / 100);
-          }
-          else
+          } else
           { //if there were less then 10 defense elements - calculating giveback per element
             $units_giveback = 0;
             for($i = 1; $i <= $units_lost; $i++)
@@ -852,8 +835,7 @@ 
     if($combat_data[UBE_OPTIONS][UBE_MOON_WAS])
     {
       $outcome[UBE_MOON] = UBE_MOON_WAS;
-    }
-    else
+    } else
     {
       sn_ube_combat_analyze_moon($outcome, $combat_data[UBE_OPTIONS][UBE_SIMULATOR]);
     }
@@ -872,8 +854,7 @@ 
 }
 
 // ------------------------------------------------------------------------------------------------
-function sn_ube_combat_analyze_loot(&$combat_data)
-{
+function sn_ube_combat_analyze_loot(&$combat_data) {
   $exchange = &$combat_data[UBE_OPTIONS][UBE_EXCHANGE];
   $planet_resource_list = &$combat_data[UBE_FLEETS][0][UBE_RESOURCES];
   $outcome = &$combat_data[UBE_OUTCOME];
@@ -916,13 +897,14 @@ 
 }
 
 // ------------------------------------------------------------------------------------------------
-function sn_ube_combat_analyze_moon(&$outcome, $is_simulator)
-{
+function sn_ube_combat_analyze_moon(&$outcome, $is_simulator) {
   $outcome[UBE_DEBRIS_TOTAL] = 0;
-  foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) // TODO via array
+  foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) {
+    // TODO via array
   {
     $outcome[UBE_DEBRIS_TOTAL] += $outcome[UBE_DEBRIS][$resource_id];
   }
+  }
 
   if($outcome[UBE_DEBRIS_TOTAL])
   {
@@ -941,35 +923,33 @@ 
         {
           $outcome[UBE_DEBRIS_TOTAL] = 0;
           $outcome[UBE_DEBRIS] = array();
-        }
-        else
+        } else
         {
           $moon_debris_spent = 30000000;
           $moon_debris_left_percent = ($outcome[UBE_DEBRIS_TOTAL] - $moon_debris_spent) / $outcome[UBE_DEBRIS_TOTAL];
 
           $outcome[UBE_DEBRIS_TOTAL] = 0;
-          foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) // TODO via array
+          foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) {
+            // TODO via array
           {
             $outcome[UBE_DEBRIS][$resource_id] = floor($outcome[UBE_DEBRIS][$resource_id] * $moon_debris_left_percent);
+          }
             $outcome[UBE_DEBRIS_TOTAL] += $outcome[UBE_DEBRIS][$resource_id];
           }
         }
-      }
-      else
+      } else
       {
         $outcome[UBE_MOON] = UBE_MOON_CREATE_FAILED;
       }
     }
-  }
-  else
+  } else
   {
     $outcome[UBE_MOON] = UBE_MOON_NONE;
   }
 }
 
 // ------------------------------------------------------------------------------------------------
-function sn_ube_combat_analyze_moon_destroy(&$combat_data)
-{
+function sn_ube_combat_analyze_moon_destroy(&$combat_data) {
   // TODO: $is_simulator
   $reapers = 0;
   foreach($combat_data[UBE_ROUNDS][count($combat_data[UBE_ROUNDS])-1][UBE_FLEETS] as $fleet_data)
@@ -993,8 +973,7 @@ 
     $combat_data[UBE_OUTCOME][UBE_MOON] = $random <= $combat_data[UBE_OUTCOME][UBE_MOON_DESTROY_CHANCE] ? UBE_MOON_DESTROY_SUCCESS : UBE_MOON_DESTROY_FAILED;
     $random = mt_rand(1, 100);
     $combat_data[UBE_OUTCOME][UBE_MOON_REAPERS] = $random <= $combat_data[UBE_OUTCOME][UBE_MOON_REAPERS_DIE_CHANCE] ? UBE_MOON_REAPERS_DIED : UBE_MOON_REAPERS_RETURNED;
-  }
-  else
+  } else
   {
     $combat_data[UBE_OUTCOME][UBE_MOON_REAPERS] = UBE_MOON_REAPERS_NONE;
   }
@@ -1002,8 +981,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Рассылает письма всем участникам боя
-function sn_ube_message_send(&$combat_data)
-{
+function sn_ube_message_send(&$combat_data) {
   global $lang;
 
   // TODO: Отсылать каждому игроку сообщение на его языке!
@@ -1042,8 +1020,7 @@ 
   if($outcome[UBE_MOON] == UBE_MOON_CREATE_SUCCESS)
   {
     $text_defender .= "{$lang['ube_report_moon_created']} {$outcome[UBE_MOON_SIZE]} {$lang['sys_kilometers_short']}<br /><br />";
-  }
-  elseif($outcome[UBE_MOON] == UBE_MOON_CREATE_FAILED)
+  } elseif($outcome[UBE_MOON] == UBE_MOON_CREATE_FAILED)
   {
     $text_defender .= "{$lang['ube_report_moon_chance']} {$outcome[UBE_MOON_CHANCE]}%<br /><br />";
   }
@@ -1053,8 +1030,7 @@ 
     if($outcome[UBE_MOON_REAPERS] == UBE_MOON_REAPERS_NONE)
     {
       $text_defender .= $lang['ube_report_moon_reapers_none'];
-    }
-    else
+    } else
     {
       $text_defender .= "{$lang['ube_report_moon_reapers_wave']}. {$lang['ube_report_moon_reapers_chance']} {$outcome[UBE_MOON_DESTROY_CHANCE]}%. ";
       $text_defender .= $lang[$outcome[UBE_MOON] == UBE_MOON_DESTROY_SUCCESS ? 'ube_report_moon_reapers_success' : 'ube_report_moon_reapers_failure'] . "<br />";
@@ -1081,8 +1057,7 @@ 
 // Записывает результат боя в БД
 /** @noinspection SpellCheckingInspection */
 function ube_combat_result_apply(&$combat_data){return sn_function_call('ube_combat_result_apply', array(&$combat_data));}
-function sn_ube_combat_result_apply(&$combat_data)
-{
+function sn_ube_combat_result_apply(&$combat_data) {
 // TODO: Поменять все отладки на запросы
   $destination_user_id = $combat_data[UBE_FLEETS][0][UBE_OWNER];
 
@@ -1130,8 +1105,7 @@ 
         {
           // Не планета - всегда сразу записываем строку итогов флота
           $fleet_query[$unit_id] = "{$unit_id},{$units_left}";
-        }
-        elseif($units_lost)
+        } elseif($units_lost)
         {
           // Планета - записываем в ИД юнита его потери только если есть потери
           $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, -$units_lost, $combat_data[UBE_PLAYERS][$destination_user_id][UBE_PLAYER_DATA], $planet_id);
@@ -1186,11 +1160,13 @@ 
 
 //global $debug;
 //    $fleet_query = implode(',', $fleet_query);
-    if($fleet_id) // Не планета
+    if($fleet_id) {
+      // Не планета
     {
       if($fleet_info[UBE_FLEET_TYPE] == UBE_ATTACKERS && $outcome[UBE_MOON_REAPERS] == UBE_MOON_REAPERS_DIED)
       {
         $new_fleet_count = 0;
+    }
       }
 
       if($new_fleet_count)
@@ -1202,16 +1178,14 @@ 
           $fleet_query['fleet_amount'] = $new_fleet_count;
           fleet_update_set($fleet_id, $fleet_query, $fleet_delta);
         }
-      }
-      else
+      } else
       {
         // Удаляем пустые флоты
         // doquery("DELETE FROM {{fleets}} WHERE `fleet_id` = {$fleet_id} LIMIT 1");
         db_fleet_delete($fleet_id);
         DBStaticUnit::db_unit_list_delete(0, LOC_FLEET, $fleet_id, 0);
       }
-    }
-    else // Планета
+    } else // Планета
     {
       // Сохраняем изменения ресурсов - если они есть
       if(!empty($fleet_delta))
@@ -1222,10 +1196,12 @@ 
         }
         DBStaticPlanet::db_planet_set_by_id($planet_id, implode(',', $temp));
       }
-      if(!empty($db_changeset)) // Сохраняем изменения юнитов на планете - если они есть
+      if(!empty($db_changeset)) {
+        // Сохраняем изменения юнитов на планете - если они есть
       {
         OldDbChangeSet::db_changeset_apply($db_changeset);
       }
+      }
     }
   }
 
@@ -1242,8 +1218,7 @@ 
     $moon_row = uni_create_moon($planet_info[PLANET_GALAXY], $planet_info[PLANET_SYSTEM], $planet_info[PLANET_PLANET], $destination_user_id, $outcome[UBE_MOON_SIZE], '', false);
     $outcome[UBE_MOON_NAME] = $moon_row['name'];
     unset($moon_row);
-  }
-  elseif($outcome[UBE_MOON] == UBE_MOON_DESTROY_SUCCESS)
+  } elseif($outcome[UBE_MOON] == UBE_MOON_DESTROY_SUCCESS)
   {
     DBStaticPlanet::db_planet_delete_by_id($planet_id);
   }

includes/includes/art_artifact.php

Braces +9 added lines, -14 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-function art_use(&$user, &$planetrow, $unit_id)
-{
+function art_use(&$user, &$planetrow, $unit_id) {
   global $lang;
 
   if(!in_array($unit_id, sn_get_groups('artifacts')))
@@ -34,14 +33,12 @@ 
           {
             $new_moon_row = uni_create_moon($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'], $user['id'], $moon_chance);
             $message = sprintf($lang['art_moon_create'][$unit_id], $new_moon_row['name'], uni_render_coordinates($planetrow), pretty_number($moon_chance));
-          }
-          else
+          } else
           {
             $message = $lang['art_lhc_moon_fail'];
           }
           msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_ADMIN, $lang['art_lhc_from'], $lang['art_lhc_subj'], $message);
-        }
-        else
+        } else
         {
           $message = $lang['art_moon_exists'];
         }
@@ -69,8 +66,9 @@ 
         $sectors_used = 0;
         foreach($artifact_deploy as $deploy_unit_id => $deploy_unit_level)
         {
-          if(!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true))))
-            continue;
+          if(!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true)))) {
+                      continue;
+          }
           $sectors_used += $levels_deployed;
           $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($deploy_unit_id, $levels_deployed, $user, $planetrow['id']);
         }
@@ -104,8 +102,7 @@ 
           DBStaticQue::db_que_set_time_left_by_id($que_item['que_id'], $que_item['que_time_left']);
           $message = sprintf($lang['art_heurestic_chip_ok'], $lang['tech'][$que_item['que_unit_id']], $que_item['que_unit_level'], sys_time_human($old_time - $que_item['que_time_left']));
           msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_QUE, $lang['art_heurestic_chip_subj'], $lang['art_heurestic_chip_subj'], $message);
-        }
-        else
+        } else
         {
           $message = $lang['art_heurestic_chip_no_research'];
         }
@@ -133,8 +130,7 @@ 
             $lang['tech'][$que_item['que_unit_id']], $que_item['que_unit_level'], $planetrow['name'], uni_render_coordinates($planetrow), sys_time_human($old_time - $que_item['que_time_left'])
           );
           msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_QUE, $lang['art_nano_builder_subj'], $lang['art_nano_builder_subj'], $message);
-        }
-        else
+        } else
         {
           $message = $lang['art_nano_builder_no_que'];
         }
@@ -146,8 +142,7 @@ 
       $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, $unit_level - $artifact_level_old, $user);
       OldDbChangeSet::db_changeset_apply($db_changeset);
     }
-  }
-  else
+  } else
   {
     $message = $lang['art_err_no_artifact'];
   }

includes/includes/flt_functions.php

Braces +9 added lines, -18 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-function flt_fleet_speed($user, $fleet)
-{
+function flt_fleet_speed($user, $fleet) {
   if (!is_array($fleet))
   {
     $fleet = array($fleet => 1);
@@ -29,16 +28,13 @@ 
   if($from['galaxy'] != $to['galaxy'])
   {
     $distance = abs($from['galaxy'] - $to['galaxy']) * $config->uni_galaxy_distance;
-  }
-  elseif($from['system'] != $to['system'])
+  } elseif($from['system'] != $to['system'])
   {
     $distance = abs($from['system'] - $to['system']) * 5 * 19 + 2700;
-  }
-  elseif($from['planet'] != $to['planet'])
+  } elseif($from['planet'] != $to['planet'])
   {
     $distance = abs($from['planet'] - $to['planet']) * 5 + 1000;
-  }
-  else
+  } else
   {
     $distance = 5;
   }
@@ -55,8 +51,7 @@ 
  *
  * @return array
  */
-function flt_travel_data($user_row, $from, $to, $fleet_array, $speed_percent = 10)
-{
+function flt_travel_data($user_row, $from, $to, $fleet_array, $speed_percent = 10) {
   $distance = flt_travel_distance($from, $to);
 
   $consumption = 0;
@@ -120,8 +115,7 @@ 
   );
 }
 
-function flt_bashing_check($user, $enemy, $planet_dst, $mission, $flight_duration, $fleet_group = 0)
-{
+function flt_bashing_check($user, $enemy, $planet_dst, $mission, $flight_duration, $fleet_group = 0) {
   global $config;
 
   $config_bashing_attacks = $config->fleet_bashing_attacks;
@@ -531,8 +525,7 @@ 
       $fleet_ship_count += $amount;
       $fleet_string     .= "{$unit_id},{$amount};";
       $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, -$amount, $user, $from['id']);
-    }
-    elseif(in_array($unit_id, sn_get_groups('resources_loot')))
+    } elseif(in_array($unit_id, sn_get_groups('resources_loot')))
     {
       $planet_fields[pname_resource_name($unit_id)]['delta'] -= $amount;
     }
@@ -624,8 +617,7 @@ 
 //ini_set('error_reporting', E_ALL ^ E_NOTICE);
 }
 
-function flt_calculate_ship_to_transport_sort($a, $b)
-{
+function flt_calculate_ship_to_transport_sort($a, $b) {
   return $a['transport_effectivness'] == $b['transport_effectivness'] ? 0 : ($a['transport_effectivness'] > $b['transport_effectivness'] ? -1 : 1);
 }
 
@@ -634,8 +626,7 @@ 
 // $resource_amount - how much amount of resources need to be transported
 // $from - transport from
 // $to - transport to
-function flt_calculate_fleet_to_transport($ship_list, $resource_amount, $from, $to)
-{
+function flt_calculate_fleet_to_transport($ship_list, $resource_amount, $from, $to) {
   global $user;
 
   $ship_data = array();

jumpgate.php

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
     ));
 
     display($template, $lang['tech'][STRUC_MOON_GATE]);
-  }
-  else
+  } else
   {
     messageBox($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10);
   }

annonce.php

Braces +1 added lines, -2 removed lines

@@ -57,8 +57,7 @@
     {
       doquery("INSERT INTO {{annonce}} SET `user` ='{$users['username']}', `galaxie` ='{$users['galaxy']}', `systeme` ='{$users['system']}', `metala` ='{$metalvendre}', `cristala` ='{$cristalvendre}', `deuta` ='{$deutvendre}', `metals` ='{$metalsouhait}', `cristals` ='{$cristalsouhait}', `deuts` ='{$deutsouhait}'");
       messageBox ($lang['Your_announce_was_recorded'], $lang['announce_status'],"annonce.php");
-    }
-    else
+    } else
     {
       messageBox ($lang['Your_announce_not_recorded'], $lang['announce_status'],"annonce.php?action=1");
     }

includes/alliance/ali_internal_admin.inc

Braces +3 added lines, -6 removed lines

@@ -74,14 +74,12 @@ 
     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)
   {
@@ -98,8 +96,7 @@ 
     sn_db_transaction_commit();
     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)
   {

includes/alliance/ali_info.inc

Braces +5 added lines, -10 removed lines

@@ -23,16 +23,14 @@ 
     $lang['Go_out_welldone'] = str_replace("%s", $ally_name, $lang['Go_out_welldone']);
     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)
   {
     $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);
   }
@@ -52,20 +50,17 @@ 
     'USER_ALLY_ID' => $user['ally_id'],
   ));
   $page_header          = $lang['sys_alliance'];
-}
-else
+} else
 {
   $page_header = $lang['your_alliance'];
 
   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'];
-  }
-  else
+  } else
   {
     $range = $lang['member'];
   }

includes/alliance/ali_internal_admin_diplomacy.inc

Braces +7 added lines, -14 removed lines

@@ -66,8 +66,7 @@ 
       ->doInsert();
 
     $accept_offer = false;
-  }
-  else
+  } else
   {
     $accept_offer = true;
     $negotiation = array(
@@ -78,8 +77,7 @@ 
       'alliance_negotiation_relation' => $alliance_negotiation_relation,
     );
   }
-}
-else
+} else
 {
   $offer_id = sys_get_param_id('offer_id');
   if($offer_id)
@@ -90,31 +88,26 @@ 
     if(!$negotiation)
     {
       messageBox($lang['ali_dip_err_offer_none'], $page_title);
-    }
-    elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
+    } elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
     {
       // TODO: Add log of hack attempt
       messageBox($lang['ali_dip_err_offer_alien'], $page_title);
-    }
-    elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
+    } elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
     {
       if($offer_answer == 'accept')
       {
         // TODO: Add log of hack attempt
         messageBox($lang['ali_dip_err_offer_accept_own'], $page_title);
-      }
-      elseif($offer_answer == 'deny')
+      } elseif($offer_answer == 'deny')
       {
         doquery("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;");
       }
-    }
-    else
+    } else
     {
       if($offer_answer == 'accept')
       {
         $accept_offer = true;
-      }
-      elseif($offer_answer == 'deny')
+      } elseif($offer_answer == 'deny')
       {
         DBStaticAlly::db_ally_negotiation_update_status_1($offer_id);
       }

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');
 }