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

NEW Introduce hidden option MAIN_LANDING_PAGE to decide the home page

Browse Source 
visible just after login.
This commit is contained in:
Laurent Destailleur 2015-10-14 17:18:26 +02:00
parent ca991da312
commit 225313d8ac
1 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
htdocs/main.inc.php
View File

@ -406,10 +406,11 @@ if (! defined('NOLOGIN'))
$langs->load('main'); $langs->load('main');
$langs->load('errors'); $langs->load('errors');
$user->trigger_mesg='ErrorBadValueForCode - login='.GETPOST("username","alpha",2);
$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadValueForCode"); $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadValueForCode");
$test=false; $test=false;
// TODO @deprecated Remove this. Hook must be used, not this trigger.
$user->trigger_mesg='ErrorBadValueForCode - login='.GETPOST("username","alpha",2);
// Call of triggers // Call of triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($db); $interface=new Interfaces($db);
@ -480,11 +481,11 @@ if (! defined('NOLOGIN'))
$langs->load('errors'); $langs->load('errors');
// Bad password. No authmode has found a good password. // Bad password. No authmode has found a good password.
$user->trigger_mesg=$langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username","alpha",2);
// We set a generic message if not defined inside function checkLoginPassEntity or subfunctions // We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword"); if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
// TODO We should use a hook afterLoginFailed here, not a trigger. // TODO @deprecated Remove this. Hook must be used, not this trigger.
$user->trigger_mesg=$langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username","alpha",2);
// Call of triggers // Call of triggers
include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
$interface=new Interfaces($db); $interface=new Interfaces($db);
@ -527,16 +528,19 @@ if (! defined('NOLOGIN'))
$langs->load('main'); $langs->load('main');
$langs->load('errors'); $langs->load('errors');
$user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
$_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login); $_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
// TODO @deprecated Remove this. Hook must be used, not this trigger.
$user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
} }
if ($resultFetchUser < 0) if ($resultFetchUser < 0)
{ {
$user->trigger_mesg=$user->error;
$_SESSION["dol_loginmesg"]=$user->error; $_SESSION["dol_loginmesg"]=$user->error;
// TODO @deprecated Remove this. Hook must be used, not this trigger.
$user->trigger_mesg=$user->error;
} }
// TODO We should use a hook afterLoginFailed here, not a trigger.
// Call triggers // Call triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($db); $interface=new Interfaces($db);
@ -577,16 +581,20 @@ if (! defined('NOLOGIN'))
$langs->load('main'); $langs->load('main');
$langs->load('errors'); $langs->load('errors');
$user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
$_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login); $_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
// TODO @deprecated Remove this. Hook must be used, not this trigger.
$user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
} }
if ($resultFetchUser < 0) if ($resultFetchUser < 0)
{ {
$user->trigger_mesg=$user->error;
$_SESSION["dol_loginmesg"]=$user->error; $_SESSION["dol_loginmesg"]=$user->error;
// TODO @deprecated Remove this. Hook must be used, not this trigger.
$user->trigger_mesg=$user->error;
} }
// TODO We should use a hook here, not a trigger. // TODO @deprecated Remove this. Hook must be used, not this trigger.
// Call triggers // Call triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($db); $interface=new Interfaces($db);
@ -654,9 +662,8 @@ if (! defined('NOLOGIN'))
$loginfo = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"]; $loginfo = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"];
// TODO @deprecated Remove this. Hook must be used, not this trigger.
$user->trigger_mesg = $loginfo; $user->trigger_mesg = $loginfo;
// TODO We should use hook afterLogin here, not a trigger
// Call triggers // Call triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($db); $interface=new Interfaces($db);
@ -684,6 +691,25 @@ if (! defined('NOLOGIN'))
{ {
$db->commit(); $db->commit();
} }
if (! empty($user->conf->MAIN_LANDING_PAGE)) // Example: /index.php
{
$newpath=dol_buildpath($user->conf->MAIN_LANDING_PAGE, 1);
if ($_SERVER["PHP_SELF"] != $newpath) // not already on landing page (avoid infinite loop)
{
header('Location: '.$newpath);
exit;
}
}
if (! empty($conf->global->MAIN_LANDING_PAGE)) // Example: /index.php
{
$newpath=dol_buildpath($conf->global->MAIN_LANDING_PAGE, 1);
if ($_SERVER["PHP_SELF"] != $newpath) // not already on landing page (avoid infinite loop)
{
header('Location: '.$newpath);
exit;
}
}
} }