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

Ajax pages: exceptions are traced into error.log

Browse Source 
SVN:trunk[970]
This commit is contained in:
Romain Quetiez
2010-11-24 14:00:24 +00:00
parent ff112faf5a
commit 35c50d6689
2 changed files with 523 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pages/ajax.csvimport.php
View File

@@ -208,16 +208,18 @@ function GetMappingForField($sClassName, $sFieldName, $iFieldIndex, $bAdvancedMo
return $sHtml; return $sHtml;
} }
require_once(APPROOT.'/application/startup.inc.php'); try
require_once(APPROOT.'/application/loginwebpage.class.inc.php');
LoginWebPage::DoLogin(); // Check user rights and prompt if needed
$sOperation = utils::ReadParam('operation', '');
switch($sOperation)
{ {
require_once(APPROOT.'/application/startup.inc.php');
require_once(APPROOT.'/application/loginwebpage.class.inc.php');
LoginWebPage::DoLogin(); // Check user rights and prompt if needed
$sOperation = utils::ReadParam('operation', '');
switch($sOperation)
{
case 'parser_preview': case 'parser_preview':
$oPage = new ajax_page(""); $oPage = new ajax_page("");
$oPage->no_cache(); $oPage->no_cache();
@@ -404,6 +406,12 @@ EOF
$oPage->add('<p><textarea rows="5" cols="100">'.$sResult.'</textarea></p>'); $oPage->add('<p><textarea rows="5" cols="100">'.$sResult.'</textarea></p>');
} }
break; break;
}
$oPage->output();
} }
$oPage->output(); catch (Exception $e)
{
IssueLog::Error($e->getMessage());
}
?> ?>

44
pages/ajax.render.php
View File

@@ -31,23 +31,25 @@ require_once(APPROOT.'/application/wizardhelper.class.inc.php');
require_once(APPROOT.'/application/ui.linkswidget.class.inc.php'); require_once(APPROOT.'/application/ui.linkswidget.class.inc.php');
require_once(APPROOT.'/application/ui.autocompletewidget.class.inc.php'); require_once(APPROOT.'/application/ui.autocompletewidget.class.inc.php');
require_once(APPROOT.'/application/startup.inc.php'); try
require_once(APPROOT.'/application/user.preferences.class.inc.php');
require_once(APPROOT.'/application/loginwebpage.class.inc.php');
LoginWebPage::DoLogin(false /* bMustBeAdmin */, true /* IsAllowedToPortalUsers */); // Check user rights and prompt if needed
$oPage = new ajax_page("");
$oPage->no_cache();
$operation = utils::ReadParam('operation', '');
$sFilter = stripslashes(utils::ReadParam('filter', ''));
$sEncoding = utils::ReadParam('encoding', 'serialize');
$sClass = utils::ReadParam('class', 'MissingAjaxParam');
$sStyle = utils::ReadParam('style', 'list');
switch($operation)
{ {
require_once(APPROOT.'/application/startup.inc.php');
require_once(APPROOT.'/application/user.preferences.class.inc.php');
require_once(APPROOT.'/application/loginwebpage.class.inc.php');
LoginWebPage::DoLogin(false /* bMustBeAdmin */, true /* IsAllowedToPortalUsers */); // Check user rights and prompt if needed
$oPage = new ajax_page("");
$oPage->no_cache();
$operation = utils::ReadParam('operation', '');
$sFilter = stripslashes(utils::ReadParam('filter', ''));
$sEncoding = utils::ReadParam('encoding', 'serialize');
$sClass = utils::ReadParam('class', 'MissingAjaxParam');
$sStyle = utils::ReadParam('style', 'list');
switch($operation)
{
case 'addObjects': case 'addObjects':
require_once(APPROOT.'/application/uilinkswizard.class.inc.php'); require_once(APPROOT.'/application/uilinkswizard.class.inc.php');
$sClass = utils::ReadParam('class', '', 'get'); $sClass = utils::ReadParam('class', '', 'get');
@@ -390,8 +392,16 @@ switch($operation)
default: default:
$oPage->p("Invalid query."); $oPage->p("Invalid query.");
}
$oPage->output();
} }
$oPage->output(); catch (Exception $e)
{
IssueLog::Error($e->getMessage());
}
/** /**
* Downloads a document to the browser, either as 'inline' or 'attachment' * Downloads a document to the browser, either as 'inline' or 'attachment'