thomascube
2006-12-23 853b2e734139aa7fcd97fd931803808bdad201bd
Fixed little typos and improved CSS altering in HTML messages

3 files modified
16 ■■■■ changed files
program/js/app.js 2 ●●● patch | view | raw | blame | history
program/steps/mail/func.inc 10 ●●●● patch | view | raw | blame | history
program/steps/settings/save_identity.inc 4 ●●●● patch | view | raw | blame | history
program/js/app.js
@@ -671,7 +671,7 @@
        if (this.env.uid && props.mimetype && find_in_array(props.mimetype, this.mimetypes)>=0)
          {
          if (props.mimetype == 'text/html')
            qstring += '&safe=1';
            qstring += '&_safe=1';
          this.attachment_win = window.open(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1', 'rcubemailattachment');
          if (this.attachment_win)
            {
program/steps/mail/func.inc
@@ -1275,11 +1275,11 @@
    $last_pos = $pos+2;
    }
  
  $styles = preg_replace('/(^\s*|,\s*)([a-z0-9\._][a-z0-9\.\-_]*)/im', "\\1#$container_id \\2", $source);
  $styles = preg_replace('/<<str_replacement\[([0-9]+)\]>>/e', "\$a_css_values[\\1]", $styles);
  // replace body definition because we also stripped off the <body> tag
  $styles = preg_replace("/$container_id\s+body/i", "$container_id div.rcmBody", $styles);
  // remove html commends and add #container to each tag selector.
  // also replace body definition because we also stripped off the <body> tag
  $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"),
                         array('', "\\1#$container_id \\2", "\$a_css_values[\\1]", "$container_id div.rcmBody"),
                         $source);
  
  return $styles;
  }
program/steps/settings/save_identity.inc
@@ -139,12 +139,12 @@
    {
    // show error message
    show_message('errorsaving', 'error');
    rcmail_overwrite_action('edit-identitiy');
    rcmail_overwrite_action('edit-identity');
    }
  }
// go to next step
rcmail_overwrite_action($_POST['_framed'] ? 'edit-identitiy' : 'identities');
rcmail_overwrite_action($_POST['_framed'] ? 'edit-identity' : 'identities');
?>