Removed hard tabs

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 350d7fca9bf951a006f9d9caeed1fa2afa97d7a5..3362c2f434b44c72c28c8dc64f2eda3ca64394d4 100644 (file)
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -23,10 +23,10 @@ class MSN {
     const PROD_KEY = 'PK}_A_0N_K%O?A9S';\r
     const PROD_ID = 'PROD0114ES4Z%Q5W';\r
     const LOGIN_METHOD = 'SSO';\r
-    \r
+\r
     const OIM_SEND_URL = 'https://ows.messenger.msn.com/OimWS/oim.asmx';\r
     const OIM_SEND_SOAP = 'http://messenger.live.com/ws/2006/09/oim/Store2';\r
-    \r
+\r
     const OIM_MAILDATA_URL = 'https://rsi.hotmail.com/rsi/rsi.asmx';\r
     const OIM_MAILDATA_SOAP = 'http://www.hotmail.msn.com/ws/2004/09/oim/rsi/GetMetadata';\r
     const OIM_READ_URL = 'https://rsi.hotmail.com/rsi/rsi.asmx';\r
@@ -42,16 +42,16 @@ class MSN {
 \r
     const DELMEMBER_URL = 'https://contacts.msn.com/abservice/SharingService.asmx';\r
     const DELMEMBER_SOAP = 'http://www.msn.com/webservices/AddressBook/DeleteMember';\r
-    \r
+\r
     // the message length (include header) is limited (maybe since WLM 8.5 released)\r
     // for WLM: 1664 bytes\r
     // for YIM: 518 bytes\r
     const MAX_MSN_MESSAGE_LEN = 1664;\r
     const MAX_YAHOO_MESSAGE_LEN = 518;\r
-    \r
+\r
     private $debug;\r
     private $timeout;\r
-    \r
+\r
     private $id;\r
     private $ticket;\r
     private $user = '';\r
@@ -76,7 +76,7 @@ class MSN {
     private $port = 1863;\r
 \r
     private $clientid = '';\r
-    \r
+\r
     private $error = '';\r
 \r
     private $authed = false;\r
@@ -181,7 +181,7 @@ class MSN {
     /**\r
      * Signon methods\r
      */\r
-    \r
+\r
     /**\r
      * Connect to the NS server\r
      *\r
@@ -345,7 +345,7 @@ class MSN {
         /* FIXME Don't implement the signon as a loop or we could hang\r
         *        the queue handler! */\r
         $this->debug_message('*** Trying to connect to MSN network');\r
-        \r
+\r
         // Remove any remaining switchboard sessions\r
         $this->switchBoardSessions = array();\r
         $this->switchBoardSessionLookup = array();\r
@@ -483,9 +483,9 @@ class MSN {
     * @return void\r
     */\r
     private function signonFailure($message) {\r
-       if(!empty($message)) {\r
+        if(!empty($message)) {\r
             $this->debug_message($message);\r
-       }\r
+        }\r
         $this->callHandler('ConnectFailed');\r
         $this->NSRetryWait($this->retry_wait);\r
     }\r
@@ -509,7 +509,7 @@ class MSN {
     /**\r
      * NS and SB command handling methods\r
      */\r
-    \r
+\r
     /**\r
      * Read and handle incoming command from NS\r
      *\r
@@ -532,7 +532,7 @@ class MSN {
             $this->signon();\r
             return;\r
         }\r
-        \r
+\r
         switch (substr($data, 0, 3)) {\r
             case 'SBS':\r
                 // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us\r
@@ -898,14 +898,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
+\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 */, $status, $email, $network, $nickname) = @explode(' ', $data);\r
                 $this->callHandler('StatusChange', array('screenname' => $email, 'status' => $status, 'network' => $network, 'nickname' => $nickname));\r
                 break;\r
-            \r
+\r
             case 'OUT':\r
                 // force logout from NS\r
                 // NS: <<< OUT xxx\r
@@ -1357,7 +1357,7 @@ class MSN {
     /**\r
      * Switchboard related methods\r
      */\r
-    \r
+\r
     /**\r
      * Send a request for a switchboard session\r
      *\r
@@ -1410,12 +1410,12 @@ class MSN {
             'offline' => false,\r
             'XFRReqTime' => time()\r
         );\r
-        \r
+\r
         // Change the index of the session to the socket\r
         $intsocket = (int) $socket;\r
         $this->switchBoardSessions[$intsocket] = $this->switchBoardSessions[$to];\r
         unset($this->switchBoardSessions[$to]);\r
-        \r
+\r
         $id = &$this->switchBoardSessions[$intsocket]['id'];\r
 \r
         if ($mode == 'Active') {\r
@@ -1432,7 +1432,7 @@ class MSN {
             $this->sb_writeln($socket, $id, "ANS $id $this->user $ticket $sid");\r
         }\r
     }\r
-    \r
+\r
     /**\r
     * Called when we want to end a switchboard session\r
     * or a switchboard session ends\r
@@ -1486,7 +1486,7 @@ class MSN {
 \r
         if ($this->sb_writeln($socket, $id, "MSG $id N $len") === false ||\r
             $this->sb_writedata($socket, $aMessage) === false) {\r
-               return false;\r
+                return false;\r
             }\r
 \r
         // Don't close the SB session, we might as well leave it open\r
@@ -1522,23 +1522,23 @@ class MSN {
      */\r
     public function sendMessage($to, $message) {\r
         if ($message != '') {\r
-               $toParts = explode('@', $to);\r
-               if(count($toParts) < 3) {\r
-                       list($name, $host) = $toParts;\r
-                       $network = 1;\r
-               } else {\r
-                       list($name, $host, $network) = $toParts;\r
-               }\r
-               \r
+            $toParts = explode('@', $to);\r
+            if(count($toParts) < 3) {\r
+                list($name, $host) = $toParts;\r
+                $network = 1;\r
+            } else {\r
+                list($name, $host, $network) = $toParts;\r
+            }\r
+\r
             $recipient = $name.'@'.$host;\r
 \r
             if ($network === 1) {\r
                 if (!isset($this->switchBoardSessionLookup[$recipient])) {\r
-                       if (!isset($this->switchBoardSessions[$recipient]) || time() - $this->switchBoardSessions[$recipient]['XFRReqTime'] > $this->XFRReqTimeout) {\r
-                               $this->debug_message("*** No existing SB session or request has timed out");\r
-                           $this->reqSBSession($recipient);\r
-                       }\r
-                       return false;\r
+                    if (!isset($this->switchBoardSessions[$recipient]) || time() - $this->switchBoardSessions[$recipient]['XFRReqTime'] > $this->XFRReqTimeout) {\r
+                        $this->debug_message("*** No existing SB session or request has timed out");\r
+                        $this->reqSBSession($recipient);\r
+                    }\r
+                    return false;\r
                 } else {\r
                     $socket = $this->switchBoardSessionLookup[$recipient];\r
                     $intsocket = (int) $socket;\r
@@ -1547,18 +1547,18 @@ class MSN {
                         $this->endSBSession($socket);\r
                         return $this->sendMessage($recipient.'@Offline', $message);\r
                     } else {\r
-                       if ($this->switchBoardSessions[$intsocket]['joined'] !== true) {\r
-                               $this->debug_message("*** Recipient has not joined session, returning false");\r
-                               return false;\r
-                       }\r
-                       \r
+                        if ($this->switchBoardSessions[$intsocket]['joined'] !== true) {\r
+                            $this->debug_message("*** Recipient has not joined session, returning false");\r
+                            return false;\r
+                        }\r
+\r
                         $this->debug_message("*** Attempting to send message to $recipient using existing SB session");\r
 \r
                         if ($this->sendMessageViaSB($recipient, $message)) {\r
                             $this->debug_message('*** Message sent successfully');\r
                             return true;\r
                         }\r
-                        \r
+\r
                         return false;\r
                     }\r
                 }\r
@@ -1603,7 +1603,7 @@ class MSN {
     /**\r
      * OIM methods\r
      */\r
-    \r
+\r
     /**\r
     * Get OIM mail data\r
     *\r
@@ -1806,7 +1806,7 @@ class MSN {
             $this->debug_message("*** OIM ($msgid) deleted");\r
         return $sMsg;\r
     }\r
-    \r
+\r
     /**\r
      * Send offline message\r
      *\r
@@ -1918,11 +1918,11 @@ X-OIM-Sequence-Num: 1
         }\r
         return array('challenge' => $challenge, 'auth_policy' => $auth_policy);\r
     }\r
-    \r
+\r
     /**\r
      * Contact / Membership list methods\r
      */\r
-    \r
+\r
     /**\r
     * Fetch contact list\r
     *\r
@@ -2347,7 +2347,7 @@ X-OIM-Sequence-Num: 1
         $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);\r
         curl_close($curl);\r
         $this->debug_message("*** Get Result:\n$data");\r
-        \r
+\r
         if ($http_code != 200) return false;\r
         $p = $data;\r
         $aMemberships = array();\r
@@ -2427,11 +2427,11 @@ X-OIM-Sequence-Num: 1
         }\r
         return $aContactList;\r
     }\r
-    \r
+\r
     /**\r
      * MsnObj related methods\r
      */\r
-    \r
+\r
     /**\r
      *\r
      * @param $FilePath 圖檔路徑\r
@@ -2471,14 +2471,14 @@ X-OIM-Sequence-Num: 1
             }\r
         return $DefineString;\r
     }\r
-    \r
+\r
     /**\r
      * Socket methods\r
      */\r
-    \r
+\r
     /**\r
      * Read data of specified size from NS socket\r
-     * \r
+     *\r
      * @param integer $size Size to read\r
      * @return string Data read\r
      */\r
@@ -2497,7 +2497,7 @@ X-OIM-Sequence-Num: 1
 \r
     /**\r
      * Read line from the NS socket\r
-     * \r
+     *\r
      * @return string Data read\r
      */\r
     private function ns_readln() {\r
@@ -2511,9 +2511,9 @@ X-OIM-Sequence-Num: 1
 \r
     /**\r
      * Write line to NS socket\r
-     * \r
+     *\r
      * Also increments id\r
-     * \r
+     *\r
      * @param string $data Line to write to socket\r
      * @return mixed Bytes written or false on failure\r
      */\r
@@ -2528,7 +2528,7 @@ X-OIM-Sequence-Num: 1
 \r
     /**\r
      * Write data to NS socket\r
-     * \r
+     *\r
      * @param string $data Data to write to socket\r
      * @return mixed Bytes written or false on failure\r
      */\r
@@ -2542,7 +2542,7 @@ X-OIM-Sequence-Num: 1
 \r
     /**\r
      * Read data of specified size from given SB socket\r
-     * \r
+     *\r
      * @param resource $socket SB socket\r
      * @param integer $size Size to read\r
      * @return string Data read\r
@@ -2562,7 +2562,7 @@ X-OIM-Sequence-Num: 1
 \r
     /**\r
      * Read line from given SB socket\r
-     * \r
+     *\r
      * @param resource $socket SB Socket\r
      * @return string Line read\r
      */\r
@@ -2577,9 +2577,9 @@ X-OIM-Sequence-Num: 1
 \r
     /**\r
      * Write line to given SB socket\r
-     * \r
+     *\r
      * Also increments id\r
-     * \r
+     *\r
      * @param resource $socket SB socket\r
      * @param integer $id Reference to SB id\r
      * @param string $data Line to write\r
@@ -2596,7 +2596,7 @@ X-OIM-Sequence-Num: 1
 \r
     /**\r
      * Write data to given SB socket\r
-     * \r
+     *\r
      * @param resource $socket SB socket\r
      * @param $data Data to write to socket\r
      * @return mixed Bytes written or false on error\r
@@ -2628,11 +2628,11 @@ X-OIM-Sequence-Num: 1
         $info = stream_get_meta_data($socket);\r
         return $info['eof'];\r
     }\r
-    \r
+\r
     /**\r
      * Key generation methods\r
      */\r
-    \r
+\r
     private function derive_key($key, $magic) {\r
         $hash1 = mhash(MHASH_SHA1, $magic, $key);\r
         $hash2 = mhash(MHASH_SHA1, $hash1.$magic, $key);\r
@@ -2661,7 +2661,7 @@ X-OIM-Sequence-Num: 1
 \r
         return base64_encode($blob);\r
     }\r
-    \r
+\r
     /**\r
     * Generate challenge response\r
     *\r
@@ -2741,11 +2741,11 @@ X-OIM-Sequence-Num: 1
 \r
         return $hash;\r
     }\r
-    \r
+\r
     /**\r
      * Utility methods\r
      */\r
-    \r
+\r
     private function Array2SoapVar($Array, $ReturnSoapVarObj = true, $TypeName = null, $TypeNameSpace = null) {\r
         $ArrayString = '';\r
         foreach($Array as $Key => $Val) {\r
@@ -2773,7 +2773,7 @@ X-OIM-Sequence-Num: 1
         if ($ReturnSoapVarObj) return new SoapVar($ArrayString, XSD_ANYXML, $TypeName, $TypeNameSpace);\r
         return $ArrayString;\r
     }\r
-    \r
+\r
     private function linetoArray($lines) {\r
         $lines = str_replace("\r", '', $lines);\r
         $lines = explode("\n", $lines);\r
@@ -2784,7 +2784,7 @@ X-OIM-Sequence-Num: 1
         }\r
         return $Data;\r
     }\r
-    \r
+\r
     /**\r
     * Get Passport ticket\r
     *\r
@@ -3031,7 +3031,7 @@ X-OIM-Sequence-Num: 1
         $this->ABAuthHeader = new SoapHeader('http://www.msn.com/webservices/AddressBook', 'ABAuthHeader', $this->Array2SoapVar($ABAuthHeaderArray));\r
         return $aTickets;\r
     }\r
-    \r
+\r
     /**\r
     * Generate the data to send a message\r
     *\r
@@ -3050,7 +3050,7 @@ X-OIM-Sequence-Num: 1
         $msg = substr($sMessage, 0, $maxlen);\r
         return $msg_header.$msg;\r
     }\r
-    \r
+\r
     /**\r
     * Sleep for the given number of seconds\r
     *\r
@@ -3060,7 +3060,7 @@ X-OIM-Sequence-Num: 1
         $this->debug_message("*** Sleeping for $wait seconds before retrying");\r
         sleep($wait);\r
     }\r
-    \r
+\r
     /**\r
      * Sends a ping command\r
      *\r
@@ -3072,7 +3072,7 @@ X-OIM-Sequence-Num: 1
         // NS: >>> PNG\r
         $this->ns_writeln("PNG");\r
     }\r
-    \r
+\r
     /**\r
     * Methods to add / call callbacks\r
     */\r
@@ -3117,24 +3117,24 @@ X-OIM-Sequence-Num: 1
             return false;\r
         }\r
     }\r
-    \r
+\r
     /**\r
      * Debugging methods\r
      */\r
-    \r
+\r
     /**\r
      * Print message if debugging is enabled\r
-     * \r
+     *\r
      * @param string $str Message to print\r
      */\r
     private function debug_message($str) {\r
         if (!$this->debug) return;\r
         echo $str."\n";\r
     }\r
-    \r
+\r
     /**\r
      * Dump binary data\r
-     * \r
+     *\r
      * @param string $str Data string\r
      * @return Binary data\r
      */\r