lcdproc - code style fixes

- Add missing copyright header
- Fix permissions
- Fix indentation
- Remove useless functions

1 files changed, 71 insertions, 34 deletions

diff --git a/config/lcdproc/lcdproc.xml b/config/lcdproc/lcdproc.xml
index 8f268b49..4f109e47 100644
--- a/config/lcdproc/lcdproc.xml
+++ b/config/lcdproc/lcdproc.xml
@@ -1,8 +1,51 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
+	<copyright>
+<![CDATA[
+/* $Id$ */
+/* ====================================================================================== */
+/*
+	lcdproc.xml
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2007-2009 Seth Mos <seth.mos@dds.nl>
+	Copyright (C) 2009 Scott Ullrich
+	Copyright (C) 2011 Michele Di Maria
+	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.
+*/
+/* ====================================================================================== */
+	]]>
+	</copyright>
 	<title>Services: LCDproc</title>
 	<name>lcdproc</name>
-	<version>0.5.5 pkg.v.1.0.1</version>
+	<version>1.0.3</version>
 	<savetext>Save</savetext>
 	<include_file>/usr/local/pkg/lcdproc.inc</include_file>
 	<tabs>
@@ -18,44 +61,41 @@
 	</tabs>
 	<menu>
 		<name>LCDproc</name>
-		<tooltiptext>Set LCDproc settings such as display driver and com port</tooltiptext>
+		<tooltiptext>Set LCDproc settings such as display driver and COM port.</tooltiptext>
 		<section>Services</section>
 		<url>/pkg_edit.php?xml=lcdproc.xml&amp;id=0</url>
 	</menu>
 	<additional_files_needed>
 		<item>https://packages.pfsense.org/packages/config/lcdproc/lcdproc.inc</item>
-	    <prefix>/usr/local/pkg/</prefix>
-	    <chmod>0755</chmod>
+		<prefix>/usr/local/pkg/</prefix>
 	</additional_files_needed>
 	<additional_files_needed>
 		<item>https://packages.pfsense.org/packages/config/lcdproc/lcdproc_screens.xml</item>
-	    <prefix>/usr/local/pkg/</prefix>
-	    <chmod>0755</chmod>
+		<prefix>/usr/local/pkg/</prefix>
 	</additional_files_needed>
 	<additional_files_needed>
 		<item>https://packages.pfsense.org/packages/config/lcdproc/lcdproc_client.php</item>
-	    <prefix>/usr/local/pkg/</prefix>
-	    <chmod>0755</chmod>
+		<prefix>/usr/local/pkg/</prefix>
 	</additional_files_needed>
 	<additional_files_needed>
 		<item>https://files.pfsense.org/packages/lcdproc/nexcom.so</item>
-	    <prefix>/usr/local/lib/lcdproc/</prefix>
-	    <chmod>0755</chmod>
+		<prefix>/usr/local/lib/lcdproc/</prefix>
+		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
 		<item>https://files.pfsense.org/packages/lcdproc/SureElec.so</item>
-	    <prefix>/usr/local/lib/lcdproc/</prefix>
-	    <chmod>0755</chmod>
-	</additional_files_needed>	
+		<prefix>/usr/local/lib/lcdproc/</prefix>
+		<chmod>0755</chmod>
+	</additional_files_needed>
 	<additional_files_needed>
 		<item>https://files.pfsense.org/packages/lcdproc/picolcd.so</item>
-	    <prefix>/usr/local/lib/lcdproc/</prefix>
-	    <chmod>0755</chmod>
+		<prefix>/usr/local/lib/lcdproc/</prefix>
+		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
 		<item>https://files.pfsense.org/packages/lcdproc/libusb.so.2</item>
-	    <prefix>/usr/local/lib/lcdproc/</prefix>
-	    <chmod>0755</chmod>
+		<prefix>/usr/local/lib/lcdproc/</prefix>
+		<chmod>0755</chmod>
 	</additional_files_needed>
 	<service>
 		<name>lcdproc</name>
@@ -71,8 +111,8 @@
 		</field>
 		<field>
 			<fieldname>comport</fieldname>
-			<fielddescr>Com Port</fielddescr>
-			<description>Set the com port LCDproc should use.</description>
+			<fielddescr>COM Port</fielddescr>
+			<description>Set the COM port LCDproc should use.</description>
 			<type>select</type>
 			<options>
 				<option>
@@ -81,15 +121,15 @@
 				</option>
 				<option>
 					<value>com2</value>
-					<name>Serial Com port 2 (/dev/cua1)</name>
+					<name>Serial COM port 2 (/dev/cua1)</name>
 				</option>
 				<option>
 					<value>ucom1</value>
-					<name>USB Com port 1 (/dev/cuaU0)</name>
+					<name>USB COM port 1 (/dev/cuaU0)</name>
 				</option>
 				<option>
 					<value>ucom2</value>
-					<name>USB Com port 2 (/dev/cuaU1)</name>
+					<name>USB COM port 2 (/dev/cuaU1)</name>
 				</option>
 				<option>
 					<value>lpt1</value>
@@ -97,16 +137,16 @@
 				</option>
 				<option>
 					<value>ugen0.2</value>
-					<name>USB Com port 1 alternate (/dev/ugen0.2)</name>
-				</option>				
+					<name>USB COM port 1 alternate (/dev/ugen0.2)</name>
+				</option>
 				<option>
 					<value>ugen1.2</value>
-					<name>USB Com port 2 alternate (/dev/ugen1.2)</name>
+					<name>USB COM port 2 alternate (/dev/ugen1.2)</name>
 				</option>
 				<option>
 					<value>ugen2.2</value>
-					<name>USB Com port 3 alternate (/dev/ugen2.2)</name>
-				</option>				
+					<name>USB COM port 3 alternate (/dev/ugen2.2)</name>
+				</option>
 			</options>
 			<default_value>ucom1</default_value>
 		</field>
@@ -272,7 +312,7 @@
 				<option>
 					<value>pyramid</value>
 					<name>pyramid</name>
-				</option>				
+				</option>
 				<option>
 					<value>picolcd</value>
 					<name>picolcd</name>
@@ -304,7 +344,7 @@
 				<option>
 					<value>SureElec</value>
 					<name>SureElec</name>
-				</option>				
+				</option>
 				<option>
 					<value>svga</value>
 					<name>svga</name>
@@ -335,7 +375,7 @@
 		<field>
 			<fieldname>refresh_frequency</fieldname>
 			<fielddescr>Refresh frequency</fielddescr>
-			<description>Set the refresh frequency of the information on the LCD Panel</description>
+			<description>Set the refresh frequency of the information on the LCD Panel.</description>
 			<type>select</type>
 			<options>
 				<option>
@@ -360,11 +400,8 @@
 				</option>
 			</options>
 			<default_value>5</default_value>
-		</field>		
+		</field>
 	</fields>
-	<custom_php_command_before_form>
-		before_form_lcdproc($pkg);
-	</custom_php_command_before_form>
 	<custom_php_validation_command>
 		validate_form_lcdproc($_POST, $input_errors);
 	</custom_php_validation_command>