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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Modified Files:
	HotMail.xml 
Log Message:
delete and minor fixes

Index: HotMail.xml
===================================================================
RCS file: /cvsroot/pywebmail/webmail/webmail/client/config/HotMail.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** HotMail.xml	7 Dec 2007 06:38:44 -0000	1.21
--- HotMail.xml	8 Dec 2007 07:55:10 -0000	1.22
***************
*** 250,254 ****
        </choose>
        <test inverse="yes" error_group="1">error=(.*)</test>
!       <field name="inbox" group="1">^inbox=(.*)$</field>
      </parse>
    </login>
--- 250,254 ----
        </choose>
        <test inverse="yes" error_group="1">error=(.*)</test>
!       <field name="inbox" group="1" parse="decode(unicode_escape)">^inbox=(.*)$</field>
      </parse>
    </login>
***************
*** 334,338 ****
        <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>
--- 334,338 ----
        <url_get id="folder_page">
          <url>http://<value name="server"/>/mail/InboxLight.aspx</url>
!         <file>folder_<value expr="folder.encode('punycode').strip()"/>_<value name="curmbox"/>_page<value name="page"/>.htm</file>
          <method>GET</method>
          <fields>
***************
*** 363,367 ****
          <field name="from_name" group="1" parse="html">&lt;td  class="(?:InboxContentItemUnread)?" nowrap&gt;&lt;a href="ReadMessageLight\.aspx\?[^"]+" class="TruncateFrom"&gt;([^&lt;]*)&lt;/a&gt;&lt;/td&gt;</field>
          <field name="subject" group="1" parse="html">&lt;td  class="(?:InboxContentItemUnread)?"&gt;&lt;a href="ReadMessageLight\.aspx\?[^"]+"&gt;([^&lt;]*)&amp;#x200f;&lt;/a&gt;&lt;/td&gt;</field>
!         <field name="date" group="1" parse="html,date(%d.%m.%Y)">&lt;td  class="NoWrap"&gt;([^&lt;]+)&lt;/td&gt;</field>
          <field name="size" group="1" parse="html,decode(utf-8),replace(KB$,k),replace(&#1050;&#1041;$,k),replace(MB$,m),replace(&#1052;&#1041;$,m),replace(GB$,g),replace(&#1043;&#1041;$,g)">&lt;td  class="TextAlignRight"&gt;([^lt;]*)&lt;/td&gt;</field>
        </item>
--- 363,367 ----
          <field name="from_name" group="1" parse="html">&lt;td  class="(?:InboxContentItemUnread)?" nowrap&gt;&lt;a href="ReadMessageLight\.aspx\?[^"]+" class="TruncateFrom"&gt;([^&lt;]*)&lt;/a&gt;&lt;/td&gt;</field>
          <field name="subject" group="1" parse="html">&lt;td  class="(?:InboxContentItemUnread)?"&gt;&lt;a href="ReadMessageLight\.aspx\?[^"]+"&gt;([^&lt;]*)&amp;#x200f;&lt;/a&gt;&lt;/td&gt;</field>
!         <field name="date" group="1" parse="html,date(%d.%m.%Y,%H:%M)">&lt;td  class="NoWrap"&gt;([^&lt;]+)&lt;/td&gt;</field>
          <field name="size" group="1" parse="html,decode(utf-8),replace(KB$,k),replace(&#1050;&#1041;$,k),replace(MB$,m),replace(&#1052;&#1041;$,m),replace(GB$,g),replace(&#1043;&#1041;$,g)">&lt;td  class="TextAlignRight"&gt;([^lt;]*)&lt;/td&gt;</field>
        </item>
***************
*** 372,376 ****
        <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>
--- 372,376 ----
        <url_get id="message_eml">
          <url>http://<value name="server"/>/mail/GetMessageSource.aspx</url>
!         <file>message_<value expr="folder.encode('punycode').strip()"/>_<value name="msgid"/>.txt</file>
          <method>GET</method>
          <fields>
***************
*** 473,487 ****
      <fetch>
        <url_get id="delete_page">
!         <url>http://<value name="server"/>/cgi-bin/HoTMaiL</url>
!         <file>delete_<value name="folder"/>_<value name="timestamp"/>.htm</file>
!         <method>GET</method>
          <fields>
!           <field name="curmbox"><value name="curmbox"/></field>
!           <field name="_HMaction"><value expr="iif(defined('delete_tobox'),'MoveTo','delete')"/></field>
!           <field name="tobox"><value expr="getdefault('delete_tobox','')"/></field>
!           <field value="on" multiply="msgid"><value name="msgid"/></field>
          </fields>
          <url_options>
            <option name="use_meta_refresh">0</option>
          </url_options>
        </url_get>
--- 473,491 ----
      <fetch>
        <url_get id="delete_page">
!         <url>http://<value name="server"/>/mail/InboxLight.aspx?FolderID=<value name="curmbox"/>&amp;n=<value expr="str(randrange(10000000000))"/></url>
!         <file>delete_<value expr="folder.encode('punycode').strip()"/>_<value name="timestamp"/>.htm</file>
!         <method>POST</method>
          <fields>
!           <field name="__VIEWSTATE"></field>
!           <field name="mt"><value expr="cookie('mt')"/></field>
!           <field name="MoveMessageSelector"></field>
!           <field name="ToolbarActionItem">DeleteMessages</field>
!           <field name="SelectAllMessages">off</field>
!           <field name="SelectedMessages" multiply="msgid"><value name="msgid"/></field>
          </fields>
          <url_options>
+           <option name="override_ua">moz</option>
            <option name="use_meta_refresh">0</option>
+           <option name="multipart_form">1</option>
          </url_options>
        </url_get>
***************
*** 489,493 ****
      <check>
        <input ref="delete_page"/>
!       <test>&lt;font class=&quot;G&quot;&gt;<value name="email"/>&lt;/font&gt;</test>
      </check>
    </delete>
--- 493,497 ----
      <check>
        <input ref="delete_page"/>
!       <test ref="check_email_header"/>
      </check>
    </delete>