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

Merge branch 'support/3.2' into develop

Browse Source
This commit is contained in:
Stephen Abello
2024-12-20 10:16:11 +01:00
parent ea5473ad77 8f8b65a71d
commit 07964cc404
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
datamodels/2.x/itop-portal-base/portal/src/Brick/ObjectBrick.php
View File

@@ -30,7 +30,10 @@ abstract class ObjectBrick extends AbstractBrick
*/
public static function InitializeSelf($aCombodoPortalInstanceConf): void
{
static::LoadClassDefinitionFromPortalProperties($aCombodoPortalInstanceConf['properties']);
if(array_key_exists('properties', $aCombodoPortalInstanceConf))
{
static::LoadClassDefinitionFromPortalProperties($aCombodoPortalInstanceConf['properties']);
}
}
/**

26
webservices/itop.wsdl.php
View File

@@ -17,19 +17,15 @@
* You should have received a copy of the GNU Affero General Public License
*/
if (isset($_REQUEST['debug']))
{
if ($_REQUEST['debug'] == 'text')
{
if (isset($_REQUEST['debug'])) {
if ($_REQUEST['debug'] == 'text') {
header('Content-Type: text/plain; charset=UTF-8');
}
else
{
else {
header('Content-Type: application/xml; charset=UTF-8');
}
}
else
{
else {
// This is to make sure that the client will accept it....
//
header('Content-Type: application/xml; charset=UTF-8');
@@ -48,19 +44,17 @@ require_once(APPROOT.'/application/startup.inc.php');
require_once(APPROOT.'webservices/webservices.basic.php');
if (isset($_REQUEST['service_category']) && (!empty($_REQUEST['service_category'])))
{
$sRawFile = WebServicesBase::GetWSDLContents($_REQUEST['service_category']);
$sServiceCategory = utils::ReadParam('service_category');
if (!empty($sServiceCategory)) {
$sRawFile = WebServicesBase::GetWSDLContents($sServiceCategory);
}
else
{
else {
$sRawFile = WebServicesBase::GetWSDLContents();
}
$sServerURI = utils::GetAbsoluteUrlAppRoot().'webservices/soapserver.php';
if (isset($_REQUEST['service_category']) && (!empty($_REQUEST['service_category'])))
{
$sServerURI .= "?service_category=".$_REQUEST['service_category'];
if (!empty($sServiceCategory)) {
$sServerURI .= "?service_category=".$sServiceCategory;
}
$sFinalFile = str_replace(