holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hold on to import file while doing dry run, so user can just click import again

Browse Source
This commit is contained in:
Nathan Gray 2011-12-20 19:01:16 +00:00
parent d37ee80161
commit 3b2862a63b
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
importexport/inc/class.importexport_import_ui.inc.php
View File

@ -56,15 +56,31 @@
$content['delimiter'] == 'other' ? $content['other_delimiter'] : $content['delimiter']; $content['delimiter'] == 'other' ? $content['other_delimiter'] : $content['delimiter'];
$definition_obj->plugin_options = $options; $definition_obj->plugin_options = $options;
} }
$plugin = new $definition_obj->plugin; $plugin = new $definition_obj->plugin;
$file = fopen($content['file']['tmp_name'], 'r'); $file = fopen($content['file']['tmp_name'], 'r');
// Some of the translation, conversion, etc look here // Some of the translation, conversion, etc look here
$GLOBALS['egw_info']['flags']['currentapp'] = $appname; $GLOBALS['egw_info']['flags']['currentapp'] = $appname;
// Destination if we need to hold the file
$cachefile = new egw_cache_files(array());
$dst_file = $cachefile->filename(egw_cache::keys(egw_cache::INSTANCE, 'importexport',
'import_'.md5($content['file']['name'].$GLOBALS['egw_info']['user']['account_id']), true),true);
if($content['dry-run']) if($content['dry-run'])
{ {
echo $this->preview($file, $definition_obj); echo $this->preview($file, $definition_obj);
// Keep file
if($dst_file)
{
if(copy($content['file']['tmp_name'],$dst_file)) {
$preserve['file']['tmp_name'] = $dst_file;
}
}
} elseif ($dst_file && $content['file']['tmp_name'] == $dst_file) {
// Remove file
$cachefile->delete(egw_cache::keys(egw_cache::INSTANCE, 'importexport',
'import_'.md5($content['file']['name'].$GLOBALS['egw_info']['user']['account_id'])));
} }
$count = $plugin->import($file, $definition_obj); $count = $plugin->import($file, $definition_obj);