X-Git-Url: http://git.pk910.de/?p=PHP-P10.git;a=blobdiff_plain;f=ModCMD%2FModCMD.class.php;h=c613ecaecbef5819e77cac37380401a25466b182;hp=026b8ae5deea020ab6ffc8c5ed1a56ba38ee64f8;hb=811bc0c7a1f583fb624a0f8c3601146e063c5a25;hpb=316aa700bd3e2e0019b8e3f10b543b49b0f77f02 diff --git a/ModCMD/ModCMD.class.php b/ModCMD/ModCMD.class.php index 026b8ae..c613eca 100644 --- a/ModCMD/ModCMD.class.php +++ b/ModCMD/ModCMD.class.php @@ -1,22 +1,19 @@ . * * * ************************************************************************ * @@ -24,9 +21,6 @@ * * shares the incoming events to all bot's that request them. * - ************************************************************************ - * - * */ require_once("Binding.class.php"); @@ -40,11 +34,14 @@ define("BIND_QUIT", $bindid++); define("BIND_JOIN", $bindid++); define("BIND_PART", $bindid++); define("BIND_KICK", $bindid++); +define("BIND_AWAY", $bindid++); define("BIND_CHANMODE", $bindid++); define("BIND_CHANMSG", $bindid++); define("BIND_PRIVMSG", $bindid++); define("BIND_CHANNOTICE", $bindid++); define("BIND_PRIVNOTICE", $bindid++); +define("BIND_CTCP", $bindid++); +define("BIND_CTCPREPLY", $bindid++); define("BIND_PREPARSE", $bindid++); define("BIND_UNKNOWNCMD", $bindid++); @@ -60,24 +57,24 @@ class ModCMD implements EventHandler { return self::$eventHandler; } - public static function bind($bot, $type, $method) { + public static function bind($bot, $type, $method, $filter = NULL) { if(is_a($bot, "Bot") && method_exists($bot, $method)) { if(array_key_exists($type, self::$bindings)) { foreach(self::$bindings[$type] as $binding) { - if($binding->match($bot, $method)) + if($binding->match($bot, $method, $filter)) return; } } else self::$bindings[$type] = array(); - self::$bindings[$type][] = new Binding($bot, $method); + self::$bindings[$type][] = new Binding($bot, $method, $filter); } } - public static function unbind($bot, $type, $method) { + public static function unbind($bot, $type, $method, $filter = NULL) { if(is_a($bot, "Bot")) { if(array_key_exists($type, self::$bindings)) { foreach(self::$bindings[$type] as $id => $binding) { - if($binding->match($bot, $method)) { + if($binding->match($bot, $method, $filter)) { unset(self::$bindings[$type][$id]); break; } @@ -90,7 +87,7 @@ class ModCMD implements EventHandler { if(is_a($bot, "Bot")) { foreach(self::$bindings as $type => $bindings) { foreach($bindings as $id => $binding) { - if($binding->match($bot, null)) { + if($binding->match($bot, null, null)) { unset(self::$bindings[$type][$id]); } } @@ -101,95 +98,102 @@ class ModCMD implements EventHandler { /******************************************************************************************** * EVENT HANDLER * ********************************************************************************************/ - //All events trigger a binding. You may set the same binding for eg. CHANMODE and USERMODE (or some others) - //to get only one binding for both events... but i think that's senceless - const EVENT_NEWSERVER = BIND_NEWSERVER; - const EVENT_SQUIT = BIND_SQUIT; - const EVENT_CONNECT = BIND_CONNECT; - const EVENT_NICK = BIND_NICK; - const EVENT_USERMODE = BIND_USERMODE; - const EVENT_QUIT = BIND_QUIT; - const EVENT_JOIN = BIND_JOIN; - const EVENT_PART = BIND_PART; - const EVENT_KICK = BIND_KICK; - const EVENT_CHANMODE = BIND_CHANMODE; - const EVENT_CHANMSG = BIND_CHANMSG; - const EVENT_PRIVMSG = BIND_PRIVMSG; - const EVENT_CHANNOTICE = BIND_CHANNOTICE; - const EVENT_PRIVNOTICE = BIND_PRIVNOTICE; - const EVENT_PREPARSE = BIND_PREPARSE; - const EVENT_UNKNOWNCMD = BIND_UNKNOWNCMD; - - private function event($type, $parameters) { + + private function event($type, $parameters, $matchings = array(null)) { if(array_key_exists($type, self::$bindings)) { foreach(self::$bindings[$type] as $binding) { - $binding->trigger($parameters); + $match = false; + foreach($matchings as $matching) { + if(($match = $binding->match_filter($matching))) break; + } + if($match) + $binding->trigger($parameters); } } } public function event_newserver($server, $isBurst) { - $this->event(self::EVENT_NEWSERVER, array($server, $isBurst)); + $this->event(BIND_NEWSERVER, array($server, $isBurst)); } public function event_squit($server){ - $this->event(self::EVENT_SQUIT, array($server)); + $this->event(BIND_SQUIT, array($server)); } public function event_connect($user, $isBurst) { - $this->event(self::EVENT_CONNECT, array($user, $isBurst)); + $this->event(BIND_CONNECT, array($user, $isBurst)); } public function event_nick($user, $newNick) { - $this->event(self::EVENT_NICK, array($user, $newNick)); + $this->event(BIND_NICK, array($user, $newNick)); } public function event_usermode($user, $modes) { - $this->event(self::EVENT_USERMODE, array($user, $modes)); + $this->event(BIND_USERMODE, array($user, $modes)); } public function event_quit($user, $reason) { - $this->event(self::EVENT_QUIT, array($user, $reason)); + $this->event(BIND_QUIT, array($user, $reason)); } public function event_join($user, $channel, $isBurst) { - $this->event(self::EVENT_JOIN, array($user, $channel, $isBurst)); + $this->event(BIND_JOIN, array($user, $channel, $isBurst), array($user, $channel)); } public function event_part($user, $channel, $reason) { - $this->event(self::EVENT_PART, array($user, $channel, $reason)); + $this->event(BIND_PART, array($user, $channel, $reason), array($user, $channel)); } public function event_kick($user, $target, $channel, $reason) { - $this->event(self::EVENT_KICK, array($user, $target, $channel, $reason)); + $this->event(BIND_KICK, array($user, $target, $channel, $reason), array($user, $channel, $target)); } public function event_chanmode($user, $channel, $modes) { - $this->event(self::EVENT_CHANMODE, array($user, $channel, $modes)); + $this->event(BIND_CHANMODE, array($user, $channel, $modes), array($user, $channel)); } public function event_chanmessage($user, $channel, $message) { - $this->event(self::EVENT_CHANMSG, array($user, $channel, $message)); + $this->event(BIND_CHANMSG, array($user, $channel, $message), array($user, $channel)); } public function event_channotice($user, $channel, $message) { - $this->event(self::EVENT_CHANNOTICE, array($user, $channel, $message)); + $this->event(BIND_CHANNOTICE, array($user, $channel, $message), array($user, $channel)); } - public function event_privmessage($user, $channel, $message) { - $this->event(self::EVENT_PRIVMSG, array($user, $channel, $message)); + public function event_privmessage($user, $target, $message) { + $this->event(BIND_PRIVMSG, array($user, $target, $message), array($user, $target)); } - public function event_privnotice($user, $channel, $message) { - $this->event(self::EVENT_PRIVNOTICE, array($user, $channel, $message)); + public function event_privnotice($user, $target, $message) { + $this->event(BIND_PRIVNOTICE, array($user, $target, $message), array($user, $target)); } public function event_preparse($from, $command, $arguments) { - $this->event(self::EVENT_PREPARSE, array($from, $command, $arguments)); + $this->event(BIND_PREPARSE, array($from, $command, $arguments), array($command)); } public function event_unknown_cmd($from, $command, $arguments) { - $this->event(self::EVENT_UNKNOWNCMD, array($from, $command, $arguments)); + $this->event(BIND_UNKNOWNCMD, array($from, $command, $arguments), array($command)); + } + + public function event_chanctcp($user, $channel, $command, $text) { + $this->event(BIND_CTCP, array($user, $channel, $command, $text, true)); + } + + public function event_chanctcpreply($user, $channel, $command, $text) { + $this->event(BIND_CTCPREPLY, array($user, $channel, $command, $text, true)); + } + + public function event_privctcp($user, $target, $command, $text) { + $this->event(BIND_CTCP, array($user, $target, $command, $text, false)); + } + + public function event_privctcpreply($user, $target, $command, $text) { + $this->event(BIND_CTCPREPLY, array($user, $target, $command, $text, false)); + } + + public function event_away($user, $away) { + $this->event(BIND_AWAY, array($user, $away)); } }