X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_notify.php;h=2cc5a62f3c75f84bb3c4f00b2f9f3aa10ba087f9;hb=f20464112f274d720649c2f92480cc235df4db19;hp=180a8edfd398b69551d910f88230ebfb959446f3;hpb=0bf8e418a8b8c57607ed8a52cff6b3ac53d38d05;p=friendica.git

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 180a8edfd3..2cc5a62f3c 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,7 +196,7 @@ 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_html_body_eml.tpl');
 			$email_html_body_tpl = replace_macros($tpl,array(
@@ -239,27 +227,16 @@ function dfrn_notify_post(&$a) {
 				'$hostname'		=> $a->get_hostname()					// name of this host
 			));
 
-			// assemble the final multipart message body with the text and html types included
-			$textbody	=	chunk_split(base64_encode($email_text_body_tpl));
-			$htmlbody	=	chunk_split(base64_encode($email_html_body_tpl));
-			$multipart_message_body =
-				"--" . $msg['mimeboundary'] . "\n" .					// plain text section
-				"Content-Type: text/plain; charset=UTF-8\n" .
-				"Content-Transfer-Encoding: base64\n\n" .
-				$textbody . "\n" .
-				"--" . $msg['mimeboundary'] . "\n" .					// text/html section
-				"Content-Type: text/html; charset=UTF-8\n" .
-				"Content-Transfer-Encoding: base64\n\n" .
-				$htmlbody . "\n" .
-				"--" . $msg['mimeboundary'] . "--\n";					// message ending
-			
-			
-			// send the message
-			$res = mail(
-				$importer['email'], 									// send to address
-				t('New mail received at ') . $a->config['sitename'],	// subject
-				$multipart_message_body, 								// message body
-				$msg['headers']											// message headers
+			// 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);
@@ -392,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');
@@ -407,10 +382,10 @@ 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'],
+							$res = mail($importer['email'], sprintf(t('%s commented on an item at %s'), $from , $a->config['sitename']),
 								$email_tpl, "From: " . t('Administrator') . '@' . $a->get_hostname() );
 						}
 					}
@@ -419,19 +394,39 @@ function dfrn_notify_post(&$a) {
 				}
 			}
 			else {
+
 				// regular comment that is part of this total conversation. Have we seen it? If not, import it.
 
-				$item_id = $item->get_id();
+				$item_id  = $item->get_id();
+				$datarray = get_atom_elements($feed,$item);
 
-				$r = q("SELECT `uid`, `last-child`, `edited` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+				$r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 					dbesc($item_id),
 					intval($importer['importer_uid'])
 				);
-				// FIXME update content if 'updated' changes
+
+				// Update content if 'updated' changes
+
 				if(count($r)) {
+					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+						$r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+							dbesc($datarray['body']),
+							dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
+							dbesc($item_id),
+							intval($importer['importer_uid'])
+						);
+					}
+
+					// update last-child if it changes
+
 					$allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
-					if($allow && $allow[0]['data'] != $r[0]['last-child']) {
-						$r = q("UPDATE `item` SET `last-child` = %d, `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+					if(($allow) && ($allow[0]['data'] != $r[0]['last-child'])) {
+						$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
+							dbesc(datetime_convert()),
+							dbesc($parent_uri),
+							intval($importer['importer_uid'])
+						);
+						$r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s'  WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 							intval($allow[0]['data']),
 							dbesc(datetime_convert()),
 							dbesc($item_id),
@@ -440,7 +435,7 @@ function dfrn_notify_post(&$a) {
 					}
 					continue;
 				}
-				$datarray = get_atom_elements($feed,$item);
+
 				$datarray['parent-uri'] = $parent_uri;
 				$datarray['uid'] = $importer['importer_uid'];
 				$datarray['contact-id'] = $importer['id'];
@@ -473,12 +468,11 @@ 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 ") 
-								. $a->config['sitename'],
-								$email_tpl,t("From: Administrator@") . $a->get_hostname() );
+							$res = mail($importer['email'], sprintf( t("%s commented on an item at %s") , $from ,$a->config['sitename']),
+								$email_tpl, "From: ".t("Administrator") . "@". $a->get_hostname() );
 							break;
 						}
 					}
@@ -486,18 +480,37 @@ function dfrn_notify_post(&$a) {
 				continue;
 			}
 		}
+
 		else {
+
 			// Head post of a conversation. Have we seen it? If not, import it.
 
-			$item_id = $item->get_id();
-			$r = q("SELECT `uid`, `last-child`, `edited` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+
+			$item_id  = $item->get_id();
+			$datarray = get_atom_elements($feed,$item);
+
+			$r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 				dbesc($item_id),
 				intval($importer['importer_uid'])
 			);
+
+			// Update content if 'updated' changes
+
 			if(count($r)) {
+				if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+					$r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+						dbesc($datarray['body']),
+						dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
+						dbesc($item_id),
+						intval($importer['importer_uid'])
+					);
+				}
+
+				// update last-child if it changes
+
 				$allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
 				if($allow && $allow[0]['data'] != $r[0]['last-child']) {
-					$r = q("UPDATE `item` SET `last-child` = %d, `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+					$r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 						intval($allow[0]['data']),
 						dbesc(datetime_convert()),
 						dbesc($item_id),
@@ -507,8 +520,6 @@ function dfrn_notify_post(&$a) {
 				continue;
 			}
 
-
-			$datarray = get_atom_elements($feed,$item);
 			$datarray['parent-uri'] = $item_id;
 			$datarray['uid'] = $importer['importer_uid'];
 			$datarray['contact-id'] = $importer['id'];