patch

Author: JABirchall

app/Plugin.php

@@ -162,11 +162,10 @@ static function sortByLengthDESC($array)
      */
     function sendOutput($text, ...$params)
     {
-
         $text = vsprintf($text, $params);
 
         try {
-            $client = $this->teamSpeak3Bot->node->clientGetById($this->info['invokerid']?$this->info['invokerid']:$this->info['clid']);
+            $client = $this->teamSpeak3Bot->node->clientGetById(@$this->info['invokerid']?$this->info['invokerid']:$this->info['clid']);
 
             if (\App\TeamSpeak3Bot::$config['newLineNewMessage'] === false) {
                $client->message($text);

app/TeamSpeak3Bot.php

@@ -138,7 +138,7 @@ public function __construct($username, $password, $host = "127.0.0.1", $port = 1
 
        if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN' && posix_getuid() === 0) {
            $this->printOutput("[WARNING] Running Nimda as root is bad!");
-           $this->printOutput("Start anyway? Y/N:", false, true);
+           $this->printOutput("Start anyway? Y/N:", false);
            $response = rtrim(fgets(STDIN));
            if (strcasecmp($response,'y')) {
                $this->printOutput("Aborted.");
@@ -148,7 +148,7 @@ public function __construct($username, $password, $host = "127.0.0.1", $port = 1
 
        if($username === "serveradmin") {
            $this->printOutput("[WARNING] Running Nimda logged in as serveradmin is bad!");
-           $this->printOutput("Start anyway? Y/N:", false, true);
+           $this->printOutput("Start anyway? Y/N:", false);
            $response = rtrim(fgets(STDIN));
            if (strcasecmp($response,'y') ) {
                $this->printOutput("Aborted.");
@@ -176,8 +176,7 @@ public function run()
 
         $this->subscribe();
         try {
-            $this->node = TeamSpeak3::factory("serverquery://{$this->username}:{$this->password}@{$this->host}:{$this->port}/".
-                "?server_port={$this->serverPort}&blocking=0&nickname={$this->name}&timeout={$this->timeout}");
+            $this->node = TeamSpeak3::factory("serverquery://{$this->username}:{$this->password}@{$this->host}:{$this->port}/?server_port={$this->serverPort}&blocking=0&nickname={$this->name}&timeout={$this->timeout}&no_query_clients=1");
         } catch (Ts3Exception $e) {
             $this->onException($e);
 
@@ -202,7 +201,7 @@ protected function subscribe()
         Signal::getInstance()->subscribe("serverqueryConnected", [$this, "onConnect"]);
         Signal::getInstance()->subscribe("notifyTextmessage", [$this, "onMessage"]);
         Signal::getInstance()->subscribe("notifyEvent", [$this, "onEvent"]);
-        Signal::getInstance()->subscribe("errorException", [$this, "onException"]);
+        //Signal::getInstance()->subscribe("errorException", [$this, "onException"]);
         Signal::getInstance()->subscribe("serverqueryDisconnected", [$this, "onDisconnect"]);
     }
 
@@ -220,21 +219,20 @@ protected function register()
      * @param $eol
      * @param $send
      */
-    public function printOutput($output, $eol = true, $send = false)
+    public function printOutput($output, $eol = true, $send = true)
     {
-        if(empty($this->text)) {
-            $this->text = sprintf("[%s]: %s ", $this->carbon->now()->toTimeString(), $output);
+        if(!ob_get_contents()) {
+            ob_start(null, 1024);
+            printf("[%s]: %s ", $this->carbon->now()->toTimeString(), $output);
         } else {
-            $this->text .= $output;
+            echo $output;
         }
         if ($eol) {
-            echo  $this->text . PHP_EOL;
-            $this->text = (unset)$this->text;
+            echo PHP_EOL;
         }
 
         if($send) {
-            echo  $this->text;
-            $this->text = (unset)$this->text;
+            ob_end_flush();
         }
     }
 
@@ -301,10 +299,13 @@ private function setup()
                 'name' => 'Nimda',
                 'version' => $this::NIMDA_VERSION,
             ]);
-        } elseif (version_compare(($nimda = Plugin::where('name', 'Nimda')->first())->version, $this::NIMDA_VERSION, '<')) {
-            $this->update($nimda->version);
+        } else {
+            $nimda = Plugin::where('name', 'Nimda')->first();
+            if (version_compare($nimda->version, $this::NIMDA_VERSION, '<')) {
+                $this->update($nimda->version);
 
-            $nimda->update(['version' => $this::NIMDA_VERSION]);
+                $nimda->update(['version' => $this::NIMDA_VERSION]);
+            }
         }
     }
 
@@ -335,12 +336,12 @@ private function loadPlugin($configFile)
 
             return false;
         } elseif (!isset($config['name'])) {
-            $this->printOutput("Plugin with config file {$configFile} has not been loaded because it has no name.");
+            $this->printOutput("Plugin with config file {$configFile} has not been loaded because it has no name.") ;
 
             return false;
         }
 
-        $this->printOutput(sprintf("%- 80s %s", "Loading plugin [{$config['name']}] by {$config['author']} ", "::"), false);
+        $this->printOutput(sprintf("%- 80s %s", "Loading plugin [{$config['name']}] by {$config['author']} ", "::"), false, false);
 
         $config['class'] = \Plugin::class . '\\' . $config['name'];
 
@@ -445,7 +446,7 @@ public function onMessage(Event $event)
     public function onEvent(Event $event)
     {
         $data = $event->getData();
-        if (@$data['invokername'] == $this->name || @$data['invokeruid'] == 'serveradmin') {
+        if (@$data['invokername'] == $this->name || @$data['invokeruid'] == 'serveradmin' || @$data["client_unique_identifier"] == "ServerQuery") {
             return;
         } elseif ($this->lastEvent && $event->getMessage()->contains($this->lastEvent)) {
             return;
@@ -476,7 +477,7 @@ public function onEvent(Event $event)
 
     public function onTimeout($time, AbstractAdapter $adapter)
     {
-        if ($adapter->getQueryLastTimestamp() < time() - 120) {
+        if ($adapter->getQueryLastTimestamp() < $this->carbon->now()->subSeconds(120)) {
             $adapter->request("clientupdate");
         }
 

plugins/WelcomeMsg.php

@@ -14,8 +14,7 @@ public function isTriggered()
         $this->server = $this->teamSpeak3Bot->node;
 
         $client = $this->server->clientGetById($this->info['clid']);
-        $clientDbId = current($this->server->clientFindDb($client['client_nickname']));
-        $clientInfo = $this->server->clientInfoDb($clientDbId);
+        $clientInfo = $this->server->clientInfoDb($this->server->clientFindDb($client['client_nickname']));
 
         $format = [
             "%CL_DATABASE_ID%"      => $clientInfo["client_database_id"],