mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-07 08:34:29 +01:00
allow change of from
This commit is contained in:
parent
dbd8bbb072
commit
23755c07b3
@ -81,11 +81,11 @@
|
||||
\**************************************************************************/
|
||||
$phpgw_info["server"]["api_inc"] = $phpgw_info["server"]["include_root"]."/phpgwapi/inc";
|
||||
include($phpgw_info["server"]["server_root"]."/version.inc.php");
|
||||
$phpgw_info["server"]["versions"]["header"] = "1.9";
|
||||
$phpgw_info["server"]["versions"]["header"] = "1.10";
|
||||
// This is a fix for NT
|
||||
if (!isset($phpgw_info["flags"]["noapi"]) ||
|
||||
!$phpgw_info["flags"]["noapi"] == True){
|
||||
include($phpgw_info["server"]["api_inc"] . "/phpgw.inc.php");
|
||||
include($phpgw_info["server"]["api_inc"] . "/functions.inc.php");
|
||||
}
|
||||
|
||||
// Leave off the final php closing tag, some editors will add
|
||||
|
@ -22,13 +22,14 @@ class send {
|
||||
$this->err["desc"] = " ";
|
||||
}
|
||||
|
||||
function msg($service, $to, $subject, $body, $msgtype="", $cc="", $bcc="") {
|
||||
function msg($service, $to, $subject, $body, $msgtype="", $cc="", $bcc="", $from ="") {
|
||||
global $phpgw_info, $phpgw, $attach_sig;
|
||||
if ($from ==""){ $from = $phpgw_info["user"]["fullname"]." <".$phpgw_info["user"]["preferences"]["email"]["address"].">"; }
|
||||
|
||||
if ($service == "email") {
|
||||
$now = getdate();
|
||||
$header = "Date: " . gmdate("D, d M Y H:i:s") . " +0000\n";
|
||||
$header .= "From: ".$phpgw_info["user"]["fullname"]." <".$phpgw_info["user"]["preferences"]["email"]["address"].">\n";
|
||||
$header .= "From: ".$from."\n";
|
||||
$header .= "Reply-To: ".$phpgw_info["user"]["preferences"]["email"]["address"]."\n";
|
||||
$header .= "To: $to\n";
|
||||
if (!empty($cc)) {
|
||||
|
@ -12,4 +12,4 @@
|
||||
/* $Id$ */
|
||||
|
||||
$phpgw_info["server"]["versions"]["phpgwapi"] = "0.9.9";
|
||||
$phpgw_info["server"]["versions"]["current_header"] = "1.9";
|
||||
$phpgw_info["server"]["versions"]["current_header"] = "1.10";
|
||||
|
Loading…
Reference in New Issue
Block a user