From 3485f67d6435f164c6de52b9ef42213c0f50dfe1 Mon Sep 17 00:00:00 2001
From: Mark Crane <mcrane@pfsense.org>
Date: Thu, 22 Jan 2009 21:04:27 +0000
Subject: phpservice package work on installation take 1

---
 packages/phpservice/phpservice.inc | 8 ++++----
 packages/phpservice/phpservice.xml | 4 ++--
 pkg_config.7.xml                   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/phpservice/phpservice.inc b/packages/phpservice/phpservice.inc
index 0498c3ce..be5eaad5 100644
--- a/packages/phpservice/phpservice.inc
+++ b/packages/phpservice/phpservice.inc
@@ -58,7 +58,7 @@ function byte_convert( $bytes ) {
 }
 
  
-function sync_package_phpservice()
+function phpservice_sync_package_php()
 {
 
   global $config; 
@@ -150,11 +150,11 @@ function sync_package_phpservice()
 }
 
 
-function php_sync_package() 
+function phpservice_sync_package() 
 {
   
 	global $config;   
-	sync_package_phpservice();
+	phpservice_sync_package_php();
 
 	if (!is_dir('/usr/local/www/packages/phpservice/')) {
 	   exec("mkdir /usr/local/www/packages/phpservice/");
@@ -193,7 +193,7 @@ function php_install_command()
 		)
 	);
 		  	       
-	php_sync_package();
+	phpservice_sync_package();
 	$handle = popen("/usr/local/etc/rc.d/phpservice.sh start", "r");
 	pclose($handle);
 	
diff --git a/packages/phpservice/phpservice.xml b/packages/phpservice/phpservice.xml
index 89335b60..211e9554 100644
--- a/packages/phpservice/phpservice.xml
+++ b/packages/phpservice/phpservice.xml
@@ -107,10 +107,10 @@
 	<custom_add_php_command>
 	</custom_add_php_command>
 	<custom_php_resync_config_command>
-		php_sync_package();
+		phpservice_sync_package();
 	</custom_php_resync_config_command>
 	<custom_delete_php_command>    
-		php_sync_package();
+		phpservice_sync_package();
 	</custom_delete_php_command>
 	<custom_php_install_command>
 		php_install_command();
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 57d27174..1cecdb0a 100644
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -94,7 +94,7 @@
       <pkginfolink></pkginfolink>
       <config_file>http://www.pfsense.com/packages/config/phpservice/phpservice.xml</config_file>
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
-      <version>0.2.2</version>
+      <version>0.2.3</version>
       <status>Alpha</status>
       <required_version>1.2.1</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>
-- 
cgit v1.2.3