diff options
| author | Erik Fonnesbeck <efonnes@gmail.com> | 2010-09-07 22:03:24 -0600 |
|---|---|---|
| committer | Erik Fonnesbeck <efonnes@gmail.com> | 2010-09-07 22:06:48 -0600 |
| commit | 22d323b338ef35be05dbd97eb33d8f07517c38fb (patch) | |
| tree | 6d2701ca2ff736dbe10f69f91dff286ba3958b95 | |
| parent | 392687e5633a663c1297363ff2d5d8e8f15298d7 (diff) | |
| download | pfsense-22d323b338ef35be05dbd97eb33d8f07517c38fb.zip pfsense-22d323b338ef35be05dbd97eb33d8f07517c38fb.tar.gz | |
Fix variable name typo in status_services.php and fix return value of is_pid_running. Fixes #877
| -rw-r--r-- | etc/inc/service-utils.inc | 2 | ||||
| -rwxr-xr-x | usr/local/www/status_services.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/service-utils.inc b/etc/inc/service-utils.inc index 94a4c53..281da52 100644 --- a/etc/inc/service-utils.inc +++ b/etc/inc/service-utils.inc @@ -157,7 +157,7 @@ function is_pid_running($pidfile) { return false; $running = shell_exec("/bin/pgrep -F {$pidfile} 2>/dev/null"); - return (intval($running) == 0); + return (!empty($running)); } function is_dhcp_running($interface) { diff --git a/usr/local/www/status_services.php b/usr/local/www/status_services.php index 3d4cfe0..cfeb959 100755 --- a/usr/local/www/status_services.php +++ b/usr/local/www/status_services.php @@ -328,7 +328,7 @@ foreach (array('server', 'client') as $mode) { $pconfig['name'] = "openvpn"; $pconfig['mode'] = $mode; $pconfig['id'] = $id; - $pconfig['vpnid'] = $settings['vpnid']; + $pconfig['vpnid'] = $setting['vpnid']; $pconfig['description'] = gettext("OpenVPN") . " ".$mode.": ".htmlspecialchars($setting['description']); $services[] = $pconfig; } |
