X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=zncadmin%2FZNCServer.class.php;h=d019be005b9925b292bb6ab19a093993e5ff6537;hb=b35aabd3a108d88fb6c64319c42a19d0d49a7d15;hp=35724a1c1994628cfa283a2a8c4b84872a71ce1c;hpb=68a600683c091740094edc47f27286e9719f644a;p=ZNCAdmin.git
diff --git a/zncadmin/ZNCServer.class.php b/zncadmin/ZNCServer.class.php
index 35724a1..d019be0 100644
--- a/zncadmin/ZNCServer.class.php
+++ b/zncadmin/ZNCServer.class.php
@@ -16,6 +16,11 @@
* along with this program. If not, see .
*/
+define("ERR_OK", 0);
+define("ERR_UNKNOWN", 1);
+define("ERR_MODULE_NOT_FOUND", 2);
+define("ERR_USER_NOT_FOUND", 3);
+
class ZNCServer {
private $host, $port;
private $connector;
@@ -40,7 +45,7 @@ class ZNCServer {
}
public function getUserList() {
- $html = $this->connector->get("http://".$this->host.":".$this->port."/mods/webadmin/listusers");
+ $html = $this->connector->get("http://".$this->host.":".$this->port."/mods/global/webadmin/listusers");
$exp = explode('
', $html);
$exp = explode('
', $exp[1]);
$exp = explode('', $exp[0]);
@@ -64,7 +69,7 @@ class ZNCServer {
}
public function getSeenList() {
- $html = $this->connector->get("http://".$this->host.":".$this->port."/mods/lastseen/");
+ $html = $this->connector->get("http://".$this->host.":".$this->port."/mods/global/lastseen/");
$exp = explode('', $html);
$exp = explode('
', $exp[1]);
$exp = explode('', $exp[0]);
@@ -94,7 +99,7 @@ class ZNCServer {
ident
*/
public function addZNC($username, $password, $settings, $servers, $modules, $others) {
- $html = $this->connector->get("http://".$this->host.":".$this->port."/mods/webadmin/adduser");
+ $html = $this->connector->get("http://".$this->host.":".$this->port."/mods/global/webadmin/adduser");
$exp = explode('name="_CSRF_Check" value="', $html);
$exp = explode('"', $exp[1]);
$csrf = $exp[0];
@@ -119,12 +124,12 @@ class ZNCServer {
foreach($others as $name => $value) {
$post[$name] = $value;
}
- $html = $this->connector->post("http://".$this->host.":".$this->port."/mods/webadmin/adduser", $post);
+ $html = $this->connector->post("http://".$this->host.":".$this->port."/mods/global/webadmin/adduser", $post);
return !preg_match("/Invalid Submission/i", $html);
}
public function delZNC($username) {
- $html = $this->connector->get("http://".$this->host.":".$this->port."/mods/webadmin/deluser?user=".$username);
+ $html = $this->connector->get("http://".$this->host.":".$this->port."/mods/global/webadmin/deluser?user=".$username);
$exp = explode('name="_CSRF_Check" value="', $html);
$exp = explode('"', $exp[1]);
$csrf = $exp[0];
@@ -132,14 +137,10 @@ class ZNCServer {
$post['_CSRF_Check'] = $csrf;
$post['submitted'] = '1';
$post['user'] = $username;
- $this->connector->post("http://".$this->host.":".$this->port."/mods/webadmin/deluser", $post);
+ $this->connector->post("http://".$this->host.":".$this->port."/mods/global/webadmin/deluser", $post);
}
- public function editZNC($username, $password = NULL, $new_servers = NULL, $add_modules = NULL, $del_modules = NULL, $others = NULL) {
- $html = $this->connector->get("http://".$this->host.":".$this->port."/mods/webadmin/edituser?user=".$username);
- if(preg_match("/No such username/i", $html)) return false;
- $post = array();
- $post['loadmod'] = array();
+ private function parseHTMLFields($html, &$post) {
preg_match_all("]*)>", $html, $matches);
foreach($matches[0] as $input) {
$fields = array(0 => "");
@@ -208,6 +209,58 @@ class ZNCServer {
$content = $content[0];
$post[$name] = $content;
}
+ //select boxes
+ $selectboxes = explode("]*)>", $content, $matches);
+ foreach($matches[0] as $input) {
+ $fields = array(0 => "");
+ $esc = false; $str = false;
+ $fieldid = 0;
+ for($i = 0; $i < strlen($input); $i++) {
+ if($esc) {
+ $esc = false;
+ $fields[$fieldid] .= $input[$i];
+ continue;
+ }
+ if($input[$i] == "\\") {
+ $esc = true;
+ }
+ if($input[$i] == "\"") {
+ $str = !$str;
+ continue;
+ }
+ if($input[$i] == " " && !$str) {
+ $fields[++$fieldid] = "";
+ continue;
+ }
+ $fields[$fieldid] .= $input[$i];
+ }
+ $cfields = array();
+ foreach($fields as $field) {
+ $fieldexp = explode("=", $field, 2);
+ if(count($fieldexp) != 2) continue;
+ $cfields[$fieldexp[0]] = $fieldexp[1];
+ }
+ if(!$post[$name] || $cfields['selected']) {
+ $post[$name] = $cfields['value'];
+ }
+ }
+ }
+ }
+
+ public function editZNC($username, $password = NULL, $new_servers = NULL, $add_modules = NULL, $del_modules = NULL, $others = NULL) {
+ $html = $this->connector->get("http://".$this->host.":".$this->port."/mods/global/webadmin/edituser?user=".$username);
+ if(preg_match("/No such username/i", $html)) return false;
+ $post = array();
+ $post['loadmod'] = array();
+ $this->parseHTMLFields($html, $post);
if($password) {
$post['password'] = $password;
$post['password2'] = $password;
@@ -229,13 +282,29 @@ class ZNCServer {
foreach($others as $name => $value) {
$post[$name] = $value;
}
- $html = $this->connector->post("http://".$this->host.":".$this->port."/mods/webadmin/edituser?user=".$username, $post);
+ $html = $this->connector->post("http://".$this->host.":".$this->port."/mods/global/webadmin/edituser?user=".$username, $post);
return !preg_match("/Invalid Submission/i", $html);
}
- public function simulZNC($username, $raw, $server = true) {
- $html = $this->connector->get("http://".$this->host.":".$this->port."/mods/send_raw/");
- if(preg_match("/Not Found/i", $html)) return false;
+ public function blockZNC($username, $block) {
+ $html = $this->connector->get("http://".$this->host.":".$this->port."/mods/global/webadmin/edituser?user=".$username);
+ if(preg_match("/No such username/i", $html)) return ERR_USER_NOT_FOUND;
+ $post = array();
+ $post['loadmod'] = array();
+ $this->parseHTMLFields($html, $post);
+ if(!$post['embed_blockuser_presented']) return ERR_MODULE_NOT_FOUND;
+ if(!($post['embed_blockuser_block'] xor $block)) return ERR_OK;
+ $post['embed_blockuser_block'] = ($block ? "1" : null);
+ if(!$block) {
+ $post['doconnect'] = 1;
+ }
+ $html = $this->connector->post("http://".$this->host.":".$this->port."/mods/global/webadmin/edituser?user=".$username, $post);
+ return (preg_match("/Invalid Submission/i", $html) ? ERR_UNKNOWN : ERR_OK);
+ }
+
+ public function simulZNC($username, $raw, &$errmsg, $server = true) {
+ $html = $this->connector->get("http://".$this->host.":".$this->port."/mods/user/send_raw/");
+ if(preg_match("/Not Found/i", $html)) return ERR_MODULE_NOT_FOUND;
$exp = explode('name="_CSRF_Check" value="', $html);
$exp = explode('"', $exp[1]);
$csrf = $exp[0];
@@ -245,11 +314,12 @@ class ZNCServer {
$post['user'] = $username;
$post['send_to'] = ($server ? "server" : "client");
$post['line'] = $raw;
- $this->connector->post("http://".$this->host.":".$this->port."/mods/send_raw/", $post);
+ $this->connector->post("http://".$this->host.":".$this->port."/mods/user/send_raw/", $post);
+ return ERR_OK;
}
public function addChan($username, $channel, $key = NULL, $buffer = NULL) {
- $html = $this->connector->get("http://".$this->host.":".$this->port."/mods/webadmin/addchan?user=".$username);
+ $html = $this->connector->get("http://".$this->host.":".$this->port."/mods/global/webadmin/addchan?user=".$username);
if(preg_match("/No such username/i", $html)) return false;
$exp = explode('name="_CSRF_Check" value="', $html);
$exp = explode('"', $exp[1]);
@@ -268,7 +338,7 @@ class ZNCServer {
$default_buffer = $exp[0];
$post['buffercount'] = ($buffer ? $buffer : $default_buffer);
$post['save'] = 'true';
- $this->connector->post("http://".$this->host.":".$this->port."/mods/webadmin/addchan?user=".$username, $post);
+ $this->connector->post("http://".$this->host.":".$this->port."/mods/global/webadmin/addchan?user=".$username, $post);
}
}