Added more commenting

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

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 933cc0387887fae3b9adeed8bf012234dfff571a..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.
@@ -64,29 +63,21 @@ class IrcManager extends ImManager {
         }
     }
 
-    /**
-     * Idle processing for io manager's execution loop.
-     * Send keepalive pings to server.
-     *
-     * @return void
-     */
-    public function idle() {
-        // Call Phergie's doTick methods if necessary
-        echo "BEGIN IDLE\n";
-        $this->conn->handleEvents();
-        echo "END IDLE\n";
-    }
-
     /**
      * 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->handleEvents();
+
+        try {
+            $this->conn->handleEvents();
+        } catch (Phergie_Driver_Exception $e) {
+            $this->conn->reconnect();
+        }
     }
 
     /**
@@ -150,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
@@ -209,7 +199,7 @@ class IrcManager extends ImManager {
     /**
      * Send a message using the daemon
      *
-     * @param $data Message
+     * @param $data Message data
      * @return boolean true on success
      */
     public function send_raw_message($data) {
@@ -233,12 +223,8 @@ class IrcManager extends ImManager {
             $this->regchecksLookup[$usernick] = $screenname;
         }
 
-        $args = $data['data']['args'];
-        $lines = explode("\n", $args[1]);
         try {
-            foreach ($lines as $line) {
-                $this->conn->send($data['data']['command'], array($args[0], $line));
-            }
+            $this->conn->send($data['data']['command'], $data['data']['args']);
         } catch (Phergie_Driver_Exception $e) {
             $this->conn->reconnect();
             return false;