From 43db20ca9835118dd852c759dca79a9387636ca4 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <darkip@inflatablegoldfish.com>
Date: Fri, 11 Mar 2011 17:23:14 +0000
Subject: [PATCH] Merge in upstream protocol change

"passport response message changed, it might return Compact2 instead of PPToken2 since 2011/2/14."
---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 33 ++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 996c5571c2..3d10c25b2c 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -2995,8 +2995,37 @@ X-OIM-Sequence-Num: 1
 
         // no ticket found!
         if (count($matches) == 0) {
-            $this->debug_message('*** Could not get passport ticket!');
-            return false;
+            // Since 2011/2/15, the return value will be Compact2, not PPToken2
+
+            // we need ticket and secret code
+            // RST1: messengerclear.live.com
+            // <wsse:BinarySecurityToken Id="Compact1">t=tick&p=</wsse:BinarySecurityToken>
+            // <wst:BinarySecret>binary secret</wst:BinarySecret>
+            // RST2: messenger.msn.com
+            // <wsse:BinarySecurityToken Id="PPToken2">t=tick</wsse:BinarySecurityToken>
+            // RST3: contacts.msn.com
+            // <wsse:BinarySecurityToken Id="Compact3">t=tick&p=</wsse:BinarySecurityToken>
+            // RST4: messengersecure.live.com
+            // <wsse:BinarySecurityToken Id="Compact4">t=tick&p=</wsse:BinarySecurityToken>
+            // RST5: spaces.live.com
+            // <wsse:BinarySecurityToken Id="Compact5">t=tick&p=</wsse:BinarySecurityToken>
+            // RST6: storage.msn.com
+            // <wsse:BinarySecurityToken Id="Compact6">t=tick&p=</wsse:BinarySecurityToken>
+            preg_match("#".
+                       "<wsse\:BinarySecurityToken Id=\"Compact1\">(.*)</wsse\:BinarySecurityToken>(.*)".
+                       "<wst\:BinarySecret>(.*)</wst\:BinarySecret>(.*)".
+                       "<wsse\:BinarySecurityToken Id=\"Compact2\">(.*)</wsse\:BinarySecurityToken>(.*)".
+                       "<wsse\:BinarySecurityToken Id=\"Compact3\">(.*)</wsse\:BinarySecurityToken>(.*)".
+                       "<wsse\:BinarySecurityToken Id=\"Compact4\">(.*)</wsse\:BinarySecurityToken>(.*)".
+                       "<wsse\:BinarySecurityToken Id=\"Compact5\">(.*)</wsse\:BinarySecurityToken>(.*)".
+                       "<wsse\:BinarySecurityToken Id=\"Compact6\">(.*)</wsse\:BinarySecurityToken>(.*)".
+                       "#",
+                       $data, $matches);
+            // no ticket found!
+            if (count($matches) == 0) {
+                $this->debug_message("*** Can't get passport ticket!");
+                return false;
+            }
         }
 
         //$this->debug_message(var_export($matches, true));
-- 
2.39.5