From 96834a47b09985e1c82b82857fc108f20e8b8f2b Mon Sep 17 00:00:00 2001 From: tcitworld Date: Fri, 16 May 2014 17:38:19 +0200 Subject: [PATCH 1/6] Added PHPePub --- CREDITS.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CREDITS.md b/CREDITS.md index c892336..ffef5b3 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -9,7 +9,8 @@ wallabag is based on : * Twig http://twig.sensiolabs.org * Flash messages https://github.com/plasticbrain/PHP-Flash-Messages * Pagination https://github.com/daveismyname/pagination +* PHPePub https://github.com/Grandt/PHPePub/ wallabag is developed by Nicolas Lœuillet under the Do What the Fuck You Want to Public License -Contributors : https://github.com/wallabag/wallabag/graphs/contributors \ No newline at end of file +Contributors : https://github.com/wallabag/wallabag/graphs/contributors From 800868e27ea9cb73b889537be6ff35c88fb9e443 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Thu, 24 Jul 2014 17:47:23 +0300 Subject: [PATCH 2/6] security fix --- index.php | 82 +++++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/index.php b/index.php index 481841e..2c532c0 100755 --- a/index.php +++ b/index.php @@ -63,54 +63,54 @@ if (! empty($notInstalledMessage)) { # poche actions if (isset($_GET['login'])) { - # hello you + # hello to you $poche->login($referer); -} elseif (isset($_GET['logout'])) { - # see you soon ! - $poche->logout(); -} elseif (isset($_GET['config'])) { - # Update password - $poche->updatePassword(); -} elseif (isset($_GET['newuser'])) { - $poche->createNewUser(); -} elseif (isset($_GET['deluser'])) { - $poche->deleteUser(); -} elseif (isset($_GET['epub'])) { - $poche->createEpub(); -} elseif (isset($_GET['import'])) { - $import = $poche->import(); - $tpl_vars = array_merge($tpl_vars, $import); -} elseif (isset($_GET['download'])) { - Tools::download_db(); -} elseif (isset($_GET['empty-cache'])) { - $poche->emptyCache(); -} elseif (isset($_GET['export'])) { - $poche->export(); -} elseif (isset($_GET['updatetheme'])) { - $poche->updateTheme(); -} elseif (isset($_GET['updatelanguage'])) { - $poche->updateLanguage(); -} elseif (isset($_GET['uploadfile'])) { - $poche->uploadFile(); -} elseif (isset($_GET['feed'])) { - if (isset($_GET['action']) && $_GET['action'] == 'generate') { - $poche->generateToken(); - } - else { - $tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0); - $poche->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type']); - } -} - -elseif (isset($_GET['plainurl']) && !empty($_GET['plainurl'])) { - $plain_url = new Url(base64_encode($_GET['plainurl'])); - $poche->action('add', $plain_url); +} elseif (isset($_GET['feed']) && isset($_GET['user_id'])) { + $tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0); + $poche->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type']); } if (Session::isLogged()) { + + if (isset($_GET['logout'])) { + # see you soon ! + $poche->logout(); + } elseif (isset($_GET['config'])) { + # Update password + $poche->updatePassword(); + } elseif (isset($_GET['newuser'])) { + $poche->createNewUser(); + } elseif (isset($_GET['deluser'])) { + $poche->deleteUser(); + } elseif (isset($_GET['epub'])) { + $poche->createEpub(); + } elseif (isset($_GET['import'])) { + $import = $poche->import(); + $tpl_vars = array_merge($tpl_vars, $import); + } elseif (isset($_GET['download'])) { + Tools::download_db(); + } elseif (isset($_GET['empty-cache'])) { + $poche->emptyCache(); + } elseif (isset($_GET['export'])) { + $poche->export(); + } elseif (isset($_GET['updatetheme'])) { + $poche->updateTheme(); + } elseif (isset($_GET['updatelanguage'])) { + $poche->updateLanguage(); + } elseif (isset($_GET['uploadfile'])) { + $poche->uploadFile(); + } elseif (isset($_GET['feed']) && isset($_GET['action']) && $_GET['action'] == 'generate') { + $poche->generateToken(); + } + elseif (isset($_GET['plainurl']) && !empty($_GET['plainurl'])) { + $plain_url = new Url(base64_encode($_GET['plainurl'])); + $poche->action('add', $plain_url); + } + $poche->action($action, $url, $id); $tpl_file = Tools::getTplFile($view); $tpl_vars = array_merge($tpl_vars, $poche->displayView($view, $id)); + } elseif(isset($_SERVER['PHP_AUTH_USER'])) { if($poche->store->userExists($_SERVER['PHP_AUTH_USER'])) { $poche->login($referer); From 38cf3413dfe156ced4f5f3a8c792cef69e2735f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 24 Jul 2014 21:41:01 +0200 Subject: [PATCH 3/6] 1.7.2 --- index.php | 68 +++++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/index.php b/index.php index 2c532c0..b2ab146 100755 --- a/index.php +++ b/index.php @@ -8,7 +8,7 @@ * @license http://www.wtfpl.net/ see COPYING file */ -define ('POCHE', '1.7.1'); +define ('POCHE', '1.7.2'); require 'check_setup.php'; require_once 'inc/poche/global.inc.php'; @@ -72,39 +72,39 @@ if (isset($_GET['login'])) { if (Session::isLogged()) { - if (isset($_GET['logout'])) { - # see you soon ! - $poche->logout(); - } elseif (isset($_GET['config'])) { - # Update password - $poche->updatePassword(); - } elseif (isset($_GET['newuser'])) { - $poche->createNewUser(); - } elseif (isset($_GET['deluser'])) { - $poche->deleteUser(); - } elseif (isset($_GET['epub'])) { - $poche->createEpub(); - } elseif (isset($_GET['import'])) { - $import = $poche->import(); - $tpl_vars = array_merge($tpl_vars, $import); - } elseif (isset($_GET['download'])) { - Tools::download_db(); - } elseif (isset($_GET['empty-cache'])) { - $poche->emptyCache(); - } elseif (isset($_GET['export'])) { - $poche->export(); - } elseif (isset($_GET['updatetheme'])) { - $poche->updateTheme(); - } elseif (isset($_GET['updatelanguage'])) { - $poche->updateLanguage(); - } elseif (isset($_GET['uploadfile'])) { - $poche->uploadFile(); - } elseif (isset($_GET['feed']) && isset($_GET['action']) && $_GET['action'] == 'generate') { - $poche->generateToken(); - } - elseif (isset($_GET['plainurl']) && !empty($_GET['plainurl'])) { - $plain_url = new Url(base64_encode($_GET['plainurl'])); - $poche->action('add', $plain_url); + if (isset($_GET['logout'])) { + # see you soon ! + $poche->logout(); + } elseif (isset($_GET['config'])) { + # Update password + $poche->updatePassword(); + } elseif (isset($_GET['newuser'])) { + $poche->createNewUser(); + } elseif (isset($_GET['deluser'])) { + $poche->deleteUser(); + } elseif (isset($_GET['epub'])) { + $poche->createEpub(); + } elseif (isset($_GET['import'])) { + $import = $poche->import(); + $tpl_vars = array_merge($tpl_vars, $import); + } elseif (isset($_GET['download'])) { + Tools::download_db(); + } elseif (isset($_GET['empty-cache'])) { + $poche->emptyCache(); + } elseif (isset($_GET['export'])) { + $poche->export(); + } elseif (isset($_GET['updatetheme'])) { + $poche->updateTheme(); + } elseif (isset($_GET['updatelanguage'])) { + $poche->updateLanguage(); + } elseif (isset($_GET['uploadfile'])) { + $poche->uploadFile(); + } elseif (isset($_GET['feed']) && isset($_GET['action']) && $_GET['action'] == 'generate') { + $poche->generateToken(); + } + elseif (isset($_GET['plainurl']) && !empty($_GET['plainurl'])) { + $plain_url = new Url(base64_encode($_GET['plainurl'])); + $poche->action('add', $plain_url); } $poche->action($action, $url, $id); From 81315897f088105b445c194e7a984662bb208854 Mon Sep 17 00:00:00 2001 From: Jean Baptiste Favre Date: Sun, 21 Dec 2014 22:41:04 +0100 Subject: [PATCH 4/6] Make call to FTRSS silent to avoid warnings which can break import --- inc/poche/Tools.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index f803e3b..7ccfc06 100755 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php @@ -342,7 +342,10 @@ final class Tools return $json; }; - $json = $scope("inc/3rdparty/makefulltextfeed.php", array("url" => $url)); + // Silence $scope function to avoid + // issues with FTRSS when error_reporting is to high + // FTRSS generates PHP warnings which break output + $json = @$scope("inc/3rdparty/makefulltextfeed.php", array("url" => $url)); // Clearing and restoring context foreach ($GLOBALS as $key => $value) { From 30b948e68b53dcb8b79c2aa1b62b992045892e90 Mon Sep 17 00:00:00 2001 From: goofy-bz Date: Fri, 2 Jan 2015 21:13:54 +0100 Subject: [PATCH 5/6] Update fr_FR.utf8.po formulation (trivial) --- locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po index 3d03196..849e66d 100644 --- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po +++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po @@ -250,7 +250,7 @@ msgid "" "your config file: IMPORT_LIMIT (how many articles are fetched at once) and " "IMPORT_DELAY (delay between fetch of next batch of articles)." msgstr "" -"Sélectionner le fichier à importer sur votre disque dur, et pressez la " +"Sélectionnez le fichier à importer sur votre disque dur, et pressez la " "bouton « Importer » ci-dessous.
wallabag analysera votre fichier, " "ajoutera toutes les URL trouvées et commencera à télécharger les contenus si " "nécessaire.
Le processus de téléchargement est contrôlé par deux " From 166ff0a0932ede6824a30d553c39ff6dd7dbb0b4 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 3 Jan 2015 11:40:19 +0100 Subject: [PATCH 6/6] updated french mo file (see #986) --- locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo | Bin 21037 -> 21037 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo index eed260b2e0a008835e8fcc661fb8d2035da8dc1b..83f397a05d37afd64e4e148c7340b97ae3144b2e 100644 GIT binary patch delta 16 YcmZ3xgmLW>#tr9f7^^m4u!$7~06;ni3;+NC delta 16 YcmZ3xgmLW>#tr9f7>hPvu!$7~06+={1ONa4