summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2011-08-03 20:50:11 +0000
committerErmal <eri@pfsense.org>2011-08-03 20:50:11 +0000
commit578111924972e3a9806d623ad12d18708b486ad5 (patch)
tree01359f506ca493b035300587a5c0b7da91693e21 /etc
parentf3a274b70aaa0f2a97323c6cd780ab6f9eae5ec8 (diff)
downloadpfsense-578111924972e3a9806d623ad12d18708b486ad5.zip
pfsense-578111924972e3a9806d623ad12d18708b486ad5.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.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/pkg-utils.inc54
1 files changed, 27 insertions, 27 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index 006726b..2903a32 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -754,6 +754,33 @@ 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);
+ }
+ }
/* sidebar items */
if(is_array($pkg_config['menu'])) {
$static_output .= gettext("Menu items... ");
@@ -802,33 +829,6 @@ function install_package_xml($pkg) {
$static_output .= gettext("done.") . "\n";
update_output_window($static_output);
}
-
- /* 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);
- }
- }
} else {
$static_output .= gettext("Loading package configuration... failed!") . "\n\n" . gettext("Installation aborted.");
update_output_window($static_output);
OpenPOWER on IntegriCloud