diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 788bad91af..03eaf20745 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ + +2009-09-03 Sacnho Lerena + + * extensions/plugin_registration.php: Added two new parameter + (pre command and post command to ini parsing). + + * general/header.php: Page looks ugly at 1024x because header width, + fixed. + 2009-09-02 Sancho Lerena * attachment/plugin: New directory to place console uploaded server diff --git a/pandora_console/extensions/plugin_registration.php b/pandora_console/extensions/plugin_registration.php index d90929134d..64c4e940f3 100644 --- a/pandora_console/extensions/plugin_registration.php +++ b/pandora_console/extensions/plugin_registration.php @@ -64,7 +64,18 @@ function pluginreg_extension_main () { } $exec_path = $config["plugin_store"] . "/" . $ini_array["plugin_definition"]["filename"]; - if (!file_exists($exec_path)){ + + $file_exec_path = $exec_path; + + if (isset($ini_array["plugin_definition"]["execution_command"]) && ($ini_array["plugin_definition"]["execution_command"] != "")){ + $exec_path = $ini_array["plugin_definition"]["execution_command"] . " " . $config["plugin_store"] . "/" . $ini_array["plugin_definition"]["filename"]; + } + + if (isset($ini_array["plugin_definition"]["execution_postcommand"]) && ($ini_array["plugin_definition"]["execution_postcommand"] != "")){ + $exec_path = $exec_path . " " .$ini_array["plugin_definition"]["execution_postcommand"]; + } + + if (!file_exists($file_exec_path)){ echo "

".__("Plugin exec not found. Aborting!")."

"; unlink ($config["attachment_store"] . "/plugin_definition.ini"); return; diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 3bd297712b..c36468db15 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -91,7 +91,7 @@ require_once ("include/functions_messages.php"); echo ''; } echo ""; - echo ""; + echo ""; echo ""; echo "
Pandora FMS
"; if (file_exists (ENTERPRISE_DIR."/load_enterprise.php"))