X-Git-Url: http://git.pk910.de/?p=PHP-P10.git;a=blobdiff_plain;f=Uplink%2FP10_ModeSets.class.php;h=9eb36eab7a60b14b1aa6d5bed5ca06c6b0baad7d;hp=e03521d24ab83fb25a426ed87a22ec36d2e6ce88;hb=0f30e96ae37491aee19e72b89cc54a6798d1f254;hpb=61ea565f8e0161c0f0f75aac75682941fc2a3611

diff --git a/Uplink/P10_ModeSets.class.php b/Uplink/P10_ModeSets.class.php
index e03521d..9eb36ea 100644
--- a/Uplink/P10_ModeSets.class.php
+++ b/Uplink/P10_ModeSets.class.php
@@ -1,22 +1,19 @@
 <?php
-/********************************* PHP-P10 ******************************
- *    P10 uplink class by pk910   (c)2011 pk910                         *
- ************************************************************************
- *                          Version 2 (OOP)                             *
+/******************************* PHP-P10 v2 *****************************
+ * Copyright (C) 2011  Philipp Kreil (pk910)                            *
  *                                                                      *
- * PHP-P10 is free software; you can redistribute it and/or modify      *
+ * This program is free software: you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or    *
+ * the Free Software Foundation, either version 3 of the License, or    *
  * (at your option) any later version.                                  *
- *                                                                      *
+ *                                                                      * 
  * This program is distributed in the hope that it will be useful,      *
  * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
  * GNU General Public License for more details.                         *
  *                                                                      *
  * You should have received a copy of the GNU General Public License    *
- * along with PHP-P10; if not, write to the Free Software Foundation,   *
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.       *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
  *                                                                      *
  ************************************************************************
  * 
@@ -108,9 +105,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 +152,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 +207,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 +221,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);
 	}
 	
 }
@@ -239,7 +239,7 @@ class P10_UserModeSet {
 		"s" => self::MODE_WITHOUT_PARAMETER,
 		"d" => self::MODE_WITHOUT_PARAMETER,
 		"k" => self::MODE_WITHOUT_PARAMETER,
-		"g" => self::MODE_WITH_PARAMETER,
+		"g" => self::MODE_WITHOUT_PARAMETER,
 		"r" => self::MODE_WITH_PARAMETER,
 		"f" => self::MODE_WITH_PARAMETER,
 		"n" => self::MODE_WITHOUT_PARAMETER,
@@ -286,7 +286,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 +317,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 +346,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 +354,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