X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=7f72b14699e8e334c4101e7680dd63d4c4cd70a9;hb=refs%2Fpull%2F609%2Fhead;hp=bc28a19d59299be677a6f547d59b21a0f25d2997;hpb=a7048bc45d63710b2e550b4ad467bd91e75c7acf;p=github%2Fwallabag%2Fwallabag.git

diff --git a/index.php b/index.php
old mode 100644
new mode 100755
index bc28a19d..7f72b146
--- a/index.php
+++ b/index.php
@@ -8,15 +8,13 @@
  * @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';
 
 # Start session
 Session::$sessionName = 'poche';
-if ( !isset($_GET['login']) ) {
-    Session::init();
-}
+Session::init();
 
 # Start Poche
 $poche = new Poche();
@@ -42,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 '<h1>Errors</h1><ol>';
         foreach ($notInstalledMessage as $message) {
             echo '<li>' . $message . '</li>';
@@ -69,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'])) {
@@ -122,6 +121,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)