feat(routes): use named routes in search

Elgg · Jan 18, 2018 · 6f085cd · 6f085cd
1 parent 8edbceb
commit 6f085cd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/mod/search/elgg-plugin.php b/mod/search/elgg-plugin.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+	'routes' => [
+		'default:search' => [
+			'path' => '/search/{route_query?}',
+			'resource' => 'search/index',
+		],
+	],
+];
diff --git a/mod/search/start.php b/mod/search/start.php
@@ -11,9 +11,6 @@
  */
 function search_init() {
 
-	// page handler for search actions and results
-	elgg_register_page_handler('search', 'search_page_handler');
-
 	// exclude /search routes from indexing
 	elgg_register_plugin_hook_handler('robots.txt', 'site', 'search_exclude_robots');
 
@@ -25,24 +22,6 @@ function search_init() {
 	elgg_register_plugin_hook_handler('view_vars', 'output/tag', 'search_output_tag');
 }
 
-/**
- * Page handler for /search routes
- *
- * @param array $segments URL segments
- *
- * @return \Elgg\Http\OkResponse
- * @throws SecurityException
- */
-function search_page_handler($segments) {
-
-	if (!get_input('q') && isset($segments[0])) {
-		set_input('q', $segments[0]);
-	}
-
-	$output = elgg_view_resource('search/index');
-	return elgg_ok_response($output);
-}
-
 /**
  * Exclude robots from indexing search pages
  *

diff --git a/mod/search/views/default/resources/search/index.php b/mod/search/views/default/resources/search/index.php
@@ -7,6 +7,10 @@
 // Search supports RSS
 elgg_register_rss_link();
 
+// This magic is needed to support /search/<query>
+// but have /search/<query1>?q=<query2> as <query2> be the main search query
+set_input('q', get_input('q', elgg_extract('route_query', $vars, null, false)));
+
 $service = new \Elgg\Search\Search();
 $params = $service->getParams();