Remove unused upubkey and uprvkey from queries

[friendica.git] / mod / suggest.php

diff --git a/mod/suggest.php b/mod/suggest.php
index 19e89f05ba7155c85334aeac1373f7ae80a84589..f05c76cedae20573a43994f4836dc61b68713fc1 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -1,10 +1,14 @@
 <?php
-
+/**
+ * @file mod/suggest.php
+ */
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Model\GlobalContact;
+use Friendica\Object\Contact;
 
-require_once('include/socgraph.php');
-require_once('include/contact_widgets.php');
+require_once 'include/contact_widgets.php';
 
 function suggest_init(App $a) {
        if (! local_user()) {
@@ -39,10 +43,7 @@ function suggest_init(App $a) {
                }
                // Now check how the user responded to the confirmation query
                if (!$_REQUEST['canceled']) {
-                       q("INSERT INTO `gcign` ( `uid`, `gcid` ) VALUES ( %d, %d ) ",
-                               intval(local_user()),
-                               intval($_GET['ignore'])
-                       );
+                       dba::insert('gcign', array('uid' => local_user(), 'gcid' => $_GET['ignore']));
                }
        }
 
@@ -68,9 +69,9 @@ function suggest_content(App $a) {
        $a->page['aside'] .= follow_widget();
 
 
-       $r = suggestion_query(local_user());
+       $r = GlobalContact::suggestionQuery(local_user());
 
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                $o .= t('No suggestions available. If this is a new site, please try again in 24 hours.');
                return $o;
        }
@@ -87,7 +88,7 @@ function suggest_content(App $a) {
                        'hide' => array(t('Ignore/Hide'), $ignlnk)
                );
 
-               $contact_details = get_contact_details_by_url($rr["url"], local_user(), $rr);
+               $contact_details = Contact::getDetailsByURL($rr["url"], local_user(), $rr);
 
                $entry = array(
                        'url' => zrl($rr['url']),
@@ -98,7 +99,7 @@ function suggest_content(App $a) {
                        'details'       => $contact_details['location'],
                        'tags'          => $contact_details['keywords'],
                        'about'         => $contact_details['about'],
-                       'account_type'  => account_type($contact_details),
+                       'account_type'  => Contact::getAccountType($contact_details),
                        'ignlnk' => $ignlnk,
                        'ignid' => $rr['id'],
                        'conntxt' => t('Connect'),