[PyWebMail-Checkins] webmail/webmail/client/config HotMail.xml, 1.20, 1.21

[Michael D. <du...@us...>]

Update of /cvsroot/pywebmail/webmail/webmail/client/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17492

Modified Files:
	HotMail.xml 
Log Message:
logout, NOTFIXED: delete

Index: HotMail.xml
===================================================================
RCS file: /cvsroot/pywebmail/webmail/webmail/client/config/HotMail.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** HotMail.xml	1 Dec 2007 02:38:32 -0000	1.20
--- HotMail.xml	7 Dec 2007 06:38:44 -0000	1.21
***************
*** 253,256 ****
--- 253,316 ----
      </parse>
    </login>
+   <logout>
+     <fetch>
+       <url_get id="logout_page1">
+         <url>http://<value name="server"/>/mail/logout.aspx</url>
+         <file>logout1.htm</file>
+         <method>GET</method>
+         <fields/>
+         <url_options>
+           <option name="override_ua">moz</option>
+           <option name="use_meta_refresh">0</option>
+         </url_options>
+       </url_get>
+       <url_get id="logout_page2">
+         <url>http://login.live.com/uilogout.srf</url>
+         <file>logout2.htm</file>
+         <method>GET</method>
+         <fields>
+           <field name="lc"><value name="lc"/></field>
+           <field name="id"><value name="id"/></field>
+           <field name="ru">http://<value name="server"/>/mail/logout.aspx?redirect=true&amp;mkt=<value name="language"/>-<value name="country"/></field>
+           <field name="nsvis"></field>
+           <field name="ec">1</field>
+         </fields>
+         <url_options>
+           <option name="override_ua">moz</option>
+           <option name="use_meta_refresh">0</option>
+         </url_options>
+       </url_get>
+       <url_get id="logout_page3">
+         <url>http://<value name="server"/>/mail/logout.aspx</url>
+         <file>logout3.htm</file>
+         <method>GET</method>
+         <fields>
+           <field name="redirect">true</field>
+           <field name="mkt"><value name="language"/>-<value name="country"/></field>
+           <field name="lc"><value name="lc"/></field>
+         </fields>
+         <url_options>
+           <option name="override_ua">moz</option>
+           <option name="use_redirect">0</option>
+           <option name="use_meta_refresh">0</option>
+           <option name="do_save_headers">1</option>
+         </url_options>
+       </url_get>
+     </fetch>
+     <parse>
+       <input ref="logout_page1"/>
+       <test id="logout_refresh_re">&lt;meta http-equiv="refresh" content="\d+;url=http://login\.live\.com/uilogout\.srf\?lc=(\d+)&amp;id=(\d+)&amp;ru=http://<value expr="server.replace('.','\\.')"/>/mail/logout\.aspx%3Fredirect%3Dtrue%26mkt%3D<value name="language"/>-<value name="country"/>&amp;nsvis=&amp;ec=1" /&gt;</test>
+       <field ref="logout_refresh_re" name="lc" group="1"/>
+       <field ref="logout_refresh_re" name="id" group="2"/>
+     </parse>
+     <check>
+       <input ref="logout_page2"/>
+       <test>window\.location\.replace\("http://<value expr="server.replace('.','\\.')"/>/mail/logout\.aspx\?redirect=true&amp;mkt=<value name="language"/>-<value name="country"/>&amp;lc=<value name="lc"/>"\);</test>
+     </check>
+     <check>
+       <input ref="logout_page3"/>
+       <test>^Location: http://www\.(?:live|msn)\.com</test>
+     </check>
+   </logout>
    <folders>
      <list>