gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-11 09:35:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-02-22 10:43:39 +01:00
commit 677a134cf4
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
inc/inc.ClassEmailNotify.php
View File

@ -76,9 +76,16 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
global $settings;
if ($recipient->isDisabled() || $recipient->getEmail()=="") return 0;
if (!is_object($recipient) && strcasecmp(get_class($recipient), "SeedDMS_Core_User")) {
if(!is_object($recipient) && strcasecmp(get_class($recipient), "SeedDMS_Core_User")) {
return -1;
}
if (is_object($sender) && !strcasecmp(get_class($sender), "SeedDMS_Core_User")) {
$from = $sender->getFullName() ." <". $sender->getEmail() .">";
} elseif(is_string($sender) && trim($sender) != "") {
$from = $sender;
} else
return -1;
if(is_object($sender) && strcasecmp(get_class($sender), "SeedDMS_Core_User")) {
$from = $sender->getFullName() ." <". $sender->getEmail() .">";
@ -127,9 +134,7 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
$headers = array();
$headers[] = "MIME-Version: 1.0";
$headers[] = "Content-type: text/plain; charset=utf-8";
//$headers[] = "From: ". $sender->getFullName() ." <". $sender->getEmail() .">";
$headers[] = "From: ". $settings->_smtpSendFrom;
$headers[] = "Reply-To: ". $sender->getFullName() ." <". $sender->getEmail() .">";
$headers[] = "From: ". $from;
$lang = $recipient->getLanguage();
$message = getMLText("email_header", array(), "", $lang)."\r\n\r\n".getMLText($message, $params, "", $lang);

2
languages/de_DE/lang.inc
View File

@ -721,7 +721,7 @@ wir haben einen Anfrage zum Zurücksetzen Ihres Passworts erhalten.
Dies kann durch den folgenden Link erfolgen:
###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###
[url_prefix]out/out.ChangePassword.php?hash=[hash]
Sollen Sie danach immer noch Problem bei der Anmeldung haben, dann kontaktieren Sie bitte Ihren Adminstrator',
'password_forgotten_email_subject' => 'Passwort vergessen',

1
op/op.PasswordForgotten.php
View File

@ -63,6 +63,7 @@ if($user) {
$params['http_root'] = $settings->_httpRoot;
$params['hash'] = $hash;
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ChangePassword.php?hash=".$hash;
$params['url_prefix'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot;
$emailobj->toIndividual($settings->_smtpSendFrom, $user, $subject, $message, $params);
}
}