projects
/
ZNCAdmin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
35d6cfe
)
added possibility to skip version detection
author
pk910
<philipp@zoelle1.de>
Sat, 29 Jun 2013 22:43:43 +0000
(
00:43
+0200)
committer
pk910
<philipp@zoelle1.de>
Sat, 29 Jun 2013 22:43:43 +0000
(
00:43
+0200)
config.example.php
patch
|
blob
|
history
zncadmin.php
patch
|
blob
|
history
diff --git
a/config.example.php
b/config.example.php
index d3139eaed28a4d4f9ca11dcc708fc430a326ab6e..7633f2bfbb31f3522928776df4cdd27c102e5fb3 100644
(file)
--- a/
config.example.php
+++ b/
config.example.php
@@
-19,6
+19,7
@@
$zncservers = array(
array(
"name" => "znc1", //name of the Server (is shown in whois and used to identify multiple used usernames)
$zncservers = array(
array(
"name" => "znc1", //name of the Server (is shown in whois and used to identify multiple used usernames)
+ "version" => 1.000, //Version of the ZNC instance
"host" => "127.0.0.1", //host to connect to (is not shown to the user)
"public" => "znc1.example.net", //Public address used in the add reply
"port" => 8000, //NORMAL ZNC Port
"host" => "127.0.0.1", //host to connect to (is not shown to the user)
"public" => "znc1.example.net", //Public address used in the add reply
"port" => 8000, //NORMAL ZNC Port
@@
-34,6
+35,7
@@
$zncservers = array(
),
array(
"name" => "znc2",
),
array(
"name" => "znc2",
+ "version" => 0.206, //Version of the ZNC instance
"host" => "127.0.0.1",
"public" => "znc2.example.net",
"port" => 8001,
"host" => "127.0.0.1",
"public" => "znc2.example.net",
"port" => 8001,
diff --git
a/zncadmin.php
b/zncadmin.php
index 4949a10ccebc7022c73c737ac4b4c6c0877991ca..b89be854f43939140b2016b61191303e4c403c61 100644
(file)
--- a/
zncadmin.php
+++ b/
zncadmin.php
@@
-162,7
+162,7
@@
function zncadmin_search() {
$table->add("Server", "User", "Clients", "Server");
$count = 0;
foreach($zncservers as $zncserver) {
$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;
$zncserver['conn']->login($zncserver['auser'], $zncserver['apass']);
foreach($zncserver['conn']->getUserList() as $user) {
$skip = false;
@@
-247,7
+247,7
@@
function zncadmin_seen() {
$table->add("Server", "User", "Seen", "Info");
$found = false;
foreach($zncservers as $zncserver) {
$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))) {
$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
+277,7
@@
function zncadmin_del() {
foreach($zncservers as $zncserver) {
if($argv[3] && (strtolower($argv[3]) != strtolower($zncserver['name']))) continue;
if($username == strtolower($zncserver['auser'])) continue;
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) {
$zncserver['conn']->login($zncserver['auser'], $zncserver['apass']);
foreach($zncserver['conn']->getUserList() as $user) {
if(strtolower($user['user']) == $username) {
@@
-320,7
+320,7
@@
function zncadmin_add() {
error("Access denied\n");
return;
}
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;
$zncserver['conn']->login($zncserver['auser'], $zncserver['apass']);
$zncserver['users'] = $zncserver['conn']->getUserList();
$existing = false;
@@
-388,7
+388,7
@@
function zncadmin_resetpass() {
foreach($zncservers as $zncserver) {
if($argv[3] && (strtolower($argv[3]) != strtolower($zncserver['name']))) continue;
if($username == strtolower($zncserver['auser'])) continue;
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) {
$zncserver['conn']->login($zncserver['auser'], $zncserver['apass']);
foreach($zncserver['conn']->getUserList() as $user) {
if(strtolower($user['user']) == $username) {
@@
-446,7
+446,7
@@
function zncadmin_simul() {
foreach($zncservers as $zncserver) {
if($server && (strtolower($server) != strtolower($zncserver['name']))) continue;
if($username == strtolower($zncserver['auser'])) continue;
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) {
$zncserver['conn']->login($zncserver['auser'], $zncserver['apass']);
foreach($zncserver['conn']->getUserList() as $user) {
if(strtolower($user['user']) == $username) {
@@
-489,7
+489,7
@@
function zncadmin_block() {
foreach($zncservers as $zncserver) {
if($server && (strtolower($server) != strtolower($zncserver['name']))) continue;
if($username == strtolower($zncserver['auser'])) continue;
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) {
$zncserver['conn']->login($zncserver['auser'], $zncserver['apass']);
foreach($zncserver['conn']->getUserList() as $user) {
if(strtolower($user['user']) == $username) {
@@
-532,7
+532,7
@@
function zncadmin_unblock() {
foreach($zncservers as $zncserver) {
if($server && (strtolower($server) != strtolower($zncserver['name']))) continue;
if($username == strtolower($zncserver['auser'])) continue;
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) {
$zncserver['conn']->login($zncserver['auser'], $zncserver['apass']);
foreach($zncserver['conn']->getUserList() as $user) {
if(strtolower($user['user']) == $username) {
@@
-572,7
+572,7
@@
function zncadmin_stats() {
$total = 0;
$connected = 0;
$online = 0;
$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++;
$zncserver['conn']->login($zncserver['auser'], $zncserver['apass']);
foreach($zncserver['conn']->getUserList() as $user) {
if($user['server'] != "-N/A-") $connected++;