Changeset 4830 in subversion


Ignore:
Timestamp:
Jun 2, 2011 8:36:32 AM (2 years ago)
Author:
alec
Message:
  • Apply fixes from trunk
Location:
branches/release-0.5
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/release-0.5/CHANGELOG

    r4779 r4830  
    22=========================== 
    33 
     4- Fix identities "reply-to" and "bcc" fields have a bogus value when left empty (#1487943) 
    45- Fix issue which cases IMAP disconnection when encrypt() method was used (#1487900) 
    56- Fix some CSS issues in Settings for Internet Explorer 

  • branches/release-0.5/installer/config.php

    r4054 r4830  
    8282<label for="cfgipcheck">Check client IP in session authorization</label><br /> 
    8383 
    84 <p class="hint">This increases security but can cause sudden logouts when someone uses a proxy with changeing IPs.</p> 
     84<p class="hint">This increases security but can cause sudden logouts when someone uses a proxy with changing IPs.</p> 
    8585</dd> 
    8686 
    … …  
    9494?> 
    9595<div>This key is used to encrypt the users imap password before storing in the session record</div> 
    96 <p class="hint">It's a random generated string to ensure that every installation has it's own key. 
     96<p class="hint">It's a random generated string to ensure that every installation has its own key. 
    9797If you enter it manually please provide a string of exactly 24 chars.</p> 
    9898</dd> 

  • branches/release-0.5/program/include/main.inc

    r4763 r4830  
    19171917  $domain = $is_utf ? idn_to_ascii($domain) : idn_to_utf8($domain); 
    19181918 
     1919  if ($domain === false) { 
     1920    return ''; 
     1921  } 
     1922 
    19191923  return $at ? $user . '@' . $domain : $domain; 
    19201924} 

  • branches/release-0.5/program/lib/washtml.php

    r4675 r4830  
    275275    // Remove invalid HTML comments (#1487759) 
    276276    // Don't remove valid conditional comments 
    277     $html = preg_replace('/<!--[^->[]*>/', '', $html); 
     277    $html = preg_replace('/<!--[^->[\n]*>/', '', $html); 
    278278 
    279279    @$node->loadHTML($html); 

  • branches/release-0.5/program/steps/mail/func.inc

    r4729 r4830  
    576576    '<html>', 
    577577  ); 
    578   $html = preg_replace($html_search, $html_replace, $html); 
     578  $html = preg_replace($html_search, $html_replace, trim($html)); 
    579579 
    580580  // PCRE errors handling (#1486856), should we use something like for every preg_* use? 

  • branches/release-0.5/program/steps/settings/save_identity.inc

    r4509 r4830  
    117117  $save_data = $plugin['record']; 
    118118 
    119   $save_data['email']    = rcube_idn_to_ascii($save_data['email']); 
    120   $save_data['bcc']      = rcube_idn_to_ascii($save_data['bcc']); 
    121   $save_data['reply-to'] = rcube_idn_to_ascii($save_data['reply-to']); 
     119  if ($save_data['email']) 
     120    $save_data['email']    = rcube_idn_to_ascii($save_data['email']); 
     121  if ($save_data['bcc']) 
     122    $save_data['bcc']      = rcube_idn_to_ascii($save_data['bcc']); 
     123  if ($save_data['reply-to']) 
     124    $save_data['reply-to'] = rcube_idn_to_ascii($save_data['reply-to']); 
    122125 
    123126  if (!$plugin['abort']) 
    … …  
    128131  if ($insert_id) { 
    129132    $OUTPUT->show_message('successfullysaved', 'confirmation', null, false); 
    130      
     133 
    131134    $_GET['_iid'] = $insert_id; 
    132135 
Note: See TracChangeset for help on using the changeset viewer.