shibdib / Dramiel

src/plugins/admin/setAvatar.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
             $roles = $member->roles;
             foreach ($roles as $role) {
                 if (in_array(strtolower($role->name), $adminRoles, true)) {
-                    $avatarURL = strtolower((string)$data['messageString']);
+                    $avatarURL = strtolower((string) $data['messageString']);
                     $ch = curl_init($avatarURL);
                     if (substr($avatarURL, -4) === '.jpg') {
                         $fp = fopen('/tmp/avatar.jpg', 'wb');

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

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 GLOBAL $logger;
 
 //Check we are not running on a 32bit platform
-if(PHP_INT_SIZE == 4)
+if (PHP_INT_SIZE == 4)
 {
 	$logger->error('32bit PHP found, if you are running a 64bit OS please install 64bit PHP');
 	die();
@@ -206,7 +206,7 @@ 
                         clearQueuedMessages($id);
                         continue;
                     }
-                    $channel = $guild->channels->get('id', (int)$queuedMessage['channel']);
+                    $channel = $guild->channels->get('id', (int) $queuedMessage['channel']);
                     //Check if channel is bad
                     if (null === $channel) {
                         $logger->addInfo("QueueProcessing Error- Item #{$id} : Channel provided is incorrect, removing it from the queue");

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)) {

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
             }
 
             $rss = new SimpleXMLElement($rssUrl, null, true); // XML parser
-			if ($rss===null || !is_object($rss)) {
+			if ($rss === null || !is_object($rss)) {
 				$this->logger->addInfo("Failed to load xml file: {$rssUrl}");
 				break;
 			}

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) {

Spacing +5 added lines, -5 removed lines

@@ -93,16 +93,16 @@ 
             if ($kmGroup['startMail'] > $SavedKillID || null === $SavedKillID) {
                 $SavedKillID = $kmGroup['startMail'];
             }
-            if ((string)$kmGroup['allianceID'] === '0' & $kmGroup['lossMails'] === 'true') {
+            if ((string) $kmGroup['allianceID'] === '0' & $kmGroup['lossMails'] === 'true') {
                 $url = "https://zkillboard.com/api/corporationID/{$kmGroup['corpID']}/no-attackers/no-items/orderDirection/asc/pastSeconds/10800/";
             }
-            if ((string)$kmGroup['allianceID'] === '0' & $kmGroup['lossMails'] === 'false') {
+            if ((string) $kmGroup['allianceID'] === '0' & $kmGroup['lossMails'] === 'false') {
                 $url = "https://zkillboard.com/api/corporationID/{$kmGroup['corpID']}/no-attackers/no-items/kills/orderDirection/asc/pastSeconds/10800/";
             }
-            if ((string)$kmGroup['allianceID'] !== '0' & $kmGroup['lossMails'] === 'true') {
+            if ((string) $kmGroup['allianceID'] !== '0' & $kmGroup['lossMails'] === 'true') {
                 $url = "https://zkillboard.com/api/allianceID/{$kmGroup['allianceID']}/no-attackers/no-items/orderDirection/asc/pastSeconds/10800/";
             }
-            if ((string)$kmGroup['allianceID'] !== '0' & $kmGroup['lossMails'] === 'false') {
+            if ((string) $kmGroup['allianceID'] !== '0' & $kmGroup['lossMails'] === 'false') {
                 $url = "https://zkillboard.com/api/allianceID/{$kmGroup['allianceID']}/no-attackers/no-items/kills/orderDirection/asc/pastSeconds/10800/";
             }
 
@@ -204,7 +204,7 @@ 
  //               if ($i < 10) {
                     $killID = $kill['killID'];
                     //check if mail is old
-                    if ((int)$killID <= (int)$oldID) {
+                    if ((int) $killID <= (int) $oldID) {
                         continue;
                     }
                     //save highest killID for cache

src/plugins/onTick/authCheck.php

Spacing +5 added lines, -5 removed lines

@@ -245,13 +245,13 @@ 
                 $corporationDetails = $this->getCorpDetails($character['corporation_id']);
                 $allianceContacts = getContacts($corporationDetails['alliance_id']);
                 $corpContacts = getContacts($character['corporation_id']);
-                if ($role === 'blue' && ((int)$allianceContacts['standing'] === 5 || 10 || (int)$corpContacts['standing'] === 5 || 10)) {
+                if ($role === 'blue' && ((int) $allianceContacts['standing'] === 5 || 10 || (int) $corpContacts['standing'] === 5 || 10)) {
                     $return = true;
                 }
-                if ($role === 'red' && ((int)$allianceContacts['standing'] === -5 || -10 || (int)$corpContacts['standing'] === -5 || -10)) {
+                if ($role === 'red' && ((int) $allianceContacts['standing'] === -5 || -10 || (int) $corpContacts['standing'] === -5 || -10)) {
                     $return = true;
                 }
-                if ($role === 'neut' && ((int)$allianceContacts['standing'] === 0 || (int)$corpContacts['standing'] === 0 || (@(int)$allianceContacts['standings'] === null || '' && @(int)$corpContacts['standings'] === null || ''))) {
+                if ($role === 'neut' && ((int) $allianceContacts['standing'] === 0 || (int) $corpContacts['standing'] === 0 || (@(int) $allianceContacts['standings'] === null || '' && @(int) $corpContacts['standings'] === null || ''))) {
                     $return = true;
                 }
             }
@@ -329,14 +329,14 @@ 
     private function standingsUpdate()
     {
         foreach ($this->apiKey as $apiKey) {
-            if ((string)$apiKey['keyID'] === (string)$this->config['plugins']['auth']['standings']['apiKey']) {
+            if ((string) $apiKey['keyID'] === (string) $this->config['plugins']['auth']['standings']['apiKey']) {
                 $url = "https://api.eveonline.com/char/ContactList.xml.aspx?keyID={$apiKey['keyID']}&vCode={$apiKey['vCode']}&characterID={$apiKey['characterID']}";
                 $xml = makeApiRequest($url);
                 if (empty($xml)) {
                     return null;
                 }
                 foreach ($xml->result->rowset as $contactType) {
-                    if ((string)$contactType->attributes()->name === 'corporateContactList' || 'allianceContactList') {
+                    if ((string) $contactType->attributes()->name === 'corporateContactList' || 'allianceContactList') {
                         foreach ($contactType->row as $contact) {
                             if (null !== $contact['contactID'] && $contact['contactName'] && $contact['standing']) {
                                 addContactInfo($contact['contactID'], $contact['contactName'], $contact['standing']);

src/plugins/onMessage/price.php

Spacing +6 added lines, -6 removed lines

@@ -132,12 +132,12 @@
                     $data = new SimpleXMLElement(downloadData("https://api.eve-central.com/api/marketstat?usesystem={$solarSystemID}&typeid={$typeID}"));
                 }
 
-                $lowBuy = str_pad(number_format((float) $data->marketstat->type->buy->min, 2),18," ",STR_PAD_LEFT);
-                $avgBuy = str_pad(number_format((float) $data->marketstat->type->buy->avg, 2),18," ",STR_PAD_LEFT);
-                $highBuy = str_pad(number_format((float) $data->marketstat->type->buy->max, 2),18," ",STR_PAD_LEFT);
-                $lowSell = str_pad(number_format((float) $data->marketstat->type->sell->min, 2),18," ",STR_PAD_LEFT);
-                $avgSell = str_pad(number_format((float) $data->marketstat->type->sell->avg, 2),18," ",STR_PAD_LEFT);
-                $highSell = str_pad(number_format((float) $data->marketstat->type->sell->max, 2),18," ",STR_PAD_LEFT);
+                $lowBuy = str_pad(number_format((float) $data->marketstat->type->buy->min, 2), 18, " ", STR_PAD_LEFT);
+                $avgBuy = str_pad(number_format((float) $data->marketstat->type->buy->avg, 2), 18, " ", STR_PAD_LEFT);
+                $highBuy = str_pad(number_format((float) $data->marketstat->type->buy->max, 2), 18, " ", STR_PAD_LEFT);
+                $lowSell = str_pad(number_format((float) $data->marketstat->type->sell->min, 2), 18, " ", STR_PAD_LEFT);
+                $avgSell = str_pad(number_format((float) $data->marketstat->type->sell->avg, 2), 18, " ", STR_PAD_LEFT);
+                $highSell = str_pad(number_format((float) $data->marketstat->type->sell->max, 2), 18, " ", STR_PAD_LEFT);
 
                 $this->logger->addInfo("Price: Sending pricing info to {$user}");
                 $solarSystemName = $systemName === 'pc' ? 'Global' : ucfirst($systemName);

src/lib/Db.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
     $logger->pushHandler(new StreamHandler(__DIR__ . '/../../log/libraryError.log', Logger::DEBUG));
     if ($db === null) {
         $db = __DIR__ . '/../../database/dramiel.sqlite';
-    } elseif ($db === 'eve'){
+    } elseif ($db === 'eve') {
         $db = __DIR__ . '/../../database/eveData.db';
     }