[PyWebMail-Checkins] webmail/webmail/client/config pochta.ru.xml, 1.14, 1.15

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

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

Modified Files:
	pochta.ru.xml 
Log Message:
logout support plus more checks

Index: pochta.ru.xml
===================================================================
RCS file: /cvsroot/pywebmail/webmail/webmail/client/config/pochta.ru.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** pochta.ru.xml	7 Dec 2007 06:27:11 -0000	1.14
--- pochta.ru.xml	8 Dec 2007 07:52:56 -0000	1.15
***************
*** 34,40 ****
--- 34,65 ----
        <test id="login_re">(?i)^Location: (?:http://((?:new\.)?www\d*\.pochta\.ru))?/list\.php\?id=([a-fA-F0-9]*)(?:&amp;last_enter=yes)?(?:&amp;lng=(?:en|ru))?(?:&amp;fic=1)?\r?$</test>
        <test id="relogin_error_re" inverse="true" result="relogin" error_group="1">&lt;div class="error"&gt;\s*&lt;div&gt;([^&lt;]*)&lt;</test>
+       <test id="err_report_re" inverse="true" error_group="1">&lt;div class="err_report"&gt;[\n\r]*([^&lt;]*)[\n\r]*&lt;/div&gt;</test>
        <field group="2" name="session" ref="login_re"/>
      </parse>
    </login>
+   <logout>
+     <fetch>
+       <url_get id="logout_result">
+         <url>http://www.pochta.ru/logout.php</url>
+         <file>logout.htm</file>
+         <method>GET</method>
+         <fields>
+           <field name="id"><value name="session"/></field>
+         </fields>
+         <url_options>
+           <option name="use_meta_refresh">0</option>
+           <option name="use_redirect">0</option>
+           <option name="do_save_headers">1</option>
+         </url_options>
+       </url_get>
+     </fetch>
+     <check>
+       <input ref="logout_result"/>
+       <test ref="relogin_error_re" inverse="true" result="relogin" error_group="1"/>
+       <test ref="err_report_re" inverse="true" error_group="1"/>
+       <test>^Set-Cookie: just_logout=<value name="user"/>%40<value name="domain"/>\r?$</test>
+       <test>^Location: (?:http://www\.pochta\.ru)?/(?:index\.php)?(?:\?lng=[a-z]+)?\r?$</test>
+     </check>
+   </logout>
    <folders>
      <fetch>
***************
*** 54,57 ****
--- 79,83 ----
        <input ref="folders_list"/>
        <test ref="relogin_error_re" inverse="true" result="relogin" error_group="1"/>
+       <test ref="err_report_re" inverse="true" error_group="1"/>
        <item bounds="inclusive">
          <start>&lt;td&gt;&lt;input type="checkbox" name="mbfs\[\]"</start>
***************
*** 83,86 ****
--- 109,113 ----
          <input ref="folder_page"/>
          <test ref="relogin_error_re" inverse="true" result="relogin" error_group="1"/>
+         <test ref="err_report_re" inverse="true" error_group="1"/>
          <start>1</start>
          <next group="1">&lt;a href="mailbox\.php\?id=<value name="session"/>&amp;page=(\d+)" id="link_next_f"&gt;[^&amp;]*&amp;nbsp;?&amp;raquo;&lt;/a&gt;</next>
***************
*** 113,117 ****
          <url_options>
            <option name="accept_charset">koi8-r</option>
!           <option name="use_redirect">0</option>
            <!--option name="accept_charset">windows-1251</option-->
          </url_options>
--- 140,144 ----
          <url_options>
            <option name="accept_charset">koi8-r</option>
!           <!--option name="use_redirect">0</option-->
            <!--option name="accept_charset">windows-1251</option-->
          </url_options>
***************
*** 123,126 ****
--- 150,154 ----
        <input ref="message_eml">
          <test ref="relogin_error_re" inverse="true" result="relogin" error_group="1"/>
+         <test ref="err_report_re" inverse="true" error_group="1"/>
        </input>
      </asis>
***************
*** 143,147 ****
        <input ref="delete_page"/>
        <test ref="relogin_error_re" inverse="true" result="relogin" error_group="1"/>
!       <!-- FIXME: No test at all!? -->
      </parse>
    </delete>
--- 171,176 ----
        <input ref="delete_page"/>
        <test ref="relogin_error_re" inverse="true" result="relogin" error_group="1"/>
!       <test ref="err_report_re" inverse="true" error_group="1"/>
!       <!-- FIXME: No positive tests at all!? -->
      </parse>
    </delete>