Revision 1650
Added by darkviper over 12 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 11 | 11 |
! = Update/Change |
| 12 | 12 |
=============================================================================== |
| 13 | 13 |
|
| 14 |
24 Mar-2012 Build 1650 Werner v.d.Decken(DarkViper) |
|
| 15 |
+ add argument 'replyTo' into class.wb::mail() |
|
| 14 | 16 |
24 Mar-2012 Build 1649 Dietmar Woellbrink (Luisehahne) |
| 15 | 17 |
! rebranding banner.jpg and powered.jpg round template |
| 16 | 18 |
24 Mar-2012 Build 1648 Werner v.d.Decken(DarkViper) |
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 51 | 51 |
|
| 52 | 52 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 53 | 53 |
if(!defined('VERSION')) define('VERSION', '2.8.3');
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1649');
|
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1650');
|
|
| 55 | 55 |
if(!defined('SP')) define('SP', '');
|
| branches/2.8.x/wb/framework/class.wb.php | ||
|---|---|---|
| 389 | 389 |
} |
| 390 | 390 |
|
| 391 | 391 |
// Validate send email |
| 392 |
function mail($fromaddress, $toaddress, $subject, $message, $fromname='') {
|
|
| 392 |
function mail($fromaddress, $toaddress, $subject, $message, $fromname='', $replyTo='') {
|
|
| 393 | 393 |
/* |
| 394 | 394 |
INTEGRATED OPEN SOURCE PHPMAILER CLASS FOR SMTP SUPPORT AND MORE |
| 395 | 395 |
SOME SERVICE PROVIDERS DO NOT SUPPORT SENDING MAIL VIA PHP AS IT DOES NOT PROVIDE SMTP AUTHENTICATION |
| ... | ... | |
| 403 | 403 |
$fromaddress = preg_replace('/[\r\n]/', '', $fromaddress);
|
| 404 | 404 |
$toaddress = preg_replace('/[\r\n]/', '', $toaddress);
|
| 405 | 405 |
$subject = preg_replace('/[\r\n]/', '', $subject);
|
| 406 |
$replyTo = preg_replace('/[\r\n]/', '', $replyTo);
|
|
| 406 | 407 |
// $message_alt = $message; |
| 407 | 408 |
// $message = preg_replace('/[\r\n]/', '<br \>', $message);
|
| 408 | 409 |
|
| ... | ... | |
| 412 | 413 |
if ($fromaddress!='') {
|
| 413 | 414 |
if($fromname!='') $myMail->FromName = $fromname; // FROM-NAME |
| 414 | 415 |
$myMail->From = $fromaddress; // FROM: |
| 416 |
// $myMail->AddReplyTo($fromaddress); // REPLY TO: |
|
| 417 |
} |
|
| 418 |
if($replyTo) {
|
|
| 415 | 419 |
$myMail->AddReplyTo($fromaddress); // REPLY TO: |
| 416 | 420 |
} |
| 417 | 421 |
// define recepient and information to send out |
Also available in: Unified diff
add argument 'replyTo' into class.wb::mail()