added some more events

[PHP-P10.git] / Uplink / Uplink.class.php

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index f83c7e35a85cb3e64f0cd49efba41edb60be1704..85adeaeb81bc92f46482e536e25d82671f210e7d 100644 (file)
--- a/Uplink/Uplink.class.php
+++ b/Uplink/Uplink.class.php
@@ -61,6 +61,7 @@ require_once("P10_User.class.php");
 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++);
@@ -74,7 +75,7 @@ class Uplink {
        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
@@ -394,7 +395,7 @@ class Uplink {
                        $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)
@@ -555,14 +556,30 @@ class Uplink {
                                $channel = P10_Channel::getChannelByName($args[0]);
                                if($channel == null)
                                        $channel = new P10_Channel($args[0]);
-                               $this->eventHandler->event_chanmessage($user, $channel, $args[1]);
+                               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);
+                                       $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]);
                        } 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);
                                        return;
                                }
-                               $this->eventHandler->event_privmessage($user, $targetUser, $args[1]);
+                               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);
+                                       $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]);
                        }
                }
        }
@@ -578,14 +595,30 @@ class Uplink {
                                $channel = P10_Channel::getChannelByName($args[0]);
                                if($channel == null)
                                        $channel = new P10_Channel($args[0]);
-                               $this->eventHandler->event_channotice($user, $channel, $args[1]);
+                               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);
+                                       $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]);
                        } 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);
                                        return;
                                }
-                               $this->eventHandler->event_privnotice($user, $targetUser, $args[1]);
+                               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);
+                                       $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]);
                        }
                }
        }
@@ -670,8 +703,12 @@ class Uplink {
                }
                if(count($args) > 0) {
                        $user->setAway($args[0]);
+                       if($this->eventHandler)
+                               $this->eventHandler->event_away($user, $args[0]);
                } else {
                        $user->setAway(null);
+                       if($this->eventHandler)
+                               $this->eventHandler->event_away($user, null);
                }
        }
        
@@ -690,7 +727,7 @@ class Uplink {
                        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;
@@ -712,7 +749,7 @@ class Uplink {
                        $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);
@@ -785,9 +822,10 @@ class Uplink {
                }
                $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;