shibdib / Dramiel

src/plugins/onTick/notifications.php

Spacing +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
                 $this->fuelChannel = $this->toDiscordChannel;
             }
             //Set timer for next key based on number of keys
-            $nextKey = (1900 / (int)$this->numberOfKeys) + time();
+            $nextKey = (1900 / (int) $this->numberOfKeys) + time();
             $nextKeyTime = gmdate("Y-m-d H:i:s", $nextKey);
             setPermCache("notificationsLastChecked", $nextKey);
             //Set cache timer for api key

src/plugins/onTick/evemails.php

Spacing +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
         $cacheClr = $baseUnix - 13500;
 
         //Set timer for next key based on number of keys
-        $nextKey = (1900 / (int)$this->numberOfKeys) + time();
+        $nextKey = (1900 / (int) $this->numberOfKeys) + time();
         $nextKeyTime = gmdate("Y-m-d H:i:s", $nextKey);
         setPermCache("mailLastChecked", $nextKey);
 

src/plugins/onTick/authCheck.php

Spacing +5 added lines, -5 removed lines

@@ -199,20 +199,20 @@
 
                 //check if user authed based on standings
                 $standings = null;
-                if ((string)$role === 'blue' || 'neut' || 'red') {
+                if ((string) $role === 'blue' || 'neut' || 'red') {
                     $allianceContacts = getContacts($allianceID);
                     $corpContacts = getContacts($corporationID);
-                    if ((string)$role === 'blue' && ($allianceContacts['standings'] || $corpContacts['standings'] === 5 || 10 || '5' || '10')) {
+                    if ((string) $role === 'blue' && ($allianceContacts['standings'] || $corpContacts['standings'] === 5 || 10 || '5' || '10')) {
                         $standings = 1;
                     }
-                    if ((string)$role === 'red' && ($allianceContacts['standings'] || $corpContacts['standings'] === -5 || -10 || '-5' || '-10')) {
+                    if ((string) $role === 'red' && ($allianceContacts['standings'] || $corpContacts['standings'] === -5 || -10 || '-5' || '-10')) {
                         $standings = 1;
                     }
-                    if ((string)$role === 'neut' && ($allianceContacts['standings'] || $corpContacts['standings'] === 0 || '0' || (@(int)$allianceContacts['standings'] && @(int)$corpContacts['standings'] === null || ''))) {
+                    if ((string) $role === 'neut' && ($allianceContacts['standings'] || $corpContacts['standings'] === 0 || '0' || (@(int) $allianceContacts['standings'] && @(int) $corpContacts['standings'] === null || ''))) {
                         $standings = 1;
                     }
                 }
-                if (!in_array((int)$allianceID, $allianceArray) && !in_array((int)$corporationID, $corpArray) && null === $standings) {
+                if (!in_array((int) $allianceID, $allianceArray) && !in_array((int) $corporationID, $corpArray) && null === $standings) {
                     // Deactivate user in database
                     $sql = "UPDATE authUsers SET active='no' WHERE discordID='$discordID'";
                     $this->logger->addInfo("AuthCheck: {$eveName} account has been deactivated as they are no longer in a correct corp/alliance.");

src/lib/eveApi.php

Doc Comments +12 added lines, -1 removed lines

@@ -28,7 +28,7 @@ 
 
 /**
  * @param $url
- * @return SimpleXMLElement|null|string
+ * @return SimpleXMLElement|null
  */
 function makeApiRequest($url)
 {
@@ -117,6 +117,11 @@ 
  * @return mixed
  */
 ////Character name to ID
+/**
+ * @param string $characterName
+ *
+ * @return string
+ */
 function characterID($characterName)
 {
     $logger = new Logger('eveESI');
@@ -197,6 +202,9 @@ 
  * @return mixed
  */
 ////Corp name to ID
+/**
+ * @param string $corpName
+ */
 function corpID($corpName)
 {
     $logger = new Logger('eveESI');
@@ -364,6 +372,9 @@ 
 }
 
 ////Char/Object ID to name via CCP
+/**
+ * @param string $moonID
+ */
 function apiMoonName($moonID)
 {
     $url = "https://api.eveonline.com/eve/CharacterName.xml.aspx?IDs={$moonID}";

Spacing +9 added lines, -9 removed lines

@@ -101,7 +101,7 @@ 
 function characterName($characterID)
 {
     $character = characterDetails($characterID);
-    $name = (string)$character['name'];
+    $name = (string) $character['name'];
     if (null === $name || '' === $name) { // Make sure it's always set.
         $url = "https://api.eveonline.com/eve/CharacterName.xml.aspx?ids={$characterID}";
         $xml = makeApiRequest($url);
@@ -127,7 +127,7 @@ 
     try {
         $json = file_get_contents($url);
         $data = json_decode($json, TRUE);
-        $id = (int)$data['character'][0];
+        $id = (int) $data['character'][0];
 
     } catch (Exception $e) {
         $logger->error('EVE ESI Error: ' . $e->getMessage());
@@ -178,7 +178,7 @@ 
     try {
         $json = file_get_contents($url);
         $data = json_decode($json, TRUE);
-        $name = (string)$data['solar_system_name'];
+        $name = (string) $data['solar_system_name'];
 
     } catch (Exception $e) {
         $logger->error('EVE ESI Error: ' . $e->getMessage());
@@ -207,7 +207,7 @@ 
     try {
         $json = file_get_contents($url);
         $data = json_decode($json, TRUE);
-        $id = (int)$data['corporation'][0];
+        $id = (int) $data['corporation'][0];
 
     } catch (Exception $e) {
         $logger->error('EVE ESI Error: ' . $e->getMessage());
@@ -230,7 +230,7 @@ 
 function corpName($corpID)
 {
     $corporation = corpDetails($corpID);
-    $name = (string)$corporation['corporation_name'];
+    $name = (string) $corporation['corporation_name'];
     if (null === $name || '' === $name) { // Make sure it's always set.
         $url = "https://api.eveonline.com/eve/CharacterName.xml.aspx?ids={$corpID}";
         $xml = makeApiRequest($url);
@@ -277,7 +277,7 @@ 
     try {
         $json = file_get_contents($url);
         $data = json_decode($json, TRUE);
-        $name = (string)$data['alliance_name'];
+        $name = (string) $data['alliance_name'];
 
     } catch (Exception $e) {
         $url = "https://api.eveonline.com/eve/CharacterName.xml.aspx?ids={$allianceID}";
@@ -303,7 +303,7 @@ 
     try {
         $json = file_get_contents($url);
         $data = json_decode($json, TRUE);
-        $id = (int)$data['solarsystem'][0];
+        $id = (int) $data['solarsystem'][0];
 
     } catch (Exception $e) {
         $logger->error('EVE ESI Error: ' . $e->getMessage());
@@ -329,7 +329,7 @@ 
     try {
         $json = file_get_contents($url);
         $data = json_decode($json, TRUE);
-        $name = (string)$data['type_name'];
+        $name = (string) $data['type_name'];
 
     } catch (Exception $e) {
         $logger->error('EVE ESI Error: ' . $e->getMessage());
@@ -354,7 +354,7 @@ 
     $url = "https://www.fuzzwork.co.uk/api/typeid.php?typename={$typeName}";
     $json = file_get_contents($url);
     $data = json_decode($json, TRUE);
-    $id = (int)$data['typeID'];
+    $id = (int) $data['typeID'];
 
     if (null === $id) { // Make sure it's always set.
         $id = 'Unknown';

config/config.new.php

Spacing +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
 		'motd' => array(
         'keyID' => '', //char api keyID (Must have channel on api and mod rights on the char)
         'vCode' => '', //char api vCode
-        'characterID' => , //ID Of the character with mod rights to the channel, can get this from zkill, look up your char and its /character/#### is your char ID
+        'characterID' =>, //ID Of the character with mod rights to the channel, can get this from zkill, look up your char and its /character/#### is your char ID
         'channelname' => '', //name of channel you are requesting, must be IDENTICAL
     ),
     // what channel for eve notifications/also the channel for tq status alerts

Indentation +3 added lines, -3 removed lines

@@ -130,7 +130,7 @@ 
         ),
     ),
     //Pull MOTD of channel
-		'motd' => array(
+        'motd' => array(
         'keyID' => '', //char api keyID (Must have channel on api and mod rights on the char)
         'vCode' => '', //char api vCode
         'characterID' => , //ID Of the character with mod rights to the channel, can get this from zkill, look up your char and its /character/#### is your char ID
@@ -196,7 +196,7 @@ 
                 'lossMails' => 'true', //set as true to post both kills and losses, false to post only kills.
                 'startMail' => 1, //Put the zkill killID of your latest killmail. Otherwise it will pull from the beginning of time.
                 'minimumValue' => 0, //Put the minimum isk value for killmails here (Do not put any commas just numbers)
-				'minimumlossValue' => 0, //Put the minimum isk loss value for killmails here (Do not put any commas just numbers)
+                'minimumlossValue' => 0, //Put the minimum isk loss value for killmails here (Do not put any commas just numbers)
                 '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)
                 '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)
             ),
@@ -208,7 +208,7 @@ 
                 'lossMails' => 'true', //set as true to post both kills and losses, false to post only kills.
                 'startMail' => 1, //Put the zkill killID of your latest killmail. Otherwise it will pull from the beginning of time.
                 'minimumValue' => 0, //Put the minimum isk value for killmails here (Do not put any commas just numbers)
-				'minimumlossValue' => 0, //Put the minimum isk loss value for killmails here (Do not put any commas just numbers)
+                'minimumlossValue' => 0, //Put the minimum isk loss value for killmails here (Do not put any commas just numbers)
                 '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)
                 '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)
             ),

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 BurntOutWebs MOTD, useful for seeing upcoming ops when not in-game.');
-		}
-	}
+        }
+    }
 ?>

src/plugins/admin/setAvatar.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
             $roles = $member->roles;
             foreach ($roles as $role) {
                 if (in_array($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/onTick/getKillmails.php

Indentation +10 added lines, -10 removed lines

@@ -129,16 +129,16 @@
                         $rawValue = $kill['zkb']['totalValue'];
                         //Check if killmail meets minimum value and if it meets lost minimum value
                         if (isset($kmGroup['minimumValue']) && isset($kmGroup['minimumlossValue'])) {
-							if ($rawValue < $kmGroup['minimumValue']) {
-								if ($kill['victim']['corporationID'] == $kmGroup['corpID'] && $rawValue > $kmGroup['minimumlossValue']|| 
-								$kill['victim']['allianceID'] == $kmGroup['allianceID'] && $rawValue > $kmGroup['minimumlossValue'])
-								{
-									$this->logger->addInfo("Killmails: Mail {$killID} posted because it meet minimum loss value required.");
-								} else {
-									$this->logger->addInfo("Killmails: Mail {$killID} ignored for not meeting the minimum value required.");
-									setPermCache("{$kmGroup['name']}newestKillmailID", $killID);
-									continue;
-								}
+                            if ($rawValue < $kmGroup['minimumValue']) {
+                                if ($kill['victim']['corporationID'] == $kmGroup['corpID'] && $rawValue > $kmGroup['minimumlossValue']|| 
+                                $kill['victim']['allianceID'] == $kmGroup['allianceID'] && $rawValue > $kmGroup['minimumlossValue'])
+                                {
+                                    $this->logger->addInfo("Killmails: Mail {$killID} posted because it meet minimum loss value required.");
+                                } else {
+                                    $this->logger->addInfo("Killmails: Mail {$killID} ignored for not meeting the minimum value required.");
+                                    setPermCache("{$kmGroup['name']}newestKillmailID", $killID);
+                                    continue;
+                                }
                             }
                         }
                         $totalValue = number_format($kill['zkb']['totalValue']);

Spacing +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
                         //Check if killmail meets minimum value and if it meets lost minimum value
                         if (isset($kmGroup['minimumValue']) && isset($kmGroup['minimumlossValue'])) {
 							if ($rawValue < $kmGroup['minimumValue']) {
-								if ($kill['victim']['corporationID'] == $kmGroup['corpID'] && $rawValue > $kmGroup['minimumlossValue']|| 
+								if ($kill['victim']['corporationID'] == $kmGroup['corpID'] && $rawValue > $kmGroup['minimumlossValue'] || 
 								$kill['victim']['allianceID'] == $kmGroup['allianceID'] && $rawValue > $kmGroup['minimumlossValue'])
 								{
 									$this->logger->addInfo("Killmails: Mail {$killID} posted because it meet minimum loss value required.");

src/plugins/onMessage/auth.php

Spacing +5 added lines, -5 removed lines

@@ -196,22 +196,22 @@ 
                     $allianceContacts = getContacts($allianceID);
                     $corpContacts = getContacts($corpID);
                     foreach ($roles as $role) {
-                        if ((@(int)$allianceContacts['standings'] === 5 || @(int)$corpContacts['standings'] === 5) && (string)$role->name === (string)$this->config['plugins']['auth']['standings']['plus5Role']) {
+                        if ((@(int) $allianceContacts['standings'] === 5 || @(int) $corpContacts['standings'] === 5) && (string) $role->name === (string) $this->config['plugins']['auth']['standings']['plus5Role']) {
                             $member->addRole($role);
                             $role = 'blue';
                             break;
                         }
-                        if ((@(int)$allianceContacts['standings'] === 10 || @(int)$corpContacts['standings'] === 10) && (string)$role->name === (string)$this->config['plugins']['auth']['standings']['plus10Role']) {
+                        if ((@(int) $allianceContacts['standings'] === 10 || @(int) $corpContacts['standings'] === 10) && (string) $role->name === (string) $this->config['plugins']['auth']['standings']['plus10Role']) {
                             $member->addRole($role);
                             $role = 'blue';
                             break;
                         }
-                        if ((@(int)$allianceContacts['standings'] === -5 || @(int)$corpContacts['standings'] === -5) && (string)$role->name === (string)$this->config['plugins']['auth']['standings']['minus5Role']) {
+                        if ((@(int) $allianceContacts['standings'] === -5 || @(int) $corpContacts['standings'] === -5) && (string) $role->name === (string) $this->config['plugins']['auth']['standings']['minus5Role']) {
                             $member->addRole($role);
                             $role = 'red';
                             break;
                         }
-                        if ((@(int)$allianceContacts['standings'] === -10 || @(int)$corpContacts['standings'] === -10) && (string)$role->name === (string)$this->config['plugins']['auth']['standings']['minus10Role']) {
+                        if ((@(int) $allianceContacts['standings'] === -10 || @(int) $corpContacts['standings'] === -10) && (string) $role->name === (string) $this->config['plugins']['auth']['standings']['minus10Role']) {
                             $member->addRole($role);
                             $role = 'red';
                             break;
@@ -219,7 +219,7 @@ 
                     }
                     if ($role === null) {
                         foreach ($roles as $role) {
-                            if ((string)$role->name === (string)$this->config['plugins']['auth']['standings']['neutralRole']) {
+                            if ((string) $role->name === (string) $this->config['plugins']['auth']['standings']['neutralRole']) {
                                 $member->addRole($role);
                                 $role = 'neut';
                                 break;