diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 130af91be4..7ddec72ed0 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2011-01-27 Miguel de Dios + + * include/functions_db.php, + godmode/modules/manage_network_templates_form.php: cleaned source style. + + * extensions/resource_registration.php: added extensión to import by xml + file the network component, wmi component, smnp component and local + component. And if the xml content a template, this component add into + template. + 2011-01-27 Miguel de Dios * include/functions_db.php: fixed the check ACL in function diff --git a/pandora_console/godmode/modules/manage_network_templates_form.php b/pandora_console/godmode/modules/manage_network_templates_form.php index 6d9e5ac2e5..6beb43a207 100644 --- a/pandora_console/godmode/modules/manage_network_templates_form.php +++ b/pandora_console/godmode/modules/manage_network_templates_form.php @@ -48,7 +48,8 @@ if (isset ($_GET["delete_module"])) { print_result_message (($errors < 1), __('Successfully deleted module from profile'), __('Error deleting module from profile')); -} elseif (isset ($_GET["add_module"])) { +} +elseif (isset ($_GET["add_module"])) { // Add module to profile $errors = 0; foreach ($id_nc as $component) { @@ -76,7 +77,8 @@ if (isset ($_GET["create"]) || isset ($_GET["update"])) { print_result_message ($result !== false, __('Successfully updated network profile'), __('Error updating network profile')); - } else { + } + else { //Profile doesn't exist $sql = sprintf ("INSERT INTO tnetwork_profile (name, description) VALUES ('%s', '%s')", $name, $description); $result = process_sql ($sql, "insert_id"); @@ -86,14 +88,16 @@ if (isset ($_GET["create"]) || isset ($_GET["update"])) { $id_np = (int) $result; //Will return either 0 (in case of error) or an int } -} elseif ($id_np > 0) { +} +elseif ($id_np > 0) { //Profile exists $row = get_db_row ("tnetwork_profile", "id_np", $id_np); $description = $row["description"]; $name = $row["name"]; -} else { +} +else { //Profile has to be created $description = ""; $name = ""; @@ -102,7 +106,8 @@ if (isset ($_GET["create"]) || isset ($_GET["update"])) { if ($id_np < 1) { echo '
'; -} else { +} +else { echo ''; } @@ -119,7 +124,8 @@ echo ""; echo ''; if ($id_np > 0) { print_submit_button (__("Update"), "updbutton", false, 'class="sub upd"'); -} else { +} +else { print_submit_button (__("Create"), "crtbutton", false, 'class="sub wand"'); } echo "
"; diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index d64970eb05..6bd4c305f6 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -3488,11 +3488,14 @@ function process_sql_insert ($table, $values) { if (is_null ($value)) { $values_str .= "NULL"; - } elseif (is_int ($value) || is_bool ($value)) { + } + elseif (is_int ($value) || is_bool ($value)) { $values_str .= sprintf ("%d", $value); - } else if (is_float ($value) || is_double ($value)) { + } + else if (is_float ($value) || is_double ($value)) { $values_str .= sprintf ("%f", $value); - } else { + } + else { $values_str .= sprintf ("'%s'", $value); }