Merge remote-tracking branch 'upstream/develop' into api4

[friendica.git] / src / Module / FollowConfirm.php

diff --git a/src/Module/FollowConfirm.php b/src/Module/FollowConfirm.php
index 5ff618ae62b7c710c5d760dc6fb33b216ba2391e..41f811698bed01514acb221da2ebbd789a754065 100644 (file)
--- a/src/Module/FollowConfirm.php
+++ b/src/Module/FollowConfirm.php
@@ -2,20 +2,19 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\L10n;
-use Friendica\Model\Introduction;
 use Friendica\DI;
+use Friendica\Model\Contact;
 
 /**
  * Process follow request confirmations
  */
 class FollowConfirm extends BaseModule
 {
-       public static function post(array $parameters = [])
+       public function post()
        {
                $uid = local_user();
                if (!$uid) {
-                       notice(DI::l10n()->t('Permission denied.') . EOL);
+                       notice(DI::l10n()->t('Permission denied.'));
                        return;
                }
 
@@ -23,12 +22,11 @@ class FollowConfirm extends BaseModule
                $duplex   = intval($_POST['duplex']     ?? 0);
                $hidden   = intval($_POST['hidden']     ?? 0);
 
-               $intro = DI::intro()->selectFirst(['id' => $intro_id, 'uid' => local_user()]);
+               $intro = DI::intro()->selectOneById($intro_id, local_user());
 
-               $cid = $intro->{'contact-id'};
+               Contact\Introduction::confirm($intro, $duplex, $hidden);
+               DI::intro()->delete($intro);
 
-               $intro->confirm($duplex, $hidden);
-
-               DI::baseUrl()->redirect('contact/' . intval($cid));
+               DI::baseUrl()->redirect('contact/' .  $intro->cid);
        }
 }