From: Nicolas LÅ“uillet Date: Thu, 24 Jul 2014 19:41:01 +0000 (+0200) Subject: 1.7.2 X-Git-Tag: 1.7.2^2 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=38cf3413dfe156ced4f5f3a8c792cef69e2735f7;p=github%2Fwallabag%2Fwallabag.git 1.7.2 --- diff --git a/index.php b/index.php index 2c532c0e..b2ab1461 100755 --- a/index.php +++ b/index.php @@ -8,7 +8,7 @@ * @license http://www.wtfpl.net/ see COPYING file */ -define ('POCHE', '1.7.1'); +define ('POCHE', '1.7.2'); require 'check_setup.php'; require_once 'inc/poche/global.inc.php'; @@ -72,39 +72,39 @@ if (isset($_GET['login'])) { 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); + 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);