diff options
Diffstat (limited to 'modules-available/sysconfig/addmodule_custommodule.inc.php')
| -rw-r--r-- | modules-available/sysconfig/addmodule_custommodule.inc.php | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/modules-available/sysconfig/addmodule_custommodule.inc.php b/modules-available/sysconfig/addmodule_custommodule.inc.php index 0c3c299d..7830b8ed 100644 --- a/modules-available/sysconfig/addmodule_custommodule.inc.php +++ b/modules-available/sysconfig/addmodule_custommodule.inc.php @@ -57,6 +57,7 @@ class CustomModule_ProcessUpload extends AddModule_Base { $status = Taskmanager::waitComplete($this->taskId); Taskmanager::release($this->taskId); + $userGroupWarn = false; $tempfile = Session::get('mod_temp'); if (!isset($status['statusCode'])) { unlink($tempfile); @@ -66,36 +67,21 @@ class CustomModule_ProcessUpload extends AddModule_Base unlink($tempfile); $this->taskError($status); } - // Sort files for better display - $dirs = array(); - foreach ($status['data']['entries'] as $file) { - if ($file['isdir']) continue; - $dirs[dirname($file['name'])][] = $file; - } - ksort($dirs); - $list = array(); - foreach ($dirs as $dir => $files) { - $list[] = array( - 'name' => $dir, - 'isdir' => true - ); - sort($files); - foreach ($files as $file) { - $file['size'] = Util::readableFileSize($file['size']); - $list[] = $file; - } - } - if ($this->edit !== false) + $list = SysConfig::archiveContentsFromTask($status, $userGroupWarn); + + if ($this->edit !== false) { $title = $this->edit->title(); - elseif (isset($_FILES['modulefile']['name'])) + } else if (isset($_FILES['modulefile']['name'])) { $title = basename($_FILES['modulefile']['name']); - else + } else { $title = ''; + } Render::addDialog(Dictionary::translate('config-module', 'custom_title'), false, 'custom-fileselect', array( 'step' => 'CustomModule_CompressModule', 'files' => $list, 'edit' => $this->edit ? $this->edit->id() : false, - 'title' => $title + 'title' => $title, + 'userGroupWarn' => $userGroupWarn, )); Session::save(); } @@ -121,7 +107,8 @@ class CustomModule_CompressModule extends AddModule_Base Taskmanager::submit('RecompressArchive', array( 'id' => $this->taskId, 'inputFiles' => [$tempfile => false], - 'outputFile' => $destFile + 'outputFile' => $destFile, + 'forceRoot' => Request::post('force-owner', 0, 'int') !== 0, ), true); $status = Taskmanager::waitComplete($this->taskId, 5000); unlink($tempfile); |