updates gitignore

[ZNCAdmin.git] / zncadmin.php

diff --git a/zncadmin.php b/zncadmin.php
index 4949a10ccebc7022c73c737ac4b4c6c0877991ca..5b63e1e497b8e67f02a5b4b46c4b68649db02458 100644 (file)
--- a/zncadmin.php
+++ b/zncadmin.php
@@ -159,10 +159,10 @@ function zncadmin_search() {
     }
     $mask = preg_prepare($mask);
     $table = new Table(5);
-    $table->add("Server", "User", "Clients", "Server");
+    $table->add("Server", "User", "Clients", "Server", "");
     $count = 0;
     foreach($zncservers as $zncserver) {
-        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port']);
+        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port'], (isset($zncserver['version']) ? $zncserver['version'] : NULL));
         $zncserver['conn']->login($zncserver['auser'], $zncserver['apass']);
         foreach($zncserver['conn']->getUserList() as $user) {
             $skip = false;
@@ -209,7 +209,13 @@ function zncadmin_search() {
             }
             if($skip) continue;
             if(preg_match("#^".$mask."$#i", $user['user'])) {
-                $table->add($zncserver['name'], $user['user'], $user['clients'], $user['server']);
+                $extra = "";
+                if(isset($user['nick'])) {
+                    if($extra != "")
+                        $extra .= ", ";
+                    $extra .= "Nick: ".$user['nick'];
+                }
+                $table->add($zncserver['name'], $user['user'], $user['clients'], $user['server'], $extra);
                 $count++;
             }
         }
@@ -247,7 +253,7 @@ function zncadmin_seen() {
     $table->add("Server", "User", "Seen", "Info");
     $found = false;
     foreach($zncservers as $zncserver) {
-        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port']);
+        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port'], (isset($zncserver['version']) ? $zncserver['version'] : NULL));
         $zncserver['conn']->login($zncserver['auser'], $zncserver['apass']);
         foreach($zncserver['conn']->getSeenList() as $user) {
             if(preg_match("#^".$mask."$#i", $user['user']) && (($over_time && $user['seen_unix'] < $time) || (!$over_time && $user['seen_unix'] > $time))) {
@@ -277,7 +283,7 @@ function zncadmin_del() {
     foreach($zncservers as $zncserver) {
         if($argv[3] && (strtolower($argv[3]) != strtolower($zncserver['name']))) continue;
         if($username == strtolower($zncserver['auser'])) continue;
-        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port']);
+        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port'], (isset($zncserver['version']) ? $zncserver['version'] : NULL));
         $zncserver['conn']->login($zncserver['auser'], $zncserver['apass']);
         foreach($zncserver['conn']->getUserList() as $user) {
             if(strtolower($user['user']) == $username) {
@@ -320,7 +326,7 @@ function zncadmin_add() {
             error("Access denied\n");
             return;
         }
-        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port']);
+        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port'], (isset($zncserver['version']) ? $zncserver['version'] : NULL));
         $zncserver['conn']->login($zncserver['auser'], $zncserver['apass']);
         $zncserver['users'] = $zncserver['conn']->getUserList();
         $existing = false;
@@ -388,7 +394,7 @@ function zncadmin_resetpass() {
     foreach($zncservers as $zncserver) {
         if($argv[3] && (strtolower($argv[3]) != strtolower($zncserver['name']))) continue;
         if($username == strtolower($zncserver['auser'])) continue;
-        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port']);
+        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port'], (isset($zncserver['version']) ? $zncserver['version'] : NULL));
         $zncserver['conn']->login($zncserver['auser'], $zncserver['apass']);
         foreach($zncserver['conn']->getUserList() as $user) {
             if(strtolower($user['user']) == $username) {
@@ -446,7 +452,7 @@ function zncadmin_simul() {
     foreach($zncservers as $zncserver) {
         if($server && (strtolower($server) != strtolower($zncserver['name']))) continue;
         if($username == strtolower($zncserver['auser'])) continue;
-        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port']);
+        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port'], (isset($zncserver['version']) ? $zncserver['version'] : NULL));
         $zncserver['conn']->login($zncserver['auser'], $zncserver['apass']);
         foreach($zncserver['conn']->getUserList() as $user) {
             if(strtolower($user['user']) == $username) {
@@ -489,7 +495,7 @@ function zncadmin_block() {
     foreach($zncservers as $zncserver) {
         if($server && (strtolower($server) != strtolower($zncserver['name']))) continue;
         if($username == strtolower($zncserver['auser'])) continue;
-        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port']);
+        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port'], (isset($zncserver['version']) ? $zncserver['version'] : NULL));
         $zncserver['conn']->login($zncserver['auser'], $zncserver['apass']);
         foreach($zncserver['conn']->getUserList() as $user) {
             if(strtolower($user['user']) == $username) {
@@ -532,7 +538,7 @@ function zncadmin_unblock() {
     foreach($zncservers as $zncserver) {
         if($server && (strtolower($server) != strtolower($zncserver['name']))) continue;
         if($username == strtolower($zncserver['auser'])) continue;
-        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port']);
+        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port'], (isset($zncserver['version']) ? $zncserver['version'] : NULL));
         $zncserver['conn']->login($zncserver['auser'], $zncserver['apass']);
         foreach($zncserver['conn']->getUserList() as $user) {
             if(strtolower($user['user']) == $username) {
@@ -572,7 +578,7 @@ function zncadmin_stats() {
         $total = 0;
         $connected = 0;
         $online = 0;
-        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port']);
+        $zncserver['conn'] = new ZNCServer($zncserver['host'], $zncserver['port'], (isset($zncserver['version']) ? $zncserver['version'] : NULL));
         $zncserver['conn']->login($zncserver['auser'], $zncserver['apass']);
         foreach($zncserver['conn']->getUserList() as $user) {
             if($user['server'] != "-N/A-") $connected++;