Merge pull request #3991 from MrPetovan/bug/undefined-variables

[friendica.git] / mod / noscrape.php

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 7a32e4d55fe90a35d69d05746cf4d676e82086ff..0269c3f77e408b27b29b9bb854b08b796f5b4c6f 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function noscrape_init(App $a) {
 
@@ -45,9 +46,10 @@ function noscrape_init(App $a) {
        );
 
        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']));
                }
 
@@ -58,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) {