X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_notify.php;h=ecab9ea72a9515a46863feb21f9e0f2869982e7b;hb=557ebe4700c477aeba043594f7b929b1129be191;hp=1d7ca3a505e649e65e45d1e5d590f034649f6923;hpb=9b0584e59338f0b75c6b8a9a1b5def33da5de5f6;p=friendica.git

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 1d7ca3a505..ecab9ea72a 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -5,7 +5,7 @@ require_once('include/items.php');
 
 
 function dfrn_notify_post(&$a) {
-dbg(3);
+
 	$dfrn_id = notags(trim($_POST['dfrn_id']));
 	$challenge = notags(trim($_POST['challenge']));
 	$data = $_POST['data'];
@@ -39,13 +39,41 @@ dbg(3);
 
 	foreach($feed->get_items() as $item) {
 
+		$deleted = false;
+
 		$rawdelete = $item->get_item_tags("http://purl.org/atompub/tombstones/1.0", 'deleted-entry');
-		print_r($rawdelete);
+		if(isset($rawdelete[0]['attribs']['']['ref'])) {
+			$uri = $rawthread[0]['attribs']['']['ref'];
+			$deleted = true;
+			if(isset($rawdelete[0]['attribs']['']['when'])) {
+				$when = $rawthread[0]['attribs']['']['when'];
+				$when = datetime_convert('UTC','UTC', $when, 'Y-m-d H:i:s');
+			}
+			else
+				$when = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
+		}
 		if($deleted) {
-			// pick out ref and when from attribs
-			// check hasn't happened already, verify ownership and then process it
-
-
+			$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+				dbesc($uri),
+				intval($importer['uid'])
+			);
+			if(count($r)) {
+				if($r[0]['uri'] == $r[0]['parent-uri']) {
+					$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s'
+						WHERE `parent-uri` = '%s'"
+						dbesc($when),
+						dbesc($r[0]['uri'])
+					);
+				}
+				else {
+					$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s' 
+						WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+						dbesc($when),
+						dbesc($uri),
+						intval($importer['uid'])
+					);
+				}
+			}	
 			continue;
 		}
 
@@ -143,7 +171,7 @@ dbg(3);
 
 
 			$datarray = get_atom_elements($item);
-			$datarray['parent-uri'] = $item['uri']
+			$datarray['parent-uri'] = $item_id;
 			$datarray['uid'] = $importer['uid'];
 			$datarray['contact-id'] = $importer['id'];
 			$r = post_remote($a,$datarray);
@@ -176,7 +204,7 @@ function dfrn_notify_content(&$a) {
 			intval(time() + 60 )
 		);
 
-		$r = q("SELECT * FROM `contact` WHERE `issued-id` = '%s' AND `blocked` = 0 LIMIT 1",
+		$r = q("SELECT * FROM `contact` WHERE `issued-id` = '%s' AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
 			dbesc($_GET['dfrn_id']));
 		if((! count($r)) || (! strlen($r[0]['prvkey'])))
 			$status = 1;