X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=index.php;h=472e0fabc20e3d34885367999e7258fd7a187567;hb=a9f5e572dde4f986a498d2fbe92a38a1b22f9595;hp=06ab7d3c0b873c00133bfa644224359e9f431135;hpb=71b0d53c5e5d44a928870f7c98beac7b34199ba0;p=github%2Fwallabag%2Fwallabag.git
diff --git a/index.php b/index.php
old mode 100644
new mode 100755
index 06ab7d3c..472e0fab
--- a/index.php
+++ b/index.php
@@ -8,10 +8,14 @@
* @license http://www.wtfpl.net/ see COPYING file
*/
-define ('POCHE', '1.5.3');
+define ('POCHE', '1.7.0');
require 'check_setup.php';
require_once 'inc/poche/global.inc.php';
+# Start session
+Session::$sessionName = 'poche';
+Session::init();
+
# Start Poche
$poche = new Poche();
$notInstalledMessage = $poche -> getNotInstalledMessage();
@@ -36,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 '
Errors
';
foreach ($notInstalledMessage as $message) {
echo '- ' . $message . '
';
@@ -62,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'])) {
@@ -74,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();
@@ -114,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)