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/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/plugins/onTick/siphons.php

Spacing +6 added lines, -6 removed lines

@@ -108,15 +108,15 @@ 
             $rawGoo = array(16634, 16643, 16647, 16641, 16640, 16635, 16648, 16633, 16646, 16651, 16650, 16644, 16652, 16639, 16636, 16649, 16653, 16638, 16637, 16642);
             foreach (@$xml->result->rowset->row as $structures) {
                 //Check silos
-                if ((int)@$structures->attributes()->typeID === 14343) {
+                if ((int) @$structures->attributes()->typeID === 14343) {
                     if (isset($structures->rowset->row)) {
                         foreach (@$structures->rowset->row as $silo) {
                             //Avoid reporting empty silos
-                            if ((int)@$silo->attributes()->quantity !== 0 && in_array(@$silo->attributes()->typeID, $rawGoo, false)) {
+                            if ((int) @$silo->attributes()->quantity !== 0 && in_array(@$silo->attributes()->typeID, $rawGoo, false)) {
                                 $siloID = $structures->attributes()->itemID;
                                 $lastAmount = getPermCache("silo{$siloID}Amount");
                                 $gooAmount = $silo->attributes()->quantity;
-                                $gooDifference = (int)$gooAmount - (int)$lastAmount;
+                                $gooDifference = (int) $gooAmount - (int) $lastAmount;
                                 //Check if silo has been checked before
                                 if (null === $lastAmount || $gooDifference < 0) {
                                     setPermCache("silo{$siloID}Amount", $gooAmount);
@@ -140,15 +140,15 @@ 
                         }
                     }
                 }
-                if ((int)@$structures->attributes()->typeID === 17982) {
+                if ((int) @$structures->attributes()->typeID === 17982) {
                     if (isset($structures->rowset->row)) {
                         foreach (@$structures->rowset->row as $coupling) {
                             //Avoid reporting empty coupling arrays
-                            if ((int)@$coupling->attributes()->quantity !== 0 && in_array(@$coupling->attributes()->typeID, $rawGoo, false)) {
+                            if ((int) @$coupling->attributes()->quantity !== 0 && in_array(@$coupling->attributes()->typeID, $rawGoo, false)) {
                                 $couplingID = $structures->attributes()->itemID;
                                 $lastAmount = getPermCache("couplingArray{$couplingID}Amount");
                                 $gooAmount = $coupling->attributes()->quantity;
-                                $gooDifference = (int)$gooAmount - (int)$lastAmount;
+                                $gooDifference = (int) $gooAmount - (int) $lastAmount;
                                 //Check if silo has been checked before
                                 if (null === $lastAmount || $gooDifference < 0) {
                                     setPermCache("couplingArray{$couplingID}Amount", $gooAmount);

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

@@ -102,7 +102,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);
@@ -142,7 +142,7 @@ 
             // Close the connection
             curl_close($ch);
             $data = json_decode($data, TRUE);
-            $id = (int)$data['character'][0];
+            $id = (int) $data['character'][0];
 
         } catch (Exception $e) {
             $logger->error('EVE ESI Error: ' . $e->getMessage() . ' - Attempting ESI again.');
@@ -239,7 +239,7 @@ 
             // Close the connection
             curl_close($ch);
             $data = json_decode($data, TRUE);
-            $name = (string)$data['solar_system_name'];
+            $name = (string) $data['solar_system_name'];
 
         } catch (Exception $e) {
             $logger->error('EVE ESI Error: ' . $e->getMessage() . ' - Attempting ESI again.');
@@ -291,7 +291,7 @@ 
             // Close the connection
             curl_close($ch);
             $data = json_decode($data, TRUE);
-            $id = (int)$data['corporation'][0];
+            $id = (int) $data['corporation'][0];
 
         } catch (Exception $e) {
             $logger->error('EVE ESI Error: ' . $e->getMessage() . ' - Attempting ESI again.');
@@ -323,7 +323,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);
@@ -409,7 +409,7 @@ 
             // Close the connection
             curl_close($ch);
             $data = json_decode($data, TRUE);
-            $name = (string)$data['alliance_name'];
+            $name = (string) $data['alliance_name'];
 
         } catch (Exception $e) {
             $logger->error('EVE ESI Error: ' . $e->getMessage() . ' - Attempting ESI again.');
@@ -463,7 +463,7 @@ 
             // Close the connection
             curl_close($ch);
             $data = json_decode($data, TRUE);
-            $id = (int)$data['solarsystem'][0];
+            $id = (int) $data['solarsystem'][0];
 
         } catch (Exception $e) {
             $logger->error('EVE ESI Error: ' . $e->getMessage() . ' - Attempting ESI again.');
@@ -515,7 +515,7 @@ 
             // Close the connection
             curl_close($ch);
             $data = json_decode($data, TRUE);
-            $name = (string)$data['name'];
+            $name = (string) $data['name'];
 
         } catch (Exception $e) {
             $logger->error('EVE ESI Error: ' . $e->getMessage() . ' - Attempting ESI again.');
@@ -569,7 +569,7 @@ 
         $logger->error('Fuzzwork Error: ' . $e->getMessage());
         return null;
     }
-    $id = (int)$data['typeID'];
+    $id = (int) $data['typeID'];
 
     if (null === $id) { // Make sure it's always set.
         $id = 'Unknown';

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

Unused Use Statements -2 removed lines

@@ -23,8 +23,6 @@
  * SOFTWARE.
  */
 
-use Discord\Parts\User\Client;
-
 /**
  * @property  message
  */

src/lib/Db.php

Doc Comments +10 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
 /**
  * @param string $query
  * @param array $params
- * @param null $db
+ * @param string $db
  * @return null|void
  * @internal param string $db
  */
@@ -123,7 +123,7 @@ 
 /**
  * @param string $query
  * @param array $params
- * @param null $db
+ * @param string $db
  * @return array|void
  * @internal param string $db
  */
@@ -146,7 +146,7 @@ 
 /**
  * @param string $query
  * @param array $params
- * @param null $db
+ * @param string $db
  * @internal param string $db
  */
 function dbExecute($query, array $params = array(), $db = null)
@@ -243,6 +243,9 @@ 
 }
 
 //CORP INFO
+/**
+ * @param string $corpName
+ */
 function addCorpInfo($corpID, $corpTicker, $corpName)
 {
     dbExecute('REPLACE INTO corpCache (`corpID`, `corpTicker`, `corpName`) VALUES (:corpID,:corpTicker,:corpName)', array(':corpID' => $corpID, ':corpTicker' => $corpTicker, ':corpName' => $corpName));
@@ -301,6 +304,10 @@ 
     return dbQueryRow('SELECT * FROM pendingUsers WHERE `authString` = :authString AND `active` = :active', array(':authString' => $code, ':active' => $active), $db);
 }
 
+/**
+ * @param integer $charID
+ * @param integer $id
+ */
 function insertNewUser($userID, $charID, $eveName, $id, $role = 'corp')
 {
     $active = 'yes';

Spacing +1 added lines, -1 removed lines

@@ -305,7 +305,7 @@
 {
     $active = 'yes';
     $db = 'auth';
-    dbExecute('REPLACE into authUsers (`characterID`, `discordID`, `eveName`, `active`, `role`) VALUES (:characterID, :discordID, :eveName, :active, :role)', array(':characterID' => $charID, ':discordID' => $userID, ':eveName' => (string)$eveName, ':active' => $active, ':role' => (string)$role), $db);
+    dbExecute('REPLACE into authUsers (`characterID`, `discordID`, `eveName`, `active`, `role`) VALUES (:characterID, :discordID, :eveName, :active, :role)', array(':characterID' => $charID, ':discordID' => $userID, ':eveName' => (string) $eveName, ':active' => $active, ':role' => (string) $role), $db);
     dbExecute('DELETE from pendingUsers WHERE `id` = :id', array(':id' => $id), $db);
 }
 

Dramiel.php

Spacing +7 added lines, -7 removed lines

@@ -139,7 +139,7 @@ 
 
 $discord->on(
     'ready',
-    function ($discord) use ($logger, $config, $primary, $plugins, $pluginsT) {
+    function($discord) use ($logger, $config, $primary, $plugins, $pluginsT) {
         // In here we can access any of the WebSocket events.
         //
         // There is a list of event constants that you can
@@ -162,21 +162,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();
@@ -199,7 +199,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");
@@ -240,7 +240,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');
@@ -248,7 +248,7 @@ 
 
         $discord->on(
             Event::MESSAGE_CREATE,
-            function ($message) use ($logger, $config, $primary, $plugins) {
+            function($message) use ($logger, $config, $primary, $plugins) {
 
                 $msgData = array(
                     'message' => array(

src/plugins/onMessage/auth.php

Spacing +19 added lines, -19 removed lines

@@ -70,7 +70,7 @@ 
      */
     public function onMessage($msgData, $message)
     {
-        $channelID = (int)$msgData['message']['channelID'];
+        $channelID = (int) $msgData['message']['channelID'];
 
         if (in_array($channelID, $this->excludeChannel, true)) {
             return null;
@@ -106,10 +106,10 @@ 
             }
 
             while ($rows = $result) {
-                $charID = (int)$rows['characterID'];
-                $id = (int)$rows['id'];
-                $corpID = (int)$rows['corporationID'];
-                $allianceID = (int)$rows['allianceID'];
+                $charID = (int) $rows['characterID'];
+                $id = (int) $rows['id'];
+                $corpID = (int) $rows['corporationID'];
+                $allianceID = (int) $rows['allianceID'];
 
                 //If corp is new store in DB
                 $corpInfo = getCorpInfo($corpID);
@@ -120,7 +120,7 @@ 
                         return null;
                     }
                     $corpTicker = $corpDetails['ticker'];
-                    $corpName = (string)$corpDetails['corporation_name'];
+                    $corpName = (string) $corpDetails['corporation_name'];
                     if (null !== $corpTicker) {
                         addCorpInfo($corpID, $corpTicker, $corpName);
                     }
@@ -152,15 +152,15 @@ 
                 }
                 foreach ($this->authGroups as $authGroup) {
                     //Check if it's set to match corp and alliance
-                    if ((int)$authGroup['corpID'] !== 0 && (int)$authGroup['allianceID'] !== 0) {
+                    if ((int) $authGroup['corpID'] !== 0 && (int) $authGroup['allianceID'] !== 0) {
                         //Check if corpID matches
-                        if ((int)$corpID === (int)$authGroup['corpID'] && (int)$allianceID === (int)$authGroup['allianceID']) {
+                        if ((int) $corpID === (int) $authGroup['corpID'] && (int) $allianceID === (int) $authGroup['allianceID']) {
                             foreach ($roles as $role) {
-                                if ((string)$role->name === (string)$authGroup['corpMemberRole']) {
+                                if ((string) $role->name === (string) $authGroup['corpMemberRole']) {
                                     $member->addRole($role);
                                     $role = 'corp/ally';
                                 }
-                                if ((string)$role->name === (string)$authGroup['allyMemberRole']) {
+                                if ((string) $role->name === (string) $authGroup['allyMemberRole']) {
                                     $member->addRole($role);
                                     $role = 'corp/ally';
                                 }
@@ -169,9 +169,9 @@ 
                         }
                     } else {
                         //Check if corpID matches
-                        if ((int)$corpID === (int)$authGroup['corpID']) {
+                        if ((int) $corpID === (int) $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';
                                 }
@@ -179,9 +179,9 @@ 
                             break;
                         }
                         //Check if allianceID matches
-                        if ((int)$allianceID === (int)$authGroup['allianceID'] && (int)$authGroup['allianceID'] !== 0) {
+                        if ((int) $allianceID === (int) $authGroup['allianceID'] && (int) $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';
                                 }
@@ -195,22 +195,22 @@ 
                     $allianceContacts = getContacts($allianceID);
                     $corpContacts = getContacts($corpID);
                     foreach ($roles as $role) {
-                        if ((@(int)$allianceContacts['standing'] === 5 || @(int)$corpContacts['standing'] === 5) && (string)$role->name === (string)$this->config['plugins']['auth']['standings']['plus5Role']) {
+                        if ((@(int) $allianceContacts['standing'] === 5 || @(int) $corpContacts['standing'] === 5) && (string) $role->name === (string) $this->config['plugins']['auth']['standings']['plus5Role']) {
                             $member->addRole($role);
                             $role = 'blue';
                             break;
                         }
-                        if ((@(int)$allianceContacts['standing'] === 10 || @(int)$corpContacts['standing'] === 10) && (string)$role->name === (string)$this->config['plugins']['auth']['standings']['plus10Role']) {
+                        if ((@(int) $allianceContacts['standing'] === 10 || @(int) $corpContacts['standing'] === 10) && (string) $role->name === (string) $this->config['plugins']['auth']['standings']['plus10Role']) {
                             $member->addRole($role);
                             $role = 'blue';
                             break;
                         }
-                        if ((@(int)$allianceContacts['standing'] === -5 || @(int)$corpContacts['standing'] === -5) && (string)$role->name === (string)$this->config['plugins']['auth']['standings']['minus5Role']) {
+                        if ((@(int) $allianceContacts['standing'] === -5 || @(int) $corpContacts['standing'] === -5) && (string) $role->name === (string) $this->config['plugins']['auth']['standings']['minus5Role']) {
                             $member->addRole($role);
                             $role = 'red';
                             break;
                         }
-                        if ((@(int)$allianceContacts['standing'] === -10 || @(int)$corpContacts['standing'] === -10) && (string)$role->name === (string)$this->config['plugins']['auth']['standings']['minus10Role']) {
+                        if ((@(int) $allianceContacts['standing'] === -10 || @(int) $corpContacts['standing'] === -10) && (string) $role->name === (string) $this->config['plugins']['auth']['standings']['minus10Role']) {
                             $member->addRole($role);
                             $role = 'red';
                             break;
@@ -218,7 +218,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;