We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -7,15 +7,15 @@ discard block |
||
7 | 7 | create_error('You must first launch to drop forces!'); |
8 | 8 | |
9 | 9 | // take either from container or request, prefer container |
10 | -$drop_mines = round(isset($var['drop_mines']) ? $var['drop_mines'] : (isset($_REQUEST['drop_mines']) ? trim($_REQUEST['drop_mines']) : 0)); |
|
11 | -$drop_combat_drones = round(isset($var['drop_combat_drones']) ? $var['drop_combat_drones'] : (isset($_REQUEST['drop_combat_drones']) ? trim($_REQUEST['drop_combat_drones']) : 0)); |
|
12 | -$drop_scout_drones = round(isset($var['drop_scout_drones']) ? $var['drop_scout_drones'] : (isset($_REQUEST['drop_scout_drones']) ? trim($_REQUEST['drop_scout_drones']) : 0)); |
|
13 | -$take_mines = round(isset($var['take_mines']) ? $var['take_mines'] : (isset($_REQUEST['take_mines']) ? trim($_REQUEST['take_mines']) : 0)); |
|
14 | -$take_combat_drones = round(isset($var['take_combat_drones']) ? $var['take_combat_drones'] : (isset($_REQUEST['take_combat_drones']) ? trim($_REQUEST['take_combat_drones']) : 0)); |
|
15 | -$take_scout_drones = round(isset($var['take_scout_drones']) ? $var['take_scout_drones'] : (isset($_REQUEST['take_scout_drones']) ? trim($_REQUEST['take_scout_drones']) : 0)); |
|
10 | +$drop_mines = round(isset($var['drop_mines']) ? $var['drop_mines'] : (isset($_REQUEST['drop_mines']) ? trim($_REQUEST['drop_mines']) : 0)); |
|
11 | +$drop_combat_drones = round(isset($var['drop_combat_drones']) ? $var['drop_combat_drones'] : (isset($_REQUEST['drop_combat_drones']) ? trim($_REQUEST['drop_combat_drones']) : 0)); |
|
12 | +$drop_scout_drones = round(isset($var['drop_scout_drones']) ? $var['drop_scout_drones'] : (isset($_REQUEST['drop_scout_drones']) ? trim($_REQUEST['drop_scout_drones']) : 0)); |
|
13 | +$take_mines = round(isset($var['take_mines']) ? $var['take_mines'] : (isset($_REQUEST['take_mines']) ? trim($_REQUEST['take_mines']) : 0)); |
|
14 | +$take_combat_drones = round(isset($var['take_combat_drones']) ? $var['take_combat_drones'] : (isset($_REQUEST['take_combat_drones']) ? trim($_REQUEST['take_combat_drones']) : 0)); |
|
15 | +$take_scout_drones = round(isset($var['take_scout_drones']) ? $var['take_scout_drones'] : (isset($_REQUEST['take_scout_drones']) ? trim($_REQUEST['take_scout_drones']) : 0)); |
|
16 | 16 | |
17 | 17 | // do we have numbers? |
18 | -if ( (!empty($drop_mines) && !is_numeric($drop_mines)) |
|
18 | +if ((!empty($drop_mines) && !is_numeric($drop_mines)) |
|
19 | 19 | || (!empty($drop_combat_drones) && !is_numeric($drop_combat_drones)) |
20 | 20 | || (!empty($drop_scout_drones) && !is_numeric($drop_scout_drones)) |
21 | 21 | || (!empty($take_mines) && !is_numeric($take_mines)) |
@@ -118,18 +118,18 @@ discard block |
||
118 | 118 | // All error checking is done, so now update the ship/force |
119 | 119 | |
120 | 120 | if ($change_combat_drones != 0) { |
121 | - if($change_combat_drones>0) { |
|
122 | - $ship->decreaseCDs($change_combat_drones,true); |
|
121 | + if ($change_combat_drones > 0) { |
|
122 | + $ship->decreaseCDs($change_combat_drones, true); |
|
123 | 123 | $forces->addCDs($change_combat_drones); |
124 | 124 | } |
125 | 125 | else { |
126 | - $ship->increaseCDs(-$change_combat_drones,true); |
|
126 | + $ship->increaseCDs(-$change_combat_drones, true); |
|
127 | 127 | $forces->takeCDs(-$change_combat_drones); |
128 | 128 | } |
129 | 129 | } |
130 | 130 | |
131 | 131 | if ($change_scout_drones != 0) { |
132 | - if($change_scout_drones>0) { |
|
132 | + if ($change_scout_drones > 0) { |
|
133 | 133 | $ship->decreaseSDs($change_scout_drones); |
134 | 134 | $forces->addSDs($change_scout_drones); |
135 | 135 | } |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | } |
141 | 141 | |
142 | 142 | if ($change_mines != 0) { |
143 | - if($change_mines>0) { |
|
143 | + if ($change_mines > 0) { |
|
144 | 144 | $ship->decreaseMines($change_mines); |
145 | 145 | $forces->addMines($change_mines); |
146 | 146 | if ($ship->isCloaked()) { |
@@ -166,22 +166,22 @@ discard block |
||
166 | 166 | $mines_message .= 's'; |
167 | 167 | |
168 | 168 | if ($change_combat_drones > 0) |
169 | - $combat_drones_message = ($change_mines <= 0 ?'added ':'') . $change_combat_drones . ' combat drone'; |
|
169 | + $combat_drones_message = ($change_mines <= 0 ? 'added ' : '') . $change_combat_drones . ' combat drone'; |
|
170 | 170 | elseif ($change_combat_drones < 0) |
171 | - $combat_drones_message = ($change_mines >= 0 ?'removed ':'') . abs($change_combat_drones) . ' combat drone'; |
|
171 | + $combat_drones_message = ($change_mines >= 0 ? 'removed ' : '') . abs($change_combat_drones) . ' combat drone'; |
|
172 | 172 | //add s to drone if necesary |
173 | 173 | if (abs($change_combat_drones) > 1) |
174 | 174 | $combat_drones_message .= 's'; |
175 | 175 | |
176 | 176 | if ($change_scout_drones > 0) { |
177 | - $scout_drones_message=''; |
|
178 | - if((isset($combat_drones_message) && $change_combat_drones < 0) || (!isset($combat_drones_message) && $change_mines <= 0)) |
|
177 | + $scout_drones_message = ''; |
|
178 | + if ((isset($combat_drones_message) && $change_combat_drones < 0) || (!isset($combat_drones_message) && $change_mines <= 0)) |
|
179 | 179 | $scout_drones_message = 'added '; |
180 | 180 | $scout_drones_message .= $change_scout_drones . ' scout drone'; |
181 | 181 | } |
182 | 182 | elseif ($change_scout_drones < 0) { |
183 | - $scout_drones_message=''; |
|
184 | - if((isset($combat_drones_message) && $change_combat_drones > 0) || (!isset($combat_drones_message) && $change_mines >= 0)) |
|
183 | + $scout_drones_message = ''; |
|
184 | + if ((isset($combat_drones_message) && $change_combat_drones > 0) || (!isset($combat_drones_message) && $change_mines >= 0)) |
|
185 | 185 | $scout_drones_message = 'removed '; |
186 | 186 | $scout_drones_message .= abs($change_scout_drones) . ' scout drone'; |
187 | 187 | } |
@@ -190,25 +190,25 @@ discard block |
||
190 | 190 | $scout_drones_message .= 's'; |
191 | 191 | |
192 | 192 | // now compile it together |
193 | - $message = $player->getPlayerName().' has ' . $mines_message; |
|
193 | + $message = $player->getPlayerName() . ' has ' . $mines_message; |
|
194 | 194 | |
195 | 195 | if (!empty($mines_message) && isset($combat_drones_message) && !isset($scout_drones_message)) |
196 | - $message .= ' and '.$combat_drones_message; |
|
196 | + $message .= ' and ' . $combat_drones_message; |
|
197 | 197 | elseif (!empty($mines_message) && isset($combat_drones_message)) |
198 | - $message .= ', '.$combat_drones_message; |
|
198 | + $message .= ', ' . $combat_drones_message; |
|
199 | 199 | elseif (empty($mines_message) && isset($combat_drones_message)) |
200 | 200 | $message .= $combat_drones_message; |
201 | 201 | |
202 | 202 | if (!empty($mines_message) && isset($combat_drones_message) && isset($scout_drones_message)) |
203 | - $message .= ', and '.$scout_drones_message; |
|
203 | + $message .= ', and ' . $scout_drones_message; |
|
204 | 204 | elseif ((!empty($mines_message) || isset($combat_drones_message)) && isset($scout_drones_message)) |
205 | - $message .= ' and '.$scout_drones_message; |
|
205 | + $message .= ' and ' . $scout_drones_message; |
|
206 | 206 | elseif (empty($mines_message) && !isset($combat_drones_message) && isset($scout_drones_message)) |
207 | 207 | $message .= $scout_drones_message; |
208 | 208 | |
209 | - if($change_mines >= 0 && $change_combat_drones >= 0 && $change_scout_drones >= 0) |
|
209 | + if ($change_mines >= 0 && $change_combat_drones >= 0 && $change_scout_drones >= 0) |
|
210 | 210 | $message .= ' to'; |
211 | - elseif($change_mines <= 0 && $change_combat_drones <= 0 && $change_scout_drones <= 0) |
|
211 | + elseif ($change_mines <= 0 && $change_combat_drones <= 0 && $change_scout_drones <= 0) |
|
212 | 212 | $message .= ' from'; |
213 | 213 | else |
214 | 214 | $message .= ' from/to'; |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | $player->sendMessage($forces->getOwnerID(), MSG_SCOUT, $message, false); |
219 | 219 | } |
220 | 220 | |
221 | -$account->log(LOG_TYPE_FORCES, $change_combat_drones.' combat drones, '.$change_scout_drones.' scout drones, '.$change_mines.' mines', $player->getSectorID()); |
|
221 | +$account->log(LOG_TYPE_FORCES, $change_combat_drones . ' combat drones, ' . $change_scout_drones . ' scout drones, ' . $change_mines . ' mines', $player->getSectorID()); |
|
222 | 222 | |
223 | 223 | $forces->updateExpire(); |
224 | 224 | $forces->update(); // Needs to be in db to show up on CS instantly when querying sector forces |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -$template->assign('PageTopic','Extended User Rankings'); |
|
3 | +$template->assign('PageTopic', 'Extended User Rankings'); |
|
4 | 4 | if (SmrSession::hasGame()) { |
5 | 5 | Menu::trader(); |
6 | 6 | } |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | $shipID = $var['ship_id']; |
4 | -$newShip =& AbstractSmrShip::getBaseShip(Globals::getGameType($player->getGameID()),$shipID); |
|
4 | +$newShip = & AbstractSmrShip::getBaseShip(Globals::getGameType($player->getGameID()), $shipID); |
|
5 | 5 | $cost = $ship->getCostToUpgrade($shipID); |
6 | 6 | |
7 | 7 | // trade master 33 |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | $player->setTurns(round($player->getTurns() * $newShip['Speed'] / $ship->getSpeed())); //Don't times by game speed as getSpeed doesn't include it meaning ratio will be the same but less work. |
30 | 30 | |
31 | 31 | // take the money from the user |
32 | -if($cost>0) |
|
32 | +if ($cost > 0) |
|
33 | 33 | $player->decreaseCredits($cost); |
34 | 34 | else |
35 | 35 | $player->increaseCredits(-$cost); |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $ship->update(); |
46 | 46 | $player->update(); |
47 | 47 | |
48 | -$account->log(LOG_TYPE_HARDWARE, 'Buys a '.$ship->getName().' for '.$cost.' credits', $player->getSectorID()); |
|
48 | +$account->log(LOG_TYPE_HARDWARE, 'Buys a ' . $ship->getName() . ' for ' . $cost . ' credits', $player->getSectorID()); |
|
49 | 49 | |
50 | 50 | $container = create_container('skeleton.php', 'current_sector.php'); |
51 | 51 | transfer('LocationID'); |
@@ -3,22 +3,22 @@ |
||
3 | 3 | Menu::galactic_post(); |
4 | 4 | $container = create_container('galactic_post_write_article_processing.php'); |
5 | 5 | |
6 | -if(isset($var['id'])) { |
|
6 | +if (isset($var['id'])) { |
|
7 | 7 | $container['id'] = $var['id']; |
8 | - $template->assign('PageTopic','Editing An Article'); |
|
9 | - if(!isset($var['Preview'])) { |
|
10 | - $db->query('SELECT title, text FROM galactic_post_article WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND article_id = '.$db->escapeNumber($var['id']).' LIMIT 1'); |
|
11 | - if($db->nextRecord()) { |
|
12 | - SmrSession::updateVar('PreviewTitle',$db->getField('title')); |
|
13 | - SmrSession::updateVar('Preview',$db->getField('text')); |
|
8 | + $template->assign('PageTopic', 'Editing An Article'); |
|
9 | + if (!isset($var['Preview'])) { |
|
10 | + $db->query('SELECT title, text FROM galactic_post_article WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND article_id = ' . $db->escapeNumber($var['id']) . ' LIMIT 1'); |
|
11 | + if ($db->nextRecord()) { |
|
12 | + SmrSession::updateVar('PreviewTitle', $db->getField('title')); |
|
13 | + SmrSession::updateVar('Preview', $db->getField('text')); |
|
14 | 14 | } |
15 | 15 | } |
16 | 16 | } |
17 | 17 | else { |
18 | - $template->assign('PageTopic','Writing An Article'); |
|
18 | + $template->assign('PageTopic', 'Writing An Article'); |
|
19 | 19 | } |
20 | -if(isset($var['Preview'])) { |
|
20 | +if (isset($var['Preview'])) { |
|
21 | 21 | $template->assign('PreviewTitle', $var['PreviewTitle']); |
22 | 22 | $template->assign('Preview', $var['Preview']); |
23 | 23 | } |
24 | -$template->assign('SubmitArticleHref',SmrSession::getNewHREF($container)); |
|
24 | +$template->assign('SubmitArticleHref', SmrSession::getNewHREF($container)); |
@@ -25,9 +25,9 @@ discard block |
||
25 | 25 | create_error('You can\'t take more than you can carry!'); |
26 | 26 | |
27 | 27 | // now transfer |
28 | - $planet->decreaseStockpile($var['good_id'],$amount); |
|
29 | - $ship->increaseCargo($var['good_id'],$amount); |
|
30 | - $account->log(LOG_TYPE_PLANETS, 'Player takes '.$amount.' '.Globals::getGoodName($var['good_id']).' from planet.', $player->getSectorID()); |
|
28 | + $planet->decreaseStockpile($var['good_id'], $amount); |
|
29 | + $ship->increaseCargo($var['good_id'], $amount); |
|
30 | + $account->log(LOG_TYPE_PLANETS, 'Player takes ' . $amount . ' ' . Globals::getGoodName($var['good_id']) . ' from planet.', $player->getSectorID()); |
|
31 | 31 | |
32 | 32 | // transfer to planet |
33 | 33 | } |
@@ -38,11 +38,11 @@ discard block |
||
38 | 38 | |
39 | 39 | // do we want to transfer more than the planet can hold? |
40 | 40 | if ($amount > $planet->getRemainingStockpile($var['good_id'])) |
41 | - create_error('This planet cannot store more than '.SmrPlanet::MAX_STOCKPILE.' of each good!'); |
|
41 | + create_error('This planet cannot store more than ' . SmrPlanet::MAX_STOCKPILE . ' of each good!'); |
|
42 | 42 | |
43 | 43 | // now transfer |
44 | - $planet->increaseStockpile($var['good_id'],$amount); |
|
45 | - $ship->decreaseCargo($var['good_id'],$amount); |
|
44 | + $planet->increaseStockpile($var['good_id'], $amount); |
|
45 | + $ship->decreaseCargo($var['good_id'], $amount); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | // update both |
@@ -4,13 +4,13 @@ |
||
4 | 4 | |
5 | 5 | $container = create_container('planet_defense_processing.php'); |
6 | 6 | $container['type_id'] = 1; |
7 | -$template->assign('TransferShieldsHref',SmrSession::getNewHREF($container)); |
|
7 | +$template->assign('TransferShieldsHref', SmrSession::getNewHREF($container)); |
|
8 | 8 | |
9 | 9 | $container['type_id'] = 4; |
10 | -$template->assign('TransferCDsHref',SmrSession::getNewHREF($container)); |
|
10 | +$template->assign('TransferCDsHref', SmrSession::getNewHREF($container)); |
|
11 | 11 | |
12 | 12 | $container['type_id'] = 2; |
13 | -$template->assign('TransferArmourHref',SmrSession::getNewHREF($container)); |
|
13 | +$template->assign('TransferArmourHref', SmrSession::getNewHREF($container)); |
|
14 | 14 | |
15 | 15 | $container = create_container('planet_defense_weapon_processing.php'); |
16 | 16 | $template->assign('WeaponProcessingHREF', SmrSession::getNewHREF($container)); |
@@ -1,15 +1,15 @@ discard block |
||
1 | 1 | <?php |
2 | -$template->assign('PageTopic','Play Game'); |
|
2 | +$template->assign('PageTopic', 'Play Game'); |
|
3 | 3 | |
4 | -if(isset($var['errorMsg'])) { |
|
5 | - $template->assign('ErrorMessage',$var['errorMsg']); |
|
4 | +if (isset($var['errorMsg'])) { |
|
5 | + $template->assign('ErrorMessage', $var['errorMsg']); |
|
6 | 6 | } |
7 | 7 | if (isset($var['msg'])) { |
8 | - $template->assign('Message',$var['msg']); |
|
8 | + $template->assign('Message', $var['msg']); |
|
9 | 9 | } |
10 | 10 | |
11 | -$template->assign('UserRankingLink',SmrSession::getNewHREF(create_container('skeleton.php', 'rankings_view.php'))); |
|
12 | -$template->assign('UserRankName',$account->getRankName()); |
|
11 | +$template->assign('UserRankingLink', SmrSession::getNewHREF(create_container('skeleton.php', 'rankings_view.php'))); |
|
12 | +$template->assign('UserRankName', $account->getRankName()); |
|
13 | 13 | |
14 | 14 | // *************************************** |
15 | 15 | // ** Play Games |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | $game_id_list = array(); |
21 | 21 | $db->query('SELECT end_date, game_id, game_name, game_speed, game_type |
22 | 22 | FROM game JOIN player USING (game_id) |
23 | - WHERE account_id = '.$db->escapeNumber($account->getAccountID()).' |
|
23 | + WHERE account_id = '.$db->escapeNumber($account->getAccountID()) . ' |
|
24 | 24 | AND enabled = \'TRUE\' |
25 | 25 | AND end_date >= ' . $db->escapeNumber(TIME) . ' |
26 | 26 | ORDER BY start_date DESC'); |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | $games['Play'][$game_id]['ID'] = $game_id; |
31 | 31 | $games['Play'][$game_id]['Name'] = $db->getField('game_name'); |
32 | 32 | $games['Play'][$game_id]['Type'] = SmrGame::GAME_TYPES[$db->getInt('game_type')]; |
33 | - $games['Play'][$game_id]['EndDate'] = date(DATE_FULL_SHORT_SPLIT,$db->getField('end_date')); |
|
33 | + $games['Play'][$game_id]['EndDate'] = date(DATE_FULL_SHORT_SPLIT, $db->getField('end_date')); |
|
34 | 34 | $games['Play'][$game_id]['Speed'] = $db->getField('game_speed'); |
35 | 35 | |
36 | 36 | $container = create_container('game_play_processing.php'); |
@@ -62,12 +62,12 @@ discard block |
||
62 | 62 | $container_game['game_id'] = $game_id; |
63 | 63 | $games['Play'][$game_id]['GameStatsLink'] = SmrSession::getNewHREF($container_game); |
64 | 64 | $games['Play'][$game_id]['Turns'] = $curr_player->getTurns(); |
65 | - $games['Play'][$game_id]['LastMovement'] = format_time(TIME-$curr_player->getLastActive(),TRUE); |
|
65 | + $games['Play'][$game_id]['LastMovement'] = format_time(TIME - $curr_player->getLastActive(), TRUE); |
|
66 | 66 | |
67 | 67 | } |
68 | 68 | } |
69 | 69 | |
70 | -if(empty($games['Play'])) |
|
70 | +if (empty($games['Play'])) |
|
71 | 71 | unset($games['Play']); |
72 | 72 | |
73 | 73 | |
@@ -100,8 +100,8 @@ discard block |
||
100 | 100 | $game = SmrGame::getGame($game_id); |
101 | 101 | $games['Join'][$game_id]['ID'] = $game_id; |
102 | 102 | $games['Join'][$game_id]['Name'] = $db->getField('game_name'); |
103 | - $games['Join'][$game_id]['StartDate'] = date(DATE_FULL_SHORT_SPLIT,$db->getField('start_date')); |
|
104 | - $games['Join'][$game_id]['EndDate'] = date(DATE_FULL_SHORT_SPLIT,$db->getField('end_date')); |
|
103 | + $games['Join'][$game_id]['StartDate'] = date(DATE_FULL_SHORT_SPLIT, $db->getField('start_date')); |
|
104 | + $games['Join'][$game_id]['EndDate'] = date(DATE_FULL_SHORT_SPLIT, $db->getField('end_date')); |
|
105 | 105 | $games['Join'][$game_id]['Players'] = $game->getTotalPlayers(); |
106 | 106 | $games['Join'][$game_id]['Type'] = SmrGame::GAME_TYPES[$db->getInt('game_type')]; |
107 | 107 | $games['Join'][$game_id]['Speed'] = $db->getField('game_speed'); |
@@ -124,14 +124,14 @@ discard block |
||
124 | 124 | |
125 | 125 | //New previous games |
126 | 126 | $db->query('SELECT start_date, end_date, game_name, game_speed, game_id ' . |
127 | - 'FROM game WHERE enabled = \'TRUE\' AND end_date < '.$db->escapeNumber(TIME).' ORDER BY game_id DESC'); |
|
127 | + 'FROM game WHERE enabled = \'TRUE\' AND end_date < ' . $db->escapeNumber(TIME) . ' ORDER BY game_id DESC'); |
|
128 | 128 | if ($db->getNumRows()) { |
129 | 129 | while ($db->nextRecord()) { |
130 | 130 | $game_id = $db->getField('game_id'); |
131 | 131 | $games['Previous'][$game_id]['ID'] = $game_id; |
132 | 132 | $games['Previous'][$game_id]['Name'] = $db->getField('game_name'); |
133 | - $games['Previous'][$game_id]['StartDate'] = date(DATE_DATE_SHORT,$db->getField('start_date')); |
|
134 | - $games['Previous'][$game_id]['EndDate'] = date(DATE_DATE_SHORT,$db->getField('end_date')); |
|
133 | + $games['Previous'][$game_id]['StartDate'] = date(DATE_DATE_SHORT, $db->getField('start_date')); |
|
134 | + $games['Previous'][$game_id]['EndDate'] = date(DATE_DATE_SHORT, $db->getField('end_date')); |
|
135 | 135 | $games['Previous'][$game_id]['Speed'] = $db->getField('game_speed'); |
136 | 136 | // create a container that will hold next url and additional variables. |
137 | 137 | $container = create_container('skeleton.php'); |
@@ -155,11 +155,11 @@ discard block |
||
155 | 155 | if ($historyDB->getNumRows()) { |
156 | 156 | while ($historyDB->nextRecord()) { |
157 | 157 | $game_id = $historyDB->getField('game_id'); |
158 | - $index = $databaseClassName.$game_id; |
|
158 | + $index = $databaseClassName . $game_id; |
|
159 | 159 | $games['Previous'][$index]['ID'] = $game_id; |
160 | 160 | $games['Previous'][$index]['Name'] = $historyDB->getField('game_name'); |
161 | - $games['Previous'][$index]['StartDate'] = date(DATE_DATE_SHORT,$historyDB->getField('start_date')); |
|
162 | - $games['Previous'][$index]['EndDate'] = date(DATE_DATE_SHORT,$historyDB->getField('end_date')); |
|
161 | + $games['Previous'][$index]['StartDate'] = date(DATE_DATE_SHORT, $historyDB->getField('start_date')); |
|
162 | + $games['Previous'][$index]['EndDate'] = date(DATE_DATE_SHORT, $historyDB->getField('end_date')); |
|
163 | 163 | $games['Previous'][$index]['Speed'] = $historyDB->getField('speed'); |
164 | 164 | // create a container that will hold next url and additional variables. |
165 | 165 | $container = array(); |
@@ -181,18 +181,18 @@ discard block |
||
181 | 181 | } |
182 | 182 | $db = new SmrMySqlDatabase(); // restore database |
183 | 183 | |
184 | -$template->assign('Games',$games); |
|
184 | +$template->assign('Games', $games); |
|
185 | 185 | |
186 | 186 | // *************************************** |
187 | 187 | // ** Voting |
188 | 188 | // *************************************** |
189 | -$container = create_container('skeleton.php','vote.php'); |
|
190 | -$template->assign('VotingHref',SmrSession::getNewHREF($container)); |
|
189 | +$container = create_container('skeleton.php', 'vote.php'); |
|
190 | +$template->assign('VotingHref', SmrSession::getNewHREF($container)); |
|
191 | 191 | |
192 | 192 | $db->query('SELECT * FROM voting WHERE end > ' . $db->escapeNumber(TIME) . ' ORDER BY end DESC'); |
193 | -if($db->getNumRows()>0) { |
|
193 | +if ($db->getNumRows() > 0) { |
|
194 | 194 | $db2 = new SmrMySqlDatabase(); |
195 | - $votedFor=array(); |
|
195 | + $votedFor = array(); |
|
196 | 196 | $db2->query('SELECT * FROM voting_results WHERE account_id = ' . $db->escapeNumber($account->getAccountID())); |
197 | 197 | while ($db2->nextRecord()) { |
198 | 198 | $votedFor[$db2->getField('vote_id')] = $db2->getField('option_id'); |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | $voting[$voteID]['Question'] = $db->getField('question'); |
210 | 210 | $voting[$voteID]['TimeRemaining'] = format_time($db->getField('end') - TIME, true); |
211 | 211 | $voting[$voteID]['Options'] = array(); |
212 | - $db2->query('SELECT option_id,text,count(account_id) FROM voting_options LEFT OUTER JOIN voting_results USING(vote_id,option_id) WHERE vote_id = ' . $db->escapeNumber($db->getInt('vote_id')).' GROUP BY option_id'); |
|
212 | + $db2->query('SELECT option_id,text,count(account_id) FROM voting_options LEFT OUTER JOIN voting_results USING(vote_id,option_id) WHERE vote_id = ' . $db->escapeNumber($db->getInt('vote_id')) . ' GROUP BY option_id'); |
|
213 | 213 | while ($db2->nextRecord()) { |
214 | 214 | $voting[$voteID]['Options'][$db2->getField('option_id')]['ID'] = $db2->getField('option_id'); |
215 | 215 | $voting[$voteID]['Options'][$db2->getField('option_id')]['Text'] = $db2->getField('text'); |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | $voting[$voteID]['Options'][$db2->getField('option_id')]['Votes'] = $db2->getField('count(account_id)'); |
218 | 218 | } |
219 | 219 | } |
220 | - $template->assign('Voting',$voting); |
|
220 | + $template->assign('Voting', $voting); |
|
221 | 221 | } |
222 | 222 | |
223 | 223 | // *************************************** |
@@ -227,4 +227,4 @@ discard block |
||
227 | 227 | $container['url'] = 'skeleton.php'; |
228 | 228 | $container['body'] = 'announcements.php'; |
229 | 229 | $container['view_all'] = 'yes'; |
230 | -$template->assign('OldAnnouncementsLink',SmrSession::getNewHREF($container)); |
|
230 | +$template->assign('OldAnnouncementsLink', SmrSession::getNewHREF($container)); |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | if (!isset($var['alliance_id'])) { |
3 | - SmrSession::updateVar('alliance_id',$player->getAllianceID()); |
|
3 | + SmrSession::updateVar('alliance_id', $player->getAllianceID()); |
|
4 | 4 | } |
5 | 5 | |
6 | 6 | $alliance = SmrAlliance::getAlliance($var['alliance_id'], $player->getGameID()); |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | $db->query('SELECT * |
11 | 11 | FROM alliance_has_roles |
12 | 12 | WHERE game_id=' . $db->escapeNumber($alliance->getGameID()) . ' |
13 | -AND alliance_id=' . $db->escapeNumber($alliance->getAllianceID()) .' |
|
13 | +AND alliance_id=' . $db->escapeNumber($alliance->getAllianceID()) . ' |
|
14 | 14 | ORDER BY role_id |
15 | 15 | '); |
16 | 16 | $allianceRoles = array(); |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $container['alliance_id'] = $alliance->getAllianceID(); |
44 | 44 | $allianceRoles[$roleID]['HREF'] = SmrSession::getNewHREF($container); |
45 | 45 | } |
46 | -$template->assign('AllianceRoles',$allianceRoles); |
|
46 | +$template->assign('AllianceRoles', $allianceRoles); |
|
47 | 47 | $container = create_container('alliance_roles_processing.php'); |
48 | 48 | $container['alliance_id'] = $alliance->getAllianceID(); |
49 | 49 |
@@ -6,11 +6,11 @@ |
||
6 | 6 | $db->query('SELECT * FROM news ORDER BY time DESC LIMIT 4'); |
7 | 7 | while ($db->nextRecord()) { |
8 | 8 | $overrideGameID = $db->getInt('game_id'); |
9 | - $gameNews[] = array('Date' => date(DEFAULT_DATE_DATE_SHORT,$db->getField('time')), 'Time' => date(DEFAULT_DATE_TIME_SHORT,$db->getField('time')), 'Message' => bbifyMessage($db->getField('news_message'))); |
|
9 | + $gameNews[] = array('Date' => date(DEFAULT_DATE_DATE_SHORT, $db->getField('time')), 'Time' => date(DEFAULT_DATE_TIME_SHORT, $db->getField('time')), 'Message' => bbifyMessage($db->getField('news_message'))); |
|
10 | 10 | } |
11 | 11 | unset($overrideGameID); |
12 | -if(count($gameNews)>0) |
|
13 | - $template->assign('GameNews',$gameNews); |
|
12 | +if (count($gameNews) > 0) |
|
13 | + $template->assign('GameNews', $gameNews); |
|
14 | 14 | |
15 | 15 | require_once('login_story.inc'); |
16 | 16 |