We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | create_error('Join Date is not valid!'); |
| 20 | 20 | } |
| 21 | 21 | $start = empty(Request::get('game_start')) ? $join : |
| 22 | - DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); |
|
| 22 | + DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); |
|
| 23 | 23 | if ($start === false) { |
| 24 | 24 | create_error('Start Date is not valid!'); |
| 25 | 25 | } |
@@ -18,8 +18,7 @@ |
||
| 18 | 18 | if ($join === false) { |
| 19 | 19 | create_error('Join Date is not valid!'); |
| 20 | 20 | } |
| 21 | -$start = empty(Request::get('game_start')) ? $join : |
|
| 22 | - DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); |
|
| 21 | +$start = empty(Request::get('game_start')) ? $join : DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); |
|
| 23 | 22 | if ($start === false) { |
| 24 | 23 | create_error('Start Date is not valid!'); |
| 25 | 24 | } |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | // Get the dates ("|" sets hr/min/sec to 0) |
| 4 | 4 | $join = DateTime::createFromFormat('d/m/Y|', Request::get('game_join')); |
| 5 | 5 | $start = empty(Request::get('game_start')) ? $join : |
| 6 | - DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); |
|
| 6 | + DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); |
|
| 7 | 7 | $end = DateTime::createFromFormat('d/m/Y|', Request::get('game_end')); |
| 8 | 8 | |
| 9 | 9 | $game = SmrGame::getGame($var['game_id']); |
@@ -2,8 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | // Get the dates ("|" sets hr/min/sec to 0) |
| 4 | 4 | $join = DateTime::createFromFormat('d/m/Y|', Request::get('game_join')); |
| 5 | -$start = empty(Request::get('game_start')) ? $join : |
|
| 6 | - DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); |
|
| 5 | +$start = empty(Request::get('game_start')) ? $join : DateTime::createFromFormat('d/m/Y|', Request::get('game_start')); |
|
| 7 | 6 | $end = DateTime::createFromFormat('d/m/Y|', Request::get('game_end')); |
| 8 | 7 | |
| 9 | 8 | $game = SmrGame::getGame($var['game_id']); |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | } |
| 21 | 21 | } |
| 22 | 22 | $missingLocs = array_diff(array_keys(SmrLocation::getAllLocations()), |
| 23 | - array_keys($existingLocs)); |
|
| 23 | + array_keys($existingLocs)); |
|
| 24 | 24 | $missingLocNames = []; |
| 25 | 25 | foreach ($missingLocs as $locID) { |
| 26 | 26 | $missingLocNames[] = SmrLocation::getLocation($locID)->getName(); |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | $template->assign('SelectedPortRaceID', $selectedPortRaceID); |
| 26 | 26 | |
| 27 | 27 | $sectorLocationIDs = array_pad(array_keys($editSector->getLocations()), |
| 28 | - UNI_GEN_LOCATION_SLOTS, 0); |
|
| 28 | + UNI_GEN_LOCATION_SLOTS, 0); |
|
| 29 | 29 | $template->assign('SectorLocationIDs', $sectorLocationIDs); |
| 30 | 30 | |
| 31 | 31 | if ($editSector->hasWarp()) { |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | |
| 36 | 36 | // Set the body of the e-mail |
| 37 | 37 | set_mail_body($mail, $var['newsletter_html'], $var['newsletter_text'], |
| 38 | - Request::get('salutation')); |
|
| 38 | + Request::get('salutation')); |
|
| 39 | 39 | |
| 40 | 40 | if (Request::get('to_email') == '*') { |
| 41 | 41 | // Send the newsletter to all players. |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | // * C o l o r L e g e n d |
| 29 | 29 | // ********************************* |
| 30 | 30 | $avail_colors = array('#FFFFFF', '#00FF00', '#FF3377', '#0099FF', |
| 31 | - '#FF0000', '#0000FF'); |
|
| 31 | + '#FF0000', '#0000FF'); |
|
| 32 | 32 | |
| 33 | 33 | // now assign each account id a color |
| 34 | 34 | $colors = []; |
@@ -46,5 +46,5 @@ |
||
| 46 | 46 | $template->assign('ProcessingHREF', $processingHREF); |
| 47 | 47 | |
| 48 | 48 | $template->assign('PermissionCategories', |
| 49 | - AdminPermissions::getPermissionsByCategory()); |
|
| 49 | + AdminPermissions::getPermissionsByCategory()); |
|
| 50 | 50 | } |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | // Send vote announcement to members of the player's council (war votes) |
| 40 | 40 | // or both races' councils (peace votes). |
| 41 | 41 | $councilMembers = Council::getRaceCouncil($player->getGameID(), |
| 42 | - $player->getRaceID()); |
|
| 42 | + $player->getRaceID()); |
|
| 43 | 43 | if ($type == 'PEACE') { |
| 44 | 44 | $otherCouncil = Council::getRaceCouncil($player->getGameID(), $race_id); |
| 45 | 45 | $councilMembers = array_merge($councilMembers, $otherCouncil); |
@@ -49,16 +49,16 @@ discard block |
||
| 49 | 49 | $color = ($type == 'PEACE' ? 'dgreen' : 'red'); |
| 50 | 50 | $type_fancy = "<span class=\"$color\">$type</span>"; |
| 51 | 51 | $message = $player->getLevelName() . " " . $player->getBBLink() |
| 52 | - . " has initiated a vote for $type_fancy with the " |
|
| 53 | - . Globals::getRaceName($race_id) |
|
| 54 | - . "! You have " . format_time(TIME_FOR_COUNCIL_VOTE) |
|
| 55 | - . " to cast your vote."; |
|
| 52 | + . " has initiated a vote for $type_fancy with the " |
|
| 53 | + . Globals::getRaceName($race_id) |
|
| 54 | + . "! You have " . format_time(TIME_FOR_COUNCIL_VOTE) |
|
| 55 | + . " to cast your vote."; |
|
| 56 | 56 | |
| 57 | 57 | foreach ($councilMembers as $accountID) { |
| 58 | 58 | // don't send to the player who started the vote |
| 59 | 59 | if ($player->getAccountID() != $accountID) { |
| 60 | 60 | SmrPlayer::sendMessageFromRace($player->getRaceID(), $player->getGameID(), |
| 61 | - $accountID, $message, $time); |
|
| 61 | + $accountID, $message, $time); |
|
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | 64 | |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | |
| 47 | 47 | // Don't lose more exp than you have |
| 48 | 48 | $lost_xp = min($player->getExperience(), |
| 49 | - IRound(SmrPort::getBaseExperience($amount, $good_distance))); |
|
| 49 | + IRound(SmrPort::getBaseExperience($amount, $good_distance))); |
|
| 50 | 50 | $player->decreaseExperience($lost_xp); |
| 51 | 51 | $player->increaseHOF($lost_xp, array('Trade', 'Experience', 'Jettisoned'), HOF_PUBLIC); |
| 52 | 52 | |