From 764be9f0b7bc3a53a8781a3d744cdb162949350b Mon Sep 17 00:00:00 2001 From: xisi Date: Wed, 15 Jan 2014 19:54:38 -0500 Subject: [PATCH] fixed verbiage --- public/include/config/global.inc.dist.php | 4 ++-- public/include/pages/login.inc.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/include/config/global.inc.dist.php b/public/include/config/global.inc.dist.php index 3c6cddae..6ccf2b84 100644 --- a/public/include/config/global.inc.dist.php +++ b/public/include/config/global.inc.dist.php @@ -129,8 +129,8 @@ $config['twofactor']['options']['changepw'] = true; * * Explanation: * To help protect against CSRF, we can generate a hash that changes every minute - * and is unique for each user/IP and page or use, and check against that when - * the form is submitted. + * and is unique for each user/IP and page or use, and check against that when a + * form is submitted. * * Options: * enabled = Whether or not we will generate/check for valid CSRF tokens diff --git a/public/include/pages/login.inc.php b/public/include/pages/login.inc.php index f1758eb4..027c1e04 100644 --- a/public/include/pages/login.inc.php +++ b/public/include/pages/login.inc.php @@ -25,7 +25,7 @@ if ($setting->getValue('maintenance') && !$user->isAdmin($user->getUserId($_POST $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to login: '. $user->getError(), 'TYPE' => 'errormsg'); } } else { - $_SESSION['POPUP'][] = array('CONTENT' => 'Login token expired'. $user->getError(), 'TYPE' => 'errormsg'); + $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to login: Token expired', 'TYPE' => 'errormsg'); } } else if (@$_POST['username'] && @$_POST['password']) { $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to login: '. $user->getError(), 'TYPE' => 'errormsg');