mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #949 from RandolfCarter/InvalidDefaultAddress 

Fixing default email sender address
This commit is contained in:
Thomas Müller 2012-12-19 00:33:53 -08:00
parent 7c5150ce32 d2828bab07
commit ad497d23ec
3 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/ajax/share.php
View File

@ -89,12 +89,8 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
if ($type === 'dir')
$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($user, $file, $link));
// handle localhost installations
$server_host = OCP\Util::getServerHost();
if ($server_host === 'localhost')
$server_host = "example.com";
$default_from = 'sharing-noreply@' . $server_host;
$default_from = OCP\Util::getDefaultEmailAddress('sharing-noreply');
$from_address = OCP\Config::getUserValue($user, 'settings', 'email', $default_from );
// send it out now

2
core/lostpassword/controller.php
View File

@ -43,7 +43,7 @@ class OC_Core_LostPassword_Controller {
$tmpl->assign('link', $link, false);
$msg = $tmpl->fetchPage();
$l = OC_L10N::get('core');
$from = 'lostpassword-noreply@' . OCP\Util::getServerHost();
$from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud');
echo('Mailsent');

36
lib/public/util.php
View File

@ -172,6 +172,42 @@ class Util {
return(\OC_Request::serverHost());
}
/**
* @brief returns the server hostname
* @returns the server hostname
*
* Returns the server host name without an eventual port number
*/
public static function getServerHostName() {
$host_name = self::getServerHost();
// strip away port number (if existing)
$colon_pos = strpos($host_name, ':');
if ($colon_pos != FALSE) {
$host_name = substr($host_name, 0, $colon_pos);
}
return $host_name;
}
/**
* @brief Returns the default email address
* @param $user_part the user part of the address
* @returns the default email address
*
* Assembles a default email address (using the server hostname
* and the given user part, and returns it
* Example: when given lostpassword-noreply as $user_part param,
* and is currently accessed via http(s)://example.com/,
* it would return 'lostpassword-noreply@example.com'
*/
public static function getDefaultEmailAddress($user_part) {
$host_name = self::getServerHostName();
// handle localhost installations
if ($server_host === 'localhost') {
$server_host = "example.com";
}
return $user_part.'@'.$host_name;
}
/**
* @brief Returns the server protocol
* @returns the server protocol