shibdib / Dramiel

src/plugins/onTick/evemails.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,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/notifications.php

Spacing +1 added lines, -1 removed lines

@@ -125,7 +125,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/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/getKillmails.php

Spacing +1 added lines, -1 removed lines

@@ -197,7 +197,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

Indentation +136 added lines, -136 removed lines

@@ -146,7 +146,7 @@ 
         $conn = new mysqli($this->db, $this->dbUser, $this->dbPass, $this->dbName);
 
         //$sql = "SELECT characterID, discordID, eveName, role FROM authUsers WHERE active='yes'";
-		$sql = "SELECT characterID, discordID, eveName, active, role FROM authUsers";
+        $sql = "SELECT characterID, discordID, eveName, active, role FROM authUsers";
 
         $result = $conn->query($sql);
 
@@ -175,130 +175,130 @@ 
 
         if ($result->num_rows >= 1) {
             while ($rows = $result->fetch_assoc()) {
-				$charID = $rows['characterID'];
-				$discordID = $rows['discordID'];
-				$role = $rows['role'];
-				$member = $guild->members->get('id', $discordID);
-				$eveName = $rows['eveName'];
-				//Check if member has roles
-				if (null === @$member->roles) {
-					continue;
-				}
-
-				//Auth things
-				$character = characterDetails($charID);
-				//if issue with esi, skip
-				$timeout = 0;
-				while (null === $character) { //try 10 times to pull characterDetails
-					if ($timeout > 9) {
-						continue;
-					}
-					else{
-						$character = characterDetails($charID);
-						$timeout++;
-					}
-				}
-				$corporationID = $character['corporation_id'];
-				$corporationDetails = corpDetails($corporationID);
-				$timeout = 0;
-				while (null === $corporationDetails) { //try 10 times to pull corporationDetails
-					if ($timeout > 9) {
-						continue;
-					}
-					else{
-						$corporationDetails = corpDetails($corporationID);
-						$timeout++;
-					}
-				}
-				$allianceID = @$corporationDetails['alliance_id'];
-				if ($rows['active'] == "yes"){
-
-					//check if user authed based on standings
-					$standings = null;
-					if ($role === 'blue' || 'neut' || 'red') {
-						$allianceContacts = getContacts($allianceID);
-						$corpContacts = getContacts($corporationID);
-						if ($role === 'blue' && ((int) $allianceContacts['standing'] === 5 || 10 || (int) $corpContacts['standing'] === 5 || 10)) {
-							$standings = 1;
-						}
-						if ($role === 'red' && ((int) $allianceContacts['standing'] === -5 || -10 || (int) $corpContacts['standing'] === -5 || -10)) {
-							$standings = 1;
-						}
-						if ($role === 'neut' && ((int) $allianceContacts['standing'] === 0 || (int) $corpContacts['standing'] === 0 || (@(int) $allianceContacts['standings'] === null || '' && @(int) $corpContacts['standings'] === null || ''))) {
-							$standings = 1;
-						}
-					}
-					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.");
-						$conn->query($sql);
-						continue;
-					}
-				}
-				elseif($rows['active'] == "no") {
-					$roles = @$guild->roles;
-					$member = @$guild->members->get('id', $discordID);
-					if (in_array((int) $allianceID, $allianceArray) || in_array((int) $corporationID, $corpArray)) {
-						foreach ($this->authGroups as $authGroup) {
-							//Check if it's set to match corp and alliance
-							if ($authGroup['corpID'] !== 0 && $authGroup['allianceID'] !== 0) {
-								//Check if corpID matches
-								if ($corpID === $authGroup['corpID'] && $allianceID === $authGroup['allianceID']) {
-									foreach ($roles as $role) {
-										if ((string) $role->name === (string) $authGroup['corpMemberRole']) {
-											$member->addRole($role);
-										}
-										if ((string) $role->name === (string) $authGroup['allyMemberRole']) {
-											$member->addRole($role);
-											$role = 'corp/ally';
-											$guild->members->save($member);
-											// Deactivate user in database
-											$sql = "UPDATE authUsers SET active='yes' WHERE discordID='$discordID'";
-											$this->logger->addInfo("AuthCheck: {$eveName} account has been activates as they are in correct corp/alliance.");
-											$conn->query($sql);
-										}
-									}
-									break;
-								}
-							} elseif ($authGroup['corpID'] !== 0 || $authGroup['allianceID'] !== 0) {
-								//Check if corpID matches
-								if ($corpID === $authGroup['corpID']) {
-									foreach ($roles as $role) {
-										if ((string) $role->name === (string) $authGroup['corpMemberRole']) {
-											$member->addRole($role);
-											$role = 'corp';
-											$guild->members->save($member);
-											// Deactivate user in database
-											$sql = "UPDATE authUsers SET active='yes' WHERE discordID='$discordID'";
-											$this->logger->addInfo("AuthCheck: {$eveName} account has been deactivated as they are in correct corp/alliance.");
-											$conn->query($sql);
-										}
-									}
-									break;
-								}
-								//Check if allianceID matches
-								if ($allianceID === $authGroup['allianceID'] && $authGroup['allianceID'] !== 0) {
-									foreach ($roles as $role) {
-										if ((string) $role->name === (string) $authGroup['allyMemberRole']) {
-											$member->addRole($role);
-											$role = 'ally';
-											$guild->members->save($member);
-											// Deactivate user in database
-											$sql = "UPDATE authUsers SET active='yes' WHERE discordID='$discordID'";
-											$this->logger->addInfo("AuthCheck: {$eveName} account has been deactivated as they are in correct corp/alliance.");
-											$conn->query($sql);
-										}
-									}
-									break;
-								}
-							}
-						}
-					}
-				}
-				$nextCheck = time() + 10800;
-				setPermCache('permsLastChecked', $nextCheck);
-			}
+                $charID = $rows['characterID'];
+                $discordID = $rows['discordID'];
+                $role = $rows['role'];
+                $member = $guild->members->get('id', $discordID);
+                $eveName = $rows['eveName'];
+                //Check if member has roles
+                if (null === @$member->roles) {
+                    continue;
+                }
+
+                //Auth things
+                $character = characterDetails($charID);
+                //if issue with esi, skip
+                $timeout = 0;
+                while (null === $character) { //try 10 times to pull characterDetails
+                    if ($timeout > 9) {
+                        continue;
+                    }
+                    else{
+                        $character = characterDetails($charID);
+                        $timeout++;
+                    }
+                }
+                $corporationID = $character['corporation_id'];
+                $corporationDetails = corpDetails($corporationID);
+                $timeout = 0;
+                while (null === $corporationDetails) { //try 10 times to pull corporationDetails
+                    if ($timeout > 9) {
+                        continue;
+                    }
+                    else{
+                        $corporationDetails = corpDetails($corporationID);
+                        $timeout++;
+                    }
+                }
+                $allianceID = @$corporationDetails['alliance_id'];
+                if ($rows['active'] == "yes"){
+
+                    //check if user authed based on standings
+                    $standings = null;
+                    if ($role === 'blue' || 'neut' || 'red') {
+                        $allianceContacts = getContacts($allianceID);
+                        $corpContacts = getContacts($corporationID);
+                        if ($role === 'blue' && ((int) $allianceContacts['standing'] === 5 || 10 || (int) $corpContacts['standing'] === 5 || 10)) {
+                            $standings = 1;
+                        }
+                        if ($role === 'red' && ((int) $allianceContacts['standing'] === -5 || -10 || (int) $corpContacts['standing'] === -5 || -10)) {
+                            $standings = 1;
+                        }
+                        if ($role === 'neut' && ((int) $allianceContacts['standing'] === 0 || (int) $corpContacts['standing'] === 0 || (@(int) $allianceContacts['standings'] === null || '' && @(int) $corpContacts['standings'] === null || ''))) {
+                            $standings = 1;
+                        }
+                    }
+                    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.");
+                        $conn->query($sql);
+                        continue;
+                    }
+                }
+                elseif($rows['active'] == "no") {
+                    $roles = @$guild->roles;
+                    $member = @$guild->members->get('id', $discordID);
+                    if (in_array((int) $allianceID, $allianceArray) || in_array((int) $corporationID, $corpArray)) {
+                        foreach ($this->authGroups as $authGroup) {
+                            //Check if it's set to match corp and alliance
+                            if ($authGroup['corpID'] !== 0 && $authGroup['allianceID'] !== 0) {
+                                //Check if corpID matches
+                                if ($corpID === $authGroup['corpID'] && $allianceID === $authGroup['allianceID']) {
+                                    foreach ($roles as $role) {
+                                        if ((string) $role->name === (string) $authGroup['corpMemberRole']) {
+                                            $member->addRole($role);
+                                        }
+                                        if ((string) $role->name === (string) $authGroup['allyMemberRole']) {
+                                            $member->addRole($role);
+                                            $role = 'corp/ally';
+                                            $guild->members->save($member);
+                                            // Deactivate user in database
+                                            $sql = "UPDATE authUsers SET active='yes' WHERE discordID='$discordID'";
+                                            $this->logger->addInfo("AuthCheck: {$eveName} account has been activates as they are in correct corp/alliance.");
+                                            $conn->query($sql);
+                                        }
+                                    }
+                                    break;
+                                }
+                            } elseif ($authGroup['corpID'] !== 0 || $authGroup['allianceID'] !== 0) {
+                                //Check if corpID matches
+                                if ($corpID === $authGroup['corpID']) {
+                                    foreach ($roles as $role) {
+                                        if ((string) $role->name === (string) $authGroup['corpMemberRole']) {
+                                            $member->addRole($role);
+                                            $role = 'corp';
+                                            $guild->members->save($member);
+                                            // Deactivate user in database
+                                            $sql = "UPDATE authUsers SET active='yes' WHERE discordID='$discordID'";
+                                            $this->logger->addInfo("AuthCheck: {$eveName} account has been deactivated as they are in correct corp/alliance.");
+                                            $conn->query($sql);
+                                        }
+                                    }
+                                    break;
+                                }
+                                //Check if allianceID matches
+                                if ($allianceID === $authGroup['allianceID'] && $authGroup['allianceID'] !== 0) {
+                                    foreach ($roles as $role) {
+                                        if ((string) $role->name === (string) $authGroup['allyMemberRole']) {
+                                            $member->addRole($role);
+                                            $role = 'ally';
+                                            $guild->members->save($member);
+                                            // Deactivate user in database
+                                            $sql = "UPDATE authUsers SET active='yes' WHERE discordID='$discordID'";
+                                            $this->logger->addInfo("AuthCheck: {$eveName} account has been deactivated as they are in correct corp/alliance.");
+                                            $conn->query($sql);
+                                        }
+                                    }
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+                $nextCheck = time() + 10800;
+                setPermCache('permsLastChecked', $nextCheck);
+            }
         }
         $nextCheck = time() + 10800;
         setPermCache('permsLastChecked', $nextCheck);
@@ -449,17 +449,17 @@ 
 
                 //corp ticker
                 if ($this->corpTickers === 'true') {
-					$timeout = 0;
-					$character = characterDetails($charID);
-					while (null === $character) { //try 10 times to pull characterDetails
-						if ($timeout > 9) {
-							continue;
-						}
-						else{
-							$character = characterDetails($charID);
-							$timeout++;
-						}
-					}
+                    $timeout = 0;
+                    $character = characterDetails($charID);
+                    while (null === $character) { //try 10 times to pull characterDetails
+                        if ($timeout > 9) {
+                            continue;
+                        }
+                        else{
+                            $character = characterDetails($charID);
+                            $timeout++;
+                        }
+                    }
                     if (!array_key_exists('corporation_id', $character)) {
                         continue;
                     }

Spacing +5 added lines, -5 removed lines

@@ -193,7 +193,7 @@ 
 					if ($timeout > 9) {
 						continue;
 					}
-					else{
+					else {
 						$character = characterDetails($charID);
 						$timeout++;
 					}
@@ -205,13 +205,13 @@ 
 					if ($timeout > 9) {
 						continue;
 					}
-					else{
+					else {
 						$corporationDetails = corpDetails($corporationID);
 						$timeout++;
 					}
 				}
 				$allianceID = @$corporationDetails['alliance_id'];
-				if ($rows['active'] == "yes"){
+				if ($rows['active'] == "yes") {
 
 					//check if user authed based on standings
 					$standings = null;
@@ -236,7 +236,7 @@ 
 						continue;
 					}
 				}
-				elseif($rows['active'] == "no") {
+				elseif ($rows['active'] == "no") {
 					$roles = @$guild->roles;
 					$member = @$guild->members->get('id', $discordID);
 					if (in_array((int) $allianceID, $allianceArray) || in_array((int) $corporationID, $corpArray)) {
@@ -455,7 +455,7 @@ 
 						if ($timeout > 9) {
 							continue;
 						}
-						else{
+						else {
 							$character = characterDetails($charID);
 							$timeout++;
 						}

Braces +4 added lines, -8 removed lines

@@ -192,8 +192,7 @@ 
 				while (null === $character) { //try 10 times to pull characterDetails
 					if ($timeout > 9) {
 						continue;
-					}
-					else{
+					} else{
 						$character = characterDetails($charID);
 						$timeout++;
 					}
@@ -204,8 +203,7 @@ 
 				while (null === $corporationDetails) { //try 10 times to pull corporationDetails
 					if ($timeout > 9) {
 						continue;
-					}
-					else{
+					} else{
 						$corporationDetails = corpDetails($corporationID);
 						$timeout++;
 					}
@@ -235,8 +233,7 @@ 
 						$conn->query($sql);
 						continue;
 					}
-				}
-				elseif($rows['active'] == "no") {
+				} elseif($rows['active'] == "no") {
 					$roles = @$guild->roles;
 					$member = @$guild->members->get('id', $discordID);
 					if (in_array((int) $allianceID, $allianceArray) || in_array((int) $corporationID, $corpArray)) {
@@ -454,8 +451,7 @@ 
 					while (null === $character) { //try 10 times to pull characterDetails
 						if ($timeout > 9) {
 							continue;
-						}
-						else{
+						} else{
 							$character = characterDetails($charID);
 							$timeout++;
 						}