Merge branch 'memiks-gestion_erreur_readability' into dev

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

diff --git a/index.php b/index.php
index 954d922473808a9af4086d98a0ef81637a132cd0..829d5513542789bf4c220cb457ca22f0f12bb166 100644 (file)
--- 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'])) {
@@ -27,6 +27,7 @@ if (isset($_GET['login'])) {
     if (!empty($_POST['login']) && !empty($_POST['password'])) {
         if (Session::login('poche', 'poche', $_POST['login'], $_POST['password'])) {
             logm('login successful');
+            $msg->add('s', 'welcome in your pocket!');
             if (!empty($_POST['longlastingsession'])) {
                 $_SESSION['longlastingsession'] = 31536000;
                 $_SESSION['expires_on'] = time() + $_SESSION['longlastingsession'];
@@ -61,7 +62,7 @@ $url                = (isset ($_GET['url'])) ? $_GET['url'] : '';
 $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()) {