summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSander van Leeuwen <sander@react.nl>2015-01-16 17:12:51 +0100
committerSander van Leeuwen <sander@react.nl>2015-01-16 17:12:51 +0100
commit649cde0b0e399217fd2ba25bf41483882d8e81f3 (patch)
treed382f2f7b6fe789c2753bea04f0012f5356d4c02
parent2148e0bfd8949344d881535d2789f153514176cb (diff)
downloadpfsense-649cde0b0e399217fd2ba25bf41483882d8e81f3.zip
pfsense-649cde0b0e399217fd2ba25bf41483882d8e81f3.tar.gz
Address pull comments
head.inc - Revert indenting .gitignore - Add IDE name in comment
-rw-r--r--.gitignore1
-rwxr-xr-xusr/local/www/head.inc48
2 files changed, 25 insertions, 24 deletions
diff --git a/.gitignore b/.gitignore
index 09e544d..c6e1931 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ upload.sh
.buildpath
.project
.settings/
+# PhpStorm
.idea \ No newline at end of file
diff --git a/usr/local/www/head.inc b/usr/local/www/head.inc
index b64e74d..15ac3fa 100755
--- a/usr/local/www/head.inc
+++ b/usr/local/www/head.inc
@@ -424,33 +424,33 @@ foreach($noticeCategories as $category => $catNotices):?>
<div class="container">
<header class="header">
<?=genhtmltitle($pgtitle);?>
- <?php
- /*
- //FIXME
- if (!$hide_service_status && !empty($shortcuts[$shortcut_section]['service'])) {
- $ssvc = array();
- switch ($shortcut_section) {
- case "openvpn":
- $ssvc = find_service_by_openvpn_vpnid($vpnid);
- break;
- case "captiveportal":
- $ssvc = find_service_by_cp_zone($cpzone);
- break;
- default:
- $ssvc = find_service_by_name($shortcuts[$shortcut_section]['service']);
+<?php
+/*
+//FIXME
+if (!$hide_service_status && !empty($shortcuts[$shortcut_section]['service'])) {
+ $ssvc = array();
+ switch ($shortcut_section) {
+ case "openvpn":
+ $ssvc = find_service_by_openvpn_vpnid($vpnid);
+ break;
+ case "captiveportal":
+ $ssvc = find_service_by_cp_zone($cpzone);
+ break;
+ default:
+ $ssvc = find_service_by_name($shortcuts[$shortcut_section]['service']);
- }
- if (!empty($ssvc)) {
- echo get_service_status_icon($ssvc, false);
- echo get_service_control_links($ssvc, true);
- }
}
+ if (!empty($ssvc)) {
+ echo get_service_status_icon($ssvc, false);
+ echo get_service_control_links($ssvc, true);
+ }
+}
- echo get_shortcut_main_link($shortcut_section, true);
- echo get_shortcut_status_link($shortcut_section, true);
- echo get_shortcut_log_link($shortcut_section, true);
- */
- ?>
+echo get_shortcut_main_link($shortcut_section, true);
+echo get_shortcut_status_link($shortcut_section, true);
+echo get_shortcut_log_link($shortcut_section, true);
+*/
+?>
<?php if(! $g['disablehelpicon']): ?>
<a href="<?=$helpurl?>" title="<?=gettext("Help for items on this page")?>" class="help-icon">
OpenPOWER on IntegriCloud