some changes

[ZNCAdmin.git] / zncadmin / ZNCServer.class.php

diff --git a/zncadmin/ZNCServer.class.php b/zncadmin/ZNCServer.class.php
index bc5093b9ad9fd76ab40460ff15eb9f37d839cab3..3964875a3bc9904cfb2de10c29c2bdf3f3410e75 100644 (file)
--- a/zncadmin/ZNCServer.class.php
+++ b/zncadmin/ZNCServer.class.php
@@ -127,9 +127,6 @@ class ZNCServer {
         
         if(!preg_match("/Invalid Submission/i", $html)) {
             if(!$this->addNetwork($username, $settings, $servers, $other)) {
-                $handle = fopen('/home/srvx/neonserv/log.txt', 'a');
-                fwrite($handle, "addZNC3\r\n");
-                fclose($handle);
                 return false;
             }
             return !preg_match("/Invalid Submission/i", $html);
@@ -324,8 +321,12 @@ class ZNCServer {
     
     public function blockZNC($username, $block) {
         $html = $this->connector->get("http://".$this->host.":".$this->port."/mods/global/webadmin/edituser?user=".$username);
+        $handle = fopen('/home/srvx/neonserv/log.txt', 'a');
+        fwrite($handle, "$html\r\n");
+        fclose($handle);
         if(preg_match("/No such username/i", $html)) return ERR_USER_NOT_FOUND;
         $post = array();
+        $post['user'] = $username;
         $post['loadmod'] = array();
         $this->parseHTMLFields($html, $post);
         if(!$post['embed_blockuser_presented']) return ERR_MODULE_NOT_FOUND;
@@ -334,7 +335,10 @@ class ZNCServer {
         if(!$block) {
             $post['doconnect'] = 1;
         }
-        $html = $this->connector->post("http://".$this->host.":".$this->port."/mods/global/webadmin/edituser?user=".$username, $post);
+        $html = $this->connector->post("http://".$this->host.":".$this->port."/mods/global/webadmin/edituser", $post);
+        $handle = fopen('/home/srvx/neonserv/log.txt', 'a');
+        fwrite($handle, "$html\r\n");
+        fclose($handle);
         return (preg_match("/Invalid Submission/i", $html) ? ERR_UNKNOWN : ERR_OK);
     }
     
@@ -347,10 +351,10 @@ class ZNCServer {
         $post = array();
         $post['_CSRF_Check'] = $csrf;
         $post['submitted'] = '1';
-        $post['user'] = $username;
+        $post['network'] = $username.'/default';
         $post['send_to'] = ($server ? "server" : "client");
         $post['line'] = $raw;
-        $this->connector->post("http://".$this->host.":".$this->port."/mods/user/send_raw/", $post);
+        $html = $this->connector->post("http://".$this->host.":".$this->port."/mods/user/send_raw/", $post);
         return ERR_OK;
     }