extending notifications to other types

5 files changed, 52 insertions, 144 deletions

diff --git a/boot.php b/boot.php
index 354b51a94..1be6a26ff 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.1206' );
+define ( 'FRIENDICA_VERSION',      '2.3.1207' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1112      );
 
diff --git a/include/enotify.php b/include/enotify.php
index 05d2783d6..6f0d65aed 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -1,23 +1,5 @@
 <?php
 
-
-		// send email notification if requested.
-/*
-		$notif_params = array(
-			'type' => NOTIFY_MAIL,
-			'notify_flags' => $importer['notify-flags'],
-			'language' => $importer['language'],
-			'to_name' => $importer['username'],
-			'to_email' => $importer['email'],
-			'item' => $msg,
-			'source_name' => $msg['from-name'],
-			'source_link' => $importer['url'],
-			'source_photo' => $importer['thumb'],
-		);
-*/			
-		//notification($notif_params);
-
-
 function notification($params) {
 
 	logger('notification: entry');
@@ -38,8 +20,6 @@ function notification($params) {
 
 	if($params['type'] == NOTIFY_MAIL) {
 
-		logger('notification: email');
-
 		$subject = 	sprintf( t('New mail received at %s'),$sitename);
 
 		$preamble = sprintf( t('%s sent you a new private message at %s.'),$params['source_name'],$sitename);
@@ -47,6 +27,26 @@ function notification($params) {
 		$sitelink = t('Please visit %s to view and/or reply to your private messages.');
 		$tsitelink = sprintf( $sitelink, $siteurl . '/message' );
 		$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '/message">' . $sitename . '</a>');
+		$itemlink = '';
+	}
+
+	if($params['type'] == NOTIFY_COMMENT) {
+
+		$preamble = $subject = sprintf( t('%s commented on an item at %s'), $params['source_name'], $sitename);
+
+		$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>');
+		$itemlink =  $params['link'];
+	}
+
+	if($params['type'] == NOTIFY_WALL) {
+		$preamble = $subject =	sprintf( t('%s posted to your profile wall at %s') , $params['source_name'], $sitename);
+
+		$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>');
+		$itemlink =  $params['link'];
 	}
 
 
@@ -77,6 +77,7 @@ function notification($params) {
 			'$source_photo' => $params['source_photo'],
 			'$username'     => $params['to_name'],
 			'$hsitelink'    => $hsitelink,
+			'$itemlink'     => $itemlink,
 			'$thanks'       => $thanks,
 			'$site_admin'   => $site_admin,
 			'$title'		=> stripslashes($title),
@@ -96,6 +97,7 @@ function notification($params) {
 			'$source_photo' => $params['source_photo'],
 			'$username'     => $params['to_name'],
 			'$tsitelink'    => $tsitelink,
+			'$itemlink'     => $itemlink,
 			'$thanks'       => $thanks,
 			'$site_admin'   => $site_admin,
 			'$title'		=> stripslashes($title),
@@ -135,11 +137,9 @@ class enotify {
 	 */
 	static public function send($params) {
 
-		logger('enotify: send: ' . print_r($params,true));
 		$fromName = email_header_encode($params['fromName'],'UTF-8'); 
 		$messageSubject = email_header_encode($params['messageSubject'],'UTF-8');
 		
-		
 		// generate a mime boundary
 		$mimeBoundary   =rand(0,9)."-"
 				.rand(10000000000,9999999999)."-"
@@ -174,7 +174,7 @@ class enotify {
 			$multipartMessageBody,	 						// message body
 			$messageHeader									// message headers
 		);
-		logger("sendTextHtmlEmail: returns " . $res, LOGGER_DEBUG);
+		logger("enotify::send returns " . $res, LOGGER_DEBUG);
 	}
 }
 ?>
\ No newline at end of file
diff --git a/mod/item.php b/mod/item.php
index f72b17fc1..c32fb6952 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -679,68 +679,21 @@ function item_post(&$a) {
 				intval($post_id)
 			);
 
-			// Send a notification email to the conversation owner, unless the owner is me and I wrote this item
-			if(($user['notify-flags'] & NOTIFY_COMMENT) && ($contact_record != $author)) {
-				push_lang($user['language']);
-				require_once('bbcode.php');
-				$from = $author['name'];
-
-				// name of the automated email sender
-				$msg['notificationfromname']	= stripslashes($datarray['author-name']);;
-				// noreply address to send from
-				$msg['notificationfromemail']	= t('noreply') . '@' . $a->get_hostname();				
-
-				// text version
-				// process the message body to display properly in text mode
-				$msg['textversion']
-					= html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8');
-				
-				// html version
-				// process the message body to display properly in text mode
-				$msg['htmlversion']	
-					= html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body']))));
-
-				// load the template for private message notifications
-				$tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
-				$email_html_body_tpl = replace_macros($tpl,array(
-					'$username'     => $user['username'],
-					'$sitename'		=> $a->config['sitename'],				// name of this site
-					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
-					'$thumb'		=> $author['thumb'],					// thumbnail url for sender icon
-					'$email'		=> $importer['email'],					// email address to send to
-					'$url'			=> $author['url'],						// full url for the site
-					'$from'			=> $from,								// name of the person sending the message
-					'$body'			=> $msg['htmlversion'],					// html version of the message
-					'$display'		=> $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+			if($contact_record != $author) {
+				require_once('include/enotify.php');
+				notification(array(
+					'type'         => NOTIFY_COMMENT,
+					'notify_flags' => $user['notify-flags'],
+					'language'     => $user['language'],
+					'to_name'      => $user['username'],
+					'to_email'     => $user['email'],
+					'item'         => $datarray,
+					'link'		   => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+					'source_name'  => $datarray['author-name'],
+					'source_link'  => $datarray['author-link'],
+					'source_photo' => $datarray['author-avatar']
 				));
 			
-				// load the template for private message notifications
-				$tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
-				$email_text_body_tpl = replace_macros($tpl,array(
-					'$username'     => $user['username'],
-					'$sitename'		=> $a->config['sitename'],				// name of this site
-					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
-					'$thumb'		=> $author['thumb'],					// thumbnail url for sender icon
-					'$email'		=> $importer['email'],					// email address to send to
-					'$url'			=> $author['url'],						// profile url for the author
-					'$from'			=> $from,								// name of the person sending the message
-					'$body'			=> $msg['textversion'],					// text version of the message
-					'$display'		=> $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
-				));
-
-				// use the EmailNotification library to send the message
-				require_once("include/EmailNotification.php");
-				EmailNotification::sendTextHtmlEmail(
-					$msg['notificationfromname'],
-					t("Administrator@") . $a->get_hostname(),
-					t("noreply") . '@' . $a->get_hostname(),
-					$user['email'],
-					sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']),
-					$email_html_body_tpl,
-					$email_text_body_tpl
-				);
-
-				pop_lang();
 			}
 
 			// We won't be able to sign Diaspora comments for authenticated visitors - we don't have their private key
@@ -767,66 +720,19 @@ function item_post(&$a) {
 		else {
 			$parent = $post_id;
 
-			// let me know if somebody did a wall-to-wall post on my profile
-
-			if(($user['notify-flags'] & NOTIFY_WALL) && ($contact_record != $author)) {
-				push_lang($user['language']);
-				require_once('bbcode.php');
-				$from = $author['name'];
-							
-				// name of the automated email sender
-				$msg['notificationfromname']	= $from;
-				// noreply address to send from
-				$msg['notificationfromemail']	= t('noreply') . '@' . $a->get_hostname();				
-
-				// text version
-				// process the message body to display properly in text mode
-				$msg['textversion']
-					= html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8');
-				
-				// html version
-				// process the message body to display properly in text mode
-				$msg['htmlversion']	
-					= html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body']))));
-
-				// load the template for private message notifications
-				$tpl = load_view_file('view/wall_received_html_body_eml.tpl');
-				$email_html_body_tpl = replace_macros($tpl,array(
-					'$username'     => $user['username'],
-					'$sitename'		=> $a->config['sitename'],				// name of this site
-					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
-					'$thumb'		=> $author['thumb'],					// thumbnail url for sender icon
-					'$url'			=> $author['url'],						// full url for the site
-					'$from'			=> $from,								// name of the person sending the message
-					'$body'			=> $msg['htmlversion'],					// html version of the message
-					'$display'		=> $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+			if($contact_record != $author) {
+				notification(array(
+					'type'         => NOTIFY_WALL,
+					'notify_flags' => $user['notify-flags'],
+					'language'     => $user['language'],
+					'to_name'      => $user['username'],
+					'to_email'     => $user['email'],
+					'item'         => $datarray,
+					'link'		   => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+					'source_name'  => $datarray['author-name'],
+					'source_link'  => $datarray['author-link'],
+					'source_photo' => $datarray['author-avatar']
 				));
-			
-				// load the template for private message notifications
-				$tpl = load_view_file('view/wall_received_text_body_eml.tpl');
-				$email_text_body_tpl = replace_macros($tpl,array(
-					'$username'     => $user['username'],
-					'$sitename'		=> $a->config['sitename'],				// name of this site
-					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
-					'$thumb'		=> $author['thumb'],					// thumbnail url for sender icon
-					'$url'			=> $author['url'],						// full url for the site
-					'$from'			=> $from,								// name of the person sending the message
-					'$body'			=> $msg['textversion'],					// text version of the message
-					'$display'		=> $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
-				));
-
-				// use the EmailNotification library to send the message
-				require_once("include/EmailNotification.php");
-				EmailNotification::sendTextHtmlEmail(
-					$msg['notificationfromname'],
-					t("Administrator@") . $a->get_hostname(),
-					t("noreply") . '@' . $a->get_hostname(),
-					$user['email'],
-					sprintf( t('%s posted to your profile wall at %s') , $from , $a->config['sitename']),
-					$email_html_body_tpl,
-					$email_text_body_tpl
-				);
-				pop_lang();
 			}
 		}
 
diff --git a/view/email_notify_html.tpl b/view/email_notify_html.tpl
index ab449de52..b302c2149 100644
--- a/view/email_notify_html.tpl
+++ b/view/email_notify_html.tpl
@@ -17,7 +17,8 @@
 		<td style="padding-top:22px;"><a href="$source_link">$source_name</a></td></tr>
 	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
 	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
-	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">$hsitelink</td></tr>
+	<tr><td style="padding-top:11px;" colspan="2">$hsitelink</td></tr>
+	<tr><td style="padding-bottom:11px;" colspan="2">$itemlink</td></tr>
 	<tr><td></td><td>$thanks</td></tr>
 	<tr><td></td><td>$site_admin</td></tr>
 	</tbody>
diff --git a/view/email_notify_text.tpl b/view/email_notify_text.tpl
index 1e85a547f..f7f5a4c68 100644
--- a/view/email_notify_text.tpl
+++ b/view/email_notify_text.tpl
@@ -6,6 +6,7 @@ $title
 $textversion
 				
 $tsitelink
+$itemlink
 
 $thanks
 $site_admin