From 6127794f2933681e60538ef2c9f5f04f3c9ea5da Mon Sep 17 00:00:00 2001
From: pk910 <philipp@zoelle1.de>
Date: Thu, 28 Jul 2011 06:26:06 +0200
Subject: [PATCH] fixed P10_ModeSets.class.php

---
 Uplink/P10_ModeSets.class.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Uplink/P10_ModeSets.class.php b/Uplink/P10_ModeSets.class.php
index d5088a2..2d1d03d 100644
--- 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,7 @@ class P10_ChannelModeSet {
 			continue;
 		}
 		$flag = self::$modevalues[$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) {
 			return (($this->modeflags & $flag) ? $this->modeparams[$mode] : false);
 		} else
 			return ($this->modeflags & $flag);
@@ -289,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++];
 			}
 		}
@@ -320,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 {
@@ -349,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];
 				}
 			}
@@ -363,7 +363,7 @@ class P10_UserModeSet {
 			continue;
 		}
 		$flag = self::$modevalues[$mode];
-		if(self::$modevalues[$mode] == self::MODE_WITH_PARAMETER) {
+		if(self::$modes[$mode] == self::MODE_WITH_PARAMETER) {
 			return (($this->modeflags & $flag) ? $this->modeparams[$mode] : false);
 		} else
 			return ($this->modeflags & $flag);
-- 
2.20.1