Restaure search_id feature

beaver-dev · beaver-dev · commit 20e0301b8933 · 2016-04-23T12:59:45.000+02:00
TODO: better pagination
diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
@@ -33,13 +33,21 @@ public function display($req, $res, $args)
         }
 
         // Figure out what to do :-)
-        if (Input::query('action') || (Input::query('search_id'))) {
+        if (Input::query('action') || $args['search_id']) {
 
-            $search = $this->model->get_search_results();
+            $search = $this->model->get_search_results($args['search_id']);
 
-            // We have results to display
-            if (!is_object($search) && isset($search['is_result'])) {
+            if (is_object($search)) {
+                // $search is most likely a Router::redirect() to search page (no hits or other error) or to a search_id
+                return $search;
+            } else {
+
+                // No results to display, redirect with message
+                if (!isset($search['is_result'])) {
+                    return Router::redirect(Router::pathFor('search'), ['error', __('No hits')]);
+                }
 
+                // We have results to display
                 View::setPageInfo(array(
                     'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Search results')),
                     'active_page' => 'search',
@@ -64,9 +72,6 @@ public function display($req, $res, $args)
                 }
 
                 View::addTemplate('search/footer.php', 10)->display();
-
-            } else {
-                return Router::redirect(Router::pathFor('search'), __('No hits'));
             }
         }
         // Display the form
diff --git a/featherbb/Model/Search.php b/featherbb/Model/Search.php
@@ -22,7 +22,7 @@ public function __construct()
         $this->search = new \FeatherBB\Core\Search();
     }
 
-    public function get_search_results()
+    public function get_search_results($search_id = null)
     {
         $search = array();
 
@@ -42,8 +42,8 @@ public function get_search_results()
         }
 
         // If a search_id was supplied
-        if (Input::query('search_id')) {
-            $search_id = intval(Input::query('search_id'));
+        if ($search_id) {
+            $search_id = intval($search_id);
             if ($search_id < 1) {
                 throw new Error(__('Bad request'), 400);
             }
@@ -62,7 +62,7 @@ public function get_search_results()
             }
 
             if (!$keywords && !$author) {
-                throw new Error(__('No terms'), 400);
+                return Router::redirect(Router::pathFor('search'), ['error', __('No terms')]);
             }
 
             if ($author) {
@@ -118,7 +118,7 @@ public function get_search_results()
 
                 unset($temp);
             } else {
-                throw new Error(__('No hits'), 404);
+                return Router::redirect(Router::pathFor('search'), ['error', __('No hits')]);
             }
         } else {
             $keyword_results = $author_results = array();
@@ -178,7 +178,7 @@ public function get_search_results()
                     $keywords_array = Container::get('hooks')->fire('model.search.get_search_results_keywords_array', $keywords_array);
 
                     if (empty($keywords_array)) {
-                        throw new Error(__('No hits'), 400);
+                        return Router::redirect(Router::pathFor('search'), ['error', __('No hits')]);
                     }
 
                     // Should we search in message body or topic subject specifically?
@@ -315,7 +315,7 @@ public function get_search_results()
 
                 $num_hits = count($search_ids);
                 if (!$num_hits) {
-                    throw new Error(__('No hits'), 400);
+                    return Router::redirect(Router::pathFor('search'), ['error', __('No hits')]);
                 }
             } elseif ($action == 'show_new' || $action == 'show_recent' || $action == 'show_replies' || $action == 'show_user_posts' || $action == 'show_user_topics' || $action == 'show_subscriptions' || $action == 'show_unanswered') {
                 $search_type = array('action', $action);
@@ -563,6 +563,11 @@ public function get_search_results()
                         ->set($cache['insert']);
             $cache = Container::get('hooks')->fireDB('model.search.get_search_results_update_cache', $cache);
             $cache = $cache->save();
+
+            if ($search_type[0] != 'action') {
+                // Redirect the user to the cached result page
+                return Router::redirect(Router::pathFor('search', ['search_id' => $search_id]));
+            }
         }
 
         // If we're on the new posts search, display a "mark all as read" link
diff --git a/featherbb/View/search/form.php b/featherbb/View/search/form.php
@@ -24,7 +24,7 @@
                     <legend><?php _e('Search criteria legend') ?></legend>
                     <div class="infldset">
                         <input type="hidden" name="action" value="search" />
-                        <label class="conl"><?php _e('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" autofocus /><br /></label>
+                        <label class="conl"><?php _e('Keyword search') ?><br /><input type="text" name="keywords" size="40" maxlength="100" pattern=".{<?= ForumEnv::get('FEATHER_SEARCH_MIN_WORD') ?>,}" autofocus required /><br /></label>
                         <label class="conl"><?php _e('Author search') ?><br /><input id="author" type="text" name="author" size="25" maxlength="25" /><br /></label>
                         <p class="clearb"><?php _e('Search info') ?></p>
                     </div>
diff --git a/featherbb/routes.php b/featherbb/routes.php
@@ -77,7 +77,7 @@
 
 // Search routes
 Route::group('/search', function() {
-    Route::get('', '\FeatherBB\Controller\Search:display')->setName('search');
+    Route::get('[/{search_id:\d+}]', '\FeatherBB\Controller\Search:display')->setName('search');
     Route::get('/show/{show}', '\FeatherBB\Controller\Search:quicksearches')->setName('quickSearch');
 })->add(new CanReadBoard);
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function __construct()`
`22`	`22`	`$this->search = new \FeatherBB\Core\Search();`
`23`	`23`	`}`
`24`	`24`
`25`		`- public function get_search_results()`
	`25`	`+ public function get_search_results($search_id = null)`
`26`	`26`	`{`
`27`	`27`	`$search = array();`
`28`	`28`
`@@ -42,8 +42,8 @@ public function get_search_results()`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`// If a search_id was supplied`
`45`		`- if (Input::query('search_id')) {`
`46`		`- $search_id = intval(Input::query('search_id'));`
	`45`	`+ if ($search_id) {`
	`46`	`+ $search_id = intval($search_id);`
`47`	`47`	`if ($search_id < 1) {`
`48`	`48`	`throw new Error(__('Bad request'), 400);`
`49`	`49`	`}`
`@@ -62,7 +62,7 @@ public function get_search_results()`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`if (!$keywords && !$author) {`
`65`		`- throw new Error(__('No terms'), 400);`
	`65`	`+ return Router::redirect(Router::pathFor('search'), ['error', __('No terms')]);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`if ($author) {`
`@@ -118,7 +118,7 @@ public function get_search_results()`
`118`	`118`
`119`	`119`	`unset($temp);`
`120`	`120`	`} else {`
`121`		`- throw new Error(__('No hits'), 404);`
	`121`	`+ return Router::redirect(Router::pathFor('search'), ['error', __('No hits')]);`
`122`	`122`	`}`
`123`	`123`	`} else {`
`124`	`124`	`$keyword_results = $author_results = array();`
`@@ -178,7 +178,7 @@ public function get_search_results()`
`178`	`178`	`$keywords_array = Container::get('hooks')->fire('model.search.get_search_results_keywords_array', $keywords_array);`
`179`	`179`
`180`	`180`	`if (empty($keywords_array)) {`
`181`		`- throw new Error(__('No hits'), 400);`
	`181`	`+ return Router::redirect(Router::pathFor('search'), ['error', __('No hits')]);`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`// Should we search in message body or topic subject specifically?`
`@@ -315,7 +315,7 @@ public function get_search_results()`
`315`	`315`
`316`	`316`	`$num_hits = count($search_ids);`
`317`	`317`	`if (!$num_hits) {`
`318`		`- throw new Error(__('No hits'), 400);`
	`318`	`+ return Router::redirect(Router::pathFor('search'), ['error', __('No hits')]);`
`319`	`319`	`}`
`320`	`320`	`} elseif ($action == 'show_new' \|\| $action == 'show_recent' \|\| $action == 'show_replies' \|\| $action == 'show_user_posts' \|\| $action == 'show_user_topics' \|\| $action == 'show_subscriptions' \|\| $action == 'show_unanswered') {`
`321`	`321`	`$search_type = array('action', $action);`
`@@ -563,6 +563,11 @@ public function get_search_results()`
`563`	`563`	`->set($cache['insert']);`
`564`	`564`	`$cache = Container::get('hooks')->fireDB('model.search.get_search_results_update_cache', $cache);`
`565`	`565`	`$cache = $cache->save();`
	`566`	`+`
	`567`	`+ if ($search_type[0] != 'action') {`
	`568`	`+ // Redirect the user to the cached result page`
	`569`	`+ return Router::redirect(Router::pathFor('search', ['search_id' => $search_id]));`
	`570`	`+ }`
`566`	`571`	`}`
`567`	`572`
`568`	`573`	`// If we're on the new posts search, display a "mark all as read" link`