X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=fb13f38d499f3a271083a93e2aff26994991c232;hb=refs%2Fpull%2F586%2Fhead;hp=7ded3bdbc09862917b21ca09f3774484474e6a18;hpb=792097fb6a6507201ec41f90201ad05ad8c38870;p=github%2Fwallabag%2Fwallabag.git

diff --git a/index.php b/index.php
index 7ded3bdb..fb13f38d 100644
--- a/index.php
+++ b/index.php
@@ -8,10 +8,13 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-define ('POCHE', '1.5.0');
+define ('POCHE', '1.5.3');
 require 'check_setup.php';
 require_once 'inc/poche/global.inc.php';
-session_start(); 
+
+# Start session
+Session::$sessionName = 'poche';
+Session::init();
 
 # Start Poche
 $poche = new Poche();
@@ -30,7 +33,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()
 );
@@ -75,6 +78,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();
@@ -115,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)