lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix action into actionlogin to avoid conflict

Browse Source
This commit is contained in:
Laurent Destailleur 2019-11-20 16:42:18 +01:00
parent 70882a749a
commit 58c38912ab
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/tpl/login.tpl.php
View File

@ -91,7 +91,7 @@ $(document).ready(function () {
<form id="login" name="login" method="post" action="<?php echo $php_self; ?>"> <form id="login" name="login" method="post" action="<?php echo $php_self; ?>">
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" /> <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
<input type="hidden" name="action" value="login"> <input type="hidden" name="actionlogin" value="login">
<input type="hidden" name="loginfunction" value="loginfunction" /> <input type="hidden" name="loginfunction" value="loginfunction" />
<!-- Add fields to send local user information --> <!-- Add fields to send local user information -->
<input type="hidden" name="tz" id="tz" value="" /> <input type="hidden" name="tz" id="tz" value="" />

6
htdocs/main.inc.php
View File

@ -553,7 +553,7 @@ if (!defined('NOLOGIN'))
// Validation of login/pass/entity // Validation of login/pass/entity
// If ok, the variable login will be returned // If ok, the variable login will be returned
// If error, we will put error message in session under the name dol_loginmesg // If error, we will put error message in session under the name dol_loginmesg
if ($test && $goontestloop && GETPOST('action', 'aZ09') == 'login') if ($test && $goontestloop && GETPOST('actionlogin', 'aZ09') == 'login')
{ {
$login = checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode); $login = checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode);
if ($login) if ($login)
@ -611,8 +611,8 @@ if (!defined('NOLOGIN'))
// End test login / passwords // End test login / passwords
if (! $login || (in_array('ldap', $authmode) && empty($passwordtotest))) // With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success. if (! $login || (in_array('ldap', $authmode) && empty($passwordtotest))) // With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
{ {
// No data to test login, so we show the login page // No data to test login, so we show the login page.
dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." - action=".GETPOST('action', 'aZ09').", showing the login form and exit"); dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." - action=".GETPOST('action', 'aZ09')." - actionlogin=".GETPOST('actionlogin', 'aZ09')." - showing the login form and exit");
if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED'; if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';
else dol_loginfunction($langs, $conf, (! empty($mysoc)?$mysoc:'')); else dol_loginfunction($langs, $conf, (! empty($mysoc)?$mysoc:''));
exit; exit;