added own IPAddr Class and rewrote the IP Address parser & builder

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

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index 22a923c2b7f381afacece9a93b985af623b05b10..a23f4cee487c3543c8958a67b94668fcbd8a0967 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++);
@@ -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)
@@ -483,7 +484,7 @@ class Uplink {
                        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) {
@@ -640,23 +641,23 @@ class Uplink {
                                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]);
@@ -681,7 +682,7 @@ class Uplink {
                        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))
+               $modes = implode(" ",array_slice($args,1));
                if($args[0][0] == "#") {
                        $channel = P10_Channel::getChannelByName($args[0]);
                        if($channel == null)
@@ -730,7 +731,7 @@ class Uplink {
                                $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.=",";
@@ -785,9 +786,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;
@@ -955,7 +957,7 @@ class Uplink {
                        $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)
@@ -964,7 +966,7 @@ class Uplink {
                        $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)