Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / suggest.php

diff --git a/mod/suggest.php b/mod/suggest.php
index 4399450eccf2a1330882886d10e9923bc820e383..5af337ae1b44116c717b884b22a9e9f1e93c63ad 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -4,13 +4,14 @@ require_once('include/socgraph.php');
 require_once('include/contact_widgets.php');
 
 
-function suggest_init(&$a) {
-       if(! local_user())
+function suggest_init(App &$a) {
+       if (! local_user()) {
                return;
+       }
 
-       if(x($_GET,'ignore') && intval($_GET['ignore'])) {
+       if (x($_GET,'ignore') && intval($_GET['ignore'])) {
                // Check if we should do HTML-based delete confirmation
-               if($_REQUEST['confirm']) {
+               if ($_REQUEST['confirm']) {
                        // <form> can't take arguments in its "action" parameter
                        // so add any arguments as hidden inputs
                        $query = explode_querystring($a->query_string);
@@ -35,7 +36,7 @@ function suggest_init(&$a) {
                        return;
                }
                // Now check how the user responded to the confirmation query
-               if(!$_REQUEST['canceled']) {
+               if (!$_REQUEST['canceled']) {
                        q("INSERT INTO `gcign` ( `uid`, `gcid` ) VALUES ( %d, %d ) ",
                                intval(local_user()),
                                intval($_GET['ignore'])
@@ -49,17 +50,17 @@ function suggest_init(&$a) {
 
 
 
-function suggest_content(&$a) {
+function suggest_content(App &$a) {
 
        require_once("mod/proxy.php");
 
        $o = '';
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
 
-       $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+       $_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;
 
        $a->page['aside'] .= findpeople_widget();
        $a->page['aside'] .= follow_widget();
@@ -67,7 +68,7 @@ function suggest_content(&$a) {
 
        $r = suggestion_query(local_user());
 
-       if(! count($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;
        }
@@ -76,8 +77,8 @@ function suggest_content(&$a) {
 
        foreach($r as $rr) {
 
-               $connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
-               $ignlnk = $a->get_baseurl() . '/suggest?ignore=' . $rr['id'];
+               $connlnk = App::get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
+               $ignlnk = App::get_baseurl() . '/suggest?ignore=' . $rr['id'];
                $photo_menu = array(
                        'profile' => array(t("View Profile"), zrl($rr["url"])),
                        'follow' => array(t("Connect/Follow"), $connlnk),