diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 0c256db877..2e646e7c7a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,4 +1,11 @@ -2010-10-21 Miguel de Dios +2010-10-25 Miguel de Dios + + * include/functions_agents.php, godmode/agentes/modificar_agente.php, + godmode/alerts/alert_list.list.php: clean source style. + + * godmode/servers/manage_export_form.php: fixed a unclose parentheses. + +2010-10-25 Miguel de Dios * extensions/module_groups.php: show color for when the alert fired, and added cluetip for more details. diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index 377c4c2114..b64276965c 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -47,7 +47,9 @@ if (isset ($_GET["borrar_agente"])) { // if delete agent if (give_acl ($config["id_user"], $id_grupo, "AW")==1) { $id_agentes[0] = $id_agente; delete_agent ($id_agentes); - } else { // NO permissions. + } + else { + // NO permissions. audit_db ($config["id_user"],$_SERVER['REMOTE_ADDR'], "ACL Violation", "Trying to delete agent \'$agent_name\'"); require ("general/noaccess.php"); @@ -59,11 +61,12 @@ if (isset ($_GET["borrar_agente"])) { // if delete agent print_page_header (__('Agent configuration')." » ".__('Agents defined in Pandora'), "", false, "", true); // Show group selector -if (isset($_POST["ag_group"])){ +if (isset($_POST["ag_group"])) { $ag_group = get_parameter_post ("ag_group"); echo "
"; -} else { +} +else { echo ""; } @@ -86,9 +89,10 @@ echo __('Free text for search (*)'); echo ""; // Show group selector -if (isset($_POST["ag_group"])){ +if (isset($_POST["ag_group"])) { $group_mod = "&ag_group_refresh=".get_parameter_post ("ag_group"); -} else { +} +else { $group_mod =""; } @@ -98,10 +102,11 @@ echo ""; echo ""; echo "
"; echo ""; + echo '
'; print_input_hidden ('new_agent', 1); print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"'); - echo "
"; +echo ""; echo ""; diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index 6af54ec5ab..960c5006e3 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -425,7 +425,8 @@ foreach ($simple_alerts as $alert) { $data[6] = __("Default"). " : ".get_db_sql ("SELECT name FROM talert_actions WHERE id = $default_action"); } - } else { + } + else { $data[6] = '
    '; foreach ($actions as $action_id => $action) { $data[6] .= '
  • '; @@ -497,10 +498,12 @@ foreach ($simple_alerts as $alert) { if ($alert["times_fired"] > 0) { $status = STATUS_ALERT_FIRED; $title = __('Alert fired').' '.$alert["times_fired"].' '.__('times'); - } elseif ($alert["disabled"] > 0) { + } + elseif ($alert["disabled"] > 0) { $status = STATUS_ALERT_DISABLED; $title = __('Alert disabled'); - } else { + } + else { $status = STATUS_ALERT_NOT_FIRED; $title = __('Alert not fired'); } @@ -518,7 +521,8 @@ foreach ($simple_alerts as $alert) { if (isset($data)){ print_table ($table); -} else { +} +else { echo "
    ".__('No alerts defined')."
    "; } @@ -564,7 +568,9 @@ $(document).ready (function () { //---------------------------- - + $("#id_group").pandoraSelectGroupAgent ({ callbackBefore: function () { $select = $("#id_agent_module").disable (); @@ -575,7 +581,9 @@ $(document).ready (function () { }); //$("#id_agent").pandoraSelectAgentModule (); - + $("a.template_details").cluetip ({ arrows: true, attribute: 'href', diff --git a/pandora_console/godmode/servers/manage_export_form.php b/pandora_console/godmode/servers/manage_export_form.php index 33fefb2c4f..26bdc8cdec 100644 --- a/pandora_console/godmode/servers/manage_export_form.php +++ b/pandora_console/godmode/servers/manage_export_form.php @@ -26,7 +26,7 @@ if (! give_acl ($config['id_user'], 0, "PM")) { return; } -if (isset (get_parameter("update")) { // Edit mode +if (isset (get_parameter("update"))) { // Edit mode $id_rt = (int) get_parameter_get ("update"); $row = get_db_row ("trecon_task","id_rt",$id_rt); $name = $row["name"];