diff options
| author | jim-p <jimp@pfsense.org> | 2013-04-01 12:15:26 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-04-01 12:57:50 -0400 |
| commit | 2eaa97b952ebcf9fea18b1168ef94ff9587a5e7f (patch) | |
| tree | 0bc2867a573140e2af05c1e1cc805370f6833be3 /usr/local/www/status_openvpn.php | |
| parent | 9d7204aa2468fbe829a626355bf292740cdf6ad7 (diff) | |
| download | pfsense-2eaa97b952ebcf9fea18b1168ef94ff9587a5e7f.zip pfsense-2eaa97b952ebcf9fea18b1168ef94ff9587a5e7f.tar.gz | |
Clarify notes when there is an error reaching the openvpn management daemon for service status. Also, add service controls to the openvpn status page.
Diffstat (limited to 'usr/local/www/status_openvpn.php')
| -rw-r--r-- | usr/local/www/status_openvpn.php | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/usr/local/www/status_openvpn.php b/usr/local/www/status_openvpn.php index 4568fb9..28a9765 100644 --- a/usr/local/www/status_openvpn.php +++ b/usr/local/www/status_openvpn.php @@ -48,6 +48,7 @@ $shortcut_section = "openvpn"; require("guiconfig.inc"); require_once("openvpn.inc"); +require_once("shortcuts.inc"); /* Handle AJAX */ if($_GET['action']) { @@ -189,7 +190,16 @@ include("head.inc"); ?> <?php endforeach; ?> <tfoot> <tr> - <td colspan="6" class="list" height="12"></td> + <td colspan="2" class="list" height="12"> + <table> + <tr> + <?php $ssvc = find_service_by_openvpn_vpnid($server['vpnid']); ?> + <?= get_service_status_icon($ssvc, true, true); ?> + <td><?= get_service_control_links($ssvc, true); ?></td> + </tr> + </table> + </td> + <td colspan="4" class="list" height="12"> </td> </tr> </tfoot> </table> @@ -293,6 +303,18 @@ include("head.inc"); ?> </td> </tr> <?php endforeach; ?> + <tr> + <td colspan="2" class="list" height="12"> + <table> + <tr> + <?php $ssvc = find_service_by_openvpn_vpnid($sk_server['vpnid']); ?> + <?= get_service_status_icon($ssvc, true, true); ?> + <td><?= get_service_control_links($ssvc, true); ?></td> + </tr> + </table> + </td> + <td colspan="5" class="list" height="12"> </td> + </tr> </table> </tr> </table> @@ -344,6 +366,18 @@ include("head.inc"); ?> </td> </tr> <?php endforeach; ?> + <tr> + <td colspan="2" class="list" height="12"> + <table> + <tr> + <?php $ssvc = find_service_by_openvpn_vpnid($client['vpnid']); ?> + <?= get_service_status_icon($ssvc, true, true); ?> + <td><?= get_service_control_links($ssvc, true); ?></td> + </tr> + </table> + </td> + <td colspan="5" class="list" height="12"> </td> + </tr> </table> </tr> </table> @@ -352,7 +386,7 @@ include("head.inc"); ?> } if ($DisplayNote) { - echo "<br/><b>" . gettext("NOTE") . ":</b> " . gettext("You need to bind each OpenVPN client to enable its management daemon: use 'Local port' setting in the OpenVPN client screen"); + echo "<br/><b>" . gettext("NOTE") . ":</b> " . gettext("If you have custom options that override the management features of OpenVPN on a client or server, they will cause that OpenVPN instance to not work correctly with this status page."); } if ((empty($clients)) && (empty($servers)) && (empty($sk_servers))) { |
