Changeset 432 in subversion


Ignore:
Timestamp:
Dec 23, 2006 6:16:53 AM (6 years ago)
Author:
thomasb
Message:

Fixed little typos and improved CSS altering in HTML messages

Location:
trunk/roundcubemail/program
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/program/js/app.js

    r418 r432  
    672672          { 
    673673          if (props.mimetype == 'text/html') 
    674             qstring += '&safe=1'; 
     674            qstring += '&_safe=1'; 
    675675          this.attachment_win = window.open(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1', 'rcubemailattachment'); 
    676676          if (this.attachment_win) 

  • trunk/roundcubemail/program/steps/mail/func.inc

    r425 r432  
    12751275    $last_pos = $pos+2; 
    12761276    } 
    1277    
    1278   $styles = preg_replace('/(^\s*|,\s*)([a-z0-9\._][a-z0-9\.\-_]*)/im', "\\1#$container_id \\2", $source); 
    1279   $styles = preg_replace('/<<str_replacement\[([0-9]+)\]>>/e', "\$a_css_values[\\1]", $styles); 
    1280    
    1281   // replace body definition because we also stripped off the <body> tag 
    1282   $styles = preg_replace("/$container_id\s+body/i", "$container_id div.rcmBody", $styles); 
    1283    
     1277 
     1278  // remove html commends and add #container to each tag selector. 
     1279  // also replace body definition because we also stripped off the <body> tag 
     1280  $styles = preg_replace(array('/(^\s*<!--)|(-->\s*$)/', '/(^\s*|,\s*|\}\s*)([a-z0-9\._][a-z0-9\.\-_]*)/im', '/<<str_replacement\[([0-9]+)\]>>/e', "/$container_id\s+body/i"), 
     1281                         array('', "\\1#$container_id \\2", "\$a_css_values[\\1]", "$container_id div.rcmBody"), 
     1282                         $source); 
     1283 
    12841284  return $styles; 
    12851285  } 

  • trunk/roundcubemail/program/steps/settings/save_identity.inc

    r344 r432  
    140140    // show error message 
    141141    show_message('errorsaving', 'error'); 
    142     rcmail_overwrite_action('edit-identitiy'); 
     142    rcmail_overwrite_action('edit-identity'); 
    143143    } 
    144144  } 
    … …  
    146146 
    147147// go to next step 
    148 rcmail_overwrite_action($_POST['_framed'] ? 'edit-identitiy' : 'identities'); 
     148rcmail_overwrite_action($_POST['_framed'] ? 'edit-identity' : 'identities'); 
    149149 
    150150?> 
Note: See TracChangeset for help on using the changeset viewer.