added Bot class (simple method dummy) & fixed some bugs

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

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index 7f0e0af661225ec233468b11bf35f8b4f0c0e0cd..524d392c1084db3e72e6e8cb632c43d34e807a98 100644 (file)
--- a/Uplink/Uplink.class.php
+++ b/Uplink/Uplink.class.php
@@ -330,7 +330,7 @@ class Uplink {
                        $this->server->addServer($new_server);
                        $this->flags |= self::FLAG_P10SESSION | self::FLAG_BURST_PENDING;
                        if($this->eventHandler)
-                               $this->eventHandler->event_server($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);
@@ -341,7 +341,7 @@ 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_server($new_server, !($this->flags & self::FLAG_CONNECTED));
+                               $this->eventHandler->event_newserver($new_server, !($this->flags & self::FLAG_CONNECTED));
                }
        }
        
@@ -605,10 +605,10 @@ class Uplink {
                                        $cmodes = $channel->getModes();
                                        $privs = $channel->getUserPrivs($user);
                                        if($cmodes->hasMode("s") && !$fromUser->isOnChannel($channel) && $from != $user->getNumeric()) continue;
-                                       if($cmodes->hasMode("u") && ($privs & (P10_Channel::USERPRIV_OPPED | P10_Channel::USERPRIV_VOICE)) == 0 && $from != $user->getNumeric()) continue;
+                                       if($cmodes->hasMode("u") && ($privs & (P10_Channel::USERPRIV_OPED | P10_Channel::USERPRIV_VOICE)) == 0 && $from != $user->getNumeric()) continue;
                                        $chanstr = ($channels == "" ? "" : " ");
                                        $prefix = "";
-                                       if(($privs & P10_Channel::USERPRIV_OPPED)) {
+                                       if(($privs & P10_Channel::USERPRIV_OPED)) {
                                                $prefix = "@";
                                        } else if(($privs & P10_Channel::USERPRIV_VOICE)) {
                                                $prefix = "+";