X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnoscrape.php;h=0269c3f77e408b27b29b9bb854b08b796f5b4c6f;hb=0b5f7da270bcaa679cb684dbbbbe40781f0b49c6;hp=f1370167c5eb2815eccd1fb2c8091c800a257c9f;hpb=8ec5b06e0440302cef9f6bc2f35730fca5a9030e;p=friendica.git

diff --git a/mod/noscrape.php b/mod/noscrape.php
index f1370167c5..0269c3f77e 100644
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -1,6 +1,10 @@
 <?php
 
-function noscrape_init(App &$a) {
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+
+function noscrape_init(App $a) {
 
 	if($a->argc > 1)
 		$which = $a->argv[1];
@@ -15,7 +19,7 @@ function noscrape_init(App &$a) {
 
 	profile_load($a,$which,$profile);
 
-	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);
 		echo json_encode($json_info);
@@ -26,26 +30,28 @@ function noscrape_init(App &$a) {
 	$keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords);
 	$keywords = explode(',', $keywords);
 
-	/// @TODO This query's result is not being used (see below), maybe old-lost code?
 	$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' => App::get_baseurl()."/profile/{$which}",
-		'comm' => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
-		'photo' => $r[0]["photo"],
-		'tags' => $keywords
+		'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
 	);
 
-	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']));
+		}
 
 		$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', '')",
@@ -54,21 +60,39 @@ 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 = array('uid' => $a->profile['uid'], 'self' => true);
+	$contact = dba::select('contact', array('last-item'), $condition, array('limit' => 1));
+	if (DBM::is_result($contact)) {
+		$last_active = strtotime($contact['last-item']);
+	}
+
+	$condition = array('uid' => $a->profile['uid']);
+	$user = dba::select('user', array('login_date'), $condition, array('limit' => 1));
+	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');
-	foreach($profile_fields as $field) {
-		if(!empty($a->profile[$field])) {
+	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}"] = App::get_baseurl()."/dfrn_{$dfrn}/{$which}";
+	foreach ($dfrn_pages as $dfrn) {
+		$json_info["dfrn-{$dfrn}"] = System::baseUrl()."/dfrn_{$dfrn}/{$which}";
 	}
 
 	//Output all the JSON!