mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feature: Added support for nick conflicts + reload losing install_dir path (#6775)

Browse Source 
* Generating random nick on conflict, and trying to regain our original nick when it gets available

* Also fixes a bug where $config['install_dir'] gets lost on .reload

* ...And adding a few QUIT-messages for brewity
This commit is contained in:
Olen
2017-06-03 13:39:20 +02:00
committed by Neil Lathwood
parent 43e135ee03
commit c8e3738fbb
1 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
LibreNMS/IRCBot.php
View File

@@ -163,6 +163,10 @@ class IRCBot
}
}
if (isset($this->tempnick)) {
$this->ircRaw('NICK '.$this->nick);
}
$this->getData();
if ($this->config['irc_alert']) {
$this->alertData();
@@ -292,6 +296,30 @@ class IRCBot
}
}
if (($ex[1] == 'NICK') && (preg_replace("/^:/", "", $ex[2]) == $this->nick)) {
// Nickname changed successfully
if ($this->debug) {
$this->log("Regained our real nick");
}
unset($this->tempnick);
}
if (($ex[1] == 433) || ($ex[1] == 437)) {
// Nickname already in use / temp unavailable
if ($this->debug) {
$this->log("Nickname already in use...");
}
if ($ex[2] != "*") {
$this->tempnick = $ex[2];
}
if (!isset($this->tempnick)) {
$this->tempnick = $this->nick.rand(0, 99);
}
if ($this->debug) {
$this->log("Using temp nick ".$this->tempnick);
}
return $this->ircRaw('NICK '.$this->tempnick);
}
$this->command = str_replace(array(chr(10), chr(13)), '', $ex[3]);
if (strstr($this->command, ':.')) {
$this->handleCommand();
@@ -384,6 +412,7 @@ class IRCBot
$this->log('Trying to connect ('.($try + 1).') to '.$this->server.':'.$this->port.($this->ssl ? ' (SSL)' : ''));
if ($this->socket['irc']) {
$this->ircRaw('QUIT :Reloading');
fclose($this->socket['irc']);
}
@@ -572,6 +601,8 @@ class IRCBot
if ($this->user['level'] == 10) {
global $config;
$config = array();
$config['install_dir'] = $this->config['install_dir'];
chdir($config['install_dir']);
include 'includes/defaults.inc.php';
include 'config.php';
include 'includes/definitions.inc.php';
@@ -598,6 +629,7 @@ class IRCBot
private function _quit($params)
{
if ($this->user['level'] == 10) {
$this->ircRaw("QUIT :Requested");
return die();
} else {
return $this->respond('Permission denied.');