Another year is about to end... So we have to update these damn copyright information :P

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

diff --git a/Uplink/P10_ModeSets.class.php b/Uplink/P10_ModeSets.class.php
index 2d1d03d9af4b094ef0f2a3732821337b5b89d91e..2515984924327babca14a522a77257a370b95b01 100644 (file)
--- 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-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,      *
  * 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/>. *
  *                                                                      *
  ************************************************************************
  * 
@@ -70,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;
@@ -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,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) {
@@ -185,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) {
@@ -194,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;
@@ -242,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,