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++);
case "A":
$this->recv_away($from, $arguments);
break;
+ case "M":
+ case "OM":
+ $this->recv_mode($from, $arguments);
+ break;
//default
default:
//unknown cmd
$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($channels != "") {
$this->send("319", $from, $nick, $channels);
}
- if($fromUser->getModes()->hasMode("o") || $from == $user->getNumeric() || !$this->getSetting("his_name")) {
- $this->send("312", $from, $nick, $user->getServer()->getName(), $user->getServer()->getDescription());
- } else {
- $this->send("312", $from, $nick, $this->getSetting("his_name"), $this->getSetting("his_desc"));
- }
- if($modes->hasMode("o") && (!$modes->hasMode("H") || $fromUser->getModes()->hasMode("o"))) {
- if($modes->hasMode("S")) {
- if($modes->hasMode("D"))
- $this->send("313", $from, $nick, "is a Network Service");
- else
- $this->send("313", $from, $nick, "is an illegal Network Service - HACKER!");
- } else
- $this->send("313", $from, $nick, "is an IRC Operator");
- }
- if(($auth = $modes->hasMode("r"))) {
- $this->send("330", $from, $nick, $auth);
- }
+ }
+ if($fromUser->getModes()->hasMode("o") || $from == $user->getNumeric() || !$this->getSetting("his_name")) {
+ $this->send("312", $from, $nick, $user->getServer()->getName(), $user->getServer()->getDescription());
+ } else {
+ $this->send("312", $from, $nick, $this->getSetting("his_name"), $this->getSetting("his_desc"));
+ }
+ if($modes->hasMode("o") && (!$modes->hasMode("H") || $fromUser->getModes()->hasMode("o"))) {
+ if($modes->hasMode("S")) {
+ if($modes->hasMode("D"))
+ $this->send("313", $from, $nick, "is a Network Service");
+ else
+ $this->send("313", $from, $nick, "is an illegal Network Service - HACKER!");
+ } else
+ $this->send("313", $from, $nick, "is an IRC Operator");
+ }
+ if(($auth = $modes->hasMode("r"))) {
+ $this->send("330", $from, $nick, $auth);
}
}
$this->send("318", $from, $args[1]);
}
}
+ private function recv_mode($from, $args) {
+ $user = P10_User::getUserByNum($from);
+ if($user == null) {
+ trigger_error("Server tries to send a modechange from an user that does not exist or was not found on recv_mode.", E_USER_ERROR);
+ return;
+ }
+ $modes = implode(" ",array_slice($args,1));
+ if($args[0][0] == "#") {
+ $channel = P10_Channel::getChannelByName($args[0]);
+ if($channel == null)
+ $channel = new P10_Channel($args[0]);
+ $channel->getModes()->setModes($modes);
+ if($this->eventHandler)
+ $this->eventHandler->event_chanmode($user, $channel, $modes);
+ } else {
+ $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;
+ }
+ $targetUser->getModes()->setModes($modes);
+ if($this->eventHandler)
+ $this->eventHandler->event_usermode($targetUser, $modes);
+ }
+ }
+
/********************************************************************************************
* SERVER FUNCTIONS *
********************************************************************************************/
$local_users = true;
$sorted_users[$strPrivs][] = $user;
}
- if(!$local_users && !$channel->getModes()->hasMode("z")) continue;
+ if(!$local_users) continue;
$userStr = "";
foreach($sorted_users['-'] as $user) {
if($userStr != "") $userStr.=",";
}
$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)