X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnoscrape.php;h=3528a2f118d1862bdba1f13adb31fc64d919f1c8;hb=895b3abf320a28ecf0f797f4f4900e6baf429308;hp=fb5dea872b325f6770797b0b0a73579b6b877c85;hpb=ae66bcaff3c01d10fb8bee04201b692c1fae9032;p=friendica.git

diff --git a/mod/noscrape.php b/mod/noscrape.php
index fb5dea872b..3528a2f118 100644
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -1,66 +1,80 @@
 <?php
+/**
+ * @file mod/noscrape.php
+ */
 
 use Friendica\App;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Model\Profile;
 
-function noscrape_init(App $a) {
-
-	if($a->argc > 1)
+function noscrape_init(App $a)
+{
+	if ($a->argc > 1) {
 		$which = $a->argv[1];
-	else
-		killme();
+	} else {
+		exit();
+	}
 
 	$profile = 0;
-	if((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
+	if ((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
 		$which = $a->user['nickname'];
 		$profile = $a->argv[1];
 	}
 
-	profile_load($a,$which,$profile);
+	Profile::load($a, $which, $profile);
+
+	$json_info = [
+		'addr'         => $a->profile['addr'],
+		'nick'         => $which,
+		'guid'         => $a->profile['guid'],
+		'key'          => $a->profile['pubkey'],
+		'homepage'     => System::baseUrl()."/profile/{$which}",
+		'comm'         => ($a->profile['account-type'] == Contact::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 = array("hide" => true);
+		$json_info["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 = defaults($a->profile, 'pub_keywords', '');
+	$keywords = str_replace(['#',',',' ',',,'], ['',' ',',',','], $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,
-		'guid'     => $a->profile['guid'],
-		'key'      => $a->profile['pubkey'],
-		'homepage' => System::baseUrl()."/profile/{$which}",
-		'comm'     => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
-		'photo'    => $r[0]["photo"],
-		'tags'     => $keywords
-	);
+	$contactPhoto = DBA::selectFirst('contact', ['photo'], ['self' => true, 'uid' => $a->profile['uid']]);
+
+	$json_info['fn'] = $a->profile['name'];
+	$json_info['photo'] = $contactPhoto["photo"];
+	$json_info['tags'] = $keywords;
+	$json_info['language'] = $a->profile['language'];
 
 	if (is_array($a->profile) && !$a->profile['hide-friends']) {
 		/// @todo What should this value tell us?
 		$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 (DBM::is_result($r)) {
+		if (DBA::isResult($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']),
-			dbesc(NETWORK_DFRN),
-			dbesc(NETWORK_DIASPORA),
-			dbesc(NETWORK_OSTATUS)
+			DBA::escape(Protocol::DFRN),
+			DBA::escape(Protocol::DIASPORA),
+			DBA::escape(Protocol::OSTATUS)
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$json_info["contacts"] = intval($r[0]['total']);
 		}
 	}
@@ -68,14 +82,14 @@ function noscrape_init(App $a) {
 	// We display the last activity (post or login), reduced to year and week number
 	$last_active = 0;
 	$condition = ['uid' => $a->profile['uid'], 'self' => true];
-	$contact = dba::selectFirst('contact', ['last-item'], $condition);
-	if (DBM::is_result($contact)) {
+	$contact = DBA::selectFirst('contact', ['last-item'], $condition);
+	if (DBA::isResult($contact)) {
 		$last_active = strtotime($contact['last-item']);
 	}
 
 	$condition = ['uid' => $a->profile['uid']];
-	$user = dba::selectFirst('user', ['login_date'], $condition);
-	if (DBM::is_result($user)) {
+	$user = DBA::selectFirst('user', ['login_date'], $condition);
+	if (DBA::isResult($user)) {
 		if ($last_active < strtotime($user['login_date'])) {
 			$last_active = strtotime($user['login_date']);
 		}
@@ -83,21 +97,15 @@ function noscrape_init(App $a) {
 	$json_info["last-activity"] = date("o-W", $last_active);
 
 	//These are optional fields.
-	$profile_fields = array('pdesc', 'locality', 'region', 'postal-code', 'country-name', 'gender', 'marital', 'about');
+	$profile_fields = ['pdesc', 'locality', 'region', 'postal-code', 'country-name', 'gender', 'marital', 'about'];
 	foreach ($profile_fields as $field) {
 		if (!empty($a->profile[$field])) {
 			$json_info["$field"] = $a->profile[$field];
 		}
 	}
 
-	$dfrn_pages = array('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);
 	exit;
-
 }