@@ -112,7 +112,7 @@ |
||
| 112 | 112 | $cacheClr = $baseUnix - 13500; |
| 113 | 113 | |
| 114 | 114 | //Set timer for next key based on number of keys |
| 115 | - $nextKey = (1900 / (int)$this->numberOfKeys) + time(); |
|
| 115 | + $nextKey = (1900 / (int) $this->numberOfKeys) + time(); |
|
| 116 | 116 | $nextKeyTime = gmdate('Y-m-d H:i:s', $nextKey); |
| 117 | 117 | setPermCache('mailLastChecked', $nextKey); |
| 118 | 118 | |
@@ -125,7 +125,7 @@ |
||
| 125 | 125 | $this->fuelChannel = $this->toDiscordChannel; |
| 126 | 126 | } |
| 127 | 127 | //Set timer for next key based on number of keys |
| 128 | - $nextKey = (1900 / (int)$this->numberOfKeys) + time(); |
|
| 128 | + $nextKey = (1900 / (int) $this->numberOfKeys) + time(); |
|
| 129 | 129 | $nextKeyTime = gmdate('Y-m-d H:i:s', $nextKey); |
| 130 | 130 | setPermCache('notificationsLastChecked', $nextKey); |
| 131 | 131 | //Set cache timer for api key |
@@ -71,7 +71,7 @@ |
||
| 71 | 71 | $roles = $member->roles; |
| 72 | 72 | foreach ($roles as $role) { |
| 73 | 73 | if (in_array(strtolower($role->name), $adminRoles, true)) { |
| 74 | - $avatarURL = strtolower((string)$data['messageString']); |
|
| 74 | + $avatarURL = strtolower((string) $data['messageString']); |
|
| 75 | 75 | $ch = curl_init($avatarURL); |
| 76 | 76 | if (substr($avatarURL, -4) === '.jpg') { |
| 77 | 77 | $fp = fopen('/tmp/avatar.jpg', 'wb'); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | GLOBAL $logger; |
| 56 | 56 | |
| 57 | 57 | //Check we are not running on a 32bit platform |
| 58 | -if(PHP_INT_SIZE == 4) |
|
| 58 | +if (PHP_INT_SIZE == 4) |
|
| 59 | 59 | { |
| 60 | 60 | $logger->error('32bit PHP found, if you are running a 64bit OS please install 64bit PHP'); |
| 61 | 61 | die(); |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | clearQueuedMessages($id); |
| 207 | 207 | continue; |
| 208 | 208 | } |
| 209 | - $channel = $guild->channels->get('id', (int)$queuedMessage['channel']); |
|
| 209 | + $channel = $guild->channels->get('id', (int) $queuedMessage['channel']); |
|
| 210 | 210 | //Check if channel is bad |
| 211 | 211 | if (null === $channel) { |
| 212 | 212 | $logger->addInfo("QueueProcessing Error- Item #{$id} : Channel provided is incorrect, removing it from the queue"); |
@@ -93,16 +93,16 @@ discard block |
||
| 93 | 93 | if ($kmGroup['startMail'] > $killID || null === $killID) { |
| 94 | 94 | $killID = $kmGroup['startMail']; |
| 95 | 95 | } |
| 96 | - if ((string)$kmGroup['allianceID'] === '0' & $kmGroup['lossMails'] === 'true') { |
|
| 96 | + if ((string) $kmGroup['allianceID'] === '0' & $kmGroup['lossMails'] === 'true') { |
|
| 97 | 97 | $url = "https://zkillboard.com/api/corporationID/{$kmGroup['corpID']}/no-attackers/no-items/orderDirection/asc/afterKillID/{$killID}/"; |
| 98 | 98 | } |
| 99 | - if ((string)$kmGroup['allianceID'] === '0' & $kmGroup['lossMails'] === 'false') { |
|
| 99 | + if ((string) $kmGroup['allianceID'] === '0' & $kmGroup['lossMails'] === 'false') { |
|
| 100 | 100 | $url = "https://zkillboard.com/api/corporationID/{$kmGroup['corpID']}/no-attackers/no-items/kills/orderDirection/asc/afterKillID/{$killID}/"; |
| 101 | 101 | } |
| 102 | - if ((string)$kmGroup['allianceID'] !== '0' & $kmGroup['lossMails'] === 'true') { |
|
| 102 | + if ((string) $kmGroup['allianceID'] !== '0' & $kmGroup['lossMails'] === 'true') { |
|
| 103 | 103 | $url = "https://zkillboard.com/api/allianceID/{$kmGroup['allianceID']}/no-attackers/no-items/orderDirection/asc/afterKillID/{$killID}/"; |
| 104 | 104 | } |
| 105 | - if ((string)$kmGroup['allianceID'] !== '0' & $kmGroup['lossMails'] === 'false') { |
|
| 105 | + if ((string) $kmGroup['allianceID'] !== '0' & $kmGroup['lossMails'] === 'false') { |
|
| 106 | 106 | $url = "https://zkillboard.com/api/allianceID/{$kmGroup['allianceID']}/no-attackers/no-items/kills/orderDirection/asc/afterKillID/{$killID}/"; |
| 107 | 107 | } |
| 108 | 108 | |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | if ($i < 10) { |
| 198 | 198 | $killID = $kill['killID']; |
| 199 | 199 | //check if mail is old |
| 200 | - if ((int)$killID <= (int)$oldID) { |
|
| 200 | + if ((int) $killID <= (int) $oldID) { |
|
| 201 | 201 | continue; |
| 202 | 202 | } |
| 203 | 203 | //save highest killID for cache |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | $charID = $rows[$discordID]['characterID']; |
| 175 | 175 | |
| 176 | 176 | // corporation membership check |
| 177 | - for ($i=0; $i<3; $i++) { |
|
| 177 | + for ($i = 0; $i < 3; $i++) { |
|
| 178 | 178 | $character = characterDetails($charID); |
| 179 | 179 | //if (isset($character['corporation_id']) && in_array($character['corporation_id'], $corpArray)) |
| 180 | 180 | if (!is_null($character)) |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | // alliance membership check |
| 198 | - for ($i=0; $i<3; $i++) { |
|
| 198 | + for ($i = 0; $i < 3; $i++) { |
|
| 199 | 199 | $corporationDetails = corpDetails($corporationID); |
| 200 | 200 | if (!is_null($corporationDetails)) |
| 201 | 201 | break; |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | $eveName = $row['eveName']; |
| 270 | 270 | //Check if member has roles |
| 271 | 271 | //if ($guild->members->get('id', $discordID)->getRolesAttribute()->isEmpty()) { |
| 272 | - if ($guild->members->fetch($discordID)->done(function ($r) { return $r->getRolesAttribute()->isEmpty(); })) { |
|
| 272 | + if ($guild->members->fetch($discordID)->done(function($r) { return $r->getRolesAttribute()->isEmpty(); })) { |
|
| 273 | 273 | $this->logger->addInfo('AuthCheck: skipping user due to empty roles attribute.'); |
| 274 | 274 | continue; |
| 275 | 275 | } |
@@ -468,7 +468,7 @@ discard block |
||
| 468 | 468 | if ($timeout > 9) { |
| 469 | 469 | continue; |
| 470 | 470 | } |
| 471 | - else{ |
|
| 471 | + else { |
|
| 472 | 472 | $character = characterDetails($charID); |
| 473 | 473 | $timeout++; |
| 474 | 474 | } |
@@ -177,8 +177,9 @@ discard block |
||
| 177 | 177 | for ($i=0; $i<3; $i++) { |
| 178 | 178 | $character = characterDetails($charID); |
| 179 | 179 | //if (isset($character['corporation_id']) && in_array($character['corporation_id'], $corpArray)) |
| 180 | - if (!is_null($character)) |
|
| 181 | - break; |
|
| 180 | + if (!is_null($character)) { |
|
| 181 | + break; |
|
| 182 | + } |
|
| 182 | 183 | //Postpone check if ESI is down to prevent timeouts |
| 183 | 184 | if (isset($character['error']) && $character['error'] === 'The datasource tranquility is temporarily unavailable') { |
| 184 | 185 | $this->logger->addInfo('AuthCheck: The datasource tranquility is temporarily unavailable, check canceled.'); |
@@ -197,8 +198,9 @@ discard block |
||
| 197 | 198 | // alliance membership check |
| 198 | 199 | for ($i=0; $i<3; $i++) { |
| 199 | 200 | $corporationDetails = corpDetails($corporationID); |
| 200 | - if (!is_null($corporationDetails)) |
|
| 201 | - break; |
|
| 201 | + if (!is_null($corporationDetails)) { |
|
| 202 | + break; |
|
| 203 | + } |
|
| 202 | 204 | } |
| 203 | 205 | if (is_null($corporationDetails) || isset($corporationDetails['error'])) { |
| 204 | 206 | $this->logger->addInfo('AuthCheck: corpDetails lookup failed.'); |
@@ -223,8 +225,10 @@ discard block |
||
| 223 | 225 | $standings = 1; |
| 224 | 226 | } |
| 225 | 227 | } |
| 226 | - if ($standings) |
|
| 227 | - continue; //keep the user based on standings |
|
| 228 | + if ($standings) { |
|
| 229 | + continue; |
|
| 230 | + } |
|
| 231 | + //keep the user based on standings |
|
| 228 | 232 | |
| 229 | 233 | // User failed all checks, deactivate user in database |
| 230 | 234 | $sql = "UPDATE authUsers SET active='no' WHERE discordID='$discordID'"; |
@@ -294,8 +298,10 @@ discard block |
||
| 294 | 298 | |
| 295 | 299 | } while (!isset($character['corporation_id'])); |
| 296 | 300 | $corporationID = $character['corporation_id']; |
| 297 | - if (in_array($corporationID, $corpArray)) |
|
| 298 | - continue; // user is in a valid corp, stop checking |
|
| 301 | + if (in_array($corporationID, $corpArray)) { |
|
| 302 | + continue; |
|
| 303 | + } |
|
| 304 | + // user is in a valid corp, stop checking |
|
| 299 | 305 | |
| 300 | 306 | $timeout = 0; |
| 301 | 307 | do { |
@@ -306,8 +312,10 @@ discard block |
||
| 306 | 312 | $timeout++; |
| 307 | 313 | $corporationDetails = corpDetails($corporationID); |
| 308 | 314 | } while (!isset($corporationDetails)); |
| 309 | - if (isset($corporationDetails['alliance_id']) && in_array($corporationDetails['alliance_id'], $allianceArray)) |
|
| 310 | - continue; // user is in a valid alliance, stop checking |
|
| 315 | + if (isset($corporationDetails['alliance_id']) && in_array($corporationDetails['alliance_id'], $allianceArray)) { |
|
| 316 | + continue; |
|
| 317 | + } |
|
| 318 | + // user is in a valid alliance, stop checking |
|
| 311 | 319 | |
| 312 | 320 | //check if user authed based on standings |
| 313 | 321 | $standings = null; |
@@ -324,8 +332,10 @@ discard block |
||
| 324 | 332 | $standings = 1; |
| 325 | 333 | } |
| 326 | 334 | } |
| 327 | - if ($standings) |
|
| 328 | - continue; //keep the user based on standings |
|
| 335 | + if ($standings) { |
|
| 336 | + continue; |
|
| 337 | + } |
|
| 338 | + //keep the user based on standings |
|
| 329 | 339 | |
| 330 | 340 | // User failed all checks, deactivate user in database |
| 331 | 341 | $sql = "UPDATE authUsers SET active='no' WHERE discordID='$discordID'"; |
@@ -467,8 +477,7 @@ discard block |
||
| 467 | 477 | while (null === $character) { //try 10 times to pull characterDetails |
| 468 | 478 | if ($timeout > 9) { |
| 469 | 479 | continue; |
| 470 | - } |
|
| 471 | - else{ |
|
| 480 | + } else{ |
|
| 472 | 481 | $character = characterDetails($charID); |
| 473 | 482 | $timeout++; |
| 474 | 483 | } |