diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2016-02-10 16:14:18 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2016-02-10 16:14:18 -0500 |
commit | 686c31d5b0d3c5a30645f7b836404170b00422ba (patch) | |
tree | 3b46885b8b03b3738a7c0aed17e18ab3699be8cd /src | |
parent | e1442137c723e1ab5fd8dbd1cfc8fae69a2a8fbd (diff) | |
parent | 158fc42f0a3907dec7841325f4c82867e71d4d6d (diff) | |
download | pfsense-686c31d5b0d3c5a30645f7b836404170b00422ba.zip pfsense-686c31d5b0d3c5a30645f7b836404170b00422ba.tar.gz |
Merge pull request #2612 from NewEraCracker/php-cleanup
Diffstat (limited to 'src')
-rw-r--r-- | src/usr/local/www/crash_reporter.php | 3 | ||||
-rw-r--r-- | src/usr/local/www/diag_authentication.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_out.php | 3 | ||||
-rw-r--r--[-rwxr-xr-x] | src/usr/local/www/foot.inc | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/usr/local/www/head.inc | 0 | ||||
-rw-r--r-- | src/usr/local/www/interfaces_wireless.php | 2 | ||||
-rwxr-xr-x | src/usr/local/www/pkg.php | 10 | ||||
-rw-r--r-- | src/usr/local/www/status_carp.php | 4 | ||||
-rwxr-xr-x | src/usr/local/www/status_logs.php | 2 | ||||
-rwxr-xr-x | src/usr/local/www/status_logs_filter_dynamic.php | 5 | ||||
-rw-r--r-- | src/usr/local/www/status_logs_filter_summary.php | 6 | ||||
-rw-r--r-- | src/usr/local/www/status_logs_vpn.php | 8 | ||||
-rw-r--r-- | src/usr/local/www/vpn_ipsec.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/vpn_ipsec_keys.php | 5 | ||||
-rw-r--r-- | src/usr/local/www/widgets/widgets/captive_portal_status.widget.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php | 7 | ||||
-rw-r--r-- | src/usr/local/www/widgets/widgets/log.widget.php | 3 |
17 files changed, 6 insertions, 60 deletions
diff --git a/src/usr/local/www/crash_reporter.php b/src/usr/local/www/crash_reporter.php index 6cd5adc..07ae915 100644 --- a/src/usr/local/www/crash_reporter.php +++ b/src/usr/local/www/crash_reporter.php @@ -97,8 +97,7 @@ $crash_report_header .= php_uname("v") . "\n"; $crash_report_header .= "\nCrash report details:\n"; exec("/usr/bin/grep -vi warning /tmp/PHP_errors.log", $php_errors); -?> -<?php + if ($_POST['Submit'] == "Yes") { echo gettext("Processing..."); if (!is_dir("/var/crash")) { diff --git a/src/usr/local/www/diag_authentication.php b/src/usr/local/www/diag_authentication.php index 55b784e..03164b3 100644 --- a/src/usr/local/www/diag_authentication.php +++ b/src/usr/local/www/diag_authentication.php @@ -104,8 +104,6 @@ $pgtitle = array(gettext("Diagnostics"), gettext("Authentication")); $shortcut_section = "authentication"; include("head.inc"); -?> -<?php if ($input_errors) { print_input_errors($input_errors); } diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php index b0ee432..fea779e 100644 --- a/src/usr/local/www/firewall_nat_out.php +++ b/src/usr/local/www/firewall_nat_out.php @@ -373,8 +373,7 @@ print($form); <td> <?php $natent['source']['network'] = ($natent['source']['network'] == "(self)") ? "This Firewall" : $natent['source']['network']; -?> -<?php + if (isset($alias['src'])): ?> <a href="/firewall_aliases_edit.php?id=<?=$alias['src']?>" data-toggle="popover" data-trigger="hover focus" title="Alias details" data-content="<?=alias_info_popup($alias['src'])?>" data-html="true"> diff --git a/src/usr/local/www/foot.inc b/src/usr/local/www/foot.inc index 081cfca..081cfca 100755..100644 --- a/src/usr/local/www/foot.inc +++ b/src/usr/local/www/foot.inc diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc index 515a6d6..515a6d6 100755..100644 --- a/src/usr/local/www/head.inc +++ b/src/usr/local/www/head.inc diff --git a/src/usr/local/www/interfaces_wireless.php b/src/usr/local/www/interfaces_wireless.php index 8dd6318..616a762 100644 --- a/src/usr/local/www/interfaces_wireless.php +++ b/src/usr/local/www/interfaces_wireless.php @@ -109,9 +109,7 @@ include("head.inc"); if ($input_errors) { print_input_errors($input_errors); } -?> -<?php $tab_array = array(); $tab_array[] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); $tab_array[] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); diff --git a/src/usr/local/www/pkg.php b/src/usr/local/www/pkg.php index 8a26e20..ac4f532 100755 --- a/src/usr/local/www/pkg.php +++ b/src/usr/local/www/pkg.php @@ -612,16 +612,6 @@ if ($savemsg) { </td> </tr> <?=$final_footer?> -<?php - #Show save button only when movable is defined - if ($pkg['adddeleteeditpagefields']['movable']) { -?> - - - -<?php - } -?> </table> </div> <input class="btn btn-primary" type="button" value="Save" name="Submit" onclick="save_changes_to_xml('<?=$xml?>')" /> diff --git a/src/usr/local/www/status_carp.php b/src/usr/local/www/status_carp.php index 15bf5f4..1ccc7cb 100644 --- a/src/usr/local/www/status_carp.php +++ b/src/usr/local/www/status_carp.php @@ -171,13 +171,9 @@ if (is_array($config['virtualip']['vip'])) { } } - // If $carpcount > 0 display buttons then display table // otherwise display error box and quit -?> - -<?php if ($carpcount == 0) { print_info_box(gettext('No CARP interfaces have been defined.') . '<br />' . '<a href="system_hasync.php" class="alert-link">' . diff --git a/src/usr/local/www/status_logs.php b/src/usr/local/www/status_logs.php index fe9cd29..c0ef9d4 100755 --- a/src/usr/local/www/status_logs.php +++ b/src/usr/local/www/status_logs.php @@ -251,9 +251,7 @@ events.push(function() { </div> <?php } -?> -<?php # Manage Log - Section/Form if (!$system_logs_manage_log_form_hidden) { manage_log_section(); diff --git a/src/usr/local/www/status_logs_filter_dynamic.php b/src/usr/local/www/status_logs_filter_dynamic.php index 08b86ec..26bb6d1 100755 --- a/src/usr/local/www/status_logs_filter_dynamic.php +++ b/src/usr/local/www/status_logs_filter_dynamic.php @@ -479,8 +479,7 @@ function toggleListDescriptions() { </tr> <?php } // e-o-foreach() -?> -<?php + if (count($filterlog) == 0) { print '<tr class="text-nowrap"><td colspan=6>'; print_info_box(gettext('No logs to display')); @@ -513,9 +512,7 @@ if ($tcpcnt > 0) { </div> <?php } -?> -<?php # Manage Log - Section/Form if (!$system_logs_manage_log_form_hidden) { manage_log_section(); diff --git a/src/usr/local/www/status_logs_filter_summary.php b/src/usr/local/www/status_logs_filter_summary.php index efa7d15..84256d8 100644 --- a/src/usr/local/www/status_logs_filter_summary.php +++ b/src/usr/local/www/status_logs_filter_summary.php @@ -184,9 +184,7 @@ foreach (array_keys($fields) as $field) { </div> <?php } -?> -<?php function cmp($a, $b) { if ($a == $b) { return 0; @@ -231,9 +229,7 @@ function stat_block($summary, $stat, $num) { print "</table>"; print('</div>'); } -?> -<?php // Create the JSON document for the chart to be displayed // Todo: Be good to investigate building this with json_encode and friends some time function pie_block($summary, $stat, $num, $chartnum) { @@ -349,8 +345,6 @@ var pie = new d3pie("pieChart<?=$chartnum?>", { </script> <?php } -?> -<?php include("foot.inc"); ?> diff --git a/src/usr/local/www/status_logs_vpn.php b/src/usr/local/www/status_logs_vpn.php index 30d4e7b..69042eb 100644 --- a/src/usr/local/www/status_logs_vpn.php +++ b/src/usr/local/www/status_logs_vpn.php @@ -279,16 +279,12 @@ events.push(function() { </div> <?php } -?> -<?php # Manage Log - Section/Form if (!$system_logs_manage_log_form_hidden) { manage_log_section(); } -?> -<?php function dump_clog_vpn($logfile, $tail) { global $g, $config, $vpntype; @@ -325,9 +321,7 @@ function dump_clog_vpn($logfile, $tail) { } return($rows); } -?> -<?php // Log Filter Submit - VPN function log_filter_form_vpn_submit() { @@ -359,9 +353,7 @@ function log_filter_form_vpn_submit() { $filterlogentries_qty = getGETPOSTsettingvalue('filterlogentries_qty', null); } } -?> -<?php // Filter Section/Form - VPN function filter_form_vpn() { diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php index 196994c..bc1167f 100644 --- a/src/usr/local/www/vpn_ipsec.php +++ b/src/usr/local/www/vpn_ipsec.php @@ -260,9 +260,7 @@ $tab_array[] = array(gettext("Mobile Clients"), false, "vpn_ipsec_mobile.php"); $tab_array[] = array(gettext("Pre-Shared Keys"), false, "vpn_ipsec_keys.php"); $tab_array[] = array(gettext("Advanced Settings"), false, "vpn_ipsec_settings.php"); display_top_tabs($tab_array); -?> -<?php if ($savemsg) { print_info_box($savemsg, 'success'); } diff --git a/src/usr/local/www/vpn_ipsec_keys.php b/src/usr/local/www/vpn_ipsec_keys.php index 78dd1d0..2161831 100644 --- a/src/usr/local/www/vpn_ipsec_keys.php +++ b/src/usr/local/www/vpn_ipsec_keys.php @@ -107,9 +107,6 @@ $shortcut_section = "ipsec"; include("head.inc"); -?> - -<?php if ($savemsg) { print_info_box($savemsg); } @@ -117,9 +114,7 @@ if ($savemsg) { if (is_subsystem_dirty('ipsec')) { print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); } -?> -<?php $tab_array = array(); $tab_array[0] = array(gettext("Tunnels"), false, "vpn_ipsec.php"); $tab_array[1] = array(gettext("Mobile Clients"), false, "vpn_ipsec_mobile.php"); diff --git a/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php b/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php index c91d1c0..ec18c47 100644 --- a/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php +++ b/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php @@ -65,10 +65,6 @@ require_once("pfsense-utils.inc"); require_once("functions.inc"); require_once("captiveportal.inc"); -?> - -<?php - if (!is_array($config['captiveportal'])) { $config['captiveportal'] = array(); } diff --git a/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php b/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php index c8de7df..00ae96a 100644 --- a/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php +++ b/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php @@ -174,13 +174,10 @@ if ($_REQUEST['getdyndnsstatus']) { } if ($dyndns['type'] == '_rfc2136_') : ?> RFC 2136 - <? endif; - ?> + <?php endif; ?> </td> <td> - <?php - print(htmlspecialchars($hostname)); - ?> + <?php print(htmlspecialchars($hostname)); ?> </td> <td> <div id="dyndnsstatus<?= $dyndnsid;?>"><?= gettext("Checking ...");?></div> diff --git a/src/usr/local/www/widgets/widgets/log.widget.php b/src/usr/local/www/widgets/widgets/log.widget.php index 3940431..3b62ab8 100644 --- a/src/usr/local/www/widgets/widgets/log.widget.php +++ b/src/usr/local/www/widgets/widgets/log.widget.php @@ -188,8 +188,7 @@ $filterlog = conv_log_filter($filter_logfile, $nentries, 50, $filterfieldsarray) </tr> <?php endforeach; - ?> -<?php + if (count($filterlog) == 0) { print '<tr class="text-nowrap"><td colspan=5 class="text-center">'; print gettext('No logs to display'); |