Changeset 64

Timestamp:

02/17/08 18:27:54 (5 years ago)

Author:

tobias382

Message:

* Added a check for messages containing no commands
* Added a check for blank titles to the Url plugin
* Added port and password settings to the stock config file

Location:

trunk/Phergie

Files:

• Plugin/Abstract/Command.php (modified) (1 diff)
• Plugin/Url.php (modified) (1 diff)
• phergie.ini (modified) (2 diffs)

trunk/Phergie/Plugin/Abstract/Command.php

@@ -51 +51 @@
         }
 
-        preg_match('/^(\S+)(?:\s+(.*))?$/', $message, $match);
-        $command = strtolower($match[1]);
-        $params = isset ($match[2]) ? $match[2] : array();
+        if (preg_match('/^(\S+)(?:\s+(.*))?$/', $message, $match)) {
+            $command = strtolower($match[1]);
+            $params = isset ($match[2]) ? $match[2] : array();
 
-        if (isset ($this->methods[$command])) {
-            $method = 'onDo' . ucfirst($command);
-            if (empty ($params)) {
-                if (!$this->methods[$command]) {
-                    $this->$method();
-                }
-            } else {
-                $params = preg_split('/\s+/', $params, $this->methods[$command]);
-                if ($this->methods[$command] <= count($params)) {
-                    call_user_func_array(array($this, $method), $params);
+            if (isset ($this->methods[$command])) {
+                $method = 'onDo' . ucfirst($command);
+                if (empty ($params)) {
+                    if (!$this->methods[$command]) {
+                        $this->$method();
+                    }
+                } else {
+                    $params = preg_split('/\s+/', $params, $this->methods[$command]);
+                    if ($this->methods[$command] <= count($params)) {
+                        call_user_func_array(array($this, $method), $params);
+                    }
                 }
             }

trunk/Phergie/Plugin/Url.php

@@ -84 +84 @@
             }
 
+            if (!isset($title)) {
+                $title = '[ No Title ]';
+            }
+
             $this->doPrivmsg(
                 $this->event->getSource(),

trunk/Phergie/phergie.ini

@@ -6 +6 @@
 ;    host name of the server to which the bot should connect
 server =
+
+; port :
+;    port on which the bot should connect, defaults to 6667 if none is
+;    specified; if you don't know what this is for, just leave it blank
+port =
 
 ; username :
@@ -24 +29 @@
 ;    real name to use for the bot
 realname =
+
+; password :
+;    server password to use when connecting; if you don't know what this is
+;    for, just leave it blank
+password =
 
 ; gender :