Added more commenting

[quix0rs-gnu-social.git] / plugins / Irc / ircmanager.php

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 93513df861a6a99316a04877755c9f6999f4ff20..b99c7b2fea3aa81a9647d4ea06b38b2c873bc624 100644 (file)
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -23,17 +23,16 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
  * IRC background connection manager for IRC-using queue handlers,
  * allowing them to send outgoing messages on the right connection.
  *
- * Input is handled during socket select loop, keepalive pings during idle.
- * Any incoming messages will be handled.
+ * Input is handled during socket select loop, Any incoming messages will be handled.
  *
  * In a multi-site queuedaemon.php run, one connection will be instantiated
  * for each site being handled by the current process that has IRC enabled.
  */
 
 class IrcManager extends ImManager {
-    public $conn = null;
-    public $regchecks = array();
-    public $regchecksLookup = array();
+    protected $conn = null;
+    protected $regchecks = array();
+    protected $regchecksLookup = array();
 
     /**
      * Initialize connection to server.
@@ -67,13 +66,18 @@ class IrcManager extends ImManager {
     /**
      * Process IRC events that have come in over the wire.
      *
-     * @param resource $socket
+     * @param resource $socket Socket to handle input on
      * @return void
      */
     public function handleInput($socket) {
         common_log(LOG_DEBUG, 'Servicing the IRC queue.');
         $this->stats('irc_process');
-        $this->conn->receive();
+
+        try {
+            $this->conn->handleEvents();
+        } catch (Phergie_Driver_Exception $e) {
+            $this->conn->reconnect();
+        }
     }
 
     /**
@@ -91,7 +95,7 @@ class IrcManager extends ImManager {
                     'connections' => array(
                         array(
                             'host' => $this->plugin->host,
-                            'port' => $port,
+                            'port' => $this->plugin->port,
                             'username' => $this->plugin->username,
                             'realname' => $this->plugin->realname,
                             'nick' => $this->plugin->nick,
@@ -103,7 +107,8 @@ class IrcManager extends ImManager {
 
                     'driver' => 'statusnet',
 
-                    'processor' => 'statusnet',
+                    'processor' => 'async',
+                    'processor.options' => array('sec' => 0, 'usec' => 0),
 
                     'plugins' => array(
                         'Pong',
@@ -117,9 +122,14 @@ class IrcManager extends ImManager {
                     'ui.enabled' => true,
 
                     'nickserv.password' => $this->plugin->nickservpassword,
+                    'nickserv.identify_message' => $this->plugin->nickservidentifyregexp,
+
                     'autojoin.channels' => $this->plugin->channels,
+
                     'statusnet.messagecallback' => array($this, 'handle_irc_message'),
-                    'statusnet.regcallback' => array($this, 'handle_reg_response')
+                    'statusnet.regcallback' => array($this, 'handle_reg_response'),
+                    'statusnet.unregregexp' => $this->plugin->unregregexp,
+                    'statusnet.regregexp' => $this->plugin->regregexp
                 )
             );
 
@@ -131,7 +141,6 @@ class IrcManager extends ImManager {
 
     /**
     * Called via a callback when a message is received
-    *
     * Passes it back to the queuing system
     *
     * @param array $data Data
@@ -151,42 +160,46 @@ class IrcManager extends ImManager {
     */
     public function handle_reg_response($data) {
         // Retrieve data
-        $nickdata = $this->regchecks[$data['nick']];
-
-        if ($data['registered']) {
-            // Send message
-            $this->plugin->send_confirmation_code($nickdata['screenname'], $nickdata['code'], $nickdata['user'], true);
-        } else {
-            $this->plugin->send_message($nickdata['screenname'], _m('Your nickname is not registered so IRC connectivity cannot be enabled'));
-
-            $confirm = new Confirm_address();
-
-            $confirm->user_id      = $user->id;
-            $confirm->address_type = $this->plugin->transport;
-
-            if ($confirm->find(true)) {
-                $result = $confirm->delete();
-
-                if (!$result) {
-                    common_log_db_error($confirm, 'DELETE', __FILE__);
-                    // TRANS: Server error thrown on database error canceling IM address confirmation.
-                    $this->serverError(_('Couldn\'t delete confirmation.'));
-                    return;
+        $screenname = $data['screenname'];
+        $nickdata = $this->regchecks[$screenname];
+        $usernick = $nickdata['user']->nickname;
+
+        if (isset($this->regchecksLookup[$usernick])) {
+            if ($data['registered']) {
+                // Send message
+                $this->plugin->send_confirmation_code($screenname, $nickdata['code'], $nickdata['user'], true);
+            } else {
+                $this->plugin->send_message($screenname, _m('Your nickname is not registered so IRC connectivity cannot be enabled'));
+
+                $confirm = new Confirm_address();
+
+                $confirm->user_id      = $user->id;
+                $confirm->address_type = $this->plugin->transport;
+
+                if ($confirm->find(true)) {
+                    $result = $confirm->delete();
+
+                    if (!$result) {
+                        common_log_db_error($confirm, 'DELETE', __FILE__);
+                        // TRANS: Server error thrown on database error canceling IM address confirmation.
+                        $this->serverError(_('Couldn\'t delete confirmation.'));
+                        return;
+                    }
                 }
             }
-        }
 
-        // Unset lookup value
-        unset($this->regchecksLookup[$nickdata['screenname']]);
+            // Unset lookup value
+            unset($this->regchecksLookup[$usernick]);
 
-        // Unset data
-        unset($this->regchecks[$data['nick']]);
+            // Unset data
+            unset($this->regchecks[$screename]);
+        }
     }
 
     /**
      * Send a message using the daemon
      *
-     * @param $data Message
+     * @param $data Message data
      * @return boolean true on success
      */
     public function send_raw_message($data) {
@@ -194,14 +207,20 @@ class IrcManager extends ImManager {
         if (!$this->conn) {
             return false;
         }
+
         if ($data['type'] != 'message') {
             // Nick checking
-            $screenname = $data['nickdata']['screenname'];
-            if (isset($this->regchecksLookup[$user->nickname])) {
+            $nickdata = $data['nickdata'];
+            $usernick = $nickdata['user']->nickname;
+            $screenname = $nickdata['screenname'];
 
+            // Cancel any existing checks for this user
+            if (isset($this->regchecksLookup[$usernick])) {
+                unset($this->regchecks[$this->regchecksLookup[$usernick]]);
             }
-            $this->regchecks[$screenname] = $data['nickdata'];
-            $this->regchecksLookup[$user->nickname] = $screenname;
+
+            $this->regchecks[$screenname] = $nickdata;
+            $this->regchecksLookup[$usernick] = $screenname;
         }
 
         try {
@@ -210,6 +229,7 @@ class IrcManager extends ImManager {
             $this->conn->reconnect();
             return false;
         }
+
         return true;
     }
 }