Important fixes for search engine (thx @mariroz)

[github/wallabag/wallabag.git] / inc / poche / Poche.class.php

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index a8cd5871978b85a5778ad9b5299ba0eca4e8e602..42a2dd9a2fa73a76de1aa9d576a37a65abe8cf34 100755 (executable)
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -604,12 +604,18 @@ class Poche
                 );
                 break;
                                
-                       case 'search':
-                               if (isset($_GET['search'])){
-                                       $search = $_GET['search'];
-                                       $tpl_vars['entries'] = $this->store->search($search);
-                                       $tpl_vars['nb_results'] = count($tpl_vars['entries']);
-                               }
+         case 'search':
+            if (isset($_GET['search'])){
+               $search = filter_var($_GET['search'], FILTER_SANITIZE_STRING);
+               $tpl_vars['entries'] = $this->store->search($search,$this->user->getId());
+               $count = count($tpl_vars['entries']);
+               $this->pagination->set_total($count);
+               $page_links = str_replace(array('previous', 'next'), array(_('previous'), _('next')),
+                        $this->pagination->page_links('?view=' . $view . '?search=' . $search . '&sort=' . $_SESSION['sort'] . '&' ));
+               $tpl_vars['page_links'] = $page_links;
+               $tpl_vars['nb_results'] = $count;
+               $tpl_vars['search_term'] = $search;
+            }
                                break;
             case 'view':
                 $entry = $this->store->retrieveOneById($id, $this->user->getId());
@@ -1091,6 +1097,9 @@ class Poche
      */
     public function export()
     {
+               $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
+               header('Content-Disposition: attachment; filename='.$filename);
+               
         $entries = $this->store->retrieveAll($this->user->getId());
         echo $this->tpl->render('export.twig', array(
             'export' => Tools::renderJson($entries),