X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fenotify.php;h=f6f291e5d45be663ffa47523c997eb9652b681e3;hb=f4b1d335a571365748ee348ed2b8ac6e1c6670db;hp=49a8597b9cb55c27fbaacfae27dd376b79e7a82b;hpb=5c7df6e964561ebb5e334865717db03222bf3e1a;p=friendica.git

diff --git a/include/enotify.php b/include/enotify.php
index 49a8597b9c..f6f291e5d4 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -2,7 +2,7 @@
 
 function notification($params) {
 
-	logger('notification: entry');
+	logger('notification: entry', LOGGER_DEBUG);
 
 	$a = get_app();
 	$banner = t('Friendica Notification');
@@ -12,10 +12,10 @@ function notification($params) {
 	$sitename = get_config('config','sitename');
 	$site_admin = sprintf( t('%s Administrator'), $sitename);
 
-	$sender_name = t('Administrator');
+	$sender_name = $product;
 	$sender_email = t('noreply') . '@' . $a->get_hostname();
 
-	if(in_array('item',$params)) {
+	if(array_key_exists('item',$params)) {
 		$title = $params['item']['title'];
 		$body = $params['item']['body'];
 	}
@@ -37,8 +37,8 @@ function notification($params) {
 
 	if($params['type'] == NOTIFY_COMMENT) {
 
-		$preamble = $subject = sprintf( t('%s commented on an item at %s'), $params['source_name'], $sitename);
-
+		$subject = sprintf( t('%s commented on an item at %s'), $params['source_name'], $sitename);
+		$preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $params['source_name']); 
 		$sitelink = t('Please visit %s to view and/or reply to the conversation.');
 		$tsitelink = sprintf( $sitelink, $siteurl );
 		$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>');
@@ -78,7 +78,7 @@ function notification($params) {
 	require_once('bbcode.php');
 	if(intval($params['notify_flags']) & intval($params['type'])) {
 
-		logger('notification: sending email');
+		logger('notification: sending notification email');
 
 		push_lang($params['language']);
 
@@ -100,7 +100,7 @@ function notification($params) {
 			'$source_photo' => $params['source_photo'],
 			'$username'     => $params['to_name'],
 			'$hsitelink'    => $hsitelink,
-			'$itemlink'     => $itemlink,
+			'$itemlink'     => '<a href="' . $itemlink . '">' . $itemlink . '</a>',
 			'$thanks'       => $thanks,
 			'$site_admin'   => $site_admin,
 			'$title'		=> stripslashes($title),
@@ -127,7 +127,7 @@ function notification($params) {
 			'$textversion'	=> $textversion,	
 		));
 
-		logger('text: ' . $email_text_body);
+//		logger('text: ' . $email_text_body);
 
 		// use the EmailNotification library to send the message
 
@@ -172,7 +172,7 @@ class enotify {
 		// generate a multipart/alternative message header
 		$messageHeader =
 			"From: {$params['fromName']} <{$params['fromEmail']}>\n" . 
-			"Reply-To: {$params['replyTo']}\n" .
+			"Reply-To: {$params['fromName']} <{$params['replyTo']}>\n" .
 			"MIME-Version: 1.0\n" .
 			"Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\"";
 
@@ -197,7 +197,7 @@ class enotify {
 			$multipartMessageBody,	 						// message body
 			$messageHeader									// message headers
 		);
-		logger("enotify::send returns " . $res, LOGGER_DEBUG);
+		logger("notification: enotify::send returns " . $res, LOGGER_DEBUG);
 	}
 }
 ?>
\ No newline at end of file