From dcc73856a900a98b2b1efd5292eea6f662924884 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Tue, 25 Feb 2014 15:45:39 +0200 Subject: "poche" word removed completely, all locales .po files updated, en, pl, ru and uk .mo files recompiled. --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'index.php') diff --git a/index.php b/index.php index a26c42e1..7260e583 100644 --- a/index.php +++ b/index.php @@ -30,7 +30,7 @@ $tpl_vars = array( 'referer' => $referer, 'view' => $view, 'poche_url' => Tools::getPocheUrl(), - 'title' => _('poche, a read it later open source system'), + 'title' => _('wallabag, a read it later open source system'), 'token' => Session::getToken(), 'theme' => $poche->getTheme() ); -- cgit v1.2.3 From 4c14936353253ab521d6b64d0b9eafcb5e490cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 28 Feb 2014 14:57:04 +0100 Subject: road to 1.5.3 --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'index.php') diff --git a/index.php b/index.php index 7260e583..9f5d0ade 100644 --- a/index.php +++ b/index.php @@ -8,7 +8,7 @@ * @license http://www.wtfpl.net/ see COPYING file */ -define ('POCHE', '1.5.2'); +define ('POCHE', '1.5.3'); require 'check_setup.php'; require_once 'inc/poche/global.inc.php'; session_start(); -- cgit v1.2.3 From 31a10069a52c2fd2aca3a835a7bdc1accae197f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 28 Feb 2014 20:36:32 +0100 Subject: [add] upload form for import --- index.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'index.php') diff --git a/index.php b/index.php index 9f5d0ade..ecae9119 100644 --- a/index.php +++ b/index.php @@ -75,6 +75,8 @@ if (isset($_GET['login'])) { $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(); -- cgit v1.2.3 From 71b0d53c5e5d44a928870f7c98beac7b34199ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 2 Mar 2014 08:38:26 +0100 Subject: [fix] #115 cookie lifetime was empty --- index.php | 1 - 1 file changed, 1 deletion(-) (limited to 'index.php') diff --git a/index.php b/index.php index 9f5d0ade..06ab7d3c 100644 --- a/index.php +++ b/index.php @@ -11,7 +11,6 @@ define ('POCHE', '1.5.3'); require 'check_setup.php'; require_once 'inc/poche/global.inc.php'; -session_start(); # Start Poche $poche = new Poche(); -- cgit v1.2.3 From eb5b677250d16e6831bda43661c82e730358de65 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Mon, 17 Mar 2014 22:22:05 +0200 Subject: fix of #115 - stay connected and session livetime --- index.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'index.php') diff --git a/index.php b/index.php index 5ca8bef5..bc28a19d 100644 --- a/index.php +++ b/index.php @@ -12,6 +12,12 @@ define ('POCHE', '1.5.3'); require 'check_setup.php'; require_once 'inc/poche/global.inc.php'; +# Start session +Session::$sessionName = 'poche'; +if ( !isset($_GET['login']) ) { + Session::init(); +} + # Start Poche $poche = new Poche(); $notInstalledMessage = $poche -> getNotInstalledMessage(); -- cgit v1.2.3 From ad53faf25cc2f83594f3f756923a042351f4f202 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 21 Mar 2014 14:59:30 +0200 Subject: fix of issue under nginx and php-fpm --- index.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'index.php') diff --git a/index.php b/index.php index bc28a19d..fb13f38d 100644 --- a/index.php +++ b/index.php @@ -14,9 +14,7 @@ require_once 'inc/poche/global.inc.php'; # Start session Session::$sessionName = 'poche'; -if ( !isset($_GET['login']) ) { - Session::init(); -} +Session::init(); # Start Poche $poche = new Poche(); @@ -122,6 +120,7 @@ if (Session::isLogged()) { } else { $tpl_file = Tools::getTplFile('login'); $tpl_vars['http_auth'] = 0; + Session::logout(); } # because messages can be added in $poche->action(), we have to add this entry now (we can add it before) -- cgit v1.2.3 From 182faf2696b38502d4784efc3f84f2f00290343f Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Wed, 2 Apr 2014 20:55:19 +0300 Subject: import without cron --- index.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) mode change 100644 => 100755 index.php (limited to 'index.php') diff --git a/index.php b/index.php old mode 100644 new mode 100755 index fb13f38d..8b578832 --- a/index.php +++ b/index.php @@ -40,7 +40,7 @@ $tpl_vars = array( if (! empty($notInstalledMessage)) { if (! Poche::$canRenderTemplates || ! Poche::$configFileAvailable) { - # We cannot use Twig to display the error message + # We cannot use Twig to display the error message echo '

Errors

    '; foreach ($notInstalledMessage as $message) { echo '
  1. ' . $message . '
    2. '; @@ -67,7 +67,8 @@ if (isset($_GET['login'])) { # Update password $poche->updatePassword(); } elseif (isset($_GET['import'])) { - $import = $poche->import($_GET['from']); + $import = $poche->import(); + $tpl_vars = array_merge($tpl_vars, $import); } elseif (isset($_GET['download'])) { Tools::download_db(); } elseif (isset($_GET['empty-cache'])) { -- cgit v1.2.3 From bfa32856bc9401693b8b64ed9c946d471e4ae0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 3 Apr 2014 13:54:06 +0200 Subject: yeah, 1.6, one year after the 1st commit --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'index.php') diff --git a/index.php b/index.php index 8b578832..7f72b146 100755 --- a/index.php +++ b/index.php @@ -8,7 +8,7 @@ * @license http://www.wtfpl.net/ see COPYING file */ -define ('POCHE', '1.5.3'); +define ('POCHE', '1.6.0'); require 'check_setup.php'; require_once 'inc/poche/global.inc.php'; -- cgit v1.2.3