Merge branch 'unstable' into pre-stable

* unstable:
  Bug 2458: Si on envoie un email depuis Linux ,  le return-path doit être spécifié
This commit is contained in:
sparkyx 2026-04-01 17:26:18 +02:00
commit ae9572eae3
4 changed files with 5 additions and 5 deletions

View file

@ -100,4 +100,4 @@ define ("DEBUGNOALYSS",0);
// define ("NOALYSS_URL","https://demo.noalyss.eu");
// For POSTFIX, when sending email from NOALYSS via sendmail an extra parameter is needed
// for the Return-Path, the FROM will be replaced by the Sendmail_Core->from value
//define("MAIL_EXTRA_PARAM","-f FROM")
//define("MAIL_EXTRA_PARAM","-f [FROM]")

View file

@ -453,7 +453,7 @@ function noalyss_class_autoloader($class)
}
if ( ! defined("MAIL_EXTRA_PARAM")) {
define("MAIL_EXTRA_PARAM","-f FROM");
define("MAIL_EXTRA_PARAM","-f [FROM]");
}
spl_autoload_register('\noalyss_class_autoloader', true);

View file

@ -310,8 +310,8 @@ EOF;
// $a
// $a
// For POSTFIX, when sending email from NOALYSS via sendmail an extra parameter is needed $a
// for the Return-Path, the FROM will be replaced by the email of the sender (Sendmail_Core->from value)$a
//define("MAIL_EXTRA_PARAM","-f FROM") $a
// for the Return-Path, the [FROM] will be replaced by the email of the sender (Sendmail_Core->from value)$a
//define("MAIL_EXTRA_PARAM","-f [FROM]") $a
EOF;
}
/*!

View file

@ -261,7 +261,7 @@ eof;
if ( empty ($this->afile) ) $this->content.=$eol;
$this->content .= "--" . $separator . "--";
$this->supplemental_param= str_replace("FROM", $this->from, $this->supplemental_param);
$this->supplemental_param= str_replace("[FROM]", $this->from, $this->supplemental_param);
}
/**