fixed P10_ModeSets.class.php

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

diff --git a/Uplink/P10_ModeSets.class.php b/Uplink/P10_ModeSets.class.php
index e03521d24ab83fb25a426ed87a22ec36d2e6ce88..2d1d03d9af4b094ef0f2a3732821337b5b89d91e 100644 (file)
--- a/Uplink/P10_ModeSets.class.php
+++ b/Uplink/P10_ModeSets.class.php
@@ -108,9 +108,9 @@ class P10_ChannelModeSet {
                                continue;
                        }
                        $flag = self::$modevalues[$mode];
-                       if(self::$modevalues[$mode] == self::MODE_TYPE_A) continue; //we shouldn't get such a mode on parseModes
+                       if(self::$modes[$mode] == self::MODE_TYPE_A) continue; //we shouldn't get such a mode on parseModes
                        $this->modeflags |= $flag;
-                       if(self::$modevalues[$mode] == self::MODE_TYPE_B || self::$modevalues[$mode] == self::MODE_TYPE_C) {
+                       if(self::$modes[$mode] == self::MODE_TYPE_B || self::$modes[$mode] == self::MODE_TYPE_C) {
                                $this->modeparams[$mode] = $args[$c++];
                        }
                }
@@ -155,26 +155,26 @@ class P10_ChannelModeSet {
                        if($add) {
                                if($returndiff && !($this->modeflags & $flag)) {
                                        $modestradd .= $mode;
-                                       if(self::$modevalues[$mode] == self::MODE_TYPE_B || self::$modevalues[$mode] == self::MODE_TYPE_C) {
+                                       if(self::$modes[$mode] == self::MODE_TYPE_B || self::$modes[$mode] == self::MODE_TYPE_C) {
                                                $paramstradd .= " ".$args[$c];
                                        }
                                }
                                $this->modeflags |= $flag;
-                               if(self::$modevalues[$mode] == self::MODE_TYPE_B || self::$modevalues[$mode] == self::MODE_TYPE_C) {
+                               if(self::$modes[$mode] == self::MODE_TYPE_B || self::$modes[$mode] == self::MODE_TYPE_C) {
                                        $this->modeparams[$mode] = $args[$c++];
                                }
                        } else {
                                if($returndiff && ($this->modeflags & $flag)) {
                                        $modestrdel .= $mode;
-                                       if(self::$modevalues[$mode] == self::MODE_TYPE_C) {
+                                       if(self::$modes[$mode] == self::MODE_TYPE_C) {
                                                $paramstrdel .= " ".$args[$c];
                                        }
                                }
                                $this->modeflags &= ~$flag;
-                               if(self::$modevalues[$mode] == self::MODE_TYPE_B || self::$modevalues[$mode] == self::MODE_TYPE_C) {
+                               if(self::$modes[$mode] == self::MODE_TYPE_B || self::$modes[$mode] == self::MODE_TYPE_C) {
                                        unset($this->modeparams[$mode]);
                                }
-                               if(self::$modevalues[$mode] == self::MODE_TYPE_C) $c++;
+                               if(self::$modes[$mode] == self::MODE_TYPE_C) $c++;
                        }
                }
                if($returndiff) {
@@ -210,7 +210,7 @@ class P10_ChannelModeSet {
                foreach(self::$modevalues as $mode => $flag) {
                        if(($this->modeflags & $flag)) {
                                $modestr .= $mode;
-                               if(self::$modevalues[$mode] == self::MODE_TYPE_B || self::$modevalues[$mode] == self::MODE_TYPE_C) {
+                               if(self::$modes[$mode] == self::MODE_TYPE_B || self::$modes[$mode] == self::MODE_TYPE_C) {
                                        $paramstr .= " ".$this->modeparams[$mode];
                                }
                        }
@@ -224,7 +224,10 @@ class P10_ChannelModeSet {
                        continue;
                }
                $flag = self::$modevalues[$mode];
-               return ($this->modeflags & $flag);
+               if(self::$modes[$mode] == self::MODE_TYPE_B || self::$modes[$mode] == self::MODE_TYPE_C) {
+                       return (($this->modeflags & $flag) ? $this->modeparams[$mode] : false);
+               } else
+                       return ($this->modeflags & $flag);
        }
        
 }
@@ -286,7 +289,7 @@ class P10_UserModeSet {
                        }
                        $flag = self::$modevalues[$mode];
                        $this->modeflags |= $flag;
-                       if(self::$modevalues[$mode] == self::MODE_WITH_PARAMETER) {
+                       if(self::$modes[$mode] == self::MODE_WITH_PARAMETER) {
                                $this->modeparams[$mode] = $args[$c++];
                        }
                }
@@ -317,12 +320,12 @@ class P10_UserModeSet {
                        if($add) {
                                if($returndiff && !($this->modeflags & $flag)) {
                                        $modestradd .= $mode;
-                                       if(self::$modevalues[$mode] == self::MODE_WITH_PARAMETER) {
+                                       if(self::$modes[$mode] == self::MODE_WITH_PARAMETER) {
                                                $paramstradd .= " ".$args[$c];
                                        }
                                }
                                $this->modeflags |= $flag;
-                               if(self::$modevalues[$mode] == self::MODE_WITH_PARAMETER) {
+                               if(self::$modes[$mode] == self::MODE_WITH_PARAMETER) {
                                        $this->modeparams[$mode] = $args[$c++];
                                }
                        } else {
@@ -346,7 +349,7 @@ class P10_UserModeSet {
                foreach(self::$modevalues as $mode => $flag) {
                        if(($this->modeflags & $flag)) {
                                $modestr .= $mode;
-                               if(self::$modevalues[$mode] == self::MODE_WITH_PARAMETER) {
+                               if(self::$modes[$mode] == self::MODE_WITH_PARAMETER) {
                                        $paramstr .= " ".$this->modeparams[$mode];
                                }
                        }
@@ -354,6 +357,18 @@ class P10_UserModeSet {
                return $modestr.$paramstr;
        }
        
+       public function hasMode($mode) {
+               if(!array_key_exists($mode, self::$modevalues)) {
+                       trigger_error("unknown mode (".$mode.") on setModes (".$modes.").", E_USER_WARNING);
+                       continue;
+               }
+               $flag = self::$modevalues[$mode];
+               if(self::$modes[$mode] == self::MODE_WITH_PARAMETER) {
+                       return (($this->modeflags & $flag) ? $this->modeparams[$mode] : false);
+               } else
+                       return ($this->modeflags & $flag);
+       }
+       
 }
 
 ?>
\ No newline at end of file