Add callback for status changes

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 6dc1c49826c088a909968b526b7002a4ab02d59d..05edf86d8b3553dbe29b8436f1e328c8d8cb6d56 100644 (file)
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -900,6 +900,14 @@ class MSN {
                 $this->addContact($email, 1, $email, true);\r
                 $this->connectToSBSession('Passive', $sb_ip, $sb_port, $email, array('sid' => $sid, 'ticket' => $ticket));\r
                 break;\r
+            \r
+            case 'NLN':\r
+                // NS: <<< NLN {status} {email} {networkid} {nickname} {clientid} {dpobj}\r
+                // NS: <<< NLN NLN darkip@inflatablegoldfish.com 1 Luke 2685403136 0\r
+                @list(/* NLN */, $email, $network, $nickname, /* clientid */, /* dbobj */) = @explode(' ', $data);\r
+                $this->callHandler('StatusChange', array('screenname' => $email, 'network' => $network, 'nickname' => $nickname));\r
+                break;\r
+            \r
             case 'OUT':\r
                 // force logout from NS\r
                 // NS: <<< OUT xxx\r
@@ -3092,7 +3100,7 @@ X-OIM-Sequence-Num: 1
      *\r
      * Handler List\r
      * IMIn, Pong, ConnectFailed, Reconnect,\r
-     * AddedToList, RemovedFromList\r
+     * AddedToList, RemovedFromList, StatusChange\r
      *\r
      * @param string $event Event name\r
      * @param string $handler User function to call\r

diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 9826608ea61f915fb5798c3745b53015c20693b0..8322cde32d2f280fecd1ec9c7c77fc11e7079df0 100644 (file)
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -93,7 +93,7 @@ class MsnManager extends ImManager {
     *\r
     * @return void\r
     */\r
-    function connect() {\r
+    public function connect() {\r
         if (!$this->conn) {\r
             $this->conn = new MSN(\r
                 array(\r
@@ -161,7 +161,7 @@ class MsnManager extends ImManager {
     * @param void $data Not used (there to keep callback happy)\r
     * @return void\r
     */\r
-    function handle_connect_failed($data) {\r
+    private function handle_connect_failed($data) {\r
         common_log(LOG_NOTICE, 'MSN connect failed, retrying');\r
     }\r
 \r
@@ -171,9 +171,18 @@ class MsnManager extends ImManager {
     * @param void $data Not used (there to keep callback happy)\r
     * @return void\r
     */\r
-    function handle_reconnect($data) {\r
+    private function handle_reconnect($data) {\r
         common_log(LOG_NOTICE, 'MSN reconnecting');\r
     }\r
+    \r
+    /**\r
+     * Called by callback when contact changes status\r
+     * \r
+     * @param array $data Data\r
+     */\r
+    private function handle_status_change($data) {\r
+        \r
+    }\r
 \r
     /**\r
      * Send a message using the daemon\r
@@ -181,7 +190,7 @@ class MsnManager extends ImManager {
      * @param $data Message\r
      * @return boolean true on success\r
      */\r
-    function send_raw_message($data) {\r
+    public function send_raw_message($data) {\r
         $this->connect();\r
         if (!$this->conn) {\r
             return false;\r