X-Git-Url: http://git.pk910.de/?p=PHP-P10.git;a=blobdiff_plain;f=Uplink%2FP10_ModeSets.class.php;h=aaaf8e73fb2e8c23a9bfe00052f4341ddb7d6fd0;hp=264a53f94d7c86f711b25f6be3f80a37810937fa;hb=7f51193ddac01b0540000c756c50167ff015e02a;hpb=455040407c031d33129808462d42414c577863b4

diff --git a/Uplink/P10_ModeSets.class.php b/Uplink/P10_ModeSets.class.php
index 264a53f..aaaf8e7 100644
--- a/Uplink/P10_ModeSets.class.php
+++ b/Uplink/P10_ModeSets.class.php
@@ -1,12 +1,10 @@
 <?php
-/********************************* PHP-P10 ******************************
- *    P10 uplink class by pk910   (c)2011 pk910                         *
- ************************************************************************
- *                          Version 2 (OOP)                             *
+/******************************* PHP-P10 v2 *****************************
+ * Copyright (C) 2011-2012  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,      *
@@ -15,11 +13,10 @@
  * 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/>. *
  *                                                                      *
  ************************************************************************
- * 
+ *
  *  Uplink/P10_ModeSets.class.php
  *
  * classes to parse and store channel or user modes
@@ -70,16 +67,18 @@ class P10_ChannelModeSet {
 		"d" => self::MODE_TYPE_D,
 		"R" => self::MODE_TYPE_D,
 		"z" => self::MODE_TYPE_D,
-		
-		//special behavior
+		"S" => self::MODE_TYPE_D,
+
+	//special behavior
 		"o" => self::MODE_TYPE_B,
+        "h" => self::MODE_TYPE_B,
 		"v" => self::MODE_TYPE_B
 	);
 	private static $modevalues = null;
 	private $modeflags = 0;
 	private $modeparams = array();
 	private $channel;
-	
+
 	public function __construct($channel) {
 		if(self::$modevalues == null) {
 			//build modevalues array
@@ -92,7 +91,7 @@ class P10_ChannelModeSet {
 		}
 		$this->channel = $channel;
 	}
-	
+
 	public function parseModes($modes) {
 		$args = explode(" ",$modes);
 		$c = 1;
@@ -108,15 +107,15 @@ 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++];
 			}
 		}
 		return $c-1;
 	}
-	
+
 	public function setModes($modes, $returndiff = false) {
 		$args = explode(" ",$modes);
 		$c = 1;
@@ -131,7 +130,7 @@ class P10_ChannelModeSet {
 				$add = true;
 				continue;
 			}
-			if($mode == "-") { 
+			if($mode == "-") {
 				$add = false;
 				continue;
 			}
@@ -139,7 +138,7 @@ class P10_ChannelModeSet {
 				trigger_error("unknown mode (".$mode.") on setModes (".$modes.").", E_USER_WARNING);
 				continue;
 			}
-			if($mode == "o" || $mode == "v") {
+			if($mode == "o" || $mode == "h" || $mode == "v") {
 				if($this->setPrivs($add, $mode, $args[$c++])) {
 					if($returndiff && $add) {
 						$modestradd .= $mode;
@@ -150,31 +149,42 @@ class P10_ChannelModeSet {
 					}
 				}
 				continue;
+			} else if($mode == "b") {
+				if($this->handleBan($add, $mode, $args[$c++])) {
+					if($returndiff && $add) {
+						$modestradd .= $mode;
+						$paramstradd .= " ".$args[$c-1];
+					} else if($returndiff && !$add) {
+						$modestrdel .= $mode;
+						$paramstrdel .= " ".$args[$c-1];
+					}
+				}
+				continue;
 			}
 			$flag = self::$modevalues[$mode];
 			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) {
@@ -184,7 +194,12 @@ class P10_ChannelModeSet {
 			return $modediff;
 		}
 	}
-	
+
+	private function handleBan($add, $mode, $mask) {
+		//no ban management right now...
+		return true;
+	}
+
 	private function setPrivs($add, $mode, $user) {
 		$user = P10_User::getUserByNum($user);
 		if($user == null) {
@@ -194,30 +209,43 @@ class P10_ChannelModeSet {
 		$privs = $this->channel->getUserPrivs($user);
 		$privFlag = 0;
 		if($mode == "o") $privFlag = P10_Channel::USERPRIV_OPED;
+		if($mode == "h") $privFlag = P10_Channel::USERPRIV_HALFOP;
 		if($mode == "v") $privFlag = P10_Channel::USERPRIV_VOICE;
 		if(!($add xor ($privs & $privFlag)))
-			return false;
+		return false;
 		if($add) $privs |= $privFlag;
 		else $privs &= ~$privFlag;
 		$this->channel->setUserPrivs($user, $privs);
 		return true;
-		
+
 	}
-	
+
 	public function getModeString() {
 		$modestr = "+";
 		$paramstr = "";
 		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_TYPE_B || self::$modes[$mode] == self::MODE_TYPE_C) {
 					$paramstr .= " ".$this->modeparams[$mode];
 				}
 			}
 		}
 		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_TYPE_B || self::$modes[$mode] == self::MODE_TYPE_C) {
+			return (($this->modeflags & $flag) ? $this->modeparams[$mode] : false);
+		} else
+		return ($this->modeflags & $flag);
+	}
+
 }
 
 class P10_UserModeSet {
@@ -230,7 +258,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,
@@ -247,7 +275,7 @@ class P10_UserModeSet {
 	private static $modevalues = null;
 	private $modeflags = 0;
 	private $modeparams = array();
-	
+
 	public function __construct($modes) {
 		if(self::$modevalues == null) {
 			//build modevalues array
@@ -260,7 +288,7 @@ class P10_UserModeSet {
 		}
 		$this->parseModes($modes);
 	}
-	
+
 	public function parseModes($modes) {
 		$args = explode(" ",$modes);
 		$c = 1;
@@ -277,12 +305,12 @@ 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++];
 			}
 		}
 	}
-	
+
 	public function setModes($modes, $returndiff = false) {
 		$args = explode(" ",$modes);
 		$c = 1;
@@ -296,7 +324,7 @@ class P10_UserModeSet {
 				$add = true;
 				continue;
 			}
-			if($mode == "-") { 
+			if($mode == "-") {
 				$add = false;
 				continue;
 			}
@@ -308,12 +336,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 {
@@ -330,21 +358,33 @@ class P10_UserModeSet {
 			return $modediff;
 		}
 	}
-	
+
 	public function getModeString() {
 		$modestr = "+";
 		$paramstr = "";
 		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];
 				}
 			}
 		}
 		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