Merge branch 'dev'

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

diff --git a/index.php b/index.php
index 9a81a74104f2f739fa5e059c4915bacdf923a687..0a778d0843f2fd20c55be7f1f089f3c1cf537aa4 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'])) {
@@ -20,11 +20,14 @@ 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'])) {
-        if (Session::login('poche', 'poche', $_POST['login'], $_POST['password'])) {
+        if (Session::login($_SESSION['login'], $_SESSION['pass'], $_POST['login'], encode_string($_POST['password'] . $_POST['login']))) {
             logm('login successful');
+            $msg->add('s', 'welcome in your poche!');
             if (!empty($_POST['longlastingsession'])) {
                 $_SESSION['longlastingsession'] = 31536000;
                 $_SESSION['expires_on'] = time() + $_SESSION['longlastingsession'];
@@ -34,7 +37,7 @@ if (isset($_GET['login'])) {
             }
             session_regenerate_id(true);
 
-            MyTool::redirect();
+            MyTool::redirect($ref);
         }
         logm('login failed');
         die("Login failed !");
@@ -47,6 +50,22 @@ elseif (isset($_GET['logout'])) {
     Session::logout();
     MyTool::redirect();
 }
+elseif  (isset($_GET['config'])) {
+    if (isset($_POST['password']) && isset($_POST['password_repeat'])) {
+        if ($_POST['password'] == $_POST['password_repeat'] && $_POST['password'] != "") {
+            logm('password updated');
+            if (!DEMO) {
+                $store->updatePassword(encode_string($_POST['password'] . $_SESSION['login']));
+                $msg->add('s', 'your password has been updated');
+            }
+            else {
+                $msg->add('i', 'in demo mode, you can\'t update password');
+            }
+        }
+        else
+            $msg->add('e', 'your password can\'t be empty and you have to repeat it in the second field');
+    }
+}
 
 # Traitement des paramètres et déclenchement des actions
 $view               = (isset ($_REQUEST['view'])) ? htmlentities($_REQUEST['view']) : 'index';
@@ -55,12 +74,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 +87,4 @@ if (Session::isLogged()) {
 }
 else {
     $tpl->draw('login');
-}
\ No newline at end of file
+}