From 3dc6a64252b5cc38c2283600bebfcd7cdd6793f0 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Mon, 8 Jan 2018 10:22:09 +0100 Subject: [PATCH] fix pm select when editing fpmdaemon; fix saving of pm value Signed-off-by: Michael Kaufmann (d00p) --- admin_phpsettings.php | 8 ++++---- .../admin/phpconfig/formfield.fpmconfig_edit.php | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/admin_phpsettings.php b/admin_phpsettings.php index 52809867..2b2e33b7 100644 --- a/admin_phpsettings.php +++ b/admin_phpsettings.php @@ -402,7 +402,7 @@ if ($page == 'overview') { $description = validate($_POST['description'], 'description'); $reload_cmd = validate($_POST['reload_cmd'], 'reload_cmd'); $config_dir = validate($_POST['config_dir'], 'config_dir'); - $pm = validate($_POST['pm'], 'pm'); + $pm = $_POST['pm']; $max_children = isset($_POST['max_children']) ? (int) $_POST['max_children'] : 0; $start_servers = isset($_POST['start_servers']) ? (int) $_POST['start_servers'] : 0; $min_spare_servers = isset($_POST['min_spare_servers']) ? (int) $_POST['min_spare_servers'] : 0; @@ -431,7 +431,7 @@ if ($page == 'overview') { 'desc' => $description, 'reload_cmd' => $reload_cmd, 'config_dir' => makeCorrectDir($config_dir), - 'pm' => pm, + 'pm' => $pm, 'max_children' => $max_children, 'start_servers' => $start_servers, 'min_spare_servers' => $min_spare_servers, @@ -528,7 +528,7 @@ if ($page == 'overview') { $description = validate($_POST['description'], 'description'); $reload_cmd = validate($_POST['reload_cmd'], 'reload_cmd'); $config_dir = validate($_POST['config_dir'], 'config_dir'); - $pm = validate($_POST['pm'], 'pm'); + $pm = $_POST['pm']; $max_children = isset($_POST['max_children']) ? (int) $_POST['max_children'] : $result['max_children']; $start_servers = isset($_POST['start_servers']) ? (int) $_POST['start_servers'] : $result['start_servers']; $min_spare_servers = isset($_POST['min_spare_servers']) ? (int) $_POST['min_spare_servers'] : $result['min_spare_servers']; @@ -558,7 +558,7 @@ if ($page == 'overview') { 'desc' => $description, 'reload_cmd' => $reload_cmd, 'config_dir' => makeCorrectDir($config_dir), - 'pm' => pm, + 'pm' => $pm, 'max_children' => $max_children, 'start_servers' => $start_servers, 'min_spare_servers' => $min_spare_servers, diff --git a/lib/formfields/admin/phpconfig/formfield.fpmconfig_edit.php b/lib/formfields/admin/phpconfig/formfield.fpmconfig_edit.php index a06592ed..d5e8c17f 100644 --- a/lib/formfields/admin/phpconfig/formfield.fpmconfig_edit.php +++ b/lib/formfields/admin/phpconfig/formfield.fpmconfig_edit.php @@ -45,8 +45,7 @@ return array( 'pm' => array( 'label' => $lng['serversettings']['phpfpm_settings']['pm'], 'type' => 'select', - 'select_var' => array('static' => 'static', 'dynamic' => 'dynamic', 'ondemand' => 'ondemand'), - 'value' => $result['pm'] + 'select_var' => $pm_select ), 'max_children' => array( 'label' => $lng['serversettings']['phpfpm_settings']['max_children']['title'],