X-Git-Url: http://git.pk910.de/?p=PHP-P10.git;a=blobdiff_plain;f=Uplink%2FUplink.class.php;h=d90324bf3e6e30bfb08ce5c1e4102c59232e7df5;hp=9d88ae523af513b05e5dd9b2223c2d1a0324767d;hb=31306844f33ddc639931d9d7173f4af9f7fb327b;hpb=0f30e96ae37491aee19e72b89cc54a6798d1f254 diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php index 9d88ae5..d90324b 100644 --- a/Uplink/Uplink.class.php +++ b/Uplink/Uplink.class.php @@ -253,6 +253,9 @@ class Uplink { case "OM": $this->recv_mode($from, $arguments); break; + case "AC": + $this->recv_account($from, $arguments); + break; //default default: //unknown cmd @@ -407,13 +410,16 @@ class Uplink { private function recv_burst($from, $args) { $name = $args[0]; $create_time = $args[1]; + if(count($args) == 2) { + //we've got an empty channel without any modes set??? dead channel! + return; + } $channel = P10_Channel::getChannelByName($name); if($channel == null) $channel = new P10_Channel($name); $channel->setCreateTime($create_time); $modes = $channel->getModes(); $userstr = $args[count($args)-1]; - $modeparamcount = count($args)-3; if($userstr[0] == "%") { //ban list $banlist = explode(" ", substr($userstr, 1)); @@ -421,10 +427,8 @@ class Uplink { //TODO: save bans } $userstr = $args[count($args)-2]; - $modeparamcount--; } if($userstr[0] == "+") { //MODE String - $modeparamcount++; $userstr = ""; } $users = explode(",",$userstr); @@ -433,8 +437,8 @@ class Uplink { if($user == "") continue; $uexp = explode(":", $user); if(strlen($uexp[0]) != 5) { - trigger_error("burst parse error: '".$uexp[0]."' is not an user numeric.", E_USER_ERROR); - return; + trigger_error("burst parse error: '".$uexp[0]."' is not an user numeric.", E_USER_WARNING); + break; } if(count($uexp) > 1) { $isop = false; @@ -453,7 +457,9 @@ class Uplink { if($this->eventHandler) $this->eventHandler->event_join($user, $channel, true); } - $modes->parseModes(implode(" ", array_slice($args, 2, $modeparamcount))); + $modestr = array_slice($args, 2); + if($modestr[0] == "+") + $modes->parseModes(implode(" ", $modestr)); } private function recv_join($from, $args) { @@ -517,7 +523,7 @@ class Uplink { private function recv_privmsg($from, $args) { $user = P10_User::getUserByNum($from); if($user == null) { - trigger_error("Server tries to send a privmsg from an user that does not exist or was not found on recv_privmsg.", E_USER_ERROR); + trigger_error("Server tries to send a privmsg from an user that does not exist or was not found on recv_privmsg.", E_USER_WARNING); return; } if($this->eventHandler) { @@ -534,10 +540,13 @@ class Uplink { $this->eventHandler->event_chanctcp($user, $channel, strtoupper($ctcpexp[0]), (count($ctcpexp) > 1 ? $ctcpexp[1] : null)); } else $this->eventHandler->event_chanmessage($user, $channel, $args[1]); + } else if($args[0][0] == "$") { + //"multicast" + $this->eventHandler->event_privmessage($user, NULL, $args[1]); } else { $targetUser = P10_User::getUserByNum($args[0]); if($targetUser == null) { - trigger_error("Server tries to send a privmsg to an user that does not exist or was not found on recv_privmsg.", E_USER_ERROR); + trigger_error("Server tries to send a privmsg to an user that does not exist or was not found on recv_privmsg.", E_USER_WARNING); return; } if(strlen($args[1]) > 0 && $args[1][0] == "\001") { @@ -556,7 +565,7 @@ class Uplink { private function recv_notice($from, $args) { $user = P10_User::getUserByNum($from); if($user == null) { - trigger_error("Server tries to send a notice from an user that does not exist or was not found on recv_notice.", E_USER_ERROR); + trigger_error("Server tries to send a notice from an user that does not exist or was not found on recv_notice.", E_USER_WARNING); return; } if($this->eventHandler) { @@ -573,10 +582,13 @@ class Uplink { $this->eventHandler->event_chanctcpreply($user, $channel, strtoupper($ctcpexp[0]), (count($ctcpexp) > 1 ? $ctcpexp[1] : null)); } else $this->eventHandler->event_channotice($user, $channel, $args[1]); + } else if($args[0][0] == "$") { + //"multicast" + $this->eventHandler->event_privnotice($user, NULL, $args[1]); } else { $targetUser = P10_User::getUserByNum($args[0]); if($targetUser == null) { - trigger_error("Server tries to send a notice to an user that does not exist or was not found on recv_notice.", E_USER_ERROR); + trigger_error("Server tries to send a notice to an user that does not exist or was not found on recv_notice.", E_USER_WARNING); return; } if(strlen($args[1]) > 0 && $args[1][0] == "\001") { @@ -683,7 +695,7 @@ class Uplink { private function recv_mode($from, $args) { $user = P10_User::getUserByNum($from); - if($user == null) { + if($user == null && strlen($from) != 2) { 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; } @@ -693,7 +705,7 @@ class Uplink { if($channel == null) $channel = new P10_Channel($args[0]); $channel->getModes()->setModes($modes); - if($this->eventHandler) + if($this->eventHandler && strlen($from) != 2) $this->eventHandler->event_chanmode($user, $channel, $modes); } else { $targetUser = P10_User::getUserByNick($args[0]); @@ -706,6 +718,18 @@ class Uplink { $this->eventHandler->event_usermode($targetUser, $modes); } } + + private function recv_account($from, $args) { + $user = P10_User::getUserByNum($args[0]); + if($user == null) { + trigger_error("Server tries to send an auth announce from an user that does not exist or was not found on recv_account.", E_USER_ERROR); + return; + } + $auth = $args[1]; + $user->getModes()->setModes("+r ".$auth); + if($this->eventHandler) + $this->eventHandler->event_usermode($user, "+r ".$auth); + } /******************************************************************************************** * SERVER FUNCTIONS * @@ -984,7 +1008,13 @@ class Uplink { } } + public function ctcp($user, $target, $command, $text) { + return $this->privmsg($user, $target, "\001".strtoupper($command)." ".$text."\001"); + } + public function ctcp_reply($user, $target, $command, $text) { + return $this->notice($user, $target, "\001".strtoupper($command)." ".$text."\001"); + } }