supernova-ws / SuperNova

includes/vars.php

Indentation +57 added lines, -57 removed lines

@@ -189,62 +189,62 @@ 
   );
 
 $sn_message_class_list = array(
-   MSG_TYPE_NEW => array(
-     'name' => 'new_message',
-     'switchable' => false,
-     'email' => false,
-   ),
-   MSG_TYPE_ADMIN => array(
-     'name' => 'msg_admin',
-     'switchable' => false,
-     'email' => true,
-   ),
-   MSG_TYPE_PLAYER => array(
-     'name' => 'mnl_joueur',
-     'switchable' => false,
-     'email' => true,
-   ),
-   MSG_TYPE_ALLIANCE => array(
-     'name' => 'mnl_alliance',
-     'switchable' => false,
-     'email' => true,
-   ),
-   MSG_TYPE_SPY => array(
-     'name' => 'mnl_spy',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_COMBAT => array(
-     'name' => 'mnl_attaque',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_TRANSPORT => array(
-     'name' => 'mnl_transport',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_RECYCLE => array(
-     'name' => 'mnl_exploit',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_EXPLORE => array(
-     'name' => 'mnl_expedition',
-     'switchable' => true,
-     'email' => true,
-   ),
-   //     97 => 'mnl_general',
-   MSG_TYPE_QUE => array(
-     'name' => 'mnl_buildlist',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_OUTBOX => array(
-     'name' => 'mnl_outbox',
-     'switchable' => false,
-     'email' => false,
-   ),
+    MSG_TYPE_NEW => array(
+      'name' => 'new_message',
+      'switchable' => false,
+      'email' => false,
+    ),
+    MSG_TYPE_ADMIN => array(
+      'name' => 'msg_admin',
+      'switchable' => false,
+      'email' => true,
+    ),
+    MSG_TYPE_PLAYER => array(
+      'name' => 'mnl_joueur',
+      'switchable' => false,
+      'email' => true,
+    ),
+    MSG_TYPE_ALLIANCE => array(
+      'name' => 'mnl_alliance',
+      'switchable' => false,
+      'email' => true,
+    ),
+    MSG_TYPE_SPY => array(
+      'name' => 'mnl_spy',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_COMBAT => array(
+      'name' => 'mnl_attaque',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_TRANSPORT => array(
+      'name' => 'mnl_transport',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_RECYCLE => array(
+      'name' => 'mnl_exploit',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_EXPLORE => array(
+      'name' => 'mnl_expedition',
+      'switchable' => true,
+      'email' => true,
+    ),
+    //     97 => 'mnl_general',
+    MSG_TYPE_QUE => array(
+      'name' => 'mnl_buildlist',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_OUTBOX => array(
+      'name' => 'mnl_outbox',
+      'switchable' => false,
+      'email' => false,
+    ),
 );
 
 $sn_message_groups = array(
@@ -1096,7 +1096,7 @@ 
       SHIP_HUGE_DEATH_STAR => SHIP_HUGE_DEATH_STAR, SHIP_HUGE_SUPERNOVA => SHIP_HUGE_SUPERNOVA,
       SHIP_CARGO_SMALL => SHIP_CARGO_SMALL, SHIP_CARGO_BIG => SHIP_CARGO_BIG, SHIP_CARGO_SUPER => SHIP_CARGO_SUPER, SHIP_CARGO_HYPER => SHIP_CARGO_HYPER,
       SHIP_RECYCLER => SHIP_RECYCLER, SHIP_COLONIZER => SHIP_COLONIZER, SHIP_SPY => SHIP_SPY, SHIP_SATTELITE_SOLAR => SHIP_SATTELITE_SOLAR
-     ),
+      ),
     // Defensive building list
     'defense'   => array (UNIT_DEF_TURRET_MISSILE => UNIT_DEF_TURRET_MISSILE, UNIT_DEF_TURRET_LASER_SMALL => UNIT_DEF_TURRET_LASER_SMALL,
                           UNIT_DEF_TURRET_LASER_BIG => UNIT_DEF_TURRET_LASER_BIG, UNIT_DEF_TURRET_GAUSS => UNIT_DEF_TURRET_GAUSS,

classes/Core/Repository.php

Indentation +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
    */
   protected $_repository;
 
- /**
+  /**
    * @var ContainerPlus $_oldRepo
    */
   protected $_oldRepo;

galaxy.php

Indentation +75 added lines, -75 removed lines

@@ -239,35 +239,35 @@ 
   $user_activity = floor((SN_TIME_NOW - $uni_galaxyRowUser['onlinetime'])/(60*60*24));
 
   $templatizedPlanet = array_merge([
-     'PLANET_ID'        => $uni_galaxyRowPlanet['id'],
-     'PLANET_NUM'       => $Planet,
-     'PLANET_NAME'      => $uni_galaxyRowPlanet['name'],
-     'PLANET_NAME_JS'   => js_safe_string($uni_galaxyRowPlanet['name']),
-     'PLANET_DESTROYED' => $uni_galaxyRowPlanet["destruyed"],
-     'PLANET_TYPE'      => $uni_galaxyRowPlanet["planet_type"],
-     'PLANET_ACTIVITY'  => floor((SN_TIME_NOW - $uni_galaxyRowPlanet['last_update'])/60),
-     'PLANET_IMAGE'     => $uni_galaxyRowPlanet['image'],
-     'PLANET_FLEET_ID'  => $planet_fleet_id,
-     'PLANET_DIAMETER'  => number_format($uni_galaxyRowPlanet['diameter'], 0, '', '.'),
-
-     'USER_ID'       => $uni_galaxyRowUser['id'],
-     'USER_NAME'     => player_nick_render_to_html($uni_galaxyRowUser),
-     'USER_NAME_JS'  => js_safe_string(player_nick_render_to_html($uni_galaxyRowUser)),
-     'USER_RANK'     => in_array($uni_galaxyRowUser['id'], $user_skip_list) ? '-' : $uni_galaxyRowUser['total_rank'],
-     'USER_BANNED'   => $uni_galaxyRowUser['banaday'],
-     'USER_VACATION' => $uni_galaxyRowUser['vacation'],
-     'USER_ACTIVITY' => $user_activity,
-     'USER_ATTACKABLE' => $user_activity >= 7,
-     'USER_INACTIVE' => $user_activity >= 28,
-     'USER_PROTECTED'=> $RowUserPoints <= classSupernova::$config->game_noob_points,
-     'USER_NOOB'     => $RowUserPoints * classSupernova::$config->game_noob_factor < $CurrentPoints && classSupernova::$config->game_noob_factor,
-     'USER_STRONG'   => $CurrentPoints * classSupernova::$config->game_noob_factor < $RowUserPoints && classSupernova::$config->game_noob_factor,
-     'USER_AUTH'     => $uni_galaxyRowUser['authlevel'],
-     'USER_ADMIN'    => $lang['user_level_shortcut'][$uni_galaxyRowUser['authlevel']],
-     'USER_BIRTHDAY' => $birthday_array['month'] == $time_now_parsed['mon'] && $birthday_array['day'] == $time_now_parsed['mday'] ? date(FMT_DATE, SN_TIME_NOW) : 0,
-
-     'ALLY_ID'       => $uni_galaxyRowUser['ally_id'],
-     'ALLY_TAG'      => $uni_galaxyRowUser['ally_tag'],
+      'PLANET_ID'        => $uni_galaxyRowPlanet['id'],
+      'PLANET_NUM'       => $Planet,
+      'PLANET_NAME'      => $uni_galaxyRowPlanet['name'],
+      'PLANET_NAME_JS'   => js_safe_string($uni_galaxyRowPlanet['name']),
+      'PLANET_DESTROYED' => $uni_galaxyRowPlanet["destruyed"],
+      'PLANET_TYPE'      => $uni_galaxyRowPlanet["planet_type"],
+      'PLANET_ACTIVITY'  => floor((SN_TIME_NOW - $uni_galaxyRowPlanet['last_update'])/60),
+      'PLANET_IMAGE'     => $uni_galaxyRowPlanet['image'],
+      'PLANET_FLEET_ID'  => $planet_fleet_id,
+      'PLANET_DIAMETER'  => number_format($uni_galaxyRowPlanet['diameter'], 0, '', '.'),
+
+      'USER_ID'       => $uni_galaxyRowUser['id'],
+      'USER_NAME'     => player_nick_render_to_html($uni_galaxyRowUser),
+      'USER_NAME_JS'  => js_safe_string(player_nick_render_to_html($uni_galaxyRowUser)),
+      'USER_RANK'     => in_array($uni_galaxyRowUser['id'], $user_skip_list) ? '-' : $uni_galaxyRowUser['total_rank'],
+      'USER_BANNED'   => $uni_galaxyRowUser['banaday'],
+      'USER_VACATION' => $uni_galaxyRowUser['vacation'],
+      'USER_ACTIVITY' => $user_activity,
+      'USER_ATTACKABLE' => $user_activity >= 7,
+      'USER_INACTIVE' => $user_activity >= 28,
+      'USER_PROTECTED'=> $RowUserPoints <= classSupernova::$config->game_noob_points,
+      'USER_NOOB'     => $RowUserPoints * classSupernova::$config->game_noob_factor < $CurrentPoints && classSupernova::$config->game_noob_factor,
+      'USER_STRONG'   => $CurrentPoints * classSupernova::$config->game_noob_factor < $RowUserPoints && classSupernova::$config->game_noob_factor,
+      'USER_AUTH'     => $uni_galaxyRowUser['authlevel'],
+      'USER_ADMIN'    => $lang['user_level_shortcut'][$uni_galaxyRowUser['authlevel']],
+      'USER_BIRTHDAY' => $birthday_array['month'] == $time_now_parsed['mon'] && $birthday_array['day'] == $time_now_parsed['mday'] ? date(FMT_DATE, SN_TIME_NOW) : 0,
+
+      'ALLY_ID'       => $uni_galaxyRowUser['ally_id'],
+      'ALLY_TAG'      => $uni_galaxyRowUser['ally_tag'],
   ], $templatizedMoon, $debrisTemplatized);
   $template->assign_block_vars('galaxyrow', $templatizedPlanet);
 }
@@ -338,52 +338,52 @@ 
 
 $template->assign_vars(array(
 //     'rows'                => $Result,
-     'userCount'           => classSupernova::$config->users_amount,
-     'ALLY_COUNT'          => $ally_count['ally_count'],
-     'PLANET_EXPEDITION'   => classSupernova::$config->game_maxPlanet + 1,
-     'curPlanetID'         => $planetrow['id'],
-     'curPlanetG'          => $planetrow['galaxy'],
-     'curPlanetS'          => $planetrow['system'],
-     'curPlanetP'          => $planetrow['planet'],
-     'curPlanetPT'         => $planetrow['planet_type'],
-     'deathStars'          => mrc_get_level($user, $planetrow, SHIP_HUGE_DEATH_STAR, false, true),
-     'galaxy'              => $uni_galaxy,
-     'system'              => $uni_system,
-     'planet'              => $planet,
-     'MIPs'                => round($CurrentMIP),
-     'MODE'                => $mode,
-     'planets'             => $planetcount,
-     'SPs'                 => pretty_number(mrc_get_level($user, $planetrow, SHIP_SPY, false, true)),
-     'SHOW_ADMIN'          => SHOW_ADMIN,
-     'fleet_count'         => $flying_fleet_count,
-     'fleet_max'           => $fleetmax,
-     'ALLY_ID'             => $user['ally_id'],
-     'USER_ID'             => $user['id'],
-     'ACT_SPIO'            => classSupernova::$user_options[PLAYER_OPTION_FLEET_SPY_DEFAULT],
-     'ACT_SPY'             => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_SPYING],
-     'ACT_WRITE'           => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_PM],
-     'ACT_STATISTICS'      => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_STATS],
-     'ACT_INFO'            => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_PROFILE],
-     'ACT_FRIEND'          => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_BUDDY],
-     'opt_uni_tooltip_time'=> classSupernova::$user_options[PLAYER_OPTION_TOOLTIP_DELAY],
-     'opt_uni_avatar_user' => $user['opt_uni_avatar_user'],
-     'opt_uni_avatar_ally' => $user['opt_uni_avatar_ally'],
-     'ACT_MISSILE'         => $is_missile,
-     'PLANET_PHALANX'      => $HavePhalanx && $uni_galaxy == $CurrentGalaxy && $uni_system >= $CurrentSystem - $PhalanxRange && $uni_system <= $CurrentSystem + $PhalanxRange,
-     'PAGE_HINT'           => $lang['gal_sys_hint'],
-     'PLANET_RECYCLERS'    => $planet_recyclers_orbiting,
-     'PLANET_RECYCLERS_TEXT' => pretty_number($planet_recyclers_orbiting),
-     'GALAXY_NAME'         => $galaxy_name['universe_name'],
-     'SYSTEM_NAME'         => $system_name['universe_name'],
-     'COL_SPAN'            => $colspan + 9,
-     'COL_SPAN_PLUS'       => $colspan + 3,
-
-     'COL_SPAN_NEW'        => $colspan + 4,
-     'COL_SPAN_NEW_COLONIZE' => $colspan - 2,
-
-     'PLAYER_OPTION_UNIVERSE_OLD' => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_OLD],
-     'PLAYER_OPTION_UNIVERSE_DISABLE_COLONIZE' => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_DISABLE_COLONIZE],
-   )
+      'userCount'           => classSupernova::$config->users_amount,
+      'ALLY_COUNT'          => $ally_count['ally_count'],
+      'PLANET_EXPEDITION'   => classSupernova::$config->game_maxPlanet + 1,
+      'curPlanetID'         => $planetrow['id'],
+      'curPlanetG'          => $planetrow['galaxy'],
+      'curPlanetS'          => $planetrow['system'],
+      'curPlanetP'          => $planetrow['planet'],
+      'curPlanetPT'         => $planetrow['planet_type'],
+      'deathStars'          => mrc_get_level($user, $planetrow, SHIP_HUGE_DEATH_STAR, false, true),
+      'galaxy'              => $uni_galaxy,
+      'system'              => $uni_system,
+      'planet'              => $planet,
+      'MIPs'                => round($CurrentMIP),
+      'MODE'                => $mode,
+      'planets'             => $planetcount,
+      'SPs'                 => pretty_number(mrc_get_level($user, $planetrow, SHIP_SPY, false, true)),
+      'SHOW_ADMIN'          => SHOW_ADMIN,
+      'fleet_count'         => $flying_fleet_count,
+      'fleet_max'           => $fleetmax,
+      'ALLY_ID'             => $user['ally_id'],
+      'USER_ID'             => $user['id'],
+      'ACT_SPIO'            => classSupernova::$user_options[PLAYER_OPTION_FLEET_SPY_DEFAULT],
+      'ACT_SPY'             => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_SPYING],
+      'ACT_WRITE'           => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_PM],
+      'ACT_STATISTICS'      => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_STATS],
+      'ACT_INFO'            => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_PROFILE],
+      'ACT_FRIEND'          => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_BUDDY],
+      'opt_uni_tooltip_time'=> classSupernova::$user_options[PLAYER_OPTION_TOOLTIP_DELAY],
+      'opt_uni_avatar_user' => $user['opt_uni_avatar_user'],
+      'opt_uni_avatar_ally' => $user['opt_uni_avatar_ally'],
+      'ACT_MISSILE'         => $is_missile,
+      'PLANET_PHALANX'      => $HavePhalanx && $uni_galaxy == $CurrentGalaxy && $uni_system >= $CurrentSystem - $PhalanxRange && $uni_system <= $CurrentSystem + $PhalanxRange,
+      'PAGE_HINT'           => $lang['gal_sys_hint'],
+      'PLANET_RECYCLERS'    => $planet_recyclers_orbiting,
+      'PLANET_RECYCLERS_TEXT' => pretty_number($planet_recyclers_orbiting),
+      'GALAXY_NAME'         => $galaxy_name['universe_name'],
+      'SYSTEM_NAME'         => $system_name['universe_name'],
+      'COL_SPAN'            => $colspan + 9,
+      'COL_SPAN_PLUS'       => $colspan + 3,
+
+      'COL_SPAN_NEW'        => $colspan + 4,
+      'COL_SPAN_NEW_COLONIZE' => $colspan - 2,
+
+      'PLAYER_OPTION_UNIVERSE_OLD' => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_OLD],
+      'PLAYER_OPTION_UNIVERSE_DISABLE_COLONIZE' => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_DISABLE_COLONIZE],
+    )
 );
 
 if($scan) {