[PyWebMail-Checkins] webmail/webmail/client/config HotMail.xml, 1.19, 1.20
Status: Beta
Brought to you by:
dubnerm
Menu
▾
▴
[PyWebMail-Checkins] webmail/webmail/client/config HotMail.xml, 1.19, 1.20
|
From: Michael D. <du...@us...> - 2007-12-01 02:38:32
|
Update of /cvsroot/pywebmail/webmail/webmail/client/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10813 Modified Files: HotMail.xml Log Message: backward compatible, WL login and download, NOTFIXED: delete Index: HotMail.xml =================================================================== RCS file: /cvsroot/pywebmail/webmail/webmail/client/config/HotMail.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** HotMail.xml 26 Jul 2007 08:44:21 -0000 1.19 --- HotMail.xml 1 Dec 2007 02:38:32 -0000 1.20 *************** *** 1,6 **** <?xml version="1.0"?> ! <service version="1.1.8"> <setup> ! <assign> <field name="inbox">Inbox</field> <field name="inbox_curmbox">00000000-0000-0000-0000-000000000001</field> --- 1,6 ---- <?xml version="1.0"?> ! <service version="1.1.7"> <setup> ! <fixed> <field name="inbox">Inbox</field> <field name="inbox_curmbox">00000000-0000-0000-0000-000000000001</field> *************** *** 9,24 **** <field name="language">EN</field> <field name="country">EN</field> ! <cookie name="CkTst" path="/" domain="login.live.com">G<value expr="str(int(time()))"/></cookie> ! </assign> </setup> <login> <fetch> ! <url_get id="login_form"> ! <url>http://www.hotmail.com/</url> <file>login0.htm</file> <method>GET</method> <fields/> <url_options> <option name="blocking">1</option> <option name="use_meta_refresh">0</option> <option name="override_ua">moz</option> --- 9,25 ---- <field name="language">EN</field> <field name="country">EN</field> ! </fixed> </setup> <login> <fetch> ! <url_get id="login_init"> ! <url>http://mail.live.com/</url> <file>login0.htm</file> <method>GET</method> <fields/> <url_options> + <option name="use_redirect">0</option> <option name="blocking">1</option> + <option name="do_save_headers">1</option> <option name="use_meta_refresh">0</option> <option name="override_ua">moz</option> *************** *** 30,37 **** <method>GET</method> <fields> ! <field name="id">2</field> ! <field name="svc">mail</field> ! <field name="lc">1033</field> ! <field name="_lang">EN</field> </fields> <url_options> --- 31,41 ---- <method>GET</method> <fields> ! <field name="wa">wsignin1.0</field> ! <field name="rpsnv">10</field> ! <field name="ct"><value name="login_arg_ct"/></field> ! <field name="rver"><value name="login_arg_rver"/></field> ! <field name="wp">MBI</field> ! <field name="wreply">http://mail.live.com/default.aspx</field> ! <field name="id"><value name="login_arg_id"/></field> </fields> <url_options> *************** *** 43,56 **** </url_get> <url_get id="login_result2"> ! <url>https://login.live.com/ppsecure/post.srf?id=2&svc=mail&msppjph=1&lc=1033&_lang=EN&bk=<value name="login_arg_bk"/></url> <file>login2.htm</file> <method>POST</method> <fields> ! <field name="PPSX"><value name="login_arg_ppsx"/></field> <field name="PwdPad"><value expr="'IfYouAreReadingThisYouHaveTooMuchFreeTime'[:-len(password)]"/></field> <field name="login"><value name="email"/></field> <field name="passwd"><value name="password"/></field> ! <field name="LoginOptions">2</field> <field name="PPFT"><value name="login_arg_ppft"/></field> </fields> <url_options> --- 47,68 ---- </url_get> <url_get id="login_result2"> ! <url>https://login.live.com/ppsecure/post.srf?wa=wsignin1.0&rpsnv=10&ct=<value name="login_arg_ct"/>&rver=<value name="login_arg_rver"/>&wp=MBI&wreply=http:%2F%2Fmail.live.com%2Fdefault.aspx&id=<value name="login_arg_id"/>&bk=<value name="login_arg_bk"/></url> <file>login2.htm</file> <method>POST</method> <fields> ! <field name="idsbho">1</field> <field name="PwdPad"><value expr="'IfYouAreReadingThisYouHaveTooMuchFreeTime'[:-len(password)]"/></field> + <field name="LoginOptions">2</field> + <field name="CS"></field> + <field name="FedState"></field> + <field name="PPSX"><value name="login_arg_ppsx"/></field> + <field name="type">11</field> <field name="login"><value name="email"/></field> <field name="passwd"><value name="password"/></field> ! <field name="remMe">1</field> ! <field name="NewUser">1</field> <field name="PPFT"><value name="login_arg_ppft"/></field> + <field name="i1">0</field> + <field name="i2">2</field> </fields> <url_options> *************** *** 62,74 **** </url_get> <url_get id="login_result3"> ! <url>http://www.hotmail.msn.com/cgi-bin/sbox</url> <file>login3.htm</file> <method>GET</method> <fields> ! <field name="t"><value name="login_arg_t"/></field> ! <field name="p"><value name="login_arg_p"/></field> ! <field name="lc">1033</field> ! <field name="id">2</field> ! <field name="vv">400</field> </fields> <url_options> --- 74,82 ---- </url_get> <url_get id="login_result3"> ! <url>http://mail.live.com/default.aspx</url> <file>login3.htm</file> <method>GET</method> <fields> ! <field name="wa">wsignin1.0</field> </fields> <url_options> *************** *** 78,106 **** </url_options> </url_get> ! <url_get id="login_result4"> ! <url>http://<value name="server"/>/cgi-bin/hmhome</url> ! <file>login4.htm</file> <method>GET</method> <fields> ! <field name="fti">yes</field> ! <field name="curmbox">F000000001</field> ! <field name="a"><value name="session"/></field> ! <field name="_lang"><value name="language"/></field> ! <field name="country"><value name="country"/></field> </fields> ! <url_options/> </url_get> </fetch> <pre_require> <parse> ! <choose> ! <when test="a2bool(getdefault('debug','0'))"> ! <input ref="login_form"/> ! </when> ! <otherwise> ! <fixed><line><form action=""></line></fixed> ! </otherwise> ! </choose> ! <test>(?i)<form[^>]*></test> </parse> <parse> --- 86,114 ---- </url_options> </url_get> ! <url_get id="home"> ! <url>http://<value name="server"/>/mail/TodayLight.aspx</url> ! <file>home.htm</file> <method>GET</method> <fields> ! <field name="wa">wsignin1.0</field> ! <!--field name="n"><value name="session"/></field--> ! <field name="n"><value expr="str(randrange(10000000000))"/></field> ! <field name="gs">true</field> </fields> ! <url_options> ! <option name="use_redirect">0</option> ! <option name="use_meta_refresh">0</option> ! <option name="do_save_headers">1</option> ! <option name="override_ua">moz</option> ! </url_options> </url_get> </fetch> <pre_require> <parse> ! <input ref="login_init"/> ! <test id="login_init_re">^Location: http://login\.live\.com/login\.srf\?wa=wsignin1\.0&rpsnv=10&ct=([0-9]+)&rver=([0-9.]+)&wp=MBI&wreply=http:%2F%2Fmail\.live\.com%2Fdefault\.aspx&id=([0-9]+)\r?$</test> ! <field name="login_arg_ct" ref="login_init_re" group="1"/> ! <field name="login_arg_rver" ref="login_init_re" group="2"/> ! <field name="login_arg_id" ref="login_init_re" group="3"/> </parse> <parse> *************** *** 109,123 **** <test inverse="yes"><input type="hidden" name="mspppostint" id="mspppostint" value="([^">]*)"></test> <test inverse="yes"><input type="hidden" name="PPStateXfer" id="PPStateXfer" value="1"></test> ! <test id="login_arg1"><form [^>]* action="https://login\.live\.com/ppsecure/post\.srf\?id=2&[^>"]*&bk=(\d+)"(?: [^>]*)></test> ! <field name="login_arg_bk" group="1" ref="login_arg1"/> ! <test id="login_arg2"><input type="hidden" name="PPFT" id="i0327" value="([^">]*)"/></test> ! <field name="login_arg_ppft" group="1" ref="login_arg2"/> ! <test id="login_arg3"><input type="hidden" id="i0326" name="PPSX" value="([^">]*)"/></test> ! <field name="login_arg_ppsx" group="1" ref="login_arg3"/> <field name="MSPOK" group="1">^Set-Cookie: MSPOK=([^;]*);</field> </parse> ! <assign> <cookie name="MSPOK" path="/" domain="login.live.com"><value name="MSPOK"/></cookie> ! </assign> </pre_require> <parse> --- 117,131 ---- <test inverse="yes"><input type="hidden" name="mspppostint" id="mspppostint" value="([^">]*)"></test> <test inverse="yes"><input type="hidden" name="PPStateXfer" id="PPStateXfer" value="1"></test> ! <test id="login_arg_bk_re">var srf_uPost='https://login\.live\.com/ppsecure/post\.srf\?wa=wsignin1\.0&rpsnv=10&ct=<value name="login_arg_ct"/>&rver=<value expr="login_arg_rver.replace('.','\\.')"/>&wp=MBI&wreply=http%3A%2F%2Fmail\.live\.com%2Fdefault\.aspx&id=<value name="login_arg_id"/>&bk=(\d+)';</test> ! <field name="login_arg_bk" group="1" ref="login_arg_bk_re"/> ! <test id="login_arg_ppft_re">var srf_sFT='<input type="hidden" name="PPFT" id="i0327" value="([^">]*)"/>';</test> ! <field name="login_arg_ppft" group="1" ref="login_arg_ppft_re"/> ! <test id="login_arg_ppsx_re">var srf_sRBlob='([^']*)';</test> ! <field name="login_arg_ppsx" group="1" ref="login_arg_ppsx_re"/> <field name="MSPOK" group="1">^Set-Cookie: MSPOK=([^;]*);</field> </parse> ! <fixed> <cookie name="MSPOK" path="/" domain="login.live.com"><value name="MSPOK"/></cookie> ! </fixed> </pre_require> <parse> *************** *** 127,167 **** <test inverse="yes">(?i)<META HTTP-EQUIV="REFRESH" CONTENT="0; URL=http://www\.hotmail\.msn\.com/cgi-bin/sbox\?(?:did=1&)?t=([^&"]*)&p=([^&"]*)(?:&lc=1033&id=2)?"></test> <test inverse="yes">top\.location\.replace\("http://www\.hotmail\.msn\.com/cgi-bin/sbox\?(?:did=1&)?t=([^&"]*)&p=([^&"]*)&lc=\d+&id=\d+"\);</test> ! <test id="login_args">(?:top|window)\.location\.replace\("http://www\.hotmail\.msn\.com/cgi-bin/sbox\?(?:did=1&)?t=([^&"]*)&p=([^&"]*)&lc=\d+&id=\d+(?:&vv=(?:400|410|500))?"\);</test> ! <field name="login_arg_t" group="1" ref="login_args"/> ! <field name="login_arg_p" group="2" ref="login_args"/> </parse> <parse> <input ref="login_result3"/> <test>^Status:\s+302\s+</test> <test inverse="yes">^Location: http://([^/]+)/cgi-bin/hmhome\?fti=yes&curmbox=F000000001&a=([^&\r\n]+)\r?$</test> <test inverse="yes">^Location: http://([^/]+)/cgi-bin/hmhome\?fti=yes&curmbox=F000000001&a=([^&]+)&_lang=([^&]+)&country=(.+)$</test> ! <test id="login_results">^Location: http://([^/]+)/cgi-bin/hmhome\?fti=yes&curmbox=00000000%2d0000%2d0000%2d0000%2d000000000001&a=([^&\r\n]+)\r?$</test> <field name="server" group="1" ref="login_results"/> ! <field name="session" group="2" ref="login_results"/> </parse> - <check> - <choose> - <when test="a2bool(getdefault('debug','0'))"> - <input ref="login_result4"/> - </when> - <otherwise> - <fixed> - <line><font class="G"><value name="email"/></font></line> - <line>_UM="curmbox=00000000%2d0000%2d0000%2d0000%2d000000000001&a=<value name="session"/>"</line> - </fixed> - </otherwise> - </choose> - <test><font class="G"><value name="email"/></font></test> - <test>_UM\s*=\s*"curmbox=00000000%2d0000%2d0000%2d0000%2d000000000001&a=<value name="session"/>"</test> - </check> <parse> <choose> ! <when test="language=='DA'"><!-- Dansk --> <fixed><line>inbox=Indbakke</line></fixed> </when> ! <when test="language=='DE'"><!-- Deutsch --> <fixed><line>inbox=Posteingang</line></fixed> </when> ! <when test="language=='EN'"><!-- English --> <fixed> <line>inbox=Inbox</line> --- 135,171 ---- <test inverse="yes">(?i)<META HTTP-EQUIV="REFRESH" CONTENT="0; URL=http://www\.hotmail\.msn\.com/cgi-bin/sbox\?(?:did=1&)?t=([^&"]*)&p=([^&"]*)(?:&lc=1033&id=2)?"></test> <test inverse="yes">top\.location\.replace\("http://www\.hotmail\.msn\.com/cgi-bin/sbox\?(?:did=1&)?t=([^&"]*)&p=([^&"]*)&lc=\d+&id=\d+"\);</test> ! <test inverse="yes">(?:top|window)\.location\.replace\("http://www\.hotmail\.msn\.com/cgi-bin/sbox\?(?:did=1&)?t=([^&"]*)&p=([^&"]*)&lc=\d+&id=\d+(?:&vv=(?:400|410|500))?"\);</test> ! <test>window\.location\.replace\("http://mail\.live\.com/default\.aspx\?wa=wsignin1\.0"\);</test> </parse> <parse> <input ref="login_result3"/> <test>^Status:\s+302\s+</test> + <test inverse="yes" error_group="1">^Location: /mail/LoginError.aspx?error=(\d+)&</test> <test inverse="yes">^Location: http://([^/]+)/cgi-bin/hmhome\?fti=yes&curmbox=F000000001&a=([^&\r\n]+)\r?$</test> <test inverse="yes">^Location: http://([^/]+)/cgi-bin/hmhome\?fti=yes&curmbox=F000000001&a=([^&]+)&_lang=([^&]+)&country=(.+)$</test> ! <test inverse="yes">^Location: http://([^/]+)/cgi-bin/hmhome\?fti=yes&curmbox=00000000%2d0000%2d0000%2d0000%2d000000000001&a=([^&\r\n]+)\r?$</test> ! <test inverse="yes">^Location: http://([^/]+)/mail/mail\.aspx\?&?ip=([^&\r\n]+)&d=([^&\r\n]+)&mf=0\r?$</test> ! <test id="login_results">^Location: http://([^/]+)/mail/TodayLight\.aspx\?wa=wsignin1\.0&n=(\d+)&gs=true\r?$</test> <field name="server" group="1" ref="login_results"/> ! <!--field name="session" group="2" ref="login_results"/--> ! </parse> ! <parse> ! <input ref="home"/> ! <test id="check_email_header"><a id="uxp_hdr_meLink" title="<value name="email"/>" href="#"></test> ! <!--test>action="TodayLight\.aspx\?wa=wsignin1\.0&amp;n=<value name="session"/>&amp;gs=true"</test--> ! <test id="language_specific_re"><link rel="stylesheet" href="/mail/ThemeCommon_([0-9]+[0-9.]+[0-9]+)\.aspx\?Theme=1&culture=(..)-(..)" type="text/css"/></test> ! <field name="version" group="1" ref="language_specific_re"/> ! <field name="language" group="2" ref="language_specific_re"/> ! <field name="country" group="3" ref="language_specific_re"/> </parse> <parse> <choose> ! <when test="language=='da'"><!-- Dansk --> <fixed><line>inbox=Indbakke</line></fixed> </when> ! <when test="language=='de'"><!-- Deutsch --> <fixed><line>inbox=Posteingang</line></fixed> </when> ! <when test="language=='en'"><!-- English --> <fixed> <line>inbox=Inbox</line> *************** *** 172,200 **** </fixed> </when> ! <when test="language=='ES'"><!-- Espanol --> <fixed><line>inbox=Bandeja de entrada</line></fixed> </when> ! <when test="language=='FR'"><!-- francais --> <fixed><line>inbox=Bo\xEEte de r\xE9ception</line></fixed> </when> ! <when test="language=='IT'"><!-- Italiano --> <fixed><line>inbox=Posta in arrivo</line></fixed> </when> ! <when test="language=='NL'"><!-- Nederlands --> <fixed><line>inbox=Postvak IN</line></fixed> </when> ! <when test="language=='NO'"><!-- Norsk --> <fixed><line>inbox=Innboks</line></fixed> </when> ! <when test="language=='BR'"><!-- Portugues (Brasil) --> <fixed><line>inbox=Caixa de Entrada</line></fixed> </when> ! <when test="language=='FI'"><!-- suomi --> <fixed><line>inbox=Saapuneet</line></fixed> </when> ! <when test="language=='SV'"><!-- Svenska --> <fixed><line>inbox=Inkorgen</line></fixed> </when> ! <when test="language=='KO'"><!-- Korea --> <fixed> <line>inbox=\ubc1b\uc740 \ud3b8\uc9c0\ud568</line> --- 176,204 ---- </fixed> </when> ! <when test="language=='es'"><!-- Espanol --> <fixed><line>inbox=Bandeja de entrada</line></fixed> </when> ! <when test="language=='fr'"><!-- francais --> <fixed><line>inbox=Bo\xEEte de r\xE9ception</line></fixed> </when> ! <when test="language=='it'"><!-- Italiano --> <fixed><line>inbox=Posta in arrivo</line></fixed> </when> ! <when test="language=='nl'"><!-- Nederlands --> <fixed><line>inbox=Postvak IN</line></fixed> </when> ! <when test="language=='no'"><!-- Norsk --> <fixed><line>inbox=Innboks</line></fixed> </when> ! <when test="language=='br'"><!-- Portugues (Brasil) --> <fixed><line>inbox=Caixa de Entrada</line></fixed> </when> ! <when test="language=='fi'"><!-- suomi --> <fixed><line>inbox=Saapuneet</line></fixed> </when> ! <when test="language=='sv'"><!-- Svenska --> <fixed><line>inbox=Inkorgen</line></fixed> </when> ! <when test="language=='ko'"><!-- Korea --> <fixed> <line>inbox=\ubc1b\uc740 \ud3b8\uc9c0\ud568</line> *************** *** 205,209 **** </fixed> </when> ! <when test="language=='JA'"><!-- Japan --> <fixed> <line>inbox=\u53d7\u4fe1\u30c8\u30ec\u30a4</line> --- 209,213 ---- </fixed> </when> ! <when test="language=='ja'"><!-- Japan --> <fixed> <line>inbox=\u53d7\u4fe1\u30c8\u30ec\u30a4</line> *************** *** 214,218 **** </fixed> </when> ! <when test="language=='CN'"><!-- China --> <fixed> <line>inbox=\u6536\u4ef6\u7bb1</line> --- 218,222 ---- </fixed> </when> ! <when test="language=='cn'"><!-- China --> <fixed> <line>inbox=\u6536\u4ef6\u7bb1</line> *************** *** 223,227 **** </fixed> </when> ! <when test="language=='TW'"><!-- Taiwan --> <fixed> <line>inbox=\u6536\u4ef6\u5323</line> --- 227,231 ---- </fixed> </when> ! <when test="language=='tw'"><!-- Taiwan --> <fixed> <line>inbox=\u6536\u4ef6\u5323</line> *************** *** 232,242 **** </fixed> </when> ! <when test="language=='x-RU'"><!-- Joke: Not yet available on HotMail --> <fixed> <line>inbox=\u0412\u0445\u043e\u0434\u044f\u0449\u0438\u0435</line> <line>sent=\u041e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u043d\u044b\u0435</line> - <line>draft=\u0428\u0430\u0431\u043b\u043e\u043d\u044b</line> <line>trash=\u0423\u0434\u0430\u043b\u0435\u043d\u043d\u044b\u0435</line> - <line>spam=\u041c\u0443\u0441\u043e\u0440\u043d\u044b\u0435</line> </fixed> </when> --- 236,246 ---- </fixed> </when> ! <when test="language=='ru'"><!-- Russian --> <fixed> <line>inbox=\u0412\u0445\u043e\u0434\u044f\u0449\u0438\u0435</line> + <line>spam=\u041d\u0435\u0436\u0435\u043b\u0430\u0442\u0435\u043b\u044c\u043d\u0430\u044f \u043f\u043e\u0447\u0442\u0430</line> + <line>draft=\u0427\u0435\u0440\u043d\u043e\u0432\u0438\u043a\u0438</line> <line>sent=\u041e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u043d\u044b\u0435</line> <line>trash=\u0423\u0434\u0430\u043b\u0435\u043d\u043d\u044b\u0435</line> </fixed> </when> *************** *** 250,274 **** </login> <folders> - <fetch> - <url_get id="folders_list"> - <url>http://<value name="server"/>/cgi-bin/folders</url> - <file>folders.htm</file> - <method>GET</method> - <fields> - <field name="a"><value name="session"/></field> - </fields> - <url_options> - <option name="do_save_headers">1</option> - </url_options> - </url_get> - </fetch> <list> ! <input ref="folders_list"/> <item> ! <start><tr></start> ! <end></tr></end> ! <test ref="folder_info_re"/> ! <field name="curmbox" group="1" id="folder_info_re" parse="url"><td nowrap(?: colspan=2| *)><a href="/cgi-bin/HoTMaiL\?(?:a=<value name="session"/>&)?curmbox=([^&]+)&a=<value name="session"/>" >([^<]+)</a>&nbsp;</td></field> ! <field name="name" group="2" ref="folder_info_re"/> </item> </list> --- 254,270 ---- </login> <folders> <list> ! <input ref="home"/> ! <test ref="check_email_header"/> ! <list> ! <start><ul id="folderList"</start> ! <end></ul></end> ! </list> <item> ! <start><li class="FolderItemNormal ListItem (?: BoldText)?"</start> ! <end></li></end> ! <test id="folder_info_re"><a (?:class="DisplayBlock" )?href="InboxLight\.aspx\?FolderID=([0-9A-Fa-f-]+)&n=\d+" title="([^"]*?)(?: \(\d+ \))?"></test> ! <field name="curmbox" group="1" ref="folder_info_re" parse="url"/> ! <field name="name" group="2" ref="folder_info_re" parse="decode(utf-8),html"/> </item> </list> *************** *** 277,289 **** <fetch> <url_get id="folder_page"> ! <url>http://<value name="server"/>/cgi-bin/HoTMaiL</url> <file>folder_<value name="folder"/>_<value name="curmbox"/>_page<value name="page"/>.htm</file> <method>GET</method> <fields> ! <field name="curmbox"><value name="curmbox"/></field> ! <field name="a"><value name="session"/></field> ! <field name="page"><value name="page"/></field> </fields> ! <url_options/> </url_get> </fetch> --- 273,289 ---- <fetch> <url_get id="folder_page"> ! <url>http://<value name="server"/>/mail/InboxLight.aspx</url> <file>folder_<value name="folder"/>_<value name="curmbox"/>_page<value name="page"/>.htm</file> <method>GET</method> <fields> ! <field name="FolderID"><value name="curmbox"/></field> ! <field name="n"><value expr="str(randrange(10000000000))"/></field> ! <field name="InboxSortAscending">False</field> ! <field name="InboxSortBy">Date</field> ! <field name="Page"><value name="page"/></field> </fields> ! <url_options> ! <option name="override_ua">moz</option> ! </url_options> </url_get> </fetch> *************** *** 291,295 **** <pages> <input ref="folder_page"/> ! <test><font class="G"><value name="email"/></font></test> <start>1</start> <next group="1"><a href="javascript:HM\('page=(\d+)(?:&wo=&msg=)'\)" title="Next Page"></next> --- 291,295 ---- <pages> <input ref="folder_page"/> ! <test ref="check_email_header"/> <start>1</start> <next group="1"><a href="javascript:HM\('page=(\d+)(?:&wo=&msg=)'\)" title="Next Page"></next> *************** *** 297,310 **** <empty_list_test>There are no messages in this folder.</empty_list_test> <item bounds="inclusive"> ! <start><tr(?: bgcolor=#FFF7E5)? name="</start> <end></tr></end> <test ref="msg_info_re"/> ! <field name="id" ref="msg_info_re" group="1"/> ! <field name="from_email" group="1" parse="html"><tr (?:bgcolor=#FFF7E5 )?name="([^"]+)"></field> ! <field name="from_name" group="2" parse="html" id="msg_info_re"><td><a href="javascript:G\('/cgi-bin/getmsg\?msg=([^'&)]+)[^']*'\)">([^<]*)</a>&nbsp;</td></field> ! <!-- There are "len=..." argument in "G('/cgi-bin/getmsg?msg=...')" string but not for all messages..! What a pity... --> ! <field name="size" group="1" parse="html,replace(KB$,k),replace(MB$,m),replace(GB$,g)">(?:<td><a href="javascript:G\('/cgi-bin/getmsg?msg=.*&len=|<td align=right>)([^&"<]+)</field> ! <field name="subject" group="1" parse="html"></a>&nbsp;</td>\w*<td>([^<]*)</td></field> ! <field name="date" group="1" parse="html,date(%b %d)"><td>([^<]*)</td>\w*<td align=right></field> </item> </list> --- 297,308 ---- <empty_list_test>There are no messages in this folder.</empty_list_test> <item bounds="inclusive"> ! <start><tr class="(?:InboxContentItemUnread)?" ></start> <end></tr></end> <test ref="msg_info_re"/> ! <field name="id" id="msg_info_re" group="1"><td ><input type="checkbox" name="SelectedMessages" value="([0-9A-Fa-f-]+)" onclick="selectone\(event\)" title="[^>"]*"></td></field> ! <field name="from_name" group="1" parse="html"><td class="(?:InboxContentItemUnread)?" nowrap><a href="ReadMessageLight\.aspx\?[^"]+" class="TruncateFrom">([^<]*)</a></td></field> ! <field name="subject" group="1" parse="html"><td class="(?:InboxContentItemUnread)?"><a href="ReadMessageLight\.aspx\?[^"]+">([^<]*)&#x200f;</a></td></field> ! <field name="date" group="1" parse="html,date(%d.%m.%Y)"><td class="NoWrap">([^<]+)</td></field> ! <field name="size" group="1" parse="html,decode(utf-8),replace(KB$,k),replace(КБ$,k),replace(MB$,m),replace(МБ$,m),replace(GB$,g),replace(ГБ$,g)"><td class="TextAlignRight">([^lt;]*)</td></field> </item> </list> *************** *** 313,336 **** <fetch> <url_get id="message_eml"> ! <url>http://<value name="server"/>/cgi-bin/getmsg</url> <file>message_<value name="folder"/>_<value name="msgid"/>.txt</file> <method>GET</method> <fields> ! <field name="msg"><value name="msgid"/></field> ! <field name="raw">1</field> ! <field name="curmbox"><value name="curmbox"/></field> ! <field name="a"><value name="session"/></field> </fields> ! <url_options/> </url_get> </fetch> <join_lines> <list> ! <cut> ! <input ref="message_eml"/> ! <start><pre>\n</start> ! <end></pre></end> ! </cut> ! <item group="1" parse="pre-html">^(.*)$</item> </list> </join_lines> --- 311,410 ---- <fetch> <url_get id="message_eml"> ! <url>http://<value name="server"/>/mail/GetMessageSource.aspx</url> <file>message_<value name="folder"/>_<value name="msgid"/>.txt</file> <method>GET</method> <fields> ! <field name="msgid"><value name="msgid"/></field> ! <field name="gs">true</field> </fields> ! <url_options> ! <option name="override_ua">moz</option> ! </url_options> </url_get> </fetch> <join_lines> <list> ! <replace> ! <cut> ! <input ref="message_eml"/> ! <start><pre></start> ! <end></</end> ! </cut> ! <replaces> ! <item> ! <search>&#9;</search> ! <replace><value expr="chr(9)"/></replace> ! </item> ! <item> ! <search>&#34;</search> ! <replace>"</replace> ! </item> ! <item> ! <search>&#39;</search> ! <replace>'</replace> ! </item> ! <item> ! <search>&#40;</search> ! <replace>(</replace> ! </item> ! <item> ! <search>&#41;</search> ! <replace>)</replace> ! </item> ! <item> ! <search>&#43;</search> ! <replace>+</replace> ! </item> ! <item> ! <search>&#47;</search> ! <replace>/</replace> ! </item> ! <item> ! <search>&#58;</search> ! <replace>:</replace> ! </item> ! <item> ! <search>&#59;</search> ! <replace>;</replace> ! </item> ! <item> ! <search>&#60;</search> ! <replace><</replace> ! </item> ! <item> ! <search>&#61;</search> ! <replace>=</replace> ! </item> ! <item> ! <search>&#62;</search> ! <replace>></replace> ! </item> ! <item> ! <search>&#64;</search> ! <replace>@</replace> ! </item> ! <item> ! <search>&#91;</search> ! <replace>[</replace> ! </item> ! <item> ! <search>&#93;</search> ! <replace>]</replace> ! </item> ! <item> ! <search>&quot;</search> ! <replace>"</replace> ! </item> ! <item> ! <search>&lt;</search> ! <replace><</replace> ! </item> ! <item> ! <search>&gt;</search> ! <replace>></replace> ! </item> ! </replaces> ! </replace> ! <item group="1">(.*?)&#13;&#10;</item> </list> </join_lines> *************** *** 361,364 **** --- 435,439 ---- <domain>hotmail.com</domain> <domain>msn.com</domain> + <domain>live.com</domain> <domain>hotmail.fr</domain> <domain>hotmail.it</domain> *************** *** 369,372 **** --- 444,452 ---- <domain>hotmail.co.th</domain> <domain>hotmail.com.tr</domain> + <domain>webtv.com</domain> + <domain>charter.com</domain> + <domain>compaq.net</domain> + <domain>passport.com</domain> + <domain>messengeruser.com</domain> </domains> </service> |