Merge branch 'dev' of https://github.com/wallabag/wallabag into dev

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

diff --git a/index.php b/index.php
index 60755cf70bf0ff0266e6497655019382a8fd977b..5ca8bef5b3de0af9c49a2737cd8859efd034c5c2 100644 (file)
--- a/index.php
+++ b/index.php
@@ -8,9 +8,9 @@
  * @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 Poche
 $poche = new Poche();
@@ -29,7 +29,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()
 );
@@ -65,13 +65,17 @@ if (isset($_GET['login'])) {
 } elseif (isset($_GET['import'])) {
     $import = $poche->import($_GET['from']);
 } elseif (isset($_GET['download'])) {
-    Tools::download_db();;
+    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'])) {
     if (isset($_GET['action']) && $_GET['action'] == 'generate') {
         $poche->generateToken();