maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix shell-select for customer ftp-accounts if shell is enabled; fix typo in UserCommand

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-10-06 14:23:56 +02:00
parent 13c53b074c
commit a37beef18e
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
customer_ftp.php
View File

@@ -133,8 +133,11 @@ if ($page == 'overview' || $page == 'accounts') {
$shells['/bin/false'] = "/bin/false"; $shells['/bin/false'] = "/bin/false";
$shells_avail = Settings::Get('system.available_shells'); $shells_avail = Settings::Get('system.available_shells');
if (!empty($shells_avail)) { if (!empty($shells_avail)) {
$shells_avail = explode(",", $shells_avail); $shells_avail_arr = explode(",", $shells_avail);
$shells_avail = array_map("trim", $shells_avail); $shells_avail_arr = array_map("trim", $shells_avail_arr);
foreach ($shells_avail_arr as $shell) {
$shells[$shell] = $shell;
}
} }
} }
@@ -180,8 +183,11 @@ if ($page == 'overview' || $page == 'accounts') {
$shells['/bin/false'] = "/bin/false"; $shells['/bin/false'] = "/bin/false";
$shells_avail = Settings::Get('system.available_shells'); $shells_avail = Settings::Get('system.available_shells');
if (!empty($shells_avail)) { if (!empty($shells_avail)) {
$shells_avail = explode(",", $shells_avail); $shells_avail_arr = explode(",", $shells_avail);
$shells_avail = array_map("trim", $shells_avail); $shells_avail_arr = array_map("trim", $shells_avail_arr);
foreach ($shells_avail_arr as $shell) {
$shells[$shell] = $shell;
}
} }
} }

2
lib/Froxlor/Cli/UserCommand.php
View File

@@ -45,7 +45,7 @@ final class UserCommand extends CliCommand
$this->setDescription('Various user actions'); $this->setDescription('Various user actions');
$this->addArgument('user', InputArgument::REQUIRED, 'Loginname of the target user') $this->addArgument('user', InputArgument::REQUIRED, 'Loginname of the target user')
->addArgument('admin', InputArgument::OPTIONAL, 'Loginname of the executing admin/reseller user', 'admin'); ->addArgument('admin', InputArgument::OPTIONAL, 'Loginname of the executing admin/reseller user', 'admin');
$this->addOption('unlock', 'u', InputOption::VALUE_NONE, 'Unock user after too many failed login attempts') $this->addOption('unlock', 'u', InputOption::VALUE_NONE, 'Unlock user after too many failed login attempts')
->addOption('change-passwd', 'p', InputOption::VALUE_NONE, 'Set new password for given user') ->addOption('change-passwd', 'p', InputOption::VALUE_NONE, 'Set new password for given user')
->addOption('show-info', 's', InputOption::VALUE_NONE, 'Output information details of given user'); ->addOption('show-info', 's', InputOption::VALUE_NONE, 'Output information details of given user');
} }

2
lib/formfields/customer/ftp/formfield.ftp_add.php
View File

@@ -76,7 +76,7 @@ return [
'visible' => Settings::Get('system.allow_customer_shell') == '1', 'visible' => Settings::Get('system.allow_customer_shell') == '1',
'label' => lng('panel.shell'), 'label' => lng('panel.shell'),
'type' => 'select', 'type' => 'select',
'select_var' => $shells_avail, 'select_var' => $shells,
'selected' => '/bin/false' 'selected' => '/bin/false'
] ]
] ]

2
lib/formfields/customer/ftp/formfield.ftp_edit.php
View File

@@ -61,7 +61,7 @@ return [
'visible' => Settings::Get('system.allow_customer_shell') == '1', 'visible' => Settings::Get('system.allow_customer_shell') == '1',
'label' => lng('panel.shell'), 'label' => lng('panel.shell'),
'type' => 'select', 'type' => 'select',
'select_var' => $shells_avail, 'select_var' => $shells,
'selected' => $result['shell'] ?? '/bin/false' 'selected' => $result['shell'] ?? '/bin/false'
] ]
] ]