X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnoscrape.php;h=2a04605469b845745755b2bce39eb3a5f9472972;hb=819b374401b54c6506ec8905aa8dc653c3202548;hp=170c7377679b279800ef8e038fc8a3577ecac5f5;hpb=219932f692e09924685e34f5866135c6956dd347;p=friendica.git

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 170c737767..2a04605469 100644
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -15,23 +15,37 @@ function noscrape_init(&$a) {
 
 	profile_load($a,$which,$profile);
 
-	if(!$a->profile['net-publish'])
-		killme();
+	if (!$a->profile['net-publish'] OR $a->profile['hidewall']) {
+		header('Content-type: application/json; charset=utf-8');
+		$json_info = array("hide" => true);
+		echo json_encode($json_info);
+		exit;
+	}
 
 	$keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
 	$keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords);
 	$keywords = explode(',', $keywords);
 
+	$r = q("SELECT `photo` FROM `contact` WHERE `self` AND `uid` = %d",
+		intval($a->profile['uid']));
+
 	$json_info = array(
 		'fn' => $a->profile['name'],
+		'addr' => $a->profile['addr'],
+		'nick' => $which,
 		'key' => $a->profile['pubkey'],
 		'homepage' => $a->get_baseurl()."/profile/{$which}",
 		'comm' => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
-		'photo' => $a->profile['photo'],
+		'photo' => $r[0]["photo"],
 		'tags' => $keywords
 	);
 
 	if(is_array($a->profile) AND !$a->profile['hide-friends']) {
+		$r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
+			intval($a->profile['uid']));
+		if(count($r))
+			$json_info["updated"] =  date("c", strtotime($r[0]['updated']));
+
 		$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0
 				AND `network` IN ('%s', '%s', '%s', '')",
 			intval($a->profile['uid']),