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

diff --git a/Uplink/P10_ModeSets.class.php b/Uplink/P10_ModeSets.class.php
index 9eb36ea..b003057 100644
--- a/Uplink/P10_ModeSets.class.php
+++ b/Uplink/P10_ModeSets.class.php
@@ -67,9 +67,11 @@ class P10_ChannelModeSet {
 		"d" => self::MODE_TYPE_D,
 		"R" => self::MODE_TYPE_D,
 		"z" => self::MODE_TYPE_D,
+		"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;
@@ -136,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;
@@ -147,6 +149,17 @@ 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) {
@@ -182,6 +195,11 @@ class P10_ChannelModeSet {
 		}
 	}
 	
+	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) {
@@ -191,6 +209,7 @@ 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;