fixed bug in Uplink::kick()

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

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index 387f32406e207c71966fabda389990a0b783c4a5..67ea3b1cef2f4d08bd78e8fc18492d6bb200f942 100644 (file)
--- a/Uplink/Uplink.class.php
+++ b/Uplink/Uplink.class.php
@@ -786,7 +786,7 @@ class Uplink {
             $priv_values =    array(P10_Channel::USERPRIV_OPED, P10_Channel::USERPRIV_HALFOP, P10_Channel::USERPRIV_VOICE );
             $priv_combinations = array();
             $sorted_users = array();
-            $combinations = expr(2, count($privs_to_burst)); //binary possibilities => 2^count($privs_to_burst)
+            $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);
@@ -797,7 +797,7 @@ class Uplink {
                 for($j = 0; $j < count($privs_to_burst); $j++) {
                     if($binary[$j] == '1') {
                         $combination_name .= $privs_to_burst[$j];
-                        $combination_value .= $priv_values[$j];
+                        $combination_value += $priv_values[$j];
                     }
                 }
                 $priv_combinations[] = array("name" => $combination_name, "value" => $combination_value);
@@ -818,7 +818,7 @@ class Uplink {
                     if($userStr != "") $userStr.=",";
                     $userStr .= $user->getNumeric();
                     if(($i++) == 0 && $combination['value'] > 0) {
-                        $userStr .= $combination['name'];
+                        $userStr .= ":".$combination['name'];
                     }
                 }
             }
@@ -949,7 +949,7 @@ class Uplink {
                        $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) {