From 0f87f84cfbe026e6f049026d8f8c4d4db22dcc56 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 27 Dec 2011 14:26:44 -0800
Subject: [PATCH] notification testing

---
 boot.php            |  2 +-
 include/enotify.php | 16 ++++++++--------
 mod/item.php        |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/boot.php b/boot.php
index cb7b7fc769..bcc858fa18 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1207' );
+define ( 'FRIENDICA_VERSION',      '2.3.1208' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1112      );
 
diff --git a/include/enotify.php b/include/enotify.php
index 49a8597b9c..0c6d666b53 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'];
 	}
@@ -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
diff --git a/mod/item.php b/mod/item.php
index c32fb69521..ece92f0f3d 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -16,6 +16,7 @@
  */  
 
 require_once('include/crypto.php');
+require_once('include/enotify.php');
 
 function item_post(&$a) {
 
@@ -680,7 +681,6 @@ function item_post(&$a) {
 			);
 
 			if($contact_record != $author) {
-				require_once('include/enotify.php');
 				notification(array(
 					'type'         => NOTIFY_COMMENT,
 					'notify_flags' => $user['notify-flags'],