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

- Show error details in email

Browse Source 
- Fix 'Array ...deleted' result
- Avoid some warnings from stuff not being arrays
This commit is contained in:
Nathan Gray 2011-12-12 17:23:24 +00:00
parent 2eee7a5119
commit 193267be20
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,11 +30,14 @@
} }
public function index($content = array()) { public function index($content = array()) {
foreach($content['scheduled'] as $row) if(is_array($content['scheduled']))
{ {
if($row['delete']) { foreach($content['scheduled'] as $row)
$key = key($row['delete']); {
ExecMethod('phpgwapi.asyncservice.cancel_timer', $key); if($row['delete']) {
$key = key($row['delete']);
ExecMethod('phpgwapi.asyncservice.cancel_timer', $key);
}
} }
} }
$async_list = ExecMethod('phpgwapi.asyncservice.read', 'importexport%'); $async_list = ExecMethod('phpgwapi.asyncservice.read', 'importexport%');
@ -375,9 +378,10 @@
} }
closedir($dir); closedir($dir);
$targets = array_diff($contents, array('.','..')); $targets = array_diff($contents, array('.','..'));
$files = array();
foreach($targets as $key => &$target) foreach($targets as $key => &$target)
{ {
$target = $data['target'].'/'.$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
// Skip files modified in the last 10 seconds // Skip files modified in the last 10 seconds
@ -390,7 +394,10 @@
} }
$files[$mod_time] = $target; $files[$mod_time] = $target;
} }
ksort($files); if($files)
{
ksort($files);
}
$targets = $files; $targets = $files;
unset($target); // Unset it, or it will be overwritten in loop below unset($target); // Unset it, or it will be overwritten in loop below
} }
@ -406,7 +413,8 @@
fclose($resource); fclose($resource);
} else { } else {
fwrite(STDERR,'importexport_schedule: ' . date('c') . ": Definition not found! \n"); fwrite(STDERR,'importexport_schedule: ' . date('c') . ": File $target not readable! \n");
$data['errors'][$target][] = lang('%1 is not readable',$target);
} }
@ -441,11 +449,11 @@
{ {
if(unlink($target)) if(unlink($target))
{ {
$data['result'][$target] .= "\n..." . lang('deleted'); $data['result'][$target][] .= "\n..." . lang('deleted');
} }
else else
{ {
$data['errors'][$target] .= "\n..." . lang('Unable to delete'); $data['errors'][$target][] .= "\n..." . lang('Unable to delete');
} }
} }
} }
@ -464,6 +472,10 @@
ob_end_clean(); ob_end_clean();
} }
/**
* Update the async job with current status, and send a notification
* to user if there were any errors.
*/
private static function update_job($data) { private static function update_job($data) {
$id = self::generate_id($data); $id = self::generate_id($data);
$async = ExecMethod('phpgwapi.asyncservice.read', $id); $async = ExecMethod('phpgwapi.asyncservice.read', $id);
@ -490,6 +502,7 @@
foreach($data['errors'] as $target => $errors) foreach($data['errors'] as $target => $errors)
{ {
$contents .= "\n". (is_numeric($target) ? '' : $target."\n"); $contents .= "\n". (is_numeric($target) ? '' : $target."\n");
$contents .= is_array($errors) ? implode("\n",$errors) : $errors;
} }
$notify->set_message($contents); $notify->set_message($contents);
$notify->send(); $notify->send();