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

Merge remote-tracking branch 'origin/support/2.7' into develop

Browse Source 
# Conflicts:
#	webservices/export-v2.php
This commit is contained in:
Stephen Abello
2021-12-02 10:36:16 +01:00
parent dc8c6ed7a9 dab0e372d0
commit f039d54a51
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
webservices/export-v2.php
View File

@@ -503,17 +503,17 @@ function CheckParameters($sExpression, $sQueryId, $sFormat)
catch(MissingQueryArgument $e)
{
$oSearch = null;
ReportErrorAndUsage("Invalid OQL query: '$sExpression'.\n".$e->getMessage());
ReportErrorAndUsage("Invalid OQL query: '".utils::HtmlEntities($sExpression)."'.\n".utils::HtmlEntities($e->getMessage()));
}
catch(OQLException $e)
{
$oSearch = null;
ReportErrorAndExit("Invalid OQL query: '$sExpression'.\n".$e->getMessage());
ReportErrorAndExit("Invalid OQL query: '".utils::HtmlEntities($sExpression)."'.\n".utils::HtmlEntities($e->getMessage()));
}
catch(Exception $e)
{
$oSearch = null;
ReportErrorAndExit($e->getMessage());
ReportErrorAndExit(utils::HtmlEntities($e->getMessage()));
}
$oExporter->SetFormat($sFormat);
@@ -569,7 +569,7 @@ if (utils::IsModeCLI()) {
utils::UseParamFile();
}
catch (Exception $e) {
echo "Error: ".$e->GetMessage()."<br/>\n";
echo "Error: ".utils::HtmlEntities($e->getMessage())."<br/>\n";
exit(EXIT_CODE_FATAL);
}
@@ -660,15 +660,15 @@ if (utils::IsModeCLI()) {
}
catch(MissingQueryArgument $e)
{
ReportErrorAndUsage("Invalid OQL query: '$sExpression'.\n".$e->getMessage());
ReportErrorAndUsage("Invalid OQL query: '$sExpression'.\n".utils::HtmlEntities($e->getMessage()));
}
catch(OQLException $e)
{
ReportErrorAndExit("Invalid OQL query: '$sExpression'.\n".$e->getMessage());
ReportErrorAndExit("Invalid OQL query: '$sExpression'.\n".utils::HtmlEntities($e->getMessage()));
}
catch(Exception $e)
{
ReportErrorAndExit($e->getMessage());
ReportErrorAndExit(utils::HtmlEntities($e->getMessage()));
}
exit;
@@ -725,14 +725,14 @@ try
}
catch (BulkExportMissingParameterException $e) {
$oP = new AjaxPage('iTop Export');
$oP->add($e->getMessage());
$oP->add(utils::HtmlEntities($e->getMessage()));
Usage($oP);
$oP->output();
}
catch (Exception $e) {
$oP = new WebPage('iTop Export');
$oP->add_xframe_options();
$oP->add('Error: '.$e->getMessage());
IssueLog::Error($e->getMessage()."\n".$e->getTraceAsString());
$oP->add('Error: '.utils::HtmlEntities($e->getMessage()));
IssueLog::Error(utils::HtmlEntities($e->getMessage())."\n".$e->getTraceAsString());
$oP->output();
}