@@ -25,80 +25,80 @@ |
||
| 25 | 25 | /** |
| 26 | 26 | * @property message |
| 27 | 27 | */ |
| 28 | - class motd { |
|
| 29 | - public $config; |
|
| 30 | - public $discord; |
|
| 31 | - public $logger; |
|
| 32 | - public $message; |
|
| 33 | - private $excludeChannel; |
|
| 34 | - private $triggers; |
|
| 35 | - public function init($config, $discord, $logger) { |
|
| 36 | - $this->config = $config; |
|
| 37 | - $this->discord = $discord; |
|
| 38 | - $this->logger = $logger; |
|
| 39 | - $this->excludeChannel = $this->config['bot']['restrictedChannels']; |
|
| 40 | - $this->triggers[] = $this->config['bot']['trigger'] . 'motd'; |
|
| 41 | - $this->triggers[] = $this->config['bot']['trigger'] . 'Motd'; |
|
| 42 | - $this->triggers[] = $this->config['bot']['trigger'] . 'MOTD'; |
|
| 43 | - $this->keyID = $config['plugins']['motd']['keyID']; |
|
| 44 | - $this->vCode = $config['plugins']['motd']['vCode']; |
|
| 45 | - $this->characterID = $config['plugins']['motd']['characterID']; |
|
| 46 | - $this->channelname = $config['plugins']['motd']['channelname']; |
|
| 47 | - } |
|
| 48 | - public function onMessage($msgData, $message) { |
|
| 49 | - $channelID = (int) $msgData['message']['channelID']; |
|
| 50 | - if (in_array($channelID, $this->excludeChannel, true)) { |
|
| 51 | - return null; |
|
| 52 | - } |
|
| 53 | - $this->message = $message; |
|
| 54 | - $user = $msgData['message']['from']; |
|
| 55 | - $message = $msgData['message']['message']; |
|
| 56 | - $data = command($message, $this->information() ['trigger'], $this->config['bot']['trigger']); |
|
| 57 | - if (isset($data['trigger'])) { |
|
| 58 | - $keyID = $this->keyID; |
|
| 59 | - $vCode = $this->vCode; |
|
| 60 | - $characterID = $this->characterID; |
|
| 61 | - $channelname = $this->channelname; |
|
| 28 | + class motd { |
|
| 29 | + public $config; |
|
| 30 | + public $discord; |
|
| 31 | + public $logger; |
|
| 32 | + public $message; |
|
| 33 | + private $excludeChannel; |
|
| 34 | + private $triggers; |
|
| 35 | + public function init($config, $discord, $logger) { |
|
| 36 | + $this->config = $config; |
|
| 37 | + $this->discord = $discord; |
|
| 38 | + $this->logger = $logger; |
|
| 39 | + $this->excludeChannel = $this->config['bot']['restrictedChannels']; |
|
| 40 | + $this->triggers[] = $this->config['bot']['trigger'] . 'motd'; |
|
| 41 | + $this->triggers[] = $this->config['bot']['trigger'] . 'Motd'; |
|
| 42 | + $this->triggers[] = $this->config['bot']['trigger'] . 'MOTD'; |
|
| 43 | + $this->keyID = $config['plugins']['motd']['keyID']; |
|
| 44 | + $this->vCode = $config['plugins']['motd']['vCode']; |
|
| 45 | + $this->characterID = $config['plugins']['motd']['characterID']; |
|
| 46 | + $this->channelname = $config['plugins']['motd']['channelname']; |
|
| 47 | + } |
|
| 48 | + public function onMessage($msgData, $message) { |
|
| 49 | + $channelID = (int) $msgData['message']['channelID']; |
|
| 50 | + if (in_array($channelID, $this->excludeChannel, true)) { |
|
| 51 | + return null; |
|
| 52 | + } |
|
| 53 | + $this->message = $message; |
|
| 54 | + $user = $msgData['message']['from']; |
|
| 55 | + $message = $msgData['message']['message']; |
|
| 56 | + $data = command($message, $this->information() ['trigger'], $this->config['bot']['trigger']); |
|
| 57 | + if (isset($data['trigger'])) { |
|
| 58 | + $keyID = $this->keyID; |
|
| 59 | + $vCode = $this->vCode; |
|
| 60 | + $characterID = $this->characterID; |
|
| 61 | + $channelname = $this->channelname; |
|
| 62 | 62 | |
| 63 | 63 | $urlChar = "https://api.eveonline.com/char/ChatChannels.xml.aspx?keyID=$keyID&vCode=$vCode&characterID=$characterID"; |
| 64 | - $data = file_get_contents($urlChar); |
|
| 65 | - $list = new SimpleXMLElement($data); |
|
| 64 | + $data = file_get_contents($urlChar); |
|
| 65 | + $list = new SimpleXMLElement($data); |
|
| 66 | 66 | |
| 67 | 67 | |
| 68 | - foreach ($list->result->rowset->row as $row) { |
|
| 69 | - $channeln = $row["displayName"]; |
|
| 68 | + foreach ($list->result->rowset->row as $row) { |
|
| 69 | + $channeln = $row["displayName"]; |
|
| 70 | 70 | |
| 71 | - if ($channeln == $channelname) { |
|
| 72 | - //scrub the motd, then break it into 1900 chars or less. Limit is 2000 and want to leave room for the name of the person being replied too |
|
| 73 | - $comment = $row["motd"]; |
|
| 74 | - $comment = str_replace("<BR>", "\n", $comment); |
|
| 75 | - $comment = str_replace("<br>", "\n", $comment); |
|
| 76 | - $comment = str_replace("<u>", "__", $comment); |
|
| 77 | - $comment = str_replace("</u>", "__", $comment); |
|
| 78 | - $comment = str_replace("<b>", "**", $comment); |
|
| 79 | - $comment = str_replace("</b>", "**", $comment); |
|
| 80 | - $comment = str_replace("<i>", "*", $comment); |
|
| 81 | - $comment = str_replace("</i>", "*", $comment); |
|
| 82 | - $comment = str_replace("&", "&", $comment); |
|
| 83 | - $comment = strip_tags($comment); |
|
| 84 | - $comment2 = str_split($comment, 1900); |
|
| 71 | + if ($channeln == $channelname) { |
|
| 72 | + //scrub the motd, then break it into 1900 chars or less. Limit is 2000 and want to leave room for the name of the person being replied too |
|
| 73 | + $comment = $row["motd"]; |
|
| 74 | + $comment = str_replace("<BR>", "\n", $comment); |
|
| 75 | + $comment = str_replace("<br>", "\n", $comment); |
|
| 76 | + $comment = str_replace("<u>", "__", $comment); |
|
| 77 | + $comment = str_replace("</u>", "__", $comment); |
|
| 78 | + $comment = str_replace("<b>", "**", $comment); |
|
| 79 | + $comment = str_replace("</b>", "**", $comment); |
|
| 80 | + $comment = str_replace("<i>", "*", $comment); |
|
| 81 | + $comment = str_replace("</i>", "*", $comment); |
|
| 82 | + $comment = str_replace("&", "&", $comment); |
|
| 83 | + $comment = strip_tags($comment); |
|
| 84 | + $comment2 = str_split($comment, 1900); |
|
| 85 | 85 | |
| 86 | - $this->message->reply("\n $comment2[0]"); |
|
| 87 | - if (!empty($comment2[1])) { |
|
| 88 | - $this->message->reply("\n $comment2[1]"); |
|
| 89 | - } |
|
| 90 | - if (!empty($comment2[2])) { |
|
| 91 | - $this->message->reply("\n $comment2[2]"); |
|
| 92 | - } |
|
| 93 | - if (!empty($comment2[3])) { |
|
| 94 | - $this->message->reply("\n $comment2[3]"); |
|
| 95 | - } |
|
| 96 | - } |
|
| 97 | - } |
|
| 98 | - } |
|
| 99 | - } |
|
| 100 | - public function information() { |
|
| 86 | + $this->message->reply("\n $comment2[0]"); |
|
| 87 | + if (!empty($comment2[1])) { |
|
| 88 | + $this->message->reply("\n $comment2[1]"); |
|
| 89 | + } |
|
| 90 | + if (!empty($comment2[2])) { |
|
| 91 | + $this->message->reply("\n $comment2[2]"); |
|
| 92 | + } |
|
| 93 | + if (!empty($comment2[3])) { |
|
| 94 | + $this->message->reply("\n $comment2[3]"); |
|
| 95 | + } |
|
| 96 | + } |
|
| 97 | + } |
|
| 98 | + } |
|
| 99 | + } |
|
| 100 | + public function information() { |
|
| 101 | 101 | return array('name' => 'motd', 'trigger' => $this->triggers, 'information' => 'Displays the MOTD, useful for seeing information displayed there when not in-game.'); |
| 102 | - } |
|
| 103 | - } |
|
| 102 | + } |
|
| 103 | + } |
|
| 104 | 104 | ?> |
@@ -57,8 +57,8 @@ |
||
| 57 | 57 | //Check we are not running on a 32bit platform |
| 58 | 58 | if(PHP_INT_SIZE == 4) |
| 59 | 59 | { |
| 60 | - $logger->error('32bit PHP found, if you are running a 64bit OS please install 64bit PHP'); |
|
| 61 | - die(); |
|
| 60 | + $logger->error('32bit PHP found, if you are running a 64bit OS please install 64bit PHP'); |
|
| 61 | + die(); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | // Require the config |
@@ -153,7 +153,7 @@ |
||
| 153 | 153 | } elseif (in_array((int) $kmGroup['allianceID'], $attackerAllianceArray) && (int) $kmGroup['allianceID'] !== 0) { |
| 154 | 154 | $allianceKill = true; |
| 155 | 155 | } else { |
| 156 | - //if it wasn't any of these continue in case there is another group to process |
|
| 156 | + //if it wasn't any of these continue in case there is another group to process |
|
| 157 | 157 | continue; |
| 158 | 158 | } |
| 159 | 159 | |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | public $itemTitle; |
| 39 | 39 | public $itemUrl; |
| 40 | 40 | public $itemDate; |
| 41 | - public $strDate; |
|
| 41 | + public $strDate; |
|
| 42 | 42 | |
| 43 | 43 | /** |
| 44 | 44 | * @param $config |
@@ -91,15 +91,15 @@ discard block |
||
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | $rss = new SimpleXMLElement($rssUrl, null, true); // XML parser |
| 94 | - if ($rss===null || !is_object($rss)) { |
|
| 95 | - $this->logger->addInfo("Failed to load xml file: {$rssUrl}"); |
|
| 96 | - break; |
|
| 97 | - } |
|
| 98 | - if (!is_object($rss->feed)) { |
|
| 99 | - $this->logger->addInfo("Feed is not an object at: {$rssUrl}"); |
|
| 100 | - break; |
|
| 101 | - } |
|
| 102 | - $feedLink = $rss->feed->id; |
|
| 94 | + if ($rss===null || !is_object($rss)) { |
|
| 95 | + $this->logger->addInfo("Failed to load xml file: {$rssUrl}"); |
|
| 96 | + break; |
|
| 97 | + } |
|
| 98 | + if (!is_object($rss->feed)) { |
|
| 99 | + $this->logger->addInfo("Feed is not an object at: {$rssUrl}"); |
|
| 100 | + break; |
|
| 101 | + } |
|
| 102 | + $feedLink = $rss->feed->id; |
|
| 103 | 103 | $latestTopicDate = getPermCache("rssFeed{$feedLink}"); |
| 104 | 104 | |
| 105 | 105 | //Check if feed has been checked before |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $itemUrl = $rss->entry->id; |
| 115 | 115 | $strDate = $rss->entry->published; |
| 116 | 116 | |
| 117 | - $itemDate = strtotime($strDate); |
|
| 117 | + $itemDate = strtotime($strDate); |
|
| 118 | 118 | |
| 119 | 119 | //Check to see if feed is formatted correctly |
| 120 | 120 | if (is_null($itemTitle) || is_null($itemUrl) || is_null($itemDate)) { |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | // $i = 0; |
| 116 | 116 | if (isset($kills)) { |
| 117 | 117 | foreach ($kills as $kill) { |
| 118 | - // if ($i < 10) { |
|
| 118 | + // if ($i < 10) { |
|
| 119 | 119 | //if big kill isn't set, disable it |
| 120 | 120 | if (!array_key_exists('bigKill', $kmGroup)) { |
| 121 | 121 | $kmGroup['bigKill'] = 99999999999999999999999999; |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | if (isset($kills)) { |
| 202 | 202 | foreach ($kills as $kill) { |
| 203 | 203 | $cacheID = getPermCache('bigKillNewestKillmailID'); |
| 204 | - // if ($i < 10) { |
|
| 204 | + // if ($i < 10) { |
|
| 205 | 205 | $killID = $kill['killID']; |
| 206 | 206 | //check if mail is old |
| 207 | 207 | if ((int)$killID <= (int)$oldID) { |