Changeset 11

Timestamp:

02/06/08 22:57:05 (5 years ago)

Author:

Seldaek

Message:

fixes #7
* bugfix in AdminCommand?
* added some comments in DNSLookup

Location:

trunk/Phergie/Event/Handler

Files:

• AdminCommand.php (modified) (1 diff)
• DNSLookup.php (modified) (1 diff)
• Karma.php (added)

trunk/Phergie/Event/Handler/AdminCommand.php

@@ -66 +66 @@
                 );
                 // Replace * so that they match correctly in a regex
-                $this->_admins[] = str_replace('*', ($excluded === '' ? '.*' : '[^'.$excluded.']'), $admin);
+                $this->_admins[] = str_replace('*', ($excluded === '' ? '.*' : '[^'.$excluded.']*'), $admin);
         }
     }

trunk/Phergie/Event/Handler/DNSLookup.php

@@ -10 +10 @@
     public function onPrivmsg(Phergie_Event_Request $event)
     {
+        // Check if we have [rev]dns IP-address and if the IP is valid
         if (preg_match('#^(?:rev)?dns ((?:[0-9]{1,3}\.){3}[0-9]{1,3})$#i', $event->getArgument(1), $m) && ip2long($m[1]) !== false) {
                 $this->doPrivmsg($event->getArgument(0), $m[1].' resolved as '.gethostbyaddr(long2ip(ip2long($m[1]))));
-        } elseif (preg_match('#^(?:rev)?dns ((?:[a-z0-9]+\.)+[a-z]{2,6})$#i', $event->getArgument(1), $m)) {
+        }
+        // Check if we have [rev]dns host
+        elseif (preg_match('#^(?:rev)?dns ((?:[a-z0-9]+\.)+[a-z]{2,6})$#i', $event->getArgument(1), $m)) {
                 if(($ip = gethostbyname($m[1])) !== $m[1]) {
                 $this->doPrivmsg($event->getArgument(0), $m[1] .' resolved as '.$ip);