Ops, one more left ...

[friendica.git] / mod / fsuggest.php

diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index 86878a5295c0463af912ac405a45fbdbb6f11158..8fc0f07deef7b8b6becee9cd7f2d2a849c6cfbf7 100644 (file)
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
@@ -4,9 +4,10 @@
  */
 
 use Friendica\App;
+use Friendica\Core\ACL;
 use Friendica\Core\L10n;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 
 function fsuggest_post(App $a)
@@ -25,7 +26,7 @@ function fsuggest_post(App $a)
                intval($contact_id),
                intval(local_user())
        );
-       if (! DBM::is_result($r)) {
+       if (! DBA::isResult($r)) {
                notice(L10n::t('Contact not found.') . EOL);
                return;
        }
@@ -42,26 +43,26 @@ function fsuggest_post(App $a)
                        intval($new_contact),
                        intval(local_user())
                );
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        $x = q("INSERT INTO `fsuggest` ( `uid`,`cid`,`name`,`url`,`request`,`photo`,`note`,`created`)
                                VALUES ( %d, %d, '%s','%s','%s','%s','%s','%s')",
                                intval(local_user()),
                                intval($contact_id),
-                               dbesc($r[0]['name']),
-                               dbesc($r[0]['url']),
-                               dbesc($r[0]['request']),
-                               dbesc($r[0]['photo']),
-                               dbesc($hash),
-                               dbesc(DateTimeFormat::utcNow())
+                               DBA::escape($r[0]['name']),
+                               DBA::escape($r[0]['url']),
+                               DBA::escape($r[0]['request']),
+                               DBA::escape($r[0]['photo']),
+                               DBA::escape($hash),
+                               DBA::escape(DateTimeFormat::utcNow())
                        );
                        $r = q("SELECT `id` FROM `fsuggest` WHERE `note` = '%s' AND `uid` = %d LIMIT 1",
-                               dbesc($hash),
+                               DBA::escape($hash),
                                intval(local_user())
                        );
-                       if (DBM::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                $fsuggest_id = $r[0]['id'];
                                q("UPDATE `fsuggest` SET `note` = '%s' WHERE `id` = %d AND `uid` = %d",
-                                       dbesc($note),
+                                       DBA::escape($note),
                                        intval($fsuggest_id),
                                        intval(local_user())
                                );
@@ -75,8 +76,6 @@ function fsuggest_post(App $a)
 
 function fsuggest_content(App $a)
 {
-       require_once 'include/acl_selectors.php';
-
        if (! local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
                return;
@@ -93,7 +92,7 @@ function fsuggest_content(App $a)
                intval($contact_id),
                intval(local_user())
        );
-       if (! DBM::is_result($r)) {
+       if (! DBA::isResult($r)) {
                notice(L10n::t('Contact not found.') . EOL);
                return;
        }
@@ -105,11 +104,10 @@ function fsuggest_content(App $a)
 
        $o .= '<form id="fsuggest-form" action="fsuggest/' . $contact_id . '" method="post" >';
 
-       $o .= contact_selector(
+       $o .= ACL::getSuggestContactSelectHTML(
                'suggest',
                'suggest-select',
-               ['size' => 4, 'exclude' => $contact_id, 'networks' => 'DFRN_ONLY', 'single' => true],
-               false
+               ['size' => 4, 'exclude' => $contact_id, 'networks' => 'DFRN_ONLY', 'single' => true]
        );