From 552d58848c33af4cd88d3dccd9c895a51b70fdad Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 9 May 2017 13:17:50 +0200 Subject: [PATCH] fix sql_mode=only_full_group_by in admin_admins.php; fix wrong webserver-user when using FCGID Signed-off-by: Michael Kaufmann (d00p) --- admin_admins.php | 2 +- scripts/jobs/cron_tasks.inc.http.10.apache.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin_admins.php b/admin_admins.php index 32e5de12..de104c34 100644 --- a/admin_admins.php +++ b/admin_admins.php @@ -846,7 +846,7 @@ if ($page == 'admins' $ipaddress = makeoption($lng['admin']['allips'], "-1", $result['ip']); $ipsandports_stmt = Database::query(" - SELECT `id`, `ip` FROM `" . TABLE_PANEL_IPSANDPORTS . "` GROUP BY `ip` ORDER BY `ip`, `port` ASC + SELECT `id`, `ip` FROM `" . TABLE_PANEL_IPSANDPORTS . "` GROUP BY `id`, `ip` ORDER BY `ip`, `port` ASC "); while ($row = $ipsandports_stmt->fetch(PDO::FETCH_ASSOC)) { diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index 85ef9bac..a7ad40f7 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -253,7 +253,7 @@ class apache extends HttpConfigBase 'adminid' => 1, /* first admin-user (superadmin) */ 'mod_fcgid_starter' => - 1, 'mod_fcgid_maxrequests' => - 1, - 'guid' => Settings::Get('phpfpm.vhost_httpuser'), + 'guid' => Settings::Get('system.mod_fcgid_httpuser'), 'openbasedir' => 0, 'email' => Settings::Get('panel.adminmail'), 'loginname' => 'froxlor.panel',