[PyWebMail-Checkins] webmail/webmail/client/config local.xml, 1.7, 1.8
Status: Beta
Brought to you by:
dubnerm
From: Michael D. <du...@us...> - 2008-03-02 17:28:22
|
Update of /cvsroot/pywebmail/webmail/webmail/client/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30474 Modified Files: local.xml Log Message: support new wsgi server+logout Index: local.xml =================================================================== RCS file: /cvsroot/pywebmail/webmail/webmail/client/config/local.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** local.xml 9 Oct 2006 21:14:49 -0000 1.7 --- local.xml 2 Mar 2008 17:28:25 -0000 1.8 *************** *** 5,8 **** --- 5,10 ---- <field name="inbox"><skip/></field> <field name="delete_multiple">10</field> + <field name="port_suffix"><value expr="iif(getdefault('port','80')!='80',':'+getdefault('port','80'))"/></field> + <cookie name="docookie" path="/" domain="loopback">true</cookie> </fixed> </setup> *************** *** 18,22 **** <fetch> <url_get id="login_result"> ! <url>http://loopback<value expr="iif(defined('port'),':'+getdefault('port','80'))"/>/python/webmail/login.html</url> <file>login.htm</file> <method>POST</method> --- 20,24 ---- <fetch> <url_get id="login_result"> ! <url>http://loopback<value name="port_suffix"/>/python/webmail/login.html</url> <file>login.htm</file> <method>POST</method> *************** *** 30,40 **** <check> <input ref="login_result"/> <test><title>Successfull logon</title></test> </check> </login> <folder> <fetch> <url_get id="folder_page"> ! <url>http://loopback<value expr="iif(defined('port'),':'+getdefault('port','80'))"/>/python/webmail/list_folder.html</url> <file>folder_<value name="folder"/>.htm</file> <method>GET</method> --- 32,61 ---- <check> <input ref="login_result"/> + <test id="relogin_form_re" inverse="true"><form action="(?:[^"]*/)?login\.html" </test> <test><title>Successfull logon</title></test> </check> </login> + <logout> + <fetch> + <url_get id="logout_result"> + <url>http://loopback<value name="port_suffix"/>/python/webmail/logout.html</url> + <file>logout.htm</file> + <method>GET</method> + <fields/> + <url_options> + <option name="use_redirect">0</option> + <option name="do_save_headers">1</option> + </url_options> + </url_get> + </fetch> + <check> + <input ref="logout_result"/> + <test>Location: </test> + </check> + </logout> <folder> <fetch> <url_get id="folder_page"> ! <url>http://loopback<value name="port_suffix"/>/python/webmail/list_folder.html</url> <file>folder_<value name="folder"/>.htm</file> <method>GET</method> *************** *** 45,48 **** --- 66,70 ---- <list> <input ref="folder_page"/> + <test ref="relogin_form_re" inverse="true"/> <item> <start>\<tr class=msg\></start> *************** *** 60,64 **** <fetch> <url_get id="folders_list"> ! <url>http://loopback<value expr="iif(defined('port'),':'+getdefault('port','80'))"/>/python/webmail/folders.html</url> <file>folders.htm</file> <method>GET</method> --- 82,86 ---- <fetch> <url_get id="folders_list"> ! <url>http://loopback<value name="port_suffix"/>/python/webmail/folders.html</url> <file>folders.htm</file> <method>GET</method> *************** *** 73,76 **** --- 95,99 ---- <list> <input ref="folders_list"/> + <test ref="relogin_form_re" inverse="true"/> <item group="1">"list_folder\.html\?folder\=([^"]+)"</item> </list> *************** *** 80,84 **** <fetch> <url_get id="message_eml"> ! <url>http://loopback<value expr="iif(defined('port'),':'+getdefault('port','80'))"/>/python/webmail/message.eml</url> <file>message_<value name="folder"/>_<value name="msgid"/>.txt</file> <method>GET</method> --- 103,107 ---- <fetch> <url_get id="message_eml"> ! <url>http://loopback<value name="port_suffix"/>/python/webmail/message.eml</url> <file>message_<value name="folder"/>_<value name="msgid"/>.txt</file> <method>GET</method> *************** *** 94,98 **** <fetch> <url_get id="delete_page"> ! <url>http://loopback<value expr="iif(defined('port'),':'+getdefault('port','80'))"/>/python/webmail/delete.html</url> <file>delete_<value name="folder"/>_<value name="timestamp"/>.htm</file> <method>GET</method> --- 117,121 ---- <fetch> <url_get id="delete_page"> ! <url>http://loopback<value name="port_suffix"/>/python/webmail/delete.html</url> <file>delete_<value name="folder"/>_<value name="timestamp"/>.htm</file> <method>GET</method> *************** *** 105,108 **** --- 128,132 ---- <check> <input ref="delete_page"/> + <test ref="relogin_form_re" inverse="true"/> <test><title>Delete successful</title></test> </check> |