Remove unused upubkey and uprvkey from queries

[friendica.git] / mod / suggest.php

diff --git a/mod/suggest.php b/mod/suggest.php
index 0004128a1a0a54c9d3180b1508ec0586e484ddaf..f05c76cedae20573a43994f4836dc61b68713fc1 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -1,10 +1,16 @@
 <?php
-
-require_once('include/socgraph.php');
-require_once('include/contact_widgets.php');
-
-
-function suggest_init(&$a) {
+/**
+ * @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/contact_widgets.php';
+
+function suggest_init(App $a) {
        if (! local_user()) {
                return;
        }
@@ -16,8 +22,8 @@ function suggest_init(&$a) {
                        // so add any arguments as hidden inputs
                        $query = explode_querystring($a->query_string);
                        $inputs = array();
-                       foreach($query['args'] as $arg) {
-                               if(strpos($arg, 'confirm=') === false) {
+                       foreach ($query['args'] as $arg) {
+                               if (strpos($arg, 'confirm=') === false) {
                                        $arg_parts = explode('=', $arg);
                                        $inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
                                }
@@ -37,10 +43,7 @@ function suggest_init(&$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']));
                }
        }
 
@@ -50,7 +53,7 @@ function suggest_init(&$a) {
 
 
 
-function suggest_content(&$a) {
+function suggest_content(App $a) {
 
        require_once("mod/proxy.php");
 
@@ -60,15 +63,15 @@ function suggest_content(&$a) {
                return;
        }
 
-       $_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;
+       $_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
 
        $a->page['aside'] .= findpeople_widget();
        $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;
        }
@@ -77,15 +80,15 @@ function suggest_content(&$a) {
 
        foreach ($r as $rr) {
 
-               $connlnk = App::get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
-               $ignlnk = App::get_baseurl() . '/suggest?ignore=' . $rr['id'];
+               $connlnk = System::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
+               $ignlnk = System::baseUrl() . '/suggest?ignore=' . $rr['id'];
                $photo_menu = array(
                        'profile' => array(t("View Profile"), zrl($rr["url"])),
                        'follow' => array(t("Connect/Follow"), $connlnk),
                        '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']),
@@ -96,7 +99,7 @@ function suggest_content(&$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'),