Changeset 223

Timestamp:

04/13/08 00:21:06 (7 months ago)

Author:

Slynderdale

Message:

Various bug fixes and enhancements:

Notable Changes:

• Bot.php: The auto loader now strips out the "Phergie_" prefix from class names while getting the path to the class file to include for those who don't have the bot in a directory called Phergie. Both the Phergie directory and the parent directory were added to the include path. Also added a check to see if they have a timezone is set in PHP.ini, if not, set the timezone to the default timezone to prevent strict errors while using date.
  
• Streams.php: Added support for invite requests and also fixed a small bug where an empty command gets ent to call_user_func due to a packet getting cut off.
  
• Base.php: Added onInvite and changed fromAdmin so the first argunent needs to be set to true for hostmask admin checking.
  
• Lart.php: Improved lart a bit and fixed bugs where you couldn't remove certain terms due to spacing/character casing issues
  
• Seen.php: Added a quote command to get a random quote by a specified user
  
• Users.php: Renamed Users to ServerInfo to prepare it for future changes to make it store more information about users, channels and the server. Also fixed a bug where halfops and voiced users were considered an OP.
  

Files:

• trunk/Phergie/Bot.php (modified) (5 diffs)
• trunk/Phergie/Driver/Streams.php (modified) (2 diffs)
• trunk/Phergie/Plugin/Abstract/Base.php (modified) (7 diffs)
• trunk/Phergie/Plugin/Abstract/Command.php (modified) (1 diff)
• trunk/Phergie/Plugin/Acronym.php (modified) (1 diff)
• trunk/Phergie/Plugin/ChuckNorris.php (modified) (1 diff)
• trunk/Phergie/Plugin/Daddy.php (modified) (1 diff)
• trunk/Phergie/Plugin/Eval.php (modified) (2 diffs)
• trunk/Phergie/Plugin/JoinPart.php (modified) (4 diffs)
• trunk/Phergie/Plugin/Karma.php (modified) (2 diffs)
• trunk/Phergie/Plugin/Lart.php (modified) (13 diffs)
• trunk/Phergie/Plugin/Logging.php (modified) (3 diffs)
• trunk/Phergie/Plugin/ModuleList.php (modified) (1 diff)
• trunk/Phergie/Plugin/Nickserv.php (modified) (1 diff)
• trunk/Phergie/Plugin/Puppet.php (modified) (1 diff)
• trunk/Phergie/Plugin/Quit.php (modified) (7 diffs)
• trunk/Phergie/Plugin/Sed.php (modified) (1 diff)
• trunk/Phergie/Plugin/Seen.php (modified) (8 diffs)
• trunk/Phergie/Plugin/ServerInfo.php (added)
• trunk/Phergie/Plugin/Set.php (modified) (2 diffs)
• trunk/Phergie/Plugin/Tld.php (modified) (2 diffs)
• trunk/Phergie/Plugin/Toggle.php (modified) (4 diffs)
• trunk/Phergie/Plugin/Users.php (deleted)

trunk/Phergie/Bot.php

@@ -13 +13 @@
-    trigger_error('Fatal error: PHP 5.1.2+ is required, current version: ' . PHP_VERSION, E_USER_ERROR);
-
-    
-    
-    
+
+
+
-} elseif (version_compare('5.2', PHP_VERSION, '>')) {
-    trigger_error('Warning: PHP 5.2+ is recommended, current version: ' . PHP_VERSION, E_USER_WARNING);
@@ -40 +40 @@
- * @const string
- */
+define('PHERGIE_BASE_DIR', dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR);
+
+/**
+ * Path to the directory containing the actual Phergie files
+ *
+ * @const string
+ */
-define('PHERGIE_DIR', dirname(__FILE__) . DIRECTORY_SEPARATOR);
-
@@ -52 +59 @@
- * Add the Phergie directory to the include path
- */
-dirname(PHERGIE_DIR)
+PHERGIE_DIR . PATH_SEPARATOR. PHERGIE_BASE_DIR
-
-/**
@@ -60 +67 @@
-    trigger_error('Phergie requires the CLI SAPI in order to run', E_USER_ERROR);
-}
+
+/**
+ * Check to see if date.timezone is empty in the PHP.ini, if so, set the
+ * default timezone to prevent strict errors.
+ */
+ $timezone = ini_get('date.timezone');
+if (empty($timezone)) {
+    trigger_error('The default timezone wasn\'t set, defaulting to "' . date_default_timezone_get() . '."', E_USER_NOTICE);
+    date_default_timezone_set(date_default_timezone_get());
+}
+unset($timezone);
-
-/**
@@ -106 +124 @@
-function phergieAutoLoader($class)
-{
-
+
+
+
+
+
-    require_once ($file);
-    if (class_exists($class)) {

trunk/Phergie/Driver/Streams.php

@@ -256 +256 @@
-                case 'part':
-                case 'kill':
+                case 'invite':
-                    $args = preg_split('/ :?/', $args, 2);
-                break;
@@ -324 +325 @@
-                    $plugin->onResponse();
-                // Skip events from ignored users
-
-event->getType()
+ && !empty($cmd)
+cmd
-                }
-            }

trunk/Phergie/Plugin/Abstract/Base.php

@@ -219 +219 @@
-    public function tinyUrl($url)
-    {
+        $tiny = $url;
-        if (strlen($url) > 30) {
-            $opts = array(
@@ -235 +236 @@
-                $tiny = $url;
-            }
-        } else {
-            $tiny = $url;
-        }
-
@@ -293 +292 @@
-            // 2 bytes, 11 bits
-            case ($code&0x7FF):
-
+
+
-
-            // 3 bytes, 16 bits
-            case ($code&0xFFFF):
-
+
+
+
-
-            // 4 bytes, 21 bits
-            case ($code&0x1FFFFF):
-
+
+
+
+
-        }
-    }
@@ -491 +496 @@
-     * op.
-     *
-
+
+
-     * @return bool TRUE if the message originated from an authorized
-     *              individual, FALSE otherwise
-     */
-includeOps = tru
+hostmaskAdminOnly = fals
-    {
-        $class = $this->getName();
@@ -514 +520 @@
-
-        // Try to match mask against admin masks
-isset
+!empty
-            preg_match($this->adminList[$class], $this->event->getHostmask())) {
-            return true;
@@ -520 +526 @@
-
-        // Check if is op and ops are admins
-$includeOps && isset($this->opList[$class]) && $this->pluginLoaded('Users
+!$hostmaskAdminOnly && !empty($this->opList[$class]) && $this->pluginLoaded('ServerInfo
-            $nick = $this->event->getNick();
-            $source = $this->event->getSource();
-Users
+ServerInfo
-                return true;
-            }
@@ -742 +748 @@
-
-    /**
+     * Handler for when a user sends an invite request
+     *
+     * @return void
+     */
+    public function onInvite() { }
+
+    /**
-     * Handler for when PHP throws an error
-     *

trunk/Phergie/Plugin/Abstract/Command.php

@@ -61 +61 @@
-        $bot = $this->getIni('nick');
-        // The Botprefix regex expression
-:
+[:,>]
-
-        if (preg_match('/^' . $exp . '(\S+)(?:[\s' . chr(240) . ']+(.*))?$/', $message, $match)) {

trunk/Phergie/Plugin/Acronym.php

@@ -82 +82 @@
-        } while ($target[0] != '#' && $randomUser);
-        if ($randomUser) {
-Users
+ServerInfo
-                $nick = $this->getIni('nick');
-                do {
-Users
+ServerInfo
-                } while ($user == $nick);
-            } else {

trunk/Phergie/Plugin/ChuckNorris.php

@@ -266 +266 @@
-        // Check to see if the message includes the word Chuck Norris. If so, check to see if
-        // it was a bot request by checking for Fact: at the begiining and also do a floodpro check
-:
+[:,>]
-            strtolower(substr($message, 0, 5)) != 'fact:' && ($source[0] != '#' ||
-            (!empty($m[1]) || $this->chance <= 0 || $this->chance >= 100 || mt_rand(1, 100) < $this->chance) &&
-
+
+
-            $fact = $this->praiseChuckNorris();
-            if (!empty($fact)) {

trunk/Phergie/Plugin/Daddy.php

@@ -18 +18 @@
-        $text = $this->event->getArgument(1);
-        $target = $this->event->getNick();
-:
+[:,>]
-            if ($this->getIni('curses') && mt_rand(0, 5) === 5) {
-                $this->doPrivmsg($this->event->getSource(), $target . ': I am your ' . $m[1] . ', bitch!');

trunk/Phergie/Plugin/Eval.php

@@ -24 +24 @@
-
-        // Check to see if the admin is a hostmask admin only and not an op
-fals
+tru
-            $code = trim($code);
-            if (empty($code)) {
@@ -76 +76 @@
-
-        // Check to see if the admin is a hostmask admin only and not an op
-fals
+tru
-            $code = trim($code);
-            if (empty($code)) {

trunk/Phergie/Plugin/JoinPart.php

@@ -19 +19 @@
-     * @var bool
-     */
-users
+serverInfo
-
-    /**
@@ -29 +29 @@
-    {
-        if (!empty($channel)) {
-
+
+
-        }
-    }
@@ -50 +51 @@
-        // Check whether a channel or multiple channels were given as well as a reason
-        } else if (preg_match('/^([#&][^\s,]+ (?:\s*,+\s* [#&][^\s,]+)* | all | \#)?(?:[\s,]+)?(.*)?$/xis', $channel, $match)) {
-strtolower($match[1])
+$match[1]
-            if (!empty($channels) || $source[0] == '#') {
-                if (empty($channels) || $channels == '#') {
@@ -57 +58 @@
-                } else if ($channels == 'all') {
-                    //Check to see if the Users plugin is enabled  to retrieve a list of channels
-users
-usersEnabled = $this->pluginLoaded('Users
+serverInfo
+serverInfoEnabled = $this->pluginLoaded('ServerInfo
-                    }
-users
+serverInfo
-                        // A fallback, most IRC servers cause the user to part all channels if they try to join 0
-                        $this->doJoin('0');
-                    } else {
-Users
+ServerInfo
-                    }
-                }

trunk/Phergie/Plugin/Karma.php

@@ -232 +232 @@
-        $prefix = preg_quote(trim($this->getIni('command_prefix')));
-        $bot = preg_quote($this->getIni('nick'));
-:
+[:,>]
-
-        // Karma status request
@@ -297 +297 @@
-
-            // Force a decrementation if someone tries to update his own karma
-fals
+tru
-                $this->doNotice($target, 'Bad ' . $target . '! You can not modify your own Karma. Shame on you!');
-                $sign = '--';

trunk/Phergie/Plugin/Lart.php

@@ -66 +66 @@
-
-    /**
-     * An array used to store recursive aliases for the getAliases function
-     *
-     * @var array
-     */
-    protected $aCache;
-
-    /**
-     * Creates the database if needed, connects to it, and sets up prepared
-     * statements for common operations.
@@ -105 +98 @@
-            $columns = array();
-            foreach($table as $key => $column) {
-$column['name']
+trim(strtolower($column['name']))
-            }
-            unset($table);
@@ -173 +166 @@
-    protected function getDefinition($term)
-    {
-$term
-$term
+trim(strtolower($term))
+trim($term)
-            $definition = $this->defination->fetchColumn();
-            if ($definition) {
-$term
+trim(strtolower($term))
-            } else {
-                return false;
-            }
-        }
-$term
+trim(strtolower($term))
-    }
-
@@ -194 +187 @@
-    protected function getAlias($definition)
-    {
-$definition
+trim($definition)
-        $names = $this->alias->fetchAll();
-        if ($names && count($names) > 0) {
@@ -218 +211 @@
-
-        $definition = trim($this->getDefinition($message));
-strtolower($message
+trim(strtolower($message)
-
-        if (!empty($definition)) {
-            do {
-strtolower($message) == strtolower($definition
+trim(strtolower($message)) == trim(strtolower($definition)
-                    break;
-                }
@@ -246 +239 @@
-            } while(!empty($redirect));
-
-$definition
+strtolower($definition)
-                $definition = trim(substr($definition, 3));
-                $this->doAction($this->event->getSource(), $definition);
@@ -262 +255 @@
-     * @return array An array of aliases for the given term
-     */
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-            foreach($alias as $key => $value) {
-                $name = $value['name'];
-                if (empty($name)) continue;
-this->a
-this->aCache[] = strtolower($name)
+alias
+aliasCache[] = $name
-                    if ($recursive) {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    }
-
@@ -302 +290 @@
-            $this->debug('Removing term: ' . $name);
-            $this->delete->execute(array(':name' => $name));
-$name
+trim(strtolower($name))
-        } else {
-            $aliases = $this->getAliases($name);
@@ -311 +299 @@
-            foreach($aliases as $key => $alias) {
-                $this->delete->execute(array(':name' => $alias));
-$alias
+trim(strtolower($alias))
-            }
-        }
@@ -343 +331 @@
-
-        $adminOnly = $this->getPluginIni('admin_only');
-:
+[:,>]
-            if ($this->fromAdmin()) {
-                list(, $address, $name) = array_pad($match, 3, null);
-strtolower($name)
+$name
-                if (!empty($name)) {
-                    $this->select->execute(array(':name' => $name));
@@ -355 +343 @@
-                        $host = (isset($info['hostmask']) ? substr($info['hostmask'], 0, strpos($info['hostmask'], '!')) : 'N/A');
-                        $time = (isset($info['tstamp']) ? $this->getCountdown(time() -$info['tstamp']) : 'N/A');
-, false
+
-                        $aliases = (count($aliases) > 0 ? implode(', ', $aliases) : 'N/A');
-
@@ -370 +358 @@
-                $this->doNotice($target, 'You do not have permission to view the lart info.');
-            }
-:
+[:,>]
-            list(, $address, $name, $definition) = array_pad($match, 4, null);
-            if (!empty($name) && !empty($definition) && (empty($address) xor $source[0] == '#')) {
@@ -377 +365 @@
-                    $definition = trim($definition);
-
-
-
-
-
+
+
+
+
+
+
-                } else {
-                    $this->doNotice($target, 'You do not have permission to add larts.');
-                }
-            }
-:
+[:,>]
-            if (!$adminOnly || $this->fromAdmin()) {
-                list(, $address, $name) = array_pad($match, 3, null);
+                $name = trim($name);
-                if (!empty($name) && (empty($address) xor $source[0] == '#')) {
-
-
-
+
+
+
+
+
+
+
-                }
-            } else {

trunk/Phergie/Plugin/Logging.php

@@ -164 +164 @@
-    public static function checkDependencies(Phergie_Driver_Abstract $client, array$plugins)
-    {
-Users
+ServerInfo
-            return false;
-        }
@@ -321 +321 @@
-        $nick = $this->event->getNick();
-
-Users
+ServerInfo
-            $this->insertEvent(
-                self::QUIT,
@@ -340 +340 @@
-        $nick = $this->event->getNick();
-
-Users
+ServerInfo
-            $this->insertEvent(
-                self::NICK,

trunk/Phergie/Plugin/ModuleList.php

@@ -57 +57 @@
-        $source = $this->event->getSource();
-        $rawArgs = $this->parseArguments($rawArgs);
-fals
+tru
-        $pluginData = array();
-

trunk/Phergie/Plugin/Nickserv.php

@@ -110 +110 @@
-    {
-        $user = $this->event->getNick();
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            }
-        } else {

trunk/Phergie/Plugin/Puppet.php

@@ -54 +54 @@
-    {
-        $user = $this->event->getNick();
-fals
+tru
-            $this->doRaw($message);
-        } else {

trunk/Phergie/Plugin/Quit.php

@@ -58 +58 @@
-             */
-            $paths = array();
-
-
-
-
-
-
-
+
+
-
-            if (!empty($phpPath) &&
@@ -183 +178 @@
-    {
-        $user = $this->event->getNick();
-fals
+tru
-            $this->handleQuit($message);
-        } else {
@@ -198 +193 @@
-    {
-        $user = $this->event->getNick();
-fals
+tru
-            $this->handleQuit($message);
-        } else {
@@ -213 +208 @@
-    {
-        $user = $this->event->getNick();
-fals
+tru
-            $this->handleQuit($message);
-        } else {
@@ -228 +223 @@
-    {
-        $user = $this->event->getNick();
-fals
+tru
-            $this->handleQuit($message, true);
-        } else {
@@ -243 +238 @@
-    {
-        $user = $this->event->getNick();
-fals
+tru
-            $this->handleReboot($message);
-        } else {
@@ -258 +253 @@
-    {
-        $user = $this->event->getNick();
-fals
+tru
-            $this->handleReboot($message);
-        } else {

trunk/Phergie/Plugin/Sed.php

@@ -78 +78 @@
-
-        // The regex used to match the Sed search/replace syntax
-:
+[:,>]
-        if (preg_match($regex, $message, $matches)) {
-            list($match, $user, $line, $pattern, $replacement, $flags1, $limit, $flags2) = array_pad($matches, 8, NULL);

trunk/Phergie/Plugin/Seen.php

@@ -24 +24 @@
-
-    /**
-
+
+
+
+
+
+
+
+
+
-     * which a particular user is most likely to be present in a particular
-     * channel
@@ -31 +39 @@
-     */
-    protected $willsee;
+
+    /**
+     * Prepared statement for searching for a random logged message originating
+     * from a particular user
+     *
+     * @var PDOStatement
+     */
+    protected $quote;
-
-    /**
@@ -98 +114 @@
-                LIMIT 1
-            ');
+
+            $this->quote = Phergie_Plugin_Logging::prepare('
+                SELECT tstamp, chan, message
+                FROM logs
+                WHERE type = ' . Phergie_Plugin_Logging::PRIVMSG . '
+                AND LOWER(nick) = LOWER(:name)
+                ORDER BY RANDOM()
+                LIMIT 1,1
+            ');
-        } catch (PDOException $e) { }
-    }
@@ -150 +175 @@
-            $searchAll = true;
-        }
-fals
+tru
-
-        $source = $this->event->getSource();
@@ -173 +198 @@
-                $source,
-                sprintf(
-: %s
+ "%s"
-                    ($source[0] == '#' ? $target . ': ' : ''),
-                    $row['nick'],
@@ -230 +255 @@
-                $source,
-                sprintf(
-: %s
+ "%s"
-                    $target,
-                    $user,
@@ -289 +314 @@
-                $source,
-                sprintf(
-: %s
+ "%s"
-                    $target,
-                    $user,
@@ -374 +399 @@
-        $this->doPrivmsg($source, $message);
-    }
+
+    /**
+     * Responds to requests for a random message originating from a particular
+     * user.
+     *
+     * @param string $user Nick of the user to search for
+     * @return void
+     */
+    public function onDoQuote($user)
+    {
+        if (!Phergie_Plugin_Logging::databaseExists()) {
+            return;
+        }
+
+        // Don't match if user has a space (obviously it's not a nick)
+        if (strpos($user, ' ') !== false) {
+            return;
+        }
+
+        $source = $this->event->getSource();
+        $target = $this->event->getNick();
+
+        // Handle cases where the bot is the subject
+        if (strtolower($user) == strtolower($this->getIni('nick'))) {
+            $this->doPrivmsg($source, $target . ': Everything I say is amazing, how can I choose just one?');
+            return;
+        }
+
+        // Handle 'me' alias
+        if ($user == 'me') {
+            $user = $target;
+        }
+
+        // Get the last event from the specified user
+        $params = array(
+            ':name' => $user
+        );
+
+        $this->quote->execute($params);
+        $row = $this->quote->fetch(PDO::FETCH_ASSOC);
+
+        // Send the last action if available
+        if ($row) {
+            $this->doPrivmsg(
+                $source,
+                sprintf(
+                    '%s: %s was quoted saying "%s" on %s (%s ago)',
+                    $target,
+                    $user,
+                    $row['message'],
+                    $row['chan'],
+                    $this->formatTimestamp($row['tstamp'])
+                )
+            );
+        } else {
+            $this->doNotice($target, 'I have no records for ' . $user);
+        }
+    }
-}

trunk/Phergie/Plugin/Set.php

@@ -19 +19 @@
-    {
-        $user = $this->event->getNick();
-fals
+tru
-            $append = $var === '-a' || $var === 'append' || $var === '-append';
-            // Got an append parameter, so we shift value/tmp down to var/value
@@ -55 +55 @@
-    {
-        $user = $this->event->getNick();
-fals
+tru
-            $this->doPrivmsg($this->event->getSource(), $var . ' = ' . $this->getIni($var));
-        } else {

trunk/Phergie/Plugin/Tld.php

@@ -73 +73 @@
-
-                foreach($pragma as $key => $column) {
-$column['name']
+tr