Added some more error handling and commenting

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index f00333d72870348df01dc86c9317455a4e1ed0ca..acbc6446e08945f40d250a3873b22913b0682440 100644 (file)
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -118,6 +118,11 @@ class MsnPlugin extends ImPlugin {
         }\r
     }\r
 \r
+    /*\r
+     * Start manager on daemon start\r
+     * \r
+     * @return boolean\r
+     */\r
     public function onStartImDaemonIoManagers(&$classes) {\r
         parent::onStartImDaemonIoManagers(&$classes);\r
         $classes[] = new MsnManager($this); // handles sending/receiving\r

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 378a3eb3ced5264b7578f44bd36ad90254989d02..3d33340b2284c384c9655d219bc8aab06f09a628 100644 (file)
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -1455,7 +1455,6 @@ class MSN {
     private function sendMessageViaSB($to, $message) {\r
         $socket = $this->switchBoardSessionLookup[$to];\r
         if (self::socketcheck($socket)) {\r
-            $this->endSBSession($socket);\r
             return false;\r
         }\r
         \r
@@ -1469,21 +1468,24 @@ class MSN {
 \r
         $aMessage = $this->getMessage($Message);\r
         // CheckEmotion...\r
-        $MsnObjDefine=$this->GetMsnObjDefine($aMessage);\r
+        $MsnObjDefine = $this->GetMsnObjDefine($aMessage);\r
         if ($MsnObjDefine !== '') {\r
             $SendString = "MIME-Version: 1.0\r\nContent-Type: text/x-mms-emoticon\r\n\r\n$MsnObjDefine";\r
             $len = strlen($SendString);\r
-            // TODO handle failure during write to socket\r
-            $this->sb_writeln($socket, $id, "MSG $id N $len");\r
-            $this->sb_writedata($socket, $SendString);\r
+\r
+            if ($this->sb_writeln($socket, $id, "MSG $id N $len") === false ||\r
+                $this->sb_writedata($socket, $SendString) === false) {\r
+                    return false;\r
+                }\r
         }\r
         $len = strlen($aMessage);\r
-        // TODO handle failure during write to socket\r
-        $this->sb_writeln($socket, $id, "MSG $id N $len");\r
-        $this->sb_writedata($socket, $aMessage);\r
 \r
-        // Don't close the SB session, we might as well leave it open\r
+        if ($this->sb_writeln($socket, $id, "MSG $id N $len") === false ||\r
+            $this->sb_writedata($socket, $aMessage) === false) {\r
+                return false;\r
+            }\r
 \r
+        // Don't close the SB session, we might as well leave it open\r
         return true;\r
     }\r
 \r
@@ -1995,7 +1997,6 @@ X-OIM-Sequence-Num: 1
                 $str = '<ml l="1"><d n="'.$u_domain.'"><c n="'.$u_name.'" l="'.$l.'" t="'.$network.'" /></d></ml>';\r
                 $len = strlen($str);\r
                 // NS: >>> ADL {id} {size}\r
-                //TODO introduce error checking\r
                 $this->ns_writeln("ADL $this->id $len");\r
                 $this->ns_writedata($str);\r
             }\r

diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 66152f0d2a3b979760b12a33aecea3a73e191785..9826608ea61f915fb5798c3745b53015c20693b0 100644 (file)
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -134,7 +134,9 @@ class MsnManager extends ImManager {
 \r
     /**\r
      * Update the time till the next ping\r
+     * \r
      * @param $data Time till next ping\r
+     * @return void\r
      */\r
     private function update_ping_time($data) {\r
         $pingInterval = $data;\r
@@ -173,6 +175,12 @@ class MsnManager extends ImManager {
         common_log(LOG_NOTICE, 'MSN reconnecting');\r
     }\r
 \r
+    /**\r
+     * Send a message using the daemon\r
+     * \r
+     * @param $data Message\r
+     * @return boolean true on success\r
+     */\r
     function send_raw_message($data) {\r
         $this->connect();\r
         if (!$this->conn) {\r