extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 16:33:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Fix handling of multiple delegated users

Browse Source 
- Give error if foreign custom field can't be found
This commit is contained in:
Nathan Gray 2012-01-23 15:15:29 +00:00
parent 62433c2e26
commit 4ab9c5ed1f
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
infolog/inc/class.infolog_import_infologs_csv.inc.php
View File

@ -198,6 +198,10 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
$record['info_owner'] = $_definition->plugin_options['record_owner'];
}
if (!isset($record['info_owner'])) $record['info_owner'] = $GLOBALS['egw_info']['user']['account_id'];
// Responsible has to be an array
$record['info_responsible'] = $record['info_responsible'] ? explode(',',$record['info_responsible']) : 0;
// Special values
if ($record['addressbook'] && !is_numeric($record['addressbook']))
{
@ -511,18 +515,26 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
if($app && $custom_field && $value)
{
$cfs = config::get_customfields($app);
// Error if no custom fields, probably something wrong in definition
if(!$cfs[$custom_field])
{
// Check for users specifing label instead of name
foreach($cfs as $name => $settings)
{
if($settings['label'] == $custom_field)
if(strtolower($settings['label']) == strtolower($custom_field))
{
$custom_field = $name;
break;
}
}
}
// Couldn't find field, give an error - something's wrong
if(!$cfs[$custom_field] && !$cfs[substr($custom_field,1)]) {
$this->errors[$record_num] .= lang('No custom field "%1" for %2.',
$custom_field, lang($app));
return false;
}
if($custom_field[0] != '#') $custom_field = '#' . $custom_field;
// Search