supernova-ws / SuperNova

admin/adm_payment.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage($lang['adm_err_denied']);
 }
 
@@ -25,7 +25,7 @@ 
 );
 
 $query = db_payment_list_payers();
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $payer_list[$row['payment_user_id']] = '[' . $row['payment_user_id'] . '] ' . $row['payment_user_name'];
 }
 tpl_assign_select($template, 'payer', $payer_list);
@@ -35,7 +35,7 @@ 
 );
 
 $query = db_payment_list_modules();
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $module_list[$row['payment_module_name']] = $row['payment_module_name'];
 }
 tpl_assign_select($template, 'module', $module_list);
@@ -50,9 +50,9 @@ 
 
 $query = db_payment_list_get($flt_payer, $flt_status, $flt_test, $flt_module);
 
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $row2 = array();
-  foreach($row as $key => $value) {
+  foreach ($row as $key => $value) {
     $row2[strtoupper($key)] = $value;
   }
   $template->assign_block_vars('payment', $row2);

notes.php

Spacing +20 added lines, -20 removed lines

@@ -15,34 +15,34 @@ 
 $template = gettemplate('notes', true);
 
 $result = array();
-if(($result_message = sys_get_param_str('MESSAGE')) && isset($lang[$result_message])) {
+if (($result_message = sys_get_param_str('MESSAGE')) && isset($lang[$result_message])) {
   $result[] = array('STATUS' => sys_get_param_int('STATUS'), 'MESSAGE' => $lang[$result_message]);
 }
 
 $note_id_edit = sys_get_param_id('note_id_edit');
-if(sys_get_param('note_delete')) {
+if (sys_get_param('note_delete')) {
   try {
     $not = '';
     $query_where = '';
-    switch(sys_get_param_str('note_delete_range')) {
+    switch (sys_get_param_str('note_delete_range')) {
       case 'all':
       break;
 
       case 'marked_not':
         $not = 'NOT';
       case 'marked':
-        if(!is_array($notes_marked = sys_get_param('note'))) {
+        if (!is_array($notes_marked = sys_get_param('note'))) {
           throw new Exception('note_err_none_selected', ERR_WARNING);
         }
 
         $notes_marked_filtered = array();
-        foreach($notes_marked as $note_id => $note_select) {
-          if($note_select == 'on' && $note_id = idval($note_id)) {
+        foreach ($notes_marked as $note_id => $note_select) {
+          if ($note_select == 'on' && $note_id = idval($note_id)) {
             $notes_marked_filtered[] = $note_id;
           }
         }
 
-        if(empty($notes_marked_filtered)) {
+        if (empty($notes_marked_filtered)) {
           throw new Exception('note_err_none_selected', ERR_WARNING);
         }
 
@@ -59,7 +59,7 @@ 
     db_note_list_delete($user, $query_where);
     sn_db_transaction_commit();
     throw new Exception($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added', ERR_NONE);
-  } catch(Exception $e) {
+  } catch (Exception $e) {
     $note_id_edit = 0;
     sn_db_transaction_rollback();
     $result[] = array(
@@ -67,7 +67,7 @@ 
       'MESSAGE' => $lang[$e->getMessage()],
     );
   }
-} elseif(($note_title = sys_get_param_str('note_title')) || ($note_text = sys_get_param_str('note_text'))) {
+} elseif (($note_title = sys_get_param_str('note_title')) || ($note_text = sys_get_param_str('note_text'))) {
   $note_title == db_escape($lang['note_new_title']) ? $note_title = '' : false;
   ($note_text = sys_get_param_str('note_text')) == db_escape($lang['note_new_text']) ? $note_text = '' : false;
 
@@ -76,7 +76,7 @@ 
     $note_system = max(0, min(sys_get_param_id('note_system'), $config->game_maxSystem));
     $note_planet = max(0, min(sys_get_param_id('note_planet'), $config->game_maxPlanet + 1));
 
-    if(!$note_text && !$note_title && !$note_galaxy && !$note_system && !$note_planet) {
+    if (!$note_text && !$note_title && !$note_galaxy && !$note_system && !$note_planet) {
       throw new exception('note_err_note_empty', ERR_WARNING);
     }
 
@@ -85,15 +85,15 @@ 
     $note_sticky = intval(sys_get_param_id('note_sticky')) ? 1 : 0;
 
     sn_db_transaction_start();
-    if($note_id_edit) {
+    if ($note_id_edit) {
       $check_note_id = db_note_get_id_and_owner($note_id_edit);
-      if(!$check_note_id) {
+      if (!$check_note_id) {
         throw new Exception('note_err_note_not_found', ERR_ERROR);
       }
     }
 
-    if($note_id_edit) {
-      if($check_note_id['owner'] != $user['id']) {
+    if ($note_id_edit) {
+      if ($check_note_id['owner'] != $user['id']) {
         throw new Exception('note_err_owner_wrong', ERR_ERROR);
       }
 
@@ -105,7 +105,7 @@ 
     sn_db_transaction_commit();
     sys_redirect('notes.php?STATUS=' . ERR_NONE . '&MESSAGE=' . ($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added'));
 //    throw new exception($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added', ERR_NONE);
-  } catch(Exception $e) {
+  } catch (Exception $e) {
     $note_id_edit = 0;
     sn_db_transaction_rollback();
     $result[] = array(
@@ -115,7 +115,7 @@ 
   }
 }
 
-if(!$note_id_edit) {
+if (!$note_id_edit) {
   note_assign($template, array(
     'id'          => 0,
     'time'        => SN_TIME_NOW,
@@ -128,13 +128,13 @@ 
 
 $note_exist = false;
 $notes_query = db_note_list_by_owner($user['id']);
-while($note_row = db_fetch($notes_query)) {
+while ($note_row = db_fetch($notes_query)) {
   note_assign($template, $note_row);
   $note_exist = $note_exist || $note_row['id'] == $note_id_edit;
 }
 $note_id_edit = $note_exist ? $note_id_edit : 0;
 
-foreach($note_priority_classes as $note_priority_id => $note_priority_class) {
+foreach ($note_priority_classes as $note_priority_id => $note_priority_class) {
   $template->assign_block_vars('note_priority', array(
     'ID'    => $note_priority_id,
     'CLASS' => $note_priority_classes[$note_priority_id],
@@ -142,14 +142,14 @@ 
   ));
 }
 
-foreach($lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
+foreach ($lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
   $template->assign_block_vars('planet_type', array(
     'ID'   => $planet_type_id,
     'TEXT' => $planet_type_string,
   ));
 }
 
-foreach($result as $result_data) {
+foreach ($result as $result_data) {
   $template->assign_block_vars('result', $result_data);
 }
 

flotenajax.php

Spacing +11 added lines, -11 removed lines

@@ -36,7 +36,7 @@ 
 
   $target_mission = sys_get_param_int('mission');
   $sn_group_missions = sn_get_groups('missions');
-  if(empty($sn_group_missions[$target_mission]['AJAX'])) {
+  if (empty($sn_group_missions[$target_mission]['AJAX'])) {
     die($lang['gs_c00']);
   }
 
@@ -51,7 +51,7 @@ 
   );
   // fleet_ajax now can send fleets only to existing planets/moons
   // TODO - sending colonization and expeditions in 1 click
-  if(!uni_coordinates_valid($target_coord)) {
+  if (!uni_coordinates_valid($target_coord)) {
     die($lang['gs_c02']);
   }
 
@@ -62,7 +62,7 @@ 
 
   // TODO - DEADLOCK CAN BE HERE!!!! We should lock SOURCE and TARGET owners in one query
   $target_row = db_planet_by_vector($target_coord);
-  if(empty($target_row)) {
+  if (empty($target_row)) {
     $target_row = $target_coord;
     $target_row['id_owner'] = 0;
     // If fleet destination is PT_DEBRIS - then it's actually destination is PT_PLANET // TODO - REMOVE! Debris should be valid DESTINATION planet_type!
@@ -73,15 +73,15 @@ 
   }
 
   $fleet_array = array();
-  switch($target_mission) {
+  switch ($target_mission) {
     case MT_SPY:
       $fleet_array[SHIP_SPY] = min(mrc_get_level($user, $planetrow, SHIP_SPY), abs(classSupernova::$user_options[PLAYER_OPTION_FLEET_SPY_DEFAULT]));
       $unit_group = 'flt_spies';
     break;
 
     case MT_RECYCLE:
-      foreach(sn_get_groups('flt_recyclers') as $unit_id) {
-        if($unit_count = mrc_get_level($user, $planetrow, $unit_id)) {
+      foreach (sn_get_groups('flt_recyclers') as $unit_id) {
+        if ($unit_count = mrc_get_level($user, $planetrow, $unit_id)) {
           $fleet_array[$unit_id] = $unit_count;
         }
       }
@@ -106,16 +106,16 @@ 
       'target_structure' => $target_structure = sys_get_param_int('structures'),
     )
   );
-  if($isAttackAllowed != ATTACK_ALLOWED) {
+  if ($isAttackAllowed != ATTACK_ALLOWED) {
     die($lang['fl_attack_error'][$isAttackAllowed]);
   }
 
   $db_changeset = array();
-  foreach($fleet_array as $unit_id => $unit_count) {
+  foreach ($fleet_array as $unit_id => $unit_count) {
     $db_changeset['unit'][] = sn_db_unit_changeset_prepare($unit_id, -$unit_count, $user, $planetrow);
   }
 
-  if($target_mission == MT_MISSILE) {
+  if ($target_mission == MT_MISSILE) {
     $distance = abs($target_coord['system'] - $planetrow['system']);
     $duration = round((30 + (60 * $distance)) / flt_server_flight_speed_multiplier());
     $arrival = SN_TIME_NOW + $duration;
@@ -125,7 +125,7 @@ 
   } else {
     $travel_data = flt_travel_data($user, $planetrow, $target_coord, $fleet_array, 10);
 
-    if($planetrow['deuterium'] < $travel_data['consumption']) {
+    if ($planetrow['deuterium'] < $travel_data['consumption']) {
       die($lang['gs_c13']);
     }
 
@@ -146,7 +146,7 @@ 
 
   $ships_sent = array();
   $ships_sent_js = 0;
-  foreach($fleet_array as $unit_id => $unit_count) {
+  foreach ($fleet_array as $unit_id => $unit_count) {
     $ships_sent[] = "{$unit_count} {$lang['tech'][$unit_id]}";
     $ships_sent_js += mrc_get_level($user, $planetrow, $unit_id, false, true);
   }

metamatter.php

Spacing +40 added lines, -40 removed lines

@@ -8,7 +8,7 @@ 
 
 include_once('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(!sn_module_get_active_count('payment')) {
+if (!sn_module_get_active_count('payment')) {
   sys_redirect('dark_matter.php');
   die();
 }
@@ -65,9 +65,9 @@ 
 
 // Таблица скидок
 $prev_discount = 0;
-if(isset(sn_module_payment::$bonus_table) && is_array(sn_module_payment::$bonus_table)) {
-  foreach(sn_module_payment::$bonus_table as $sum => $discount) {
-    if($discount && $discount != $prev_discount) {
+if (isset(sn_module_payment::$bonus_table) && is_array(sn_module_payment::$bonus_table)) {
+  foreach (sn_module_payment::$bonus_table as $sum => $discount) {
+    if ($discount && $discount != $prev_discount) {
       $template->assign_block_vars('discount', array(
         'SUM'          => $sum,
         'DISCOUNT'     => $discount * 100,
@@ -80,19 +80,19 @@ 
 }
 
 // Результат платежа
-if($payment_id = sys_get_param_id('payment_id')) {
+if ($payment_id = sys_get_param_id('payment_id')) {
   $payment = db_payment_get($payment_id);
-  if($payment && $payment['payment_user_id'] == $user['id']) {
-    if($payment['payment_status'] == PAYMENT_STATUS_COMPLETE) {
+  if ($payment && $payment['payment_user_id'] == $user['id']) {
+    if ($payment['payment_status'] == PAYMENT_STATUS_COMPLETE) {
       $template->assign_block_vars('result', array('MESSAGE' => sprintf($lang['pay_msg_mm_purchase_complete'], $payment['payment_dark_matter_paid'], $payment['payment_module_name'], $payment['payment_dark_matter_gained'])));
     }
-    if($payment['payment_status'] == PAYMENT_STATUS_NONE) {
+    if ($payment['payment_status'] == PAYMENT_STATUS_NONE) {
       $template->assign_block_vars('result', array(
         'MESSAGE' => sprintf($lang['pay_msg_mm_purchase_incomplete'], $payment['payment_dark_matter_paid'], $payment['payment_module_name']),
         'STATUS'  => 1,
       ));
     }
-    if($payment['payment_test']) {
+    if ($payment['payment_test']) {
       $template->assign_block_vars('result', array(
         'MESSAGE' => sprintf($lang['pay_msg_mm_purchase_test']),
         'STATUS'  => -1,
@@ -107,28 +107,28 @@ 
   'metamatter' => sys_get_param_float('metamatter'),
 );
 
-if(!$request['metamatter']) {
+if (!$request['metamatter']) {
   unset($_POST);
 }
 
 $payment_methods_available = array_combine(array_keys(sn_module_payment::$payment_methods), array_fill(0, count(sn_module_payment::$payment_methods), null));
-array_walk($payment_methods_available, function (&$value, $index) {
+array_walk($payment_methods_available, function(&$value, $index) {
   $value = !empty(sn_module_payment::$payment_methods[$index]) ? array_combine(array_keys(sn_module_payment::$payment_methods[$index]), array_fill(0, count(sn_module_payment::$payment_methods[$index]), null)) : $value;
 });
 
 // pdump($payment_methods_available);
 $payment_module_valid = false;
 $payment_module = sys_get_param_str('payment_module');
-foreach($sn_module_list['payment'] as $module_name => $module) {
-  if(!is_object($module) || !$module->manifest['active']) {
+foreach ($sn_module_list['payment'] as $module_name => $module) {
+  if (!is_object($module) || !$module->manifest['active']) {
     continue;
   }
 
   lng_include($module_name, $module->manifest['root_relative']);
 
-  foreach(sn_module_payment::$payment_methods as $payment_type_id => $available_methods) {
-    foreach($available_methods as $payment_method => $payment_currency) {
-      if(isset($module->manifest['payment_method'][$payment_method])) {
+  foreach (sn_module_payment::$payment_methods as $payment_type_id => $available_methods) {
+    foreach ($available_methods as $payment_method => $payment_currency) {
+      if (isset($module->manifest['payment_method'][$payment_method])) {
         $payment_methods_available[$payment_type_id][$payment_method][$module_name] = $module->manifest['payment_method'][$payment_method];
       }
     }
@@ -139,8 +139,8 @@ 
 
 global $template_result;
 // Доступные платежные методы
-foreach($payment_methods_available as $payment_type_id => $payment_methods) {
-  if(empty($payment_methods)) {
+foreach ($payment_methods_available as $payment_type_id => $payment_methods) {
+  if (empty($payment_methods)) {
     continue;
   }
 
@@ -148,8 +148,8 @@ 
     'ID'   => $payment_type_id,
     'NAME' => $lang['pay_methods'][$payment_type_id],
   );
-  foreach($payment_methods as $payment_method_id => $module_list) {
-    if(empty($module_list)) {
+  foreach ($payment_methods as $payment_method_id => $module_list) {
+    if (empty($module_list)) {
       continue;
     }
     $template_result['.']['payment'][$payment_type_id]['.']['method'][$payment_method_id] = array(
@@ -160,14 +160,14 @@ 
       'NAME_FORCE' => isset(sn_module_payment::$payment_methods[$payment_type_id][$payment_method_id]['name']),
       'BUTTON'     => isset(sn_module_payment::$payment_methods[$payment_type_id][$payment_method_id]['button']),
     );
-    foreach($module_list as $payment_module_name => $payment_module_method_details) {
+    foreach ($module_list as $payment_module_name => $payment_module_method_details) {
       $template_result['.']['payment'][$payment_type_id]['.']['method'][$payment_method_id]['.']['module'][] = array(
         'MODULE' => $payment_module_name,
       );
     }
   }
 
-  if(empty($template_result['.']['payment'][$payment_type_id]['.'])) {
+  if (empty($template_result['.']['payment'][$payment_type_id]['.'])) {
     unset($template_result['.']['payment'][$payment_type_id]);
   }
 }
@@ -180,19 +180,19 @@ 
 $payment_module_valid = $payment_module_valid && (!$payment_method_selected || isset($payment_methods_available[$payment_type_selected][$payment_method_selected][$module_name]));
 
 // If payment_module invalid - making it empty OR if there is only one payment_module - selecting it
-if($payment_module_valid) {
+if ($payment_module_valid) {
   // $payment_module = $payment_module; // Really - do nothing
-} elseif($payment_type_selected && count($payment_methods_available[$payment_type_selected][$payment_method_selected]) == 1) {
+} elseif ($payment_type_selected && count($payment_methods_available[$payment_type_selected][$payment_method_selected]) == 1) {
   reset($payment_methods_available[$payment_type_selected][$payment_method_selected]);
   $payment_module = key($payment_methods_available[$payment_type_selected][$payment_method_selected]);
-} elseif(count($sn_module_list['payment']) == 1) {
+} elseif (count($sn_module_list['payment']) == 1) {
   $payment_module = $module_name;
 } else {
   $payment_module = '';
 }
 
-if($payment_type_selected && $payment_method_selected) {
-  foreach($payment_methods_available[$payment_type_selected][$payment_method_selected] as $module_name => $temp) {
+if ($payment_type_selected && $payment_method_selected) {
+  foreach ($payment_methods_available[$payment_type_selected][$payment_method_selected] as $module_name => $temp) {
     $template->assign_block_vars('payment_module', array(
       'ID'          => $module_name,
       'NAME'        => $lang["module_{$module_name}_name"],
@@ -201,10 +201,10 @@ 
   }
 }
 
-foreach($lang['pay_currency_list'] as $key => $value) {
+foreach ($lang['pay_currency_list'] as $key => $value) {
   $course = get_exchange_rate($key);
 //  if(!$course || $key == $config->payment_currency_default) {
-  if(!$course) {
+  if (!$course) {
     continue;
   }
   $template->assign_block_vars('exchange', array(
@@ -219,17 +219,17 @@ 
   ));
 }
 
-if($request['metamatter'] && $payment_module) {
+if ($request['metamatter'] && $payment_module) {
   try {
     // Any possible errors about generating paylink should be raised in module!
     $pay_link = $sn_module[$payment_module]->compile_request($request);
 
     // Поддержка дополнительной информации
-    if(is_array($pay_link['RENDER'])) {
-      foreach($pay_link['RENDER'] as $html_data) {
+    if (is_array($pay_link['RENDER'])) {
+      foreach ($pay_link['RENDER'] as $html_data) {
         $template->assign_block_vars('render', $html_data);
-        if(isset($html_data['VALUE']) && is_array($html_data['VALUE'])) {
-          foreach($html_data['VALUE'] as $value_id => $value_value) {
+        if (isset($html_data['VALUE']) && is_array($html_data['VALUE'])) {
+          foreach ($html_data['VALUE'] as $value_id => $value_value) {
             $template->assign_block_vars('render.value', array(
               'FIELD' => $value_id,
               'VALUE' => $value_value,
@@ -240,8 +240,8 @@ 
     }
 
     // Поддержка передачи данных для многошаговых платежных систем
-    if(is_array($pay_link['DATA'])) {
-      foreach($pay_link['DATA'] as $key => $value) {
+    if (is_array($pay_link['DATA'])) {
+      foreach ($pay_link['DATA'] as $key => $value) {
         $template->assign_block_vars('pay_link_data', array(
           'FIELD' => $key,
           'VALUE' => $value,
@@ -249,7 +249,7 @@ 
       }
     }
 
-    if(is_array($pay_link) && in_array($pay_link['PAY_LINK_METHOD'], array('POST', 'GET', 'LINK', 'STEP'))) {
+    if (is_array($pay_link) && in_array($pay_link['PAY_LINK_METHOD'], array('POST', 'GET', 'LINK', 'STEP'))) {
       // TODO Переделать это под assign_vars_recursive и возвращать пустые строки если нет платежного метода - для унификации формы в темплейте
       $template->assign_vars(array(
         'PAY_LINK_METHOD' => $pay_link['PAY_LINK_METHOD'],
@@ -258,7 +258,7 @@ 
     } else {
       throw new exception($lang['pay_msg_request_paylink_unsupported'], ERR_ERROR);
     }
-  } catch(exception $e) {
+  } catch (exception $e) {
     $template->assign_block_vars('result', $response = array(
       'STATUS'  => $e->getCode(),
       'MESSAGE' => $e->getMessage(),
@@ -268,7 +268,7 @@ 
 }
 
 // Прегенерированные пакеты
-foreach($unit_available_amount_list as $unit_amount => $discount) {
+foreach ($unit_available_amount_list as $unit_amount => $discount) {
   $temp = sn_module_payment::currency_convert($unit_amount, 'MM_', $player_currency);
   $template->assign_block_vars('mm_amount', array(
     'VALUE'            => $unit_amount,
@@ -303,7 +303,7 @@ 
   'PLAYER_CURRENCY'              => $player_currency,
   'PLAYER_CURRENCY_PRICE_PER_MM' => sn_module_payment::currency_convert(1, $player_currency, 'MM_', 10),
 
-  'UNIT_AMOUNT'                 => (float)$request['metamatter'],
+  'UNIT_AMOUNT'                 => (float) $request['metamatter'],
   'UNIT_AMOUNT_TEXT'            => pretty_number($request['metamatter']),
   'UNIT_AMOUNT_BONUS_PERCENT'   => $bonus_percent,
   'UNIT_AMOUNT_TEXT_DISCOUNTED' => $income_metamatter_text,

announce.php

Spacing +12 added lines, -12 removed lines

@@ -23,39 +23,39 @@ 
 $mode = sys_get_param_str('mode');
 
 $announce = array();
-if($user['authlevel'] >= 3) {
-  if(!empty($text)) {
+if ($user['authlevel'] >= 3) {
+  if (!empty($text)) {
     $announce_time = strtotime($announce_time, SN_TIME_NOW);
     $announce_time = $announce_time ? $announce_time : SN_TIME_NOW;
 
-    if($mode == 'edit') {
+    if ($mode == 'edit') {
       db_news_update_set($announce_time, $text, $detail_url, $announce_id);
       db_survey_delete_by_id($announce_id);
     } else {
       db_news_insert_set($announce_time, $text, $detail_url, $user);
       $announce_id = db_insert_id();
     }
-    if(($survey_question = sys_get_param_str('survey_question')) && ($survey_answers = sys_get_param('survey_answers'))) {
+    if (($survey_question = sys_get_param_str('survey_question')) && ($survey_answers = sys_get_param('survey_answers'))) {
       $survey_answers = explode("\r\n", $survey_answers);
       $survey_until = strtotime($survey_until = sys_get_param_str('survey_until'), SN_TIME_NOW);
       $survey_until = date(FMT_DATE_TIME_SQL, $survey_until ? $survey_until : SN_TIME_NOW + PERIOD_DAY * 1);
       db_survey_insert($announce_id, $survey_question, $survey_until);
       $survey_id = db_insert_id();
-      foreach($survey_answers as $survey_answer) {
+      foreach ($survey_answers as $survey_answer) {
         $survey_answer = db_escape(trim($survey_answer));
-        if(empty($survey_answer)) {
+        if (empty($survey_answer)) {
           continue;
         }
         db_survey_answer_insert($survey_id, $survey_answer);
       }
     }
 
-    if($announce_time <= SN_TIME_NOW) {
-      if($announce_time > $config->var_news_last && $announce_time == SN_TIME_NOW) {
+    if ($announce_time <= SN_TIME_NOW) {
+      if ($announce_time > $config->var_news_last && $announce_time == SN_TIME_NOW) {
         $config->db_saveItem('var_news_last', $announce_time);
       }
 
-      if(sys_get_param_int('news_mass_mail')) {
+      if (sys_get_param_int('news_mass_mail')) {
         $text = sys_get_param('text') . ($detail_url ? " <a href=\"{$detail_url}\"><span class=\"positive\">{$lang['news_more']}</span></a>" : '');
         msg_send_simple_message('*', 0, 0, MSG_TYPE_ADMIN, $lang['sys_administration'], $lang['news_title'], $text);
       }
@@ -66,7 +66,7 @@ 
   }
 
   $survey_answers = '';
-  switch($mode) {
+  switch ($mode) {
     case 'del':
       db_news_delete_by_id($announce_id);
       $mode = '';
@@ -76,9 +76,9 @@ 
       $template->assign_var('ID', $announce_id);
     case 'copy':
       $announce = db_news_with_survey_select_by_id($announce_id);
-      if($announce['survey_id']) {
+      if ($announce['survey_id']) {
         $query = db_survey_answer_text_select_by_news($announce);
-        while($row = db_fetch($query)) {
+        while ($row = db_fetch($query)) {
           $survey_answers[] = $row['survey_answer_text'];
         }
         $survey_answers = implode("\r\n", $survey_answers);

includes/pages/options.php

Spacing +45 added lines, -45 removed lines

@@ -22,7 +22,7 @@ 
 
   $language_new = sys_get_param_str('langer', $user['lang']);
 
-  if($language_new != $user['lang']) {
+  if ($language_new != $user['lang']) {
     $lang->lng_switch($language_new);
   }
 
@@ -31,35 +31,35 @@ 
 
   $FMT_DATE = preg_replace(array('/d/', '/m/', '/Y/'), array('DD', 'MM', 'YYYY'), FMT_DATE);
 
-  if(sys_get_param_str('mode') == 'change') {
-    if($user['authlevel'] > 0) {
+  if (sys_get_param_str('mode') == 'change') {
+    if ($user['authlevel'] > 0) {
       $planet_protection = sys_get_param_int('adm_pl_prot') ? $user['authlevel'] : 0;
       db_planet_set_by_owner($user['id'], "`id_level` = '{$planet_protection}'");
       db_user_set_by_id($user['id'], "`admin_protection` = '{$planet_protection}'");
       $user['admin_protection'] = $planet_protection;
     }
 
-    if(sys_get_param_int('vacation') && !$config->user_vacation_disable) {
+    if (sys_get_param_int('vacation') && !$config->user_vacation_disable) {
       sn_db_transaction_start();
-      if($user['authlevel'] < 3) {
-        if($user['vacation_next'] > SN_TIME_NOW) {
+      if ($user['authlevel'] < 3) {
+        if ($user['vacation_next'] > SN_TIME_NOW) {
           message($lang['opt_vacation_err_timeout'], $lang['Error'], 'index.php?page=options', 5);
           die();
         }
 
-        if(FleetList::fleet_count_flying($user['id'])) {
+        if (FleetList::fleet_count_flying($user['id'])) {
           message($lang['opt_vacation_err_your_fleet'], $lang['Error'], 'index.php?page=options', 5);
           die();
         }
 
         $que = que_get($user['id'], false);
-        if(!empty($que)) {
+        if (!empty($que)) {
           message($lang['opt_vacation_err_que'], $lang['Error'], 'index.php?page=options', 5);
           die();
         }
 
         $query = classSupernova::db_get_record_list(LOC_PLANET, "`id_owner` = {$user['id']}");
-        foreach($query as $planet) {
+        foreach ($query as $planet) {
           // $planet = sys_o_get_updated($user, $planet, SN_TIME_NOW);
           // $planet = $planet['planet'];
 
@@ -77,9 +77,9 @@ 
       sn_db_transaction_commit();
     }
 
-    foreach($user_option_list as $option_group_id => $option_group) {
-      foreach($option_group as $option_name => $option_value) {
-        if($user[$option_name] !== null) {
+    foreach ($user_option_list as $option_group_id => $option_group) {
+      foreach ($option_group as $option_name => $option_value) {
+        if ($user[$option_name] !== null) {
           $user[$option_name] = sys_get_param_str($option_name);
         } else {
           $user[$option_name] = $option_value;
@@ -90,8 +90,8 @@ 
 
 
     $player_options = sys_get_param('options');
-    if(!empty($player_options)) {
-      array_walk($player_options, function (&$value) {
+    if (!empty($player_options)) {
+      array_walk($player_options, function(&$value) {
         // TODO - Когда будет больше параметров - сделать больше проверок
         $value = intval($value);
       });
@@ -102,15 +102,15 @@ 
 
     $username = substr(sys_get_param_str_unsafe('username'), 0, 32);
     $username_safe = db_escape($username);
-    if($username && $user['username'] != $username && $config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_NONE && sys_get_param_int('username_confirm') && !strpbrk($username, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
+    if ($username && $user['username'] != $username && $config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_NONE && sys_get_param_int('username_confirm') && !strpbrk($username, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
       // проверка на корректность
       sn_db_transaction_start();
       $name_check = db_player_name_history_get_name_by_name($username_safe);
-      if(!$name_check || $name_check['player_id'] == $user['id']) {
+      if (!$name_check || $name_check['player_id'] == $user['id']) {
         $user = db_user_by_id($user['id'], true);
-        switch($config->game_user_changename) {
+        switch ($config->game_user_changename) {
           case SERVER_PLAYER_NAME_CHANGE_PAY:
-            if(mrc_get_level($user, $planetrow, RES_DARK_MATTER) < $config->game_user_changename_cost) {
+            if (mrc_get_level($user, $planetrow, RES_DARK_MATTER) < $config->game_user_changename_cost) {
               $template_result['.']['result'][] = array(
                 'STATUS'  => ERR_ERROR,
                 'MESSAGE' => $lang['opt_msg_name_change_err_no_dm'],
@@ -140,18 +140,18 @@ 
       sn_db_transaction_commit();
     }
 
-    if($new_password = sys_get_param('newpass1')) {
+    if ($new_password = sys_get_param('newpass1')) {
       try {
-        if($new_password != sys_get_param('newpass2')) {
+        if ($new_password != sys_get_param('newpass2')) {
           throw new Exception($lang['opt_err_pass_unmatched'], ERR_WARNING);
         }
 
-        if(!classSupernova::$auth->password_change(sys_get_param('db_password'), $new_password)) {
+        if (!classSupernova::$auth->password_change(sys_get_param('db_password'), $new_password)) {
           throw new Exception($lang['opt_err_pass_wrong'], ERR_WARNING);
         }
 
         throw new Exception($lang['opt_msg_pass_changed'], ERR_NONE);
-      } catch(Exception $e) {
+      } catch (Exception $e) {
         $template_result['.']['result'][] = array(
           'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
           'MESSAGE' => $e->getMessage()
@@ -192,12 +192,12 @@ 
     $user['gender'] = $user['gender'] == GENDER_UNKNOWN ? $gender : $user['gender'];
 
     try {
-      if($user['birthday']) {
+      if ($user['birthday']) {
         throw new exception();
       }
 
       $user_birthday = sys_get_param_str_unsafe('user_birthday');
-      if(!$user_birthday || $user_birthday == $FMT_DATE) {
+      if (!$user_birthday || $user_birthday == $FMT_DATE) {
         throw new exception();
       }
 
@@ -207,16 +207,16 @@ 
       $pos['Y'] = strpos(FMT_DATE, 'Y');
       asort($pos);
       $i = 0;
-      foreach($pos as &$position) {
+      foreach ($pos as &$position) {
         $position = ++$i;
       }
 
       $regexp = "/" . preg_replace(array('/\\\\/', '/\//', '/\./', '/\-/', '/d/', '/m/', '/Y/'), array('\\\\\\', '\/', '\.', '\-', '(\d?\d)', '(\d?\d)', '(\d{4})'), FMT_DATE) . "/";
-      if(!preg_match($regexp, $user_birthday, $match)) {
+      if (!preg_match($regexp, $user_birthday, $match)) {
         throw new exception();
       }
 
-      if(!checkdate($match[$pos['m']], $match[$pos['d']], $match[$pos['Y']])) {
+      if (!checkdate($match[$pos['m']], $match[$pos['d']], $match[$pos['Y']])) {
         throw new exception();
       }
 
@@ -224,13 +224,13 @@ 
       // EOF black magic! Now we have valid SQL date in $user['user_birthday'] - independent of date format
 
       $year = date('Y', SN_TIME_NOW);
-      if(mktime(0, 0, 0, $match[$pos['m']], $match[$pos['d']], $year) > SN_TIME_NOW) {
+      if (mktime(0, 0, 0, $match[$pos['m']], $match[$pos['d']], $year) > SN_TIME_NOW) {
         $year--;
       }
       $user['user_birthday_celebrated'] = db_escape("{$year}-{$match[$pos['m']]}-{$match[$pos['d']]}");
 
       $user_birthday = ", `user_birthday` = '{$user['user_birthday']}', `user_birthday_celebrated` = '{$user['user_birthday_celebrated']}'";
-    } catch(exception $e) {
+    } catch (exception $e) {
       $user_birthday = '';
     }
 
@@ -240,14 +240,14 @@ 
     $template_result['.']['result'][] = $avatar_upload_result;
 
     $user_time_diff = playerTimeDiff::user_time_diff_get();
-    if(sys_get_param_int('PLAYER_OPTION_TIME_DIFF_FORCED')) {
+    if (sys_get_param_int('PLAYER_OPTION_TIME_DIFF_FORCED')) {
       playerTimeDiff::user_time_diff_set(array(
         PLAYER_OPTION_TIME_DIFF              => sys_get_param_int('PLAYER_OPTION_TIME_DIFF'),
         PLAYER_OPTION_TIME_DIFF_UTC_OFFSET   => 0,
         PLAYER_OPTION_TIME_DIFF_FORCED       => 1,
         PLAYER_OPTION_TIME_DIFF_MEASURE_TIME => SN_TIME_SQL,
       ));
-    } elseif(sys_get_param_int('opt_time_diff_clear') || $user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
+    } elseif (sys_get_param_int('opt_time_diff_clear') || $user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
       playerTimeDiff::user_time_diff_set(array(
         PLAYER_OPTION_TIME_DIFF              => '',
         PLAYER_OPTION_TIME_DIFF_UTC_OFFSET   => 0,
@@ -267,7 +267,7 @@ 
       'STATUS'  => ERR_NONE,
       'MESSAGE' => $lang['opt_msg_saved']
     );
-  } elseif(sys_get_param_str('result') == 'ok') {
+  } elseif (sys_get_param_str('result') == 'ok') {
     $template_result['.']['result'][] = array(
       'STATUS'  => ERR_NONE,
       'MESSAGE' => $lang['opt_msg_saved']
@@ -295,8 +295,8 @@ 
 //  );
 
   $dir = dir(SN_ROOT_PHYSICAL . 'skins');
-  while(($entry = $dir->read()) !== false) {
-    if(is_dir("skins/{$entry}") && $entry[0] != '.') {
+  while (($entry = $dir->read()) !== false) {
+    if (is_dir("skins/{$entry}") && $entry[0] != '.') {
       $template_result['.']['skin_list'][] = array(
         'VALUE'    => $entry,
         'NAME'     => $entry,
@@ -306,7 +306,7 @@ 
   }
   $dir->close();
 
-  foreach($lang['opt_planet_sort_options'] as $key => &$value) {
+  foreach ($lang['opt_planet_sort_options'] as $key => &$value) {
     $template_result['.']['planet_sort_options'][] = array(
       'VALUE'    => $key,
       'NAME'     => $value,
@@ -322,7 +322,7 @@ 
       );
     }
   */
-  foreach($lang['sys_gender_list'] as $key => $value) {
+  foreach ($lang['sys_gender_list'] as $key => $value) {
     $template_result['.']['gender_list'][] = array(
       'VALUE'    => $key,
       'NAME'     => $value,
@@ -331,7 +331,7 @@ 
   }
 
   $lang_list = lng_get_list();
-  foreach($lang_list as $lang_id => $lang_data) {
+  foreach ($lang_list as $lang_id => $lang_data) {
     $template_result['.']['languages'][] = array(
       'VALUE'    => $lang_id,
       'NAME'     => $lang_data['LANG_NAME_NATIVE'],
@@ -340,8 +340,8 @@ 
   }
 
 
-  if(isset($lang['menu_customize_show_hide_button_state'])) {
-    foreach($lang['menu_customize_show_hide_button_state'] as $key => $value) {
+  if (isset($lang['menu_customize_show_hide_button_state'])) {
+    foreach ($lang['menu_customize_show_hide_button_state'] as $key => $value) {
       $template->assign_block_vars('menu_customize_show_hide_button_state', array(
         'ID'   => $key,
         'NAME' => $value,
@@ -451,10 +451,10 @@ 
     'PAGE_HEADER' => $lang['opt_header'],
   ));
 
-  foreach($user_option_list as $option_group_id => $option_group) {
-    if($option_group_id == OPT_MESSAGE) {
-      foreach($sn_message_class_list as $message_class_id => $message_class_data) {
-        if($message_class_data['switchable'] || ($message_class_data['email'] && $config->game_email_pm)) {
+  foreach ($user_option_list as $option_group_id => $option_group) {
+    if ($option_group_id == OPT_MESSAGE) {
+      foreach ($sn_message_class_list as $message_class_id => $message_class_data) {
+        if ($message_class_data['switchable'] || ($message_class_data['email'] && $config->game_email_pm)) {
           $option_name = $message_class_data['name'];
 
           $template->assign_block_vars("options_{$option_group_id}", array(
@@ -466,8 +466,8 @@ 
         }
       }
     } else {
-      foreach($option_group as $option_name => $option_value) {
-        if(array_key_exists($option_name, $user_option_types)) {
+      foreach ($option_group as $option_name => $option_value) {
+        if (array_key_exists($option_name, $user_option_types)) {
           $option_type = $user_option_types[$option_name];
         } else {
           $option_type = 'switch';

includes/pages/chat.php

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php
 /**
- * chat.php
- * Main chat window
- *
- * Changelog:
- * 4.0 copyright © 2009-2012 Gorlum for http://supernova.ws
- * [!] Another rewrite
- * [+] preMVC-compatible
- * 3.0 copyright © 2009-2011 Gorlum for http://supernova.ws
- * [!] Almost full rewrote
- * [+] Complies with PCG1
- * 2.0 copyright © 2009-2010 Gorlum for http://supernova.ws
- * [+] Rewrote to remove unnecessary code dupes
- * 1.5 copyright © 2009-2010 Gorlum for http://supernova.ws
- * [~] More DDoS-realted fixes
- * 1.4 copyright © 2009-2010 Gorlum for http://supernova.ws
- * [~] DDoS-realted fixes
- * 1.3 copyright © 2009-2010 Gorlum for http://supernova.ws
- * [~] Security checks for SQL-injection
- * 1.2 by Ihor
- * 1.0 Shoutbox copyright © 2008 by e-Zobar for XNova
- **/
+   * chat.php
+   * Main chat window
+   *
+   * Changelog:
+   * 4.0 copyright © 2009-2012 Gorlum for http://supernova.ws
+   * [!] Another rewrite
+   * [+] preMVC-compatible
+   * 3.0 copyright © 2009-2011 Gorlum for http://supernova.ws
+   * [!] Almost full rewrote
+   * [+] Complies with PCG1
+   * 2.0 copyright © 2009-2010 Gorlum for http://supernova.ws
+   * [+] Rewrote to remove unnecessary code dupes
+   * 1.5 copyright © 2009-2010 Gorlum for http://supernova.ws
+   * [~] More DDoS-realted fixes
+   * 1.4 copyright © 2009-2010 Gorlum for http://supernova.ws
+   * [~] DDoS-realted fixes
+   * 1.3 copyright © 2009-2010 Gorlum for http://supernova.ws
+   * [~] Security checks for SQL-injection
+   * 1.2 by Ihor
+   * 1.0 Shoutbox copyright © 2008 by e-Zobar for XNova
+   **/
 /*
 $sn_mvc['model']['chat'][] = 'sn_chat_model';
 $sn_mvc['model']['chat_add'][] = 'sn_chat_add_model';

Spacing +13 added lines, -13 removed lines

@@ -36,7 +36,7 @@ 
   $user_auth_level = isset($user['authlevel']) ? $user['authlevel'] : AUTH_LEVEL_ANONYMOUS;
 
   $mode = sys_get_param_int('mode');
-  switch($mode) {
+  switch ($mode) {
     case CHAT_MODE_ALLY:
       $template_result['ALLY'] = intval($user['ally_id']);
       $page_title = $lang['chat_ally'];
@@ -49,12 +49,12 @@ 
   }
 
   $template_result['.']['smiles'] = array();
-  foreach($supernova->design['smiles'] as $auth_level => $replaces) {
-    if($auth_level > $user_auth_level) {
+  foreach ($supernova->design['smiles'] as $auth_level => $replaces) {
+    if ($auth_level > $user_auth_level) {
       continue;
     }
 
-    foreach($replaces as $bbcode => $filename) {
+    foreach ($replaces as $bbcode => $filename) {
       $template_result['.']['smiles'][] = array(
         'BBCODE'   => $bbcode,
         'FILENAME' => $filename,
@@ -77,11 +77,11 @@ 
   define('IN_AJAX', true);
   $skip_fleet_update = true;
 
-  if($config->_MODE != CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout) {
+  if ($config->_MODE != CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout) {
     die();
   }
 
-  if(($message = sys_get_param_str('message')) && $user['username']) {
+  if (($message = sys_get_param_str('message')) && $user['username']) {
     $ally_id = sys_get_param('ally') && $user['ally_id'] ? $user['ally_id'] : 0;
     $nick = db_escape(player_nick_compact(player_nick_render_current_to_array($user, array('color' => true, 'icons' => true, 'ally' => !$ally_id))));
 
@@ -102,7 +102,7 @@ 
   $skip_fleet_update = true;
 
   $history = sys_get_param_str('history');
-  if(!$history) {
+  if (!$history) {
     $config->array_set('users', $user['id'], 'chat_last_refresh', SN_TIME_MICRO);
   }
 
@@ -110,7 +110,7 @@ 
   $last_message = '';
   $alliance = 0;
   $template_result['.']['chat'] = array();
-  if(!$history && $config->_MODE != CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout) {
+  if (!$history && $config->_MODE != CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout) {
     $result['disable'] = true;
     $template_result['.']['chat'][] = array(
       'TIME'    => date(FMT_DATE_TIME, htmlentities(SN_CLIENT_TIME_LOCAL, ENT_QUOTES, 'utf-8')),
@@ -123,11 +123,11 @@ 
 
     $where_add = '';
     $last_message = 0;
-    if($history) {
+    if ($history) {
       $rows = db_chat_message_count_by_ally($alliance);
       $page_count = ceil($rows['CNT'] / $page_limit);
 
-      for($i = 0; $i < $page_count; $i++) {
+      for ($i = 0; $i < $page_count; $i++) {
         $template_result['.']['page'][] = array(
           'NUMBER' => $i
         );
@@ -141,12 +141,12 @@ 
 
     $start_row = $page * $page_limit;
     $query = db_chat_message_get_page($alliance, $where_add, $start_row, $page_limit);
-    while($chat_row = db_fetch($query)) {
+    while ($chat_row = db_fetch($query)) {
       // Little magik here - to retain HTML codes from DB and stripping HTML codes from nick
       $chat_row['user'] = player_nick_render_to_html($chat_row['user']);
       $nick_stripped = htmlentities(strip_tags($chat_row['user']), ENT_QUOTES, 'utf-8');
       $nick = str_replace(strip_tags($chat_row['user']), $nick_stripped, $chat_row['user']);
-      if(!$history) {
+      if (!$history) {
         $nick = "<span style=\"cursor: pointer;\" onclick=\"addSmiley('({$nick_stripped})');\">{$nick}</span>";
       }
 
@@ -171,7 +171,7 @@ 
   $template = gettemplate('chat_messages', $template);
   $template->assign_recursive($template_result);
 
-  if($history) {
+  if ($history) {
     display($template, "{$lang['chat_history']} - {$lang[$alliance ? 'chat_ally' : 'chat_common']}", true, '', false, true);
   } else {
     $result['last_message'] = $last_message;

includes/alliance/ali_internal_admin_diplomacy.inc

Spacing +20 added lines, -20 removed lines

@@ -1,10 +1,10 @@ 
 <?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_can_negotiate) {
+if (!$user_can_negotiate) {
   message($lang['Denied_access'], $lang['ali_dip_title']);
 }
 
@@ -15,24 +15,24 @@ 
 
 
 
-if(sys_get_param_str('ali_dip_offer_make')) {
+if (sys_get_param_str('ali_dip_offer_make')) {
   $alliance_negotiation_relation = sys_get_param_str('alliance_negotiation_relation');
-  if(!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list)) {
+  if (!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list)) {
     message($lang['ali_dip_err_wrong_offer'], $page_title);
   }
 
   $alliance_negotiation_contr_ally_id = sys_get_param_id('alliance_negotiation_contr_ally_id');
-  if($alliance_negotiation_contr_ally_id == $user['ally_id']) {
+  if ($alliance_negotiation_contr_ally_id == $user['ally_id']) {
     message($lang['ali_dip_err_same_ally'], $page_title);
   }
 
   $contr_ally_row = db_ally_get_by_id($alliance_negotiation_contr_ally_id);
-  if(!$contr_ally_row) {
+  if (!$contr_ally_row) {
     message($lang['ali_dip_err_no_ally'], $page_title);
   }
 
   $relation_current_id = ali_relation($user['ally_id'], $alliance_negotiation_contr_ally_id);
-  if($alliance_negotiation_relation == $relation_current_id) {
+  if ($alliance_negotiation_relation == $relation_current_id) {
     message(sprintf($lang['ali_dip_err_offer_same'], $lang['ali_dip_relations'][$alliance_negotiation_relation]), $page_title);
   }
 
@@ -43,7 +43,7 @@ 
 
   $relation_new = $sn_diplomacy_relation_list[$alliance_negotiation_relation];
   $relation_current = $sn_diplomacy_relation_list[$relation_current_id];
-  if($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1) {
+  if ($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1) {
     sn_db_perform('{{alliance_negotiation}}',
       array(
         'alliance_negotiation_ally_id'         => $user['ally_id'],
@@ -70,33 +70,33 @@ 
   }
 } else {
   $offer_id = sys_get_param_id('offer_id');
-  if($offer_id) {
+  if ($offer_id) {
     $offer_answer = sys_get_param_str('answer');
 
     $negotiation = db_ally_negotiation_get_by_offer_id($offer_id);
-    if(!$negotiation) {
+    if (!$negotiation) {
       message($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
       message($lang['ali_dip_err_offer_alien'], $page_title);
-    } elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id']) {
-      if($offer_answer == 'accept') {
+    } elseif ($negotiation['alliance_negotiation_ally_id'] == $user['ally_id']) {
+      if ($offer_answer == 'accept') {
         // TODO: Add log of hack attempt
         message($lang['ali_dip_err_offer_accept_own'], $page_title);
-      } elseif($offer_answer == 'deny') {
+      } elseif ($offer_answer == 'deny') {
         db_ally_negotiation_delete_by_offer_id($offer_id);
       }
     } else {
-      if($offer_answer == 'accept') {
+      if ($offer_answer == 'accept') {
         $accept_offer = true;
-      } elseif($offer_answer == 'deny') {
+      } elseif ($offer_answer == 'deny') {
         db_ally_negotiation_update_status_1($offer_id);
       }
     }
   }
 }
 
-if($accept_offer) {
+if ($accept_offer) {
   sn_db_transaction_start();
 
   // TODO: Make sn_db_perform() multirow
@@ -125,7 +125,7 @@ 
   sn_db_transaction_commit();
 }
 
-foreach($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation) {
+foreach ($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation) {
   $template->assign_block_vars('relation', array(
     'ID'   => $diplomacy_relation_id,
     'TEXT' => $lang['ali_dip_relations'][$diplomacy_relation_id],
@@ -134,7 +134,7 @@ 
 
 
 $query = db_ally_list_get_by_not_user_ally($user);
-while($alliance = db_fetch($query)) {
+while ($alliance = db_fetch($query)) {
   $template->assign_block_vars('alliance', array(
     'ID'   => $alliance['id'],
     'NAME' => js_safe_string($alliance['ally_name']),
@@ -143,7 +143,7 @@ 
 }
 
 $query = db_ally_negotiation_list($user);
-while($offer = db_fetch($query)) {
+while ($offer = db_fetch($query)) {
   $template->assign_block_vars('offer', array(
     'ID'       => $offer['alliance_negotiation_id'],
     'NAME'     => $offer['ally_name'],

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);
 }
 
@@ -11,13 +11,13 @@ 
 $ally_name_raw = sys_get_param_str_unsafe('name');
 $ally_name = db_escape($ally_name_raw);
 
-if($ally_tag) {
-  if(!$ally_name_raw || !$ally_tag_raw) {
+if ($ally_tag) {
+  if (!$ally_name_raw || !$ally_tag_raw) {
     message($lang['have_not_name'], $lang['make_alliance']);
   }
 
   $query = db_ally_get_by_name_or_tag($ally_tag, $ally_name);
-  if($query) {
+  if ($query) {
     message(str_replace('%s', $query['ally_tag'] == $ally_tag_raw ? $ally_tag_raw : $ally_name_raw, $lang['always_exist']), $lang['make_alliance']);
   }