1 files changed, 7 insertions, 6 deletions

diff --git a/index.php b/index.php
index 9a81a741..6eefd277 100644
--- a/index.php
+++ b/index.php
@@ -10,8 +10,8 @@
 
 include dirname(__FILE__).'/inc/config.php';
 
-# initialize session
-Session::init();
+myTool::initPhp();
+
 # XSRF protection with token
 if (!empty($_POST)) {
     if (!Session::isToken($_POST['token'])) {
@@ -20,6 +20,8 @@ if (!empty($_POST)) {
     unset($_SESSION['tokens']);
 }
 
+$ref = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
+
 if (isset($_GET['login'])) {
     // Login
     if (!empty($_POST['login']) && !empty($_POST['password'])) {
@@ -34,7 +36,7 @@ if (isset($_GET['login'])) {
             }
             session_regenerate_id(true);
 
-            MyTool::redirect();
+            MyTool::redirect($ref);
         }
         logm('login failed');
         die("Login failed !");
@@ -55,12 +57,11 @@ $action             = (isset ($_REQUEST['action'])) ? htmlentities($_REQUEST['ac
 $_SESSION['sort']   = (isset ($_REQUEST['sort'])) ? htmlentities($_REQUEST['sort']) : 'id';
 $id                 = (isset ($_REQUEST['id'])) ? htmlspecialchars($_REQUEST['id']) : '';
 $url                = (isset ($_GET['url'])) ? $_GET['url'] : '';
-$ref                = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
 
 $tpl->assign('isLogged', Session::isLogged());
 $tpl->assign('referer', $ref);
 $tpl->assign('view', $view);
-$tpl->assign('poche_url', get_poche_url());
+$tpl->assign('poche_url', myTool::getUrl());
 $tpl->assign('title', 'poche, a read it later open source system');
 
 if (Session::isLogged()) {
@@ -69,4 +70,4 @@ if (Session::isLogged()) {
 }
 else {
     $tpl->draw('login');
-}
\ No newline at end of file
+}