X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=472e0fabc20e3d34885367999e7258fd7a187567;hb=a9f5e572dde4f986a498d2fbe92a38a1b22f9595;hp=2c81afd69018ce2eb2161bdbc3c9b9baf3857224;hpb=fb5a9666ed99abe16b8823a98aed1a6dce03bb04;p=github%2Fwallabag%2Fwallabag.git

diff --git a/index.php b/index.php
old mode 100644
new mode 100755
index 2c81afd6..472e0fab
--- a/index.php
+++ b/index.php
@@ -8,10 +8,13 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-define ('POCHE', '1.5.1');
+define ('POCHE', '1.7.0');
 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,14 +33,14 @@ $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()
 );
 
 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>';
@@ -63,8 +66,15 @@ if (isset($_GET['login'])) {
 } 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($_GET['from']);
+    $import = $poche->import();
+    $tpl_vars = array_merge($tpl_vars, $import);
 } elseif (isset($_GET['download'])) {
     Tools::download_db();
 } elseif (isset($_GET['empty-cache'])) {
@@ -75,6 +85,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 +127,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)