From 2f0401aff51314420c2da65f08465ccb4906c6ab Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Fri, 18 Apr 2014 14:33:46 +0000
Subject: Remove problematic code without proper checks but even not needed
 here

---
 usr/local/www/diag_limiter_info.php    | 4 ----
 usr/local/www/diag_pf_info.php         | 4 ----
 usr/local/www/diag_system_activity.php | 4 ----
 usr/local/www/diag_system_pftop.php    | 4 ----
 usr/local/www/installer/installer.php  | 3 ---
 5 files changed, 19 deletions(-)

(limited to 'usr/local')

diff --git a/usr/local/www/diag_limiter_info.php b/usr/local/www/diag_limiter_info.php
index 25d066c..eb592b5 100644
--- a/usr/local/www/diag_limiter_info.php
+++ b/usr/local/www/diag_limiter_info.php
@@ -41,8 +41,6 @@
 
 require("guiconfig.inc");
 
-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-
 $pgtitle = gettext("Diagnostics: Limiter Info");
 $shortcut_section = "trafficshaper-limiters";
 
@@ -86,8 +84,6 @@ include("head.inc");
 <div id='maincontent'>
 <?php
 	include("fbegin.inc"); 
-	if(strstr($pfSversion, "1.2")) 
-		echo "<p class=\"pgtitle\">{$pgtitle}</p>";
 	if($savemsg) {
 		echo "<div id='savemsg'>";
 		print_info_box($savemsg);
diff --git a/usr/local/www/diag_pf_info.php b/usr/local/www/diag_pf_info.php
index 71430df..ce7bd90 100644
--- a/usr/local/www/diag_pf_info.php
+++ b/usr/local/www/diag_pf_info.php
@@ -41,8 +41,6 @@
 
 require("guiconfig.inc");
 
-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-
 $pgtitle = gettext("Diagnostics: pfInfo");
 
 if($_REQUEST['getactivity']) {
@@ -80,8 +78,6 @@ jQuery(document).ready(function() {setTimeout('getpfinfo()', 5000);});
 <div id='maincontent'>
 <?php
 	include("fbegin.inc"); 
-	if(strstr($pfSversion, "1.2")) 
-		echo "<p class=\"pgtitle\">{$pgtitle}</p>";
 	if($savemsg) {
 		echo "<div id='savemsg'>";
 		print_info_box($savemsg);
diff --git a/usr/local/www/diag_system_activity.php b/usr/local/www/diag_system_activity.php
index b3f9634..b3ba57b 100644
--- a/usr/local/www/diag_system_activity.php
+++ b/usr/local/www/diag_system_activity.php
@@ -41,8 +41,6 @@
 
 require("guiconfig.inc");
 
-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-
 $pgtitle = gettext("Diagnostics: System Activity");
 
 if($_REQUEST['getactivity']) {
@@ -78,8 +76,6 @@ include("head.inc");
 <div id='maincontent'>
 <?php
 	include("fbegin.inc"); 
-	if(strstr($pfSversion, "1.2")) 
-		echo "<p class=\"pgtitle\">{$pgtitle}</p>";
 	if($savemsg) {
 		echo "<div id='savemsg'>";
 		print_info_box($savemsg);
diff --git a/usr/local/www/diag_system_pftop.php b/usr/local/www/diag_system_pftop.php
index 97c1b7a..c70b3ad 100644
--- a/usr/local/www/diag_system_pftop.php
+++ b/usr/local/www/diag_system_pftop.php
@@ -40,8 +40,6 @@
 
 require("guiconfig.inc");
 
-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-
 $pgtitle = gettext("Diagnostics: pfTop");
 
 $sorttypes = array('age', 'bytes', 'dest', 'dport', 'exp', 'none', 'peak', 'pkt', 'rate', 'size', 'sport', 'src');
@@ -115,8 +113,6 @@ if($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], $sorttypes)
 <div id='maincontent'>
 <?php
 	include("fbegin.inc"); 
-	if(strstr($pfSversion, "1.2")) 
-		echo "<p class=\"pgtitle\">{$pgtitle}</p>";
 	if($savemsg) {
 		echo "<div id='savemsg'>";
 		print_info_box($savemsg);
diff --git a/usr/local/www/installer/installer.php b/usr/local/www/installer/installer.php
index 090c537..85360be 100644
--- a/usr/local/www/installer/installer.php
+++ b/usr/local/www/installer/installer.php
@@ -404,9 +404,6 @@ EOF;
 
 function body_html() {
 	global $g, $fstype, $savemsg;
-	$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-	if(strstr($pfSversion, "1.2")) 
-		$one_two = true;
 	$pgtitle = array("{$g['product_name']}", gettext("Installer"));
 	include("head.inc");
 	echo <<<EOF
-- 
cgit v1.1