diff options
| author | jim-p <jimp@pfsense.org> | 2010-11-09 15:16:14 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2010-11-09 15:16:14 -0500 |
| commit | c70b574412951f52e30dcc4b1bf251c5d2e47819 (patch) | |
| tree | ba801064dffda50b80511792e592a7e6faaf1a26 | |
| parent | e284125663f36249ac6ee8c16e5b09878a035307 (diff) | |
| download | pfsense-packages-c70b574412951f52e30dcc4b1bf251c5d2e47819.tar.gz pfsense-packages-c70b574412951f52e30dcc4b1bf251c5d2e47819.tar.bz2 pfsense-packages-c70b574412951f52e30dcc4b1bf251c5d2e47819.zip | |
Unique function names
| -rw-r--r-- | config/phpservice/phpservice.inc | 10 | ||||
| -rw-r--r-- | config/phpservice/phpservice.xml | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/config/phpservice/phpservice.inc b/config/phpservice/phpservice.inc index 421ac94d..d346713a 100644 --- a/config/phpservice/phpservice.inc +++ b/config/phpservice/phpservice.inc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -function pkg_is_service_running($servicename) +function pkg_is_service_running($servicename) { exec("/bin/ps ax | awk '{ print $5 }'", $psout); array_shift($psout); @@ -153,7 +153,7 @@ function phpservice_sync_package_php() } -function php_sync_package() +function phpservice_sync_package() { global $config; @@ -162,7 +162,7 @@ function php_sync_package() } -function php_install_command() +function phpservice_install_command() { global $config; @@ -194,7 +194,7 @@ function php_install_command() ) ); - php_sync_package(); + phpservice_sync_package(); //$handle = popen("/usr/local/etc/rc.d/phpservice.sh start", "r"); //pclose($handle); @@ -208,7 +208,7 @@ function php_install_command() } -function deinstall_command() +function phpservice_deinstall_command() { conf_mount_rw(); diff --git a/config/phpservice/phpservice.xml b/config/phpservice/phpservice.xml index 225590b8..765dc8c7 100644 --- a/config/phpservice/phpservice.xml +++ b/config/phpservice/phpservice.xml @@ -107,15 +107,15 @@ <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(); + phpservice_install_command(); </custom_php_install_command> <custom_php_deinstall_command> - deinstall_command(); + phpservice_deinstall_command(); </custom_php_deinstall_command> </packagegui>
\ No newline at end of file |