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

Fix exporting to a directory

Browse Source
This commit is contained in:
Nathan Gray 2012-04-17 15:40:34 +00:00
parent df1f6b2ff4
commit dff86e4842
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
importexport/inc/class.importexport_schedule_ui.inc.php
View File

@ -344,9 +344,9 @@
*/
private static function is__writable($path) {
if ($path{strlen($path)-1}=='/') // recursively return a temporary file path
return is__writable($path.uniqid(mt_rand()).'.tmp');
return self::is__writable($path.uniqid(mt_rand()).'.tmp');
else if (is_dir($path))
return is__writable($path.'/'.uniqid(mt_rand()).'.tmp');
return self::is__writable($path.'/'.uniqid(mt_rand()).'.tmp');
// check tmp file for read/write capabilities
$rm = file_exists($path);
$f = @fopen($path, 'a');
@ -423,25 +423,33 @@
if(is_dir($data['target']))
{
$targets = array();
foreach(scandir($data['target']) as $target)
if($data['type'] == 'import')
{
if ($target == '.' || $target == '..') continue;
$target = $data['target'].(substr($data['target'],-1) == '/' ? '' : '/').$target;
// Check modification time, make sure it's not currently being written
// Skip files modified in the last 10 seconds
$mod_time = filemtime($target);
if($mod_time >= time() - 10)
$targets = array();
foreach(scandir($data['target']) as $target)
{
$data['result'][$target] = lang('Skipped');
continue;
if ($target == '.' || $target == '..') continue;
$target = $data['target'].(substr($data['target'],-1) == '/' ? '' : '/').$target;
// Check modification time, make sure it's not currently being written
// Skip files modified in the last 10 seconds
$mod_time = filemtime($target);
if($mod_time >= time() - 10)
{
$data['result'][$target] = lang('Skipped');
continue;
}
$targets[$mod_time.$target] = $target;
}
if($targets)
{
ksort($targets);
}
$targets[$mod_time.$target] = $target;
}
if($targets)
else
{
ksort($targets);
// Create a unique file for export
$targets = array($data['target'].uniqid($definition->name).'.'.$po->get_filesuffix());
}
}
else