supernova-ws / SuperNova

includes/vars/vars_combats.php

Spacing +22 added lines, -22 removed lines

@@ -35,7 +35,7 @@ 
     'shield' => 10,
     'armor' => 400,
     'attack' => 5,
-    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250, ),
+    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250,),
   ),
   SHIP_CARGO_BIG => array(
     'name' => 'big_ship_cargo',
@@ -55,7 +55,7 @@ 
     'shield' => 25,
     'armor' => 1200,
     'attack' => 5,
-    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250, ),
+    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -83,7 +83,7 @@ 
     'shield' => 50,
     'armor' => 3000,
     'attack' => 10,
-    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250, ),
+    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_ION,
@@ -111,7 +111,7 @@ 
     'shield' => 200,
     'armor' => 70000,
     'attack' => 50,
-    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250, ),
+    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_HYPER,
@@ -140,7 +140,7 @@ 
     'shield' => 100,
     'armor' => 3000,
     'attack' => 50,
-    'amplify' => array(SHIP_SPY => 10.001, SHIP_SATTELITE_SOLAR => 21, ),
+    'amplify' => array(SHIP_SPY => 10.001, SHIP_SATTELITE_SOLAR => 21,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_ION,
@@ -168,7 +168,7 @@ 
     'shield' => 10,
     'armor' => 1600,
     'attack' => 1,
-    'amplify' => array(SHIP_SPY => 500.05, SHIP_SATTELITE_SOLAR => 1050, ),
+    'amplify' => array(SHIP_SPY => 500.05, SHIP_SATTELITE_SOLAR => 1050,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -196,7 +196,7 @@ 
     'shield' =>  0.01,
     'armor' => 100,
     'attack' =>  0.01,
-    'amplify' => array( SHIP_SPY => 1,),
+    'amplify' => array(SHIP_SPY => 1,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -220,7 +220,7 @@ 
       'factor' => 1,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_ENERGY => function($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 4 + 20) * $level * (0.1 * $production_factor);},
+      RES_ENERGY => function($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 4 + 20) * $level * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
 
@@ -229,7 +229,7 @@ 
     'shield' => 10,
     'armor' => 200,
     'attack' => 1,
-    'amplify' => array(SHIP_SPY => 1, ),
+    'amplify' => array(SHIP_SPY => 1,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -261,7 +261,7 @@ 
     'shield' => 10,
     'armor' => 400,
     'attack' => 50,
-    'amplify' => array(SHIP_CARGO_SMALL => 16.4, SHIP_SPY => 10.001, SHIP_SATTELITE_SOLAR => 21, ),
+    'amplify' => array(SHIP_CARGO_SMALL => 16.4, SHIP_SPY => 10.001, SHIP_SATTELITE_SOLAR => 21,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -290,7 +290,7 @@ 
     'shield' => 25,
     'armor' => 1000,
     'attack' => 150,
-    'amplify' => array(SHIP_CARGO_SMALL => 8.2, SHIP_SPY => 3.33367, SHIP_SATTELITE_SOLAR => 7, ),
+    'amplify' => array(SHIP_CARGO_SMALL => 8.2, SHIP_SPY => 3.33367, SHIP_SATTELITE_SOLAR => 7,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_ION,
@@ -349,7 +349,7 @@ 
     'shield' =>  50,
     'armor' => 2700,
     'attack' => 400,
-    'amplify' => array(SHIP_SMALL_FIGHTER_LIGHT => 6.15, SHIP_SPY => 1.25013, SHIP_SATTELITE_SOLAR => 2.625, UNIT_DEF_TURRET_MISSILE => 5.5, ),
+    'amplify' => array(SHIP_SMALL_FIGHTER_LIGHT => 6.15, SHIP_SPY => 1.25013, SHIP_SATTELITE_SOLAR => 2.625, UNIT_DEF_TURRET_MISSILE => 5.5,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_ION,
@@ -408,7 +408,7 @@ 
     'shield' =>  200,
     'armor' =>  6000,
     'attack' => 1000,
-    'amplify' => array(SHIP_SPY => 0.50005, SHIP_SATTELITE_SOLAR => 1.05, UNIT_DEF_TURRET_MISSILE => 1.76, ),
+    'amplify' => array(SHIP_SPY => 0.50005, SHIP_SATTELITE_SOLAR => 1.05, UNIT_DEF_TURRET_MISSILE => 1.76,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_HYPER,
@@ -504,7 +504,7 @@ 
     'shield' =>  500,
     'armor' => 11000,
     'attack' => 2000,
-    'amplify' => array(SHIP_SPY => 0.25003, SHIP_SATTELITE_SOLAR => 0.525, SHIP_LARGE_BATTLESHIP => 7.4, UNIT_DEF_TURRET_LASER_SMALL => 1.125, ),
+    'amplify' => array(SHIP_SPY => 0.25003, SHIP_SATTELITE_SOLAR => 0.525, SHIP_LARGE_BATTLESHIP => 7.4, UNIT_DEF_TURRET_LASER_SMALL => 1.125,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_HYPER,
@@ -608,7 +608,7 @@ 
     'shield' => 20,
     'armor' => 200,
     'attack' => 80,
-    'amplify' => array(SHIP_SPY => 7, ),
+    'amplify' => array(SHIP_SPY => 7,),
   ),
   UNIT_DEF_TURRET_LASER_SMALL => array(
     'name' => 'small_laser',
@@ -626,7 +626,7 @@ 
     'shield' => 25,
     'armor' => 200,
     'attack' => 100,
-    'amplify' => array(SHIP_SPY => 5, ),
+    'amplify' => array(SHIP_SPY => 5,),
   ),
   UNIT_DEF_TURRET_LASER_BIG => array(
     'name' => 'big_laser',
@@ -644,7 +644,7 @@ 
     'shield' => 100,
     'armor' => 800,
     'attack' => 250,
-    'amplify' => array(SHIP_SPY => 2, ),
+    'amplify' => array(SHIP_SPY => 2,),
   ),
   UNIT_DEF_TURRET_GAUSS => array(
     'name' => 'gauss_canyon',
@@ -662,7 +662,7 @@ 
     'armor' => 3500,
     'shield' => 200,
     'attack' => 1100,
-    'amplify' => array(SHIP_SPY => 0.5, ),
+    'amplify' => array(SHIP_SPY => 0.5,),
   ),
   UNIT_DEF_TURRET_ION => array(
     'name' => 'ionic_canyon',
@@ -680,7 +680,7 @@ 
     'shield' => 500,
     'armor' => 800,
     'attack' => 150,
-    'amplify' => array(SHIP_SPY => 3.3, ),
+    'amplify' => array(SHIP_SPY => 3.3,),
   ),
   UNIT_DEF_TURRET_PLASMA => array(
     'name' => 'buster_canyon',
@@ -698,7 +698,7 @@ 
     'shield' => 300,
     'armor' => 10000,
     'attack' => 3000,
-    'amplify' => array(SHIP_SPY => 0.17, ),
+    'amplify' => array(SHIP_SPY => 0.17,),
   ),
 
   UNIT_DEF_SHIELD_SMALL => array(
@@ -718,7 +718,7 @@ 
     'shield' => 2000,
     'armor' => 2000,
     'attack' => 1,
-    'amplify' => array(SHIP_SPY => 500, ),
+    'amplify' => array(SHIP_SPY => 500,),
   ),
   UNIT_DEF_SHIELD_BIG => array(
     'name' => 'big_protection_shield',
@@ -737,7 +737,7 @@ 
     'shield' => 2000,
     'armor' => 10000,
     'attack' => 1,
-    'amplify' => array(SHIP_SPY => 500, ),
+    'amplify' => array(SHIP_SPY => 500,),
   ),
   UNIT_DEF_SHIELD_PLANET => array(
     'name'      => 'planet_protector',

includes/vars/vars_menu.php

Spacing +12 added lines, -12 removed lines

@@ -104,21 +104,21 @@ 
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'tech[UNIT_STRUCTURES]',
-    'LINK'  => 'buildings.php?mode=' . QUE_STRUCTURES,
+    'LINK'  => 'buildings.php?mode='.QUE_STRUCTURES,
     'ICON'  => true,
   ),
   'menu_planet_shipyard'   => array(
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'Shipyard',
-    'LINK'  => 'buildings.php?mode=' . SUBQUE_FLEET,
+    'LINK'  => 'buildings.php?mode='.SUBQUE_FLEET,
     'ICON'  => true,
   ),
   'menu_planet_defense'    => array(
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'Defense',
-    'LINK'  => 'buildings.php?mode=' . SUBQUE_DEFENSE,
+    'LINK'  => 'buildings.php?mode='.SUBQUE_DEFENSE,
     'ICON'  => true,
   ),
   'menu_planet_resources'  => array(
@@ -147,7 +147,7 @@ 
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'Research',
-    'LINK'  => 'buildings.php?mode=' . QUE_RESEARCH,
+    'LINK'  => 'buildings.php?mode='.QUE_RESEARCH,
     'ICON'  => true,
   ),
   'menu_empire_techtree' => array(
@@ -233,14 +233,14 @@ 
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'tech[UNIT_MERCENARIES]',
-    'LINK'  => 'officer.php?mode=' . UNIT_MERCENARIES,
+    'LINK'  => 'officer.php?mode='.UNIT_MERCENARIES,
     'ICON'  => true,
   ),
   'menu_empire_schematics'  => array(
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'tech[UNIT_PLANS]',
-    'LINK'  => 'officer.php?mode=' . UNIT_PLANS,
+    'LINK'  => 'officer.php?mode='.UNIT_PLANS,
     'ICON'  => true,
   ),
   'menu_empire_artifacts'   => array(
@@ -270,14 +270,14 @@ 
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'Chat',
-    'LINK'  => 'index.php?page=chat&mode=' . CHAT_MODE_COMMON,
+    'LINK'  => 'index.php?page=chat&mode='.CHAT_MODE_COMMON,
     'ICON'  => true,
   ),
   'menu_ally_chat'     => array(
     'LEVEL'    => 'submenu',
     'TYPE'     => 'lang',
     'ITEM'     => 'AllyChat',
-    'LINK'     => 'index.php?page=chat&mode=' . CHAT_MODE_ALLY,
+    'LINK'     => 'index.php?page=chat&mode='.CHAT_MODE_ALLY,
     'ICON'     => true,
     'DISABLED' => classSupernova::$config->game_mode == GAME_BLITZ,
   ),
@@ -458,8 +458,8 @@ 
   ),
   'menu_admin_version_info'  => array(
     'TYPE' => 'text',
-    'ITEM' => (classSupernova::$config->server_updater_check_last ? date(FMT_DATE, classSupernova::$config->server_updater_check_last) : '') . '<div class="' .
-      $sn_version_check_class[classSupernova::$config->server_updater_check_result] . '">' . classLocale::$lang['adm_opt_ver_response_short'][classSupernova::$config->server_updater_check_result] . '</div>',
+    'ITEM' => (classSupernova::$config->server_updater_check_last ? date(FMT_DATE, classSupernova::$config->server_updater_check_last) : '').'<div class="'.
+      $sn_version_check_class[classSupernova::$config->server_updater_check_result].'">'.classLocale::$lang['adm_opt_ver_response_short'][classSupernova::$config->server_updater_check_result].'</div>',
   ),
 
   'USER_AUTHLEVEL_NAME'      => array(
@@ -547,13 +547,13 @@ 
   'menu_admin_planet_list_planets' => array(
     'TYPE'       => 'lang',
     'ITEM'       => 'adm_pltlst',
-    'LINK'       => 'admin/adm_planet_list.php?planet_type=' . PT_PLANET,
+    'LINK'       => 'admin/adm_planet_list.php?planet_type='.PT_PLANET,
     'AUTH_LEVEL' => 3,
   ),
   'menu_admin_planet_list_moons'   => array(
     'TYPE'       => 'lang',
     'ITEM'       => 'adm_moonlst',
-    'LINK'       => 'admin/adm_planet_list.php?planet_type=' . PT_MOON,
+    'LINK'       => 'admin/adm_planet_list.php?planet_type='.PT_MOON,
     'AUTH_LEVEL' => 3,
   ),
   'menu_admin_planet_moon_add'     => array(

includes/alliance/ali_external_search.inc

Spacing +4 added lines, -4 removed lines

@@ -1,18 +1,18 @@
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
 $template = gettemplate('ali_search', true);
 
 $ali_search_text = sys_get_param_str('searchtext');
-if($ali_search_text) {
+if ($ali_search_text) {
   $template->assign_var('SEARCH_TEXT', $ali_search_text);
 
   $search = DBStaticAlly::db_ally_search_by_name_or_tag($ali_search_text);
-  if(classSupernova::$db->db_num_rows($search)) {
-    while($ally_row = db_fetch($search)) {
+  if (classSupernova::$db->db_num_rows($search)) {
+    while ($ally_row = db_fetch($search)) {
       $template->assign_block_vars('alliances', array(
         'ID'          => $ally_row['id'],
         'TAG'         => $ally_row['ally_tag'],

tests.int/FleetTest.php

Spacing +5 added lines, -5 removed lines

@@ -5,7 +5,7 @@ 
 define('SN_IN_FLEET', true);
 define('SN_RENDER_NAVBAR_PLANET', true);
 
-include('../common.' . substr(strrchr(__FILE__, '.'), 1));
+include('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
 // TODO - Переместить это куда-нибудь
 $fleet_page = sys_get_param_int('fleet_page', sys_get_param_int('mode'));
@@ -192,8 +192,8 @@ 
 //  break;
     }
 
-    if($exceptionCode !== null) {
-      print('<span style="color: red; font-size: 200%;">FAILED! Expected Exception [' . $exceptionCode . ']: "' . classLocale::$lang['fl_attack_error'][$exceptionCode] . '" - FAILED!</span><br />');
+    if ($exceptionCode !== null) {
+      print('<span style="color: red; font-size: 200%;">FAILED! Expected Exception ['.$exceptionCode.']: "'.classLocale::$lang['fl_attack_error'][$exceptionCode].'" - FAILED!</span><br />');
       print('<div style="color: red; font-size: 200%;">NO EXCEPTION RAISED</div>');
       pdie();
     } else {
@@ -203,8 +203,8 @@ 
     if ($exceptionCode !== null && $e->getCode() === $exceptionCode) {
 //      print('<span style="color: darkgreen;">Exception [' . $exceptionCode . ']: "' . classLocale::$lang['fl_attack_error'][$exceptionCode] . '" - passed</span><br />');
     } else {
-      print('<div style="color: red; font-size: 200%;">Expected Exception [' . $exceptionCode . ']: "' . classLocale::$lang['fl_attack_error'][$exceptionCode] . '" - FAILED!</div>');
-      print('<div style="color: red; font-size: 200%;">Got Exception [' . $e->getCode() . ']: "' . $e->getMessage() . '"/"' . classLocale::$lang['fl_attack_error'][$e->getCode()] . '" . "</div>');
+      print('<div style="color: red; font-size: 200%;">Expected Exception ['.$exceptionCode.']: "'.classLocale::$lang['fl_attack_error'][$exceptionCode].'" - FAILED!</div>');
+      print('<div style="color: red; font-size: 200%;">Got Exception ['.$e->getCode().']: "'.$e->getMessage().'"/"'.classLocale::$lang['fl_attack_error'][$e->getCode()].'" . "</div>');
       throw $e;
     }
   }

buddy.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 $template = gettemplate('viewreport', true);
 $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']);

includes/functions/qst_quest.php

Spacing +4 added lines, -4 removed lines

@@ -179,7 +179,7 @@ 
     $template->assign_vars($quest_templatized);
     if (!empty($quest_templatized['quest_rewards_list'])) {
       foreach ($quest_templatized['quest_rewards_list'] as $quest_reward) {
-        $template->assign_block_vars(($block_name ? $block_name . '.' : '') . 'quest_rewards_list', $quest_reward);
+        $template->assign_block_vars(($block_name ? $block_name.'.' : '').'quest_rewards_list', $quest_reward);
       }
     }
   }
@@ -248,10 +248,10 @@ 
 
         $comment_reward = array();
         foreach ($reward_list as $unit_id => $unit_amount) {
-          $comment_reward[] = $unit_amount . ' ' . classLocale::$lang['tech'][$unit_id];
+          $comment_reward[] = $unit_amount.' '.classLocale::$lang['tech'][$unit_id];
           $total_rewards[$user_id][$planet_id][$unit_id] += $unit_amount;
         }
-        $comment .= " {$classLocale['qst_msg_your_reward']} " . implode(',', $comment_reward);
+        $comment .= " {$classLocale['qst_msg_your_reward']} ".implode(',', $comment_reward);
 
         DBStaticMessages::msg_send_simple_message($user['id'], 0, SN_TIME_NOW, MSG_TYPE_ADMIN, classLocale::$lang['msg_from_admin'], classLocale::$lang['qst_msg_complete_subject'], $comment);
 
@@ -289,7 +289,7 @@ 
 
         if (!empty($resourcesChange)) {
           $planet_id = $planet_id == 0 && isset($user_row['id_planet']) ? $user_row['id_planet'] : $planet_id;
-          if($planet_id) {
+          if ($planet_id) {
             // update planet
             DBStaticPlanet::db_planet_update_resources($resourcesChange, $planet_id);
           } else {

admin/adm_message_list.php

Spacing +12 added lines, -12 removed lines

@@ -12,9 +12,9 @@ 
 define('INSTALL', false);
 define('IN_ADMIN', true);
 
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
@@ -28,8 +28,8 @@ 
   ),
 );
 $template->assign_block_vars('int_type_selected', $allowed_types[-1]);
-foreach(DBStaticMessages::$snMessageClassList as $key => $value) {
-  if($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX) {
+foreach (DBStaticMessages::$snMessageClassList as $key => $value) {
+  if ($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX) {
     continue;
   }
 
@@ -41,21 +41,21 @@ 
 
 
 $deletedMessages = '';
-if($idMessageDelete = sys_get_param_id('msg_del')) {
+if ($idMessageDelete = sys_get_param_id('msg_del')) {
   DBStaticMessages::db_message_delete_by_id($idMessageDelete);
   $deletedMessages = $idMessageDelete;
-} elseif(sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete)) {
+} elseif (sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete)) {
   $message_delete = implode(', ', $message_delete);
   DBStaticMessages::db_message_list_delete_set($message_delete);
   $deletedMessages = $message_delete;
 }
 
-if($deletedMessages) {
+if ($deletedMessages) {
   $template->assign_block_vars('result', array('MESSAGE' => sprintf(classLocale::$lang['mlst_messages_deleted'], $deletedMessages)));
 }
 
 
-if(sys_get_param('str_delete_date') && checkdate($month = sys_get_param_id('delete_month'), $day = sys_get_param_id('delete_day'), $year = sys_get_param_id('delete_year'))) {
+if (sys_get_param('str_delete_date') && checkdate($month = sys_get_param_id('delete_month'), $day = sys_get_param_id('delete_day'), $year = sys_get_param_id('delete_year'))) {
   $delete_date = "{$year}-{$month}-{$day}";
   DBStaticMessages::db_message_list_delete_by_date($delete_date, $int_type_selected);
   $template->assign_block_vars('result', array('MESSAGE' => sprintf(classLocale::$lang['mlst_messages_deleted_date'], $allowed_types[$int_type_selected]['TEXT'], $delete_date)));
@@ -67,13 +67,13 @@ 
 
 $int_page_current = min(sys_get_param_id('int_page_current', 1), $page_max);
 
-if(sys_get_param('page_prev') && $int_page_current > 1) {
+if (sys_get_param('page_prev') && $int_page_current > 1) {
   $int_page_current--;
-} elseif(sys_get_param('page_next') && $int_page_current < $page_max) {
+} elseif (sys_get_param('page_next') && $int_page_current < $page_max) {
   $int_page_current++;
 }
 
-for($i = 1; $i <= $page_max; $i++) {
+for ($i = 1; $i <= $page_max; $i++) {
   $template->assign_block_vars('page', array('NUMBER' => $i));
 }
 
@@ -81,7 +81,7 @@ 
 $StartRec = ($int_page_current - 1) * 25;
 
 $Messages = DBStaticMessages::db_message_list_admin_by_type($int_type_selected, $StartRec);
-while($row = db_fetch($Messages)) {
+while ($row = db_fetch($Messages)) {
   $row['FROM'] = htmlentities($row['FROM'], ENT_COMPAT, 'UTF-8');
   $row['OWNER_NAME'] = htmlentities($row['OWNER_NAME'], ENT_COMPAT, 'UTF-8');
   $row['TEXT'] = nl2br($row['TEXT']);

announce.php

Spacing +15 added lines, -15 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 $allow_anonymous = true;
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 nws_mark_read($user);
 $template = gettemplate('announce', true);
@@ -23,42 +23,42 @@ 
 $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') {
       DBStaticNews::db_news_update_set($announce_time, $text, $detail_url, $announce_id);
       DBStaticSurvey::db_survey_delete_by_id($announce_id);
     } else {
       DBStaticNews::db_news_insert_set($announce_time, $text_unsafe, $detail_url_unsafe, $user['id'], $user['username']);
       $announce_id = classSupernova::$db->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);
       $survey_question_unsafe = sys_get_param_str_unsafe('survey_question');
       DBStaticSurvey::db_survey_insert($announce_id, $survey_question_unsafe, $survey_until);
       $survey_id = classSupernova::$db->db_insert_id();
-      foreach($survey_answers as $survey_answer) {
+      foreach ($survey_answers as $survey_answer) {
         $survey_answer_unsafe = trim($survey_answer);
-        if(empty($survey_answer_unsafe)) {
+        if (empty($survey_answer_unsafe)) {
           continue;
         }
         DBStaticSurveyAnswer::db_survey_answer_insert($survey_id, $survey_answer_unsafe);
       }
     }
 
-    if($announce_time <= SN_TIME_NOW) {
-      if($announce_time > classSupernova::$config->var_news_last && $announce_time == SN_TIME_NOW) {
+    if ($announce_time <= SN_TIME_NOW) {
+      if ($announce_time > classSupernova::$config->var_news_last && $announce_time == SN_TIME_NOW) {
         classSupernova::$config->db_saveItem('var_news_last', $announce_time);
       }
 
-      if(sys_get_param_int('news_mass_mail')) {
+      if (sys_get_param_int('news_mass_mail')) {
         $lang_news_more = classLocale::$lang['news_more'];
-        $text = sys_get_param('text') . ($detail_url ? " <a href=\"{$detail_url}\"><span class=\"positive\">{$lang_news_more}</span></a>" : '');
+        $text = sys_get_param('text').($detail_url ? " <a href=\"{$detail_url}\"><span class=\"positive\">{$lang_news_more}</span></a>" : '');
         DBStaticMessages::msgSendFromAdmin('*', classLocale::$lang['news_title'], $text);
       }
     }
@@ -68,7 +68,7 @@ 
   }
 
   $survey_answers = '';
-  switch($mode) {
+  switch ($mode) {
     case 'del':
       DBStaticNews::db_news_delete_by_id($announce_id);
       $mode = '';
@@ -79,9 +79,9 @@ 
       $template->assign_var('ID', $announce_id);
     case 'copy':
       $announce = DBStaticNews::db_news_with_survey_select_by_id($announce_id);
-      if($announce['survey_id']) {
+      if ($announce['survey_id']) {
         $query = DBStaticSurveyAnswer::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);
@@ -89,7 +89,7 @@ 
     break;
   }
 } else {
-  $annQuery = 'WHERE UNIX_TIMESTAMP(`tsTimeStamp`) <= ' . SN_TIME_NOW;
+  $annQuery = 'WHERE UNIX_TIMESTAMP(`tsTimeStamp`) <= '.SN_TIME_NOW;
 }
 
 nws_render($template, $annQuery, 20);

notes.php

Spacing +17 added lines, -17 removed lines

@@ -10,7 +10,7 @@ 
 
 use Vector\Vector;
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 lng_include('notes');
 
 global $user;
@@ -18,17 +18,17 @@ 
 $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');
 $note_title_unsafe = sys_get_param_str_unsafe('note_title');
 $note_text_unsafe = sys_get_param_str_unsafe('note_text');
-if(sys_get_param('note_delete')) {
+if (sys_get_param('note_delete')) {
   try {
     DBStaticNote::processDelete($user, $note_id_edit);
-  } catch(Exception $e) {
+  } catch (Exception $e) {
     $note_id_edit = 0;
     sn_db_transaction_rollback();
     $result[] = array(
@@ -36,7 +36,7 @@ 
       'MESSAGE' => classLocale::$lang[$e->getMessage()],
     );
   }
-} elseif(($note_title_unsafe = sys_get_param_str_unsafe('note_title')) || ($note_text_unsafe = sys_get_param_str('note_text'))) {
+} elseif (($note_title_unsafe = sys_get_param_str_unsafe('note_title')) || ($note_text_unsafe = sys_get_param_str('note_text'))) {
   $note_title_unsafe == classLocale::$lang['note_new_title'] ? $note_title_unsafe = '' : false;
   $note_text_unsafe == classLocale::$lang['note_new_text'] ? $note_text_unsafe = '' : false;
   try {
@@ -44,7 +44,7 @@ 
     $note_system = max(0, min(sys_get_param_id('note_system'), Vector::$knownSystems));
     $note_planet = max(0, min(sys_get_param_id('note_planet'), Vector::$knownPlanets + 1));
 
-    if(!$note_text_unsafe && !$note_title_unsafe && !$note_galaxy && !$note_system && !$note_planet) {
+    if (!$note_text_unsafe && !$note_title_unsafe && !$note_galaxy && !$note_system && !$note_planet) {
       throw new Exception('note_err_note_empty', ERR_WARNING);
     }
 
@@ -53,15 +53,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 = DBStaticNote::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);
       }
 
@@ -71,9 +71,9 @@ 
     }
 
     sn_db_transaction_commit();
-    sys_redirect('notes.php?STATUS=' . ERR_NONE . '&MESSAGE=' . ($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added'));
+    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(
@@ -83,7 +83,7 @@ 
   }
 }
 
-if(!$note_id_edit) {
+if (!$note_id_edit) {
   note_assign($template, array(
     'id'          => 0,
     'time'        => SN_TIME_NOW,
@@ -96,13 +96,13 @@ 
 
 $note_exist = false;
 $notes_query = DBStaticNote::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],
@@ -110,14 +110,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);
 }