Changeset 1290


Ignore:
Timestamp:
08/07/09 09:56:18 (15 years ago)
Author:
amuller
Message:

Ticket #485 - Correção dos formularios em admin e preferencias

Location:
trunk/expressoMail1_2
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/expressoMail1_2/index.php

    r1264 r1290  
    5757        $_SESSION['phpgw_info']['expressomail']['user']['email'] = $GLOBALS['phpgw']->preferences->values['email']; 
    5858         
    59         if($current_config['enable_local_messages']!='True')  { 
    60                 $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'] = 0; 
    61         } 
    6259        $preferences = $GLOBALS['phpgw']->preferences->read(); 
    6360        $_SESSION['phpgw_info']['user']['preferences']['expressoMail'] = $preferences['expressoMail']; 
    64          $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['voip_enabled'] = $voip_enabled; 
     61        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['voip_enabled'] = $voip_enabled; 
    6562        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['voip_email_redirect'] = $emailVoip; 
    6663        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['outoffice'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['outoffice']; 
    … …  
    6966        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['number_of_contacts'] = $current_config['expressoMail_Number_of_dynamic_contacts'] ? $current_config['expressoMail_Number_of_dynamic_contacts'] : "0"; 
    7067        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['notification_domains'] = $current_config['expressoMail_notification_domains']; 
    71         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['remove_attachments_function'] = $current_config['expressoMail_remove_attachments_function']; 
    72         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_important_flag'] = $current_config['expressoMail_enable_important_flag']; 
    73         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'] : "0"; 
    74         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['keep_archived_messages'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['keep_archived_messages'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['keep_archived_messages'] : "0"; 
    7568    $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_assinar_criptografar'] = $GLOBALS['phpgw_info']['server']['use_assinar_criptografar'] ?  $GLOBALS['phpgw_info']['server']['use_assinar_criptografar'] : "0"; 
    7669    $_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/templates/default/config.tpl

    r1248 r1290  
    2222    </td> 
    2323   </tr> 
    24         <tr class="{row_off}"> 
    25     <td>{lang_Would_you_like_to_use_local_messages_?}:</td> 
    26     <td> 
    27      <select name="newsettings[enable_local_messages]"> 
    28       <option value="">{lang_No}</option> 
    29       <option value="True"{selected_enable_local_messages_True}>{lang_Yes}</option> 
    30      </select> 
    31     </td> 
    32    </tr> 
    33    <tr bgcolor="{row_on}"> 
     24   <tr bgcolor="{row_off}"> 
    3425    <td>{lang_Do_you_want_to_log_the_sent_messages?}</td> 
    3526    <td> 
    … …  
    4031    </td> 
    4132   </tr> 
    42    <tr bgcolor="{row_off}"> 
     33   <tr bgcolor="{row_on}"> 
    4334   <td>{lang_Do_you_want_to_cache_php_requests_in_javascript?}</td> 
    4435   <td> 
    … …  
    4940   </td> 
    5041   </tr> 
    51    <tr bgcolor="{row_on}"> 
    52    <td>{lang_Do_you_want_to_use_important_flag_in_email_editor?}</td> 
    53    <td> 
    54    <select name="newsettings[expressoMail_enable_important_flag]"> 
    55    <option value=""{selected_expressoMail_enable_important_flag_False}>{lang_No}</option>   
    56    <option value="True"{selected_expressoMail_enable_important_flag_True}>{lang_Yes}</option> 
    57    </select> 
    58    </td> 
    59    </tr> 
    6042   <tr bgcolor="{row_off}"> 
    61    <td>{lang_Do_you_want_to_use_remove_attachments_function?}</td> 
    62    <td> 
    63    <select name="newsettings[expressoMail_remove_attachments_function]"> 
    64    <option value=""{selected_expressoMail_remove_attachments_function_False}>{lang_No}</option> 
    65    <option value="True"{selected_expressoMail_remove_attachments_function_True}>{lang_Yes}</option> 
    66    </select> 
    67    </td> 
    68    </tr> 
    69    <tr bgcolor="{row_on}"> 
    7043   <td>{lang_Do_you_want_to_use_the_spam_filter?}</td> 
    7144   <td> 
    … …  
    7649    </td> 
    7750   </tr> 
    78    <tr bgcolor="{row_off}"> 
     51   <tr bgcolor="{row_on}"> 
    7952    <td>{lang_Command_for_spam}</td> 
    8053    <td> 
    8154    <input type="text" name="newsettings[expressoMail_command_for_spam]" value="{value_expressoMail_command_for_spam}" size="60" />  
    8255    </td> 
    83     <tr bgcolor="{row_on}"> 
     56    <tr bgcolor="{row_off}"> 
    8457    <td>{lang_Command_for_unmark_spam}</td> 
    8558    <td> 
    … …  
    8760    </td> 
    8861    </tr> 
    89     <tr bgcolor="{row_off}"> 
     62    <tr bgcolor="{row_on}"> 
    9063    <td>{lang_Always_confirm_notification_to_these_domains}</td> 
    9164    <td> 
    … …  
    9366    </td> 
    9467    </tr> 
    95     <tr bgcolor="{row_on}"> 
     68    <tr bgcolor="{row_off}"> 
    9669    <td>{lang_Number_of_dynamic_contacts}</td> 
    9770    <td> 
    … …  
    9972    </td> 
    10073    </tr> 
    101     <tr bgcolor="{row_off}">              
     74    <tr bgcolor="{row_on}">               
    10275    <td>{lang_Max_attachment_size}</td>                   
    10376    <td>                  
Note: See TracChangeset for help on using the changeset viewer.