Catch HTTPExceptions in App::runFrontend()

[friendica.git] / mod / noscrape.php

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 20936929ddd6672787d7dce4e3860f86dde557c6..e1d51e5a801eae0f8a5bcee7c27d0cc9d43e2c1e 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -2,9 +2,12 @@
 /**
  * @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)
@@ -24,14 +27,20 @@ function noscrape_init(App $a)
        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),
+               '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["hide"] = true;
@@ -39,32 +48,33 @@ function noscrape_init(App $a)
                exit;
        }
 
-       $keywords = ((x($a->profile, 'pub_keywords')) ? $a->profile['pub_keywords'] : '');
+       $keywords = defaults($a->profile, 'pub_keywords', '');
        $keywords = str_replace(['#',',',' ',',,'], ['',' ',',',','], $keywords);
        $keywords = explode(',', $keywords);
 
-       $contactPhoto = dba::selectFirst('contact', ['photo'], ['self' => true, 'uid' => $a->profile['uid']]);
+       $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']);
                }
        }
@@ -72,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']);
                }
@@ -94,11 +104,6 @@ function noscrape_init(App $a)
                }
        }
 
-       $dfrn_pages = ['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);