From aa79a72151e03944519dae83d34157fa8a448cf8 Mon Sep 17 00:00:00 2001 From: Ermal Date: Tue, 31 Aug 2010 18:02:47 +0000 Subject: [PATCH] More fixes to openvpn to catch up with latest changes. --- usr/local/www/status_services.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/usr/local/www/status_services.php b/usr/local/www/status_services.php index 28654b2e93..ede7d5ff8a 100755 --- a/usr/local/www/status_services.php +++ b/usr/local/www/status_services.php @@ -131,11 +131,11 @@ if($_GET['mode'] == "startservice" and !empty($_GET['service'])) { break; case 'openvpn': $vpnmode = $_GET['vpnmode']; - if (($vpnmode == "server") or ($vpnmode == "client")) { + if (($vpnmode == "server") || ($vpnmode == "client")) { $id = $_GET['id']; if (is_numeric($id)) { - $configfile = $g['varetc_path'] . "/openvpn_{$vpnmode}{$id}.conf"; - mwexec_bg("/usr/local/sbin/openvpn --config $configfile"); + $configfile = "{$g['varetc_path']}/openvpn/{$vpnmode}{$id}.conf"; + mwexec_bg("/usr/local/sbin/openvpn --config {$configfile}"); } } break; @@ -188,7 +188,7 @@ if($_GET['mode'] == "stopservice" && !empty($_GET['service'])) { if (($vpnmode == "server") or ($vpnmode == "client")) { $id = $_GET['id']; if (is_numeric($id)) { - $pidfile = $g['varrun_path'] . "/openvpn_{$vpnmode}{$id}.pid"; + $pidfile = "{$g['varrun_path']}/openvpn_{$vpnmode}{$id}.pid"; killbypid($pidfile); } } @@ -197,7 +197,7 @@ if($_GET['mode'] == "stopservice" && !empty($_GET['service'])) { stop_service($_GET['service']); break; } - $savemsg = sprintf(gettext("%s has been stopped."),$_GET['service']); + $savemsg = sprintf(gettext("%s has been stopped."), $_GET['service']); sleep(5); }