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

Merge remote-tracking branch 'origin/master' into develop

Browse Source 
# Conflicts:
#	css/css-variables.scss
#	css/light-grey.css
#	datamodels/2.x/version.xml
This commit is contained in:
Pierre Goiffon
2019-03-21 17:46:30 +01:00
parent 9bb365e60d cac0da4e3d
commit 2a0928b4be
31 changed files with 107 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
application/utils.inc.php
View File

@@ -273,79 +273,93 @@ class utils
}
return $retValue;
}
/**
* @param string|string[] $value
* @param string $sSanitizationFilter one of : integer, class, string, context_param, parameter, field_name,
* transaction_id, parameter, raw_data
*
* @return string|string[]|bool boolean for :
* * the 'class' filter (true if valid, false otherwise)
* * if the filter fails (@see \filter_var())
*
* @since 2.5.2 2.6.0 new 'transaction_id' filter
*/
protected static function Sanitize_Internal($value, $sSanitizationFilter)
{
switch($sSanitizationFilter)
switch ($sSanitizationFilter)
{
case 'integer':
$retValue = filter_var($value, FILTER_SANITIZE_NUMBER_INT);
break;
$retValue = filter_var($value, FILTER_SANITIZE_NUMBER_INT);
break;
case 'class':
$retValue = $value;
if (!MetaModel::IsValidClass($value))
{
$retValue = false;
}
break;
$retValue = $value;
if (!MetaModel::IsValidClass($value))
{
$retValue = false;
}
break;
case 'string':
$retValue = filter_var($value, FILTER_SANITIZE_SPECIAL_CHARS);
break;
$retValue = filter_var($value, FILTER_SANITIZE_SPECIAL_CHARS);
break;
case 'context_param':
case 'parameter':
case 'field_name':
if (is_array($value))
{
$retValue = array();
foreach($value as $key => $val)
if (is_array($value))
{
$retValue[$key] = self::Sanitize_Internal($val, $sSanitizationFilter); // recursively check arrays
if ($retValue[$key] === false)
$retValue = array();
foreach ($value as $key => $val)
{
$retValue = false;
break;
$retValue[$key] = self::Sanitize_Internal($val, $sSanitizationFilter); // recursively check arrays
if ($retValue[$key] === false)
{
$retValue = false;
break;
}
}
}
}
else
{
switch($sSanitizationFilter)
else
{
case 'transaction_id':
// same as parameter type but keep the dot character
// see N°1835 : when using file transaction_id on Windows you get *.tmp tokens
// it must be included at the regexp beginning otherwise you'll get an invalid character error
$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
array("options" => array("regexp" => '/^[\. A-Za-z0-9_=-]*$/')));
break;
switch ($sSanitizationFilter)
{
case 'transaction_id':
// same as parameter type but keep the dot character
// see N°1835 : when using file transaction_id on Windows you get *.tmp tokens
// it must be included at the regexp beginning otherwise you'll get an invalid character error
$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
array("options" => array("regexp" => '/^[\. A-Za-z0-9_=-]*$/')));
break;
case 'parameter':
$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
array("options" => array("regexp" => '/^[ A-Za-z0-9_=-]*$/'))); // the '=', '%3D, '%2B', '%2F'
// characters are used in serialized filters (starting 2.5, only the url encoded versions are presents, but the "=" is kept for BC)
break;
case 'parameter':
$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
array("options" => array("regexp" => '/^[ A-Za-z0-9_=-]*$/'))); // the '=', '%3D, '%2B', '%2F'
// characters are used in serialized filters (starting 2.5, only the url encoded versions are presents, but the "=" is kept for BC)
break;
case 'field_name':
$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options"=>array("regexp"=>'/^[A-Za-z0-9_]+(->[A-Za-z0-9_]+)*$/'))); // att_code or att_code->name or AttCode->Name or AttCode->Key2->Name
break;
case 'context_param':
$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options"=>array("regexp"=>'/^[ A-Za-z0-9_=%:+-]*$/')));
break;
case 'field_name':
$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
array("options" => array("regexp" => '/^[A-Za-z0-9_]+(->[A-Za-z0-9_]+)*$/'))); // att_code or att_code->name or AttCode->Name or AttCode->Key2->Name
break;
case 'context_param':
$retValue = filter_var($value, FILTER_VALIDATE_REGEXP,
array("options" => array("regexp" => '/^[ A-Za-z0-9_=%:+-]*$/')));
break;
}
}
}
break;
break;
default:
case 'raw_data':
$retValue = $value;
$retValue = $value;
// Do nothing
}
return $retValue;
return $retValue;
}
/**

15
core/metamodel.class.php
View File

@@ -635,7 +635,7 @@ abstract class MetaModel
* @param string $sRootClass
* @param string $sRuleId
*
* @return string[] child classes with the rule disabled
* @return string[] child classes with the rule disabled, and that are concrete classes
*
* @throws \CoreException
* @since 2.6.1 N°1968 (soyez réalistes, demandez l'impossible)
@@ -645,6 +645,10 @@ abstract class MetaModel
$aClassesWithDisabledRule = array();
foreach (self::EnumChildClasses($sRootClass, ENUM_CHILD_CLASSES_EXCLUDETOP) as $sChildClass)
{
if (array_key_exists($sChildClass, $aClassesWithDisabledRule))
{
continue;
}
if (!array_key_exists('uniqueness_rules', self::$m_aClassParams[$sChildClass]))
{
continue;
@@ -656,7 +660,14 @@ abstract class MetaModel
if (self::$m_aClassParams[$sChildClass]['uniqueness_rules'][$sRuleId]['disabled'] === true)
{
$aClassesWithDisabledRule[] = $sChildClass;
$aDisabledClassChildren = self::EnumChildClasses($sChildClass, ENUM_CHILD_CLASSES_ALL);
foreach ($aDisabledClassChildren as $sDisabledClassChild)
{
if (!self::IsAbstract($sDisabledClassChild))
{
$aClassesWithDisabledRule[] = $sDisabledClassChild;
}
}
}
}

2
datamodels/2.x/authent-external/module.authent-external.php
View File

@@ -27,7 +27,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'authent-external/2.6.0',
'authent-external/2.6.1',
array(
// Identification
//

2
datamodels/2.x/authent-ldap/module.authent-ldap.php
View File

@@ -9,7 +9,7 @@ if (function_exists('ldap_connect'))
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'authent-ldap/2.6.0',
'authent-ldap/2.6.1',
array(
// Identification
//

2
datamodels/2.x/authent-local/module.authent-local.php
View File

@@ -3,7 +3,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'authent-local/2.6.0',
'authent-local/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-attachments/module.attachments.php
View File

@@ -19,7 +19,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-attachments/2.6.0',
'itop-attachments/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-backup/module.itop-backup.php
View File

@@ -3,7 +3,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-backup/2.6.0',
'itop-backup/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
View File

@@ -3,7 +3,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-bridge-virtualization-storage/2.6.0',
'itop-bridge-virtualization-storage/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
View File

@@ -3,7 +3,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-change-mgmt-itil/2.6.0',
'itop-change-mgmt-itil/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
View File

@@ -3,7 +3,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-change-mgmt/2.6.0',
'itop-change-mgmt/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
View File

@@ -3,7 +3,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-config-mgmt/2.6.0',
'itop-config-mgmt/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-config/module.itop-config.php
View File

@@ -3,7 +3,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-config/2.6.0',
'itop-config/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php
View File

@@ -18,7 +18,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-datacenter-mgmt/2.6.0',
'itop-datacenter-mgmt/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php
View File

@@ -25,7 +25,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-endusers-devices/2.6.0',
'itop-endusers-devices/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-full-itil/module.itop-full-itil.php
View File

@@ -6,7 +6,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-full-itil/2.6.0', array(
'itop-full-itil/2.6.1', array(
// Identification
//
'label' => 'Bridge - Request management ITIL + Incident management ITIL',

2
datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
View File

@@ -5,7 +5,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-hub-connector/2.6.0',
'itop-hub-connector/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
View File

@@ -3,7 +3,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-incident-mgmt-itil/2.6.0',
'itop-incident-mgmt-itil/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
View File

@@ -3,7 +3,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-knownerror-mgmt/2.6.0',
'itop-knownerror-mgmt/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-portal-base/module.itop-portal-base.php
View File

@@ -2,7 +2,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-portal-base/2.6.0', array(
'itop-portal-base/2.6.1', array(
// Identification
'label' => 'Portal Development Library',
'category' => 'Portal',

2
datamodels/2.x/itop-portal/module.itop-portal.php
View File

@@ -2,7 +2,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-portal/2.6.0', array(
'itop-portal/2.6.1', array(
// Identification
'label' => 'Enhanced Customer Portal',
'category' => 'Portal',

2
datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
View File

@@ -3,7 +3,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-problem-mgmt/2.6.0',
'itop-problem-mgmt/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
View File

@@ -19,7 +19,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-profiles-itil/2.6.0',
'itop-profiles-itil/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
View File

@@ -3,7 +3,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-request-mgmt-itil/2.6.0',
'itop-request-mgmt-itil/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
View File

@@ -3,7 +3,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-request-mgmt/2.6.0',
'itop-request-mgmt/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
View File

@@ -3,7 +3,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-service-mgmt-provider/2.6.0',
'itop-service-mgmt-provider/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
View File

@@ -3,7 +3,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-service-mgmt/2.6.0',
'itop-service-mgmt/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php
View File

@@ -18,7 +18,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-sla-computation/2.6.0',
'itop-sla-computation/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php
View File

@@ -25,7 +25,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-storage-mgmt/2.6.0',
'itop-storage-mgmt/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-tickets/module.itop-tickets.php
View File

@@ -3,7 +3,7 @@
SetupWebPage::AddModule(
__FILE__,
'itop-tickets/2.6.0',
'itop-tickets/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php
View File

@@ -16,7 +16,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-virtualization-mgmt/2.6.0',
'itop-virtualization-mgmt/2.6.1',
array(
// Identification
//

2
datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
View File

@@ -3,7 +3,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-welcome-itil/2.6.0',
'itop-welcome-itil/2.6.1',
array(
// Identification
//