X-Git-Url: http://git.pk910.de/?p=PHP-P10.git;a=blobdiff_plain;f=Uplink%2FP10_Channel.class.php;h=b194b8206ba4ee39ee6b554a3501b975ef126318;hp=e373d55c75b3988acaa90f530b37a3d3ac02c825;hb=7f51193ddac01b0540000c756c50167ff015e02a;hpb=db1190e9fd749fbf6221838845150f0a7b3bba92

diff --git a/Uplink/P10_Channel.class.php b/Uplink/P10_Channel.class.php
index e373d55..b194b82 100644
--- a/Uplink/P10_Channel.class.php
+++ b/Uplink/P10_Channel.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,29 +13,19 @@
  * 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_Channel.class.php
  *
  * This class represents a IRC Channel
  *
- ************************************************************************
- * accessable methods:
- *
- * static P10_User getChannelByName(String $name) 
- *     searches and returns the Channel with the provided name
- *
- * __construct(String $name)
- *     *** nothing to say here ***
- *
  */
 
 class P10_Channel {
 	private static $static_channels = array();
-	
+
 	public static function getChannelByName($name) {
 		$name = strtolower($name);
 		if(array_key_exists($name, self::$static_channels)) {
@@ -45,79 +33,80 @@ class P10_Channel {
 		}
 		return NULL;
 	}
-	
+
 	public static function getChannels() {
 		return self::$static_channels;
 	}
-	
+
 	public static function getChannelCount() {
 		return count(self::$static_channels);
 	}
-	
+
 	public static function recheckAllChannels() {
 		foreach(self::$static_channels as $channel) {
 			$channel->checkChannel();
 		}
-	}	
-	
+	}
+
 	private $name;
 	private $topic;
 	private $modes;
 	private $create_time;
 	private $users = array();
 	const USERPRIV_OPED  = 0x0001;
-	const USERPRIV_VOICE = 0x0002;
+	const USERPRIV_HALFOP = 0x0002;
+	const USERPRIV_VOICE = 0x0004;
 	private $userPrivs = array();
-	
+
 	public function __construct($name) {
 		$this->name = $name;
 		$this->modes = new P10_ChannelModeSet($this);
 		$this->create_time = time();
 		self::$static_channels[strtolower($name)] = $this;
 	}
-	
+
 	public function getName() {
 		return $this->name;
 	}
-	
+
 	public function getModes() {
 		return $this->modes;
 	}
-	
+
 	public function setTopic($topic) {
 		$this->topic = $topic;
 	}
-	
+
 	public function getTopic() {
 		return $this->topic;
 	}
-	
+
 	public function setCreateTime($time) {
 		$this->create_time = $time;
 	}
-	
+
 	public function getCreateTime() {
 		return $this->create_time;
 	}
-	
+
 	public function joinUser($user) {
 		$this->users[$user->getNumeric()] = $user;
 		$this->userPrivs[$user->getNumeric()] = 0;
 		$user->addChannel($this);
 	}
-	
-	public function burstUser($user, $opped, $voiced) {
+
+	public function burstUser($user, $opped, $halfopped, $voiced) {
 		$this->users[$user->getNumeric()] = $user;
-		$this->userPrivs[$user->getNumeric()] = ($opped ? self::USERPRIV_OPED : 0) | ($voiced ? self::USERPRIV_VOICE : 0);
+		$this->userPrivs[$user->getNumeric()] = ($opped ? self::USERPRIV_OPED : 0) | ($halfopped ? self::USERPRIV_HALFOP : 0) | ($voiced ? self::USERPRIV_VOICE : 0);
 		$user->addChannel($this);
 	}
-	
+
 	private function checkChannel() {
 		if(count($this->users) == 0 && !$this->modes->hasMode('z')) {
 			unset(self::$static_channels[strtolower($this->name)]); //drop empty channel
 		}
 	}
-	
+
 	public function quitUser($user) {
 		if(array_key_exists($user->getNumeric(), $this->users)) {
 			unset($this->users[$user->getNumeric()]);
@@ -128,7 +117,7 @@ class P10_Channel {
 			trigger_error("Tried to quit a User from a Channel it is not joined.", E_USER_WARNING);
 		}
 	}
-	
+
 	public function partUser($user) {
 		if(array_key_exists($user->getNumeric(), $this->users)) {
 			unset($this->users[$user->getNumeric()]);
@@ -139,24 +128,28 @@ class P10_Channel {
 			trigger_error("Tried to part a User from a Channel it is not joined.", E_USER_WARNING);
 		}
 	}
-	
+
 	public function getUserPrivs($user) {
 		if(array_key_exists($user->getNumeric(), $this->users)) {
 			return $this->userPrivs[$user->getNumeric()];
-		} else 
-			return 0;
+		} else
+		return 0;
 	}
-	
+
 	public function setUserPrivs($user, $privs) {
 		if(array_key_exists($user->getNumeric(), $this->users)) {
 			$this->userPrivs[$user->getNumeric()] = $privs;
 		}
 	}
-	
+
+	public function getUserCount() {
+		return count($this->users);
+	}
+
 	public function getUsers() {
 		return $this->users;
 	}
-	
+
 }
 
 ?>
\ No newline at end of file