diff options
| author | Simon Rettberg | 2013-11-16 15:58:23 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-11-16 15:58:23 +0100 |
| commit | 22e9b75b1b6c193f58639348e04cc8fbb0b45f9a (patch) | |
| tree | ed26a9c67e83de9c87bc903e70e8de971aee1882 | |
| parent | Add minilinux download functionality and ipxe compilation scripts (diff) | |
| download | slx-admin-22e9b75b1b6c193f58639348e04cc8fbb0b45f9a.tar.gz slx-admin-22e9b75b1b6c193f58639348e04cc8fbb0b45f9a.tar.xz slx-admin-22e9b75b1b6c193f58639348e04cc8fbb0b45f9a.zip | |
Fixed two stupid messups
| -rw-r--r-- | inc/message.inc.php | 2 | ||||
| -rw-r--r-- | modules/minilinux.inc.php | 3 | ||||
| -rw-r--r-- | modules/sysconfig.inc.php | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/inc/message.inc.php b/inc/message.inc.php index ea6cd20d..3117630b 100644 --- a/inc/message.inc.php +++ b/inc/message.inc.php @@ -13,7 +13,7 @@ $error_text = array( 'debug-mode' => 'Der Debug-Modus ist aktiv!', 'value-invalid' => 'Der Wert {{1}} ist ungültig für die Option {{0}} und wurde ignoriert', 'invalid-action' => 'Ungültige Aktion: {{0}}', - 'remote-timeout' => 'Konnte Ressource {{0}} nicht herunterladen', + 'remote-timeout' => 'Konnte Ressource {{0}} nicht herunterladen ({{1}})', 'remote-parse-failed' => 'Parsen der empfangenen Daten fehlgeschlagen ({{0}})', 'missing-file' => 'Es wurde keine Datei ausgewählt!', 'invalid-file' => 'Die Datei {{0}} existiert nicht!', diff --git a/modules/minilinux.inc.php b/modules/minilinux.inc.php index 3508fb43..49e72616 100644 --- a/modules/minilinux.inc.php +++ b/modules/minilinux.inc.php @@ -10,6 +10,7 @@ if (!User::hasPermission('superadmin')) { function render_module() { $files = array(); + mkdir(CONFIG_HTTP_DIR . "/default", 0755, true); checkFile($files, 'kernel'); checkFile($files, 'initramfs-stage31'); checkFile($files, 'stage32.sqfs'); @@ -62,7 +63,7 @@ function checkFile(&$files, $name) } $existingMd5 = strtolower(preg_replace('/[^0-9a-f]/is', '', $existingMd5)); $remoteMd5 = Util::download($remote, 3, $code); - $remoteMd5 = strtolower(preg_replace('/[^0-9a-f]/is', '', $existingMd5)); + $remoteMd5 = strtolower(preg_replace('/[^0-9a-f]/is', '', $remoteMd5)); if ($code != 200) { Message::addError('remote-timeout', $remote); return false; diff --git a/modules/sysconfig.inc.php b/modules/sysconfig.inc.php index f10446ed..1a171a40 100644 --- a/modules/sysconfig.inc.php +++ b/modules/sysconfig.inc.php @@ -93,7 +93,7 @@ function list_remote_configs() } $data = Util::download(CONFIG_REMOTE_TGZ . '/list.php', 4, $code); if ($code !== 200) { - Message::addError('remote-timeout', CONFIG_REMOTE_TGZ); + Message::addError('remote-timeout', CONFIG_REMOTE_TGZ . '/list.php', $code); return; } $list = json_decode($data, true); |