shibdib / Dramiel

src/plugins/onMessage/motd.php

Indentation +69 added lines, -69 removed lines

@@ -25,80 +25,80 @@
 /**
  * @property  message
  */
-	class motd {
-		public $config;
-		public $discord;
-		public $logger;
-		public $message;
-		private $excludeChannel;
-		private $triggers;
-		public function init($config, $discord, $logger) {
-			$this->config = $config;
-			$this->discord = $discord;
-			$this->logger = $logger;
-			$this->excludeChannel = $this->config['bot']['restrictedChannels'];
-			$this->triggers[] = $this->config['bot']['trigger'] . 'motd';
-			$this->triggers[] = $this->config['bot']['trigger'] . 'Motd';
-			$this->triggers[] = $this->config['bot']['trigger'] . 'MOTD';
-			$this->keyID = $config['plugins']['motd']['keyID'];
-			$this->vCode = $config['plugins']['motd']['vCode'];
-			$this->characterID = $config['plugins']['motd']['characterID'];
-			$this->channelname = $config['plugins']['motd']['channelname'];
-		}
-		public function onMessage($msgData, $message) {
-			$channelID = (int) $msgData['message']['channelID'];
-			if (in_array($channelID, $this->excludeChannel, true)) {
-				return null;
-			}
-			$this->message = $message;
-			$user = $msgData['message']['from'];
-			$message = $msgData['message']['message'];
-			$data = command($message, $this->information() ['trigger'], $this->config['bot']['trigger']);
-			if (isset($data['trigger'])) {
-				$keyID = $this->keyID;
-				$vCode = $this->vCode;
-				$characterID = $this->characterID;
-				$channelname = $this->channelname;
+    class motd {
+        public $config;
+        public $discord;
+        public $logger;
+        public $message;
+        private $excludeChannel;
+        private $triggers;
+        public function init($config, $discord, $logger) {
+            $this->config = $config;
+            $this->discord = $discord;
+            $this->logger = $logger;
+            $this->excludeChannel = $this->config['bot']['restrictedChannels'];
+            $this->triggers[] = $this->config['bot']['trigger'] . 'motd';
+            $this->triggers[] = $this->config['bot']['trigger'] . 'Motd';
+            $this->triggers[] = $this->config['bot']['trigger'] . 'MOTD';
+            $this->keyID = $config['plugins']['motd']['keyID'];
+            $this->vCode = $config['plugins']['motd']['vCode'];
+            $this->characterID = $config['plugins']['motd']['characterID'];
+            $this->channelname = $config['plugins']['motd']['channelname'];
+        }
+        public function onMessage($msgData, $message) {
+            $channelID = (int) $msgData['message']['channelID'];
+            if (in_array($channelID, $this->excludeChannel, true)) {
+                return null;
+            }
+            $this->message = $message;
+            $user = $msgData['message']['from'];
+            $message = $msgData['message']['message'];
+            $data = command($message, $this->information() ['trigger'], $this->config['bot']['trigger']);
+            if (isset($data['trigger'])) {
+                $keyID = $this->keyID;
+                $vCode = $this->vCode;
+                $characterID = $this->characterID;
+                $channelname = $this->channelname;
 
         $urlChar = "https://api.eveonline.com/char/ChatChannels.xml.aspx?keyID=$keyID&vCode=$vCode&characterID=$characterID";
-				$data = file_get_contents($urlChar);
-				$list = new SimpleXMLElement($data);
+                $data = file_get_contents($urlChar);
+                $list = new SimpleXMLElement($data);
 				
 				
-				foreach ($list->result->rowset->row as $row) {
-					$channeln = $row["displayName"];
+                foreach ($list->result->rowset->row as $row) {
+                    $channeln = $row["displayName"];
 					
-					if ($channeln == $channelname) {
-					//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
-					$comment = $row["motd"];
-          $comment = str_replace("<BR>", "\n", $comment);
-          $comment = str_replace("<br>", "\n", $comment);
-          $comment = str_replace("<u>", "__", $comment);
-          $comment = str_replace("</u>", "__", $comment);	
-          $comment = str_replace("<b>", "**", $comment);	
-          $comment = str_replace("</b>", "**", $comment);	
-          $comment = str_replace("<i>", "*", $comment);	
-          $comment = str_replace("</i>", "*", $comment);
-					$comment = str_replace("&amp;", "&", $comment);
-          $comment = strip_tags($comment);
-					$comment2 = str_split($comment, 1900);
+                    if ($channeln == $channelname) {
+                    //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
+                    $comment = $row["motd"];
+            $comment = str_replace("<BR>", "\n", $comment);
+            $comment = str_replace("<br>", "\n", $comment);
+            $comment = str_replace("<u>", "__", $comment);
+            $comment = str_replace("</u>", "__", $comment);	
+            $comment = str_replace("<b>", "**", $comment);	
+            $comment = str_replace("</b>", "**", $comment);	
+            $comment = str_replace("<i>", "*", $comment);	
+            $comment = str_replace("</i>", "*", $comment);
+                    $comment = str_replace("&amp;", "&", $comment);
+            $comment = strip_tags($comment);
+                    $comment2 = str_split($comment, 1900);
 					
-					$this->message->reply("\n $comment2[0]");
-						if (!empty($comment2[1])) {
-							$this->message->reply("\n $comment2[1]");
-						}
-						if (!empty($comment2[2])) {
-							$this->message->reply("\n $comment2[2]");
-						}
-						if (!empty($comment2[3])) {
-							$this->message->reply("\n $comment2[3]");
-						}
-					}
-				}
-			}
-		}
-		public function information() {
+                    $this->message->reply("\n $comment2[0]");
+                        if (!empty($comment2[1])) {
+                            $this->message->reply("\n $comment2[1]");
+                        }
+                        if (!empty($comment2[2])) {
+                            $this->message->reply("\n $comment2[2]");
+                        }
+                        if (!empty($comment2[3])) {
+                            $this->message->reply("\n $comment2[3]");
+                        }
+                    }
+                }
+            }
+        }
+        public function information() {
             return array('name' => 'motd', 'trigger' => $this->triggers, 'information' => 'Displays the MOTD, useful for seeing information displayed there when not in-game.');
-		}
-	}
+        }
+    }
 ?>

Dramiel.php

Indentation +2 added lines, -2 removed lines

@@ -57,8 +57,8 @@
 //Check we are not running on a 32bit platform
 if(PHP_INT_SIZE == 4)
 {
-	$logger->error('32bit PHP found, if you are running a 64bit OS please install 64bit PHP');
-	die();
+    $logger->error('32bit PHP found, if you are running a 64bit OS please install 64bit PHP');
+    die();
 }
 
 // Require the config

src/plugins/onTick/getKillmailsRedis.php

Indentation +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
                 } elseif (in_array((int) $kmGroup['allianceID'], $attackerAllianceArray) && (int) $kmGroup['allianceID'] !== 0) {
                     $allianceKill = true;
                 } else {
-                	//if it wasn't any of these continue in case there is another group to process
+                    //if it wasn't any of these continue in case there is another group to process
                     continue;
                 }
 

src/plugins/onTick/rssReader.php

Indentation +11 added lines, -11 removed lines

@@ -38,7 +38,7 @@ 
     public $itemTitle;
     public $itemUrl;
     public $itemDate;
-	public $strDate;
+    public $strDate;
 
     /**
      * @param $config
@@ -91,15 +91,15 @@ 
             }
 
             $rss = new SimpleXMLElement($rssUrl, null, true); // XML parser
-			if ($rss===null || !is_object($rss)) {
-				$this->logger->addInfo("Failed to load xml file: {$rssUrl}");
-				break;
-			}
-			if (!is_object($rss->feed)) {
-				$this->logger->addInfo("Feed is not an object at: {$rssUrl}");
-				break;
-			}
-			$feedLink = $rss->feed->id;
+            if ($rss===null || !is_object($rss)) {
+                $this->logger->addInfo("Failed to load xml file: {$rssUrl}");
+                break;
+            }
+            if (!is_object($rss->feed)) {
+                $this->logger->addInfo("Feed is not an object at: {$rssUrl}");
+                break;
+            }
+            $feedLink = $rss->feed->id;
             $latestTopicDate = getPermCache("rssFeed{$feedLink}");
 
             //Check if feed has been checked before
@@ -114,7 +114,7 @@ 
             $itemUrl = $rss->entry->id;
             $strDate = $rss->entry->published;
 			
-			$itemDate = strtotime($strDate);
+            $itemDate = strtotime($strDate);
 			
             //Check to see if feed is formatted correctly
             if (is_null($itemTitle) || is_null($itemUrl) || is_null($itemDate)) {

src/plugins/onTick/getKillmails.php

Indentation +2 added lines, -2 removed lines

@@ -115,7 +115,7 @@ 
 //            $i = 0;
             if (isset($kills)) {
                 foreach ($kills as $kill) {
- //                   if ($i < 10) {
+    //                   if ($i < 10) {
                         //if big kill isn't set, disable it
                         if (!array_key_exists('bigKill', $kmGroup)) {
                             $kmGroup['bigKill'] = 99999999999999999999999999;
@@ -201,7 +201,7 @@ 
         if (isset($kills)) {
             foreach ($kills as $kill) {
                 $cacheID = getPermCache('bigKillNewestKillmailID');
- //               if ($i < 10) {
+    //               if ($i < 10) {
                     $killID = $kill['killID'];
                     //check if mail is old
                     if ((int)$killID <= (int)$oldID) {

src/plugins/onMessage/sysInfo.php

Unused Use Statements -2 removed lines

@@ -1,7 +1,5 @@
 <?php
 
-use Discord\Discord;
-
 class sysInfo
 {
 	public $config;

Indentation +113 added lines, -113 removed lines

@@ -4,93 +4,93 @@ 
 
 class sysInfo
 {
-	public $config;
-	public $discord;
-	public $logger;
-	private $excludeChannel;
-	private $message;
-	private $triggers;
-
-	public function init($config, $discord, $logger)
-	{
-		$this->config = $config;
-		$this->discord = $discord;
-		$this->logger = $logger;
-		$this->excludeChannel = $this->config['bot']['restrictedChannels'];
-		$this->triggers[] = $this->config['bot']['trigger'] . 'sys';
-		$this->triggers[] = $this->config['bot']['trigger'] . 'Sys';
-		$this->triggers[] = $this->config['bot']['trigger'] . 'sysinfo';
-		$this->triggers[] = $this->config['bot']['trigger'] . 'system';
-		$this->triggers[] = $this->config['bot']['trigger'] . 'System';
-		$this->triggers[] = $this->config['bot']['trigger'] . 'Sysinfo';
-	}
-
-	public function onMessage($msgData, $message)
-	{
-		$channelID = (int) $msgData['message']['channelID'];
-
-		if(in_array($channelID, $this->excludeChannel, true))
-		{
-			return null;
-		}
-
-		$this->message = $message;
-
-		$message = $msgData['message']['message'];
-		$user = $msgData['message']['from'];
-
-		$data = command($message, $this->information()['trigger'], $this->config['bot']['trigger']);
-		if(isset($data['trigger']))
-		{
-			$messageString = strstr($data['messageString'], '@') ? str_replace('<@', '', str_replace('>', '', $data['messageString'])) : $data['messageString'];
-			if(is_numeric($messageString))
-			{
-				$messageString = dbQueryField('SELECT name FROM usersSeen WHERE id = :id', 'name', array(':id' => $messageString));
-			}
-			$cleanString = urlencode($messageString);
-			$sysID = urlencode(getSystemID($cleanString));
-
-			//Check if we get a system back, otherwise check for partials
-			if(empty($sysID))
-			{
-				$search = "http://tools.pandemic-legion.pl/api/search/{$cleanString}";
-				$search = json_decode(file_get_contents($search));
-				$tot = 0;
-				$res = array();
-				foreach ($search as $s){
-					if ($s->type == "system"){
-						$tot++;
-						$res[] = $s->name;
-					}
-				}
-				if ($tot == 0){
-					return $this->message->reply('**Error:** no data available');
-				}
-				if ($tot == 1){
-					$sysID = urlencode(getSystemID($res[0]));
-					if(empty($sysID)){
-						return $this->message->reply('**Error:** no data available');
-					}
-				}
-				if ($tot > 1){
-					$res = implode(", ",$res);
-					return $this->message->reply("**Error:** Did you mean one of these? {$res}");
-				}			
-			}
-
-			$systemDetails = systemDetails($sysID);
-			if (null === $systemDetails)
-			{
-				return $this->message->reply('**Error:** ESI is down. Try again later.');
-			}
-
-			$url = "https://zkillboard.com/api/stats/solarSystemID/{$sysID}/";
-			$json = json_decode(file_get_contents($url));
-
-			$regionID = $json->info->regionID;
-			$regionName = getRegionName($regionID);
-
-			$thisMonth = (string)date('Ym');
+    public $config;
+    public $discord;
+    public $logger;
+    private $excludeChannel;
+    private $message;
+    private $triggers;
+
+    public function init($config, $discord, $logger)
+    {
+        $this->config = $config;
+        $this->discord = $discord;
+        $this->logger = $logger;
+        $this->excludeChannel = $this->config['bot']['restrictedChannels'];
+        $this->triggers[] = $this->config['bot']['trigger'] . 'sys';
+        $this->triggers[] = $this->config['bot']['trigger'] . 'Sys';
+        $this->triggers[] = $this->config['bot']['trigger'] . 'sysinfo';
+        $this->triggers[] = $this->config['bot']['trigger'] . 'system';
+        $this->triggers[] = $this->config['bot']['trigger'] . 'System';
+        $this->triggers[] = $this->config['bot']['trigger'] . 'Sysinfo';
+    }
+
+    public function onMessage($msgData, $message)
+    {
+        $channelID = (int) $msgData['message']['channelID'];
+
+        if(in_array($channelID, $this->excludeChannel, true))
+        {
+            return null;
+        }
+
+        $this->message = $message;
+
+        $message = $msgData['message']['message'];
+        $user = $msgData['message']['from'];
+
+        $data = command($message, $this->information()['trigger'], $this->config['bot']['trigger']);
+        if(isset($data['trigger']))
+        {
+            $messageString = strstr($data['messageString'], '@') ? str_replace('<@', '', str_replace('>', '', $data['messageString'])) : $data['messageString'];
+            if(is_numeric($messageString))
+            {
+                $messageString = dbQueryField('SELECT name FROM usersSeen WHERE id = :id', 'name', array(':id' => $messageString));
+            }
+            $cleanString = urlencode($messageString);
+            $sysID = urlencode(getSystemID($cleanString));
+
+            //Check if we get a system back, otherwise check for partials
+            if(empty($sysID))
+            {
+                $search = "http://tools.pandemic-legion.pl/api/search/{$cleanString}";
+                $search = json_decode(file_get_contents($search));
+                $tot = 0;
+                $res = array();
+                foreach ($search as $s){
+                    if ($s->type == "system"){
+                        $tot++;
+                        $res[] = $s->name;
+                    }
+                }
+                if ($tot == 0){
+                    return $this->message->reply('**Error:** no data available');
+                }
+                if ($tot == 1){
+                    $sysID = urlencode(getSystemID($res[0]));
+                    if(empty($sysID)){
+                        return $this->message->reply('**Error:** no data available');
+                    }
+                }
+                if ($tot > 1){
+                    $res = implode(", ",$res);
+                    return $this->message->reply("**Error:** Did you mean one of these? {$res}");
+                }			
+            }
+
+            $systemDetails = systemDetails($sysID);
+            if (null === $systemDetails)
+            {
+                return $this->message->reply('**Error:** ESI is down. Try again later.');
+            }
+
+            $url = "https://zkillboard.com/api/stats/solarSystemID/{$sysID}/";
+            $json = json_decode(file_get_contents($url));
+
+            $regionID = $json->info->regionID;
+            $regionName = getRegionName($regionID);
+
+            $thisMonth = (string)date('Ym');
             $lastMonth = (string)date('Ym', strtotime('first day of previous month'));
 
             $thisMonthKill = $json->months->$thisMonth->shipsDestroyed;
@@ -100,21 +100,21 @@ 
             $activeKills = $activePVP->kills->count;
             $activeChars = $activePVP->characters->count;
 
-			$sysName = $systemDetails['name'];
-			$secStatus = round($systemDetails['security_status'],2);
+            $sysName = $systemDetails['name'];
+            $secStatus = round($systemDetails['security_status'],2);
 
-			$npc = "https://api.eveonline.com/map/kills.xml.aspx";
-			$npc = new SimpleXMLElement(file_get_contents($npc));
-			foreach($npc->result->rowset->row as $row){
-				if($row->attributes()->solarSystemID == $sysID){
-					$npcKills = $row->attributes()->factionKills;
-					$podKills = $row->attributes()->podKills;
-				}
-			}
+            $npc = "https://api.eveonline.com/map/kills.xml.aspx";
+            $npc = new SimpleXMLElement(file_get_contents($npc));
+            foreach($npc->result->rowset->row as $row){
+                if($row->attributes()->solarSystemID == $sysID){
+                    $npcKills = $row->attributes()->factionKills;
+                    $podKills = $row->attributes()->podKills;
+                }
+            }
 
-			$url = "https://zkillboard.com/system/{$sysID}/";
+            $url = "https://zkillboard.com/system/{$sysID}/";
 
-			$msg = "```Systeminfo
+            $msg = "```Systeminfo
 Name: {$sysName} 
 Region: {$regionName}
 Security: {$secStatus}
@@ -131,18 +131,18 @@ 
 ```
 
 More information: $url";
-			$this->logger->addInfo("sysInfo: Sending system information to {$user}");
-			$this->message->reply($msg);
-		}
-		return null;
-	}
-
-	public function information()
-	{
-		return array(
-			'name' => 'sys',
-			'trigger' => $this->triggers,
-			'information' => 'Returns information for the given system'
-			);
-	}
+            $this->logger->addInfo("sysInfo: Sending system information to {$user}");
+            $this->message->reply($msg);
+        }
+        return null;
+    }
+
+    public function information()
+    {
+        return array(
+            'name' => 'sys',
+            'trigger' => $this->triggers,
+            'information' => 'Returns information for the given system'
+            );
+    }
 }