diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/backup.inc.php | 3 | ||||
-rw-r--r-- | modules/eventlog.inc.php | 2 | ||||
-rw-r--r-- | modules/serversetup.inc.php | 8 |
3 files changed, 8 insertions, 5 deletions
diff --git a/modules/backup.inc.php b/modules/backup.inc.php index 61964d47..2a44997a 100644 --- a/modules/backup.inc.php +++ b/modules/backup.inc.php @@ -96,6 +96,7 @@ class Page_Backup extends Page $this->templateData['mountid'] = $task['id']; $parent = $task['id']; } + EventLog::info('Creating backup, v' . Database::getExpectedSchemaVersion() . ' on ' . Property::getServerIp()); // Finally run backup $task = Taskmanager::submit('BackupRestore', array( 'mode' => 'restore', @@ -106,8 +107,8 @@ class Page_Backup extends Page if (isset($task['id'])) { $this->templateData['restoreid'] = $task['id']; $parent = $task['id']; + TaskmanagerCallback::addCallback($task, 'dbRestored'); } - // TODO: Trigger::rebuildAdModules(); // Wait a bit $task = Taskmanager::submit('SleepTask', array( 'seconds' => 3, diff --git a/modules/eventlog.inc.php b/modules/eventlog.inc.php index f67bc8a7..a070f5a2 100644 --- a/modules/eventlog.inc.php +++ b/modules/eventlog.inc.php @@ -57,7 +57,7 @@ class Page_EventLog extends Page { switch ($type) { case 'info': - return 'green'; + return ''; case 'warning': return 'orange'; case 'failure': diff --git a/modules/serversetup.inc.php b/modules/serversetup.inc.php index 93d373c1..37868308 100644 --- a/modules/serversetup.inc.php +++ b/modules/serversetup.inc.php @@ -125,9 +125,11 @@ class Page_ServerSetup extends Page $this->currentMenu['defaultentry'] = Request::post('defaultentry', 'net'); $this->currentMenu['timeout'] = $timeout; $this->currentMenu['custom'] = Request::post('custom', ''); - $this->currentMenu['masterpassword'] = Request::post('masterpassword', ''); - if (!preg_match('/^\$[1456]\$.+\$/', $this->currentMenu['masterpassword'])) - $this->currentMenu['masterpassword'] = Crypto::hash6($this->currentMenu['masterpassword']); + $this->currentMenu['masterpasswordclear'] = Request::post('masterpassword', ''); + if (empty($this->currentMenu['masterpasswordclear'])) + $this->currentMenu['masterpassword'] = 'invalid'; + else + $this->currentMenu['masterpassword'] = Crypto::hash6($this->currentMenu['masterpasswordclear']); Property::setBootMenu($this->currentMenu); $id = Trigger::ipxe(); Util::redirect('?do=ServerSetup&taskid=' . $id); |