Changeset 17

Timestamp:

02/08/08 00:57:36 (5 years ago)

Author:

Seldaek

Message:

+ adds Debug (command is 'mem') plugin
+ adds Users (internal static use only) plugin
* bugfix in AdminCommand?
* added .adminOps to AdminCommand? (and child classes)

Location:

trunk/Phergie/Event/Handler

Files:

• AdminCommand.php (modified) (4 diffs)
• Debug.php (added)
• Users.php (added)

trunk/Phergie/Event/Handler/AdminCommand.php

@@ -5 +5 @@
 */
 require_once 'Phergie/Event/Handler.php';
+
+/**
+* @see Phergie_Event_Handler_Users
+*/
+require_once 'Phergie/Event/Handler/Users.php';
 
 /**
@@ -29 +34 @@
 {
         protected $_admins = array();
+        protected $_adminOps = array();
 
     public function isAdmin(Phergie_Event_Request $event, $__class__ = __CLASS__)
     {
         $class = substr($__class__, 22);
-        if ($this->_admins[$class] === null) {
+        if (!isset($this->_admins[$class])) {
                 $this->initialize($class);
         }
         $mask = $event->getNick() .'!'. $event->getUsername() .'@'. $event->getHost();
+                // Check if is op and ops are admins
+                if($this->_adminOps[$class] === true && Phergie_Event_Handler_Users::isOp($event->getNick(), $event->getArgument(0)) === true) {
+                        return true;
+                }
         // Try to match mask against admin masks
         foreach ($this->_admins[$class] as $admin) {
@@ -48 +58 @@
     protected function initialize($class)
     {
+        // Set adminOps values
+        $ini = $this->getIni($class.'.adminOps');
+        if ($ini===null) {
+                $ini = $this->getIni('AdminCommand.adminOps');
+        }
+        if ($ini==='true' || $ini==='1') {
+                $this->_adminOps[$class] = true;
+        } else {
+                $this->_adminOps[$class] = false;
+        }
+
+        // Set admins values
         $ini = $this->getIni($class.'.admins');
-        if(empty($ini))
+        if ($ini===null) {
                 $ini = $this->getIni('AdminCommand.admins');
+        }
         $admins = explode(',', $ini);
-        $this->_admins = array();
         foreach ($admins as $admin) {
                 // Find out which chars are present in the config mask and exclude them from the regex match
@@ -70 +92 @@
                 );
                 // Replace * so that they match correctly in a regex
-                $this->_admins[] = str_replace('*', ($excluded === '' ? '.*' : '[^'.$excluded.']*'), $admin);
+                $this->_admins[$class][] = str_replace('*', ($excluded === '' ? '.*' : '[^'.$excluded.']*'), $admin);
         }
     }