composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-19 16:48:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°1277 Portal: Improve error reporting when user with no associated contact logs in the portal.

Browse Source 
SVN:trunk[5276]
This commit is contained in:
Guillaume Lajarige
2018-01-17 12:31:05 +00:00
parent ae59780297
commit e6ab3ac9f9
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
datamodels/2.x/itop-portal-base/portal/web/index.php
View File

@@ -84,17 +84,19 @@ $oApp->register(new Silex\Provider\HttpFragmentServiceProvider());
$oKPI->ComputeAndReport('Initialization of the Silex application');
$oApp->before(function(Symfony\Component\HttpFoundation\Request $oRequest, Silex\Application $oApp) use ($bDebug){
// Checking user rights and prompt if needed (401 HTTP code returned if XHR request)
// User pre-checks
// Note: At this point the Exception handler is not registered, so we can't use $oApp::abort() method, hence the die().
// - Checking user rights and prompt if needed (401 HTTP code returned if XHR request)
$iExitMethod = ($oRequest->isXmlHttpRequest()) ? LoginWebPage::EXIT_RETURN : LoginWebPage::EXIT_PROMPT;
$iLogonRes = LoginWebPage::DoLoginEx(PORTAL_ID, false, $iExitMethod);
if( ($iExitMethod === LoginWebPage::EXIT_RETURN) && ($iLogonRes != 0) )
{
$oApp->abort(401, Dict::S('Portal:ErrorUserLoggedOut'));
die(Dict::S('Portal:ErrorUserLoggedOut'));
}
// - User must be associated with a Contact
if (UserRights::GetContactId() == 0)
{
$oApp->abort(500, Dict::S('Portal:ErrorNoContactForThisUser'));
die(Dict::S('Portal:ErrorNoContactForThisUser'));
}
// Enable archived data