mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00
Code Issues Releases Wiki Activity

Issue #2165: Should fix {EUF: field=country} data rendering.

Browse Source
This commit is contained in:
Cameron
2017-01-24 09:24:10 -08:00
parent e376dd92d9
commit 2640e536ff
1 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
e107_handlers/user_extended_class.php
View File

@@ -260,24 +260,40 @@ class e107_user_extended
function user_extended_validate_entry($val, $params) function user_extended_validate_entry($val, $params)
{ {
$tp = e107::getParser(); $tp = e107::getParser();
$parms = explode('^,^', $params['user_extended_struct_parms']); $parms = explode('^,^', $params['user_extended_struct_parms']);
$requiredField = $params['user_extended_struct_required'] == 1; $requiredField = $params['user_extended_struct_required'] == 1;
$regex = $tp->toText($parms[1]); $regex = $tp->toText($parms[1]);
$regexfail = $tp->toText($parms[2]); $regexfail = $tp->toText($parms[2]);
if (defined($regexfail)) { $regexfail = constant($regexfail); } if(defined($regexfail))
if($val == '' && $requiredField) return TRUE; {
switch ($type) $regexfail = constant($regexfail);
}
if($val == '' && $requiredField)
{
return true;
}
$type = $params['user_extended_struct_type'];
switch($type)
{ {
case EUF_DATE : case EUF_DATE :
if ($requiredField && ($val == '0000-00-00')) return TRUE; if($requiredField && ($val == '0000-00-00'))
{
return true;
}
break; break;
} }
if($regex != "" && $val != "") if($regex != "" && $val != "")
{ {
if(!preg_match($regex, $val)) return $regexfail ? $regexfail : TRUE; if(!preg_match($regex, $val))
{
return $regexfail ? $regexfail : true;
}
} }
return FALSE; // Pass by default here
return false; // Pass by default here
} }
@@ -1180,6 +1196,18 @@ class e107_user_extended
switch($type) switch($type)
{ {
case EUF_COUNTRY:
if(!empty($value))
{
return e107::getForm()->getCountry($value);
}
return null;
break;
case EUF_CHECKBOX: case EUF_CHECKBOX:
$value = e107::unserialize($value); $value = e107::unserialize($value);