[PyWebMail-Checkins] webmail/webmail/client/config Google.xml, 1.17, 1.18
Status: Beta
Brought to you by:
dubnerm
Menu
▾
▴
[PyWebMail-Checkins] webmail/webmail/client/config Google.xml, 1.17, 1.18
|
From: Michael D. <du...@us...> - 2008-03-02 17:34:12
|
Update of /cvsroot/pywebmail/webmail/webmail/client/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32701 Modified Files: Google.xml Log Message: incompatible changes on server Index: Google.xml =================================================================== RCS file: /cvsroot/pywebmail/webmail/webmail/client/config/Google.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Google.xml 30 Nov 2007 20:23:26 -0000 1.17 --- Google.xml 2 Mar 2008 17:34:15 -0000 1.18 *************** *** 80,84 **** <input ref="login2_result"/> <test inverse="yes">location\.replace\((["'])https?://g?mail.google.com/g?mail/?\?(?:_sgh|auth)(?:=|\\u003d)(.*)\1\)</test> ! <test id="login2_check">location\.replace\("http://www\.google\.ru/accounts/SetSID\?[^"]*&continue\\u003dhttp%3A%2F%2Fmail\.google\.com%2Fmail%2F%3Fauth%3D([^"]*)%26gausr%3D<value name="user"/>%2540gmail\.com"\)</test> <field ref="login2_check" name="session" group="1" parse="url"/> </parse> --- 80,84 ---- <input ref="login2_result"/> <test inverse="yes">location\.replace\((["'])https?://g?mail.google.com/g?mail/?\?(?:_sgh|auth)(?:=|\\u003d)(.*)\1\)</test> ! <test id="login2_check">location\.replace\("http://www\.google\.ru/accounts/SetSID\?[^"]*(?:&|\\46)continue(?:\\u003d|\\75)http%3A%2F%2Fmail\.google\.com%2Fmail%2F%3Fauth%3D([^"]*)%26gausr%3D<value name="user"/>%2540gmail\.com"\)</test> <field ref="login2_check" name="session" group="1" parse="url"/> </parse> *************** *** 96,101 **** <test inverse="yes" error_group="1">^Location: https://mail\.google\.com/mail/\?view=(chatintro)&</test> <test inverse="yes" result="retry">^Location: https://www\.google\.com/accounts/ServiceLogin\?</test> ! <field name="language" expr="icase('','en',match.group(2)[:1],'/',match.group(2)[1:],icase(match.group(2)[:4],'\\x2F',match.group(2)[4:],'Unknown'))">top\.location\s*=\s*(['"])(?:/g?mail/)?html(|(?:/|\\x2F)(?:en-GB|fr|it|de|es|zh-TW|zh-CN|ja|ko|nl|pt-BR|ru))(?:/|\\x2F)noactivex\.html\1</field> ! <test id="js_ver">(?:<script src="(?:/gmail)?\?view=page&name=browser&|^js\.location\.replace\("\?(?:ui=1\\x26)?view=page\\x26name=js\\x26)ver=([^ ">]*)"(?:>|\);$)</test> <field ref="js_ver" name="js_ver" group="1"/> </parse> --- 96,101 ---- <test inverse="yes" error_group="1">^Location: https://mail\.google\.com/mail/\?view=(chatintro)&</test> <test inverse="yes" result="retry">^Location: https://www\.google\.com/accounts/ServiceLogin\?</test> ! <field name="language" expr="icase(match.group(2)[:1],'','en','/',match.group(2)[1:],icase(match.group(2)[:4],'\\x2F',match.group(2)[4:],'Unknown'))">top\.location\s*=\s*(['"])(?:/g?mail/)?html(|(?:/|\\x2F)(?:en-GB|fr|it|de|es|zh-TW|zh-CN|ja|ko|nl|pt-BR|ru))(?:/|\\x2F)noactivex\.html\1</field> ! <test id="js_ver">(?:<script src="(?:/gmail)?\?(?:ui=1&(?:amp;)?)?view=page&(?:amp;)?name=browser&(?:amp;)?|^js\.location\.replace\("\?(?:ui=1\\x26)?view=page\\x26name=js\\x26)ver=([^ ">]*)"(?:>|\);$)</test> <field ref="js_ver" name="js_ver" group="1"/> </parse> *************** *** 103,110 **** <choose> <when test="language=='en'"> ! <fixed><line>parse_date=date(%a %b %d %Y_%I:%M %p)</line></fixed> </when> <when test="language=='ru'"> ! <fixed><line>parse_date=decode(utf-8),replace( ã\.,),replace( ã\.,),replace(ÿíâàðÿ,Jan),replace(ôåâðàëÿ,Feb),replace(ìàðòà,Mar),replace(àïðåëÿ,Apr),replace(ìàÿ,May),replace(èþíÿ,Jun),replace(èþëÿ,Jul),replace(àâãóñòà,Aug),replace(ñåíòÿáðÿ,Sep),replace(îêòÿáðÿ,Oct),replace(íîÿáðÿ,Nov),replace(äåêàáðÿ,Dec),date(%d %b %Y_%H:%M)</line></fixed> </when> <otherwise> --- 103,110 ---- <choose> <when test="language=='en'"> ! <fixed><line>parse_date=replace(_, ),date(%a %b %d %Y %I:%M %p)</line></fixed> </when> <when test="language=='ru'"> ! <fixed><line>parse_date=decode(utf-8),replace( ã\.,),replace( ã\.,),replace(ÿíâàðÿ,Jan),replace(ôåâðàëÿ,Feb),replace(ìàðòà,Mar),replace(àïðåëÿ,Apr),replace(ìàÿ,May),replace(èþíÿ,Jun),replace(èþëÿ,Jul),replace(àâãóñòà,Aug),replace(ñåíòÿáðÿ,Sep),replace(îêòÿáðÿ,Oct),replace(íîÿáðÿ,Nov),replace(äåêàáðÿ,Dec),replace(_, ),date(%d %b %Y %H:%M)</line></fixed> </when> <otherwise> *************** *** 200,204 **** <start>,\[</start> <end>,\d(?:,"[^"]*")?\]$</end> ! <field name="id" id="list_message_id" group="1">^,\["([^"]+)(?#1=uid)",[01](?#unread),[01](?#starred),"(?:<b>)?([^"]+?)(?#2=display_date)(?:</b>)?","(?:<|\\u003c)span id(?:=|\\u003d)\\(['"])(?#3)_u(?:ser|pro)_([^'"\\]*)(?#4=from_email)\\\3\\?>(?:<b>)?([^"]*?)(?#5=from_name)(?:</b>)?(?:<|\\u003c)/span\\?>(?: \((\d+)(?#6=conversation_length)\))?","[^"]*"(?#maillist_mark),"(?:<b>)?([^"]*?)(?#7=subject)(?:</b>)?","[^"]*"(?#body start),\[(?:"(?:[^"])*"(?:,"(?:[^"])*")*)?\](?#labels)\s*,"([^"]*)(?#8=attachments)","\1"(?#uid-copy),\d+,"([^"]*)"(?#9=date),\d+,"[^"]*",\d+,\d+,\d+\]</field> <field name="date" group="9" ref="list_message_id" parse="$parse_date"/> <field name="from_email" group="4" ref="list_message_id" parse=""/> --- 200,204 ---- <start>,\[</start> <end>,\d(?:,"[^"]*")?\]$</end> ! <field name="id" id="list_message_id" group="1">^,\["([^"]+)(?#1=uid)",[01](?#unread),[01](?#starred),"(?:<b>)?([^"]+?)(?#2=display_date)(?:</b>)?","(?:<|\\u003c)span id(?:=|\\u003d)\\(['"])(?#3)_u(?:ser|pro)_([^'"\\]*)(?#4=from_email)\\\3(?:\\?>|\\u003e)(?:<b>)?([^"]*?)(?#5=from_name)(?:</b>)?(?:<|\\u003c)/span(?:\\?>|\\u003e)(?: \((\d+)(?#6=conversation_length)\))?","[^"]*"(?#maillist_mark),"(?:<b>)?([^"]*?)(?#7=subject)(?:</b>)?","[^"]*"(?#body start),\[(?:"(?:[^"])*"(?:,"(?:[^"])*")*)?\](?#labels)\s*,"([^"]*)(?#8=attachments)","\1"(?#uid-copy),\d+,"([^"]*)"(?#9=date),\d+,"[^"]*",\d+,\d+,\d+\]</field> <field name="date" group="9" ref="list_message_id" parse="$parse_date"/> <field name="from_email" group="4" ref="list_message_id" parse=""/> |
