Changeset 4026


Ignore:
Timestamp:
04/14/11 11:30:48 (13 years ago)
Author:
rafaelraymundo
Message:

Ticket #1726 - Melhoria para exibir o x-origin na fonte da mensagem. r4023

Location:
branches/2.2.0.1/expressoMail1_2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.0.1/expressoMail1_2/inc/class.phpmailer.php

    r3018 r4026  
    975975        } 
    976976 
     977        if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_x_origin']) 
     978                $result .= $this->HeaderLine("X-Origin", isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR']); 
     979 
    977980                $from = array(); 
    978981                $from[0][0] = trim($this->From); 
  • branches/2.2.0.1/expressoMail1_2/index.php

    r3995 r4026  
    7575        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['telephone_number'] = $GLOBALS['phpgw_info']['user']['telephonenumber']; 
    7676        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_cache'] = $current_config['expressoMail_enable_cache']; 
     77        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_x_origin'] = $current_config['expressoMail_use_x_origin']; 
    7778        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['number_of_contacts'] = $current_config['expressoMail_Number_of_dynamic_contacts'] ? $current_config['expressoMail_Number_of_dynamic_contacts'] : "0"; 
    7879        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['notification_domains'] = $current_config['expressoMail_notification_domains']; 
  • branches/2.2.0.1/expressoMail1_2/templates/default/config.tpl

    r3407 r4026  
    112112    <input size="80" name="newsettings[expressoMail_googlegears_url]" value="{value_expressoMail_googlegears_url}">  
    113113    </td> 
    114     </tr>   
     114    </tr> 
     115    <tr bgcolor="{row_on}"> 
     116    <td>{lang_Do_you_want_to_use_x_origin_in_source_menssage?}</td> 
     117    <td> 
     118    <select name="newsettings[expressoMail_use_x_origin]"> 
     119    <option value=""{selected_expressoMail_use_x_origin_False}>{lang_No}</option> 
     120    <option value="True"{selected_expressoMail_use_x_origin_True}>{lang_Yes}</option> 
     121    </select> 
     122    </td> 
     123    </tr>  
    115124<!-- END body --> 
    116125<!-- BEGIN footer --> 
Note: See TracChangeset for help on using the changeset viewer.