$this->regCallback = NULL;\r
}\r
\r
- $this->unregRegexp = $this->config['statusnet.unregregexp'];\r
- if (!$this->unregRegexp) {\r
- $this->unregRegexp = '/\x02(.*?)\x02 (?:isn\'t|is not) registered/i';\r
- }\r
-\r
- $this->regRegexp = $this->config['statusnet.regregexp'];\r
- if (!$this->regRegexp) {\r
- $this->regRegexp = '/(?:\A|\x02)(\w+?)\x02? (?:\(account|is \w+?\z)/i';\r
- }\r
+ $this->unregRegexp = $this->getConfig('statusnet.unregregexp', '/\x02(.*?)\x02 (?:isn\'t|is not) registered/i');\r
+ $this->regRegexp = $this->getConfig('statusnet.regregexp', '/(?:\A|\x02)(\w+?)\x02? (?:\(account|is \w+?\z)/i');\r
}\r
\r
/**\r
if ($this->messageCallback !== NULL) {\r
$event = $this->getEvent();\r
$source = $event->getSource();\r
+ $sender = $event->getNick();\r
$message = trim($event->getText());\r
\r
- call_user_func($this->messageCallback, array('sender' => $source, 'message' => $message));\r
+ call_user_func($this->messageCallback, array('source' => $source, 'sender' => $sender, 'message' => $message));\r
}\r
}\r
\r
* @return void\r
*/\r
public function onNotice() {\r
- $event = $this->getEvent();\r
- if ($event->getNick() == 'NickServ') {\r
- $message = $event->getArgument(1);\r
- if (preg_match($this->unregRegexp, $message, $groups)) {\r
- $screenname = $groups[1];\r
- call_user_func($this->regCallback, array('screenname' => $screenname, 'registered' => false));\r
- } elseif (preg_match($this->regRegexp, $message, $groups)) {\r
- $screenname = $groups[1];\r
- call_user_func($this->regCallback, array('screenname' => $screenname, 'registered' => true));\r
+ if ($this->regCallback !== NULL) {\r
+ $event = $this->getEvent();\r
+ if ($event->getNick() == 'NickServ') {\r
+ $message = $event->getArgument(1);\r
+ if (preg_match($this->unregRegexp, $message, $groups)) {\r
+ $screenname = $groups[1];\r
+ call_user_func($this->regCallback, array('screenname' => $screenname, 'registered' => false));\r
+ } elseif (preg_match($this->regRegexp, $message, $groups)) {\r
+ $screenname = $groups[1];\r
+ call_user_func($this->regCallback, array('screenname' => $screenname, 'registered' => true));\r
+ }\r
}\r
}\r
}\r