Changeset 179

Timestamp:

03/21/08 22:40:41 (8 months ago)

Author:

Slynderdale

Message:

Some minor bug fixes and code improvements as well as some added debug info if debug mode is enabled.

Files:

• trunk/Phergie/Plugin/Abstract/Base.php (modified) (1 diff)
• trunk/Phergie/Plugin/Abstract/Command.php (modified) (3 diffs)
• trunk/Phergie/Plugin/ChuckNorris.php (modified) (1 diff)
• trunk/Phergie/Plugin/Convert.php (modified) (2 diffs)
• trunk/Phergie/Plugin/Drink.php (modified) (6 diffs)
• trunk/Phergie/Plugin/Karma.php (modified) (7 diffs)
• trunk/Phergie/Plugin/Toggle.php (modified) (3 diffs)

trunk/Phergie/Plugin/Abstract/Base.php

@@ -397 +397 @@
-        }
-
-
+ || count($return) <= 0
-                        $return[] = $time . 's';
-                }

trunk/Phergie/Plugin/Abstract/Command.php

@@ -38 +38 @@
-    * @return void
-    */
-adminCommand
+forceBotPrefix
-    {
-        if (!$this->methods) {
@@ -56 +56 @@
-        // Checks to see if the command was prefixed with the bot's name
-        $target = $this->event->getArgument(0);
-
-
-
+
+
-
-        if (preg_match('/^'.$exp.'(\S+)(?:[\s'.chr(240).']+(.*))?$/', $message, $match)) {
@@ -66 +65 @@
-            // Checks the command for a prefix if one is specified in the config
-            $commandPrefix = trim($this->getIni('command_prefix'));
-
-
-
+
+
+
+
+
+
+
-            }
-

trunk/Phergie/Plugin/ChuckNorris.php

@@ -173 +173 @@
-        // Checks to see if the chuckfacts table exists
-        $table = $this->db
-"SELECT COUNT(*) FROM sqlite_master WHERE name = 'chuckfacts'"
+'SELECT COUNT(*) FROM sqlite_master WHERE name = ' . $this->db->quote('chuckfacts')
-            ->fetchColumn();
-
-        // If the table doesn't exist, create them and return true for the next step
-        if (!$table) {
-  $this->debug('Creating tables.
+$this->debug('Creating the database schema
-            $this->db->exec('CREATE TABLE chuckfacts (facts VARCHAR(255))');
-            $this->db->exec('CREATE UNIQUE INDEX chuckfacts_name ON chuckfacts (facts)');

trunk/Phergie/Plugin/Convert.php

@@ -7 +7 @@
-
-/**
- 
+
-* between different units.
-*/
@@ -25 +25 @@
-        )));
-
-ie=utf-8&oe=utf-8&aq=t&rls=org.mozilla:en-US:official&client=firefox-a
+btnG=Google+Search&aq=f
-        $contents = @file_get_contents($url, null, $context);
-        if (empty($contents)) {

trunk/Phergie/Plugin/Drink.php

@@ -95 +95 @@
-            // Populate the database if necessary
-            if ($this->needTable('beer')) {
+                $this->debug('Retrieving data for: Beer');
-                $contents = @file_get_contents('http://beerme.com/beerlist.php');
-                if ($contents !== false) {
+                        $this->debug('Parsing data for: Beer');
-                    preg_match_all('/brewery\.php\?[0-9]+#[0-9]+\'>([^<]+)/', $contents, $matches);
-                    $names = array();
@@ -119 +121 @@
-                $limit = 2;
-                $names = array();
+                $this->debug('Retrieving data for: Cocktail');
-                for ($i = 1; $i <= $limit; $i += 150) {
-                    $contents = @file_get_contents('http://www.webtender.com/db/browse?level=2&dir=drinks&char=%2A&start=' . $i);
@@ -124 +127 @@
-                        break;
-                    }
+                    $this->debug('Parsing data for: Cocktail (' . $i . ' - ' . ($i + 150) . ')');
-                    if ($i == 1) {
-                        preg_match('/>([0-9]+) found\\.</', $contents, $match);
@@ -144 +148 @@
-
-            if ($this->needTable('coke')) {
+                $this->debug('Retrieving data for: Coke');
-                $contents = @file_get_contents('http://www.energyfiend.com/huge-caffeine-database/');
-                if ($contents) {
+                        $this->debug('Parsing data for: Coke');
-                    // List of drinks to filter out
-                    $filter = array(
@@ -169 +175 @@
-
-            if ($this->needTable('tea')) {
+                $this->debug('Retrieving data for: Tea');
-                $names = @file('http://www.midnight-labs.org/tea.txt');
-                if ($names) {
+                        $this->debug('Parsing data for: Tea');
-                    foreach ($names as $key => $value) {
-                        $names[$key] = ucwords(rtrim($value));
@@ -233 +241 @@
-    private function populateTable($table, $names)
-    {
+        $this->debug('Creating the database schema for: ' . ucfirst($table));
-        $this->db->exec('CREATE TABLE ' . $table . ' (name VARCHAR(255))');
-        $this->db->exec('CREATE UNIQUE INDEX ' . $table . '_name ON ' . $table . ' (name)');

trunk/Phergie/Plugin/Karma.php

@@ -132 +132 @@
-        if (!file_exists($db)) {
-            $this->db = new PDO('sqlite:' . $db);
+
+            $this->debug('Creating the database schema');
-            $this->db->query('
-                CREATE TABLE karmas ( word VARCHAR ( 255 ) , karma MEDIUMINT ) ;
@@ -169 +171 @@
-
-        $this->fetchKarma = $this->db->prepare('
-word = :word
+LOWER(word) = LOWER(:word)
-        ');
-
-        $this->updateKarma = $this->db->prepare('
-word = :word
+LOWER(word) = LOWER(:word)
-        ');
-    }
@@ -211 +213 @@
-
-        // Command prefix check
-
-
+
+
+
-
-        // Karma status request
-(?:'.$prefix.')
+'.$exp.'
-            // Return user's value if "me" is requested
-            if (strtolower($m[1]) === 'me') {
@@ -246 +249 @@
-            }
-        // Incrementation/decrementation request
-(?:'.$prefix.')
+'.$exp.'
-            $word = strtolower($m[1]);
-            // Strip parenthesis grouping multiple words
@@ -287 +290 @@
-                    ':word' => $word
-                );
+                $this->debug('Updated karma: '. $word . ' = ' . ($res['karma'] + ($m[2]=='++' ? 1 : -1)));
-                $this->updateKarma->execute($args);
-            } else {
@@ -293 +297 @@
-                    ':karma' => ($m[2]=='++' ? '1' : '-1')
-                );
+                $this->debug('Inserted karma: '. $word . ' = ' . ($m[2]=='++' ? '1' : '-1'));
-                $this->insertKarma->execute($args);
-                $this->fetchKarma->execute(array(':word'=>$word));
@@ -302 +307 @@
-            $comment = preg_replace('{(?:^//(.*)|^#(.*)|^/\*(.*?)\*/$)}', '$1$2$3', $m[3]);
-            if (!empty($comment)) {
+                $this->debug('Inserted comment: '. $comment);
-                $this->insertComment->execute(array(':wordid' => $id, ':comment' => $comment));
-            }

trunk/Phergie/Plugin/Toggle.php

@@ -60 +60 @@
-                                }
-
+
-                                // Plugin file was found, check if it can be loaded
-                                if (isset($target)) {
@@ -81 +82 @@
-        public function onDoMute($plugin, $target='')
-        {
-trim((!empty($target) && $this->fromAdmin(false)) ? $target : $this->event->getSource(
+strtolower(trim((!empty($target) && $this->fromAdmin(false)) ? $target : $this->event->getSource()
-                if (!empty($target)) {
-                if ($instance = $this->getPlugin($plugin)) {
-                        $instance->muted[$target] = true;
-
+
+
-                } else {
-                        $this->doPrivmsg($this->event->getSource(), 'Plugin '.$plugin.' not found, could not mute.');
@@ -98 +100 @@
-                    if ($instance = $this->getPlugin($plugin)) {
-                        $instance->muted[$target] = false;
-
+
+
-                } else {
-                        $this->doPrivmsg($this->event->getSource(), 'Plugin '.$plugin.' not found, could not unmute.');