diff options
| -rw-r--r-- | program/js/app.js | 9 | ||||
| -rw-r--r-- | program/steps/mail/sendmail.inc | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/program/js/app.js b/program/js/app.js index 8cc385895..a61cc1e73 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -6,7 +6,7 @@ | Copyright (C) 2005, RoundCube Dev, - Switzerland | | Licensed under the GNU GPL | | | - | Modified: 2005/10/26 (roundcube) | + | Modified: 2005/11/01 (roundcube) | | | +-----------------------------------------------------------------------+ | Author: Thomas Bruederli <roundcube@gmail.com> | @@ -1203,16 +1203,15 @@ function rcube_webmail() if (this.message_rows[uid].classname.indexOf('unread')<0 && this.message_rows[uid].unread) { this.message_rows[uid].classname += ' unread'; - if (!this.in_selection(uid)) - this.message_rows[uid].obj.className += ' unread'; + this.set_classname(this.message_rows[uid].obj, 'unread', true); + if (this.env.unreadicon) icn_src = this.env.unreadicon; } else if (!this.message_rows[uid].unread) { this.message_rows[uid].classname = this.message_rows[uid].classname.replace(/\s*unread/, ''); - if (!this.in_selection(uid)) - this.message_rows[uid].obj.className = this.message_rows[uid].obj.className.replace(/\s*unread/, ''); + this.set_classname(this.message_rows[uid].obj, 'unread', false); if (this.message_rows[uid].replied && this.env.repliedicon) icn_src = this.env.repliedicon; diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index ddd08f11e..fbb31b3d8 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -194,7 +194,11 @@ else unset($headers_php['To'], $headers_php['Subject']); $header_str = $MAIL_MIME->txtHeaders($headers_php); - $sent = mail($mailto, $msg_subject, $msg_body, $header_str, "-f$from"); + + if(ini_get('safe_mode')) + $sent = mail($mailto, $msg_subject, $msg_body, $header_str); + else + $sent = mail($mailto, $msg_subject, $msg_body, $header_str, "-f$from"); } |