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

N°3448 - Framework field size check not correctly implemented for multibytes languages/strings (#528)

Browse Source
This commit is contained in:
Anne-Catherine
2024-01-15 16:10:23 +01:00
committed by GitHub
parent a8cd9566ac
commit cff50f8732
7 changed files with 207 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/dbobject.class.php
View File

@@ -756,9 +756,10 @@ abstract class DBObject implements iDisplay
{
$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
$iMaxSize = $oAttDef->GetMaxSize();
if ($iMaxSize && (strlen($sValue) > $iMaxSize))
{
$sValue = substr($sValue, 0, $iMaxSize);
$sLength = mb_strlen($sValue);
if ($iMaxSize && ($sLength > $iMaxSize)) {
$sMessage = " -truncated ($sLength chars)";
$sValue = mb_substr($sValue, 0, $iMaxSize - mb_strlen($sMessage)).$sMessage;
}
$this->Set($sAttCode, $sValue);
}
@@ -2110,33 +2111,26 @@ abstract class DBObject implements iDisplay
return true;
}
if ($toCheck instanceof ormSet)
{
if ($toCheck instanceof ormSet) {
return true;
}
return "Bad type";
}
elseif ($oAtt->IsScalar())
{
} elseif ($oAtt->IsScalar()) {
$aValues = $oAtt->GetAllowedValues($this->ToArgsForQuery());
if (is_array($aValues) && (count($aValues) > 0))
{
if (!array_key_exists($toCheck, $aValues))
{
if (is_array($aValues) && (count($aValues) > 0)) {
if (!array_key_exists($toCheck, $aValues)) {
return "Value not allowed [$toCheck]";
}
}
if (!is_null($iMaxSize = $oAtt->GetMaxSize()))
{
$iLen = strlen($toCheck);
if ($iLen > $iMaxSize)
{
if (!is_null($iMaxSize = $oAtt->GetMaxSize())) {
$iLen = mb_strlen($toCheck);
if ($iLen > $iMaxSize) {
return "String too long (found $iLen, limited to $iMaxSize)";
}
}
if (!$oAtt->CheckFormat($toCheck))
{
if (!$oAtt->CheckFormat($toCheck)) {
return "Wrong format [$toCheck]";
}
}