phpservice - rewrite garbage package

Another quality stuff from the same guy... :-(

1 files changed, 45 insertions, 82 deletions

diff --git a/config/phpservice/phpservice.xml b/config/phpservice/phpservice.xml
index eb7e670e..e437be20 100644
--- a/config/phpservice/phpservice.xml
+++ b/config/phpservice/phpservice.xml
@@ -1,47 +1,49 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE packagegui SYSTEM "./schema/packages.dtd">
-<?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-        <copyright>
-        <![CDATA[
+	<copyright>
+<![CDATA[
 /* $Id$ */
-/* ========================================================================== */
+/* ====================================================================================== */
 /*
-    phpservice.xml
-    Copyright (C) 2008 Mark J Crane
-    All rights reserved.
-                                                                              */
-/* ========================================================================== */
+	phpservice.xml
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2008 Mark J Crane
+	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:
+	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.
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
 
-    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>
-    <description>PHP Service</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
+	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>
+	<description>PHP Service</description>
 	<name>PHP Service Settings</name>
-	<version>0.4.1</version>
+	<version>0.5.0</version>
 	<title>Settings</title>
 	<include_file>/usr/local/pkg/phpservice.inc</include_file>
 	<menu>
@@ -55,66 +57,27 @@
 		<name>phpservice</name>
 		<rcfile>phpservice.sh</rcfile>
 		<executable>phpservice</executable>
-		<description>PHP run from a command line as a service.</description>    
+		<description>PHP script as a service</description>
 		<custom_php_service_status_command>
-			exec("/bin/pgrep -f phpservice");
+			exec("/bin/pgrep -fq phpservice");
 		</custom_php_service_status_command>
 	</service>
-	<tabs>
-		<tab>
-			<text>Settings</text>
-			<url>/pkg_edit.php?xml=phpservice.xml&amp;id=0</url>
-			<active/>
-		</tab>
-		<tab>
-			<text>Settings</text>
-			<url>/packages/phpservice_php.php</url>
-			<active/>
-		</tab>		
-	</tabs>
-	<configpath>installedpackages->package->$packagename->configuration->phpservice</configpath>	
+	<configpath>installedpackages->package->$packagename->configuration->phpservice</configpath>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>		
-		<item>https://packages.pfsense.org/packages/config/phpservice/phpservice.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>		
 		<item>https://packages.pfsense.org/packages/config/phpservice/phpservice.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>		
-		<item>https://packages.pfsense.org/packages/config/phpservice/phpservice_php.tmp</item>
+		<prefix>/usr/local/www/packages/phpservice/</prefix>
+		<item>https://packages.pfsense.org/packages/config/phpservice/phpservice_php.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>		
-		<item>https://packages.pfsense.org/packages/config/phpservice/phpservice_php_edit.tmp</item>
-	</additional_files_needed>			
-	<fields>
-		<field>
-			<fielddescr>Variable One</fielddescr>
-			<fieldname>var1</fieldname>
-			<description>Enter the variable one here.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fielddescr>Variable Two</fielddescr>
-			<fieldname>var1</fieldname>
-			<description>Enter the variable one here.</description>
-			<type>input</type>
-		</field>
-	</fields>	
-	<custom_add_php_command>
-	</custom_add_php_command>
+		<prefix>/usr/local/www/packages/phpservice/</prefix>
+		<item>https://packages.pfsense.org/packages/config/phpservice/phpservice_php_edit.php</item>
+	</additional_files_needed>
 	<custom_php_resync_config_command>
 		phpservice_sync_package();
 	</custom_php_resync_config_command>
-	<custom_delete_php_command>    
-		phpservice_sync_package();
-	</custom_delete_php_command>
 	<custom_php_install_command>
 		phpservice_install_command();
 	</custom_php_install_command>