Completed
Push — trunk ( 91a948...0e7a2e )
by SuperNova.WS
05:44
created
includes/includes/market_fleeter.inc 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 use DBAL\OldDbChangeSet;
4 4
 use Planet\DBStaticPlanet;
5 5
 
6
-if(!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) {
6
+if (!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) {
7 7
   $debug->error("Attempt to call market page mode {$mode} directly - not from market.php", 'Forbidden', 403);
8 8
 }
9 9
 
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
   'rpg_cost' => $rpg_cost,
16 16
 ));
17 17
 
18
-if(is_array($shipList)) {
19
-  if(mrc_get_level($user, null, RES_DARK_MATTER) < $rpg_cost) {
18
+if (is_array($shipList)) {
19
+  if (mrc_get_level($user, null, RES_DARK_MATTER) < $rpg_cost) {
20 20
     $intError = MARKET_NO_DM;
21 21
   }
22 22
 
@@ -33,30 +33,30 @@  discard block
 block discarded – undo
33 33
   $qry = array();
34 34
   $total = array();
35 35
   $db_changeset = array();
36
-  foreach($shipList as $shipID => &$shipCount) {
36
+  foreach ($shipList as $shipID => &$shipCount) {
37 37
     $shipCount = ceil(floatval($shipCount));
38
-    if(!$shipCount) {
38
+    if (!$shipCount) {
39 39
       continue;
40 40
     }
41 41
 
42
-    if($shipCount < 0) {
42
+    if ($shipCount < 0) {
43 43
       $debug->warning('User supplied negative ship count on Black Market page', 'Hack Attempt', 307);
44 44
       $intError = MARKET_NEGATIVE_SHIPS;
45 45
       break;
46 46
     }
47 47
 
48
-    if($mode == MARKET_SCRAPPER) {
48
+    if ($mode == MARKET_SCRAPPER) {
49 49
       $amount = mrc_get_level($user, $planetrow, $shipID, true, true); // $planetrow[get_unit_param($shipID, P_NAME)];
50
-    } elseif($mode == MARKET_STOCKMAN) {
50
+    } elseif ($mode == MARKET_STOCKMAN) {
51 51
       $amount = $stock[$shipID];
52 52
     }
53 53
 
54
-    if($amount < $shipCount) {
54
+    if ($amount < $shipCount) {
55 55
       $intError = $error_no_stock;
56 56
       break;
57 57
     }
58 58
 
59
-    if(!in_array($shipID, sn_get_groups('fleet'))) {
59
+    if (!in_array($shipID, sn_get_groups('fleet'))) {
60 60
       $debug->warning('Hack Attempt', 'User supplied non-ship unit ID on Black Market page', 306);
61 61
       $intError = MARKET_NOT_A_SHIP;
62 62
       break;
@@ -72,16 +72,16 @@  discard block
 block discarded – undo
72 72
     $resTemp[RES_CRYSTAL] = floor($build_data[BUILD_CREATE][RES_CRYSTAL] * $shipCount * $config_rpg_scrape_crystal * (-$multiplier));
73 73
     $resTemp[RES_DEUTERIUM] = floor($build_data[BUILD_CREATE][RES_DEUTERIUM] * $shipCount * $config_rpg_scrape_deuterium * (-$multiplier));
74 74
 
75
-    foreach($resTemp as $resID => $resCount) {
75
+    foreach ($resTemp as $resID => $resCount) {
76 76
       $total[$resID] += $resCount;
77 77
     }
78 78
 
79 79
     $message .= "<li>{$lang['tech'][$shipID]}: " . HelperString::numberFloorAndFormat($shipCount);
80 80
   }
81 81
 
82
-  if($mode == MARKET_STOCKMAN && $intError == MARKET_DEAL) {
83
-    foreach($total as $resID => $resCount) {
84
-      if(mrc_get_level($user, $planetrow, $resID, true, true) < -$resCount) {
82
+  if ($mode == MARKET_STOCKMAN && $intError == MARKET_DEAL) {
83
+    foreach ($total as $resID => $resCount) {
84
+      if (mrc_get_level($user, $planetrow, $resID, true, true) < -$resCount) {
85 85
         $intError = MARKET_NO_RESOURCES;
86 86
         $debug->warning('Trying to use bug in s/h market', 'S/H Ship Market', 301);
87 87
         break;
@@ -91,10 +91,10 @@  discard block
 block discarded – undo
91 91
 
92 92
   $intError = ($intError == MARKET_DEAL) && (array_sum($total) == 0) ? $error_zero_res : $intError;
93 93
 
94
-  if($intError == MARKET_DEAL) {
94
+  if ($intError == MARKET_DEAL) {
95 95
     $message .= '</ul>' . $lang["eco_mrk_{$submode}_res"] . '<ul>';
96
-    foreach($total as $resID => $resCount) {
97
-      if(!$resCount) {
96
+    foreach ($total as $resID => $resCount) {
97
+      if (!$resCount) {
98 98
         continue;
99 99
       }
100 100
 
@@ -128,38 +128,38 @@  discard block
 block discarded – undo
128 128
       'MESSAGE' => $lang['eco_mrk_errors'][$intError],
129 129
     ));
130 130
 
131
-    foreach($shipList as $shipID => $shipCount) {
131
+    foreach ($shipList as $shipID => $shipCount) {
132 132
       $data['ships'][$shipID] = max(0, intval($shipCount));
133 133
     }
134 134
   }
135 135
 }
136 136
 $message = '';
137 137
 
138
-if(!$config->eco_stockman_fleet && $config->eco_stockman_fleet_populate) {
139
-  $config->db_saveItem('eco_stockman_fleet', sys_unit_arr2str(array_map(function($item){return mt_rand(1, 1000);}, sn_get_groups('fleet'))));
138
+if (!$config->eco_stockman_fleet && $config->eco_stockman_fleet_populate) {
139
+  $config->db_saveItem('eco_stockman_fleet', sys_unit_arr2str(array_map(function($item) {return mt_rand(1, 1000); }, sn_get_groups('fleet'))));
140 140
 }
141 141
 
142 142
 tpl_set_resource_info($template, $planetrow, array());
143 143
 
144
-if(!$array) {
144
+if (!$array) {
145 145
   $array = array();
146 146
 }
147 147
 
148 148
 $group_fleet = sn_get_groups('fleet');
149
-foreach($array as $key => $value) {
150
-  if($mode == MARKET_SCRAPPER) {
149
+foreach ($array as $key => $value) {
150
+  if ($mode == MARKET_SCRAPPER) {
151 151
     $shipID = $value;
152 152
     $amount = mrc_get_level($user, $planetrow, $shipID, false, true); // $planetrow[get_unit_param($shipID, P_NAME)];
153
-  } elseif($mode == MARKET_STOCKMAN) {
153
+  } elseif ($mode == MARKET_STOCKMAN) {
154 154
     $shipID = $key;
155 155
     $amount = $value;
156 156
   }
157 157
 
158
-  if(!in_array($shipID, $group_fleet)) {
158
+  if (!in_array($shipID, $group_fleet)) {
159 159
     continue;
160 160
   }
161 161
 
162
-  if($amount > 0) {
162
+  if ($amount > 0) {
163 163
     $build_data = eco_get_build_data($user, $planetrow, $shipID);
164 164
     $template->assign_block_vars('ships', array(
165 165
       'ID'        => $shipID,
Please login to merge, or discard this patch.
includes/includes/flt_page4.inc 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -2,18 +2,18 @@  discard block
 block discarded – undo
2 2
 
3 3
 use Planet\DBStaticPlanet;
4 4
 
5
-if(SN_IN_FLEET !== true) {
5
+if (SN_IN_FLEET !== true) {
6 6
   $debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
7 7
 }
8 8
 
9 9
 $fleetid = sys_get_param_id('fleetid');
10 10
 
11
-if(!is_numeric($fleetid) || empty($fleetid)) {
11
+if (!is_numeric($fleetid) || empty($fleetid)) {
12 12
   sys_redirect("fleet.php");
13 13
 }
14 14
 
15 15
 $fleet = db_fleet_get($fleetid);
16
-if(!$fleet) {
16
+if (!$fleet) {
17 17
   messageBox($lang['fl_fleet_not_exists'], $lang['fl_error']);
18 18
 }
19 19
 //$query = doquery("SELECT * FROM `{{fleets}}` WHERE fleet_id = '{$fleetid}'");
@@ -27,8 +27,8 @@  discard block
 block discarded – undo
27 27
   messageBox($lang['fl_isback'], $lang['fl_error']);
28 28
 }
29 29
 
30
-if($fleet['fleet_owner'] != $user['id']) {
31
-  $debug->warning($lang['fl_aks_hack_wrong_fleet'],'Wrong Fleet Owner',301);
30
+if ($fleet['fleet_owner'] != $user['id']) {
31
+  $debug->warning($lang['fl_aks_hack_wrong_fleet'], 'Wrong Fleet Owner', 301);
32 32
   messageBox($lang['fl_aks_hack_wrong_fleet'], $lang['fl_error']);
33 33
 }
34 34
 
@@ -38,19 +38,19 @@  discard block
 block discarded – undo
38 38
 
39 39
 !$aks && !$userToAdd_unsafe ? $userToAdd_unsafe = $user['username'] : false;
40 40
 
41
-if($userToAdd_unsafe) {
41
+if ($userToAdd_unsafe) {
42 42
   $userToAdd = db_escape($userToAdd_unsafe);
43 43
   $userToAddID = db_user_by_username($userToAdd_unsafe, true);
44 44
   $userToAddID = $userToAddID['id'];
45 45
 
46
-  if($fleet['fleet_target_owner'] == $userToAddID) {
46
+  if ($fleet['fleet_target_owner'] == $userToAddID) {
47 47
     messageBox($lang['flt_aks_player_same'], $lang['fl_error']);
48 48
   }
49 49
 
50
-  if($userToAddID) {
51
-    if(!$aks) {
50
+  if ($userToAddID) {
51
+    if (!$aks) {
52 52
       // No AСS exists - making one
53
-      if(!$fleet['fleet_group']) {
53
+      if (!$fleet['fleet_group']) {
54 54
         doquery("INSERT INTO {{aks}} SET
55 55
           `name` = '" . db_escape($lang['flt_acs_prefix'] . $fleetid) . "',
56 56
           `teilnehmer` = '" . $user['id'] . "',
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
           `planet` = '" . $fleet['fleet_end_planet'] . "',
62 62
           `planet_type` = '" . $fleet['fleet_end_type'] . "',
63 63
           `eingeladen` = '" . $user['id'] . "',
64
-          `fleet_end_time` = '" . $fleet['fleet_end_time']. "'");
64
+          `fleet_end_time` = '" . $fleet['fleet_end_time'] . "'");
65 65
 
66 66
         $aks = doquery("SELECT * FROM {{aks}} WHERE `flotten` = {$fleetid} LIMIT 1;", true);
67 67
 
@@ -79,26 +79,26 @@  discard block
 block discarded – undo
79 79
 
80 80
     $isUserExists = false;
81 81
     $invited_ar = explode(",", $aks['eingeladen']);
82
-    foreach($invited_ar as $inv) {
82
+    foreach ($invited_ar as $inv) {
83 83
       if ($userToAddID == $inv) {
84 84
         $isUserExists = true;
85 85
       }
86 86
     }
87 87
 
88
-    if(count($invited_ar) >= 5) {
88
+    if (count($invited_ar) >= 5) {
89 89
       messageBox($lang['flt_aks_error_too_much_players'], $lang['fl_error']);
90 90
     }
91 91
 
92
-    if($isUserExists) {
92
+    if ($isUserExists) {
93 93
       $userToAdd_unsafe != $user['username'] ? $add_user_message_mr = sprintf($lang['fl_aks_player_invited_already'], $userToAdd) : false;
94 94
     } else {
95 95
       $add_user_message_mr = sprintf($lang['fl_aks_player_invited'], $userToAdd);
96 96
       doquery("UPDATE `{{aks}}` SET `eingeladen` = concat(`eingeladen`, ',{$userToAddID}') WHERE `flotten` = {$fleetid};")
97
-        or die(sprintf($lang['fl_aks_adding_error'],db_error()));
97
+        or die(sprintf($lang['fl_aks_adding_error'], db_error()));
98 98
       $aks['eingeladen'] .= ',' . $userToAddID;
99 99
     }
100
-    msg_send_simple_message ( $userToAddID, $user['id'], SN_TIME_NOW, MSG_TYPE_COMBAT, $user['username'],
101
-      $lang['fl_aks_invite_message_header'], sprintf( $lang['fl_aks_invite_message'], $user['username']));
100
+    msg_send_simple_message($userToAddID, $user['id'], SN_TIME_NOW, MSG_TYPE_COMBAT, $user['username'],
101
+      $lang['fl_aks_invite_message_header'], sprintf($lang['fl_aks_invite_message'], $user['username']));
102 102
   } else {
103 103
     $add_user_message_mr = sprintf($lang['fl_aks_player_error'], $userToAdd);
104 104
   }
@@ -112,8 +112,8 @@  discard block
 block discarded – undo
112 112
   'MISSION_NAME' => $lang['type_mission'][MT_AKS],
113 113
 ));
114 114
 
115
-if($aks['eingeladen'] && is_array($members = SN::db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
116
-  foreach($members as $row) {
115
+if ($aks['eingeladen'] && is_array($members = SN::db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
116
+  foreach ($members as $row) {
117 117
     $template->assign_block_vars('invited', array(
118 118
       'NAME' => $row['username'],
119 119
     ));
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 $i++;
124 124
 $fleet_row = db_fleet_get($fleetid);
125 125
 
126
-if(is_array($fleet_row) && !empty($fleet_row)) {
126
+if (is_array($fleet_row) && !empty($fleet_row)) {
127 127
 $planet_start = DBStaticPlanet::db_planet_by_id($fleet_row['fleet_start_planet_id']);
128 128
 $fleet_row['fleet_start_name'] = !empty($planet_start['name']) ? $planet_start['name'] : '';
129 129
 $planet_end = DBStaticPlanet::db_planet_by_id($fleet_row['fleet_end_planet_id']);
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 
132 132
 $fleet_data = tpl_parse_fleet_db($fleet_row, $i, $user);
133 133
 $template->assign_block_vars('fleets', $fleet_data['fleet']);
134
-foreach($fleet_data['ships'] as $ship_data) {
134
+foreach ($fleet_data['ships'] as $ship_data) {
135 135
   $template->assign_block_vars('fleets.ships', $ship_data);
136 136
 }
137 137
 }
Please login to merge, or discard this patch.
admin/settings.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@  discard block
 block discarded – undo
10 10
 
11 11
 use Unit\DBStaticUnit;
12 12
 
13
-define('INSIDE'  , true);
14
-define('INSTALL' , false);
13
+define('INSIDE', true);
14
+define('INSTALL', false);
15 15
 define('IN_ADMIN', true);
16 16
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
17 17
 
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
 $template = gettemplate('admin/settings', true);
23 23
 
24
-if(sys_get_param('save')) {
24
+if (sys_get_param('save')) {
25 25
   SN::$config->game_name               = sys_get_param_str_unsafe('game_name');
26 26
   SN::$config->game_mode               = sys_get_param_int('game_mode');
27 27
   SN::$config->game_speed              = sys_get_param_float('game_speed', 1);
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
   SN::$config->url_faq                 = sys_get_param_str_unsafe('url_faq');
32 32
   SN::$config->url_forum               = sys_get_param_str_unsafe('url_forum');
33 33
   SN::$config->url_rules               = sys_get_param_str_unsafe('url_rules');
34
-  SN::$config->url_purchase_metamatter         = sys_get_param_str_unsafe('url_purchase_metamatter');
34
+  SN::$config->url_purchase_metamatter = sys_get_param_str_unsafe('url_purchase_metamatter');
35 35
   SN::$config->game_disable            = sys_get_param_int('game_disable');
36 36
   SN::$config->game_disable_reason     = sys_get_param_str_unsafe('game_disable_reason');
37 37
   SN::$config->server_updater_check_auto = sys_get_param_int('server_updater_check_auto');
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
   SN::$config->stats_schedule          = sys_get_param_str('stats_schedule');
102 102
 
103 103
   SN::$config->empire_mercenary_base_period = sys_get_param_int('empire_mercenary_base_period');
104
-  if(SN::$config->empire_mercenary_temporary != sys_get_param_int('empire_mercenary_temporary')) {
105
-    if(SN::$config->empire_mercenary_temporary) {
104
+  if (SN::$config->empire_mercenary_temporary != sys_get_param_int('empire_mercenary_temporary')) {
105
+    if (SN::$config->empire_mercenary_temporary) {
106 106
       DBStaticUnit::db_unit_list_admin_delete_mercenaries_finished();
107 107
     } else {
108 108
       DBStaticUnit::db_unit_list_admin_set_mercenaries_expire_time(SN::$config->empire_mercenary_base_period);
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 tpl_assign_select($template, 'ver_response', SN::$lang['adm_opt_ver_response'], 'ID', 'NAME');
153 153
 
154 154
 $lang_list = lng_get_list();
155
-foreach($lang_list as $lang_id => $lang_data) {
155
+foreach ($lang_list as $lang_id => $lang_data) {
156 156
   $template->assign_block_vars('game_languages', array(
157 157
     'ID'   => $lang_id,
158 158
     'NAME' => "{$lang_data['LANG_NAME_NATIVE']} ({$lang_data['LANG_NAME_ENGLISH']})",
Please login to merge, or discard this patch.