@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | use \DBAL\DbQuery; |
4 | 4 | |
5 | -if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) |
|
5 | +if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) |
|
6 | 6 | { |
7 | 7 | $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403); |
8 | 8 | } |
@@ -17,28 +17,28 @@ discard block |
||
17 | 17 | $ally_name_safe = db_escape($user['ally_name']); |
18 | 18 | |
19 | 19 | $autoAccept = false; |
20 | -if(sys_get_param_str('ali_dip_offer_make')) |
|
20 | +if (sys_get_param_str('ali_dip_offer_make')) |
|
21 | 21 | { |
22 | 22 | $alliance_negotiation_relation = sys_get_param_str('alliance_negotiation_relation'); |
23 | - if(!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list)) |
|
23 | + if (!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list)) |
|
24 | 24 | { |
25 | 25 | messageBox($lang['ali_dip_err_wrong_offer'], $page_title); |
26 | 26 | } |
27 | 27 | |
28 | 28 | $alliance_negotiation_contr_ally_id = sys_get_param_id('alliance_negotiation_contr_ally_id'); |
29 | - if($alliance_negotiation_contr_ally_id == $user['ally_id']) |
|
29 | + if ($alliance_negotiation_contr_ally_id == $user['ally_id']) |
|
30 | 30 | { |
31 | 31 | messageBox($lang['ali_dip_err_same_ally'], $page_title); |
32 | 32 | } |
33 | 33 | |
34 | 34 | $contr_ally_row = doquery("SELECT `ally_name` FROM {{alliance}} WHERE `id` = {$alliance_negotiation_contr_ally_id} LIMIT 1;", '', true); |
35 | - if(!$contr_ally_row) |
|
35 | + if (!$contr_ally_row) |
|
36 | 36 | { |
37 | 37 | messageBox($lang['ali_dip_err_no_ally'], $page_title); |
38 | 38 | } |
39 | 39 | |
40 | 40 | $relation_current_id = ali_relation($user['ally_id'], $alliance_negotiation_contr_ally_id); |
41 | - if($alliance_negotiation_relation == $relation_current_id) |
|
41 | + if ($alliance_negotiation_relation == $relation_current_id) |
|
42 | 42 | { |
43 | 43 | messageBox(sprintf($lang['ali_dip_err_offer_same'], $lang['ali_dip_relations'][$alliance_negotiation_relation]), $page_title); |
44 | 44 | } |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | |
51 | 51 | $relation_new = $sn_diplomacy_relation_list[$alliance_negotiation_relation]; |
52 | 52 | $relation_current = $sn_diplomacy_relation_list[$relation_current_id]; |
53 | - if($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1) |
|
53 | + if ($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1) |
|
54 | 54 | { |
55 | 55 | DbQuery::build() |
56 | 56 | ->setTable('alliance_negotiation') |
@@ -84,39 +84,39 @@ discard block |
||
84 | 84 | else |
85 | 85 | { |
86 | 86 | $offer_id = sys_get_param_id('offer_id'); |
87 | - if($offer_id) |
|
87 | + if ($offer_id) |
|
88 | 88 | { |
89 | 89 | $offer_answer = sys_get_param_str('answer'); |
90 | 90 | |
91 | 91 | $negotiation = doquery("SELECT * FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;", '', true); |
92 | - if(!$negotiation) |
|
92 | + if (!$negotiation) |
|
93 | 93 | { |
94 | 94 | messageBox($lang['ali_dip_err_offer_none'], $page_title); |
95 | 95 | } |
96 | - elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id']) |
|
96 | + elseif ($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id']) |
|
97 | 97 | { |
98 | 98 | // TODO: Add log of hack attempt |
99 | 99 | messageBox($lang['ali_dip_err_offer_alien'], $page_title); |
100 | 100 | } |
101 | - elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id']) |
|
101 | + elseif ($negotiation['alliance_negotiation_ally_id'] == $user['ally_id']) |
|
102 | 102 | { |
103 | - if($offer_answer == 'accept') |
|
103 | + if ($offer_answer == 'accept') |
|
104 | 104 | { |
105 | 105 | // TODO: Add log of hack attempt |
106 | 106 | messageBox($lang['ali_dip_err_offer_accept_own'], $page_title); |
107 | 107 | } |
108 | - elseif($offer_answer == 'deny') |
|
108 | + elseif ($offer_answer == 'deny') |
|
109 | 109 | { |
110 | 110 | doquery("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;"); |
111 | 111 | } |
112 | 112 | } |
113 | 113 | else |
114 | 114 | { |
115 | - if($offer_answer == 'accept') |
|
115 | + if ($offer_answer == 'accept') |
|
116 | 116 | { |
117 | 117 | $accept_offer = true; |
118 | 118 | } |
119 | - elseif($offer_answer == 'deny') |
|
119 | + elseif ($offer_answer == 'deny') |
|
120 | 120 | { |
121 | 121 | DBStaticAlly::db_ally_negotiation_update_status_1($offer_id); |
122 | 122 | } |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | } |
125 | 125 | } |
126 | 126 | |
127 | -if($accept_offer) |
|
127 | +if ($accept_offer) |
|
128 | 128 | { |
129 | 129 | sn_db_transaction_start(); |
130 | 130 | |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | sn_db_transaction_commit(); |
185 | 185 | } |
186 | 186 | |
187 | -foreach($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation) |
|
187 | +foreach ($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation) |
|
188 | 188 | { |
189 | 189 | $template->assign_block_vars('relation', array( |
190 | 190 | 'ID' => $diplomacy_relation_id, |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | } |
194 | 194 | |
195 | 195 | $query = doquery("SELECT id, ally_name, ally_tag FROM {{alliance}} WHERE `id` != {$user['ally_id']} ORDER BY ally_name;"); |
196 | -while($alliance = db_fetch($query)) |
|
196 | +while ($alliance = db_fetch($query)) |
|
197 | 197 | { |
198 | 198 | $template->assign_block_vars('alliance', array( |
199 | 199 | 'ID' => $alliance['id'], |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | WHERE |
213 | 213 | alliance_negotiation_ally_id = {$user['ally_id']} OR alliance_negotiation_contr_ally_id = {$user['ally_id']};" |
214 | 214 | ); |
215 | -while($offer = db_fetch($query)) |
|
215 | +while ($offer = db_fetch($query)) |
|
216 | 216 | { |
217 | 217 | $template->assign_block_vars('offer', array( |
218 | 218 | 'ID' => $offer['alliance_negotiation_id'], |
@@ -67,8 +67,7 @@ discard block |
||
67 | 67 | ->doInsert(); |
68 | 68 | |
69 | 69 | $accept_offer = false; |
70 | - } |
|
71 | - else |
|
70 | + } else |
|
72 | 71 | { |
73 | 72 | $accept_offer = true; |
74 | 73 | $autoAccept = true; |
@@ -80,8 +79,7 @@ discard block |
||
80 | 79 | 'alliance_negotiation_relation' => $alliance_negotiation_relation, |
81 | 80 | ); |
82 | 81 | } |
83 | -} |
|
84 | -else |
|
82 | +} else |
|
85 | 83 | { |
86 | 84 | $offer_id = sys_get_param_id('offer_id'); |
87 | 85 | if($offer_id) |
@@ -92,31 +90,26 @@ discard block |
||
92 | 90 | if(!$negotiation) |
93 | 91 | { |
94 | 92 | messageBox($lang['ali_dip_err_offer_none'], $page_title); |
95 | - } |
|
96 | - elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id']) |
|
93 | + } elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id']) |
|
97 | 94 | { |
98 | 95 | // TODO: Add log of hack attempt |
99 | 96 | messageBox($lang['ali_dip_err_offer_alien'], $page_title); |
100 | - } |
|
101 | - elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id']) |
|
97 | + } elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id']) |
|
102 | 98 | { |
103 | 99 | if($offer_answer == 'accept') |
104 | 100 | { |
105 | 101 | // TODO: Add log of hack attempt |
106 | 102 | messageBox($lang['ali_dip_err_offer_accept_own'], $page_title); |
107 | - } |
|
108 | - elseif($offer_answer == 'deny') |
|
103 | + } elseif($offer_answer == 'deny') |
|
109 | 104 | { |
110 | 105 | doquery("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;"); |
111 | 106 | } |
112 | - } |
|
113 | - else |
|
107 | + } else |
|
114 | 108 | { |
115 | 109 | if($offer_answer == 'accept') |
116 | 110 | { |
117 | 111 | $accept_offer = true; |
118 | - } |
|
119 | - elseif($offer_answer == 'deny') |
|
112 | + } elseif($offer_answer == 'deny') |
|
120 | 113 | { |
121 | 114 | DBStaticAlly::db_ally_negotiation_update_status_1($offer_id); |
122 | 115 | } |