Merge pull request #3965 from tobiasd/20171126-docGettingStarted

[friendica.git] / mod / noscrape.php

diff --git a/mod/noscrape.php b/mod/noscrape.php
index e9655f20bfcfb39ccfeaade7eb48fde91ed1fa07..0269c3f77e408b27b29b9bb854b08b796f5b4c6f 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -1,22 +1,25 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+
 function noscrape_init(App $a) {
 
-       if ($a->argc > 1) {
+       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);
 
-       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);
@@ -34,17 +37,19 @@ function noscrape_init(App $a) {
                'fn'       => $a->profile['name'],
                'addr'     => $a->profile['addr'],
                'nick'     => $which,
+               'guid'     => $a->profile['guid'],
                'key'      => $a->profile['pubkey'],
-               'homepage' => App::get_baseurl()."/profile/{$which}",
+               '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']));
                }
 
@@ -55,11 +60,28 @@ 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) {
@@ -70,7 +92,7 @@ function noscrape_init(App $a) {
 
        $dfrn_pages = array('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!