[PyWebMail-Checkins] webmail/webmail/client/config Netscape.xml, 1.18, 1.19

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

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

Modified Files:
	Netscape.xml 
Log Message:
incompatible changes on server

Index: Netscape.xml
===================================================================
RCS file: /cvsroot/pywebmail/webmail/webmail/client/config/Netscape.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Netscape.xml	30 Nov 2007 19:20:29 -0000	1.18
--- Netscape.xml	2 Mar 2008 17:31:43 -0000	1.19
***************
*** 121,124 ****
--- 121,137 ----
          </url_options>
        </url_get>
+       <url_get id="login_usersettings">
+         <url>http://webmail.aol.com/<value name="version"/>/aim/en-us/common/settings.js.aspx</url>
+         <file>login7.js</file>
+         <method>GET</method>
+         <fields/>
+         <url_options>
+           <option name="use_meta_refresh">0</option>
+           <option name="use_redirect">0</option>
+           <option name="use_refresh">0</option>
+           <option name="do_save_headers">1</option>
+           <option name="override_ua">Mozilla/5.0 (Windows; U; Windows NT 5.0; en-GB; rv:1.8.1.1) Gecko/20061204 Firefox/2.0.0.1</option>
+         </url_options>
+       </url_get>
      </fetch>
      <pre_require>
***************
*** 179,187 ****
        </fixed>
      </pre_require>
!     <parse>
        <fixed>
          <line><value expr="cookie('Auth')"/></line>
        </fixed>
        <field name="enc_user" group="1">&amp;uid:([^&amp;]*)&amp;</field>
      </parse>
    </login>
--- 192,205 ----
        </fixed>
      </pre_require>
!     <!--parse>
        <fixed>
          <line><value expr="cookie('Auth')"/></line>
        </fixed>
        <field name="enc_user" group="1">&amp;uid:([^&amp;]*)&amp;</field>
+     </parse-->
+     <parse>
+       <input ref="login_usersettings"/>
+       <test>^window\.Settings = </test>
+       <field name="enc_user" group="1">","UserUID":"([^"]*)","</field>
      </parse>
    </login>
***************
*** 205,209 ****
      <parse>
        <input ref="get_info"/>
!       <test>^\[{"isSuccess":true,</test>
        <field name="storageQuota">,"storageQuota":(\d+),</field>
        <field name="storageUsed">,"storageUsed":(\d+)}]</field>
--- 223,229 ----
      <parse>
        <input ref="get_info"/>
!       <test inverse="true" error_group="1" result="relogin" id="re_json_err_relogin">\[{"needAuthentication":true,"msg":"([^"]*)","loginUrl":"</test>
!       <test inverse="true" error_group="1" id="re_json_err">\[{"needAuthentication":true,"msg":"([^"]*)",</test>
!       <test id="re_json_success">^\[{"isSuccess":true,</test>
        <field name="storageQuota">,"storageQuota":(\d+),</field>
        <field name="storageUsed">,"storageUsed":(\d+)}]</field>
***************
*** 229,233 ****
      <list>
        <input ref="folders_list"/>
!       <test>^\[{"isSuccess":true,</test>
        <list bounds="inclusive">
          <start>,"folders":\[</start>
--- 249,255 ----
      <list>
        <input ref="folders_list"/>
!       <test inverse="true" error_group="1" result="relogin" ref="re_json_err_relogin"/>
!       <test inverse="true" error_group="1" ref="re_json_err"/>
!       <test ref="re_json_success"/>
        <list bounds="inclusive">
          <start>,"folders":\[</start>
***************
*** 243,247 ****
      <fetch>
        <url_get id="folder_page">
!         <url>http://webmail.aol.com/<value name="version"/>/aim/en-us/common/rpc/RPC.aspx?user=<value name="enc_user"/></url>
          <file>folder_<value name="folder"/>_<value name="page"/>.htm</file>
          <method>POST</method>
--- 265,269 ----
      <fetch>
        <url_get id="folder_page">
!         <url>http://webmail.aol.com/<value name="version"/>/aim/en-us/common/rpc/RPC.aspx?user=<value name="enc_user"/>&amp;a=GetMessageList</url>
          <file>folder_<value name="folder"/>_<value name="page"/>.htm</file>
          <method>POST</method>
***************
*** 262,266 ****
          <input ref="folder_page"/>
          <start>0</start>
!         <test>^\[{"isSuccess":true,</test>
          <next expr="iif(int(match.group(1))&gt;(int(page)+1)*100,str(int(page)+1))">,"totalItems":(\d+),</next>
        </pages>
--- 284,290 ----
          <input ref="folder_page"/>
          <start>0</start>
!         <test inverse="true" error_group="1" result="relogin" ref="re_json_err_relogin"/>
!         <test inverse="true" error_group="1" ref="re_json_err"/>
!         <test ref="re_json_success"/>
          <next expr="iif(int(match.group(1))&gt;(int(page)+1)*100,str(int(page)+1))">,"totalItems":(\d+),</next>
        </pages>
***************
*** 322,326 ****
      <check>
        <input ref="delete_page"/>
!       <test>^\[{"isSuccess":true}\]</test>
      </check>
    </delete>
--- 346,352 ----
      <check>
        <input ref="delete_page"/>
!       <test inverse="true" error_group="1" result="relogin" ref="re_json_err_relogin"/>
!       <test inverse="true" error_group="1" ref="re_json_err"/>
!       <test ref="re_json_success"/>
      </check>
    </delete>