require_once("P10_Channel.class.php");
require_once("P10_ModeSets.class.php");
require_once("EventHandler.interface.php");
+require_once("IPAddr.class.php");
$e=1;
define("ERR_NICK_IN_USE", $e++);
private $settings = array();
private $server;
private $eventHandler = null;
- private $last_local_numeric = 1;
+ private $last_local_numeric = 0;
const FLAG_P10SESSION = 0x0001; //connection is in P10 mode (server is connected)
const FLAG_SECURITY_QUIT = 0x0002; //local connection abort because of security issues
$host = $args[4];
$modes = implode(" ",array_slice($args, 5, count($args)-8));
$modes = new P10_UserModeSet($modes);
- $ip = Numerics::parseIP($args[count($args)-3]);
+ $ip = new IPAddr($args[count($args)-3]);
$realname = $args[count($args)-1];
$user = new P10_User($nick, $numeric, $server, $connect_time, $ident, $host, $ip, $realname, $modes);
if($this->eventHandler)
if($this->eventHandler)
$this->eventHandler->event_join($user, $channel, true);
}
- $modes->parseModes(implode(array_slice($args, 2, $modeparamcount)));
+ $modes->parseModes(implode(" ", array_slice($args, 2, $modeparamcount)));
}
private function recv_join($from, $args) {
if($this->eventHandler)
$this->eventHandler->event_chanmode($user, $channel, $modes);
} else {
- $targetUser = P10_User::getUserByNum($args[0]);
+ $targetUser = P10_User::getUserByNick($args[0]);
if($targetUser == null) {
trigger_error("Server tries to send a mode to an user that does not exist or was not found on recv_mode.", E_USER_ERROR);
return;
$ident = $user->getIdent();
$host = $user->getHost();
$modes = $user->getModes()->getModeString();
- $ip = Numerics::numericFromIP($user->getIP());
+ $ip = $user->getIP()->getNumeric();
$numeric = $user->getNumeric();
$realname = $user->getRealname();
$this->send("N", $nick, $connect_time, $ident, $host, $modes, $ip, $numeric, $realname);
}
$this->last_local_numeric++;
$modes = new P10_UserModeSet($modes);
+ $ip = new IPAddr($ip);
$user = new P10_User($nick, $numeric, $this->server, time(), $ident, $host, $ip, $realname, $modes);
if(($this->flags & self::FLAG_CONNECTED)) {
- $ip = Numerics::numericFromIP($user->getIP());
+ $ip = $user->getIP()->getNumeric();
$this->send("N", $nick, $user->getConnectTime(), $ident, $host, $user->getModes()->getModeString(), $ip, $numeric, $realname);
}
return $user;
$channel = P10_Channel::getChannelByName($targetStr);
if($channel == null)
$channel = new P10_Channel($targetStr);
- $modes = $channel->getModes()->setModes($modes);
+ $modes = $channel->getModes()->setModes($modes, true);
if(($this->flags & self::FLAG_CONNECTED))
$this->send(($force ? "OM" : "M"), $user->getNumeric(), $targetStr, $modes);
if($this->eventHandler)
$targetUser = P10_User::getUserByNum($targetStr);
if($targetUser->getServer() === $this->server) {
//just do it :D
- $modes = $targetUser->getModes()->setModes($modes);
+ $modes = $targetUser->getModes()->setModes($modes, true);
if(($this->flags & self::FLAG_CONNECTED))
$this->send("M", $targetUser->getNumeric(), $targetUser->getNick(), $modes);
if($this->eventHandler)