X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FSearch%2FSaved.php;h=4256ffcd44ec4904cd68b785eab258c02083809f;hb=e7384288766f342da98b7d0ada082db516501ac6;hp=7b8c8d012f08f48e38ffe605ada2d3f8f4c21148;hpb=0e05ff68686270d87447c570e28543a5bcc7e755;p=friendica.git

diff --git a/src/Module/Search/Saved.php b/src/Module/Search/Saved.php
index 7b8c8d012f..4256ffcd44 100644
--- 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-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,39 +21,55 @@
 
 namespace Friendica\Module\Search;
 
+use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Util\Strings;
+use Friendica\Core\L10n;
+use Friendica\Core\Search;
+use Friendica\Database\Database;
+use Friendica\Module\Response;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 class Saved extends BaseModule
 {
-	public static function init(array $parameters = [])
+	/** @var Database */
+	protected $dba;
+
+	public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Database $dba, array $server, array $parameters = [])
+	{
+		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+		$this->dba = $dba;
+	}
+
+	protected function rawContent(array $request = [])
 	{
-		$action = DI::args()->get(2, 'none');
-		$search = Strings::escapeTags(trim(rawurldecode($_GET['term'] ?? '')));
+		$action = $this->args->get(2, 'none');
+		$search = 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 (!$this->dba->exists('search', $fields)) {
+						if (!$this->dba->insert('search', $fields)) {
+							notice($this->t('Search term was not saved.'));
+						}
 					} else {
-						info(DI::l10n()->t('Search term already saved.'));
+						notice($this->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 (!$this->dba->delete('search', ['uid' => local_user(), 'term' => $search])) {
+						notice($this->t('Search term was not removed.'));
+					}
 					break;
 			}
 		}
 
-		DI::baseUrl()->redirect($return_url);
+		$this->baseUrl->redirect($return_url);
 	}
 }