From 1b2db323aae5315f72acbb231f1b0820880671e8 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Tue, 29 Nov 2005 06:33:49 +0000 Subject: * Correct argument order * If user selects HTTPS but doesn't provide a port, default to 443 --- etc/inc/system.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'etc/inc') diff --git a/etc/inc/system.inc b/etc/inc/system.inc index a7b88e7..c9a2d3e 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -352,6 +352,9 @@ function system_webgui_start() { if ($config['system']['webgui']['protocol'] == "https") { + if(!$config['system']['webgui']['port']) + $portarg = "443"; + if ($config['system']['webgui']['certificate'] && $config['system']['webgui']['private-key']) { $cert = base64_decode($config['system']['webgui']['certificate']); $key = base64_decode($config['system']['webgui']['private-key']); @@ -403,7 +406,7 @@ EOD; /* generate lighttpd configuration */ system_generate_lighty_config("{$g['varetc_path']}/lighty-webConfigurator.conf", - $key, $cert, "lighty-webConfigurator.pid", $portarg, "/usr/local/www/"); + $cert, $key, "lighty-webConfigurator.pid", $portarg, "/usr/local/www/"); /* attempt to start lighthttpd */ $res = mwexec("/usr/local/sbin/lighttpd -f {$g['varetc_path']}/lighty-webConfigurator.conf"); -- cgit v1.1