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

Dramiel.php

Spacing +4 added lines, -4 removed lines

@@ -158,21 +158,21 @@ 
         $discord->updatePresence($game);
 
         // Server Status Check (tick plugins will not run if eve is offline)
-        $discord->loop->addPeriodicTimer(60, function () use ($logger) {
+        $discord->loop->addPeriodicTimer(60, function() use ($logger) {
             $crestData = json_decode(downloadData('https://crest-tq.eveonline.com/'), true);
             $crestStatus = isset($crestData['serviceStatus']) ? $crestData['serviceStatus'] : 'offline';
             setPermCache('serverState', $crestStatus);
         });
 
         // Run the Tick plugins
-        $discord->loop->addPeriodicTimer(3, function () use ($pluginsT) {
+        $discord->loop->addPeriodicTimer(3, function() use ($pluginsT) {
             foreach ($pluginsT as $plugin) {
                 $plugin->tick();
             }
         });
 
         // Message queue
-        $discord->loop->addPeriodicTimer(7, function () use ($discord, $logger) {
+        $discord->loop->addPeriodicTimer(7, function() use ($discord, $logger) {
             $x = 0;
             while ($x < 3) {
                 $id = getOldestMessage();
@@ -228,7 +228,7 @@ 
         });
 
         // Mem cleanup every 30 minutes
-        $discord->loop->addPeriodicTimer(1800, function () use ($logger) {
+        $discord->loop->addPeriodicTimer(1800, function() use ($logger) {
             $logger->addInfo('Memory in use: ' . memory_get_usage() / 1024 / 1024 . 'MB');
             gc_collect_cycles(); // Collect garbage
             $logger->addInfo('Memory in use after garbage collection: ' . memory_get_usage() / 1024 / 1024 . 'MB');

src/plugins/onTick/getKillmailsRedis.php

Spacing +6 added lines, -6 removed lines

@@ -141,17 +141,17 @@
                 $attackerAllianceArray = array();
 
                 foreach ($kill['killmail']['attackers'] as $attacker) {
-                    $attackerCorpArray[] = (int)@$attacker['corporation']['id'];
-                    $attackerAllianceArray[] = (int)@$attacker['alliance']['id'];
+                    $attackerCorpArray[] = (int) @$attacker['corporation']['id'];
+                    $attackerAllianceArray[] = (int) @$attacker['alliance']['id'];
                 }
 
-                if ((int)@$kill['killmail']['victim']['corporation']['id'] === $kmGroup['corpID'] && (int)$kmGroup['corpID'] !== 0) {
+                if ((int) @$kill['killmail']['victim']['corporation']['id'] === $kmGroup['corpID'] && (int) $kmGroup['corpID'] !== 0) {
                     $corpLoss = true;
-                } elseif ((int)@$kill['killmail']['victim']['alliance']['id'] === $kmGroup['allianceID'] && (int)$kmGroup['allianceID'] !== 0) {
+                } elseif ((int) @$kill['killmail']['victim']['alliance']['id'] === $kmGroup['allianceID'] && (int) $kmGroup['allianceID'] !== 0) {
                     $allianceLoss = true;
-                } elseif (in_array((int)$kmGroup['corpID'], $attackerCorpArray) && (int)$kmGroup['corpID'] !== 0) {
+                } elseif (in_array((int) $kmGroup['corpID'], $attackerCorpArray) && (int) $kmGroup['corpID'] !== 0) {
                     $corpKill = true;
-                } elseif (in_array((int)$kmGroup['allianceID'], $attackerAllianceArray) && (int)$kmGroup['allianceID'] !== 0) {
+                } elseif (in_array((int) $kmGroup['allianceID'], $attackerAllianceArray) && (int) $kmGroup['allianceID'] !== 0) {
                     $allianceKill = true;
                 } else {
                     break;

src/plugins/onTick/periodicStatusCheck.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
         //Crest
         $crestData = json_decode(downloadData('https://crest-tq.eveonline.com/'), true);
         $crestStatus = isset($crestData['serviceStatus']) ? $crestData['serviceStatus'] : 'offline';
-        $tqOnline = (int)@$crestData['userCount'];
+        $tqOnline = (int) @$crestData['userCount'];
         
         if ($lastStatus === $crestStatus) {
             // No change

src/lib/eveApi.php

Spacing +9 added lines, -9 removed lines

@@ -105,7 +105,7 @@ 
     if (null === $character) { // Make sure it's always set.
         return null;
     }
-    return (string)$character['name'];
+    return (string) $character['name'];
 }
 
 /**
@@ -123,7 +123,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());
@@ -170,7 +170,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());
@@ -195,7 +195,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());
@@ -214,7 +214,7 @@ 
 function corpName($corpID)
 {
     $corporation = corpDetails($corpID);
-    $name = (string)$corporation['corporation_name'];
+    $name = (string) $corporation['corporation_name'];
 
     if (null === $corporation) { // Make sure it's always set.
         return null;
@@ -256,7 +256,7 @@ 
     $url = "https://esi.tech.ccp.is/latest/alliances/{$allianceID}/";
     $json = file_get_contents($url);
     $data = json_decode($json, TRUE);
-    $name = (string)$data['alliance_name'];
+    $name = (string) $data['alliance_name'];
 
     if (null === $name) { // Make sure it's always set.
         $name = 'Unknown';
@@ -276,7 +276,7 @@ 
     $url = "https://esi.tech.ccp.is/latest/search/?search={$systemName}&categories=solarsystem&language=en-us&strict=true&datasource=tranquility";
     $json = file_get_contents($url);
     $data = json_decode($json, TRUE);
-    $id = (int)$data['solarsystem'][0];
+    $id = (int) $data['solarsystem'][0];
 
     if (null === $id) { // Make sure it's always set.
         $id = 'Unknown';
@@ -295,7 +295,7 @@ 
     $url = "https://esi.tech.ccp.is/latest/universe/types/{$typeID}/";
     $json = file_get_contents($url);
     $data = json_decode($json, TRUE);
-    $name = (string)$data['type_name'];
+    $name = (string) $data['type_name'];
 
     if (null === $name) { // Make sure it's always set.
         $name = 'Unknown';
@@ -315,7 +315,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';

src/plugins/onMessage/auth.php

Spacing +8 added lines, -8 removed lines

@@ -126,7 +126,7 @@ 
                         return null;
                     }
                     $corpTicker = $corpDetails['ticker'];
-                    $corpName = (string)$corpDetails['corporation_name'];
+                    $corpName = (string) $corpDetails['corporation_name'];
                     if (null !== $corpTicker) {
                         addCorpInfo($corpID, $corpTicker, $corpName);
                     }
@@ -156,7 +156,7 @@ 
                     //Check if corpID matches
                     if ($corpID === $authGroup['corpID']) {
                         foreach ($roles as $role) {
-                            if ((string)$role->name === (string)$authGroup['corpMemberRole']) {
+                            if ((string) $role->name === (string) $authGroup['corpMemberRole']) {
                                 $member->addRole($role);
                                 $role = 'corp';
                             }
@@ -165,7 +165,7 @@ 
                     //Check if allianceID matches
                     if ($allianceID === $authGroup['allianceID'] && $authGroup['allianceID'] != 0) {
                         foreach ($roles as $role) {
-                            if ((string)$role->name === (string)$authGroup['allyMemberRole']) {
+                            if ((string) $role->name === (string) $authGroup['allyMemberRole']) {
                                 $member->addRole($role);
                                 $role = 'ally';
                             }
@@ -176,23 +176,23 @@ 
                         $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';
                             }
-                            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';
                             }
-                            if ((@(int)$allianceContacts['standings'] === 0 || @(int)$corpContacts['standings'] === 0 || (@(int)$allianceContacts['standings'] && @(int)$corpContacts['standings'] === null || '')) && (string)$role->name === (string)$this->config['plugins']['auth']['standings']['neutralRole']) {
+                            if ((@(int) $allianceContacts['standings'] === 0 || @(int) $corpContacts['standings'] === 0 || (@(int) $allianceContacts['standings'] && @(int) $corpContacts['standings'] === null || '')) && (string) $role->name === (string) $this->config['plugins']['auth']['standings']['neutralRole']) {
                                 $member->addRole($role);
                                 $role = 'neut';
                             }
-                            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';
                             }
-                            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';
                             }

config/config.new.php

Spacing +2 added lines, -2 removed lines

@@ -163,8 +163,8 @@
             )
         ),
         'standings' => array(
-            'enabled' => 'false',//set to true if you want to allow people to auth based off of corp/alliance standings
-            'apiKey' => 'user1',//enter the KEYID for whatever above api you'd like to base standings off of
+            'enabled' => 'false', //set to true if you want to allow people to auth based off of corp/alliance standings
+            'apiKey' => 'user1', //enter the KEYID for whatever above api you'd like to base standings off of
             'plus10Role' => '',
             'plus5Role' => '',
             'neutralRole' => '',

src/plugins/onTick/authCheck.php

Spacing +11 added lines, -11 removed lines

@@ -165,10 +165,10 @@ 
         //Set corp/ally id arrays
         foreach ($this->authGroups as $authGroup) {
             if ($authGroup['corpID'] !== 0) {
-                $corpArray[] = (int)$authGroup['corpID'];
+                $corpArray[] = (int) $authGroup['corpID'];
             }
             if ($authGroup['allianceID'] !== 0) {
-                $allianceArray[] = (int)$authGroup['allianceID'];
+                $allianceArray[] = (int) $authGroup['allianceID'];
             }
         }
 
@@ -208,11 +208,11 @@ 
                     if ($role === 'red' && ($allianceContacts['standings'] || $corpContacts['standings'] === -5 || -10)) {
                         $standings = 1;
                     }
-                    if ($role === 'neut' && ($allianceContacts['standings'] || $corpContacts['standings'] === 0 || (@(int)$allianceContacts['standings'] && @(int)$corpContacts['standings'] === null || ''))) {
+                    if ($role === 'neut' && ($allianceContacts['standings'] || $corpContacts['standings'] === 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.");
@@ -318,7 +318,7 @@ 
         $guild = $this->discord->guilds->get('id', $this->guildID);
 
         //Get name queue status
-        $x = (int)getPermCache('nameQueueState');
+        $x = (int) getPermCache('nameQueueState');
 
         //Establish connection to mysql
         $conn = new mysqli($this->db, $this->dbUser, $this->dbPass, $this->dbName);
@@ -384,10 +384,10 @@ 
                     }
                     $nick = null;
                     if (null !== @$corpInfo['corpTicker']) {
-                        $corpTicker = (string)$corpInfo['corpTicker'];
+                        $corpTicker = (string) $corpInfo['corpTicker'];
                         if ($this->nameEnforce === 'true') {
                             $nick = "[{$corpTicker}] {$eveName}";
-                        } elseif ((string)$nickName === "[{$corpTicker}]") {
+                        } elseif ((string) $nickName === "[{$corpTicker}]") {
                             $nick = "[{$corpTicker}] {$userName}";
                         } elseif (strpos($nickName, $corpTicker) === false) {
                             $nick = "[{$corpTicker}] {$nickName}";
@@ -408,11 +408,11 @@ 
                     if (@$corpTicker === 'U') {
                         continue;
                     }
-                    $corpName = (string)$corporationDetails['corporation_name'];
+                    $corpName = (string) $corporationDetails['corporation_name'];
                     if (null !== $corpTicker) {
                         if ($this->nameEnforce === 'true') {
                             $nick = "[{$corpTicker}] {$eveName}";
-                        } elseif ((string)$nickName === "[{$corpTicker}]") {
+                        } elseif ((string) $nickName === "[{$corpTicker}]") {
                             $nick = "[{$corpTicker}] {$userName}";
                         } elseif (strpos($nickName, $corpTicker) === false) {
                             $nick = "[{$corpTicker}] {$nickName}";
@@ -446,14 +446,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']);