fixed bug in Uplink.class.php (fixed handling of Server kicks)
[PHP-P10.git] / Uplink / Uplink.class.php
index c88c2ea211c5870caa3e9e5441794b3be837650e..378d4b6a5acea60ee2bf43e6c16fa57e357fb74f 100644 (file)
@@ -1,12 +1,12 @@
 <?php
 /******************************* PHP-P10 v2 *****************************
- * Copyright (C) 2011  Philipp Kreil (pk910)                            *
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)                       *
  *                                                                      *
  * This program is free software: you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
  * the Free Software Foundation, either version 3 of the License, or    *
  * (at your option) any later version.                                  *
- *                                                                      * 
+ *                                                                      *
  * This program is distributed in the hope that it will be useful,      *
  * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>. *
  *                                                                      *
  ************************************************************************
- * 
+ *
  *  Uplink/Uplink.class.php
  *
  * This file contains the basic P10 Protocol handler.
@@ -45,7 +45,7 @@ class Uplink {
        private $server;
        private $eventHandler = null;
        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
        const FLAG_NOT_CONNECTABLE = 0x0004; //remote server is not connectable
@@ -53,13 +53,13 @@ class Uplink {
        const FLAG_CONNECTED       = 0x0010; //connected and synced (ready)
        const FLAG_GOT_PASS        = 0x0020; //got PASS from the remote Server
        private $flags = 0;
-       
+
        public function __construct() {
                $this->client = new Client();
                $this->setSetting("recv_timeout", 1000);
                $this->setSetting("his_usermask", "user.NoMask");
        }
-       
+
        public function initialize() {
                if($this->server) {
                        trigger_error("Uplink already initialized.", E_USER_ERROR);
@@ -74,7 +74,7 @@ class Uplink {
                }
                $this->server = new P10_Server($self_name, $self_numeric, null, time(), time(), $self_description);
        }
-       
+
        public function loop() {
                if($this->server == null) {
                        trigger_error("Uplink not initialized.", E_USER_ERROR);
@@ -111,7 +111,7 @@ class Uplink {
                        $this->parseLine($line);
                }
        }
-       
+
        public function shutdown() {
                if($this->client->connected()) {
                        if(($this->flags & self::FLAG_P10SESSION)) {
@@ -120,36 +120,36 @@ class Uplink {
                        $this->client->disconnect();
                }
        }
-       
+
        public function setUplinkHost($host, $port, $ssl = false, $bind = null) {
                $this->setSetting("host", $host);
                $this->setSetting("port", $port);
                $this->setSetting("ssl", $ssl);
                $this->setSetting("bind", $bind);
        }
-       
+
        public function setLoopTimeout($timeout) {
                $this->setSetting("recv_timeout", $timeout);
        }
-       
+
        public function setUplinkServer($numeric, $name, $password, $description) {
                $this->setSetting("numeric", Numerics::intToNum($numeric, 2));
                $this->setSetting("name", $name);
                $this->setSetting("password", $password);
                $this->setSetting("description", $description);
        }
-       
+
        public function setValidateServer($name, $password) {
                $this->setSetting("their_name", $name);
                $this->setSetting("their_password", $password);
        }
-       
+
        public function setHISOptions($servername, $serverdesc, $usermask) {
                $this->setSetting("his_name", $servername);
                $this->setSetting("his_desc", $serverdesc);
                $this->setSetting("his_usermask", $usermask);
        }
-       
+
        public function setEventHandler($event_handler) {
                if(!is_a($event_handler, "EventHandler")) {
                        trigger_error((is_object($event_handler) ? get_class($event_handler) : gettype($event_handler))." is NOT a valid EventHandler.", E_USER_ERROR);
@@ -157,11 +157,11 @@ class Uplink {
                }
                $this->eventHandler = $event_handler;
        }
-       
+
        private function setSetting($setting, $value) {
                $this->settings[$setting] = $value;
        }
-       
+
        private function getSetting($setting) {
                if(array_key_exists($setting, $this->settings)) {
                        return $this->settings[$setting];
@@ -169,18 +169,18 @@ class Uplink {
                        return null;
                }
        }
-       
+
        private function loginServer() {
                $password = $this->getSetting("password");
                $this->send("PASS", $password);
                $this->send("SERVER", $this->server->getName(), $this->server->getStartTime(), $this->server->getLinkTime(), $this->server->getNumeric(), $this->server->getDescription());
        }
-       
+
        private function parseLine($line) {
                $highExplode = explode(" :", $line, 2);
                $tokens = explode(" ", $highExplode[0]);
                if(count($highExplode) > 1)
-                       $tokens[] = $highExplode[1];
+               $tokens[] = $highExplode[1];
                $cmdPos = (($this->flags & self::FLAG_P10SESSION) ? 1 : 0);
                if($cmdPos == 1) $from = $tokens[0];
                else $from = null;
@@ -189,7 +189,7 @@ class Uplink {
                        $this->eventHandler->event_preparse($from, strtoupper($tokens[$cmdPos]), $arguments);
                }
                switch(strtoupper($tokens[$cmdPos])) {
-               //pre P10 Session
+                       //pre P10 Session
                        case "PASS":
                                $this->recv_pass($from, $arguments);
                                break;
@@ -199,7 +199,7 @@ class Uplink {
                        case "ERROR":
                                $this->recv_error($from, $arguments);
                                break;
-               //P10 Session
+                               //P10 Session
                        case "S":
                                $this->recv_server($from, $arguments);
                                break;
@@ -253,24 +253,24 @@ class Uplink {
                        case "OM":
                                $this->recv_mode($from, $arguments);
                                break;
-            case "AC":
+                       case "AC":
                                $this->recv_account($from, $arguments);
                                break;
-            case "FA":
+                       case "FA":
                                $this->recv_fakehost($from, $arguments);
                                break;
-            case "NFH":
+                       case "NFH":
                                $this->recv_newfakehost($from, $arguments);
                                break;
-               //default
+                               //default
                        default:
                                //unknown cmd
                                if($this->eventHandler)
-                                       $this->eventHandler->event_unknown_cmd($from, strtoupper($tokens[$cmdPos]), $arguments);
+                               $this->eventHandler->event_unknown_cmd($from, strtoupper($tokens[$cmdPos]), $arguments);
                                break;
                }
        }
-       
+
        private function send($command) {
                if(func_num_args() > 1) {
                        $args = array_slice(func_get_args(), 1);
@@ -280,11 +280,11 @@ class Uplink {
                }
                $this->client->send($command);
        }
-       
+
        /********************************************************************************************
         *                                     INCOMING COMMANDS                                    *
         ********************************************************************************************/
-       
+
        private function recv_pass($from, $args) {
                $their_pass = $this->getSetting("their_password");
                if($their_pass) {
@@ -298,13 +298,13 @@ class Uplink {
                        $this->flags |= self::FLAG_GOT_PASS;
                }
        }
-       
+
        private function recv_error($from, $args) {
                //we received an error - the socket is dead for us, now
                //maybe we want to log this, later
                $this->client->disconnect();
        }
-       
+
        private function recv_server($from, $args) {
                if($from == null) {
                        //our uplink Server
@@ -325,7 +325,7 @@ class Uplink {
                        $this->server->addServer($new_server);
                        $this->flags |= self::FLAG_P10SESSION | self::FLAG_BURST_PENDING;
                        if($this->eventHandler)
-                               $this->eventHandler->event_newserver($new_server, !($this->flags & self::FLAG_CONNECTED));
+                       $this->eventHandler->event_newserver($new_server, !($this->flags & self::FLAG_CONNECTED));
                } else {
                        //another server got a new slave server ^^
                        $server = P10_Server::getServerByNum($from);
@@ -336,15 +336,15 @@ class Uplink {
                        $new_server = new P10_Server($args[0], substr($args[5],0,2), $server, $args[2], $args[3], $args[7]);
                        $server->addServer($new_server);
                        if($this->eventHandler)
-                               $this->eventHandler->event_newserver($new_server, !($this->flags & self::FLAG_CONNECTED));
+                       $this->eventHandler->event_newserver($new_server, !($this->flags & self::FLAG_CONNECTED));
                }
        }
-       
+
        private function recv_ping($from, $args) {
                $this->send("Z", $args[0]); //simply PONG
                P10_Channel::recheckAllChannels();
        }
-       
+
        private function recv_nick($from, $args) {
                if(count($args) <= 2) {
                        //Nick change
@@ -354,7 +354,7 @@ class Uplink {
                                return;
                        }
                        if($this->eventHandler)
-                               $this->eventHandler->event_nick($user, $args[0]);
+                       $this->eventHandler->event_nick($user, $args[0]);
                        $user->setNick($args[0]);
                } else {
                        //New User
@@ -374,13 +374,15 @@ class Uplink {
                        $modes = implode(" ",array_slice($args, 5, count($args)-8));
                        $modes = new P10_UserModeSet($modes);
                        $ip = new IPAddr($args[count($args)-3]);
+                       if($host == $server->getName())
+                               $ip->setServerAddr(true);
                        $realname = $args[count($args)-1];
                        $user = new P10_User($nick, $numeric, $server, $connect_time, $ident, $host, $ip, $realname, $modes);
                        if($this->eventHandler)
-                               $this->eventHandler->event_connect($user, !($this->flags & self::FLAG_CONNECTED));
+                       $this->eventHandler->event_connect($user, !($this->flags & self::FLAG_CONNECTED));
                }
        }
-       
+
        private function recv_end_of_burst($from, $args) {
                if(($this->flags & self::FLAG_BURST_PENDING)) {
                        $this->burst();
@@ -388,11 +390,11 @@ class Uplink {
                        $this->flags &= ~self::FLAG_BURST_PENDING;
                }
        }
-       
+
        private function recv_end_of_burst_ack($from, $args) {
                $this->flags |= self::FLAG_CONNECTED;
        }
-       
+
        private function recv_server_quit($from, $args) {
                $server = P10_Server::getServerByName($args[0]);
                if($server == null) {
@@ -401,28 +403,28 @@ class Uplink {
                }
                $server->disconnectServer($this->eventHandler);
        }
-       
+
        private function recv_quit($from, $args) {
                $user = P10_User::getUserByNum($from);
                if($user == null) {
                        trigger_error("Server tries to quit an user that does not exist or was not found on recv_quit.", E_USER_ERROR);
                        return;
                }
-               if($this->eventHandler)
-                       $this->eventHandler->event_quit($user, $args[0]);
                $user->quit($args[0]);
+               if($this->eventHandler)
+               $this->eventHandler->event_quit($user, $args[0]);
        }
-       
+
        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;
-        }
+               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 = new P10_Channel($name);
                $channel->setCreateTime($create_time);
                $modes = $channel->getModes();
                $userstr = $args[count($args)-1];
@@ -438,7 +440,7 @@ class Uplink {
                        $userstr = "";
                }
                $users = explode(",",$userstr);
-               $isop = false; $isvoice = false;
+               $isop = false; $ishalfop = false; $isvoice = false;
                foreach($users as $user) {
                        if($user == "") continue;
                        $uexp = explode(":", $user);
@@ -448,9 +450,11 @@ class Uplink {
                        }
                        if(count($uexp) > 1) {
                                $isop = false;
+                               $ishalfop = false;
                                $isvoice = false;
                                for($i = 0; $i < strlen($uexp[1]); $i++) {
                                        if($uexp[1][0] == "@") $isop = true;
+                                       if($uexp[1][0] == "%") $ishalfop = true;
                                        if($uexp[1][0] == "+") $isvoice = true;
                                }
                        }
@@ -459,15 +463,15 @@ class Uplink {
                                trigger_error("burst parse error: cant find User '".$uexp[0]."'.", E_USER_ERROR);
                                return;
                        }
-                       $channel->burstUser($user, $isop, $isvoice);
+                       $channel->burstUser($user, $isop, $ishalfop, $isvoice);
                        if($this->eventHandler)
-                               $this->eventHandler->event_join($user, $channel, true);
+                       $this->eventHandler->event_join($user, $channel, true);
                }
                $modestr = array_slice($args, 2);
                if($modestr[0] == "+")
-                       $modes->parseModes(implode(" ", $modestr));
+               $modes->parseModes(implode(" ", $modestr));
        }
-       
+
        private function recv_join($from, $args) {
                $user = P10_User::getUserByNum($from);
                if($user == null) {
@@ -476,12 +480,12 @@ class Uplink {
                }
                $channel = P10_Channel::getChannelByName($args[0]);
                if($channel == null)
-                       $channel = new P10_Channel($args[0]);
+               $channel = new P10_Channel($args[0]);
                $channel->joinUser($user);
                if($this->eventHandler)
-                       $this->eventHandler->event_join($user, $channel, false);
+               $this->eventHandler->event_join($user, $channel, false);
        }
-       
+
        private function recv_part($from, $args) {
                $user = P10_User::getUserByNum($from);
                if($user == null) {
@@ -490,42 +494,42 @@ class Uplink {
                }
                $channel = P10_Channel::getChannelByName($args[0]);
                if($channel == null)
-                       $channel = new P10_Channel($args[0]);
+               $channel = new P10_Channel($args[0]);
                if($this->eventHandler)
-                       $this->eventHandler->event_part($user, $channel, $args[1]);
+               $this->eventHandler->event_part($user, $channel, $args[1]);
                $channel->partUser($user);
        }
-       
+
        private function recv_kick($from, $args) {
                $user = P10_User::getUserByNum($from);
-               if($user == null) {
+               if($user == null && strlen($from) != 2) {
                        trigger_error("An unknown user tries to kick another user on recv_kick.", E_USER_ERROR);
                        return;
                }
                $channel = P10_Channel::getChannelByName($args[0]);
                if($channel == null)
-                       $channel = new P10_Channel($args[0]);
+               $channel = new P10_Channel($args[0]);
                $target = P10_User::getUserByNum($args[1]);
                if($target == null) {
                        trigger_error("Someone tries to kick an user that does not exist or was not found on recv_kick.", E_USER_ERROR);
                        return;
                }
                if($this->eventHandler)
-                       $this->eventHandler->event_kick($user, $target, $channel, $args[1]);
-               $channel->partUser($user);
+               $this->eventHandler->event_kick($user, $target, $channel, $args[1]);
+               $channel->partUser($target);
        }
-       
+
        private function recv_kill($from, $args) {
                $user = P10_User::getUserByNum($args[0]);
                if($user == null) {
                        trigger_error("Server tries to kill an user that does not exist or was not found on recv_quit.", E_USER_ERROR);
                        return;
                }
-               if($this->eventHandler)
-                       $this->eventHandler->event_quit($user, "Killed (".$args[1].")");
                $user->quit($args[1]);
+               if($this->eventHandler)
+               $this->eventHandler->event_quit($user, "Killed (".$args[1].")");
        }
-       
+
        private function recv_privmsg($from, $args) {
                $user = P10_User::getUserByNum($from);
                if($user == null) {
@@ -536,16 +540,16 @@ class Uplink {
                        if($args[0][0] == "#") {
                                $channel = P10_Channel::getChannelByName($args[0]);
                                if($channel == null)
-                                       $channel = new P10_Channel($args[0]);
+                               $channel = new P10_Channel($args[0]);
                                if(strlen($args[1]) > 0 && $args[1][0] == "\001") {
                                        //ctcp
                                        $args[1] = substr($args[1],1);
                                        if($args[1][strlen($args[1])-1] == "\001")
-                                               $args[1] = substr($args[1],0,-1);
+                                       $args[1] = substr($args[1],0,-1);
                                        $ctcpexp = explode(" ",$args[1],2);
                                        $this->eventHandler->event_chanctcp($user, $channel, strtoupper($ctcpexp[0]), (count($ctcpexp) > 1 ? $ctcpexp[1] : null));
                                } else
-                                       $this->eventHandler->event_chanmessage($user, $channel, $args[1]);
+                               $this->eventHandler->event_chanmessage($user, $channel, $args[1]);
                        } else if($args[0][0] == "$") {
                                //"multicast"
                                $this->eventHandler->event_privmessage($user, NULL, $args[1]);
@@ -559,15 +563,15 @@ class Uplink {
                                        //ctcp
                                        $args[1] = substr($args[1],1);
                                        if($args[1][strlen($args[1])-1] == "\001")
-                                               $args[1] = substr($args[1],0,-1);
+                                       $args[1] = substr($args[1],0,-1);
                                        $ctcpexp = explode(" ",$args[1],2);
                                        $this->eventHandler->event_privctcp($user, $targetUser, strtoupper($ctcpexp[0]), (count($ctcpexp) > 1 ? $ctcpexp[1] : null));
                                } else
-                                       $this->eventHandler->event_privmessage($user, $targetUser, $args[1]);
+                               $this->eventHandler->event_privmessage($user, $targetUser, $args[1]);
                        }
                }
        }
-       
+
        private function recv_notice($from, $args) {
                $user = P10_User::getUserByNum($from);
                if($user == null) {
@@ -578,16 +582,16 @@ class Uplink {
                        if($args[0][0] == "#") {
                                $channel = P10_Channel::getChannelByName($args[0]);
                                if($channel == null)
-                                       $channel = new P10_Channel($args[0]);
+                               $channel = new P10_Channel($args[0]);
                                if(strlen($args[1]) > 0 && $args[1][0] == "\001") {
                                        //ctcp
                                        $args[1] = substr($args[1],1);
                                        if($args[1][strlen($args[1])-1] == "\001")
-                                               $args[1] = substr($args[1],0,-1);
+                                       $args[1] = substr($args[1],0,-1);
                                        $ctcpexp = explode(" ",$args[1],2);
                                        $this->eventHandler->event_chanctcpreply($user, $channel, strtoupper($ctcpexp[0]), (count($ctcpexp) > 1 ? $ctcpexp[1] : null));
                                } else
-                                       $this->eventHandler->event_channotice($user, $channel, $args[1]);
+                               $this->eventHandler->event_channotice($user, $channel, $args[1]);
                        } else if($args[0][0] == "$") {
                                //"multicast"
                                $this->eventHandler->event_privnotice($user, NULL, $args[1]);
@@ -601,15 +605,15 @@ class Uplink {
                                        //ctcp
                                        $args[1] = substr($args[1],1);
                                        if($args[1][strlen($args[1])-1] == "\001")
-                                               $args[1] = substr($args[1],0,-1);
+                                       $args[1] = substr($args[1],0,-1);
                                        $ctcpexp = explode(" ",$args[1],2);
                                        $this->eventHandler->event_privctcpreply($user, $targetUser, strtoupper($ctcpexp[0]), (count($ctcpexp) > 1 ? $ctcpexp[1] : null));
                                } else
-                                       $this->eventHandler->event_privnotice($user, $targetUser, $args[1]);
+                               $this->eventHandler->event_privnotice($user, $targetUser, $args[1]);
                        }
                }
        }
-       
+
        private function recv_whois($from, $args) {
                /* [get] ACAAF W AX :NetworkServ */
                $fromUser = P10_User::getUserByNum($from);
@@ -669,11 +673,11 @@ class Uplink {
                        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");
+                                       $this->send("313", $from, $nick, "is a Network Service");
                                        else
-                                               $this->send("313", $from, $nick, "is an illegal Network Service - HACKER!");
+                                       $this->send("313", $from, $nick, "is an illegal Network Service - HACKER!");
                                } else
-                                       $this->send("313", $from, $nick, "is an IRC Operator");
+                               $this->send("313", $from, $nick, "is an IRC Operator");
                        }
                        if(($auth = $modes->hasMode("r"))) {
                                $this->send("330", $from, $nick, $auth);
@@ -681,7 +685,7 @@ class Uplink {
                }
                $this->send("318", $from, $args[1]);
        }
-       
+
        private function recv_away($from, $args) {
                $user = P10_User::getUserByNum($from);
                if($user == null) {
@@ -691,14 +695,14 @@ class Uplink {
                if(count($args) > 0) {
                        $user->setAway($args[0]);
                        if($this->eventHandler)
-                               $this->eventHandler->event_away($user, $args[0]);
+                       $this->eventHandler->event_away($user, $args[0]);
                } else {
                        $user->setAway(null);
                        if($this->eventHandler)
-                               $this->eventHandler->event_away($user, null);
+                       $this->eventHandler->event_away($user, null);
                }
        }
-       
+
        private function recv_mode($from, $args) {
                $user = P10_User::getUserByNum($from);
                if($user == null && strlen($from) != 2) {
@@ -709,10 +713,10 @@ class Uplink {
                if($args[0][0] == "#") {
                        $channel = P10_Channel::getChannelByName($args[0]);
                        if($channel == null)
-                               $channel = new P10_Channel($args[0]);
+                       $channel = new P10_Channel($args[0]);
                        $channel->getModes()->setModes($modes);
                        if($this->eventHandler && strlen($from) != 2)
-                               $this->eventHandler->event_chanmode($user, $channel, $modes);
+                       $this->eventHandler->event_chanmode($user, $channel, $modes);
                } else {
                        $targetUser = P10_User::getUserByNick($args[0]);
                        if($targetUser == null) {
@@ -720,12 +724,21 @@ class Uplink {
                                return;
                        }
                        $targetUser->getModes()->setModes($modes);
-                       if($this->eventHandler)
+                       $fakemodes = NULL;
+                       if($targetUser->getModes()->hasMode("x") && $targetUser->getModes()->hasMode("r") && !$targetUser->getModes()->hasMode("f")) {
+                               //user is registered and has umode +x set (automatically assign default fakehost)
+                               $fakemodes = "+f ".$targetUser->getModes()->hasMode("r").".".$this->getSetting("his_usermask");
+                               $targetUser->getModes()->setModes($fakemodes);
+                       }
+                       if($this->eventHandler) {
                                $this->eventHandler->event_usermode($targetUser, $modes);
+                               if($fakemodes)
+                               $this->eventHandler->event_usermode($targetUser, $fakemodes);
+                       }
                }
        }
-    
-    private function recv_account($from, $args) {
+
+       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);
@@ -733,11 +746,20 @@ class Uplink {
                }
                $auth = $args[1];
                $user->getModes()->setModes("+r ".$auth);
-        if($this->eventHandler)
-            $this->eventHandler->event_usermode($user, "+r ".$auth);
+               $fakemodes = NULL;
+               if($user->getModes()->hasMode("x") && !$user->getModes()->hasMode("f")) {
+                       //user is registered and has umode +x set (automatically assign default fakehost)
+                       $fakemodes = "+f ".$auth.".".$this->getSetting("his_usermask");
+                       $user->getModes()->setModes($fakemodes);
+               }
+               if($this->eventHandler) {
+                       $this->eventHandler->event_usermode($user, "+r ".$auth);
+                       if($fakemodes)
+                       $this->eventHandler->event_usermode($user, $fakemodes);
+               }
        }
-    
-    private function recv_fakehost($from, $args) {
+
+       private function recv_fakehost($from, $args) {
                $user = P10_User::getUserByNum($args[0]);
                if($user == null) {
                        trigger_error("Server tries to send a fakehost change from an user that does not exist or was not found on recv_fakehost.", E_USER_ERROR);
@@ -745,28 +767,28 @@ class Uplink {
                }
                $fakehost = $args[1];
                $user->getModes()->setModes("+f ".$fakehost);
-        if($this->eventHandler)
-            $this->eventHandler->event_usermode($user, "+f ".$fakehost);
+               if($this->eventHandler)
+               $this->eventHandler->event_usermode($user, "+f ".$fakehost);
        }
-    
-    private function recv_newfakehost($from, $args) {
+
+       private function recv_newfakehost($from, $args) {
                $user = P10_User::getUserByNum($args[0]);
                if($user == null) {
                        trigger_error("Server tries to send a fakehost change from an user that does not exist or was not found on recv_fakehost.", E_USER_ERROR);
                        return;
                }
-        $fakeident = $args[1];
+               $fakeident = $args[1];
                $fakehost = $args[2];
-        $user->setIdent($fakeident);
+               $user->setIdent($fakeident);
                $user->getModes()->setModes("+f ".$fakehost);
-        if($this->eventHandler)
-            $this->eventHandler->event_usermode($user, "+f ".$fakehost);
+               if($this->eventHandler)
+               $this->eventHandler->event_usermode($user, "+f ".$fakehost);
        }
-       
+
        /********************************************************************************************
         *                                     SERVER FUNCTIONS                                     *
         ********************************************************************************************/
-       
+
        private function burst() {
                foreach($this->server->getUsers() as $user) {
                        $nick = $user->getNick();
@@ -780,38 +802,45 @@ class Uplink {
                        $this->send("N", $nick, $connect_time, $ident, $host, $modes, $ip, $numeric, $realname);
                }
                foreach(P10_Channel::getChannels() as $channel) {
-                       $sorted_users = array('ov' => array(), 'o' => array(), 'v' => array(), '-' => array());
+                       $privs_to_burst = array('o',                        'h',                          'v'                         );
+                       $priv_values =    array(P10_Channel::USERPRIV_OPED, P10_Channel::USERPRIV_HALFOP, P10_Channel::USERPRIV_VOICE );
+                       $priv_combinations = array();
+                       $sorted_users = array();
+                       $combinations = pow(2, count($privs_to_burst)); //binary possibilities => 2^count($privs_to_burst)
+                       for($i = 0; $i < $combinations; $i++) {
+                               //make a binary number out of $i
+                               $binary = decbin($i);
+                               while(strlen($binary) < count($privs_to_burst))
+                               $binary = '0'.$binary;
+                               $combination_name = '';
+                               $combination_value = 0;
+                               for($j = 0; $j < count($privs_to_burst); $j++) {
+                                       if($binary[$j] == '1') {
+                                               $combination_name .= $privs_to_burst[$j];
+                                               $combination_value += $priv_values[$j];
+                                       }
+                               }
+                               $priv_combinations[] = array("name" => $combination_name, "value" => $combination_value);
+                               $sorted_users[$combination_value] = array();
+                       }
                        $local_users = false;
                        foreach($channel->getUsers() as $user) {
                                if(substr($user->getNumeric(), 0, 2) != $this->server->getNumeric()) continue; //skip users that are not on the local server
                                $privs = $channel->getUserPrivs($user);
-                               $strPrivs = "";
-                               if(($privs & P10_Channel::USERPRIV_OPED)) $strPrivs .= "o";
-                               if(($privs & P10_Channel::USERPRIV_VOICE)) $strPrivs .= "v";
-                               if($strPrivs == "") $strPrivs = "-";
                                $local_users = true;
-                               $sorted_users[$strPrivs][] = $user;
+                               $sorted_users[$privs][] = $user;
                        }
                        if(!$local_users) continue;
                        $userStr = "";
-                       foreach($sorted_users['-'] as $user) {
-                               if($userStr != "") $userStr.=",";
-                               $userStr .= $user->getNumeric();
-                       }
-                       foreach($sorted_users['ov'] as $i => $user) {
-                               if($userStr != "") $userStr.=",";
-                               $userStr .= $user->getNumeric();
-                               if($i == 0) $userStr .= ":ov";
-                       }
-                       foreach($sorted_users['o'] as $i => $user) {
-                               if($userStr != "") $userStr.=",";
-                               $userStr .= $user->getNumeric();
-                               if($i == 0) $userStr .= ":o";
-                       }
-                       foreach($sorted_users['v'] as $i => $user) {
-                               if($userStr != "") $userStr.=",";
-                               $userStr .= $user->getNumeric();
-                               if($i == 0) $userStr .= ":v";
+                       foreach($priv_combinations as $combination) {
+                               $i = 0;
+                               foreach($sorted_users[$combination['value']] as $user) {
+                                       if($userStr != "") $userStr.=",";
+                                       $userStr .= $user->getNumeric();
+                                       if(($i++) == 0 && $combination['value'] > 0) {
+                                               $userStr .= ":".$combination['name'];
+                                       }
+                               }
                        }
                        $banString = "";
                        //TODO: Build ban String
@@ -832,11 +861,11 @@ class Uplink {
                }
                $this->send("EB");
        }
-       
+
        /********************************************************************************************
         *                                    LOCAL USER FUNCTIONS                                  *
         ********************************************************************************************/
-       
+
        public function addUser($nick, $ident, $host, $ip, $modes, $realname) {
                $user = P10_User::getUserByNick($nick);
                if($user != null) return ERR_NICK_IN_USE;
@@ -855,112 +884,113 @@ class Uplink {
                }
                return $user;
        }
-       
+
        public function delUser($user, $reason) {
                if(!is_a($user, "P10_User")) return ERR_INVALID_USER;
                if($user->getServer() === $this->server) {
                        //local user (QUIT)
                        $user->quit($reason);
-                       if(($this->flags & self::FLAG_CONNECTED)) 
-                               $this->send("Q", $user->getNumeric(), $reason);
+                       if(($this->flags & self::FLAG_CONNECTED))
+                       $this->send("Q", $user->getNumeric(), $reason);
                } else {
                        //remote user (KILL)
-                       if(!($this->flags & self::FLAG_CONNECTED)) 
-                               return ERR_NOT_CONNECTED;
+                       if(!($this->flags & self::FLAG_CONNECTED))
+                       return ERR_NOT_CONNECTED;
                        if($this->eventHandler)
-                               $this->eventHandler->event_quit($user, "Killed (".$reason.")");
+                       $this->eventHandler->event_quit($user, "Killed (".$reason.")");
                        $user->quit("Killed (".$reason.")");
                        $name = ($this->getSetting('his_name') ? $this->getSetting('his_name') : $this->getSetting('name'));
 
                        $this->send("D", $user->getNumeric(), $name, $reason);
                }
        }
-       
+
        public function join($user, $chanName, $privs = 0) {
                if(!is_a($user, "P10_User") || !($user->getServer() === $this->server))
-                       return ERR_INVALID_USER;
+               return ERR_INVALID_USER;
                if($chanName[0] != "#")
-                       return ERR_INVALID_CHANNAME;
+               return ERR_INVALID_CHANNAME;
                $channel = P10_Channel::getChannelByName($chanName);
                if($channel == null)
-                       $channel = new P10_Channel($chanName);
+               $channel = new P10_Channel($chanName);
                $channel->joinUser($user);
                if(($this->flags & self::FLAG_CONNECTED))
-                       $this->send("J", $user->getNumeric(), $chanName, time(), 0);
+               $this->send("J", $user->getNumeric(), $chanName, time(), 0);
                if($privs != 0) {
                        $channel->setUserPrivs($user, $privs);
                        if(($this->flags & self::FLAG_CONNECTED)) {
-                               $modestr = "+".(($privs & P10_Channel::USERPRIV_OPED) ? "o" : "").(($privs & P10_Channel::USERPRIV_VOICE) ? "v" : "");
+                               $modestr = "+".(($privs & P10_Channel::USERPRIV_OPED) ? "o" : "").(($privs & P10_Channel::USERPRIV_HALFOP) ? "h" : "").(($privs & P10_Channel::USERPRIV_VOICE) ? "v" : "");
                                $modestr .= (($privs & P10_Channel::USERPRIV_OPED) ? " ".$user->getNumeric() : "");
+                               $modestr .= (($privs & P10_Channel::USERPRIV_HALFOP) ? " ".$user->getNumeric() : "");
                                $modestr .= (($privs & P10_Channel::USERPRIV_VOICE) ? " ".$user->getNumeric() : "");
-                               $this->send("OM", $user->getNumeric(), $chanName, $modestr);
+                               $this->send(($user->getModes()->hasMode('k') ? "M" : "OM"), $user->getNumeric(), $chanName, $modestr);
                        }
                }
                if($this->eventHandler)
-                       $this->eventHandler->event_join($user, $channel, false);
+               $this->eventHandler->event_join($user, $channel, false);
        }
-       
+
        public function part($user, $chanName, $reason) {
                if(!is_a($user, "P10_User") || !($user->getServer() === $this->server))
-                       return ERR_INVALID_USER;
+               return ERR_INVALID_USER;
                if(!((is_string($chanName) && $chanName[0] == "#") || is_a($chanName, "P10_Channel")))
-                       return ERR_INVALID_CHANNAME;
+               return ERR_INVALID_CHANNAME;
                if(is_a($chanName, "P10_Channel"))
-                       $channel = $chanName;
+               $channel = $chanName;
                else
-                       $channel = P10_Channel::getChannelByName($chanName);
+               $channel = P10_Channel::getChannelByName($chanName);
                if($channel == null)
-                       $channel = new P10_Channel($chanName);
-               if(!$user->isOnChannel($channel)) 
-                       return ERR_NOT_ON_CHANNEL;
+               $channel = new P10_Channel($chanName);
+               if(!$user->isOnChannel($channel))
+               return ERR_NOT_ON_CHANNEL;
                if($this->eventHandler)
-                       $this->eventHandler->event_part($user, $channel, $reason);
+               $this->eventHandler->event_part($user, $channel, $reason);
                $channel->partUser($user, $reason);
                if(($this->flags & self::FLAG_CONNECTED))
-                       $this->send("L", $user->getNumeric(), $chanName, $reason);
+               $this->send("L", $user->getNumeric(), $chanName, $reason);
        }
-       
+
        public function kick($user, $target, $chanName, $reason) {
                if(!is_a($user, "P10_User") || !($user->getServer() === $this->server))
-                       return ERR_INVALID_USER;
+               return ERR_INVALID_USER;
                if(!is_a($target, "P10_User"))
-                       return ERR_INVALID_USER;
+               return ERR_INVALID_USER;
                if(!((is_string($chanName) && $chanName[0] == "#") || is_a($chanName, "P10_Channel")))
-                       return ERR_INVALID_CHANNAME;
+               return ERR_INVALID_CHANNAME;
                if(is_a($chanName, "P10_Channel"))
-                       $channel = $chanName;
+               $channel = $chanName;
                else
-                       $channel = P10_Channel::getChannelByName($chanName);
+               $channel = P10_Channel::getChannelByName($chanName);
                if($channel == null)
-                       $channel = new P10_Channel($chanName);
-               if(!$target->isOnChannel($channel)) 
-                       return ERR_NOT_ON_CHANNEL;
+               $channel = new P10_Channel($chanName);
+               if(!$target->isOnChannel($channel))
+               return ERR_NOT_ON_CHANNEL;
                if($this->eventHandler)
-                       $this->eventHandler->event_kick($user, $target, $channel, $reason);
+               $this->eventHandler->event_kick($user, $target, $channel, $reason);
                $channel->partUser($target, $reason);
                if(($this->flags & self::FLAG_CONNECTED))
-                       $this->send("K", $user->getNumeric(), $chanName, $target->getNumeric(), $reason);
+               $this->send("K", $user->getNumeric(), $channel->getName(), $target->getNumeric(), $reason);
        }
-       
+
        public function privmsg($user, $target, $message) {
                if(!is_a($user, "P10_User") || !($user->getServer() === $this->server))
-                       return ERR_INVALID_USER;
+               return ERR_INVALID_USER;
                if(!is_a($target, "P10_User") && !is_a($target, "P10_Channel") && !(is_string($target) && ($target[0] == "#" || P10_User::getUserByNick($target))))
-                       return ERR_INVALID_USER;
+               return ERR_INVALID_USER;
                if(is_a($target, "P10_Channel"))
-                       $targetStr = $target->getName();
+               $targetStr = $target->getName();
                else if(is_a($target, "P10_User"))
-                       $targetStr = $target->getNumeric();
+               $targetStr = $target->getNumeric();
                else if($target[0] == "#")
-                       $targetStr = $target;
+               $targetStr = $target;
                else
-                       $targetStr = P10_User::getUserByNick($target)->getNumeric();
-               
+               $targetStr = P10_User::getUserByNick($target)->getNumeric();
+
                if($this->eventHandler) {
                        if($targetStr[0] == "#") {
                                $channel = P10_Channel::getChannelByName($targetStr);
                                if($channel == null)
-                                       $channel = new P10_Channel($targetStr);
+                               $channel = new P10_Channel($targetStr);
                                $this->eventHandler->event_chanmessage($user, $channel, $message);
                        } else {
                                $targetUser = P10_User::getUserByNum($targetStr);
@@ -968,28 +998,28 @@ class Uplink {
                        }
                }
                if(($this->flags & self::FLAG_CONNECTED))
-                       $this->send("P", $user->getNumeric(), $targetStr, $message);
+               $this->send("P", $user->getNumeric(), $targetStr, $message);
        }
-       
+
        public function notice($user, $target, $message) {
                if(!is_a($user, "P10_User") || !($user->getServer() === $this->server))
-                       return ERR_INVALID_USER;
+               return ERR_INVALID_USER;
                if(!is_a($target, "P10_User") && !is_a($target, "P10_Channel") && !(is_string($target) && ($target[0] == "#" || P10_User::getUserByNick($target))))
-                       return ERR_INVALID_USER;
+               return ERR_INVALID_USER;
                if(is_a($target, "P10_Channel"))
-                       $targetStr = $target->getName();
+               $targetStr = $target->getName();
                else if(is_a($target, "P10_User"))
-                       $targetStr = $target->getNumeric();
+               $targetStr = $target->getNumeric();
                else if($target[0] == "#")
-                       $targetStr = $target;
+               $targetStr = $target;
                else
-                       $targetStr = P10_User::getUserByNick($target)->getNumeric();
-               
+               $targetStr = P10_User::getUserByNick($target)->getNumeric();
+
                if($this->eventHandler) {
                        if($targetStr[0] == "#") {
                                $channel = P10_Channel::getChannelByName($targetStr);
                                if($channel == null)
-                                       $channel = new P10_Channel($targetStr);
+                               $channel = new P10_Channel($targetStr);
                                $this->eventHandler->event_channotice($user, $channel, $message);
                        } else {
                                $targetUser = P10_User::getUserByNum($targetStr);
@@ -997,57 +1027,57 @@ class Uplink {
                        }
                }
                if(($this->flags & self::FLAG_CONNECTED))
-                       $this->send("O", $user->getNumeric(), $targetStr, $message);
+               $this->send("O", $user->getNumeric(), $targetStr, $message);
        }
-       
+
        public function mode($user, $target, $modes, $force = false) {
                if(!is_a($user, "P10_User") || !($user->getServer() === $this->server))
-                       return ERR_INVALID_USER;
+               return ERR_INVALID_USER;
                if(!is_a($target, "P10_User") && !is_a($target, "P10_Channel") && !(is_string($target) && ($target[0] == "#" || P10_User::getUserByNick($target))))
-                       return ERR_INVALID_USER;
+               return ERR_INVALID_USER;
                if(is_a($target, "P10_Channel"))
-                       $targetStr = $target->getName();
+               $targetStr = $target->getName();
                else if(is_a($target, "P10_User"))
-                       $targetStr = $target->getNumeric();
+               $targetStr = $target->getNumeric();
                else if($target[0] == "#")
-                       $targetStr = $target;
+               $targetStr = $target;
                else
-                       $targetStr = P10_User::getUserByNick($target)->getNumeric();
-               
+               $targetStr = P10_User::getUserByNick($target)->getNumeric();
+
                if($targetStr[0] == "#") {
                        $channel = P10_Channel::getChannelByName($targetStr);
                        if($channel == null)
-                               $channel = new P10_Channel($targetStr);
+                       $channel = new P10_Channel($targetStr);
                        $modes = $channel->getModes()->setModes($modes, true);
                        if(($this->flags & self::FLAG_CONNECTED))
-                               $this->send(($force ? "OM" : "M"), $user->getNumeric(), $targetStr, $modes);
+                       $this->send(($force ? "OM" : "M"), $user->getNumeric(), $targetStr, $modes);
                        if($this->eventHandler)
-                               $this->eventHandler->event_chanmode(($force ? $this->server : $user), $channel, $modes);
+                       $this->eventHandler->event_chanmode(($force ? $this->server : $user), $channel, $modes);
                } else {
                        $targetUser = P10_User::getUserByNum($targetStr);
                        if($targetUser->getServer() === $this->server) {
                                //just do it :D
                                $modes = $targetUser->getModes()->setModes($modes, true);
                                if(($this->flags & self::FLAG_CONNECTED))
-                                       $this->send("M", $targetUser->getNumeric(), $targetUser->getNick(), $modes);
+                               $this->send("M", $targetUser->getNumeric(), $targetUser->getNick(), $modes);
                                if($this->eventHandler)
-                                       $this->eventHandler->event_usermode($targetUser, $modes);
+                               $this->eventHandler->event_usermode($targetUser, $modes);
                        } else {
                                //SVSMODE
                                if(($this->flags & self::FLAG_CONNECTED))
-                                       $this->send("SM", $user->getNumeric(), $targetUser->getNumeric(), $modes);
+                               $this->send("SM", $user->getNumeric(), $targetUser->getNumeric(), $modes);
                        }
                }
        }
-       
+
        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");
        }
-       
+
 }
 
 ?>
\ No newline at end of file