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

trying to work arround "PHP Fatal error: Cannot unset string offsets in /usr/share/egroupware/importexport/inc/class.importexport_schedule_ui.inc.php on line 444"

Browse Source
This commit is contained in:
Ralf Becker 2012-03-13 10:23:59 +00:00
parent 57730480a7
commit 9319cfd8c4
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -423,16 +423,10 @@
if(is_dir($data['target'])) if(is_dir($data['target']))
{ {
$dir = opendir($data['target']); $targets = array();
$contents = array(); foreach(scandir($data['target']) as $target)
while(false !== ($item = readdir($dir))) {
$contents[] = $item;
}
closedir($dir);
$targets = array_diff($contents, array('.','..'));
$files = array();
foreach($targets as $key => &$target)
{ {
if ($target == '.' || $target == '..') continue;
$target = $data['target'].(substr($data['target'],-1) == '/' ? '' : '/').$target; $target = $data['target'].(substr($data['target'],-1) == '/' ? '' : '/').$target;
// Check modification time, make sure it's not currently being written // Check modification time, make sure it's not currently being written
@ -441,17 +435,14 @@
if($mod_time >= time() - 10) if($mod_time >= time() - 10)
{ {
$data['result'][$target] = lang('Skipped'); $data['result'][$target] = lang('Skipped');
unset($target[$key]);
continue; continue;
} }
$files[$mod_time.$target] = $target; $targets[$mod_time.$target] = $target;
} }
if($files) if($targets)
{ {
ksort($files); ksort($targets);
} }
$targets = $files;
unset($target); // Unset it, or it will be overwritten in loop below
} }
else else
{ {