supernova-ws / SuperNova

phalanx.php

Spacing +8 added lines, -8 removed lines

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

admin/adm_planet_list.php

Spacing +5 added lines, -6 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
@@ -9,12 +9,12 @@ 
 global $config, $lang, $user;
 
 // if($user['authlevel'] < 1)
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
 $planet_active = sys_get_param_int('planet_active');
-if(!$planet_active) {
+if (!$planet_active) {
   $planet_type = sys_get_param_int('planet_type', 1);
   $planet_type = $planet_type == 3 ? 3 : 1;
 } else {
@@ -43,8 +43,7 @@ 
 
 $page_title =
   classLocale::$lang['adm_planet_list_title'] . ': ' .
-  ($planet_active ? classLocale::$lang['adm_planet_active'] :
-    ($planet_type ? ($planet_type == 3 ? classLocale::$lang['sys_moons'] : classLocale::$lang['sys_planets']) : '')
+  ($planet_active ? classLocale::$lang['adm_planet_active'] : ($planet_type ? ($planet_type == 3 ? classLocale::$lang['sys_moons'] : classLocale::$lang['sys_planets']) : '')
   );
 $template->assign_vars(array(
   'PAGE_TITLE' => $page_title,

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(classLocale::$lang[$result_message])) {
+if (($result_message = sys_get_param_str('MESSAGE')) && isset(classLocale::$lang[$result_message])) {
   $result[] = array('STATUS' => sys_get_param_int('STATUS'), 'MESSAGE' => classLocale::$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' => classLocale::$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(classLocale::$lang['note_new_title']) ? $note_title = '' : false;
   ($note_text = sys_get_param_str('note_text')) == db_escape(classLocale::$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(classLocale::$lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
+foreach (classLocale::$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);
 }
 

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(classLocale::$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(classLocale::$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(classLocale::$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::$sn_module_list['payment'] as $module_name => $module) {
-  if(!is_object($module) || !$module->manifest['active']) {
+foreach (sn_module::$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' => classLocale::$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::$sn_module_list['payment']) == 1) {
+} elseif (count(sn_module::$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'        => classLocale::$lang["module_{$module_name}_name"],
@@ -201,10 +201,10 @@ 
   }
 }
 
-foreach(classLocale::$lang['pay_currency_list'] as $key => $value) {
+foreach (classLocale::$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::$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(classLocale::$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,

messages.php

Switch Indentation +122 added lines, -122 removed lines

@@ -48,106 +48,106 @@ 
 }
 
 switch($mode) {
-  case 'write':
-    $error_list = array();
-    $template = gettemplate('msg_message_compose', true);
+    case 'write':
+      $error_list = array();
+      $template = gettemplate('msg_message_compose', true);
 
-    $recipient_name = sys_get_param_str_unsafe('recipient_name');
-    if($recipient_name) {
-      $recipient_row = db_user_by_username($recipient_name);
-    }
+      $recipient_name = sys_get_param_str_unsafe('recipient_name');
+      if($recipient_name) {
+        $recipient_row = db_user_by_username($recipient_name);
+      }
 
-    if(!$recipient_row) {
-      $recipient_id = sys_get_param_id('id');
-      $recipient_row = db_user_by_id($recipient_id);
       if(!$recipient_row) {
-        $recipient_id = 0;
+        $recipient_id = sys_get_param_id('id');
+        $recipient_row = db_user_by_id($recipient_id);
+        if(!$recipient_row) {
+          $recipient_id = 0;
+        }
       }
-    }
-
-    if($recipient_row) {
-      $recipient_id = $recipient_row['id'];
-      $recipient_name = $recipient_row['username'];
-    }
-
-    if($recipient_id == $user['id']) {
-      $error_list[] = array('MESSAGE' => classLocale::$lang['msg_err_self_send'], 'STATUS' => ERR_ERROR);
-    }
-
-    $re = 0;
-    $subject = sys_get_param_str('subject');
-    while(strpos($subject, classLocale::$lang['msg_answer_prefix']) !== false) {
-      $subject = substr($subject, strlen(classLocale::$lang['msg_answer_prefix']));
-      $re++;
-    }
-    $re ? $subject = classLocale::$lang['msg_answer_prefix'] . $subject : false;
 
-    if(sys_get_param_str('msg_send')) {
-      $subject = $subject ? $subject : classLocale::$lang['msg_subject_default'];
+      if($recipient_row) {
+        $recipient_id = $recipient_row['id'];
+        $recipient_name = $recipient_row['username'];
+      }
 
-      if(!$recipient_id) {
-        $error_list[] = array('MESSAGE' => classLocale::$lang['msg_err_player_not_found'], 'STATUS' => ERR_ERROR);
+      if($recipient_id == $user['id']) {
+        $error_list[] = array('MESSAGE' => classLocale::$lang['msg_err_self_send'], 'STATUS' => ERR_ERROR);
       }
 
-      $text = sys_get_param_str('text');
-      if(!$text) {
-        $error_list[] = array('MESSAGE' => classLocale::$lang['msg_err_no_text'], 'STATUS' => ERR_ERROR);
+      $re = 0;
+      $subject = sys_get_param_str('subject');
+      while(strpos($subject, classLocale::$lang['msg_answer_prefix']) !== false) {
+        $subject = substr($subject, strlen(classLocale::$lang['msg_answer_prefix']));
+        $re++;
       }
+      $re ? $subject = classLocale::$lang['msg_answer_prefix'] . $subject : false;
 
-      if(empty($error_list)) {
-        $error_list[] = array('MESSAGE' => classLocale::$lang['msg_not_message_sent'], 'STATUS' => ERR_NONE);
+      if(sys_get_param_str('msg_send')) {
+        $subject = $subject ? $subject : classLocale::$lang['msg_subject_default'];
 
-        $user_safe_name = db_escape($user['username']);
-        $recipient_name = db_escape($recipient_name);
-        msg_send_simple_message($recipient_id, $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, "{$user_safe_name} [{$user['galaxy']}:{$user['system']}:{$user['planet']}]", $subject, $text, true);
+        if(!$recipient_id) {
+          $error_list[] = array('MESSAGE' => classLocale::$lang['msg_err_player_not_found'], 'STATUS' => ERR_ERROR);
+        }
 
-        //$recipient_id = 0;
-        //$recipient_name = '';
-        //$subject = '';
-        $text = '';
+        $text = sys_get_param_str('text');
+        if(!$text) {
+          $error_list[] = array('MESSAGE' => classLocale::$lang['msg_err_no_text'], 'STATUS' => ERR_ERROR);
+        }
 
-        $msg_sent = true;
-      } else {
-        $subject = sys_get_param_str_unsafe('subject');
-        $text = sys_get_param_str_unsafe('text');
-      }
-      $recipient_name = sys_get_param_str_unsafe('recipient_name');
-    }
+        if(empty($error_list)) {
+          $error_list[] = array('MESSAGE' => classLocale::$lang['msg_not_message_sent'], 'STATUS' => ERR_NONE);
 
-    $subject = $subject ? $subject : classLocale::$lang['msg_subject_default'];
+          $user_safe_name = db_escape($user['username']);
+          $recipient_name = db_escape($recipient_name);
+          msg_send_simple_message($recipient_id, $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, "{$user_safe_name} [{$user['galaxy']}:{$user['system']}:{$user['planet']}]", $subject, $text, true);
 
-    $template->assign_vars(array(
-      'RECIPIENT_ID'   => $recipient_id,
-      'RECIPIENT_NAME' => htmlspecialchars($recipient_name),
-      'SUBJECT'        => htmlspecialchars($subject),
-      'TEXT'           => htmlspecialchars($text),
-    ));
+          //$recipient_id = 0;
+          //$recipient_name = '';
+          //$subject = '';
+          $text = '';
 
-    foreach($error_list as $error_message) {
-      $template->assign_block_vars('result', $error_message);
-    }
+          $msg_sent = true;
+        } else {
+          $subject = sys_get_param_str_unsafe('subject');
+          $text = sys_get_param_str_unsafe('text');
+        }
+        $recipient_name = sys_get_param_str_unsafe('recipient_name');
+      }
 
-    $message_query = db_message_list_get_last_20($user, $recipient_id);
-    while($message_row = db_fetch($message_query)) {
-      $template->assign_block_vars('messages', array(
-        'ID'   => $message_row['message_id'],
-        'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
-        'FROM' => htmlspecialchars($message_row['message_from']),
-        'SUBJ' => htmlspecialchars($message_row['message_subject']),
-        'TEXT' => in_array($message_row['message_type'], array(MSG_TYPE_PLAYER, MSG_TYPE_ALLIANCE)) && $message_row['message_sender'] ? nl2br(htmlspecialchars($message_row['message_text'])) : nl2br($message_row['message_text']),
+      $subject = $subject ? $subject : classLocale::$lang['msg_subject_default'];
 
-        'FROM_ID' => $message_row['message_sender'],
+      $template->assign_vars(array(
+        'RECIPIENT_ID'   => $recipient_id,
+        'RECIPIENT_NAME' => htmlspecialchars($recipient_name),
+        'SUBJECT'        => htmlspecialchars($subject),
+        'TEXT'           => htmlspecialchars($text),
       ));
-    }
 
-  break;
+      foreach($error_list as $error_message) {
+        $template->assign_block_vars('result', $error_message);
+      }
+
+      $message_query = db_message_list_get_last_20($user, $recipient_id);
+      while($message_row = db_fetch($message_query)) {
+        $template->assign_block_vars('messages', array(
+          'ID'   => $message_row['message_id'],
+          'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
+          'FROM' => htmlspecialchars($message_row['message_from']),
+          'SUBJ' => htmlspecialchars($message_row['message_subject']),
+          'TEXT' => in_array($message_row['message_type'], array(MSG_TYPE_PLAYER, MSG_TYPE_ALLIANCE)) && $message_row['message_sender'] ? nl2br(htmlspecialchars($message_row['message_text'])) : nl2br($message_row['message_text']),
+
+          'FROM_ID' => $message_row['message_sender'],
+        ));
+      }
 
-  case 'delete':
-    $query_add = '';
+    break;
 
-    $message_range = sys_get_param_str('message_range');
+    case 'delete':
+      $query_add = '';
 
-    switch($message_range) {
+      $message_range = sys_get_param_str('message_range');
+
+      switch($message_range) {
       case 'unchecked':
       case 'checked':
         $marked_message_list = sys_get_param('mark', array());
@@ -171,65 +171,65 @@ 
       case 'all':
         $query_add = $query_add ? $query_add : true;
       break;
-    }
+      }
 
     if($query_add) {
       $query_add = $query_add === true ? '' : $query_add;
       db_message_list_delete($user, $query_add);
     }
 
-  case 'show':
-    if($current_class == MSG_TYPE_OUTBOX) {
-      $message_query = db_message_list_outbox_by_user_id($user['id']);
-    } else {
-      if($current_class == MSG_TYPE_NEW) {
-        $SubUpdateQry = array();
-        foreach($sn_message_class_list as $message_class_id => $message_class) {
-          if($message_class_id != MSG_TYPE_OUTBOX) {
-            $SubUpdateQry[] = "`{$message_class['name']}` = '0'";
-            $user[$message_class['name']] = 0;
+    case 'show':
+      if($current_class == MSG_TYPE_OUTBOX) {
+        $message_query = db_message_list_outbox_by_user_id($user['id']);
+      } else {
+        if($current_class == MSG_TYPE_NEW) {
+          $SubUpdateQry = array();
+          foreach($sn_message_class_list as $message_class_id => $message_class) {
+            if($message_class_id != MSG_TYPE_OUTBOX) {
+              $SubUpdateQry[] = "`{$message_class['name']}` = '0'";
+              $user[$message_class['name']] = 0;
+            }
           }
+          $SubUpdateQry = implode(',', $SubUpdateQry);
+        } else {
+          $SubUpdateQry = "`{$sn_message_class_list[$current_class]['name']}` = '0', `{$sn_message_class_list[MSG_TYPE_NEW]['name']}` = `{$sn_message_class_list[MSG_TYPE_NEW]['name']}` - '{$user[$sn_message_class_list[$current_class]['name']]}'";
+          $SubSelectQry = "AND `message_type` = '{$current_class}'";
+
+          $user[$sn_message_class_list[MSG_TYPE_NEW]['name']] -= $user[$sn_message_class_list[$current_class]['name']];
+          $user[$sn_message_class_list[$current_class]['name']] = 0;
         }
-        $SubUpdateQry = implode(',', $SubUpdateQry);
-      } else {
-        $SubUpdateQry = "`{$sn_message_class_list[$current_class]['name']}` = '0', `{$sn_message_class_list[MSG_TYPE_NEW]['name']}` = `{$sn_message_class_list[MSG_TYPE_NEW]['name']}` - '{$user[$sn_message_class_list[$current_class]['name']]}'";
-        $SubSelectQry = "AND `message_type` = '{$current_class}'";
 
-        $user[$sn_message_class_list[MSG_TYPE_NEW]['name']] -= $user[$sn_message_class_list[$current_class]['name']];
-        $user[$sn_message_class_list[$current_class]['name']] = 0;
+        db_user_set_by_id($user['id'], $SubUpdateQry);
+        $message_query = db_message_list_by_owner_and_string($user, $SubSelectQry);
       }
 
-      db_user_set_by_id($user['id'], $SubUpdateQry);
-      $message_query = db_message_list_by_owner_and_string($user, $SubSelectQry);
-    }
-
-    if(sys_get_param_int('return')) {
-      header('Location: messages.php');
-      die();
-    }
+      if(sys_get_param_int('return')) {
+        header('Location: messages.php');
+        die();
+      }
 
-    $template = gettemplate('msg_message_list', true);
-    while($message_row = db_fetch($message_query)) {
-      $template->assign_block_vars('messages', array(
-        'ID'   => $message_row['message_id'],
-        'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
-        'FROM' => htmlspecialchars($message_row['message_from']),
-        'SUBJ' => htmlspecialchars($message_row['message_subject']),
-        'TEXT' => in_array($message_row['message_type'], array(MSG_TYPE_PLAYER, MSG_TYPE_ALLIANCE)) && $message_row['message_sender'] ? nl2br(htmlspecialchars($message_row['message_text'])) : nl2br($message_row['message_text']),
-
-        'FROM_ID'        => $message_row['message_sender'],
-        'SUBJ_SANITIZED' => htmlspecialchars($message_row['message_subject']),
-        'STYLE'          => $current_class == MSG_TYPE_OUTBOX ? $sn_message_class_list[MSG_TYPE_OUTBOX]['name'] : $sn_message_class_list[$message_row['message_type']]['name'],
-      ));
-    }
+      $template = gettemplate('msg_message_list', true);
+      while($message_row = db_fetch($message_query)) {
+        $template->assign_block_vars('messages', array(
+          'ID'   => $message_row['message_id'],
+          'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
+          'FROM' => htmlspecialchars($message_row['message_from']),
+          'SUBJ' => htmlspecialchars($message_row['message_subject']),
+          'TEXT' => in_array($message_row['message_type'], array(MSG_TYPE_PLAYER, MSG_TYPE_ALLIANCE)) && $message_row['message_sender'] ? nl2br(htmlspecialchars($message_row['message_text'])) : nl2br($message_row['message_text']),
+
+          'FROM_ID'        => $message_row['message_sender'],
+          'SUBJ_SANITIZED' => htmlspecialchars($message_row['message_subject']),
+          'STYLE'          => $current_class == MSG_TYPE_OUTBOX ? $sn_message_class_list[MSG_TYPE_OUTBOX]['name'] : $sn_message_class_list[$message_row['message_type']]['name'],
+        ));
+      }
 
-    $current_class_text = classLocale::$lang['msg_class'][$current_class];
+      $current_class_text = classLocale::$lang['msg_class'][$current_class];
 
-    $template->assign_vars(array(
-      "MESSAGE_CLASS"      => $current_class,
-      "MESSAGE_CLASS_TEXT" => $current_class_text,
-    ));
-  break;
+      $template->assign_vars(array(
+        "MESSAGE_CLASS"      => $current_class,
+        "MESSAGE_CLASS_TEXT" => $current_class_text,
+      ));
+    break;
 }
 
 if(!$template) {

Spacing +29 added lines, -29 removed lines

@@ -42,59 +42,59 @@ 
 
 $mode = sys_get_param_str('msg_delete') ? 'delete' : sys_get_param_str('mode');
 $current_class = sys_get_param_int('message_class');
-if(!isset($sn_message_class_list[$current_class])) {
+if (!isset($sn_message_class_list[$current_class])) {
   $current_class = 0;
   $mode = '';
 }
 
-switch($mode) {
+switch ($mode) {
   case 'write':
     $error_list = array();
     $template = gettemplate('msg_message_compose', true);
 
     $recipient_name = sys_get_param_str_unsafe('recipient_name');
-    if($recipient_name) {
+    if ($recipient_name) {
       $recipient_row = db_user_by_username($recipient_name);
     }
 
-    if(!$recipient_row) {
+    if (!$recipient_row) {
       $recipient_id = sys_get_param_id('id');
       $recipient_row = db_user_by_id($recipient_id);
-      if(!$recipient_row) {
+      if (!$recipient_row) {
         $recipient_id = 0;
       }
     }
 
-    if($recipient_row) {
+    if ($recipient_row) {
       $recipient_id = $recipient_row['id'];
       $recipient_name = $recipient_row['username'];
     }
 
-    if($recipient_id == $user['id']) {
+    if ($recipient_id == $user['id']) {
       $error_list[] = array('MESSAGE' => classLocale::$lang['msg_err_self_send'], 'STATUS' => ERR_ERROR);
     }
 
     $re = 0;
     $subject = sys_get_param_str('subject');
-    while(strpos($subject, classLocale::$lang['msg_answer_prefix']) !== false) {
+    while (strpos($subject, classLocale::$lang['msg_answer_prefix']) !== false) {
       $subject = substr($subject, strlen(classLocale::$lang['msg_answer_prefix']));
       $re++;
     }
     $re ? $subject = classLocale::$lang['msg_answer_prefix'] . $subject : false;
 
-    if(sys_get_param_str('msg_send')) {
+    if (sys_get_param_str('msg_send')) {
       $subject = $subject ? $subject : classLocale::$lang['msg_subject_default'];
 
-      if(!$recipient_id) {
+      if (!$recipient_id) {
         $error_list[] = array('MESSAGE' => classLocale::$lang['msg_err_player_not_found'], 'STATUS' => ERR_ERROR);
       }
 
       $text = sys_get_param_str('text');
-      if(!$text) {
+      if (!$text) {
         $error_list[] = array('MESSAGE' => classLocale::$lang['msg_err_no_text'], 'STATUS' => ERR_ERROR);
       }
 
-      if(empty($error_list)) {
+      if (empty($error_list)) {
         $error_list[] = array('MESSAGE' => classLocale::$lang['msg_not_message_sent'], 'STATUS' => ERR_NONE);
 
         $user_safe_name = db_escape($user['username']);
@@ -123,12 +123,12 @@ 
       'TEXT'           => htmlspecialchars($text),
     ));
 
-    foreach($error_list as $error_message) {
+    foreach ($error_list as $error_message) {
       $template->assign_block_vars('result', $error_message);
     }
 
     $message_query = db_message_list_get_last_20($user, $recipient_id);
-    while($message_row = db_fetch($message_query)) {
+    while ($message_row = db_fetch($message_query)) {
       $template->assign_block_vars('messages', array(
         'ID'   => $message_row['message_id'],
         'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
@@ -147,25 +147,25 @@ 
 
     $message_range = sys_get_param_str('message_range');
 
-    switch($message_range) {
+    switch ($message_range) {
       case 'unchecked':
       case 'checked':
         $marked_message_list = sys_get_param('mark', array());
-        if($message_range == 'checked' && empty($marked_message_list)) {
+        if ($message_range == 'checked' && empty($marked_message_list)) {
           break;
         }
 
         $query_add = implode(',', $marked_message_list);
-        if($query_add) {
+        if ($query_add) {
           $query_add = "IN ({$query_add})";
-          if($message_range == 'unchecked') {
+          if ($message_range == 'unchecked') {
             $query_add = "NOT {$query_add}";
           }
           $query_add = " AND `message_id` {$query_add}";
         }
 
       case 'class':
-        if($current_class != MSG_TYPE_OUTBOX && $current_class != MSG_TYPE_NEW) {
+        if ($current_class != MSG_TYPE_OUTBOX && $current_class != MSG_TYPE_NEW) {
           $query_add .= " AND `message_type` = {$current_class}";
         }
       case 'all':
@@ -173,19 +173,19 @@ 
       break;
     }
 
-    if($query_add) {
+    if ($query_add) {
       $query_add = $query_add === true ? '' : $query_add;
       db_message_list_delete($user, $query_add);
     }
 
   case 'show':
-    if($current_class == MSG_TYPE_OUTBOX) {
+    if ($current_class == MSG_TYPE_OUTBOX) {
       $message_query = db_message_list_outbox_by_user_id($user['id']);
     } else {
-      if($current_class == MSG_TYPE_NEW) {
+      if ($current_class == MSG_TYPE_NEW) {
         $SubUpdateQry = array();
-        foreach($sn_message_class_list as $message_class_id => $message_class) {
-          if($message_class_id != MSG_TYPE_OUTBOX) {
+        foreach ($sn_message_class_list as $message_class_id => $message_class) {
+          if ($message_class_id != MSG_TYPE_OUTBOX) {
             $SubUpdateQry[] = "`{$message_class['name']}` = '0'";
             $user[$message_class['name']] = 0;
           }
@@ -203,13 +203,13 @@ 
       $message_query = db_message_list_by_owner_and_string($user, $SubSelectQry);
     }
 
-    if(sys_get_param_int('return')) {
+    if (sys_get_param_int('return')) {
       header('Location: messages.php');
       die();
     }
 
     $template = gettemplate('msg_message_list', true);
-    while($message_row = db_fetch($message_query)) {
+    while ($message_row = db_fetch($message_query)) {
       $template->assign_block_vars('messages', array(
         'ID'   => $message_row['message_id'],
         'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
@@ -232,18 +232,18 @@ 
   break;
 }
 
-if(!$template) {
+if (!$template) {
   $template = gettemplate('msg_message_class', true);
 
   $query = db_message_count_by_owner_and_type($user);
-  while($message_row = db_fetch($query)) {
+  while ($message_row = db_fetch($query)) {
     $messages_total[$message_row['message_type']] = $message_row['message_count'];
     $messages_total[MSG_TYPE_NEW] += $message_row['message_count'];
   }
 
   $messages_total[MSG_TYPE_OUTBOX] = db_message_count_outbox($user);
 
-  foreach($sn_message_class_list as $message_class_id => $message_class) {
+  foreach ($sn_message_class_list as $message_class_id => $message_class) {
     $template->assign_block_vars('message_class', array(
       'ID'     => $message_class_id,
       'STYLE'  => $message_class['name'],

buildings.php

Spacing +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
 $mode = sys_get_param_escaped('mode');
 $mode = (!$mode || $mode == 'buildings') ? QUE_STRUCTURES : ($mode == 'fleet' ? SUBQUE_FLEET : ($mode == 'defense' ? SUBQUE_DEFENSE : ($mode == 'research' ? QUE_RESEARCH : $mode)));
 
-if($building_sort = sys_get_param_id('sort_elements')) {
-  if(!empty(classLocale::$lang['player_option_building_sort'][$building_sort])) {
+if ($building_sort = sys_get_param_id('sort_elements')) {
+  if (!empty(classLocale::$lang['player_option_building_sort'][$building_sort])) {
     classSupernova::$user_options[array(PLAYER_OPTION_BUILDING_SORT, $mode)] = $building_sort;
     classSupernova::$user_options[array(PLAYER_OPTION_BUILDING_SORT_INVERSE, $mode)] = sys_get_param_id('sort_elements_inverse', 0);
   }

includes/classes/core_auth.php

Doc Comments +7 added lines, -1 removed lines

@@ -286,7 +286,6 @@ 
   /**
    * Функция пытается залогиниться по всем известным провайдерам
    *
-   * @param null $result
    */
   public function login() {
     if(empty(sn_module::$sn_module_list['auth'])) {
@@ -823,10 +822,17 @@ 
 
   // OK v4.5
   // TODO - REMEMBER_ME
+
+  /**
+   * @param integer $period
+   */
   protected static function cookie_set($value, $impersonate = false, $period = null) {
     sn_setcookie($impersonate ? SN_COOKIE_U_I : SN_COOKIE_U, $value, $period === null ? SN_TIME_NOW + PERIOD_YEAR : $period, SN_ROOT_RELATIVE);
   }
 
+  /**
+   * @param string $message
+   */
   protected static function flog($message, $die = false) {
     if(!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
       return;

Spacing +62 added lines, -62 removed lines

@@ -199,18 +199,18 @@ 
     // TODO Хотя тут может получится вечный цикл - ПОДУМАТЬ
     // TODO Тут же можно пробовать провести попытку слияния аккаунтов - хотя это и очень небезопасно
 
-    if(sys_get_param('login_player_register_logout')) {
+    if (sys_get_param('login_player_register_logout')) {
       $this->logout();
     }
 
     $original_suggest = '';
     // Смотрим - есть ли у нас данные от пользователя
-    if(($player_name_submitted = sys_get_param('submit_player_name'))) {
+    if (($player_name_submitted = sys_get_param('submit_player_name'))) {
       // Попытка регистрации нового игрока из данных, введенных пользователем
       $this->player_suggested_name = sys_get_param_str_unsafe('player_suggested_name');
     } else {
-      foreach($this->providers_authorised as $provider) {
-        if($this->player_suggested_name = $provider->player_name_suggest()) { // OK 4.5
+      foreach ($this->providers_authorised as $provider) {
+        if ($this->player_suggested_name = $provider->player_name_suggest()) { // OK 4.5
           $original_suggest = $provider->player_name_suggest();
           break;
         }
@@ -218,7 +218,7 @@ 
     }
 
     // Если у нас провайдеры не дают имени и пользователь не дал свой вариант - это у нас первый логин в игру
-    if(!$this->player_suggested_name) {
+    if (!$this->player_suggested_name) {
       $max_user_id = db_player_get_max_id(); // 4.5
       // TODO - предлагать имя игрока по локали
 
@@ -227,15 +227,15 @@ 
         sn_db_transaction_rollback();
         $this->player_suggested_name = 'Emperor ' . mt_rand($max_user_id + 1, $max_user_id + 1000);
         sn_db_transaction_start();
-      } while(db_player_name_exists($this->player_suggested_name));
+      } while (db_player_name_exists($this->player_suggested_name));
 
     }
 
-    if($player_name_submitted) {
+    if ($player_name_submitted) {
       $this->register_player_db_create($this->player_suggested_name); // OK 4.5
-      if($this->register_status == LOGIN_SUCCESS) {
+      if ($this->register_status == LOGIN_SUCCESS) {
         sys_redirect(SN_ROOT_VIRTUAL . 'overview.php');
-      } elseif($this->register_status == REGISTER_ERROR_PLAYER_NAME_EXISTS && $original_suggest == $this->player_suggested_name) {
+      } elseif ($this->register_status == REGISTER_ERROR_PLAYER_NAME_EXISTS && $original_suggest == $this->player_suggested_name) {
         // self::$player_suggested_name .= ' ' . $this->account->account_id;
       }
 //      if(self::$login_status != LOGIN_SUCCESS) {
@@ -259,7 +259,7 @@ 
         : false
       );
 
-    if($this->register_status == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
+    if ($this->register_status == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
       $prohibited_characters = array_map(function($value) {
         return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'";
       }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED));
@@ -289,27 +289,27 @@ 
    * @param null $result
    */
   public function login() {
-    if(empty(sn_module::$sn_module_list['auth'])) {
+    if (empty(sn_module::$sn_module_list['auth'])) {
       die('{Не обнаружено ни одного провайдера авторизации в core_auth::login()!}');
     }
 
     !empty($_POST) ? self::flog(dump($_POST, '$_POST')) : false;
     !empty($_GET) ? self::flog(dump($_GET, '$_GET')) : false;
-    !empty($_COOKIE) ? self::flog(dump($_COOKIE,'$_COOKIE')) : false;
+    !empty($_COOKIE) ? self::flog(dump($_COOKIE, '$_COOKIE')) : false;
 
     $this->auth_reset(); // OK v4.5
 
     $this->providers = array();
-    foreach(sn_module::$sn_module_list['auth'] as $module_name => $module) {
+    foreach (sn_module::$sn_module_list['auth'] as $module_name => $module) {
       $this->providers[$module->provider_id] = $module;
     }
 
     // $this->providers = array_reverse($this->providers, true); // НИНАДА! СН-аккаунт должен всегда авторизироваться первым!
 
-    foreach($this->providers as $provider_id => $provider) {
+    foreach ($this->providers as $provider_id => $provider) {
       $login_status = $provider->login(); // OK v4.5
       self::flog(($provider->manifest['name'] . '->' . 'login_try - ') . (empty($provider->account->account_id) ? classLocale::$lang['sys_login_messages'][$provider->account_login_status] : dump($provider)));
-      if($login_status == LOGIN_SUCCESS && is_object($provider->account) && $provider->account instanceof Account && $provider->account->account_id) {
+      if ($login_status == LOGIN_SUCCESS && is_object($provider->account) && $provider->account instanceof Account && $provider->account->account_id) {
         $this->providers_authorised[$provider_id] = &$this->providers[$provider_id];
 
         $this->user_id_to_provider = array_replace_recursive(
@@ -317,15 +317,15 @@ 
           // static::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id) // OK 4.5
           PlayerToAccountTranslate::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id) // OK 4.5
         );
-      } elseif($login_status != LOGIN_UNDEFINED) {
+      } elseif ($login_status != LOGIN_UNDEFINED) {
         $this->provider_error_list[$provider_id] = $login_status;
       }
     }
 
-    if(empty($this->providers_authorised)) {
+    if (empty($this->providers_authorised)) {
       // Ни один аккаунт не авторизирован
       // Проверяем - есть ли у нас ошибки в аккаунтах?
-      if(!empty($this->provider_error_list)) {
+      if (!empty($this->provider_error_list)) {
         // Если есть - выводим их
         self::$login_status = reset($this->provider_error_list);
       }
@@ -340,12 +340,12 @@ 
       // В self::$accessible_user_row_list - список доступных игроков для данных аккаунтов с соответствующими записями из таблицы `users`
 
       // Остались ли у нас в списке доступные игроки?
-      if(empty($this->accessible_user_row_list)) {
+      if (empty($this->accessible_user_row_list)) {
         // Нет ни одного игрока ни на одном авторизированном аккаунте
         // Надо регать нового игрока
 
         // Сейчас происходит процесс регистрации игрока?
-        if(!$this->is_player_register) {
+        if (!$this->is_player_register) {
           // Нет - отправляем на процесс регистрации
           $partner_id = sys_get_param_int('id_ref', sys_get_param_int('partner_id'));
           sys_redirect(SN_ROOT_VIRTUAL . 'index.php?page=player_register&player_register=1' . ($partner_id ? '&id_ref=' . $partner_id : ''));
@@ -354,7 +354,7 @@ 
         // Да, есть доступные игроки, которые так же прописаны в базе
         $this->get_active_user(); // 4.5
 
-        if($this->is_impersonating = !empty($_COOKIE[SN_COOKIE_U_I]) ? $_COOKIE[SN_COOKIE_U_I] : 0) {
+        if ($this->is_impersonating = !empty($_COOKIE[SN_COOKIE_U_I]) ? $_COOKIE[SN_COOKIE_U_I] : 0) {
           $a_user = db_user_by_id($this->is_impersonating);
           $this->impersonator_username = $a_user['username'];
         }
@@ -362,9 +362,9 @@ 
 
         //Прописываем текущего игрока на все авторизированные аккаунты
         // TODO - ИЛИ ВСЕХ ИГРОКОВ??
-        if(empty($this->is_impersonating)) {
-          foreach($this->providers_authorised as $provider_id => $provider) {
-            if(empty($this->user_id_to_provider[self::$user['id']][$provider_id])) {
+        if (empty($this->is_impersonating)) {
+          foreach ($this->providers_authorised as $provider_id => $provider) {
+            if (empty($this->user_id_to_provider[self::$user['id']][$provider_id])) {
               // self::db_translate_register_user($provider_id, $provider->account->account_id, self::$user['id']);
               PlayerToAccountTranslate::db_translate_register_user($provider_id, $provider->account->account_id, self::$user['id']);
               $this->user_id_to_provider[self::$user['id']][$provider_id][$provider->account->account_id] = true;
@@ -374,9 +374,9 @@ 
       }
     }
 
-    if(empty(self::$user['id'])) {
+    if (empty(self::$user['id'])) {
       self::cookie_set(''); // OK 4.5
-    } elseif(self::$user['id'] != $_COOKIE[SN_COOKIE_U]) {
+    } elseif (self::$user['id'] != $_COOKIE[SN_COOKIE_U]) {
       self::cookie_set(self::$user['id']); // OK 4.5
     }
 
@@ -395,21 +395,21 @@ 
    */
   // OK v4.7
   public function logout($redirect = true) {
-    if(!empty($_COOKIE[SN_COOKIE_U_I])) {
+    if (!empty($_COOKIE[SN_COOKIE_U_I])) {
       self::cookie_set($_COOKIE[SN_COOKIE_U_I]);
       self::cookie_set(0, true);
       self::$main_provider->logout();
     } else {
-      foreach($this->providers as $provider_name => $provider) {
+      foreach ($this->providers as $provider_name => $provider) {
         $provider->logout();
       }
 
       self::cookie_set(0);
     }
 
-    if($redirect === true) {
+    if ($redirect === true) {
       sys_redirect(SN_ROOT_RELATIVE . (empty($_COOKIE[SN_COOKIE_U]) ? 'login.php' : 'admin/overview.php'));
-    } elseif($redirect !== false) {
+    } elseif ($redirect !== false) {
       sys_redirect($redirect);
     }
   }
@@ -420,15 +420,15 @@ 
    * @param $user_selected
    */
   public function impersonate($user_selected) {
-    if($_COOKIE[SN_COOKIE_U_I]) {
+    if ($_COOKIE[SN_COOKIE_U_I]) {
       die('You already impersonating someone. Go back to living other\'s life! Or clear your cookies and try again'); // TODO: Log it
     }
 
-    if($this->auth_level_max_local < AUTH_LEVEL_ADMINISTRATOR) {
+    if ($this->auth_level_max_local < AUTH_LEVEL_ADMINISTRATOR) {
       die('You can\'t impersonate - too low level'); // TODO: Log it
     }
 
-    if($this->auth_level_max_local <= $user_selected['authlevel']) {
+    if ($this->auth_level_max_local <= $user_selected['authlevel']) {
       die('You can\'t impersonate this account - level is greater or equal to yours'); // TODO: Log it
     }
 
@@ -436,7 +436,7 @@ 
     $account_translate = reset($account_translate[$user_selected['id']][self::$main_provider->provider_id]);
     $account_to_impersonate = new Account(self::$main_provider->db);
     $account_to_impersonate->db_get_by_id($account_translate['provider_account_id']);
-    if(!$account_to_impersonate->is_exists) {
+    if (!$account_to_impersonate->is_exists) {
       die('Какая-то ошибка - не могу найти аккаунт для имперсонации'); // TODO: Log it
     }
     self::$main_provider->impersonate($account_to_impersonate);
@@ -462,12 +462,12 @@ 
   public function password_check($password_unsafe) {
     $result = false;
 
-    if(empty($this->providers_authorised)) {
+    if (empty($this->providers_authorised)) {
       // TODO - такого быть не может!
       self::flog("password_check: Не найдено ни одного авторизированного провайдера в self::\$providers_authorised", true);
     } else {
-      foreach($this->providers_authorised as $provider_id => $provider) {
-        if($provider->is_feature_supported(AUTH_FEATURE_HAS_PASSWORD)) {
+      foreach ($this->providers_authorised as $provider_id => $provider) {
+        if ($provider->is_feature_supported(AUTH_FEATURE_HAS_PASSWORD)) {
           $result = $result || $provider->password_check($password_unsafe);
         }
       }
@@ -486,7 +486,7 @@ 
    */
   // OK v4.6
   public function password_change($old_password_unsafe, $new_password_unsafe) {
-    if(empty($this->providers_authorised)) {
+    if (empty($this->providers_authorised)) {
       // TODO - такого быть не может!
       self::flog("Не найдено ни одного авторизированного провайдера в self::\$providers_authorised", true);
       return false;
@@ -499,8 +499,8 @@ 
     $salt_unsafe = self::password_salt_generate();
 
     $providers_changed_password = array();
-    foreach($this->providers_authorised as $provider_id => $provider) {
-      if(
+    foreach ($this->providers_authorised as $provider_id => $provider) {
+      if (
         !$provider->is_feature_supported(AUTH_FEATURE_PASSWORD_CHANGE)
         || !$provider->password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe)
       ) {
@@ -512,7 +512,7 @@ 
       $account_translation = PlayerToAccountTranslate::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id);
 
       // Рассылаем уведомления о смене пароля в ЛС
-      foreach($account_translation as $user_id => $provider_info) {
+      foreach ($account_translation as $user_id => $provider_info) {
         // TODO - УКазывать тип аккаунта, на котором сменён пароль
         msg_send_simple_message($user_id, 0, SN_TIME_NOW, MSG_TYPE_ADMIN,
           classLocale::$lang['sys_administration'], classLocale::$lang['sys_login_register_message_title'],
@@ -559,7 +559,7 @@ 
       sn_db_transaction_start();
       // Проверить наличие такого имени в истории имён
 
-      if(db_player_name_exists($player_name_unsafe)) {
+      if (db_player_name_exists($player_name_unsafe)) {
         throw new Exception(REGISTER_ERROR_PLAYER_NAME_EXISTS, ERR_ERROR);
       }
 
@@ -567,11 +567,11 @@ 
       $player_language = '';
       $player_email = '';
       // TODO - порнография - работа должна происходить над списком аккаунтов, а не только на одном аккаунте...
-      foreach($this->providers_authorised as $provider) {
-        if(!$player_language && $provider->account->account_language) {
+      foreach ($this->providers_authorised as $provider) {
+        if (!$player_language && $provider->account->account_language) {
           $player_language = $provider->account->account_language;
         }
-        if(!$player_email && $provider->account->account_email) {
+        if (!$player_email && $provider->account->account_email) {
           $player_email = $provider->account->account_email;
         }
       }
@@ -587,7 +587,7 @@ 
       ));
       // Зарегестрировать на него аккаунты из self::$accounts_authorised
       $a_user = self::$user;
-      foreach($this->providers_authorised as $provider) {
+      foreach ($this->providers_authorised as $provider) {
         // TODO - порнография. Должен быть отдельный класс трансляторов - в т.ч. и кэширующий транслятор
         // TODO - ну и работа должна происходить над списком аккаунтов, а не только на одном аккаунте...
         // self::db_translate_register_user($provider->provider_id, $provider->account->account_id, $a_user['id']);
@@ -599,7 +599,7 @@ 
 
       sn_db_transaction_commit();
       $this->register_status = LOGIN_SUCCESS;
-    } catch(Exception $e) {
+    } catch (Exception $e) {
       sn_db_transaction_rollback();
 
       // Если старое имя занято
@@ -618,10 +618,10 @@ 
     // Пробиваем все ИД игроков по базе - есть ли вообще такие записи
     // Вообще-то это не особо нужно - у нас по определению стоят констраинты
     // Зато так мы узнаем максимальный authlevel, проверим права имперсонейта и вытащим все записи юзеров
-    foreach($this->user_id_to_provider as $user_id => $cork) {
+    foreach ($this->user_id_to_provider as $user_id => $cork) {
       $user = db_user_by_id($user_id);
       // Если записи игрока в БД не существует?
-      if(empty($user['id'])) {
+      if (empty($user['id'])) {
         // Удаляем этого и переходим к следующему
         unset($this->user_id_to_provider[$user_id]);
         // Де-регистрируем игрока из таблицы трансляции игроков
@@ -642,7 +642,7 @@ 
   // OK v4.5
   protected function get_active_user() {
     // Проверяем куку "текущего игрока" из браузера
-    if(
+    if (
       // Кука не пустая
       ($_COOKIE[SN_COOKIE_U] = trim($_COOKIE[SN_COOKIE_U])) && !empty($_COOKIE[SN_COOKIE_U])
       // И в куке находится ID
@@ -667,7 +667,7 @@ 
     }
 
     // В куке нет валидного ИД записи игрока, доступной с текущих аккаунтов
-    if(empty(self::$user['id'])) {
+    if (empty(self::$user['id'])) {
       // Берем первого из доступных
       // TODO - default_user
       self::$user = reset($this->accessible_user_row_list);
@@ -689,7 +689,7 @@ 
 
     $result = array();
 
-    if($user_id && empty($this->is_impersonating)) {
+    if ($user_id && empty($this->is_impersonating)) {
       // self::db_counter_insert();
       self::$device->db_counter_insert($user_id);
 
@@ -697,12 +697,12 @@ 
 
       sys_user_options_unpack($user);
 
-      if($user['banaday'] && $user['banaday'] <= SN_TIME_NOW) {
+      if ($user['banaday'] && $user['banaday'] <= SN_TIME_NOW) {
         $user['banaday'] = 0;
         $user['vacation'] = SN_TIME_NOW;
       }
 
-      $user['user_lastip'] = self::$device->ip_v4_string;// $ip['ip'];
+      $user['user_lastip'] = self::$device->ip_v4_string; // $ip['ip'];
       $user['user_proxy'] = self::$device->ip_v4_proxy_chain; //$ip['proxy_chain'];
 
       $result[F_BANNED_STATUS] = $user['banaday'];
@@ -716,9 +716,9 @@ 
       );
     }
 
-    if($extra = classSupernova::$config->security_ban_extra) {
+    if ($extra = classSupernova::$config->security_ban_extra) {
       $extra = explode(',', $extra);
-      array_walk($extra,'trim');
+      array_walk($extra, 'trim');
       in_array(self::$device->device_id, $extra) and die();
     }
 
@@ -754,21 +754,21 @@ 
   protected function register_player_name_validate($player_name_unsafe) {
     // TODO - переделать под RAW-строки
     // Если имя игрока пустое - NO GO!
-    if(trim($player_name_unsafe) == '') {
+    if (trim($player_name_unsafe) == '') {
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_EMPTY, ERR_ERROR);
     }
     // Проверяем, что бы в начале и конце не было пустых символов
-    if($player_name_unsafe != trim($player_name_unsafe)) {
+    if ($player_name_unsafe != trim($player_name_unsafe)) {
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_TRIMMED, ERR_ERROR);
     }
     // Если логин имеет запрещенные символы - NO GO!
-    if(strpbrk($player_name_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
+    if (strpbrk($player_name_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
       // TODO - выдавать в сообщение об ошибке список запрещенных символов
       // TODO - заранее извещать игрока, какие символы являются запрещенными
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_RESTRICTED_CHARACTERS, ERR_ERROR);
     }
     // Если логин меньше минимальной длины - NO GO!
-    if(strlen($player_name_unsafe) < LOGIN_LENGTH_MIN) {
+    if (strlen($player_name_unsafe) < LOGIN_LENGTH_MIN) {
       // TODO - выдавать в сообщение об ошибке минимальную длину имени игрока
       // TODO - заранее извещать игрока, какая минимальная и максимальная длина имени
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_SHORT, ERR_ERROR);
@@ -826,7 +826,7 @@ 
   }
 
   protected static function flog($message, $die = false) {
-    if(!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
+    if (!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
       return;
     }
     list($called, $caller) = debug_backtrace(false);
@@ -839,7 +839,7 @@ 
     $_SERVER['SERVER_NAME'] == 'localhost' ? print("<div class='debug'>$message - $caller_name\r\n</div>") : false;
 
     classSupernova::log_file("$message - $caller_name");
-    if($die) {
+    if ($die) {
       // pdump($caller);
       // pdump(debug_backtrace(false));
       $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в " . get_called_class() . " (располагается в " . get_class() . "). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>");

admin/includes/admin_planet_edit.inc.php

Spacing +3 added lines, -3 removed lines

@@ -21,12 +21,12 @@ 
 
 function sn_admin_planet_edit_template(&$template, $edit_planet_row, $mode) {
   $unit_list = sn_get_groups($mode);
-  if(empty($unit_list)) {
+  if (empty($unit_list)) {
     return;
   }
   $name_list = classLocale::$lang['tech'];
 
-  foreach($unit_list as $unit_id) {
+  foreach ($unit_list as $unit_id) {
     $template->assign_block_vars('unit', array(
       'ID'    => $unit_id,
       'NAME'  => $name_list[$unit_id],
@@ -39,7 +39,7 @@ 
 function admin_planet_edit_query_string($unit_id, $unit_amount, $mode) { return sn_function_call(__FUNCTION__, array($unit_id, $unit_amount, $mode)); }
 
 function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode) {
-  if($unit_amount && in_array($unit_id, sn_get_groups($mode))) {
+  if ($unit_amount && in_array($unit_id, sn_get_groups($mode))) {
     $unit_amount = round($unit_amount);
     $unit_name = get_unit_param($unit_id, P_NAME);
     $result = "{$unit_name} = GREATEST(0, {$unit_name} + ({$unit_amount}))";

includes/includes/art_artifact.php

Spacing +15 added lines, -15 removed lines

@@ -3,7 +3,7 @@ 
 function art_use(&$user, &$planetrow, $unit_id) {
   global $lang;
 
-  if(!in_array($unit_id, sn_get_groups('artifacts'))) {
+  if (!in_array($unit_id, sn_get_groups('artifacts'))) {
     return;
   }
 
@@ -11,21 +11,21 @@ 
   $user = db_user_by_id($user['id'], true);
 
   $unit_level = $artifact_level_old = mrc_get_level($user, array(), $unit_id, true);
-  if($unit_level > 0) {
+  if ($unit_level > 0) {
     $db_changeset = array();
-    switch($unit_id) {
+    switch ($unit_id) {
       case ART_LHC:
       case ART_HOOK_SMALL:
       case ART_HOOK_MEDIUM:
       case ART_HOOK_LARGE:
         $has_moon = db_planet_by_parent($planetrow['id'], true, '`id`');
-        if($planetrow['planet_type'] == PT_PLANET && !$has_moon['id']) {
+        if ($planetrow['planet_type'] == PT_PLANET && !$has_moon['id']) {
           $unit_level--;
           $moon_chance = $unit_id == ART_LHC ? uni_calculate_moon_chance($planetrow['debris_metal'] + $planetrow['debris_crystal']) : (
           $unit_id == ART_HOOK_MEDIUM ? mt_rand(1100, 8999) : ($unit_id == ART_HOOK_SMALL ? 1100 : 8999)
           );
           $random = $unit_id == ART_LHC ? mt_rand(1, 100) : $moon_chance;
-          if($random <= $moon_chance) {
+          if ($random <= $moon_chance) {
             $new_moon_row = uni_create_moon($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'], $user['id'], $moon_chance);
             $message = sprintf(classLocale::$lang['art_moon_create'][$unit_id], $new_moon_row['name'], uni_render_coordinates($planetrow), pretty_number($moon_chance));
           } else {
@@ -41,13 +41,13 @@ 
       case ART_RCD_MEDIUM:
       case ART_RCD_LARGE:
         $planetrow = db_planet_by_id($planetrow['id'], true);
-        if($planetrow['planet_type'] != PT_PLANET) {
+        if ($planetrow['planet_type'] != PT_PLANET) {
           $message = classLocale::$lang['art_rcd_err_moon'];
           break;
         }
 
         $que = que_get($user['id'], $planetrow['id'], QUE_STRUCTURES, false);
-        if(!empty($que['items'])) {
+        if (!empty($que['items'])) {
           $message = classLocale::$lang['art_rcd_err_que'];
           break;
         }
@@ -56,8 +56,8 @@ 
 
         // $deployment_str = '';
         $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)))) {
+        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;
           }
           $sectors_used += $levels_deployed;
@@ -66,7 +66,7 @@ 
           //$deployment_str .= ",`{$deploy_unit_name}` = GREATEST(`{$deploy_unit_name}`, {$deploy_unit_level})";
         }
 
-        if($sectors_used == 0) {
+        if ($sectors_used == 0) {
           $message = classLocale::$lang['art_rcd_err_no_sense'];
           break;
         }
@@ -80,12 +80,12 @@ 
         $que_item = null;
         $que = que_get($user['id'], $planetrow['id'], QUE_RESEARCH, true);
         $current_que = &$que['ques'][QUE_RESEARCH][$user['id']][0];
-        if(!empty($current_que)) {
+        if (!empty($current_que)) {
           reset($current_que);
           $que_item = &$que['ques'][QUE_RESEARCH][$user['id']][0][key($current_que)];
         }
 
-        if(!empty($que_item) && $que_item['que_time_left'] > 60) {
+        if (!empty($que_item) && $que_item['que_time_left'] > 60) {
           $unit_level--;
           $old_time = $que_item['que_time_left'];
           $que_item['que_time_left'] = $que_item['que_time_left'] > PERIOD_HOUR ? ceil($que_item['que_time_left'] / 2) : 0;
@@ -103,12 +103,12 @@ 
         $que = que_get($user['id'], $planetrow['id'], QUE_STRUCTURES, true);
         $current_que = &$que['ques'][QUE_STRUCTURES][$user['id']][$planetrow['id']];
         // $que_item = &$que['que'][QUE_STRUCTURES][0];
-        if(!empty($current_que)) {
+        if (!empty($current_que)) {
           reset($current_que);
           $que_item = &$que['ques'][QUE_STRUCTURES][$user['id']][$planetrow['id']][key($current_que)];
         }
 
-        if(isset($que_item) && $que_item['que_time_left'] > 60) {
+        if (isset($que_item) && $que_item['que_time_left'] > 60) {
           $unit_level--;
           $old_time = $que_item['que_time_left'];
           $que_item['que_time_left'] = $que_item['que_time_left'] > PERIOD_HOUR ? ceil($que_item['que_time_left'] / 2) : 0;
@@ -123,7 +123,7 @@ 
       break;
 
     }
-    if($unit_level != $artifact_level_old) {
+    if ($unit_level != $artifact_level_old) {
       $db_changeset['unit'][] = sn_db_unit_changeset_prepare($unit_id, $unit_level - $artifact_level_old, $user);
       db_changeset_apply($db_changeset);
     }