Changeset 1466

Timestamp:

09/30/09 11:44:50 (15 years ago)

Author:

amuller

Message:

Ticket #669 - Implementação de url do gears para instala-la automaticamente

Location:

trunk

Files:

• admin/setup/phpgw_pt-br.lang (modified) (previous)
• expressoMail1_2/index.php (modified) (1 diff)
• expressoMail1_2/js/draw_api.js (modified) (1 diff)
• expressoMail1_2/js/local_messages.js (modified) (4 diffs)
• expressoMail1_2/setup/phpgw_pt-br.lang (modified) (previous)
• expressoMail1_2/templates/default/config.tpl (modified) (1 diff)

trunk/expressoMail1_2/index.php

@@ -66 +66 @@
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['number_of_contacts'] = $current_config['expressoMail_Number_of_dynamic_contacts'] ? $current_config['expressoMail_Number_of_dynamic_contacts'] : "0";
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['notification_domains'] = $current_config['expressoMail_notification_domains'];
+        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['googlegears_url'] = $current_config['expressoMail_googlegears_url'];    
     $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_assinar_criptografar'] = $GLOBALS['phpgw_info']['server']['use_assinar_criptografar'] ?  $GLOBALS['phpgw_info']['server']['use_assinar_criptografar'] : "0";
     $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_signature_digital_cripto'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature_digital_cripto'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature_digital_cripto'] : "0";

trunk/expressoMail1_2/js/draw_api.js

@@ -168 +168 @@
                 if (preferences.use_local_messages==1 || expresso_offline) {
                         if (!window.google || !google.gears) {
-                                temp = confirm(get_lang("To use local messages you have to install google gears. Would you like to be redirected to gears installation page?"));
-                                if (temp) {
-                                        location.href = "http://gears.google.com/?action=install&message="+
-                                        get_lang("To use local messages, install Google Gears")+"&return=" + document.location.href;
-                                }
-                                else {
+                                if (!expresso_local_messages.installGears())
                                         preferences.use_local_messages=0;
-                                }
                         }
                         else{

trunk/expressoMail1_2/js/local_messages.js

@@ -9 +9 @@
                 this.fileSubmitter = null;
         }
-
+        local_messages.prototype.installGears = function (){
+                temp = confirm(get_lang("To use local messages you have to install google gears. Would you like to install it now?"));
+                if (temp && typeof(preferences.googlegears_url) != 'undefined'){
+                        if (is_ie)
+                                location.href = preferences.googlegears_url + "/gears.exe";
+                        else
+                                location.href = preferences.googlegears_url + "/gears.xpi";
+                        return false;
+                }
+                if (temp) {
+                        location.href = "http://gears.google.com/?action=install&message="+
+                                get_lang("To use local messages, install Google Gears")+"&return=" + document.location.href;
+                }
+                else return false;
+        }
         local_messages.prototype.init_local_messages = function(){
                 if(this.dbGears == null)
@@ -849 +863 @@
                 
         }
-
         local_messages.prototype.update_offline = function(redirect) {
                 this.init_local_messages();
@@ -872 +885 @@
                                 temp = confirm(document.getElementById('lang_gears_redirect').value);
                                 if (temp) {
-                                        location.href = "http://gears.google.com/?action=install&message="+
-                                        "Para utilizar o recurso de mensagens locais, instale o google gears&return=" + document.location.href;                         
+                                        expresso_local_messages.installGears();
                                 }
                                 return;
@@ -891 +903 @@
                                 temp = confirm(document.getElementById('lang_gears_redirect').value);
                                 if (temp) {
-                                        location.href = "http://gears.google.com/?action=install&message="+
-                                        "Para utilizar o recurso de mensagens locais, instale o google gears&return=" + document.location.href;
+                                         expresso_local_messages.installGears();
                                 }
                                 return;

trunk/expressoMail1_2/templates/default/config.tpl

@@ -76 +76 @@
     <td>                 
     <input size="1" name="newsettings[expressoMail_Max_attachment_size]" value="{value_expressoMail_Max_attachment_size}">&nbsp;Mb
-    </td>                
-    </tr> 
+    </td>
+    </tr>
+    <tr bgcolor="{row_off}">
+    <td>{lang_googlegears_url}</td>
+    <td>
+    <input size="80" name="newsettings[expressoMail_googlegears_url]" value="{value_expressoMail_googlegears_url}"> 
+    </td>
+    </tr>  
 <!-- END body -->
 <!-- BEGIN footer -->