Refactor code style

shadonet · shadonet · commit f1eae4d4dcf9 · 2018-02-20T00:40:58.000+01:00
diff --git a/files/usr/local/pkg/bro.inc b/files/usr/local/pkg/bro.inc
@@ -74,6 +74,7 @@ function bro_enabled() {
 	}
 	return $bro_enabled;
 }
+
 // Check whether Bro Cluster is enabled
 function bro_cluster_enabled() {
 	global $config, $bro_cluster_enabled;
@@ -158,7 +159,6 @@ fi
 EOD;
 
 	 write_rcfile($rcfile);
-
  }
 
  /*
@@ -365,7 +365,7 @@ EOD;
 	 //$settings = $config['installedpackages']['broscript']['config'];
 	 if (!bro_enabled()) {
 		 $input_errors[] = 'You must enabled Bro instance first';
-	 }else {
+	 } else {
 		 if (substr($post['broscriptpath'], -1, 1) == '/') {
 			 $input_errors[] = 'Script location must not end with a / character.';
 		 }
@@ -448,8 +448,7 @@ EOD;
 
 		file_put_contents($nodefile, $conf);
 		chmod($nodefile, 0640);
-
-}
+	}
 
 	$conf = '';
 	$conf .= <<< EOD
@@ -655,7 +654,7 @@ EOD;
 		file_put_contents($nodefile, $conf);
 		chmod($nodefile, 0640);
 
-}
+	}
 	bro_sync_on_changes();
 	bro_restart_services();
 }
@@ -792,20 +791,19 @@ $filename
 $newline
 
 EOD;
+		}
 	}
-}
 
 	$destpath = '/usr/local/share/bro/site/local.bro';
 
 	file_put_contents($destpath, $conf);
 	chmod($destpath, 0640);
-	
 
 	}else {
 		log_error("You must enabled Bro instance first.");
 	}
-bro_sync_on_changes();
-bro_restart_services();
+	bro_sync_on_changes();
+	bro_restart_services();
 }
 
 /*
diff --git a/files/usr/local/pkg/bro.xml b/files/usr/local/pkg/bro.xml
@@ -8,34 +8,21 @@
 		/* ====================================================================================== */
 		/*
 		bro.xml
-		part of pfSense (https://www.pfSense.org/)
-		Copyright (C) 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.
+		*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.
 		*/
 		/* ====================================================================================== */
 		]]>
@@ -139,16 +126,16 @@
 			<encoding>base64</encoding>
 		</field>
 	</fields>
-	<custom_php_validation_command>
-		bro_validate_general($_POST, $input_errors);
-	</custom_php_validation_command>
-	<custom_php_resync_config_command>
-		bro_settings_resync();
-	</custom_php_resync_config_command>
 	<custom_php_install_command>
 		bro_install_command();
 	</custom_php_install_command>
 	<custom_php_deinstall_command>
 		bro_deinstall_command();
 	</custom_php_deinstall_command>
+	<custom_php_validation_command>
+		bro_validate_general($_POST, $input_errors);
+	</custom_php_validation_command>
+	<custom_php_resync_config_command>
+		bro_settings_resync();
+	</custom_php_resync_config_command>
 </packagegui>
diff --git a/files/usr/local/pkg/bro_broctl.xml b/files/usr/local/pkg/bro_broctl.xml
@@ -7,35 +7,22 @@
 		/* $Id$ */
 		/* ====================================================================================== */
 		/*
-		bro.xml
-		part of pfSense (https://www.pfSense.org/)
-		Copyright (C) 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_broctl.xml
+		* 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.
 		*/
 		/* ====================================================================================== */
 		]]>
diff --git a/files/usr/local/pkg/bro_cluster.xml b/files/usr/local/pkg/bro_cluster.xml
@@ -7,35 +7,22 @@
 		/* $Id$ */
 		/* ====================================================================================== */
 		/*
-		bro.xml
-		part of pfSense (https://www.pfSense.org/)
-		Copyright (C) 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_cluster.xml
+		* 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.
 		*/
 		/* ====================================================================================== */
 		]]>
diff --git a/files/usr/local/pkg/bro_log.xml b/files/usr/local/pkg/bro_log.xml
@@ -7,35 +7,22 @@
 		/* $Id$ */
 		/* ====================================================================================== */
 		/*
-		bro.xml
-		part of pfSense (https://www.pfSense.org/)
-		Copyright (C) 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_log.xml
+		* 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.
 		*/
 		/* ====================================================================================== */
 		]]>
diff --git a/files/usr/local/pkg/bro_script.xml b/files/usr/local/pkg/bro_script.xml
@@ -7,35 +7,22 @@
 		/* $Id$ */
 		/* ====================================================================================== */
 		/*
-		bro.xml
-		part of pfSense (https://www.pfSense.org/)
-		Copyright (C) 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_script.xml
+		* 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.
 		*/
 		/* ====================================================================================== */
 		]]>
diff --git a/files/usr/local/pkg/bro_sync.xml b/files/usr/local/pkg/bro_sync.xml
