extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-08 14:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

API/customfields: fix for link-entry validation problems caused by unmotivated/empty default data. This may require a review.

Browse Source
This commit is contained in:
Klaus Leithoff 2012-01-03 16:34:02 +00:00
parent ed9f079fda
commit 2e8ec69619
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
etemplate/inc/class.link_widget.inc.php
View File

@ -537,19 +537,38 @@ class link_widget
$tmpl->set_validation_error($name,lang('Field must not be empty !!!'),''); $tmpl->set_validation_error($name,lang('Field must not be empty !!!'),'');
return true; return true;
} }
$defaultData = false;
// beware: default may be something like Array([link_type] => [query] => [id] => ) so take care for id, in case it is empty AND needed // beware: default may be something like Array([link_type] => [query] => [id] => ) so take care for id, in case it is empty AND needed
if (is_array($extension_data['default']) && !empty($extension_data['default'])) if (is_array($extension_data['default']) && !empty($extension_data['default']))
{
// this may fail, if $extension_data['default'][0] is set on purpose
foreach($extension_data['default'] as $k => $v)
{
if ($v)
{
$defaultData=true;
if ($k==0 && !empty($value_in['id'])) // we have a valid incomming id, we intend to use that
{
$defaultData=false;
continue;
}
break;
}
}
if ($defaultData)
{ {
$value = $extension_data['default']; $value = $extension_data['default'];
$value['current'] = $extension_data['app'] ? $value_in['id'] : $value_in['app'].':'.$value_in['id']; $value['current'] = $extension_data['app'] ? $value_in['id'] : $value_in['app'].':'.$value_in['id'];
// we take care for id, in case it is empty AND needed // we take care for id, in case it is empty AND needed
if(empty($value['id']) && $extension_data['needed']) $value['id'] = $value['current']; if(empty($value['id']) && $extension_data['needed']) $value['id'] = $value['current'];
} }
else }
if($defaultData === false)
{ {
// this was the line before the default opt, not sure it works well in all case // this was the line before the default opt, not sure it works well in all case
$value = $extension_data['app'] ? $value_in['id'] : $value['app'].':'.$value_in['id']; $value = $extension_data['app'] ? $value_in['id'] : $value['app'].':'.$value_in['id'];
} }
//error_log(__METHOD__.__LINE__.array2string(array('return'=>$value)));
return true; return true;
case 'link-apps': case 'link-apps':