composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed regressions in the user portal

Browse Source 
SVN:trunk[968]
This commit is contained in:
Romain Quetiez
2010-11-24 09:03:20 +00:00
parent dc3a99200f
commit 5ecbc66d7e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
portal/index.php
View File

@@ -22,6 +22,7 @@
* @author Denis Flaven <denis.flaven@combodo.com> * @author Denis Flaven <denis.flaven@combodo.com>
* @license http://www.opensource.org/licenses/gpl-3.0.html LGPL * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL
*/ */
require_once('../approot.inc.php');
require_once(APPROOT.'/application/application.inc.php'); require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/nicewebpage.class.inc.php'); require_once(APPROOT.'/application/nicewebpage.class.inc.php');
require_once(APPROOT.'/application/wizardhelper.class.inc.php'); require_once(APPROOT.'/application/wizardhelper.class.inc.php');
@@ -715,7 +716,7 @@ function RequestDetails(WebPage $oP, $id)
* @param WebPage $oP The current page, for errors output * @param WebPage $oP The current page, for errors output
* @return Organization The user's org or null in case of problem... * @return Organization The user's org or null in case of problem...
*/ */
function GetUserOrg($oP) function GetUserOrg()
{ {
$oOrg = null; $oOrg = null;
$iContactId = UserRights::GetContactId(); $iContactId = UserRights::GetContactId();
@@ -726,7 +727,7 @@ function GetUserOrg($oP)
} }
else else
{ {
$oP->add("<p class=\"error\">".Dict::S('Portal:ErrorNoContactForThisUser')."</p>"); throw new Exception(Dict::S('Portal:ErrorNoContactForThisUser'));
} }
return $oOrg; return $oOrg;
} }
@@ -741,7 +742,7 @@ try
require_once(APPROOT.'/application/loginwebpage.class.inc.php'); require_once(APPROOT.'/application/loginwebpage.class.inc.php');
LoginWebPage::DoLogin(false /* bMustBeAdmin */, true /* IsAllowedToPortalUsers */); // Check user rights and prompt if needed LoginWebPage::DoLogin(false /* bMustBeAdmin */, true /* IsAllowedToPortalUsers */); // Check user rights and prompt if needed
$oUserOrg = GetUserOrg($oP); $oUserOrg = GetUserOrg();
$sCode = $oUserOrg->Get('code'); $sCode = $oUserOrg->Get('code');
$sAlternateStylesheet = ''; $sAlternateStylesheet = '';