X-Git-Url: http://git.pk910.de/?p=PHP-P10.git;a=blobdiff_plain;f=ModCMD%2FBinding.class.php;h=e7619b48cd54fc9adcdc456fd6b307ddeddacee2;hp=7dc0d79567d82eb96b4b91f6b20bb7734c9ba248;hb=7f51193ddac01b0540000c756c50167ff015e02a;hpb=0f30e96ae37491aee19e72b89cc54a6798d1f254

diff --git a/ModCMD/Binding.class.php b/ModCMD/Binding.class.php
index 7dc0d79..e7619b4 100644
--- a/ModCMD/Binding.class.php
+++ b/ModCMD/Binding.class.php
@@ -1,12 +1,12 @@
 <?php
 /******************************* PHP-P10 v2 *****************************
- * Copyright (C) 2011  Philipp Kreil (pk910)                            *
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)                       *
  *                                                                      *
  * 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 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        *
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>. *
  *                                                                      *
  ************************************************************************
- * 
+ *
  *  ModCMD/Binding.class.php
  *
  * a single Binding...
@@ -26,20 +26,31 @@
 class Binding {
 	private $bot;
 	private $method;
-	
-	public function __construct($bot, $method) {
+	private $filter;
+
+	public function __construct($bot, $method, $filter) {
 		$this->bot = $bot;
 		$this->method = $method;
+		$this->filter = $filter;
 	}
-	
+
 	public function trigger($params) {
 		call_user_func_array(array($this->bot, $this->method), $params);
 	}
-	
-	public function match($bot, $method) {
-		return ($bot === $this->bot && strtolower($this->method) == strtolower($method));
+
+	public function match($bot, $method, $filter) {
+		return ($bot === $this->bot && (!$method || strtolower($this->method) == strtolower($method)) && (!$filter || $this->match_filter($filter, false)));
+	}
+
+	public function match_filter($filter, $preg = true) {
+		if(!$this->filter) return true;
+		if(is_object($filter) || is_object($this->filter)) {
+			return $filter === $this->filter;
+		} else if($preg && is_string($filter && is_string($this->filter))) {
+			return preg_match($this->filter, $filter);
+		} else
+		return $filter == $this->filter;
 	}
-	
 }
 
 ?>
\ No newline at end of file