diff options
Diffstat (limited to 'modules-available/sysconfig/addmodule_custommodule.inc.php')
| -rw-r--r-- | modules-available/sysconfig/addmodule_custommodule.inc.php | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/modules-available/sysconfig/addmodule_custommodule.inc.php b/modules-available/sysconfig/addmodule_custommodule.inc.php index 3afdad0a..f1199db7 100644 --- a/modules-available/sysconfig/addmodule_custommodule.inc.php +++ b/modules-available/sysconfig/addmodule_custommodule.inc.php @@ -34,11 +34,11 @@ class CustomModule_ProcessUpload extends AddModule_Base { if (!isset($_FILES['modulefile'])) { Message::addError('missing-file'); - Util::redirect('?do=SysConfig'); + Util::redirect('?do=SysConfig', 400); } if ($_FILES['modulefile']['error'] != UPLOAD_ERR_OK) { Message::addError('upload-failed', Util::uploadErrorString($_FILES['modulefile']['error'])); - Util::redirect('?do=SysConfig'); + Util::redirect('?do=SysConfig', 400); } $tempfile = '/tmp/bwlp-' . mt_rand(1, 100000) . '-' . crc32($_SERVER['REMOTE_ADDR']) . '.tmp'; if (!move_uploaded_file($_FILES['modulefile']['tmp_name'], $tempfile)) { @@ -92,11 +92,15 @@ class CustomModule_CompressModule extends AddModule_Base protected function preprocessInternal() { - $title = Request::post('title'); + $title = Request::post('title', Request::REQUIRED, 'string'); $tempfile = Session::get('mod_temp'); - if (empty($title) || empty($tempfile) || !file_exists($tempfile)) { + if (empty($tempfile)) { Message::addError('main.empty-field'); - Util::redirect('?do=SysConfig&action=addmodule&step=CustomModule_Start'); + Util::redirect('?do=SysConfig&action=addmodule&step=CustomModule_Start', 400); + } + if (!file_exists($tempfile)) { + Message::addError('main.error-read', $tempfile); + Util::redirect('?do=SysConfig&action=addmodule&step=CustomModule_Start', 500); } // Recompress using task manager $taskId = 'tgzmod' . mt_rand() . '-' . microtime(true); @@ -127,10 +131,11 @@ class CustomModule_CompressModule extends AddModule_Base } else { $ret = $module->insert($title); } - if (!$ret) - Util::redirect('?do=SysConfig&action=addmodule&step=CustomModule_Start'); - elseif (!$module->generate($this->edit === null, NULL, 200)) - Util::redirect('?do=SysConfig&action=addmodule&step=CustomModule_Start'); + if (!$ret) { + Util::redirect('?do=SysConfig&action=addmodule&step=CustomModule_Start', 500); + } elseif (!$module->generate($this->edit === null, NULL, 200)) { + Util::redirect('?do=SysConfig&action=addmodule&step=CustomModule_Start', 500); + } Session::set('mod_temp', false); // Yay if ($this->edit !== null) { |