Final Fix of #570

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

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 480f6d45569ac56e52fcdf67975a89fda503bac6..7d9faed14e386d04391891d3ea3c8ee3890bfe56 100755 (executable)
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -32,10 +32,10 @@ class Poche
       'fr_FR.utf8' => 'Français',
       'it_IT.utf8' => 'Italiano',
       'pl_PL.utf8' => 'Polski',
+      'pt_BR.utf8' => 'Português (Brasil)',
       'ru_RU.utf8' => 'Pусский',
       'sl_SI.utf8' => 'Slovenščina',
       'uk_UA.utf8' => 'Українська',
-      'pt_BR.utf8' => 'Brasileiro',
     );
     public function __construct()
     {
@@ -61,8 +61,6 @@ class Poche
     private function init() 
     {
         Tools::initPhp();
-        Session::$sessionName = 'poche'; 
-        Session::init();
 
         if (isset($_SESSION['poche_user']) && $_SESSION['poche_user'] != array()) {
             $this->user = $_SESSION['poche_user'];
@@ -388,6 +386,7 @@ class Poche
                 }
 
                 //search for possible duplicate if not in import mode
+                $duplicate = NULL;
                 if (!$import) {
                     $duplicate = $this->store->retrieveOneByURL($url->getUrl(), $this->user->getId());
                 }
@@ -604,6 +603,14 @@ class Poche
                     'tags' => $tags,
                 );
                 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']);
+                               }
+                               break;
             case 'view':
                 $entry = $this->store->retrieveOneById($id, $this->user->getId());
                 if ($entry != NULL) {
@@ -773,8 +780,7 @@ class Poche
         $this->emptyCache();
         
         Tools::redirect('?view=config');
-    }
-
+    }  
     /**
      * get credentials from differents sources
      * it redirects the user to the $referer link
@@ -874,6 +880,8 @@ class Poche
             # the second <ol> is for read links
             $read = 1;
         }
+
+        $unlink = unlink($targetFile);
         $this->messages->add('s', _('import from instapaper completed. You have to execute the cron to fetch content.'));
         Tools::logm('import from instapaper completed');
         Tools::redirect();
@@ -918,6 +926,8 @@ class Poche
             # the second <ul> is for read links
             $read = 1;
         }
+
+        $unlink = unlink($targetFile);
         $this->messages->add('s', _('import from pocket completed. You have to execute the cron to fetch content.'));
         Tools::logm('import from pocket completed');
         Tools::redirect();
@@ -974,6 +984,8 @@ class Poche
                 }
             }
         }
+
+        unlink($targetFile);
         $this->messages->add('s', _('import from Readability completed. You have to execute the cron to fetch content.'));
         Tools::logm('import from Readability completed');
         Tools::redirect();
@@ -1020,6 +1032,8 @@ class Poche
             }
             
         }
+
+        unlink($targetFile);
         $this->messages->add('s', _('import from Poche completed. You have to execute the cron to fetch content.'));
         Tools::logm('import from Poche completed');
         Tools::redirect();
@@ -1077,6 +1091,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),
@@ -1108,7 +1125,13 @@ class Poche
     public function generateToken()
     {
         if (ini_get('open_basedir') === '') {
-            $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
+                       if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+                       echo 'This is a server using Windows!';
+                       // alternative to /dev/urandom for Windows
+                       $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
+                       } else {
+                       $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
+                       }
         }
         else {
             $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
@@ -1155,7 +1178,7 @@ class Poche
             foreach ($entries as $entry) {
                 $newItem = $feed->createNewItem();
                 $newItem->setTitle($entry['title']);
-                $newItem->setLink(Tools::getPocheUrl() . '?view=view&amp;id=' . $entry['id']);
+                $newItem->setLink($entry['url']);
                 $newItem->setDate(time());
                 $newItem->setDescription($entry['content']);
                 $feed->addItem($newItem);