diff options
| -rw-r--r-- | config/backup/backup.inc | 8 | ||||
| -rw-r--r-- | config/backup/backup.xml | 8 | ||||
| -rw-r--r-- | config/cron/cron.inc | 10 | ||||
| -rw-r--r-- | config/cron/cron.xml | 8 |
4 files changed, 17 insertions, 17 deletions
diff --git a/config/backup/backup.inc b/config/backup/backup.inc index 13c62f26..b10fceb8 100644 --- a/config/backup/backup.inc +++ b/config/backup/backup.inc @@ -65,14 +65,14 @@ function backup_sync_package_php() } -function php_sync_package() +function backup_sync_package() { global $config; backup_sync_package_php(); } -function php_install_command() +function backup_install_command() { global $config; @@ -98,14 +98,14 @@ function php_install_command() exec("cp /tmp/backup_edit.tmp /usr/local/www/packages/backup/backup_edit.php"); unlink_if_exists("/tmp/backup_edit.tmp"); - php_sync_package(); + backup_sync_package(); conf_mount_ro(); } -function deinstall_command() +function backup_deinstall_command() { conf_mount_rw(); unlink_if_exists("/usr/local/pkg/backup.xml"); diff --git a/config/backup/backup.xml b/config/backup/backup.xml index b48a8e28..8f26e3de 100644 --- a/config/backup/backup.xml +++ b/config/backup/backup.xml @@ -101,15 +101,15 @@ <custom_add_php_command> </custom_add_php_command> <custom_php_resync_config_command> - php_sync_package(); + backup_sync_package(); </custom_php_resync_config_command> <custom_delete_php_command> - php_sync_package(); + backup_sync_package(); </custom_delete_php_command> <custom_php_install_command> - php_install_command(); + backup_install_command(); </custom_php_install_command> <custom_php_deinstall_command> - deinstall_command(); + backup_deinstall_command(); </custom_php_deinstall_command> </packagegui>
\ No newline at end of file diff --git a/config/cron/cron.inc b/config/cron/cron.inc index ea490b3a..3e6b6cea 100644 --- a/config/cron/cron.inc +++ b/config/cron/cron.inc @@ -33,7 +33,7 @@ require_once("services.inc"); -function pkg_is_service_running($servicename) +function pkg_is_service_running($servicename) { exec("/bin/ps ax | awk '{ print $5 }'", $psout); array_shift($psout); @@ -48,7 +48,7 @@ function pkg_is_service_running($servicename) } } -function php_sync_package() +function cron_sync_package() { global $config; @@ -62,7 +62,7 @@ function php_sync_package() } -function php_install_command() +function cron_install_command() { global $config; @@ -93,7 +93,7 @@ function php_install_command() ) ); - php_sync_package(); + cron_sync_package(); //if (pkg_is_service_running('cron')) { //documentation purposes @@ -105,7 +105,7 @@ function php_install_command() } -function deinstall_command() +function cron_deinstall_command() { conf_mount_rw(); config_lock(); diff --git a/config/cron/cron.xml b/config/cron/cron.xml index cbffdeec..9858df8c 100644 --- a/config/cron/cron.xml +++ b/config/cron/cron.xml @@ -107,15 +107,15 @@ <custom_add_php_command> </custom_add_php_command> <custom_php_resync_config_command> - php_sync_package(); + cron_sync_package(); </custom_php_resync_config_command> <custom_delete_php_command> - php_sync_package(); + cron_sync_package(); </custom_delete_php_command> <custom_php_install_command> - php_install_command(); + cron_install_command(); </custom_php_install_command> <custom_php_deinstall_command> - deinstall_command(); + cron_deinstall_command(); </custom_php_deinstall_command> </packagegui>
\ No newline at end of file |