2010-10-06 Miguel de Dios <miguel.dedios@artica.es>

* godmode/agentes/module_manager_editor.php: cleaned source code style.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3348 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2010-10-06 10:30:11 +00:00
parent e4e288c30c
commit cd6d102fe4
2 changed files with 59 additions and 48 deletions

View File

@ -1,3 +1,7 @@
2010-10-06 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor.php: cleaned source code style.
2010-10-06 Miguel de Dios <miguel.dedios@artica.es> 2010-10-06 Miguel de Dios <miguel.dedios@artica.es>
* include/config_process.php: force the absolute path when include the * include/config_process.php: force the absolute path when include the

View File

@ -160,7 +160,8 @@ if ($id_agent_module) {
$min_critical = $module['min_critical']; $min_critical = $module['min_critical'];
$max_critical = $module['max_critical']; $max_critical = $module['max_critical'];
$ff_event = $module['min_ff_event']; $ff_event = $module['min_ff_event'];
} else { }
else {
if (!isset ($moduletype)) { if (!isset ($moduletype)) {
$moduletype = (string) get_parameter ('moduletype'); $moduletype = (string) get_parameter ('moduletype');
@ -225,45 +226,50 @@ if($unlink_policy) {
} }
switch ($moduletype) { switch ($moduletype) {
case "dataserver": case "dataserver":
case 1:
$moduletype = 1; $moduletype = 1;
case 1:
/* Categories is an array containing the allowed module types /* Categories is an array containing the allowed module types
(generic_data, generic_string, etc) from ttipo_modulo (field categoria) */ (generic_data, generic_string, etc) from ttipo_modulo (field categoria) */
$categories = array (0, 1, 2, 6, 7, 8, -1); $categories = array (0, 1, 2, 6, 7, 8, -1);
require ('module_manager_editor_common.php'); require ('module_manager_editor_common.php');
require ('module_manager_editor_data.php'); require ('module_manager_editor_data.php');
break; break;
case "networkserver": case "networkserver":
case 2:
$moduletype = 2; $moduletype = 2;
case 2:
$categories = array (3, 4, 5); $categories = array (3, 4, 5);
require ('module_manager_editor_common.php'); require ('module_manager_editor_common.php');
require ('module_manager_editor_network.php'); require ('module_manager_editor_network.php');
break; break;
case "pluginserver": case "pluginserver":
case 4:
$moduletype = 4; $moduletype = 4;
case 4:
$categories = array (0, 1, 2); $categories = array (0, 1, 2);
require ('module_manager_editor_common.php'); require ('module_manager_editor_common.php');
require ('module_manager_editor_plugin.php'); require ('module_manager_editor_plugin.php');
break; break;
case "predictionserver": case "predictionserver":
case 5:
$moduletype = 5; $moduletype = 5;
case 5:
$categories = array (0, 1); $categories = array (0, 1);
require ('module_manager_editor_common.php'); require ('module_manager_editor_common.php');
require ('module_manager_editor_prediction.php'); require ('module_manager_editor_prediction.php');
break; break;
case "wmiserver": case "wmiserver":
case 6:
$moduletype = 6; $moduletype = 6;
case 6:
$categories = array (0, 1, 2); $categories = array (0, 1, 2);
require ('module_manager_editor_common.php'); require ('module_manager_editor_common.php');
require ('module_manager_editor_wmi.php'); require ('module_manager_editor_wmi.php');
break; break;
/* WARNING: type 7 is reserved on enterprise */ /* WARNING: type 7 is reserved on enterprise */
default: default:
if (enterprise_include ('godmode/agentes/module_manager_editor.php') === ENTERPRISE_NOT_HOOK) { if (enterprise_include ('godmode/agentes/module_manager_editor.php') === ENTERPRISE_NOT_HOOK) {
echo '<h3 class="error">DEBUG: Invalid module type specified in '.__FILE__.':'.__LINE__.'</h3>'; echo '<h3 class="error">DEBUG: Invalid module type specified in '.__FILE__.':'.__LINE__.'</h3>';
echo 'Most likely you have recently upgraded from an earlier version of Pandora and either <br /> echo 'Most likely you have recently upgraded from an earlier version of Pandora and either <br />
@ -273,6 +279,7 @@ default:
return; return;
} }
break;
} }
echo "<h2>".__('Modules')."</h2>"; echo "<h2>".__('Modules')."</h2>";