X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnoscrape.php;h=5761df3ff902be078a0d91d0baec9cdbd8a4f5e0;hb=85ff976f83b1037328fedd26fd817c720625e0e9;hp=0964e85ca1e4a26e1d6ef62ca39ba09e83575a2c;hpb=59d8cae805f2160402c135960b9d834a4bcd65ef;p=friendica.git

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 0964e85ca1..5761df3ff9 100644
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -9,13 +9,14 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Model\User;
 
 function noscrape_init(App $a)
 {
 	if ($a->argc > 1) {
 		$which = $a->argv[1];
 	} else {
-		killme();
+		exit();
 	}
 
 	$profile = 0;
@@ -32,10 +33,15 @@ function noscrape_init(App $a)
 		'guid'         => $a->profile['guid'],
 		'key'          => $a->profile['pubkey'],
 		'homepage'     => System::baseUrl()."/profile/{$which}",
-		'comm'         => ($a->profile['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY),
+		'comm'         => ($a->profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY),
 		'account-type' => $a->profile['account-type'],
 	];
 
+	$dfrn_pages = ['request', 'confirm', 'notify', 'poll'];
+	foreach ($dfrn_pages as $dfrn) {
+		$json_info["dfrn-{$dfrn}"] = System::baseUrl()."/dfrn_{$dfrn}/{$which}";
+	}
+
 	if (!$a->profile['net-publish'] || $a->profile['hidewall']) {
 		header('Content-type: application/json; charset=utf-8');
 		$json_info["hide"] = true;
@@ -43,7 +49,7 @@ function noscrape_init(App $a)
 		exit;
 	}
 
-	$keywords = ((x($a->profile, 'pub_keywords')) ? $a->profile['pub_keywords'] : '');
+	$keywords = defaults($a->profile, 'pub_keywords', '');
 	$keywords = str_replace(['#',',',' ',',,'], ['',' ',',',','], $keywords);
 	$keywords = explode(',', $keywords);
 
@@ -99,11 +105,6 @@ function noscrape_init(App $a)
 		}
 	}
 
-	$dfrn_pages = ['request', 'confirm', 'notify', 'poll'];
-	foreach ($dfrn_pages as $dfrn) {
-		$json_info["dfrn-{$dfrn}"] = System::baseUrl()."/dfrn_{$dfrn}/{$which}";
-	}
-
 	//Output all the JSON!
 	header('Content-type: application/json; charset=utf-8');
 	echo json_encode($json_info);