Remove direct calls to App->user

[friendica.git] / src / Module / Search / Saved.php

diff --git a/src/Module/Search/Saved.php b/src/Module/Search/Saved.php
index 7b8c8d012f08f48e38ffe605ada2d3f8f4c21148..723860bd80cf04e75c50d9974f612004edb49a4e 100644 (file)
--- a/src/Module/Search/Saved.php
+++ b/src/Module/Search/Saved.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,6 +22,7 @@
 namespace Friendica\Module\Search;
 
 use Friendica\BaseModule;
+use Friendica\Core\Search;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Util\Strings;
@@ -33,23 +34,25 @@ class Saved extends BaseModule
                $action = DI::args()->get(2, 'none');
                $search = Strings::escapeTags(trim(rawurldecode($_GET['term'] ?? '')));
 
-               $return_url = $_GET['return_url'] ?? 'search?q=' . urlencode($search);
+               $return_url = $_GET['return_url'] ?? Search::getSearchPath($search);
 
                if (local_user() && $search) {
                        switch ($action) {
                                case 'add':
                                        $fields = ['uid' => local_user(), 'term' => $search];
                                        if (!DBA::exists('search', $fields)) {
-                                               DBA::insert('search', $fields);
-                                               info(DI::l10n()->t('Search term successfully saved.'));
+                                               if (!DBA::insert('search', $fields)) {
+                                                       notice(DI::l10n()->t('Search term was not saved.'));
+                                               }
                                        } else {
-                                               info(DI::l10n()->t('Search term already saved.'));
+                                               notice(DI::l10n()->t('Search term already saved.'));
                                        }
                                        break;
 
                                case 'remove':
-                                       DBA::delete('search', ['uid' => local_user(), 'term' => $search]);
-                                       info(DI::l10n()->t('Search term successfully removed.'));
+                                       if (!DBA::delete('search', ['uid' => local_user(), 'term' => $search])) {
+                                               notice(DI::l10n()->t('Search term was not removed.'));
+                                       }
                                        break;
                        }
                }