Update to support 2.4.x pfSense version

Author: shadonet

files/etc/inc/priv/bro.priv.inc

@@ -1,30 +1,21 @@
 <?php
 /*
-	bro.priv.inc
-	part of pfSense (http://www.pfSense.org/)
-	Copyright (C) 2015 ESF, LLC
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
+	* bro.priv.inc
+  * part of pfSense (https://www.pfSense.org/)
+  * Copyright (c) 2018 Prosper Doko
+  * All rights reserved.
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+  *
+  * http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
 */
 global $priv_list;
 

files/usr/local/pkg/bro.inc

@@ -1,8 +1,8 @@
 <?php
 /*
-*bro.inc
-*part of pfSense (https://www.pfSense.org/)
-*Copyright (c) 2018 Prosper Doko
+* bro.inc
+* part of pfSense (https://www.pfSense.org/)
+* Copyright (c) 2018 Prosper Doko
 * All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");

files/usr/local/www/bro_alert_data.php

@@ -1,38 +1,29 @@
 <?php
 /*
-bro_monitor_data.php
-part of pfSense (https://www.pfSense.org/)
-Copyright (C) 2015-2016 Prosper Doko
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+* bro_monitor_data.php
+* part of pfSense (https://www.pfSense.org/)
+* Copyright (c) 2018 Prosper Doko
+* All rights reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
 */
+
 require_once("guiconfig.inc");
 
 /* Requests */
 if ($_POST) {
 	global $program, $logfile;
-	// Actions
-	//$filter = preg_replace('/(@|!|>|<)/', "", htmlspecialchars($_POST['strfilter']));
+
 	$program = strtolower($_POST['program']);
 	$logfile = $_POST['logfile'];
 
@@ -45,7 +36,6 @@
 
 		foreach ($loghead as $value) {
 			if (preg_match("/\bfields\b/", $value)) {
-				//	$headfield = preg_split("/[\s,]+/", $value);
 				$headfield = preg_split("/[\t,]/", $value);
 				show_tds($headfield);
 				break;
@@ -76,7 +66,7 @@
 /* Functions */
 function fetch_head($log) {
 	$log = escapeshellarg($log);
-	// Get logs based in filter expression
+	// Get logs first 10 lines
 	exec("/usr/bin/head -n 10 {$log}", $loghead);
 	// Return logs head
 	return $loghead;

files/usr/local/www/bro_alerts.php

@@ -1,31 +1,23 @@
 <?php
 /*
-bro_alerts.php
-part of pfSense (https://www.pfSense.org/)
-Copyright (C) 2015-2016 Prosper Doko
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+* bro_alerts.php
+* part of pfSense (https://www.pfSense.org/)
+* Copyright (c) 2018 Prosper Doko
+* All rights reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
 */
+
 require_once("/etc/inc/util.inc");
 require_once("/etc/inc/functions.inc");
 require_once("/etc/inc/pkg-utils.inc");

files/usr/local/www/select_box_file.php

@@ -2,7 +2,7 @@
 //list_by_ext: returns an array containing an alphabetic list of files in the specified directory ($path) with a file extension that matches $extension
 
 function list_by_ext($extension, $path){
-  $list = array(); //initialise a variable
+  $list = array();
   $dir_handle = @opendir($path) or die("Unable to open $path"); //attempt to open path
   while($file = readdir($dir_handle)){ //loop through all the files in the path
     if($file == "." || $file == ".."){continue;} //ignore these