Index: /trunk/expressoMail1_2/templates/default/index_offline.tpl
===================================================================
--- /trunk/expressoMail1_2/templates/default/index_offline.tpl (revision 1121)
+++ /trunk/expressoMail1_2/templates/default/index_offline.tpl (revision 1964)
@@ -20,5 +20,5 @@
-
+ {start_coment_logoff}
{end_coment_logoff}
|
Index: /trunk/expressoMail1_2/setup/phpgw_pt-br.lang
===================================================================
--- /trunk/expressoMail1_2/setup/phpgw_pt-br.lang (revision 1951)
+++ /trunk/expressoMail1_2/setup/phpgw_pt-br.lang (revision 1964)
@@ -447,4 +447,5 @@
The Anti Pop-Up is enabled. Allow this site (%1) for print. expressoMail1_2 pt-br O anti Pop-Up está ativado. Desative-o para este site (%1)!
The event was imported successfully. expressoMail1_2 pt-br O compromisso foi importado com sucesso.
+The expresso imap server is currently down, expresso noticed you have offline mail module installed, would you like to use it? expressoMail1_2 pt-br O servidor de caixas está aparentemente fora do ar. O expresso notou que você possui o módulo de e-mails offline instalado. Deseja utilizá-lo?
The extension %1 is incorrect. expressoMail1_2 pt-br O ramal %1 está incorretamente cadastrado.
The field \"%1\" of the message it contains expressoMail1_2 pt-br O campo \"%1\" da mensagem contém
Index: /trunk/expressoMail1_2/offline.php
===================================================================
--- /trunk/expressoMail1_2/offline.php (revision 1932)
+++ /trunk/expressoMail1_2/offline.php (revision 1964)
@@ -109,4 +109,11 @@
$acc = CreateObject('phpgwapi.accounts');
+ if(isset($_GET['inside'])) {
+ $template->set_var("start_coment_logoff","
");
+ }else {
+ $template->set_var("start_coment_logoff"," ");
+ $template->set_var("end_coment_logoff","");
+ }
$template->set_var("user_organization", $acc->get_organization($GLOBALS['phpgw_info']['user']['account_dn']));
$template->set_var("cyrus_delimiter",$_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter']);
Index: /trunk/expressoMail1_2/js/local_messages.js
===================================================================
--- /trunk/expressoMail1_2/js/local_messages.js (revision 1939)
+++ /trunk/expressoMail1_2/js/local_messages.js (revision 1964)
@@ -1305,10 +1305,12 @@
}
- local_messages.prototype.set_as_logged = function(uid_usuario,pass) {
- this.init_local_messages();
- var rs = this.dbGears.execute("select pass from user where uid_usuario=?",[uid_usuario]);
- if(!rs.isValidRow() || (pass!=rs.field(0) && pass!=MD5(rs.field(0))) ) {
- this.finalize();
- return false;
+ local_messages.prototype.set_as_logged = function(uid_usuario,pass,bypass) {
+ this.init_local_messages();
+ if (!bypass) {
+ var rs = this.dbGears.execute("select pass from user where uid_usuario=?", [uid_usuario]);
+ if (!rs.isValidRow() || (pass != rs.field(0) && pass != MD5(rs.field(0)))) {
+ this.finalize();
+ return false;
+ }
}
d = new Date();
Index: /trunk/expressoMail1_2/js/draw_api.js
===================================================================
--- /trunk/expressoMail1_2/js/draw_api.js (revision 1938)
+++ /trunk/expressoMail1_2/js/draw_api.js (revision 1964)
@@ -384,4 +384,19 @@
if ( data && data.imap_error )
{
+ if(preferences.use_local_messages==1 && expresso_local_messages.is_offline_installed){
+ conf = confirm(get_lang("The expresso imap server is currently down, expresso noticed you have offline mail module installed, would you like to use it?"));
+ if(conf) {
+ window.onresize = function() {
+ var target = document.getElementById('divAppbox');
+ target.style.height= document.body.clientHeight - 83;
+ }
+ var target = document.getElementById('divAppbox');
+ document.getElementById("divAppboxHeader").innerHTML="";
+ target.style.height= document.body.clientHeight - 83;
+ expresso_local_messages.set_as_logged(account_id,0,true);
+ target.innerHTML = "";
+ return false;
+ }
+ }
connector.newRequest('error.html', 'templates/'+template+'/error.html', 'GET',
function(data)
Index: /trunk/expressoMail1_2/js/offline_access.js
===================================================================
--- /trunk/expressoMail1_2/js/offline_access.js (revision 1121)
+++ /trunk/expressoMail1_2/js/offline_access.js (revision 1964)
@@ -34,5 +34,5 @@
offline_access.prototype.do_login = function(uid_usuario,pass) {
- control = expresso_local_messages.set_as_logged(uid_usuario,pass);
+ control = expresso_local_messages.set_as_logged(uid_usuario,pass,false);
if(!control) {
document.getElementById('div_error').innerHTML = 'login ou senha inválida';