Merge pull request #8135 from annando/brief

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index da508a33c253d715121e4f3f3127c2eb2e6961ba..e306f0c8a64d2cf86a41d6c719c6112fa6d560d8 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file mod/notifications.php
- * @brief The notifications module
+ * The notifications module
  */
 
 use Friendica\App;
@@ -13,14 +13,15 @@ use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Module\Login;
+use Friendica\DI;
+use Friendica\Module\Security\Login;
 use Friendica\Model\Contact;
-use Friendica\Model\Notify;
+use Friendica\Model\Introduction;
 
 function notifications_post(App $a)
 {
        if (!local_user()) {
-               $a->internalRedirect();
+               DI::baseUrl()->redirect();
        }
 
        $request_id = (($a->argc > 1) ? $a->argv[1] : 0);
@@ -30,43 +31,18 @@ function notifications_post(App $a)
        }
 
        if ($request_id) {
-               $intro = DBA::selectFirst('intro', ['id', 'contact-id', 'fid'], ['id' => $request_id, 'uid' => local_user()]);
-
-               if (DBA::isResult($intro)) {
-                       $intro_id = $intro['id'];
-                       $contact_id = $intro['contact-id'];
-               } else {
-                       notice(L10n::t('Invalid request identifier.') . EOL);
-                       return;
+               $intro = DI::intro()->selectFirst(['id' => $request_id, 'uid' => local_user()]);
+
+               switch ($_POST['submit']) {
+                       case L10n::t('Discard'):
+                               $intro->discard();
+                               break;
+                       case L10n::t('Ignore'):
+                               $intro->ignore();
+                               break;
                }
 
-               // If it is a friend suggestion, the contact is not a new friend but an existing friend
-               // that should not be deleted.
-
-               $fid = $intro['fid'];
-
-               if ($_POST['submit'] == L10n::t('Discard')) {
-                       DBA::delete('intro', ['id' => $intro_id]);
-                       if (!$fid) {
-                               // When the contact entry had been created just for that intro, we want to get rid of it now
-                               $condition = ['id' => $contact_id, 'uid' => local_user(),
-                                       'self' => false, 'pending' => true, 'rel' => [0, Contact::FOLLOWER]];
-                               $contact_pending = DBA::exists('contact', $condition);
-
-                               // Remove the "pending" to stop the reappearing in any case
-                               DBA::update('contact', ['pending' => false], ['id' => $contact_id]);
-
-                               if ($contact_pending) {
-                                       Contact::remove($contact_id);
-                               }
-                       }
-                       $a->internalRedirect('notifications/intros');
-               }
-
-               if ($_POST['submit'] == L10n::t('Ignore')) {
-                       DBA::update('intro', ['ignore' => true], ['id' => $intro_id]);
-                       $a->internalRedirect('notifications/intros');
-               }
+               DI::baseUrl()->redirect('notifications/intros');
        }
 }
 
@@ -78,14 +54,13 @@ function notifications_content(App $a)
        }
 
        $page = ($_REQUEST['page'] ?? 0) ?: 1;
-       $show =  ($_REQUEST['show'] ?? '' === 'all');
+       $show = ($_REQUEST['show'] ?? '') === 'all';
 
        Nav::setSelected('notifications');
 
        $json = (($a->argc > 1 && $a->argv[$a->argc - 1] === 'json') ? true : false);
 
-       /** @var Notify $nm */
-       $nm = \Friendica\BaseObject::getClass(Notify::class);
+       $nm = DI::notify();
 
        $o = '';
        // Get the nav tabs for the notification pages
@@ -135,11 +110,11 @@ function notifications_content(App $a)
                $notifs = $nm->getHomeList($show, $startrec, $perpage);
        // fallback - redirect to main page
        } else {
-               $a->internalRedirect('notifications');
+               DI::baseUrl()->redirect('notifications');
        }
 
        // Set the pager
-       $pager = new Pager($a->query_string, $perpage);
+       $pager = new Pager(DI::args()->getQueryString(), $perpage);
 
        // Add additional informations (needed for json output)
        $notifs['items_page'] = $pager->getItemsPerPage();