Changeset 1964

Timestamp:

02/02/10 15:15:34 (14 years ago)

Author:

eduardoalex

Message:

Ticket #894 - Resolvendo o problema descrito no ticket em questao

Location:

trunk/expressoMail1_2

Files:

• js/draw_api.js (modified) (1 diff)
• js/local_messages.js (modified) (1 diff)
• js/offline_access.js (modified) (1 diff)
• offline.php (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (1 diff)
• templates/default/index_offline.tpl (modified) (1 diff)

trunk/expressoMail1_2/js/draw_api.js

@@ -384 +384 @@
                 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 = "<iframe src='offline.php?inside=1' width='100%' height='100%' frameBorder='0'></iframe>";
+                                        return false;
+                                }
+                        }
                         connector.newRequest('error.html', 'templates/'+template+'/error.html', 'GET',
                                 function(data)

trunk/expressoMail1_2/js/local_messages.js

@@ -1305 +1305 @@
         }
         
-        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();

trunk/expressoMail1_2/js/offline_access.js

@@ -34 +34 @@
         
         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';

trunk/expressoMail1_2/offline.php

@@ -109 +109 @@
         
         $acc = CreateObject('phpgwapi.accounts');
+        if(isset($_GET['inside'])) {
+                $template->set_var("start_coment_logoff","<tr><td class='content-menu-td'>&nbsp;</td></tr><!--");
+                $template->set_var("end_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']); 

trunk/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -447 +447 @@
 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

trunk/expressoMail1_2/templates/default/index_offline.tpl

@@ -20 +20 @@
 
                                                                 <tr><td id="link_tools" class='content-menu-td' onmouseover='javascript:set_menu_bg(Element("link_tools"));' onmouseout='javascript:unset_menu_bg(this);'><div class='em_div_sidebox_menu'><img height='16px' src='./templates/{template}/images/menu/tools.gif'><span class="em_sidebox_menu">{tools} ...</span></div></td></tr>                                                               
-                                                                <tr><td class='content-menu-td' onclick='expresso_offline_access.do_logoff()' onmouseover='javascript:set_menu_bg(this);' onmouseout='javascript:unset_menu_bg(this);'><div class='em_div_sidebox_menu'><img width='18px' height='18px' src='../phpgwapi/templates/celepar/images/logout.png'><span class="em_sidebox_menu">{logoff}</span></div></td></tr>
+                                                                {start_coment_logoff}<tr><td class='content-menu-td' onclick='expresso_offline_access.do_logoff()' onmouseover='javascript:set_menu_bg(this);' onmouseout='javascript:unset_menu_bg(this);'><div class='em_div_sidebox_menu'><img width='18px' height='18px' src='../phpgwapi/templates/celepar/images/logout.png'><span class="em_sidebox_menu">{logoff}</span></div></td></tr>{end_coment_logoff}
                                                                 <tr><td height="3px">&nbsp;</td></tr>                                                           
                                                         </tbody></table>