X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=a60e4e941704c14a64f9a66c24a2cb7b9dea01e8;hb=572e758bf2e76308a3fa3eda9a8d9e9be8b53ecc;hp=d0dd4ab5070da8150299509dedbe949423602965;hpb=6fb3a2a18591a4c79e91a90282d88cd84554f83c;p=github%2Fwallabag%2Fwallabag.git diff --git a/index.php b/index.php index d0dd4ab5..a60e4e94 100644 --- a/index.php +++ b/index.php @@ -10,13 +10,15 @@ include dirname(__FILE__).'/inc/poche/config.inc.php'; +# Parse GET & REFERER vars $referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER']; $view = Tools::checkVar('view', 'home'); $action = Tools::checkVar('action'); $id = Tools::checkVar('id'); -$_SESSION['sort'] = Tools::checkVar('sort'); +$_SESSION['sort'] = Tools::checkVar('sort', 'id'); $url = new Url((isset ($_GET['url'])) ? $_GET['url'] : ''); +# poche actions if (isset($_GET['login'])) { # hello you $poche->login($referer); @@ -30,12 +32,13 @@ elseif (isset($_GET['config'])) { $poche->updatePassword(); } elseif (isset($_GET['import'])) { - $poche->import($_GET['from']); + $import = $poche->import($_GET['from']); } elseif (isset($_GET['export'])) { $poche->export(); } +# vars to send to templates $tpl_vars = array( 'referer' => $referer, 'view' => $view, @@ -57,5 +60,5 @@ else { $messages = $poche->messages->display('all', FALSE); $tpl_vars = array_merge($tpl_vars, array('messages' => $messages)); -# Aaaaaaand action ! +# display poche echo $poche->tpl->render($tpl_file, $tpl_vars); \ No newline at end of file