X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_notify.php;h=f447b54533b06b7bbc3aed7020f155414f9ebebe;hb=8c245a5d2f4e6882211ac17561f86537a7089c73;hp=9272a7c1335822d95e89d1f7e21c1439c8c4cb92;hpb=af0fe4cf422aee9a8fd6b5b5cd422ed0c02e6696;p=friendica.git

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 9272a7c133..f447b54533 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -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'],
@@ -396,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),
@@ -417,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'];
@@ -450,7 +468,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 ") 
@@ -463,18 +481,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),
@@ -484,8 +521,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'];