From 92fc97eeb3cbda0f7cee9b670c30bbf6b23b9e39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Sun, 23 Feb 2014 09:56:21 +0100
Subject: [fix] redirect on config page after token generation #491

---
 inc/poche/Poche.class.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 34f2ff5a..8a9de488 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -1124,6 +1124,7 @@ class Poche
         $currentConfig = $_SESSION['poche_user']->config;
         $currentConfig['token'] = $token;
         $_SESSION['poche_user']->setConfig($currentConfig);
+        Tools::redirect();
     }
 
     public function generateFeeds($token, $user_id, $tag_id, $type = 'home')
-- 
cgit v1.2.3


From cbcae4037c02cd6c1ce7c373c6dae390565b7c51 Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Wed, 26 Feb 2014 15:43:49 +0200
Subject: translation related: how-to md file added, script to generate php
 from all twig templates, polish mo file compiled

---
 inc/poche/Poche.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 8a9de488..deec4226 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -34,7 +34,7 @@ class Poche
       'pl_PL.utf8' => 'Polski',
       'ru_RU.utf8' => 'Pусский',
       'sl_SI.utf8' => 'Slovenščina',
-      'uk_UA.utf8' => 'Український',
+      'uk_UA.utf8' => 'Українська',
     );
     public function __construct()
     {
@@ -336,7 +336,7 @@ class Poche
         while (($language = readdir($handle)) !== false) {
             # Languages are stored in a directory, so all directory names are languages
             # @todo move language installation data to database
-            if (! is_dir(LOCALE . '/' . $language) || in_array($language, array('..', '.'))) {
+            if (! is_dir(LOCALE . '/' . $language) || in_array($language, array('..', '.', 'tools'))) {
                 continue;
             }
             
@@ -346,7 +346,7 @@ class Poche
                 $current = true;
             }
             
-            $languages[] = array('name' => $this->language_names[$language], 'value' => $language, 'current' => $current);
+            $languages[] = array('name' => (isset($this->language_names[$language]) ? $this->language_names[$language] : $language), 'value' => $language, 'current' => $current);
         }
         
         return $languages;
-- 
cgit v1.2.3


From 56532c4e7231bf7f26779754c18eb2bb5e1739bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Thu, 27 Feb 2014 13:24:29 +0100
Subject: [add] Empty cache after changing theme #503

---
 inc/poche/Poche.class.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index deec4226..a9e226c4 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -750,6 +750,8 @@ class Poche
         $currentConfig['theme'] = $_POST['theme'];
         
         $_SESSION['poche_user']->setConfig($currentConfig);
+
+        $this->emptyCache();
         
         Tools::redirect('?view=config');
     }
-- 
cgit v1.2.3


From e145f767f38c3531196dad5453f298fbea243daa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Thu, 27 Feb 2014 13:26:07 +0100
Subject: [add] empty cache after changing language #492

---
 inc/poche/Poche.class.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index a9e226c4..87c00b78 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -790,6 +790,8 @@ class Poche
         $currentConfig['language'] = $_POST['language'];
         
         $_SESSION['poche_user']->setConfig($currentConfig);
+
+        $this->emptyCache();
         
         Tools::redirect('?view=config');
     }
-- 
cgit v1.2.3


From decb9a5814be82effde73f798fbdc0c76c3dd1de Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Thu, 27 Feb 2014 18:12:43 +0200
Subject: fix of #509, related to php 5.3

---
 inc/poche/Poche.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index deec4226..e13e7e1b 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -366,7 +366,7 @@ class Poche
         // Saving and clearing context
         $REAL = array();
         foreach( $GLOBALS as $key => $value ) {
-            if( $key != "GLOBALS" && $key != "_SESSION" ) {
+            if( $key != 'GLOBALS' && $key != '_SESSION' && $key != 'HTTP_SESSION_VARS' ) {
                 $GLOBALS[$key] = array();
                 $REAL[$key] = $value;
             }
-- 
cgit v1.2.3


From 346380e131ac41229fdcadb5bc5dcb99347552ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Thu, 27 Feb 2014 21:37:25 +0100
Subject: [add] label for brazilian language on config screen

---
 inc/poche/Poche.class.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 4100f156..714fa9ee 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -35,6 +35,7 @@ class Poche
       'ru_RU.utf8' => 'Pусский',
       'sl_SI.utf8' => 'Slovenščina',
       'uk_UA.utf8' => 'Українська',
+      'pt_BR.utf8' => 'Brasileiro',
     );
     public function __construct()
     {
-- 
cgit v1.2.3


From 6065553c137ec63ec3ffddda0350f1d3d805b852 Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Fri, 28 Feb 2014 13:08:11 +0200
Subject: effect of block rebuilding on next page removed, issue #479

---
 inc/poche/Poche.class.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 4100f156..d42da60d 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -660,6 +660,7 @@ class Poche
                     'entries' => '',
                     'page_links' => '',
                     'nb_results' => '',
+                    'listmode' => (isset($_COOKIE['listmode']) ? true : false),
                 );
                 
                 //if id is given - we retrive entries by tag: id is tag id
-- 
cgit v1.2.3


From 31a10069a52c2fd2aca3a835a7bdc1accae197f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Fri, 28 Feb 2014 20:36:32 +0100
Subject: [add] upload form for import

---
 inc/poche/Poche.class.php | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 49651c52..026b0b4e 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -1068,13 +1068,7 @@ class Poche
             Tools::redirect();
         }
         
-        $targetDefinition = 'IMPORT_' . strtoupper($from) . '_FILE';
-        $targetFile = constant($targetDefinition);
-        
-        if (! defined($targetDefinition)) {
-            $this->messages->add('e', _('Incomplete inc/poche/define.inc.php file, please define "' . $targetDefinition . '".'));
-            Tools::redirect();
-        }
+        $targetFile = CACHE . '/' . constant(strtoupper($from) . '_FILE');
         
         if (! file_exists($targetFile)) {
             $this->messages->add('e', _('Could not find required "' . $targetFile . '" import file.'));
@@ -1084,6 +1078,22 @@ class Poche
         $this->$providers[$from]($targetFile);
     }
 
+    public function uploadFile() {
+        if(isset($_FILES['file']))
+        { 
+            $dir = CACHE . '/';
+            $file = basename($_FILES['file']['name']);
+            if(move_uploaded_file($_FILES['file']['tmp_name'], $dir . $file)) {
+                $this->messages->add('s', _('File uploaded. You can now execute import.'));
+            }
+            else {
+                $this->messages->add('e', _('Error while importing file. Do you have access to upload it?'));
+            }
+        }
+        
+        Tools::redirect('?view=config');
+    }
+
     /**
      * export poche entries in json
      * @return json all poche entries
-- 
cgit v1.2.3


From 53e3158dfe697ea59da1fa0e401e8da75ae13030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Fri, 28 Feb 2014 21:49:38 +0100
Subject: [add] cron to fetch content on imported entries

---
 inc/poche/Poche.class.php | 86 +++++++++++------------------------------------
 1 file changed, 19 insertions(+), 67 deletions(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 026b0b4e..5a89a8d2 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -362,60 +362,6 @@ class Poche
         );
     }
 
-    protected function getPageContent(Url $url)
-    {
-        // Saving and clearing context
-        $REAL = array();
-        foreach( $GLOBALS as $key => $value ) {
-            if( $key != 'GLOBALS' && $key != '_SESSION' && $key != 'HTTP_SESSION_VARS' ) {
-                $GLOBALS[$key] = array();
-                $REAL[$key] = $value;
-            }
-        }
-        // Saving and clearing session
-        $REAL_SESSION = array();
-        foreach( $_SESSION as $key => $value ) {
-            $REAL_SESSION[$key] = $value;
-            unset($_SESSION[$key]);
-        }
-
-        // Running code in different context
-        $scope = function() {
-            extract( func_get_arg(1) );
-            $_GET = $_REQUEST = array(
-                        "url" => $url->getUrl(),
-                        "max" => 5,
-                        "links" => "preserve",
-                        "exc" => "",
-                        "format" => "json",
-                        "submit" => "Create Feed"
-            );
-            ob_start();
-            require func_get_arg(0);
-            $json = ob_get_flush();
-            return $json;
-        };
-        $json = $scope( "inc/3rdparty/makefulltextfeed.php", array("url" => $url) );
-
-        // Clearing and restoring context
-        foreach( $GLOBALS as $key => $value ) {
-            if( $key != "GLOBALS" && $key != "_SESSION" ) {
-                unset($GLOBALS[$key]);
-            }
-        }
-        foreach( $REAL as $key => $value ) {
-            $GLOBALS[$key] = $value;
-        }
-        // Clearing and restoring session
-        foreach( $_SESSION as $key => $value ) {
-            unset($_SESSION[$key]);
-        }
-        foreach( $REAL_SESSION as $key => $value ) {
-            $_SESSION[$key] = $value;
-        }
-        return json_decode($json, true);
-    }
-
     /**
      * Call action (mark as fav, archive, delete, etc.)
      */
@@ -424,15 +370,21 @@ class Poche
         switch ($action)
         {
             case 'add':
-                $content = $this->getPageContent($url);
-                $title = ($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled');
-                $body = $content['rss']['channel']['item']['description'];
-
-                // clean content from prevent xss attack
-                $config = HTMLPurifier_Config::createDefault();
-                $purifier = new HTMLPurifier($config);
-                $title = $purifier->purify($title);
-                $body = $purifier->purify($body);
+                if (!$import) {
+                    $content = Tools::getPageContent($url);
+                    $title = ($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled');
+                    $body = $content['rss']['channel']['item']['description'];
+
+                    // clean content from prevent xss attack
+                    $config = HTMLPurifier_Config::createDefault();
+                    $purifier = new HTMLPurifier($config);
+                    $title = $purifier->purify($title);
+                    $body = $purifier->purify($body);
+                }
+                else {
+                    $title = '';
+                    $body = '';
+                }
 
                 //search for possible duplicate if not in import mode
                 if (!$import) {
@@ -897,7 +849,7 @@ class Poche
             # the second <ol> is for read links
             $read = 1;
         }
-        $this->messages->add('s', _('import from instapaper completed'));
+        $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();
     }
@@ -941,7 +893,7 @@ class Poche
             # the second <ul> is for read links
             $read = 1;
         }
-        $this->messages->add('s', _('import from pocket completed'));
+        $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();
     }
@@ -997,7 +949,7 @@ class Poche
                 }
             }
         }
-        $this->messages->add('s', _('import from Readability completed. ' . $count . ' new links.'));
+        $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();
     }
@@ -1043,7 +995,7 @@ class Poche
             }
             
         }
-        $this->messages->add('s', _('import from Poche completed. ' . $count . ' new links.'));
+        $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();
     }
-- 
cgit v1.2.3


From 223268c2fa34c497d91338e2553bc74bb1b26859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Sat, 1 Mar 2014 13:09:37 +0100
Subject: [fix] RSS Feeds don't validate / W3C #384

---
 inc/poche/Poche.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 49651c52..0c4143e1 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -1147,8 +1147,9 @@ class Poche
         $feed = new FeedWriter(RSS2);
         $feed->setTitle('wallabag — ' . $type . ' feed');
         $feed->setLink(Tools::getPocheUrl());
-        $feed->setChannelElement('updated', date(DATE_RSS , time()));
-        $feed->setChannelElement('author', 'wallabag');
+        $feed->setChannelElement('pubDate', date(DATE_RSS , time()));
+        $feed->setChannelElement('generator', 'wallabag');
+        $feed->setDescription('wallabag ' . $type . ' elements');
 
         if ($type == 'tag') {
             $entries = $this->store->retrieveEntriesByTag($tag_id, $user_id);
-- 
cgit v1.2.3


From 11c680f97aa07b48f33e264effb2975d6ca31a0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Sat, 1 Mar 2014 19:10:17 +0100
Subject: [add] display last check of wallabag release

---
 inc/poche/Poche.class.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 0c4143e1..ba262c98 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -582,8 +582,12 @@ class Poche
         switch ($view)
         {
             case 'config':
-                $dev = trim($this->getPocheVersion('dev'));
-                $prod = trim($this->getPocheVersion('prod'));
+                $dev_infos = $this->getPocheVersion('dev');
+                $dev = trim($dev_infos[0]);
+                $check_time_dev = date('d-M-Y H:i', $dev_infos[1]);
+                $prod_infos = $this->getPocheVersion('prod');
+                $prod = trim($prod_infos[0]);
+                $check_time_prod = date('d-M-Y H:i', $prod_infos[1]);
                 $compare_dev = version_compare(POCHE, $dev);
                 $compare_prod = version_compare(POCHE, $prod);
                 $themes = $this->getInstalledThemes();
@@ -595,6 +599,8 @@ class Poche
                     'languages' => $languages,
                     'dev' => $dev,
                     'prod' => $prod,
+                    'check_time_dev' => $check_time_dev,
+                    'check_time_prod' => $check_time_prod,
                     'compare_dev' => $compare_dev,
                     'compare_prod' => $compare_prod,
                     'token' => $token,
@@ -1105,15 +1111,17 @@ class Poche
     private function getPocheVersion($which = 'prod')
     {
         $cache_file = CACHE . '/' . $which;
+        $check_time = time();
 
         # checks if the cached version file exists
         if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) {
            $version = file_get_contents($cache_file);
+           $check_time = filemtime($cache_file);
         } else {
            $version = file_get_contents('http://static.wallabag.org/versions/' . $which);
            file_put_contents($cache_file, $version, LOCK_EX);
         }
-        return $version;
+        return array($version, $check_time);
     }
 
     public function generateToken()
-- 
cgit v1.2.3


From 042486c511d07226715c2e0d7cd9823f591d8d10 Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Fri, 7 Mar 2014 14:52:52 +0200
Subject: fix of #530 - import fail from Poche

---
 inc/poche/Poche.class.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index fb4e1a7f..13492506 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -377,6 +377,7 @@ class Poche
 
                     // clean content from prevent xss attack
                     $config = HTMLPurifier_Config::createDefault();
+                    $config->set('Cache.SerializerPath', CACHE);
                     $purifier = new HTMLPurifier($config);
                     $title = $purifier->purify($title);
                     $body = $purifier->purify($body);
-- 
cgit v1.2.3


From 17b2afefad1947042cc9fbbb841c3a023d00d96d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Mon, 10 Mar 2014 08:10:03 +0100
Subject: [fix] test if user_id doesn't exist in feeds generation

---
 inc/poche/Poche.class.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 13492506..0c8e798c 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -1109,6 +1109,10 @@ class Poche
         $allowed_types = array('home', 'fav', 'archive', 'tag');
         $config = $this->store->getConfigUser($user_id);
 
+        if ($config == null) {
+            die(_('User with this id (' . $user_id . ') does not exist.'));
+        }
+
         if (!in_array($type, $allowed_types) ||
             $token != $config['token']) {
             die(_('Uh, there is a problem while generating feeds.'));
-- 
cgit v1.2.3


From fb26cc9375ce9ef8df748eb473eb6e58884421c6 Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Mon, 10 Mar 2014 16:28:47 +0200
Subject: a lot of enhancements related to tags: tags list is now sorted, shows
 number of articles, autocomplete added according to #477, #542

---
 inc/poche/Poche.class.php | 52 +++++++++++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 17 deletions(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 0c8e798c..480f6d45 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -488,25 +488,33 @@ class Poche
                     Tools::logm('error : article not found');
                     Tools::redirect();
                 }
+                //get all already set tags to preven duplicates
+                $already_set_tags = array();
+                $entry_tags = $this->store->retrieveTagsByEntry($entry_id);
+                foreach ($entry_tags as $tag) {
+                  $already_set_tags[] = $tag['value'];
+                }
                 foreach($tags as $key => $tag_value) {
                     $value = trim($tag_value);
-                    $tag = $this->store->retrieveTagByValue($value);
-
-                    if (is_null($tag)) {
-                        # we create the tag
-                        $tag = $this->store->createTag($value);
-                        $sequence = '';
-                        if (STORAGE == 'postgres') {
-                            $sequence = 'tags_id_seq';
-                        }
-                        $tag_id = $this->store->getLastId($sequence);
-                    }
-                    else {
-                        $tag_id = $tag['id'];
+                    if ($value && !in_array($value, $already_set_tags)) {
+                      $tag = $this->store->retrieveTagByValue($value);
+
+                      if (is_null($tag)) {
+                          # we create the tag
+                          $tag = $this->store->createTag($value);
+                          $sequence = '';
+                          if (STORAGE == 'postgres') {
+                              $sequence = 'tags_id_seq';
+                          }
+                          $tag_id = $this->store->getLastId($sequence);
+                      }
+                      else {
+                          $tag_id = $tag['id'];
+                      }
+
+                      # we assign the tag to the article
+                      $this->store->setTagToEntry($tag_id, $entry_id);
                     }
-
-                    # we assign the tag to the article
-                    $this->store->setTagToEntry($tag_id, $entry_id);
                 }
                 if(!$import) {
                     Tools::redirect();
@@ -579,7 +587,17 @@ class Poche
                 break;
             case 'tags':
                 $token = $this->user->getConfigValue('token');
-                $tags = $this->store->retrieveAllTags($this->user->getId());
+                //if term is set - search tags for this term
+                $term = Tools::checkVar('term');
+                $tags = $this->store->retrieveAllTags($this->user->getId(), $term);
+                if (Tools::isAjaxRequest()) {
+                  $result = array();
+                  foreach ($tags as $tag) {
+                    $result[] = $tag['value'];
+                  }
+                  echo json_encode($result);
+                  exit;
+                }
                 $tpl_vars = array(
                     'token' => $token,
                     'user_id' => $this->user->getId(),
-- 
cgit v1.2.3


From 8d7cd2ccd59e152e4023ed9f54b9f693597a40d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Fri, 14 Mar 2014 08:54:44 +0100
Subject: [add] remove import file in CACHE when import is over

---
 inc/poche/Poche.class.php | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 480f6d45..5b1a0672 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -388,6 +388,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());
                 }
@@ -874,6 +875,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 +921,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 +979,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 +1027,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();
-- 
cgit v1.2.3


From ed02e38e1d52705d74ca43325820e21eabad63b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Fri, 14 Mar 2014 09:35:48 +0100
Subject: [fix] in RSS, link to original article

---
 inc/poche/Poche.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 5b1a0672..7bf33308 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -1164,7 +1164,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);
-- 
cgit v1.2.3


From 5805ac4574b5bd58937c6d698aff184ec3cbf6b0 Mon Sep 17 00:00:00 2001
From: camporez <cadastros@camporez.com>
Date: Sun, 16 Mar 2014 16:43:46 -0300
Subject: =?UTF-8?q?Update=20brazilian=20traslation=20title=20to=20"Portugu?=
 =?UTF-8?q?=C3=AAs=20(Brasil)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/poche/Poche.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 7bf33308..f85bb86c 100755
--- 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()
     {
-- 
cgit v1.2.3


From eb5b677250d16e6831bda43661c82e730358de65 Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Mon, 17 Mar 2014 22:22:05 +0200
Subject: fix of #115 - stay connected and session livetime

---
 inc/poche/Poche.class.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index f85bb86c..b1143d0b 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -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'];
-- 
cgit v1.2.3


From a33a3d2afb6a861e194599973e31e5e448617296 Mon Sep 17 00:00:00 2001
From: tcit <tcit@tcit.fr>
Date: Sat, 22 Mar 2014 11:09:18 +0100
Subject: Implemented rudimental search engine

---
 inc/poche/Poche.class.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index b1143d0b..74a185bd 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -603,6 +603,14 @@ class Poche
                     'tags' => $tags,
                 );
                 break;
+				
+			case 'search':
+				if (isset($_POST['search'])){
+					$search = $_POST['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) {
@@ -772,8 +780,7 @@ class Poche
         $this->emptyCache();
         
         Tools::redirect('?view=config');
-    }
-
+    }	
     /**
      * get credentials from differents sources
      * it redirects the user to the $referer link
-- 
cgit v1.2.3


From 2c4e7a1cea0e692b39055eec7a8ebf142839f120 Mon Sep 17 00:00:00 2001
From: tcit <tcit@tcit.fr>
Date: Sun, 23 Mar 2014 23:52:05 +0100
Subject: Fixes to search engine

Changed the search parameter from POST to GET.
Also, adapted the Baggy theme.
---
 inc/poche/Poche.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 74a185bd..c7aa71e8 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -605,8 +605,8 @@ class Poche
                 break;
 				
 			case 'search':
-				if (isset($_POST['search'])){
-					$search = $_POST['search'];
+				if (isset($_GET['search'])){
+					$search = $_GET['search'];
 					$tpl_vars['entries'] = $this->store->search($search);
 					$tpl_vars['nb_results'] = count($tpl_vars['entries']);
 				}
-- 
cgit v1.2.3


From ad03eb6286f07074ffa8bd25950359cd670f3526 Mon Sep 17 00:00:00 2001
From: tcit <tcit@tcit.fr>
Date: Wed, 26 Mar 2014 17:19:57 +0100
Subject: Fix of #580 : Add some random for Windows hosts

---
 inc/poche/Poche.class.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index c7aa71e8..a8cd5871 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -1122,7 +1122,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);
-- 
cgit v1.2.3


From b152f2b6ba73fbb3e4fb8d4c3b0d69fddad8f9d8 Mon Sep 17 00:00:00 2001
From: tcit <tcit@tcit.fr>
Date: Fri, 28 Mar 2014 00:57:07 +0100
Subject: Fix to bug #570

Forces the download of the data exported file as a poche-export file.
---
 inc/poche/Poche.class.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index a8cd5871..aacbec95 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -1092,6 +1092,7 @@ class Poche
     public function export()
     {
         $entries = $this->store->retrieveAll($this->user->getId());
+		header('Content-Disposition: attachment; filename=poche-export');
         echo $this->tpl->render('export.twig', array(
             'export' => Tools::renderJson($entries),
         ));
-- 
cgit v1.2.3


From ad697686c00432964528226588a8cbea909c9e36 Mon Sep 17 00:00:00 2001
From: tcit <tcit@tcit.fr>
Date: Fri, 28 Mar 2014 16:53:06 +0100
Subject: Final Fix of #570

Adds a date information to the exported data file.
---
 inc/poche/Poche.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index aacbec95..7d9faed1 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -1091,8 +1091,10 @@ 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());
-		header('Content-Disposition: attachment; filename=poche-export');
         echo $this->tpl->render('export.twig', array(
             'export' => Tools::renderJson($entries),
         ));
-- 
cgit v1.2.3


From d967a1fa14237648fc63c44f6a28c9c077b3e1bc Mon Sep 17 00:00:00 2001
From: tcit <tcit@tcit.fr>
Date: Wed, 2 Apr 2014 17:44:47 +0200
Subject: Important fixes for search engine (thx @mariroz)

So sorry for the mess... :(
* search only in users' own articles
* sanitized what is searched
* display what is searched
* pagination, sorting available when searching
* use existing function to query db
* bad encoding caracters fixed
* link to JQuery into default theme, no longer in each theme
* some spaces instead of tabs
---
 inc/poche/Poche.class.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 7d9faed1..42a2dd9a 100755
--- 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());
-- 
cgit v1.2.3


From 182faf2696b38502d4784efc3f84f2f00290343f Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Wed, 2 Apr 2014 20:55:19 +0300
Subject: import without cron

---
 inc/poche/Poche.class.php | 292 +++++++++++++++++++++++++++++-----------------
 1 file changed, 182 insertions(+), 110 deletions(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 7d9faed1..d1b0c945 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -18,7 +18,7 @@ class Poche
     public $tpl;
     public $messages;
     public $pagination;
-    
+
     private $currentTheme = '';
     private $currentLanguage = '';
     private $notInstalledMessage = array();
@@ -42,11 +42,11 @@ class Poche
         if ($this->configFileIsAvailable()) {
             $this->init();
         }
-        
+
         if ($this->themeIsInstalled()) {
             $this->initTpl();
         }
-        
+
         if ($this->systemIsInstalled()) {
             $this->store = new Database();
             $this->messages = new Messages();
@@ -57,8 +57,8 @@ class Poche
             $this->store->checkTags();
         }
     }
-    
-    private function init() 
+
+    private function init()
     {
         Tools::initPhp();
 
@@ -74,28 +74,28 @@ class Poche
         $language = $this->user->getConfigValue('language');
         putenv('LC_ALL=' . $language);
         setlocale(LC_ALL, $language);
-        bindtextdomain($language, LOCALE); 
-        textdomain($language); 
+        bindtextdomain($language, LOCALE);
+        textdomain($language);
 
         # Pagination
         $this->pagination = new Paginator($this->user->getConfigValue('pager'), 'p');
-        
+
         # Set up theme
         $themeDirectory = $this->user->getConfigValue('theme');
-        
+
         if ($themeDirectory === false) {
             $themeDirectory = DEFAULT_THEME;
         }
-        
+
         $this->currentTheme = $themeDirectory;
 
         # Set up language
         $languageDirectory = $this->user->getConfigValue('language');
-        
+
         if ($languageDirectory === false) {
             $languageDirectory = DEFAULT_THEME;
         }
-        
+
         $this->currentLanguage = $languageDirectory;
     }
 
@@ -108,7 +108,7 @@ class Poche
 
         return true;
     }
-    
+
     public function themeIsInstalled() {
         $passTheme = TRUE;
         # Twig is an absolute requirement for Poche to function. Abort immediately if the Composer installer hasn't been run yet
@@ -123,27 +123,27 @@ class Poche
             self::$canRenderTemplates = false;
 
             $passTheme = FALSE;
-        } 
-        
+        }
+
         # Check if the selected theme and its requirements are present
         $theme = $this->getTheme();
 
         if ($theme != '' && ! is_dir(THEME . '/' . $theme)) {
             $this->notInstalledMessage[] = 'The currently selected theme (' . $theme . ') does not seem to be properly installed (Missing directory: ' . THEME . '/' . $theme . ')';
-            
+
             self::$canRenderTemplates = false;
-            
+
             $passTheme = FALSE;
         }
-        
+
         $themeInfo = $this->getThemeInfo($theme);
         if (isset($themeInfo['requirements']) && is_array($themeInfo['requirements'])) {
             foreach ($themeInfo['requirements'] as $requiredTheme) {
                 if (! is_dir(THEME . '/' . $requiredTheme)) {
                     $this->notInstalledMessage[] = 'The required "' . $requiredTheme . '" theme is missing for the current theme (' . $theme . ')';
-                
+
                     self::$canRenderTemplates = false;
-                
+
                     $passTheme = FALSE;
                 }
             }
@@ -153,21 +153,21 @@ class Poche
             return FALSE;
         }
 
-        
+
         return true;
     }
-    
+
     /**
      * all checks before installation.
      * @todo move HTML to template
-     * @return boolean 
+     * @return boolean
      */
     public function systemIsInstalled()
     {
         $msg = TRUE;
-        
+
         $configSalt = defined('SALT') ? constant('SALT') : '';
-        
+
         if (empty($configSalt)) {
             $this->notInstalledMessage[] = 'You have not yet filled in the SALT value in the config.inc.php file.';
             $msg = FALSE;
@@ -193,7 +193,7 @@ class Poche
 
         return true;
     }
-    
+
     public function getNotInstalledMessage() {
         return $this->notInstalledMessage;
     }
@@ -202,7 +202,7 @@ class Poche
     {
         $loaderChain = new Twig_Loader_Chain();
         $theme = $this->getTheme();
-       
+
         # add the current theme as first to the loader chain so Twig will look there first for overridden template files
         try {
             $loaderChain->addLoader(new Twig_Loader_Filesystem(THEME . '/' . $theme));
@@ -210,7 +210,7 @@ class Poche
             # @todo isInstalled() should catch this, inject Twig later
             die('The currently selected theme (' . $theme . ') does not seem to be properly installed (' . THEME . '/' . $theme .' is missing)');
         }
-        
+
         # add all required themes to the loader chain
         $themeInfo = $this->getThemeInfo($theme);
         if (isset($themeInfo['requirements']) && is_array($themeInfo['requirements'])) {
@@ -223,16 +223,16 @@ class Poche
                 }
             }
         }
-        
+
         if (DEBUG_POCHE) {
             $twigParams = array();
         } else {
             $twigParams = array('cache' => CACHE);
         }
-        
+
         $this->tpl = new Twig_Environment($loaderChain, $twigParams);
         $this->tpl->addExtension(new Twig_Extensions_Extension_I18n());
-        
+
         # filter to display domain name of an url
         $filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain');
         $this->tpl->addFilter($filter);
@@ -251,7 +251,7 @@ class Poche
             'poche_url' => Tools::getPocheUrl()
         ));
         if (isset($_GET['install'])) {
-            if (($_POST['password'] == $_POST['password_repeat']) 
+            if (($_POST['password'] == $_POST['password_repeat'])
                 && $_POST['password'] != "" && $_POST['login'] != "") {
                 # let's rock, install poche baby !
                 if ($this->store->install($_POST['login'], Tools::encodeString($_POST['password'] . $_POST['login'])))
@@ -268,7 +268,7 @@ class Poche
         }
         exit();
     }
-    
+
     public function getTheme() {
         return $this->currentTheme;
     }
@@ -293,7 +293,7 @@ class Poche
         if (is_file($themeIniFile) && is_readable($themeIniFile)) {
             $themeInfo = parse_ini_file($themeIniFile);
         }
-        
+
         if ($themeInfo === false) {
             $themeInfo = array();
         }
@@ -304,7 +304,7 @@ class Poche
 
         return $themeInfo;
     }
-    
+
     public function getInstalledThemes() {
         $handle = opendir(THEME);
         $themes = array();
@@ -331,28 +331,28 @@ class Poche
     public function getInstalledLanguages() {
         $handle = opendir(LOCALE);
         $languages = array();
-        
+
         while (($language = readdir($handle)) !== false) {
             # Languages are stored in a directory, so all directory names are languages
             # @todo move language installation data to database
             if (! is_dir(LOCALE . '/' . $language) || in_array($language, array('..', '.', 'tools'))) {
                 continue;
             }
-            
+
             $current = false;
-            
+
             if ($language === $this->getLanguage()) {
                 $current = true;
             }
-            
+
             $languages[] = array('name' => (isset($this->language_names[$language]) ? $this->language_names[$language] : $language), 'value' => $language, 'current' => $current);
         }
-        
+
         return $languages;
     }
 
     public function getDefaultConfig()
-    {   
+    {
         return array(
             'pager' => PAGINATION,
             'language' => LANG,
@@ -385,19 +385,15 @@ class Poche
                     $body = '';
                 }
 
-                //search for possible duplicate if not in import mode
+                //search for possible duplicate
                 $duplicate = NULL;
                 if (!$import) {
-                    $duplicate = $this->store->retrieveOneByURL($url->getUrl(), $this->user->getId());
+                  $duplicate = $this->store->retrieveOneByURL($url->getUrl(), $this->user->getId());
                 }
 
-                if ($this->store->add($url->getUrl(), $title, $body, $this->user->getId())) {
+                $last_id = $this->store->add($url->getUrl(), $title, $body, $this->user->getId());
+                if ( $last_id && !$import ) {
                     Tools::logm('add link ' . $url->getUrl());
-                    $sequence = '';
-                    if (STORAGE == 'postgres') {
-                        $sequence = 'entries_id_seq';
-                    }
-                    $last_id = $this->store->getLastId($sequence);
                     if (DOWNLOAD_PICTURES) {
                         $content = filtre_picture($body, $url->getUrl(), $last_id);
                         Tools::logm('updating content article');
@@ -417,9 +413,7 @@ class Poche
                         }
                     }
 
-                    if (!$import) {
-                        $this->messages->add('s', _('the link has been added successfully'));
-                    }
+                    $this->messages->add('s', _('the link has been added successfully'));
                 }
                 else {
                     if (!$import) {
@@ -603,7 +597,7 @@ class Poche
                     'tags' => $tags,
                 );
                 break;
-				
+
 			case 'search':
 				if (isset($_GET['search'])){
 					$search = $_GET['search'];
@@ -647,7 +641,7 @@ class Poche
                     'nb_results' => '',
                     'listmode' => (isset($_COOKIE['listmode']) ? true : false),
                 );
-                
+
                 //if id is given - we retrive entries by tag: id is tag id
                 if ($id) {
                   $tpl_vars['tag'] = $this->store->retrieveTag($id, $this->user->getId());
@@ -672,8 +666,8 @@ class Poche
     }
 
     /**
-     * update the password of the current user. 
-     * if MODE_DEMO is TRUE, the password can't be updated. 
+     * update the password of the current user.
+     * if MODE_DEMO is TRUE, the password can't be updated.
      * @todo add the return value
      * @todo set the new password in function header like this updatePassword($newPassword)
      * @return boolean
@@ -701,44 +695,44 @@ class Poche
             }
         }
     }
-    
+
     public function updateTheme()
     {
         # no data
         if (empty($_POST['theme'])) {
         }
-        
+
         # we are not going to change it to the current theme...
         if ($_POST['theme'] == $this->getTheme()) {
             $this->messages->add('w', _('still using the "' . $this->getTheme() . '" theme!'));
             Tools::redirect('?view=config');
         }
-        
+
         $themes = $this->getInstalledThemes();
         $actualTheme = false;
-        
+
         foreach (array_keys($themes) as $theme) {
             if ($theme == $_POST['theme']) {
                 $actualTheme = true;
                 break;
             }
         }
-        
+
         if (! $actualTheme) {
             $this->messages->add('e', _('that theme does not seem to be installed'));
             Tools::redirect('?view=config');
         }
-        
+
         $this->store->updateUserConfig($this->user->getId(), 'theme', $_POST['theme']);
         $this->messages->add('s', _('you have changed your theme preferences'));
-        
+
         $currentConfig = $_SESSION['poche_user']->config;
         $currentConfig['theme'] = $_POST['theme'];
-        
+
         $_SESSION['poche_user']->setConfig($currentConfig);
 
         $this->emptyCache();
-        
+
         Tools::redirect('?view=config');
     }
 
@@ -747,40 +741,40 @@ class Poche
         # no data
         if (empty($_POST['language'])) {
         }
-        
+
         # we are not going to change it to the current language...
         if ($_POST['language'] == $this->getLanguage()) {
             $this->messages->add('w', _('still using the "' . $this->getLanguage() . '" language!'));
             Tools::redirect('?view=config');
         }
-        
+
         $languages = $this->getInstalledLanguages();
         $actualLanguage = false;
-        
+
         foreach ($languages as $language) {
             if ($language['value'] == $_POST['language']) {
                 $actualLanguage = true;
                 break;
             }
         }
-        
+
         if (! $actualLanguage) {
             $this->messages->add('e', _('that language does not seem to be installed'));
             Tools::redirect('?view=config');
         }
-        
+
         $this->store->updateUserConfig($this->user->getId(), 'language', $_POST['language']);
         $this->messages->add('s', _('you have changed your language preferences'));
-        
+
         $currentConfig = $_SESSION['poche_user']->config;
         $currentConfig['language'] = $_POST['language'];
-        
+
         $_SESSION['poche_user']->setConfig($currentConfig);
 
         $this->emptyCache();
-        
+
         Tools::redirect('?view=config');
-    }	
+    }
     /**
      * get credentials from differents sources
      * it redirects the user to the $referer link
@@ -835,7 +829,7 @@ class Poche
     /**
      * log out the poche user. It cleans the session.
      * @todo add the return value
-     * @return boolean 
+     * @return boolean
      */
     public function logout()
     {
@@ -891,7 +885,7 @@ class Poche
      * import from Pocket. poche needs a ./ril_export.html file
      * @todo add the return value
      * @param string $targetFile the file used for importing
-     * @return boolean 
+     * @return boolean
      */
     private function importFromPocket($targetFile)
     {
@@ -922,7 +916,7 @@ class Poche
                     $this->action('add_tag',$url,$last_id,true,false,$tags);
                 }
             }
-            
+
             # the second <ul> is for read links
             $read = 1;
         }
@@ -937,7 +931,7 @@ class Poche
      * import from Readability. poche needs a ./readability file
      * @todo add the return value
      * @param string $targetFile the file used for importing
-     * @return boolean 
+     * @return boolean
      */
     private function importFromReadability($targetFile)
     {
@@ -994,7 +988,7 @@ class Poche
     /**
      * import from Poche exported file
      * @param string $targetFile the file used for importing
-     * @return boolean 
+     * @return boolean
      */
     private function importFromPoche($targetFile)
     {
@@ -1014,12 +1008,12 @@ class Poche
             $url = new Url(base64_encode($value['url']));
             $favorite = ($value['is_fav'] == -1);
             $archive = ($value['is_read'] == -1);
-    
+
             # we can add the url
             if (!is_null($url) && $url->isCorrect()) {
-                
+
                 $this->action('add', $url, 0, TRUE);
-                
+
                 $count++;
                 if ($favorite) {
                     $last_id = $this->store->getLastId($sequence);
@@ -1030,7 +1024,7 @@ class Poche
                     $this->action('toggle_archive', $url, $last_id, TRUE);
                 }
             }
-            
+
         }
 
         unlink($targetFile);
@@ -1041,37 +1035,115 @@ class Poche
 
     /**
      * import datas into your poche
-     * @param  string $from name of the service to import : pocket, instapaper or readability
-     * @todo add the return value
-     * @return boolean       
+     * @return boolean
      */
-    public function import($from)
-    {
-        $providers = array(
-            'pocket' => 'importFromPocket',
-            'readability' => 'importFromReadability',
-            'instapaper' => 'importFromInstapaper',
-            'poche' => 'importFromPoche',
-        );
-        
-        if (! isset($providers[$from])) {
-            $this->messages->add('e', _('Unknown import provider.'));
-            Tools::redirect();
+    public function import() {
+
+      if ( isset($_FILES['file']) ) {
+        // assume, that file is in json format
+        $str_data = file_get_contents($_FILES['file']['tmp_name']);
+        $data = json_decode($str_data, true);
+
+        if ( $data === null ) {
+          //not json - assume html
+          $html = new simple_html_dom();
+          $html->load_file($_FILES['file']['tmp_name']);
+          $data = array();
+          $read = 0;
+          foreach (array('ol','ul') as $list) {
+            foreach ($html->find($list) as $ul) {
+            	foreach ($ul->find('li') as $li) {
+            	  $tmpEntry = array();
+            		$a = $li->find('a');
+            		$tmpEntry['url'] = $a[0]->href;
+            		$tmpEntry['tags'] = $a[0]->tags;
+            		$tmpEntry['is_read'] = $read;
+            		if ($tmpEntry['url']) {
+            		  $data[] = $tmpEntry;
+            		}
+            	}
+            	# the second <ol/ul> is for read links
+            	$read = ((sizeof($data) && $read)?0:1);
+            }
+          }
         }
-        
-        $targetFile = CACHE . '/' . constant(strtoupper($from) . '_FILE');
-        
-        if (! file_exists($targetFile)) {
-            $this->messages->add('e', _('Could not find required "' . $targetFile . '" import file.'));
-            Tools::redirect();
+
+        $i = 0; //counter for articles inserted
+        foreach ($data as $record) {
+          //echo '<pre>';
+          //var_dump($record);
+  //         foreach ($record as $key=>$val) {
+  //           echo "\n=================\n$i: $key: $val\n";
+  //         }
+  //         exit;
+
+          $url = trim($record['url']);
+          if ( $url ) {
+            $title = (isset($record['title']) ? $record['title'] :  _('Untitled - Import - ').'</a> <a href="./?import">'._('click to finish import').'</a><a>');
+            $body = (isset($record['content']) ? $record['content'] : '');
+            $isRead = (isset($record['is_read']) ? intval($record['is_read']) : 0);
+            $isFavorite = (isset($record['is_fav']) ? intval($record['is_fav']) : 0);
+            //insert new record
+            $id = $this->store->add($url, $title, $body, $this->user->getId(), $isFavorite, $isRead);
+            if ( $id ) {
+              //increment no of records inserted
+              $i++;
+              if ( isset($record['tags']) && trim($record['tags']) ) {
+              	//@TODO: set tags
+
+              }
+            }
+          }
+        }
+
+        if ( $i > 0 ) {
+          $this->messages->add('s', _('Articles inserted: ').$i._('. Please note, that some may be marked as "read".'));
+        }
+      }
+      //file parsing finished here
+
+      //now download article contents if any
+
+      //check if we need to download any content
+      $recordsDownloadRequired = $this->store->retrieveUnfetchedEntriesCount($this->user->getId());
+      if ( $recordsDownloadRequired == 0 ) {
+        //nothing to download
+        $this->messages->add('s', _('Import finished.'));
+        Tools::redirect();
+      }
+      else {
+        //if just inserted - don't download anything, download will start in next reload
+        if ( !isset($_FILES['file']) ) {
+          //download next batch
+          $items = $this->store->retrieveUnfetchedEntries($this->user->getId(), IMPORT_LIMIT);
+
+          $config = HTMLPurifier_Config::createDefault();
+          $config->set('Cache.SerializerPath', CACHE);
+          $purifier = new HTMLPurifier($config);
+
+          foreach ($items as $item) {
+          	$url = new Url(base64_encode($item['url']));
+          	$content = Tools::getPageContent($url);
+
+          	$title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'));
+          	$body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined'));
+
+          	//clean content to prevent xss attack
+          	$title = $purifier->purify($title);
+          	$body = $purifier->purify($body);
+
+          	$this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
+          }
+
         }
-        
-        $this->$providers[$from]($targetFile);
+      }
+
+      return array('includeImport'=>true, 'import'=>array('recordsDownloadRequired'=>$recordsDownloadRequired, 'recordsUnderDownload'=> IMPORT_LIMIT, 'delay'=> IMPORT_DELAY * 1000) );
     }
 
     public function uploadFile() {
-        if(isset($_FILES['file']))
-        { 
+        if (isset($_FILES['file']))
+        {
             $dir = CACHE . '/';
             $file = basename($_FILES['file']['name']);
             if(move_uploaded_file($_FILES['file']['tmp_name'], $dir . $file)) {
@@ -1081,7 +1153,7 @@ class Poche
                 $this->messages->add('e', _('Error while importing file. Do you have access to upload it?'));
             }
         }
-        
+
         Tools::redirect('?view=config');
     }
 
@@ -1093,7 +1165,7 @@ class Poche
     {
 		$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),
-- 
cgit v1.2.3


From a297fb1e38ce70a2c25f5dd9096fcfbf988ddf05 Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Thu, 3 Apr 2014 12:18:49 +0300
Subject: import w/o cron

---
 inc/poche/Poche.class.php | 316 +++++++---------------------------------------
 1 file changed, 46 insertions(+), 270 deletions(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index ee3b2ac2..a662f695 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -368,31 +368,23 @@ class Poche
         switch ($action)
         {
             case 'add':
-                if (!$import) {
-                    $content = Tools::getPageContent($url);
-                    $title = ($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled');
-                    $body = $content['rss']['channel']['item']['description'];
-
-                    // clean content from prevent xss attack
-                    $config = HTMLPurifier_Config::createDefault();
-                    $config->set('Cache.SerializerPath', CACHE);
-                    $purifier = new HTMLPurifier($config);
-                    $title = $purifier->purify($title);
-                    $body = $purifier->purify($body);
-                }
-                else {
-                    $title = '';
-                    $body = '';
-                }
+                $content = Tools::getPageContent($url);
+                $title = ($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled');
+                $body = $content['rss']['channel']['item']['description'];
+
+                // clean content from prevent xss attack
+                $config = HTMLPurifier_Config::createDefault();
+                $config->set('Cache.SerializerPath', CACHE);
+                $purifier = new HTMLPurifier($config);
+                $title = $purifier->purify($title);
+                $body = $purifier->purify($body);
 
                 //search for possible duplicate
                 $duplicate = NULL;
-                if (!$import) {
-                  $duplicate = $this->store->retrieveOneByURL($url->getUrl(), $this->user->getId());
-                }
+                $duplicate = $this->store->retrieveOneByURL($url->getUrl(), $this->user->getId());
 
                 $last_id = $this->store->add($url->getUrl(), $title, $body, $this->user->getId());
-                if ( $last_id && !$import ) {
+                if ( $last_id ) {
                     Tools::logm('add link ' . $url->getUrl());
                     if (DOWNLOAD_PICTURES) {
                         $content = filtre_picture($body, $url->getUrl(), $last_id);
@@ -416,18 +408,14 @@ class Poche
                     $this->messages->add('s', _('the link has been added successfully'));
                 }
                 else {
-                    if (!$import) {
-                        $this->messages->add('e', _('error during insertion : the link wasn\'t added'));
-                        Tools::logm('error during insertion : the link wasn\'t added ' . $url->getUrl());
-                    }
+                    $this->messages->add('e', _('error during insertion : the link wasn\'t added'));
+                    Tools::logm('error during insertion : the link wasn\'t added ' . $url->getUrl());
                 }
 
-                if (!$import) {
-                    if ($autoclose == TRUE) {
-                      Tools::redirect('?view=home');
-                    } else {
-                      Tools::redirect('?view=home&closewin=true');
-                    }
+                if ($autoclose == TRUE) {
+                  Tools::redirect('?view=home');
+                } else {
+                  Tools::redirect('?view=home&closewin=true');
                 }
                 break;
             case 'delete':
@@ -448,33 +436,21 @@ class Poche
             case 'toggle_fav' :
                 $this->store->favoriteById($id, $this->user->getId());
                 Tools::logm('mark as favorite link #' . $id);
-                if (!$import) {
-                    Tools::redirect();
-                }
+                Tools::redirect();
                 break;
             case 'toggle_archive' :
                 $this->store->archiveById($id, $this->user->getId());
                 Tools::logm('archive link #' . $id);
-                if (!$import) {
-                    Tools::redirect();
-                }
+                Tools::redirect();
                 break;
             case 'archive_all' :
                 $this->store->archiveAll($this->user->getId());
                 Tools::logm('archive all links');
-                if (!$import) {
-                    Tools::redirect();
-                }
+                Tools::redirect();
                 break;
             case 'add_tag' :
-                if($import){
-                    $entry_id = $id;
-                    $tags = explode(',', $tags);
-                }
-                else{
-                    $tags = explode(',', $_POST['value']);
-                    $entry_id = $_POST['entry_id'];
-                }
+                $tags = explode(',', $_POST['value']);
+                $entry_id = $_POST['entry_id'];
                 $entry = $this->store->retrieveOneById($entry_id, $this->user->getId());
                 if (!$entry) {
                     $this->messages->add('e', _('Article not found!'));
@@ -509,9 +485,7 @@ class Poche
                       $this->store->setTagToEntry($tag_id, $entry_id);
                     }
                 }
-                if(!$import) {
-                    Tools::redirect();
-                }
+                Tools::redirect();
                 break;
             case 'remove_tag' :
                 $tag_id = $_GET['tag_id'];
@@ -844,206 +818,19 @@ class Poche
         Tools::redirect();
     }
 
-    /**
-     * import from Instapaper. poche needs a ./instapaper-export.html file
-     * @todo add the return value
-     * @param string $targetFile the file used for importing
-     * @return boolean
-     */
-    private function importFromInstapaper($targetFile)
-    {
-        # TODO gestion des articles favs
-        $html = new simple_html_dom();
-        $html->load_file($targetFile);
-        Tools::logm('starting import from instapaper');
-
-        $read = 0;
-        $errors = array();
-        foreach($html->find('ol') as $ul)
-        {
-            foreach($ul->find('li') as $li)
-            {
-                $a = $li->find('a');
-                $url = new Url(base64_encode($a[0]->href));
-                $this->action('add', $url, 0, TRUE);
-                if ($read == '1') {
-                    $sequence = '';
-                    if (STORAGE == 'postgres') {
-                        $sequence = 'entries_id_seq';
-                    }
-                    $last_id = $this->store->getLastId($sequence);
-                    $this->action('toggle_archive', $url, $last_id, TRUE);
-                }
-            }
-
-            # 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();
-    }
-
-    /**
-     * import from Pocket. poche needs a ./ril_export.html file
-     * @todo add the return value
-     * @param string $targetFile the file used for importing
-     * @return boolean
-     */
-    private function importFromPocket($targetFile)
-    {
-        # TODO gestion des articles favs
-        $html = new simple_html_dom();
-        $html->load_file($targetFile);
-        Tools::logm('starting import from pocket');
-
-        $read = 0;
-        $errors = array();
-        foreach($html->find('ul') as $ul)
-        {
-            foreach($ul->find('li') as $li)
-            {
-                $a = $li->find('a');
-                $url = new Url(base64_encode($a[0]->href));
-                $this->action('add', $url, 0, TRUE);
-                $sequence = '';
-                if (STORAGE == 'postgres') {
-                    $sequence = 'entries_id_seq';
-                }
-                $last_id = $this->store->getLastId($sequence);
-                if ($read == '1') {
-                    $this->action('toggle_archive', $url, $last_id, TRUE);
-                }
-                $tags = $a[0]->tags;
-                if(!empty($tags)) {
-                    $this->action('add_tag',$url,$last_id,true,false,$tags);
-                }
-            }
-
-            # 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();
-    }
-
-    /**
-     * import from Readability. poche needs a ./readability file
-     * @todo add the return value
-     * @param string $targetFile the file used for importing
-     * @return boolean
-     */
-    private function importFromReadability($targetFile)
-    {
-        # TODO gestion des articles lus / favs
-        $str_data = file_get_contents($targetFile);
-        $data = json_decode($str_data,true);
-        Tools::logm('starting import from Readability');
-        $count = 0;
-        foreach ($data as $key => $value) {
-            $url = NULL;
-            $favorite = FALSE;
-            $archive = FALSE;
-            foreach ($value as $item) {
-                foreach ($item as $attr => $value) {
-                    if ($attr == 'article__url') {
-                        $url = new Url(base64_encode($value));
-                    }
-                    $sequence = '';
-                    if (STORAGE == 'postgres') {
-                        $sequence = 'entries_id_seq';
-                    }
-                    if ($value == 'true') {
-                        if ($attr == 'favorite') {
-                            $favorite = TRUE;
-                        }
-                        if ($attr == 'archive') {
-                            $archive = TRUE;
-                        }
-                    }
-                }
-
-                # we can add the url
-                if (!is_null($url) && $url->isCorrect()) {
-                    $this->action('add', $url, 0, TRUE);
-                    $count++;
-                    if ($favorite) {
-                        $last_id = $this->store->getLastId($sequence);
-                        $this->action('toggle_fav', $url, $last_id, TRUE);
-                    }
-                    if ($archive) {
-                        $last_id = $this->store->getLastId($sequence);
-                        $this->action('toggle_archive', $url, $last_id, TRUE);
-                    }
-                }
-            }
-        }
-
-        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();
-    }
-
-    /**
-     * import from Poche exported file
-     * @param string $targetFile the file used for importing
-     * @return boolean
-     */
-    private function importFromPoche($targetFile)
-    {
-        $str_data = file_get_contents($targetFile);
-        $data = json_decode($str_data,true);
-        Tools::logm('starting import from Poche');
-
-
-        $sequence = '';
-        if (STORAGE == 'postgres') {
-            $sequence = 'entries_id_seq';
-        }
-
-        $count = 0;
-        foreach ($data as $value) {
-
-            $url = new Url(base64_encode($value['url']));
-            $favorite = ($value['is_fav'] == -1);
-            $archive = ($value['is_read'] == -1);
-
-            # we can add the url
-            if (!is_null($url) && $url->isCorrect()) {
-
-                $this->action('add', $url, 0, TRUE);
-
-                $count++;
-                if ($favorite) {
-                    $last_id = $this->store->getLastId($sequence);
-                    $this->action('toggle_fav', $url, $last_id, TRUE);
-                }
-                if ($archive) {
-                    $last_id = $this->store->getLastId($sequence);
-                    $this->action('toggle_archive', $url, $last_id, TRUE);
-                }
-            }
-
-        }
-
-        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();
-    }
-
     /**
      * import datas into your poche
      * @return boolean
      */
     public function import() {
 
+      if (!defined('IMPORT_LIMIT')) {
+        define('IMPORT_LIMIT', 5);
+      }
+      if (!defined('IMPORT_DELAY')) {
+      	define('IMPORT_DELAY', 5);
+      }
+
       if ( isset($_FILES['file']) ) {
         // assume, that file is in json format
         $str_data = file_get_contents($_FILES['file']['tmp_name']);
@@ -1073,21 +860,26 @@ class Poche
           }
         }
 
+        //for readability structure
+        foreach ($data as $record) {
+          if (is_array($record)) {
+            $data[] = $record;
+            foreach ($record as $record2) {
+              if (is_array($record2)) {
+              	$data[] = $record2;
+              }
+            }
+          }
+        }
+
         $i = 0; //counter for articles inserted
         foreach ($data as $record) {
-          //echo '<pre>';
-          //var_dump($record);
-  //         foreach ($record as $key=>$val) {
-  //           echo "\n=================\n$i: $key: $val\n";
-  //         }
-  //         exit;
-
-          $url = trim($record['url']);
+          $url = trim( isset($record['article__url']) ? $record['article__url'] : (isset($record['url']) ? $record['url'] : '') );
           if ( $url ) {
             $title = (isset($record['title']) ? $record['title'] :  _('Untitled - Import - ').'</a> <a href="./?import">'._('click to finish import').'</a><a>');
             $body = (isset($record['content']) ? $record['content'] : '');
-            $isRead = (isset($record['is_read']) ? intval($record['is_read']) : 0);
-            $isFavorite = (isset($record['is_fav']) ? intval($record['is_fav']) : 0);
+            $isRead = (isset($record['is_read']) ? intval($record['is_read']) : (isset($record['archive'])?intval($record['archive']):0));
+            $isFavorite = (isset($record['is_fav']) ? intval($record['is_fav']) : (isset($record['favorite'])?intval($record['favorite']):0) );
             //insert new record
             $id = $this->store->add($url, $title, $body, $this->user->getId(), $isFavorite, $isRead);
             if ( $id ) {
@@ -1146,22 +938,6 @@ class Poche
       return array('includeImport'=>true, 'import'=>array('recordsDownloadRequired'=>$recordsDownloadRequired, 'recordsUnderDownload'=> IMPORT_LIMIT, 'delay'=> IMPORT_DELAY * 1000) );
     }
 
-    public function uploadFile() {
-        if (isset($_FILES['file']))
-        {
-            $dir = CACHE . '/';
-            $file = basename($_FILES['file']['name']);
-            if(move_uploaded_file($_FILES['file']['tmp_name'], $dir . $file)) {
-                $this->messages->add('s', _('File uploaded. You can now execute import.'));
-            }
-            else {
-                $this->messages->add('e', _('Error while importing file. Do you have access to upload it?'));
-            }
-        }
-
-        Tools::redirect('?view=config');
-    }
-
     /**
      * export poche entries in json
      * @return json all poche entries
-- 
cgit v1.2.3