diff options
| author | Ermal <eri@pfsense.org> | 2011-08-03 20:50:11 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2011-08-03 20:52:08 +0000 |
| commit | c4d83bf81002886b9b23c35280d0b7a0eff60396 (patch) | |
| tree | e81bd6deb9343ae1938f83ccda075403be5a1ebd | |
| parent | cfaccd8134214364a19d2cf8de6e7cbaa95322b3 (diff) | |
| download | pfsense-c4d83bf81002886b9b23c35280d0b7a0eff60396.zip pfsense-c4d83bf81002886b9b23c35280d0b7a0eff60396.tar.gz | |
Move seting up of tabs/menus/service entries after custom php commands. Seems there is something tripping config vars that make these steps not work.
| -rw-r--r-- | etc/inc/pkg-utils.inc | 81 |
1 files changed, 54 insertions, 27 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index 4326c8e..da783a0 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -754,6 +754,60 @@ function install_package_xml($pkg) { return false; } } + + /* custom commands */ + $static_output .= gettext("Custom commands...") . "\n"; + update_output_window($static_output); + if ($missing_include == false) { + if($pkg_config['custom_php_global_functions'] <> "") { + $static_output .= gettext("Executing custom_php_global_functions()..."); + update_output_window($static_output); + eval_once($pkg_config['custom_php_global_functions']); + $static_output .= gettext("done.") . "\n"; + update_output_window($static_output); + } + if($pkg_config['custom_php_install_command']) { + $static_output .= gettext("Executing custom_php_install_command()..."); + update_output_window($static_output); + eval_once($pkg_config['custom_php_install_command']); + $static_output .= gettext("done.") . "\n"; + update_output_window($static_output); + } + if($pkg_config['custom_php_resync_config_command'] <> "") { + $static_output .= gettext("Executing custom_php_resync_config_command()..."); + update_output_window($static_output); + eval_once($pkg_config['custom_php_resync_config_command']); + $static_output .= gettext("done.") . "\n"; + update_output_window($static_output); + } + } + + /* custom commands */ + $static_output .= "Custom commands...\n"; + update_output_window($static_output); + if ($missing_include == false) { + if($pkg_config['custom_php_global_functions'] <> "") { + $static_output .= "Executing custom_php_global_functions()..."; + update_output_window($static_output); + eval_once($pkg_config['custom_php_global_functions']); + $static_output .= "done.\n"; + update_output_window($static_output); + } + if($pkg_config['custom_php_install_command']) { + $static_output .= "Executing custom_php_install_command()..."; + update_output_window($static_output); + eval_once($pkg_config['custom_php_install_command']); + $static_output .= "done.\n"; + update_output_window($static_output); + } + if($pkg_config['custom_php_resync_config_command'] <> "") { + $static_output .= "Executing custom_php_resync_config_command()..."; + update_output_window($static_output); + eval_once($pkg_config['custom_php_resync_config_command']); + $static_output .= "done.\n"; + update_output_window($static_output); + } + } /* sidebar items */ if(is_array($pkg_config['menu'])) { $static_output .= "Menu items... "; @@ -802,33 +856,6 @@ function install_package_xml($pkg) { $static_output .= "done.\n"; update_output_window($static_output); } - - /* custom commands */ - $static_output .= "Custom commands...\n"; - update_output_window($static_output); - if ($missing_include == false) { - if($pkg_config['custom_php_global_functions'] <> "") { - $static_output .= "Executing custom_php_global_functions()..."; - update_output_window($static_output); - eval_once($pkg_config['custom_php_global_functions']); - $static_output .= "done.\n"; - update_output_window($static_output); - } - if($pkg_config['custom_php_install_command']) { - $static_output .= "Executing custom_php_install_command()..."; - update_output_window($static_output); - eval_once($pkg_config['custom_php_install_command']); - $static_output .= "done.\n"; - update_output_window($static_output); - } - if($pkg_config['custom_php_resync_config_command'] <> "") { - $static_output .= "Executing custom_php_resync_config_command()..."; - update_output_window($static_output); - eval_once($pkg_config['custom_php_resync_config_command']); - $static_output .= "done.\n"; - update_output_window($static_output); - } - } } else { $static_output .= "Loading package configuration... failed!\n\nInstallation aborted."; update_output_window($static_output); |
