[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenetwork/kopete/protocols/msn
From:       Olivier Goffart <ogoffart () tiscalinet ! be>
Date:       2003-09-09 7:29:29
[Download RAW message or body]

CVS commit by ogoffart: 

Fix connection with @hotmail and @msn  adresses.

I don't know why theses did not work anymore...

Does the fact to call job->addMetaData("cookies", "manual"); make that it
  does not follow anymore Location: stuff?
  And if yes, how to ask it need to follow it.


  M +10 -6     msnnotifysocket.cpp   1.121


--- kdenetwork/kopete/protocols/msn/msnnotifysocket.cpp  #1.120:1.121
@@ -196,6 +196,13 @@ void MSNNotifySocket::parseCommand( cons
                         m_authData=data.section( ' ' , 2 , 2 );
                         m_kv=QString::null;
-                //      QString authURL="https://loginnet.passport.com/login.srf?" + \
                m_authData;
-                        QString authURL="https://login.passport.com/login.srf?" + \
m_authData; +
+                        if( m_account->accountId().contains("@hotmail.com") )
+                                m_sid="loginnet.passport.com";
+                        else if( m_account->accountId().contains("@msn.com") ||  \
m_account->accountId().contains("@compaq.net") ||  \
m_account->accountId().contains("@webtv.net") ) +                                \
m_sid="msnialogin.passport.com"; +                        else
+                                m_sid="login.passport.com";
+
+                        QString authURL="https://"+m_sid+"/login.srf?" + m_authData;
                         authURL.replace("," , "&" ) ;
 
@@ -515,8 +522,5 @@ void MSNNotifySocket::slotAuthJobDone ( 
                 rx.search(m_authData);
 
-                /*QString \
authURL="https://loginnet.passport.com/ppsecure/post.srf?lc=" + rx.cap(1) + "&id=" \
                +rx.cap(2) +"&tw=" +rx.cap(3) +"&cbid=" + rx.cap(2)
-                        + "&da=passport.com&login=" + m_account->accountId() + \
                "&domain=hotmail.com&passwd=" + escape ( m_account->password() ) ;*/
-
-                QString authURL = "https://login.passport.com/ppsecure/post.srf?lc=" \
+ rx.cap( 1 ) + "&id=" + +                QString authURL = "https://" + m_sid + \
                "/ppsecure/post.srf?lc=" + rx.cap( 1 ) + "&id=" +
                         rx.cap( 2 ) + "&tw=" + rx.cap( 3 ) + "&cbid=" + rx.cap( 2 ) \
                + "&da=passport.com&login=" +
                         m_account->accountId() + "&domain=passport.com&passwd=";


[prev in list] [next in list] [prev in thread] [next in thread]