Completed
Push — work-fleets ( 4d76fa...c97fe0 )
by SuperNova.WS
05:17
created
affilates.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
  * v1 (c) copyright 2010 by Gorlum for http://supernova.ws
9 9
  */
10 10
 
11
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
11
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
12 12
 
13 13
 lng_include('affilates');
14 14
 
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
   $gained += $affilate_gain;
33 33
 }
34 34
 
35
-$bannerURL  = SN_ROOT_VIRTUAL_PARENT . classSupernova::$config->int_banner_URL;
35
+$bannerURL  = SN_ROOT_VIRTUAL_PARENT.classSupernova::$config->int_banner_URL;
36 36
 $bannerURL .= strpos($bannerURL, '?') ? '&' : '?';
37 37
 $bannerURL .= "id={$user['id']}";
38 38
 
39
-$userbarURL  = SN_ROOT_VIRTUAL_PARENT . classSupernova::$config->int_userbar_URL;
39
+$userbarURL  = SN_ROOT_VIRTUAL_PARENT.classSupernova::$config->int_userbar_URL;
40 40
 $userbarURL .= strpos($userbarURL, '?') ? '&' : '?';
41 41
 $userbarURL .= "id={$user['id']}";
42 42
 
Please login to merge, or discard this patch.
search.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -10,9 +10,9 @@  discard block
 block discarded – undo
10 10
  * @copyright 2008 by ??????? for XNova
11 11
  */
12 12
 
13
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
13
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
14 14
 
15
-if(classSupernova::$config->game_mode == GAME_BLITZ) {
15
+if (classSupernova::$config->game_mode == GAME_BLITZ) {
16 16
   message(classLocale::$lang['sys_blitz_page_disabled'], classLocale::$lang['sys_error'], 'overview.php', 10);
17 17
   die();
18 18
 }
@@ -25,8 +25,8 @@  discard block
 block discarded – undo
25 25
 
26 26
 $template = gettemplate('search', true);
27 27
 
28
-if($searchtext && $type) {
29
-  switch($type) {
28
+if ($searchtext && $type) {
29
+  switch ($type) {
30 30
     case "planetname":
31 31
       // $search = db_planet_list_search($searchtext);
32 32
     break;
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
     break;
42 42
   }
43 43
 
44
-  while($row = db_fetch($search)) {
45
-    if($type == 'playername' || $type == 'planetname') {
44
+  while ($row = db_fetch($search)) {
45
+    if ($type == 'playername' || $type == 'planetname') {
46 46
       $template->assign_block_vars('search_result', array(
47 47
         'PLAYER_ID'       => $row['uid'],
48 48
         'PLAYER_NAME'     => htmlentities($row['username'], ENT_COMPAT, 'UTF-8'),
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
         'ALLY_NAME'       => htmlentities($row['ally_name'], ENT_COMPAT, 'UTF-8'),
58 58
         'ALLY_TAG'        => htmlentities($row['ally_tag'], ENT_COMPAT, 'UTF-8'),
59 59
       ));
60
-    } elseif($type == 'ally') {
60
+    } elseif ($type == 'ally') {
61 61
       $template->assign_block_vars('search_result', array(
62 62
         'ALLY_NAME'     => htmlentities($row['ally_name'], ENT_COMPAT, 'UTF-8'),
63 63
         'ALLY_TAG'      => htmlentities($row['ally_tag'], ENT_COMPAT, 'UTF-8'),
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
   'ally'       => 'sys_alliance',
76 76
 );
77 77
 
78
-foreach($search_type as $type_id => $type_lang) {
78
+foreach ($search_type as $type_id => $type_lang) {
79 79
   $template->assign_block_vars('type', array(
80 80
     'ID'       => $type_id,
81 81
     'TEXT'     => classLocale::$lang[$type_lang],
Please login to merge, or discard this patch.
officer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
  *
12 12
  */
13 13
 
14
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
14
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
15 15
 
16 16
 include("includes/includes/mrc_mercenary.php");
17 17
 
Please login to merge, or discard this patch.
flotenajax.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
  * @copyright 2008 By Chlorel for XNova
15 15
  **/
16 16
 
17
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
17
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
18 18
 
19 19
 define('IN_AJAX', true);
20 20
 
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
   $target_mission = sys_get_param_int('mission');
40 40
   $sn_group_missions = sn_get_groups('missions');
41
-  if(empty($sn_group_missions[$target_mission]['AJAX'])) {
41
+  if (empty($sn_group_missions[$target_mission]['AJAX'])) {
42 42
     die(classLocale::$lang['gs_c00']);
43 43
   }
44 44
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
   );
54 54
   // fleet_ajax now can send fleets only to existing planets/moons
55 55
   // TODO - sending colonization and expeditions in 1 click
56
-  if(!uni_coordinates_valid($target_coord)) {
56
+  if (!uni_coordinates_valid($target_coord)) {
57 57
     die(classLocale::$lang['gs_c02']);
58 58
   }
59 59
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
   // TODO - DEADLOCK CAN BE HERE!!!! We should lock SOURCE and TARGET owners in one query
66 66
   $target_row = db_planet_by_vector($target_coord);
67
-  if(empty($target_row)) {
67
+  if (empty($target_row)) {
68 68
     $target_row = $target_coord;
69 69
     $target_row['id_owner'] = 0;
70 70
     // If fleet destination is PT_DEBRIS - then it's actually destination is PT_PLANET // TODO - REMOVE! Debris should be valid DESTINATION planet_type!
@@ -75,15 +75,15 @@  discard block
 block discarded – undo
75 75
   }
76 76
 
77 77
   $fleet_array = array();
78
-  switch($target_mission) {
78
+  switch ($target_mission) {
79 79
     case MT_SPY:
80 80
       $fleet_array[SHIP_SPY] = min(mrc_get_level($user, $planetrow, SHIP_SPY), abs(classSupernova::$user_options[PLAYER_OPTION_FLEET_SPY_DEFAULT]));
81 81
       $unit_group = 'flt_spies';
82 82
     break;
83 83
 
84 84
     case MT_RECYCLE:
85
-      foreach(sn_get_groups('flt_recyclers') as $unit_id) {
86
-        if($unit_count = mrc_get_level($user, $planetrow, $unit_id)) {
85
+      foreach (sn_get_groups('flt_recyclers') as $unit_id) {
86
+        if ($unit_count = mrc_get_level($user, $planetrow, $unit_id)) {
87 87
           $fleet_array[$unit_id] = $unit_count;
88 88
         }
89 89
       }
@@ -108,16 +108,16 @@  discard block
 block discarded – undo
108 108
       'target_structure' => $target_structure = sys_get_param_int('structures'),
109 109
     )
110 110
   );
111
-  if($isAttackAllowed != FLIGHT_ALLOWED) {
111
+  if ($isAttackAllowed != FLIGHT_ALLOWED) {
112 112
     die(classLocale::$lang['fl_attack_error'][$isAttackAllowed]);
113 113
   }
114 114
 
115 115
   $db_changeset = array();
116
-  foreach($fleet_array as $unit_id => $unit_count) {
116
+  foreach ($fleet_array as $unit_id => $unit_count) {
117 117
     $db_changeset['unit'][] = sn_db_unit_changeset_prepare($unit_id, -$unit_count, $user, $planetrow);
118 118
   }
119 119
 
120
-  if($target_mission == MT_MISSILE) {
120
+  if ($target_mission == MT_MISSILE) {
121 121
     $distance = abs($target_coord['system'] - $planetrow['system']);
122 122
     $duration = round((30 + (60 * $distance)) / flt_server_flight_speed_multiplier());
123 123
     $arrival = SN_TIME_NOW + $duration;
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
   } else {
128 128
     $travel_data = flt_travel_data($user, $planetrow, $target_coord, $fleet_array, 10);
129 129
 
130
-    if($planetrow['deuterium'] < $travel_data['consumption']) {
130
+    if ($planetrow['deuterium'] < $travel_data['consumption']) {
131 131
       die(classLocale::$lang['gs_c13']);
132 132
     }
133 133
 
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 
149 149
   $ships_sent = array();
150 150
   $ships_sent_js = 0;
151
-  foreach($fleet_array as $unit_id => $unit_count) {
151
+  foreach ($fleet_array as $unit_id => $unit_count) {
152 152
     $ships_sent[] = "{$unit_count} {$classLocale['tech'][$unit_id]}";
153 153
     $ships_sent_js += mrc_get_level($user, $planetrow, $unit_id, false, true);
154 154
   }
Please login to merge, or discard this patch.
dark_matter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-include_once('common.' . substr(strrchr(__FILE__, '.'), 1));
3
+include_once('common.'.substr(strrchr(__FILE__, '.'), 1));
4 4
 
5
-if(sn_module_get_active_count('payment') && !defined('SN_GOOGLE')) {
5
+if (sn_module_get_active_count('payment') && !defined('SN_GOOGLE')) {
6 6
   sys_redirect('metamatter.php');
7 7
 }
8 8
 
Please login to merge, or discard this patch.
quest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,10 +7,10 @@
 block discarded – undo
7 7
  *
8 8
  */
9 9
 
10
-define('INSIDE'  , true);
11
-define('INSTALL' , false);
10
+define('INSIDE', true);
11
+define('INSTALL', false);
12 12
 
13
-require('common.' . substr(strrchr(__FILE__, '.'), 1));
13
+require('common.'.substr(strrchr(__FILE__, '.'), 1));
14 14
 
15 15
 lng_include('quest');
16 16
 $template = gettemplate('quest', true);
Please login to merge, or discard this patch.
jumpgate.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -10,76 +10,76 @@  discard block
 block discarded – undo
10 10
  * @copyright 2008 By Chlorel for XNova
11 11
  */
12 12
 
13
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
13
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
14 14
 
15 15
 lng_include('fleet');
16 16
 
17
-if($TargetPlanet = sys_get_param_id('jmpto'))
17
+if ($TargetPlanet = sys_get_param_id('jmpto'))
18 18
 {
19 19
   sn_db_transaction_start();
20 20
   db_user_by_id($user['id'], true, 'id');
21 21
   $planetrow = db_planet_by_id($planetrow['id'], true);
22
-  if(!($NextJumpTime = uni_get_time_to_jump($planetrow)))
22
+  if (!($NextJumpTime = uni_get_time_to_jump($planetrow)))
23 23
   {
24 24
     $TargetGate = db_planet_by_id($TargetPlanet, true, '`id`, `last_jump_time`');
25
-    if(mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
25
+    if (mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
26 26
     {
27
-      $NextDestTime = uni_get_time_to_jump ( $TargetGate );
28
-      if(!$NextDestTime)
27
+      $NextDestTime = uni_get_time_to_jump($TargetGate);
28
+      if (!$NextDestTime)
29 29
       {
30 30
         // $SubQueryOri = "";
31 31
         // $SubQueryDes = "";
32 32
         $ship_list = sys_get_param('ships');
33 33
         $db_changeset = array();
34
-        foreach($ship_list as $ship_id => $ship_count)
34
+        foreach ($ship_list as $ship_id => $ship_count)
35 35
         {
36
-          if(!in_array($ship_id, sn_get_groups('fleet')))
36
+          if (!in_array($ship_id, sn_get_groups('fleet')))
37 37
           {
38 38
             continue;
39 39
           }
40 40
 
41 41
           $ship_count = max(0, min(floor($ship_count), mrc_get_level($user, $planetrow, $ship_id)));
42
-          if($ship_count)
42
+          if ($ship_count)
43 43
           {
44 44
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($ship_id, -$ship_count, $user, $planetrow['id']);
45 45
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($ship_id, $ship_count, $user, $TargetGate['id']);
46 46
           }
47 47
         }
48 48
         // Dit monsieur, y avait quelque chose a envoyer ???
49
-        if(!empty($db_changeset))
49
+        if (!empty($db_changeset))
50 50
         {
51
-          db_planet_set_by_id($TargetGate['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
52
-          db_planet_set_by_id($planetrow['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
51
+          db_planet_set_by_id($TargetGate['id'], "`last_jump_time` = ".SN_TIME_NOW."");
52
+          db_planet_set_by_id($planetrow['id'], "`last_jump_time` = ".SN_TIME_NOW."");
53 53
           db_changeset_apply($db_changeset);
54 54
 
55 55
           db_user_set_by_id($user['id'], "`current_planet` = '{$TargetGate['id']}'");
56 56
 
57 57
           $planetrow['last_jump_time'] = SN_TIME_NOW;
58
-          $RetMessage = classLocale::$lang['gate_jump_done'] ." - ". pretty_time(uni_get_time_to_jump($planetrow));
58
+          $RetMessage = classLocale::$lang['gate_jump_done']." - ".pretty_time(uni_get_time_to_jump($planetrow));
59 59
         } else {
60 60
           $RetMessage = classLocale::$lang['gate_wait_data'];
61 61
         }
62 62
       } else {
63
-        $RetMessage = classLocale::$lang['gate_wait_dest'] ." - ". pretty_time($NextDestTime);
63
+        $RetMessage = classLocale::$lang['gate_wait_dest']." - ".pretty_time($NextDestTime);
64 64
       }
65 65
     } else {
66 66
       $RetMessage = classLocale::$lang['gate_no_dest_g'];
67 67
     }
68 68
   } else {
69
-    $RetMessage = classLocale::$lang['gate_wait_star'] ." - ". pretty_time($NextJumpTime);
69
+    $RetMessage = classLocale::$lang['gate_wait_star']." - ".pretty_time($NextJumpTime);
70 70
   }
71 71
   sn_db_transaction_commit();
72 72
   message($RetMessage, classLocale::$lang['tech'][STRUC_MOON_GATE], "jumpgate.php", 10);
73 73
 } else {
74 74
   $template = gettemplate('jumpgate', true);
75
-  if(mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
75
+  if (mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
76 76
   {
77 77
     $Combo = '';
78 78
     $MoonList = db_planet_list_moon_other($user['id'], $planetrow['id']);
79 79
     // while($CurMoon = db_fetch($MoonList))
80
-    foreach($MoonList as $CurMoon)
80
+    foreach ($MoonList as $CurMoon)
81 81
     {
82
-      if(mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
82
+      if (mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
83 83
       {
84 84
         $NextJumpTime = uni_get_time_to_jump($CurMoon);
85 85
         $template->assign_block_vars('moon', array(
@@ -93,9 +93,9 @@  discard block
 block discarded – undo
93 93
       }
94 94
     }
95 95
 
96
-    foreach(sn_get_groups('fleet') as $Ship)
96
+    foreach (sn_get_groups('fleet') as $Ship)
97 97
     {
98
-      if(($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
98
+      if (($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
99 99
       {
100 100
         continue;
101 101
       }
Please login to merge, or discard this patch.
fleet.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -3,13 +3,13 @@  discard block
 block discarded – undo
3 3
 define('SN_IN_FLEET', true);
4 4
 define('SN_RENDER_NAVBAR_PLANET', true);
5 5
 
6
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
6
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
7 7
 
8 8
 // TODO - Переместить это куда-нибудь
9 9
 $fleet_page = sys_get_param_int('fleet_page', sys_get_param_int('mode'));
10
-if($fleet_ship_sort = sys_get_param_id('sort_elements') && $fleet_page == 0) {
10
+if ($fleet_ship_sort = sys_get_param_id('sort_elements') && $fleet_page == 0) {
11 11
   define('IN_AJAX', true);
12
-  if(!empty(classLocale::$lang['player_option_fleet_ship_sort'][$fleet_ship_sort])) {
12
+  if (!empty(classLocale::$lang['player_option_fleet_ship_sort'][$fleet_ship_sort])) {
13 13
     classSupernova::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT] = $fleet_ship_sort;
14 14
     classSupernova::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT_INVERSE] = sys_get_param_id('sort_elements_inverse', 0);
15 15
   }
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 $objFleet5->initDefaults($user, $planetrow, $targetVector, $target_mission, $ships, $fleet_group_mr, $speed_percent, 0, $captainId, $resources);
46 46
 
47 47
 
48
-switch($fleet_page) {
48
+switch ($fleet_page) {
49 49
   case 1:
50 50
     $objFleet5->fleetPage1();
51 51
   break;
Please login to merge, or discard this patch.
alliance.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
3
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
4 4
 
5
-if(classSupernova::$config->game_mode == GAME_BLITZ) {
5
+if (classSupernova::$config->game_mode == GAME_BLITZ) {
6 6
   message(classLocale::$lang['sys_blitz_page_disabled'], classLocale::$lang['sys_error'], 'overview.php', 10);
7 7
   die();
8 8
 }
@@ -14,16 +14,16 @@  discard block
 block discarded – undo
14 14
 
15 15
 $mode = sys_get_param_str('mode');
16 16
 
17
-if($mode == 'ainfo') {
17
+if ($mode == 'ainfo') {
18 18
   include('includes/alliance/ali_info.inc');
19 19
 }
20 20
 
21
-if(!$user['ally_id']) {
21
+if (!$user['ally_id']) {
22 22
   $user_request = db_ally_request_get_by_user_id($user['id']);
23
-  if($user_request['id_user']) {
23
+  if ($user_request['id_user']) {
24 24
     require('includes/alliance/ali_external_request.inc');
25 25
   } else {
26
-    switch($mode) {
26
+    switch ($mode) {
27 27
       case 'search':
28 28
         require('includes/alliance/ali_external_search.inc');
29 29
       break;
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 }
45 45
 
46 46
 sn_ali_fill_user_ally($user);
47
-if(!isset($user['ally'])) {
47
+if (!isset($user['ally'])) {
48 48
   db_user_set_by_id($user['id'], "`ally_id` = null, `ally_name` = null, `ally_register_time` = 0, `ally_rank_id` = 0");
49 49
   message(classLocale::$lang['ali_sys_notFound'], classLocale::$lang['your_alliance'], 'alliance.php');
50 50
 }
@@ -72,18 +72,18 @@  discard block
 block discarded – undo
72 72
 
73 73
 // This piece converting old ally data to new one
74 74
 //  unset($ally['ranklist']);
75
-if(!$ally['ranklist'] && $ally['ally_ranks']) {
75
+if (!$ally['ranklist'] && $ally['ally_ranks']) {
76 76
   $ally_ranks = unserialize($ally['ally_ranks']);
77 77
   $i = 0;
78
-  foreach($ally_ranks as $rank_id => $rank) {
79
-    foreach($ally_rights as $key => $value) {
78
+  foreach ($ally_ranks as $rank_id => $rank) {
79
+    foreach ($ally_rights as $key => $value) {
80 80
       $ranks[$i][$value] = $rank[$rights_old[$key]];
81 81
     }
82 82
     db_user_list_set_ally_deprecated_convert_ranks($user['ally_id'], $i, $rank_id);
83 83
     $i++;
84 84
   }
85 85
 
86
-  if(!empty($ranks)) {
86
+  if (!empty($ranks)) {
87 87
     ali_rank_list_save($ranks);
88 88
   }
89 89
 }
@@ -101,15 +101,15 @@  discard block
 block discarded – undo
101 101
 
102 102
 $edit = sys_get_param_str('edit');
103 103
 ally_pre_call();
104
-switch($mode) {
104
+switch ($mode) {
105 105
   case 'admin':
106
-    if(!array_key_exists($edit, $sn_ali_admin_internal)) {
106
+    if (!array_key_exists($edit, $sn_ali_admin_internal)) {
107 107
       $edit = 'default';
108 108
     }
109
-    if($sn_ali_admin_internal[$edit]['include']) {
109
+    if ($sn_ali_admin_internal[$edit]['include']) {
110 110
       require("includes/{$sn_ali_admin_internal[$edit]['include']}");
111 111
     }
112
-    if(isset($sn_ali_admin_internal[$edit]['function']) && is_callable($sn_ali_admin_internal[$edit]['function'])) {
112
+    if (isset($sn_ali_admin_internal[$edit]['function']) && is_callable($sn_ali_admin_internal[$edit]['function'])) {
113 113
       call_user_func($sn_ali_admin_internal[$edit]['function']);
114 114
     }
115 115
   break;
Please login to merge, or discard this patch.