Merge branch 'fix/securityMaster'

[github/wallabag/wallabag.git] / index.php

diff --git a/index.php b/index.php
old mode 100644 (file)
new mode 100755 (executable)
index 7ded3bd..b2ab146
--- a/index.php
+++ b/index.php
@@ -8,10 +8,18 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-define ('POCHE', '1.5.0');
+define ('POCHE', '1.7.2');
 require 'check_setup.php';
 require_once 'inc/poche/global.inc.php';
-session_start(); 
+
+# Set error reporting level
+if (defined('ERROR_REPORTING')) {
+       error_reporting(ERROR_REPORTING);
+}
+
+# Start session
+Session::$sessionName = 'poche';
+Session::init();
 
 # Start Poche
 $poche = new Poche();
@@ -30,14 +38,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>';
@@ -55,45 +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['import'])) {
-    $import = $poche->import($_GET['from']);
-} 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['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'], $_GET['user_id'], $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);
@@ -115,6 +132,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)