@@ -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}"; |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | 'lossMails' => 'true', //set as true to post both kills and losses, false to post only kills. |
| 189 | 189 | 'startMail' => 1, //Put the zkill killID of your latest killmail. Otherwise it will pull from the beginning of time. |
| 190 | 190 | 'minimumValue' => 0, //Put the minimum isk value for killmails here (Do not put any commas just numbers) |
| 191 | - 'minimumlossValue' => 0, //Put the minimum isk loss value for killmails here (Do not put any commas just numbers) |
|
| 191 | + 'minimumlossValue' => 0, //Put the minimum isk loss value for killmails here (Do not put any commas just numbers) |
|
| 192 | 192 | 'bigKill' => null, //Set an isk amount you'd like to consider a high value kill, will alert the channel if any kills/losses hit this amount. (Leave as null if you don't want this feature) |
| 193 | 193 | 'bigKillChannel' => 0, //what channel does the bot post big kills into (must be set, if ud like to use one channel just put the same u put above here) |
| 194 | 194 | ), |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | 'lossMails' => 'true', //set as true to post both kills and losses, false to post only kills. |
| 201 | 201 | 'startMail' => 1, //Put the zkill killID of your latest killmail. Otherwise it will pull from the beginning of time. |
| 202 | 202 | 'minimumValue' => 0, //Put the minimum isk value for killmails here (Do not put any commas just numbers) |
| 203 | - 'minimumlossValue' => 0, //Put the minimum isk loss value for killmails here (Do not put any commas just numbers) |
|
| 203 | + 'minimumlossValue' => 0, //Put the minimum isk loss value for killmails here (Do not put any commas just numbers) |
|
| 204 | 204 | 'bigKill' => null, //Set an isk amount you'd like to consider a high value kill, will alert the channel if any kills/losses hit this amount. (Leave as null if you don't want this feature) |
| 205 | 205 | 'bigKillChannel' => 0, //what channel does the bot post big kills into (must be set, if ud like to use one channel just put the same u put above here) |
| 206 | 206 | ), |
@@ -129,16 +129,16 @@ |
||
| 129 | 129 | $rawValue = $kill['zkb']['totalValue']; |
| 130 | 130 | //Check if killmail meets minimum value and if it meets lost minimum value |
| 131 | 131 | if (isset($kmGroup['minimumValue']) && isset($kmGroup['minimumlossValue'])) { |
| 132 | - if ($rawValue < $kmGroup['minimumValue']) { |
|
| 133 | - if ($kill['victim']['corporationID'] == $kmGroup['corpID'] && $rawValue > $kmGroup['minimumlossValue']|| |
|
| 134 | - $kill['victim']['allianceID'] == $kmGroup['allianceID'] && $rawValue > $kmGroup['minimumlossValue']) |
|
| 135 | - { |
|
| 136 | - $this->logger->addInfo("Killmails: Mail {$killID} posted because it meet minimum loss value required."); |
|
| 137 | - } else { |
|
| 138 | - $this->logger->addInfo("Killmails: Mail {$killID} ignored for not meeting the minimum value required."); |
|
| 139 | - setPermCache("{$kmGroup['name']}newestKillmailID", $killID); |
|
| 140 | - continue; |
|
| 141 | - } |
|
| 132 | + if ($rawValue < $kmGroup['minimumValue']) { |
|
| 133 | + if ($kill['victim']['corporationID'] == $kmGroup['corpID'] && $rawValue > $kmGroup['minimumlossValue']|| |
|
| 134 | + $kill['victim']['allianceID'] == $kmGroup['allianceID'] && $rawValue > $kmGroup['minimumlossValue']) |
|
| 135 | + { |
|
| 136 | + $this->logger->addInfo("Killmails: Mail {$killID} posted because it meet minimum loss value required."); |
|
| 137 | + } else { |
|
| 138 | + $this->logger->addInfo("Killmails: Mail {$killID} ignored for not meeting the minimum value required."); |
|
| 139 | + setPermCache("{$kmGroup['name']}newestKillmailID", $killID); |
|
| 140 | + continue; |
|
| 141 | + } |
|
| 142 | 142 | } |
| 143 | 143 | } |
| 144 | 144 | $totalValue = number_format($kill['zkb']['totalValue']); |