@@ -172,7 +172,7 @@ |
||
172 | 172 | $this->fuelChannel = $this->toDiscordChannel; |
173 | 173 | } |
174 | 174 | //Set timer for next key based on number of keys |
175 | - $nextKey = (1900 / (int)$this->numberOfKeys) + time(); |
|
175 | + $nextKey = (1900 / (int) $this->numberOfKeys) + time(); |
|
176 | 176 | $nextKeyTime = gmdate("Y-m-d H:i:s", $nextKey); |
177 | 177 | setPermCache("notificationsLastChecked", $nextKey); |
178 | 178 | //Set cache timer for api key |
@@ -146,7 +146,7 @@ |
||
146 | 146 | $cacheClr = $baseUnix - 13500; |
147 | 147 | |
148 | 148 | //Set timer for next key based on number of keys |
149 | - $nextKey = (1900 / (int)$this->numberOfKeys) + time(); |
|
149 | + $nextKey = (1900 / (int) $this->numberOfKeys) + time(); |
|
150 | 150 | $nextKeyTime = gmdate("Y-m-d H:i:s", $nextKey); |
151 | 151 | setPermCache("mailLastChecked", $nextKey); |
152 | 152 |
@@ -196,27 +196,27 @@ |
||
196 | 196 | $allianceContacts = getContacts($allianceID); |
197 | 197 | $corpContacts = getContacts($corpID); |
198 | 198 | foreach ($roles as $role) { |
199 | - if ((@(int)$allianceContacts['standings'] === 5 || @(int)$corpContacts['standings'] === 5) && (string)$role->name === (string)$this->config['plugins']['auth']['standings']['plus5Role']) { |
|
199 | + if ((@(int) $allianceContacts['standings'] === 5 || @(int) $corpContacts['standings'] === 5) && (string) $role->name === (string) $this->config['plugins']['auth']['standings']['plus5Role']) { |
|
200 | 200 | $member->addRole($role); |
201 | 201 | $role = 'blue'; |
202 | 202 | break; |
203 | 203 | } |
204 | - if ((@(int)$allianceContacts['standings'] === 10 || @(int)$corpContacts['standings'] === 10) && (string)$role->name === (string)$this->config['plugins']['auth']['standings']['plus10Role']) { |
|
204 | + if ((@(int) $allianceContacts['standings'] === 10 || @(int) $corpContacts['standings'] === 10) && (string) $role->name === (string) $this->config['plugins']['auth']['standings']['plus10Role']) { |
|
205 | 205 | $member->addRole($role); |
206 | 206 | $role = 'blue'; |
207 | 207 | break; |
208 | 208 | } |
209 | - if ((@(int)$allianceContacts['standings'] === 0 || @(int)$corpContacts['standings'] === 0 || (@(int)$allianceContacts['standings'] && @(int)$corpContacts['standings'] === null || '')) && (string)$role->name === (string)$this->config['plugins']['auth']['standings']['neutralRole']) { |
|
209 | + if ((@(int) $allianceContacts['standings'] === 0 || @(int) $corpContacts['standings'] === 0 || (@(int) $allianceContacts['standings'] && @(int) $corpContacts['standings'] === null || '')) && (string) $role->name === (string) $this->config['plugins']['auth']['standings']['neutralRole']) { |
|
210 | 210 | $member->addRole($role); |
211 | 211 | $role = 'neut'; |
212 | 212 | break; |
213 | 213 | } |
214 | - if ((@(int)$allianceContacts['standings'] === -5 || @(int)$corpContacts['standings'] === -5) && (string)$role->name === (string)$this->config['plugins']['auth']['standings']['minus5Role']) { |
|
214 | + if ((@(int) $allianceContacts['standings'] === -5 || @(int) $corpContacts['standings'] === -5) && (string) $role->name === (string) $this->config['plugins']['auth']['standings']['minus5Role']) { |
|
215 | 215 | $member->addRole($role); |
216 | 216 | $role = 'red'; |
217 | 217 | break; |
218 | 218 | } |
219 | - if ((@(int)$allianceContacts['standings'] === -10 || @(int)$corpContacts['standings'] === -10) && (string)$role->name === (string)$this->config['plugins']['auth']['standings']['minus10Role']) { |
|
219 | + if ((@(int) $allianceContacts['standings'] === -10 || @(int) $corpContacts['standings'] === -10) && (string) $role->name === (string) $this->config['plugins']['auth']['standings']['minus10Role']) { |
|
220 | 220 | $member->addRole($role); |
221 | 221 | $role = 'red'; |
222 | 222 | break; |
@@ -199,20 +199,20 @@ |
||
199 | 199 | |
200 | 200 | //check if user authed based on standings |
201 | 201 | $standings = null; |
202 | - if ((string)$role === 'blue' || 'neut' || 'red') { |
|
202 | + if ((string) $role === 'blue' || 'neut' || 'red') { |
|
203 | 203 | $allianceContacts = getContacts($allianceID); |
204 | 204 | $corpContacts = getContacts($corporationID); |
205 | - if ((string)$role === 'blue' && ($allianceContacts['standings'] || $corpContacts['standings'] === 5 || 10 || '5' || '10')) { |
|
205 | + if ((string) $role === 'blue' && ($allianceContacts['standings'] || $corpContacts['standings'] === 5 || 10 || '5' || '10')) { |
|
206 | 206 | $standings = 1; |
207 | 207 | } |
208 | - if ((string)$role === 'red' && ($allianceContacts['standings'] || $corpContacts['standings'] === -5 || -10 || '-5' || '-10')) { |
|
208 | + if ((string) $role === 'red' && ($allianceContacts['standings'] || $corpContacts['standings'] === -5 || -10 || '-5' || '-10')) { |
|
209 | 209 | $standings = 1; |
210 | 210 | } |
211 | - if ((string)$role === 'neut' && ($allianceContacts['standings'] || $corpContacts['standings'] === 0 || '0' || (@(int)$allianceContacts['standings'] && @(int)$corpContacts['standings'] === null || ''))) { |
|
211 | + if ((string) $role === 'neut' && ($allianceContacts['standings'] || $corpContacts['standings'] === 0 || '0' || (@(int) $allianceContacts['standings'] && @(int) $corpContacts['standings'] === null || ''))) { |
|
212 | 212 | $standings = 1; |
213 | 213 | } |
214 | 214 | } |
215 | - if (!in_array((int)$allianceID, $allianceArray) && !in_array((int)$corporationID, $corpArray) && null === $standings) { |
|
215 | + if (!in_array((int) $allianceID, $allianceArray) && !in_array((int) $corporationID, $corpArray) && null === $standings) { |
|
216 | 216 | // Deactivate user in database |
217 | 217 | $sql = "UPDATE authUsers SET active='no' WHERE discordID='$discordID'"; |
218 | 218 | $this->logger->addInfo("AuthCheck: {$eveName} account has been deactivated as they are no longer in a correct corp/alliance."); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | |
29 | 29 | /** |
30 | 30 | * @param $url |
31 | - * @return SimpleXMLElement|null|string |
|
31 | + * @return SimpleXMLElement|null |
|
32 | 32 | */ |
33 | 33 | function makeApiRequest($url) |
34 | 34 | { |
@@ -117,6 +117,11 @@ discard block |
||
117 | 117 | * @return mixed |
118 | 118 | */ |
119 | 119 | ////Character name to ID |
120 | +/** |
|
121 | + * @param string $characterName |
|
122 | + * |
|
123 | + * @return string |
|
124 | + */ |
|
120 | 125 | function characterID($characterName) |
121 | 126 | { |
122 | 127 | $logger = new Logger('eveESI'); |
@@ -197,6 +202,9 @@ discard block |
||
197 | 202 | * @return mixed |
198 | 203 | */ |
199 | 204 | ////Corp name to ID |
205 | +/** |
|
206 | + * @param string $corpName |
|
207 | + */ |
|
200 | 208 | function corpID($corpName) |
201 | 209 | { |
202 | 210 | $logger = new Logger('eveESI'); |
@@ -364,6 +372,9 @@ discard block |
||
364 | 372 | } |
365 | 373 | |
366 | 374 | ////Char/Object ID to name via CCP |
375 | +/** |
|
376 | + * @param string $moonID |
|
377 | + */ |
|
367 | 378 | function apiMoonName($moonID) |
368 | 379 | { |
369 | 380 | $url = "https://api.eveonline.com/eve/CharacterName.xml.aspx?IDs={$moonID}"; |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | function characterName($characterID) |
102 | 102 | { |
103 | 103 | $character = characterDetails($characterID); |
104 | - $name = (string)$character['name']; |
|
104 | + $name = (string) $character['name']; |
|
105 | 105 | if (null === $name || '' === $name) { // Make sure it's always set. |
106 | 106 | $url = "https://api.eveonline.com/eve/CharacterName.xml.aspx?ids={$characterID}"; |
107 | 107 | $xml = makeApiRequest($url); |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | try { |
128 | 128 | $json = file_get_contents($url); |
129 | 129 | $data = json_decode($json, TRUE); |
130 | - $id = (int)$data['character'][0]; |
|
130 | + $id = (int) $data['character'][0]; |
|
131 | 131 | |
132 | 132 | } catch (Exception $e) { |
133 | 133 | $logger->error('EVE ESI Error: ' . $e->getMessage()); |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | try { |
179 | 179 | $json = file_get_contents($url); |
180 | 180 | $data = json_decode($json, TRUE); |
181 | - $name = (string)$data['solar_system_name']; |
|
181 | + $name = (string) $data['solar_system_name']; |
|
182 | 182 | |
183 | 183 | } catch (Exception $e) { |
184 | 184 | $logger->error('EVE ESI Error: ' . $e->getMessage()); |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | try { |
208 | 208 | $json = file_get_contents($url); |
209 | 209 | $data = json_decode($json, TRUE); |
210 | - $id = (int)$data['corporation'][0]; |
|
210 | + $id = (int) $data['corporation'][0]; |
|
211 | 211 | |
212 | 212 | } catch (Exception $e) { |
213 | 213 | $logger->error('EVE ESI Error: ' . $e->getMessage()); |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | function corpName($corpID) |
231 | 231 | { |
232 | 232 | $corporation = corpDetails($corpID); |
233 | - $name = (string)$corporation['corporation_name']; |
|
233 | + $name = (string) $corporation['corporation_name']; |
|
234 | 234 | if (null === $name || '' === $name) { // Make sure it's always set. |
235 | 235 | $url = "https://api.eveonline.com/eve/CharacterName.xml.aspx?ids={$corpID}"; |
236 | 236 | $xml = makeApiRequest($url); |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | try { |
278 | 278 | $json = file_get_contents($url); |
279 | 279 | $data = json_decode($json, TRUE); |
280 | - $name = (string)$data['alliance_name']; |
|
280 | + $name = (string) $data['alliance_name']; |
|
281 | 281 | |
282 | 282 | } catch (Exception $e) { |
283 | 283 | $url = "https://api.eveonline.com/eve/CharacterName.xml.aspx?ids={$allianceID}"; |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | try { |
304 | 304 | $json = file_get_contents($url); |
305 | 305 | $data = json_decode($json, TRUE); |
306 | - $id = (int)$data['solarsystem'][0]; |
|
306 | + $id = (int) $data['solarsystem'][0]; |
|
307 | 307 | |
308 | 308 | } catch (Exception $e) { |
309 | 309 | $logger->error('EVE ESI Error: ' . $e->getMessage()); |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | try { |
330 | 330 | $json = file_get_contents($url); |
331 | 331 | $data = json_decode($json, TRUE); |
332 | - $name = (string)$data['type_name']; |
|
332 | + $name = (string) $data['type_name']; |
|
333 | 333 | |
334 | 334 | } catch (Exception $e) { |
335 | 335 | $logger->error('EVE ESI Error: ' . $e->getMessage()); |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | $url = "https://www.fuzzwork.co.uk/api/typeid.php?typename={$typeName}"; |
355 | 355 | $json = file_get_contents($url); |
356 | 356 | $data = json_decode($json, TRUE); |
357 | - $id = (int)$data['typeID']; |
|
357 | + $id = (int) $data['typeID']; |
|
358 | 358 | |
359 | 359 | if (null === $id) { // Make sure it's always set. |
360 | 360 | $id = 'Unknown'; |