diff options
Diffstat (limited to 'modules-available/vmstore/page.inc.php')
| -rw-r--r-- | modules-available/vmstore/page.inc.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/modules-available/vmstore/page.inc.php b/modules-available/vmstore/page.inc.php index cf0487f1..b27d47ce 100644 --- a/modules-available/vmstore/page.inc.php +++ b/modules-available/vmstore/page.inc.php @@ -12,10 +12,10 @@ class Page_VmStore extends Page User::load(); if (User::hasPermission('edit')) { - Dashboard::addSubmenu('?do=vmstore', Dictionary::translate('menu_edit', true)); + Dashboard::addSubmenu('?do=vmstore', Dictionary::translate('menu_edit')); } if (User::hasPermission('benchmark')) { - Dashboard::addSubmenu('?do=vmstore&show=benchmark', Dictionary::translate('menu_benchmark', true)); + Dashboard::addSubmenu('?do=vmstore&show=benchmark', Dictionary::translate('menu_benchmark')); } if (Request::any('show') === 'benchmark') { @@ -71,12 +71,12 @@ class Page_VmStore extends Page Util::redirect('?do=VmStore'); } // Validate syntax of nfs/cifs - if ($storetype === 'nfs' && !preg_match('#^\S+:\S+$#is', $vmstore['nfsaddr'])) { + if ($storetype === 'nfs' && !preg_match('#^\S+:\S+$#i', $vmstore['nfsaddr'])) { Message::addError('main.value-invalid', 'nfsaddr', $vmstore['nfsaddr']); Util::redirect('?do=VmStore'); } $vmstore['cifsaddr'] = str_replace('\\', '/', $vmstore['cifsaddr']); - if ($storetype === 'cifs' && !preg_match('#^//\S+/.+$#is', $vmstore['cifsaddr'])) { + if ($storetype === 'cifs' && !preg_match('#^//\S+/.+$#i', $vmstore['cifsaddr'])) { Message::addError('main.value-invalid', 'nfsaddr', $vmstore['nfsaddr']); Util::redirect('?do=VmStore'); } @@ -91,7 +91,7 @@ class Page_VmStore extends Page if (!Module::isAvailable('rebootcontrol')) { ErrorHandler::traceError('rebootcontrol module not enabled'); } - Render::setTitle(Dictionary::translate('page-title-benchmark', true)); + Render::setTitle(Dictionary::translate('page-title-benchmark')); if (Request::post('action') === 'start') { $this->benchmarkActionStart(); } @@ -111,7 +111,7 @@ class Page_VmStore extends Page } } - private function getJobFromId(int $id) + private function getJobFromId(int $id): ?array { $data = Property::getListEntry(VmStoreBenchmark::PROP_LIST_KEY, $id); if ($data !== null) { @@ -202,7 +202,7 @@ class Page_VmStore extends Page $servers = []; if (Dnbd3::isEnabled()) { $servers[] = ['idx' => 'auto', - 'server' => Dictionary::translate('dnbd3-all-loadbalance', true)]; + 'server' => Dictionary::translate('dnbd3-all-loadbalance')]; foreach ($lookup as $ip => $idx) { $servers[] = ['idx' => $idx, 'server' => $ip]; } @@ -251,7 +251,7 @@ class Page_VmStore extends Page ]; if ($remaining > 0) { $args['remaining'] = $remaining; - $args['refresh'] = $refresh; + $args['refresh'] = $refresh ?? 60; } Module::isAvailable('js_chart'); Render::addTemplate('benchmark-result', $args); |