Changeset 4023

Timestamp:

04/14/11 09:37:50 (13 years ago)

Author:

diegomoreno

Message:

Ticket #1727 - expressoMail1_2 - Melhoria para exibir o x-origin na fonte da mensagem.

Location:

branches/2.2/expressoMail1_2

Files:

• inc/class.phpmailer.php (modified) (1 diff)
• index.php (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (2 diffs)
• templates/default/config.tpl (modified) (1 diff)

branches/2.2/expressoMail1_2/inc/class.phpmailer.php

@@ -974 +974 @@
                 $result .= $this->AddrAppend("Cc", $this->cc);
         }
-
+                        
+                        if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_x_origin'])
+                                $result .= $this->HeaderLine("X-Origin", isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR']); 
+                        
                 $from = array();
                 $from[0][0] = trim($this->From);

branches/2.2/expressoMail1_2/index.php

@@ -73 +73 @@
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['telephone_number'] = $GLOBALS['phpgw_info']['user']['telephonenumber'];
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_cache'] = $current_config['expressoMail_enable_cache'];
+        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_x_origin'] = $current_config['expressoMail_use_x_origin'];
         $_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'];

branches/2.2/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -350 +350 @@
 imap max folders        admin   pt-br   Número de pastas imap
 googlegears url admin   pt-br   Url googlegears
-Use X-Origin    admin   pt-br   Usar "X-Origi"
+Use X-Origin    admin   pt-br   Usar "X-Origin"
 Number of messages to send:     expressoMail1_2 pt-br   Número de mensagens à enviar:
 Offline Pass    expressoMail1_2 pt-br   Senha do Offline
@@ -650 +650 @@
 Your rule contains any accented character. The filter may not work. Do you wish to continue?    expressoMail1_2 en      Sua regra contem algum caracter acentuado. O filtro pode nao funcionar. Deseja continuar?
 The selected folder cotain any accented character. The filter dont work with accented folders. Please, rename the folder or choose another folder.      expressoMail1_2 pt-br   A pasta selecionada contém algum caracter acentuado. O filtro não funcionada com pastas acentuadas. Por favor, mude o nome da pasta ou escolha outra. 
+Do you want to use x origin in source menssage? admin   pt-br   Deseja utilizar o X-Origin na fonte da mensagem?

branches/2.2/expressoMail1_2/templates/default/config.tpl

@@ -112 +112 @@
     <input size="80" name="newsettings[expressoMail_googlegears_url]" value="{value_expressoMail_googlegears_url}"> 
     </td>
-    </tr>  
+    </tr>
+   <tr bgcolor="{row_on}">
+   <td>{lang_Do_you_want_to_use_x_origin_in_source_menssage?}</td>
+   <td>
+   <select name="newsettings[expressoMail_use_x_origin]">
+   <option value=""{selected_expressoMail_use_x_origin_False}>{lang_No}</option>
+   <option value="True"{selected_expressoMail_use_x_origin_True}>{lang_Yes}</option>
+   </select>
+    </td>
+   </tr>  
 <!-- END body -->
 <!-- BEGIN footer -->