X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_notify.php;h=0102727392fd06ec1bb62b68b39fa406057e46f5;hb=c3cb3d75e593faa06e4050a016ef1893bd5a4a3a;hp=5f91f1b1be33de4d5085d350e813dd2c763a24d8;hpb=70cf5ae3c79ad1b94e9d5fab82325d55a12761c0;p=friendica.git

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 5f91f1b1be..0102727392 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -173,22 +173,10 @@ function dfrn_notify_post(&$a) {
 		require_once('bbcode.php');
 		if($importer['notify-flags'] & NOTIFY_MAIL) {
 
-			// generate a mime boundary
-			$msg['mimeboundary']   =rand(0,9)."-"
-				.rand(10000000000,9999999999)."-"
-				.rand(10000000000,9999999999)."=:"
-				.rand(10000,99999);
-
 			// name of the automated email sender
 			$msg['notificationfromname']	= t('Administrator');
 			// noreply address to send from
 			$msg['notificationfromemail']	= t('noreply') . '@' . $a->get_hostname();				
-			// message headers
-			$msg['headers'] =
-				"From: {$msg['notificationfromname']} <{$msg['notificationfromemail']}>\n" . 
-				"Reply-To: {$msg['notificationfromemail']}\n" .
-				"MIME-Version: 1.0\n" .
-				"Content-Type: multipart/alternative; boundary=\"{$msg['mimeboundary']}\"";
 
 			// text version
 			// process the message body to display properly in text mode
@@ -208,12 +196,10 @@ function dfrn_notify_post(&$a) {
 			//		4) decode any encoded html tags
 			$msg['htmlversion']	
 				= html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$msg['body']))));
-			
+
 			// load the template for private message notifications
-			$tpl = load_view_file('view/mail_received_eml.tpl');
-			
-			// import the data into the template			
-			$email_tpl = replace_macros($tpl, array(
+			$tpl = load_view_file('view/mail_received_html_body_eml.tpl');
+			$email_html_body_tpl = replace_macros($tpl,array(
 				'$siteName'		=> $a->config['sitename'],				// name of this site
 				'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
 				'$thumb'		=> $importer['thumb'],					// thumbnail url for sender icon
@@ -221,22 +207,36 @@ function dfrn_notify_post(&$a) {
 				'$url'			=> $importer['url'],					// full url for the site
 				'$from'			=> $msg['from-name'],					// name of the person sending the message
 				'$title'		=> stripslashes($msg['title']),			// subject of the message
-				'$textversion'	=> $msg['textversion'],					// text version of the message
 				'$htmlversion'	=> $msg['htmlversion'],					// html version of the message
 				'$mimeboundary'	=> $msg['mimeboundary'],				// mime message divider
 				'$hostname'		=> $a->get_hostname()					// name of this host
 			));
 			
-			logger("message headers: " . $msg['headers']);
-			logger("message body: " . $mail_tpl);
-			
-			
-			// send the message
-			$res = mail(
-				$importer['email'], 									// send to address
-				t('New mail received at ') . $a->config['sitename'],	// subject
-				$email_tpl, 											// message body
-				$msg['headers']											// message headers
+			// load the template for private message notifications
+			$tpl = load_view_file('view/mail_received_text_body_eml.tpl');
+			$email_text_body_tpl = replace_macros($tpl,array(
+				'$siteName'		=> $a->config['sitename'],				// name of this site
+				'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
+				'$thumb'		=> $importer['thumb'],					// thumbnail url for sender icon
+				'$email'		=> $importer['email'],					// email address to send to
+				'$url'			=> $importer['url'],					// full url for the site
+				'$from'			=> $msg['from-name'],					// name of the person sending the message
+				'$title'		=> stripslashes($msg['title']),			// subject of the message
+				'$textversion'	=> $msg['textversion'],					// text version of the message
+				'$mimeboundary'	=> $msg['mimeboundary'],				// mime message divider
+				'$hostname'		=> $a->get_hostname()					// name of this host
+			));
+
+			// use the EmailNotification library to send the message
+			require_once("include/EmailNotification.php");
+			EmailNotification::sendTextHtmlEmail(
+				$msg['notificationfromname'],
+				$msg['notificationfromemail'],
+				$msg['notificationfromemail'],
+				$importer['email'],
+				t('New mail received at ') . $a->config['sitename'],
+				$email_html_body_tpl,
+				$email_text_body_tpl
 			);
 		}
 		xml_status(0);
@@ -369,9 +369,7 @@ function dfrn_notify_post(&$a) {
 
 					if($posted_id && $parent) {
 				
-						$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-
-						proc_run($php_path,"include/notifier.php","comment-import","$posted_id");
+						proc_run('php',"include/notifier.php","comment-import","$posted_id");
 					
 						if((! $is_like) && ($importer['notify-flags'] & NOTIFY_COMMENT) && (! $importer['self'])) {
 							require_once('bbcode.php');
@@ -384,7 +382,7 @@ function dfrn_notify_post(&$a) {
 								'$email' => $importer['email'],
 								'$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id, 
 								'$from' => $from,
-								'$body' => strip_tags(bbcode(stripslashes($datarray['body'])))
+								'$body' => html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8')
 							));
 	
 							$res = mail($importer['email'], $from . t(' commented on an item at ') . $a->config['sitename'],
@@ -450,7 +448,7 @@ function dfrn_notify_post(&$a) {
 								'$email' => $importer['email'],
 								'$from' => $from,
 								'$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r,
-								'$body' => strip_tags(bbcode(stripslashes($datarray['body'])))
+								'$body' => html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8')
 							));
 
 							$res = mail($importer['email'], $from . t(" commented on an item at ")