Changeset 204

Timestamp:

04/04/08 10:08:19 (8 months ago)

Author:

Slynderdale

Message:

Added various bug fixes, enhancements as well as removed some stay require_once statements.

Notable Changes:

• Streams: Fixed a Fatal Error due to a typo in doWhois as well as a missing constant. Added an onConnect handler that gets called when Phergie connects to the Irc server. Also added support for invisible mode.
  
• Logging: Added support to log private messages sent to the bot, added a new constant for it called query
  
• Math: Added more math support by adding more constants and functions to the allowed list
  
• Quit: Added restart and reboot commands that creates a new bot process and closes the original one
  
• Seen: Added various bug fixes and changed the seen/heard bahavior to search even channel. Also added an -all flag to search for admins to search in private messages as well
  
• Toggle: Added supported to save mute/disable statuses through restarts
  
• Url: Added better URL checking as well as support for link merging. Basicly multiple links in one emssage can be merged and sent back as one message instead of multiple messages
  

Files:

• trunk/Phergie/Bot.php (modified) (6 diffs)
• trunk/Phergie/Driver/Abstract.php (modified) (3 diffs)
• trunk/Phergie/Driver/Streams.php (modified) (7 diffs)
• trunk/Phergie/Event/Request.php (modified) (1 diff)
• trunk/Phergie/Plugin/Abstract/Base.php (modified) (3 diffs)
• trunk/Phergie/Plugin/Ctcp.php (modified) (1 diff)
• trunk/Phergie/Plugin/Dice.php (modified) (2 diffs)
• trunk/Phergie/Plugin/Drink.php (modified) (1 diff)
• trunk/Phergie/Plugin/FeedTicker.php (modified) (4 diffs)
• trunk/Phergie/Plugin/Karma.php (modified) (4 diffs)
• trunk/Phergie/Plugin/Lart.php (modified) (1 diff)
• trunk/Phergie/Plugin/Logging.php (modified) (3 diffs)
• trunk/Phergie/Plugin/Math.php (modified) (8 diffs)
• trunk/Phergie/Plugin/ModuleList.php (modified) (4 diffs)
• trunk/Phergie/Plugin/Quit.php (modified) (5 diffs)
• trunk/Phergie/Plugin/Seen.php (modified) (11 diffs)
• trunk/Phergie/Plugin/Tld.php (modified) (2 diffs)
• trunk/Phergie/Plugin/Toggle.php (modified) (1 diff)
• trunk/Phergie/Plugin/Url.php (modified) (9 diffs)
• trunk/Phergie/Plugin/Users.php (modified) (3 diffs)
• trunk/Phergie/phergie.ini (modified) (4 diffs)

trunk/Phergie/Bot.php

@@ -113 +113 @@
-* @const string
-*/
-$ini
+basename($ini)
-
-/**
@@ -120 +120 @@
-* @const string
-*/
-PHERGIE_DIR . PHERGIE_INI
+realpath($ini)
-
-/**
@@ -131 +131 @@
-function phergieAutoLoader($class) {
-    if (strpos(strtolower($class), 'phergie_') === 0) {
-explode('_', $class, 3
+array_pad(explode('_', $class, 3), 3, null
-        $name = str_replace('_', DIRECTORY_SEPARATOR, $name);
-
@@ -200 +200 @@
-        $driver = 'Streams';
-    }
-    require_once PHERGIE_DRIVER_DIR . $driver . '.php';
-    $class = 'Phergie_Driver_' . $driver;
-    $client = new $class(); 
@@ -216 +215 @@
-    $include = array();
-    if (!empty($config['plugins'])
- except 
-$match[1]
-isset
-$match[2]
+\s*except\s*
+trim(strtolower($match[1]))
+!empty
+trim($match[2])
-        }
-    }
@@ -244 +243 @@
-
-    foreach ($plugins as $plugin) {
-        require_once PHERGIE_PLUGIN_DIR . $plugin . '.php';
-        $class = 'Phergie_Plugin_' . $plugin;
-        /**

trunk/Phergie/Driver/Abstract.php

@@ -71 +71 @@
-    {
-        if (preg_match('/^([^!@]+)!([^@]+)@(.*)$/', $hostmask, $match) > 0) {
-$match
+array_pad($match, 4, null)
-        } else {
-            $host = $hostmask;
@@ -125 +125 @@
-            echo $message;
-            if ($log = $this->getIni('log') and !empty($log)) {
-$log
+realpath($log)
-            }
-        }
@@ -167 +167 @@
-                foreach ($iterator as $filename) {
-                        if ($iterator->isFile() && pathinfo($filename, PATHINFO_EXTENSION) == 'php') {
-(string) 
+
-                        }
-                }

trunk/Phergie/Driver/Streams.php

@@ -1 +1 @@
-<?php
-
-/**
-* @see Phergie_Driver_Abstract
-*/
-require_once PHERGIE_DRIVER_DIR.'Abstract.php';
-
-/**
@@ -153 +148 @@
-        unset($server, $params);
-
+        if ($this->getIni('invisible')) {
+            $this->doMode($this->getIni('nick'), '+i');
+        }
+
-        $ignore = $this->hostmasksToRegex($this->getIni('ignore'));
+
+        // Run the onConnect handler since we successfully connected to the server
+        foreach ($this->plugins as $plugin) {
+            $plugin->onConnect();
+        }
-
-        while(true) {
@@ -159 +163 @@
-            $this->queueing = true;
-
-''
- 
+null
+
-                $buffer = fgets($this->socket, 512);
-
@@ -179 +183 @@
-                        }
-            }
+            if (!isset($buffer) || empty($buffer)) {
+                continue;
+            }
-            $buffer = rtrim($buffer);
-            $this->debug('<- ' . $buffer);
-
-$buffer[0]
-explode(' ', substr($buffer, 1), 3
+substr($buffer, 0, 1)
+array_pad(explode(' ', substr($buffer, 1), 3), 3, null
-                $this->parseHostmask($prefix, $nick, $user, $host);
-            } else {
-explode(' ', $buffer, 2
+array_pad(explode(' ', $buffer, 2), 2, null
-            }
-
@@ -203 +210 @@
-                    if(substr($temp[1], 0, 1) === chr(1) && substr($temp[1], -1) === chr(1)) {
-                        $ctcp = trim(substr($temp[1], 1, -1));
-explode(' ', $ctcp.' ', 2
+array_pad(explode(' ', $ctcp, 2), 2, null
-                        $cmd = strtolower($cmd);
-
@@ -240 +247 @@
-                    if(substr($temp[1], 0, 1) === chr(1) && substr($temp[1], -1) === chr(1)) {
-                        $ctcp = trim(substr($temp[1], 1, -1));
-explode(' ', $ctcp.' ', 2
+array_pad(explode(' ', $ctcp, 2), 2, null
-                        $cmd = strtolower($cmd);
-
@@ -496 +503 @@
-    public function doWhois($nick)
-    {
-se
+es
-    }
-

trunk/Phergie/Event/Request.php

@@ -14 +14 @@
-    */
-    const TYPE_NICK = 'nick';
+
+    /**
+    * Whois message
+    *
+    * @const string
+    */
+    const TYPE_WHOIS = 'whois';
-
-    /**

trunk/Phergie/Plugin/Abstract/Base.php

@@ -431 +431 @@
-
-        if ($time > 0 || count($return) <= 0) {
-$time
+($time > 0 ? $time : '0')
-        }
-
@@ -725 +725 @@
-
-    /**
+    * Handler for when the bot connects to the server
+    *
+    * @return void
+    */
+    public function onConnect() { }
+
+    /**
+    * Handler for each iteration of the while loop while connected to the
+    * server
+    *
+    * @return void
+    */
+    public function onTick() { }
+
+    /**
-    * Handler for when PHP throws an error
-    *
@@ -745 +760 @@
-        $source = null;
-        if (isset($arguments[0])) {
-$arguments[0]
-
-isset
+strtolower($arguments[0])
+
+!empty
-            (isset($this->muted['global']) && $this->muted['global'])) &&
-            substr($method, 0, 2) === 'do') {

trunk/Phergie/Plugin/Ctcp.php

@@ -59 +59 @@
-            $name = $this->getIni('nick');
-            $realname = $this->getIni('realname');
+            $username = $this->getIni('username');
-
-
+
+
-            $this->doCtcpReply($source, 'finger', $finger);
-        }

trunk/Phergie/Plugin/Dice.php

@@ -69 +69 @@
-            } elseif ($substr === ')') {
-                $out .= $substr;
+                $next = substr($expr, 1, $ptr+1);
+                if (!empty($next) && !in_array($next, array('+', '-', '/', '*', ')'))) {
+                    $out .= '*';
+                }
-                $expr = substr($expr, $ptr);
-                $ptr = 0;
@@ -170 +174 @@
-        $source = $this->event->getSource();
-        $ctcp = strtoupper($this->event->getArgument(1));
-explode(' ', $ctcp.' ', 2
+array_pad(explode(' ', $ctcp, 2), 2, null
-
-        if (($ctcp == 'DICE' || $ctcp == 'ROLL') and $result =  $this->processDice($message)) {

trunk/Phergie/Plugin/Drink.php

@@ -353 +353 @@
-
-    /**
+    * Alias to Beer
+    *
+    * @param string $target Target for the request
+    * @return void
+    */
+    public function onDoBooze($target)
+    {
+        $this->throwDrink('beer', $target);
+    }
+
+    /**
-    * Handles cocktail requests.
-    *

trunk/Phergie/Plugin/FeedTicker.php

@@ -164 +164 @@
-    {
-        if (!empty ($this->queue) && time() > $this->nextOutput) {
-shift($this->queue
+pad(array_shift($this->queue), 4, null
-            foreach ($chans as $chan) {
-                $this->doPrivmsg(
@@ -208 +208 @@
-        // Retrieve each feed
-        foreach ($this->feeds as $id => $feed) {
-$feed
+array_pad($feed, 2, null)
-
-            $content = @file_get_contents($url, null, $context);
@@ -218 +218 @@
-            try {
-                // RSS/RDF Feed
-pos($content, '<rss version=') !== false || str
+ipos($content, '<rss version=') !== false || stri
-                    $xml = new SimpleXMLElement($content);
-                    $feedTitle = (string) $xml->channel->title;
@@ -224 +224 @@
-                        $retrieved[$id][] = array((string) $item->title, (string) $item->link, $chans, $feedTitle);
-                    }
-
+i
-                    $xml = new SimpleXMLElement($content);
-                    $feedTitle = (string) $xml->title;

trunk/Phergie/Plugin/Karma.php

@@ -61 +61 @@
-    protected $negativeAnswers;
-
-#@+
+
-     * Prepared PDO statements
-     *
@@ -70 +70 @@
-    protected $fetchKarma;
-    protected $insertComment;
-    /**#@-*/
-
-    /**
@@ -92 +91 @@
-
-        $this->fixedKarma = array (
-
-
-
+
+
+
+
+
-            'chuck norris' => '%s has karma of Warning: Integer out of range',
-
-
-
-
-
-
-
-
-
-=> 'I
+           
+           
+       
+        
+    
+       
+        
+         
+         
+           => '%s
-            'karma' => 'The karma law says that all living creatures are responsible for their karma - their actions and the effects of their actions. You should watch yours.'
-        );
@@ -282 +283 @@
-            $m[3] = (isset($m[5]) ? $m[5] : null); # Comment
-            unset($m[4], $m[5]);
-$sign, $word, $comment) = $m
+ $sign, $word, $comment) = array_pad($m, 4, null)
-
-            // Clean the word

trunk/Phergie/Plugin/Lart.php

@@ -346 +346 @@
-        }
-
-    
-    
-    
-                   list (, $address, $name) = $match
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-        list (, $address, $name, $definition) = $match
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-                   list (, $address, $name) = $match
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+   
+   
+   
+                   list (, $address, $name) = array_pad($match, 3, null)
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+       list (, $address, $name, $definition) = array_pad($match, 4, null)
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+                   list (, $address, $name) = array_pad($match, 3, null)
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
-    }
-

trunk/Phergie/Plugin/Logging.php

@@ -83 +83 @@
-    */
-    const TOPIC = 9;
+
+    /**
+    * Indicates a QUERY event in the type column of the logs table
+    * This indicates that the message type is a PM
+    *
+    * @const int
+    */
+    const QUERY = 10;
-
-    /**
@@ -212 +220 @@
-        parent::onPrivmsg();
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    }
-
@@ -352 +358 @@
-
-    public static function databaseExists() {
-self::$db
+is_object(self::$db)
-    }
-

trunk/Phergie/Plugin/Math.php

@@ -9 +9 @@
-{
-    /**
+    * Backwards compatibility for constants not defined in PHP 5.1.x
+    */
+    public function init()
+    {
+        if (version_compare('5.2', PHP_VERSION, '>')) {
+            define('M_EULER', '0.57721566490153286061');
+            define('M_LNPI', '1.14472988584940017414');
+            define('M_SQRT3', '1.73205080756887729352');
+            define('M_SQRTPI', '1.77245385090551602729');
+        }
+    }
+
+    /**
-    * Holds the allowed function, characters, operators and constants
-    *
@@ -19 +32 @@
-        'abs(', 'ceil(', 'floor(', 'exp(',
-        'log10(',
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    );
-
@@ -32 +62 @@
-        'round(', 'log(', 'pow(',
-        'max(', 'min(', 'rand(',
+        'atan2(', 'mt_rand(',
+        'base_convert('
-    );
-
-    /**
+    * Custom functions as defined in $classFuncs to be used in math operations
+    * these automatically get prepended with $this-> before the calculations
+    * take place.
+    */
+    //return sine of <an angle in degrees>
+    protected function sind($degrees) {
+        return sin(deg2rad($degrees));
+    }
+    //return cosd of <an angle in degrees>
+    protected function cosd($degrees) {
+        return cos(deg2rad($degrees));
+    }
+    //return tand of <an angle in degrees>
+    protected function tand($degrees) {
+        return tan(deg2rad($degrees));
+    }
+    //return atand of <an angle in degrees>
+    protected function atand($x) {
+        return rad2deg(atan($x));
+    }
+    //return asind of <an angle in degrees>
+    protected function asind($x) {
+        return rad2deg(asin($x));
+    }
+    //return acosd of <an angle in degrees>
+    protected function acosd($x) {
+        return rad2deg(acos($x));
+    }
+
+    /**
-    * Processes a request to perform a calculations.
-    *
@@ -40 +102 @@
-    * @return void
-    */
-
+, $quietMode = false
-    {
-        $user = $this->event->getNick();
@@ -51 +113 @@
-        );
-        $equationSrc = $equation;
+        $this->allowed = array_merge($this->allowed, $this->classFuncs);
-
-        // Parse equation
@@ -94 +157 @@
-
-                $out .= $substr;
+                $next = substr($equation, 1, $ptr+1);
+                if (!empty($next) && !in_array($next, array('+', '-', '/', '*', ')'))) {
+                    $out .= '*';
+                }
-                $equation = substr($equation, $ptr);
-                $ptr = 0;
-            // Parse error if we've consumed the entire equation without finding anything valid
-            } elseif ($ptr >= strlen($equation)) {
-
+
+
+
-                return;
-            } else {
@@ -104 +173 @@
-            }
-        }
+
+        foreach ($this->classFuncs as $func) {
+            $out = str_replace($func, '$this->' . $func, $out);
+        }
+
-        $res = @eval('return ' . $out . ';');
-        $source = $this->event->getSource();
-        if($res === false) {
-
+
+
+
-        } else {
-
+user .': Result -> ' . $
-        }
-    }
@@ -120 +196 @@
-    public function onDoMath($expr)
-    {
+        $this->processRequest($expr, true);
+    }
+
+    /**
+    * Forwards calc commands onto a central handler.
+    *
+    * @return void
+    */
+    public function onDoCalc($expr)
+    {
-        $this->processRequest($expr);
-    }
-
-    /**
-    * Forwards calc commands onto a central handler.
-    *
-    * @return void
-    */
-    public function onDoCalc($expr)
-    {
-        $this->processRequest($expr);
-    }
-}

trunk/Phergie/Plugin/ModuleList.php

@@ -96 +96 @@
-
-                    // Checks to see if the plugin is a muted plugin or not
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                    } else {
-                        $pluginData['Unmuted'][] = $plugin;
@@ -131 +130 @@
-                // Extended/Verbose plugins list that shows every plugin and their state
-                $state = null;
-$args['v']
+isset($args['v'])
-                    foreach ($this->verboseList as $key => $value) {
-                        if (isset($pluginData[$key]) and is_array($pluginData[$key]) &&
@@ -147 +146 @@
-        // Go through the list of any passed arugments and generate the plugin list for them
-        $message = null;
-$args['v']
+isset($args['v'])
-            foreach($args as $arg => $value) {
-                $plugin = $this->argList[$arg];
@@ -163 +162 @@
-        // If the message is empty, aka no args were passed, return the full plugin list
-        if (empty($message)) {
-$args['v']
+isset($args['v'])
-            if (is_array($pluginData[$display])) {
-                sort($pluginData[$display]);

trunk/Phergie/Plugin/Quit.php

@@ -8 +8 @@
-{
-    /**
- 
- 
- 
- 
+
+
+
+
-    public $needsAdmin = true;
-
-    /**
- 
- 
- 
- 
+
+
+
+
-    protected $messages = array
-    (
@@ -29 +29 @@
-
-    /**
+    * Path to the PHP executable file
+    *
+    * @var string
+    */
+    protected $phpPath;
+
+    /**
+    * Attempts to auto-detect the path to the PHP executable if the path isn't
+    * set in the setting file
+    *
+    * @return void
+    */
+    public function init()
+    {
+        $phpPath = trim($this->getPluginIni('php_path'));
+        if (empty($phpPath) || !is_file($phpPath) ||
+            strtolower($phpPath) == 'autodetect' || strtolower($phpPath) == 'auto-detect') {
+            /**
+            * Array of file names to check for when auto-detecting the path to PHP
+            */
+            $files = array(
+                'php',
+                'php.exe',
+                'php-win.exe'
+            );
+
+            /**
+            * Array of file paths to check for the PHP executable
+            */
+            $paths = array();
+            if (strtolower(substr(PHP_OS, 0, 3)) === 'win') {
+                $paths = array_merge($paths, explode(';', ini_get('include_path')));
+                $paths = array_merge($paths, explode(';', ini_get('extension_dir')));
+            } else {
+                $paths = array_merge($paths, explode(':', ini_get('include_path')));
+                $paths = array_merge($paths, explode(':', ini_get('extension_dir')));
+            }
+
+            if (!empty($phpPath) &&
+                strtolower($phpPath) != 'autodetect' && strtolower($phpPath) != 'auto-detect') {
+                $files[] = $phpPath;
+                $paths[] = $phpPath;
+            }
+
+            /**
+            * Attempt to auto-detect the path to the PHP executable from the list of file names and paths