X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnoscrape.php;h=20936929ddd6672787d7dce4e3860f86dde557c6;hb=d7dc1f6d27a7312edaa03d5cf4c46418330042f3;hp=83ab71ce15884f90cb423172f638eab0e6dba000;hpb=12dd06f72677321006e8327636f517a2cb13fc13;p=friendica.git

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 83ab71ce15..20936929dd 100644
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -1,49 +1,59 @@
 <?php
+/**
+ * @file mod/noscrape.php
+ */
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+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
+	} else {
 		killme();
+	}
 
 	$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'] == ACCOUNT_TYPE_COMMUNITY),
+	];
 
-	if (!$a->profile['net-publish'] OR $a->profile['hidewall']) {
+	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 = ((x($a->profile, 'pub_keywords')) ? $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']));
+	$contactPhoto = dba::selectFirst('contact', ['photo'], ['self' => true, 'uid' => $a->profile['uid']]);
 
-	$json_info = array(
-		'fn'       => $a->profile['name'],
-		'addr'     => $a->profile['addr'],
-		'nick'     => $which,
-		'key'      => $a->profile['pubkey'],
-		'homepage' => App::get_baseurl()."/profile/{$which}",
-		'comm'     => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
-		'photo'    => $r[0]["photo"],
-		'tags'     => $keywords
-	);
+	$json_info['fn'] = $a->profile['name'];
+	$json_info['photo'] = $contactPhoto["photo"];
+	$json_info['tags'] = $keywords;
 
-	if (is_array($a->profile) AND !$a->profile['hide-friends']) {
+	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 (DBM::is_result($r)) {
 			$json_info["updated"] =  date("c", strtotime($r[0]['updated']));
 		}
 
@@ -54,27 +64,43 @@ function noscrape_init(App $a) {
 			dbesc(NETWORK_DIASPORA),
 			dbesc(NETWORK_OSTATUS)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$json_info["contacts"] = intval($r[0]['total']);
 		}
 	}
 
+	// 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)) {
+		$last_active = strtotime($contact['last-item']);
+	}
+
+	$condition = ['uid' => $a->profile['uid']];
+	$user = dba::selectFirst('user', ['login_date'], $condition);
+	if (DBM::is_result($user)) {
+		if ($last_active < strtotime($user['login_date'])) {
+			$last_active = strtotime($user['login_date']);
+		}
+	}
+	$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');
+	$dfrn_pages = ['request', 'confirm', 'notify', 'poll'];
 	foreach ($dfrn_pages as $dfrn) {
-		$json_info["dfrn-{$dfrn}"] = App::get_baseurl()."/dfrn_{$dfrn}/{$which}";
+		$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;
-
 }