shibdib / Dramiel

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

src/plugins/onTick/authCheck.php

Braces +23 added lines, -14 removed lines

@@ -177,8 +177,9 @@ 
             for ($i=0; $i<3; $i++) {
                 $character = characterDetails($charID);
                 //if (isset($character['corporation_id']) && in_array($character['corporation_id'], $corpArray))
-                if (!is_null($character))
-                    break;
+                if (!is_null($character)) {
+                                    break;
+                }
                 //Postpone check if ESI is down to prevent timeouts
                 if (isset($character['error']) && $character['error'] === 'The datasource tranquility is temporarily unavailable') {
                     $this->logger->addInfo('AuthCheck: The datasource tranquility is temporarily unavailable, check canceled.');
@@ -197,8 +198,9 @@ 
             // alliance membership check
             for ($i=0; $i<3; $i++) {
                 $corporationDetails = corpDetails($corporationID);
-                if (!is_null($corporationDetails))
-                    break;
+                if (!is_null($corporationDetails)) {
+                                    break;
+                }
             }
             if (is_null($corporationDetails) || isset($corporationDetails['error'])) {
                 $this->logger->addInfo('AuthCheck: corpDetails lookup failed.');
@@ -223,8 +225,10 @@ 
                     $standings = 1;
                 }
             }
-            if ($standings)
-                continue; //keep the user based on standings
+            if ($standings) {
+                            continue;
+            }
+            //keep the user based on standings
 
             // User failed all checks, deactivate user in database
             $sql = "UPDATE authUsers SET active='no' WHERE discordID='$discordID'";
@@ -294,8 +298,10 @@ 
 
             } while (!isset($character['corporation_id']));
             $corporationID = $character['corporation_id'];
-            if (in_array($corporationID, $corpArray))
-                continue; // user is in a valid corp, stop checking
+            if (in_array($corporationID, $corpArray)) {
+                            continue;
+            }
+            // user is in a valid corp, stop checking
 
             $timeout = 0;
             do {
@@ -306,8 +312,10 @@ 
                 $timeout++;
                 $corporationDetails = corpDetails($corporationID);
             } while (!isset($corporationDetails));
-            if (isset($corporationDetails['alliance_id']) && in_array($corporationDetails['alliance_id'], $allianceArray))
-                continue; // user is in a valid alliance, stop checking
+            if (isset($corporationDetails['alliance_id']) && in_array($corporationDetails['alliance_id'], $allianceArray)) {
+                            continue;
+            }
+            // user is in a valid alliance, stop checking
 
             //check if user authed based on standings
             $standings = null;
@@ -324,8 +332,10 @@ 
                     $standings = 1;
                 }
             }
-            if ($standings)
-                continue; //keep the user based on standings
+            if ($standings) {
+                            continue;
+            }
+            //keep the user based on standings
 
             // User failed all checks, deactivate user in database
             $sql = "UPDATE authUsers SET active='no' WHERE discordID='$discordID'";
@@ -467,8 +477,7 @@ 
                     while (null === $character) { //try 10 times to pull characterDetails
                         if ($timeout > 9) {
                             continue;
-                        }
-                        else{
+                        } else{
                             $character = characterDetails($charID);
                             $timeout++;
                         }