aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/phpservice/phpservice.inc22
-rw-r--r--packages/phpservice/phpservice.xml16
-rw-r--r--packages/phpservice/phpservice_php.tmp2
-rw-r--r--packages/phpservice/phpservice_php_edit.tmp2
-rw-r--r--pkg_config.7.xml2
5 files changed, 22 insertions, 22 deletions
diff --git a/packages/phpservice/phpservice.inc b/packages/phpservice/phpservice.inc
index bed136b2..24ad4e61 100644
--- a/packages/phpservice/phpservice.inc
+++ b/packages/phpservice/phpservice.inc
@@ -153,12 +153,12 @@ function sync_package_phpservice()
function sync_package()
{
- global $config;
- sync_package_phpservice();
+ global $config;
+ sync_package_phpservice();
- //if (!is_dir('/usr/local/www/phpservice/')) {
- //exec("mkdir /usr/local/www/phpservice/");
- //}
+ if (!is_dir('/usr/local/www/packages/phpservice/')) {
+ exec("mkdir /usr/local/www/packages/phpservice/");
+ }
}
@@ -170,17 +170,17 @@ function php_install_command()
conf_mount_rw();
config_lock();
- //if (!is_dir('/usr/local/www/phpservice/')) {
- //exec("mkdir /usr/local/www/phpservice/");
- //}
+ if (!is_dir('/usr/local/www/packages/phpservice/')) {
+ exec("mkdir /usr/local/www/packages/phpservice/");
+ }
//rename PHP files from .tmp to .php
- exec("cp /tmp/phpservice_php.tmp /usr/local/www/phpservice_php.php");
+ exec("cp /tmp/phpservice_php.tmp /usr/local/www/packages/phpservice/phpservice_php.php");
unlink_if_exists("/tmp/phpservice_php.tmp");
- exec("cp /tmp/phpservice.tmp /usr/local/pkg/phpservice.php");
- unlink_if_exists("/tmp/phpservice.tmp");
+ exec("cp /tmp/phpservice_php_edit.tmp /usr/local/www/packages/phpservice/phpservice_php_edit.php");
+ unlink_if_exists("/tmp/phpservice_php_edit.tmp");
//write_config();
diff --git a/packages/phpservice/phpservice.xml b/packages/phpservice/phpservice.xml
index 03e51d26..7ac7a845 100644
--- a/packages/phpservice/phpservice.xml
+++ b/packages/phpservice/phpservice.xml
@@ -41,7 +41,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>PHP Service Settings</name>
- <version>0.1</version>
+ <version>0.2</version>
<title>Settings</title>
<include_file>/usr/local/pkg/phpservice.inc</include_file>
<menu>
@@ -49,12 +49,12 @@
<tooltiptext>PHP Service settings.</tooltiptext>
<section>Services</section>
<configfile>phpservice.xml</configfile>
- <url>/phpservice.php</url>
+ <url>/packages/phpservice_php.php</url>
</menu>
<service>
<name>PHPService</name>
- <rcfile>phpservice.sh</rcfile>
- <executable>phpservice</executable>
+ <rcfile>phpservice.sh</rcfile>
+ <executable>phpservice</executable>
<description>PHP Service</description>
</service>
<tabs>
@@ -65,7 +65,7 @@
</tab>
<tab>
<text>Settings</text>
- <url>/phpservice_php.php</url>
+ <url>/packages/phpservice_php.php</url>
<active/>
</tab>
</tabs>
@@ -81,7 +81,7 @@
<item>http://www.pfsense.com/packages/config/phpservice/phpservice.inc</item>
</additional_files_needed>
<additional_files_needed>
- <prefix>/usr/local/www/</prefix>
+ <prefix>/tmp/</prefix>
<chmod>0755</chmod>
<item>http://www.pfsense.com/packages/config/phpservice/phpservice_php.tmp</item>
</additional_files_needed>
@@ -107,10 +107,10 @@
<custom_add_php_command>
</custom_add_php_command>
<custom_php_resync_config_command>
- sync_package_phpservice_settings();
+ sync_package();
</custom_php_resync_config_command>
<custom_delete_php_command>
- sync_package_phpservice_settings();
+ sync_package();
</custom_delete_php_command>
<custom_php_install_command>
php_install_command();
diff --git a/packages/phpservice/phpservice_php.tmp b/packages/phpservice/phpservice_php.tmp
index 2e054a18..21315780 100644
--- a/packages/phpservice/phpservice_php.tmp
+++ b/packages/phpservice/phpservice_php.tmp
@@ -59,7 +59,7 @@ include("head.inc");
<?php
$tab_array = array();
- $tab_array[] = array(gettext("PHP"), false, "/phpservice_php.php");
+ $tab_array[] = array(gettext("PHP"), false, "/packages/phpservice_php.php");
display_top_tabs($tab_array);
?>
diff --git a/packages/phpservice/phpservice_php_edit.tmp b/packages/phpservice/phpservice_php_edit.tmp
index 0e03131f..a077a3ba 100644
--- a/packages/phpservice/phpservice_php_edit.tmp
+++ b/packages/phpservice/phpservice_php_edit.tmp
@@ -100,7 +100,7 @@ function show_advanced_config() {
<?php
$tab_array = array();
- $tab_array[] = array(gettext("PHP"), false, "/phpservice_php.php");
+ $tab_array[] = array(gettext("PHP"), false, "/packages/phpservice_php.php");
display_top_tabs($tab_array);
?>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 1ec3edca..99799575 100644
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -94,7 +94,7 @@
<pkginfolink></pkginfolink>
<config_file></config_file>
<depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
- <version>0.1</version>
+ <version>0.2</version>
<status>Alpha</status>
<required_version>1.2.1</required_version>
<maintainer>markjcrane@gmail.com</maintainer>