aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2010-11-09 15:10:57 -0500
committerjim-p <jimp@pfsense.org>2010-11-09 15:10:57 -0500
commite73357ec940a870acc880ffb72673c50cdfcb249 (patch)
tree77a5cf7dbd182854278973e4341f22e829fab349
parent8ca5710af46e370e91abc319cc5568cbc9d7ff4f (diff)
downloadpfsense-packages-e73357ec940a870acc880ffb72673c50cdfcb249.tar.gz
pfsense-packages-e73357ec940a870acc880ffb72673c50cdfcb249.tar.bz2
pfsense-packages-e73357ec940a870acc880ffb72673c50cdfcb249.zip
Unique function names
-rw-r--r--config/tftp/tftp.inc10
-rw-r--r--config/tftp/tftp.xml8
2 files changed, 9 insertions, 9 deletions
diff --git a/config/tftp/tftp.inc b/config/tftp/tftp.inc
index ba77818a..9d06573c 100644
--- a/config/tftp/tftp.inc
+++ b/config/tftp/tftp.inc
@@ -53,7 +53,7 @@ function guid()
//echo guid();
-function pkg_is_service_running($servicename)
+function pkg_is_service_running($servicename)
{
exec("/bin/ps ax | awk '{ print $5 }'", $psout);
array_shift($psout);
@@ -80,7 +80,7 @@ function byte_convert( $bytes ) {
}
-function php_sync_package()
+function tftp_sync_package()
{
//global $config;
@@ -93,7 +93,7 @@ function php_sync_package()
}
-function php_install_command()
+function tftp_install_command()
{
global $config;
@@ -244,7 +244,7 @@ function php_install_command()
);
- //php_sync_package();
+ //tftp_sync_package();
$handle = popen("/usr/sbin/inetd", "r");
pclose($handle);
@@ -258,7 +258,7 @@ function php_install_command()
}
-function php_deinstall_command()
+function tftp_deinstall_command()
{
//prepare inetd.conf for tftp
diff --git a/config/tftp/tftp.xml b/config/tftp/tftp.xml
index 5a2cefa5..720ac212 100644
--- a/config/tftp/tftp.xml
+++ b/config/tftp/tftp.xml
@@ -77,15 +77,15 @@
<custom_add_php_command>
</custom_add_php_command>
<custom_php_resync_config_command>
- php_sync_package();
+ tftp_sync_package();
</custom_php_resync_config_command>
<custom_delete_php_command>
- php_sync_package();
+ tftp_sync_package();
</custom_delete_php_command>
<custom_php_install_command>
- php_install_command();
+ tftp_install_command();
</custom_php_install_command>
<custom_php_deinstall_command>
- php_deinstall_command();
+ tftp_deinstall_command();
</custom_php_deinstall_command>
</packagegui> \ No newline at end of file