From ae0b9af71ae6523aa2278f887bf4443aff91ee6f Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 8 Apr 2015 19:50:45 +0000
Subject: [PATCH] cleanup fend.inc

---
 src/www/diag_dump_states_sources.php       | 2 +-
 src/www/fend.inc                           | 1 -
 src/www/services_dhcp.php                  | 4 ----
 src/www/services_dhcpv6.php                | 4 ----
 src/www/services_router_advertisements.php | 4 ++--
 src/www/status.php                         | 2 +-
 src/www/status_captiveportal_expire.php    | 2 +-
 src/www/status_graph_cpu.php               | 2 +-
 src/www/system_gateway_groups_edit.php     | 2 +-
 src/www/system_groupmanager_addprivs.php   | 2 +-
 src/www/system_usermanager_addprivs.php    | 2 +-
 src/www/system_usermanager_passwordmg.php  | 2 +-
 src/www/vpn_ipsec_phase2.php               | 2 +-
 src/www/vpn_openvpn_export.php             | 2 +-
 src/www/vpn_openvpn_export_shared.php      | 2 +-
 15 files changed, 13 insertions(+), 22 deletions(-)
 delete mode 100755 src/www/fend.inc

diff --git a/src/www/diag_dump_states_sources.php b/src/www/diag_dump_states_sources.php
index 11123ce12..e9b7efe1a 100644
--- a/src/www/diag_dump_states_sources.php
+++ b/src/www/diag_dump_states_sources.php
@@ -203,6 +203,6 @@ else {
   </tr>
 </table>
 
-<?php require("fend.inc"); ?>
+<?php include("foot.inc"); ?>
 </body>
 </html>
diff --git a/src/www/fend.inc b/src/www/fend.inc
deleted file mode 100755
index 0824d9520..000000000
--- a/src/www/fend.inc
+++ /dev/null
@@ -1 +0,0 @@
-<?php include("foot.inc"); exit; ?>
diff --git a/src/www/services_dhcp.php b/src/www/services_dhcp.php
index 32e90ed09..67ef2b7ff 100644
--- a/src/www/services_dhcp.php
+++ b/src/www/services_dhcp.php
@@ -706,10 +706,6 @@ include("head.inc");
 							$tabscounter++;
 						}
 						if ($tabscounter == 0) {
-							//echo "</td></tr></table></form>";
-							//include("fend.inc");
-							//echo "</body>";
-							//echo "</html>";
 							echo "</section>";
 							echo "</div>";
 							echo "</div>";
diff --git a/src/www/services_dhcpv6.php b/src/www/services_dhcpv6.php
index a0309ebe6..6877e7aa8 100644
--- a/src/www/services_dhcpv6.php
+++ b/src/www/services_dhcpv6.php
@@ -483,10 +483,6 @@ include("head.inc");
 							}
 						}
 						if ($tabscounter == 0) {
-							//echo "</td></tr></table></form>";
-							//include("fend.inc");
-							//echo "</body>";
-							//echo "</html>";
 							echo "</section>";
 							echo "</div>";
 							echo "</div>";
diff --git a/src/www/services_router_advertisements.php b/src/www/services_router_advertisements.php
index f4e325283..7f43f2c83 100644
--- a/src/www/services_router_advertisements.php
+++ b/src/www/services_router_advertisements.php
@@ -215,7 +215,7 @@ include("head.inc");
 						}
 						if ($tabscounter == 0) {
 							echo "</td></tr></table></form>";
-							include("fend.inc");
+							include("foot.inc");
 							echo "</body>";
 							echo "</html>";
 							exit;
@@ -410,6 +410,6 @@ include("head.inc");
 //]]>
 </script>
 
-<?php include("fend.inc"); ?>
+<?php include("foot.inc"); ?>      
 </body>
 </html>
diff --git a/src/www/status.php b/src/www/status.php
index e960823a9..f8e99145e 100755
--- a/src/www/status.php
+++ b/src/www/status.php
@@ -218,6 +218,6 @@ pre {
 <?php execCmds(); ?>
 </div>
 
-<?php include("fend.inc"); ?>
+<?php include("foot.inc"); ?>      
 </body>
 </html>
diff --git a/src/www/status_captiveportal_expire.php b/src/www/status_captiveportal_expire.php
index 1cf1915ca..1c8723594 100644
--- a/src/www/status_captiveportal_expire.php
+++ b/src/www/status_captiveportal_expire.php
@@ -124,4 +124,4 @@ if ($_POST) {
 	</section>
 
 
-<? include("fend.inc"); ?>
+<?php include("foot.inc"); ?>      
diff --git a/src/www/status_graph_cpu.php b/src/www/status_graph_cpu.php
index d6f5ce628..06f7b4080 100644
--- a/src/www/status_graph_cpu.php
+++ b/src/www/status_graph_cpu.php
@@ -39,4 +39,4 @@ $pgtitle = gettext("Status: CPU Graph");
 		width="550" height="275" pluginspage="http://www.adobe.com/svg/viewer/install/auto" />
 </div>
 <br /><span class="red"><strong><?=gettext("Note"); ?>:</strong></span> <?=gettext("if you can't see the graph, you may have to install the"); ?> <a href="http://www.adobe.com/svg/viewer/install/" target="_blank"><?=gettext("Adobe SVG viewer"); ?></a>.
-<?php include("fend.inc"); ?>
+<?php include("foot.inc"); ?>      
diff --git a/src/www/system_gateway_groups_edit.php b/src/www/system_gateway_groups_edit.php
index 0c4765265..2843e3e2c 100644
--- a/src/www/system_gateway_groups_edit.php
+++ b/src/www/system_gateway_groups_edit.php
@@ -359,6 +359,6 @@ jQuery(function ($) {
 			</div>
 		</div>
 	</section>
-<?php include("fend.inc"); ?>
+<?php include("foot.inc"); ?>      
 </body>
 </html>
diff --git a/src/www/system_groupmanager_addprivs.php b/src/www/system_groupmanager_addprivs.php
index 4c3603834..63fa3c249 100644
--- a/src/www/system_groupmanager_addprivs.php
+++ b/src/www/system_groupmanager_addprivs.php
@@ -218,6 +218,6 @@ function update_description() {
 	</div>
 </section>
 
-<?php include("fend.inc"); ?>
+<?php include("foot.inc"); ?>      
 </body>
 </html>
diff --git a/src/www/system_usermanager_addprivs.php b/src/www/system_usermanager_addprivs.php
index 9a6fbc895..6b7f59cbb 100644
--- a/src/www/system_usermanager_addprivs.php
+++ b/src/www/system_usermanager_addprivs.php
@@ -188,6 +188,6 @@ function update_description() {
 </section>
 
 
-<?php include("fend.inc"); ?>
+<?php include("foot.inc"); ?>      
 </body>
 </html>
diff --git a/src/www/system_usermanager_passwordmg.php b/src/www/system_usermanager_passwordmg.php
index 3df2fab10..cecb71117 100644
--- a/src/www/system_usermanager_passwordmg.php
+++ b/src/www/system_usermanager_passwordmg.php
@@ -91,7 +91,7 @@ include("head.inc");
 
 				if ($islocal == false) {
 					echo gettext("Sorry, you cannot change the password for a non-local user.");
-					include("fend.inc");
+                                        include("foot.inc");
 					exit;
 				}
 
diff --git a/src/www/vpn_ipsec_phase2.php b/src/www/vpn_ipsec_phase2.php
index a046a06ce..6c8f87f1b 100644
--- a/src/www/vpn_ipsec_phase2.php
+++ b/src/www/vpn_ipsec_phase2.php
@@ -815,7 +815,7 @@ typesel_change_remote(<?=htmlspecialchars($pconfig['remoteid_netbits'])?>);
 <?php endif; ?>
 //]]>
 </script>
-<?php include("fend.inc"); ?>
+<?php include("foot.inc"); ?>      
 </body>
 </html>
 
diff --git a/src/www/vpn_openvpn_export.php b/src/www/vpn_openvpn_export.php
index 09c9c6b1b..f31bf85a9 100644
--- a/src/www/vpn_openvpn_export.php
+++ b/src/www/vpn_openvpn_export.php
@@ -917,6 +917,6 @@ server_changed();
 //]]>
 </script>
 
-<?php include("fend.inc"); ?>
+<?php include("foot.inc"); ?>      
 </body>
 </html>
diff --git a/src/www/vpn_openvpn_export_shared.php b/src/www/vpn_openvpn_export_shared.php
index d9647c617..be0d05279 100644
--- a/src/www/vpn_openvpn_export_shared.php
+++ b/src/www/vpn_openvpn_export_shared.php
@@ -467,6 +467,6 @@ function useproxy_changed(obj) {
 server_changed();
 //]]>
 </script>
-<?php include("fend.inc"); ?>
+<?php include("foot.inc"); ?>
 </body>
 </html>