From f0d7ba1a15e83d654d64285edf7a9640f3f9a248 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Mon, 6 Jun 2011 14:15:03 +0000 Subject: [PATCH] 2011-06-06 Dario Rodriguez * godmode/servers/manage_recontask.php godmode/servers/modificar_server.php godmode/menu.php: Changed old name functions to 4.0v. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4409 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/godmode/menu.php | 2 +- pandora_console/godmode/servers/manage_recontask.php | 6 +++--- pandora_console/godmode/servers/modificar_server.php | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 741be53422..68bb6bf186 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2011-06-06 Dario Rodriguez + + * godmode/servers/manage_recontask.php + godmode/servers/modificar_server.php + godmode/menu.php: Changed old name functions to 4.0v. + 2011-06-06 Dario Rodriguez * godmode/servers/manage_recontask.php: User with flag AW can manage recon diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index c9c3d63bdf..07ea735054 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -160,7 +160,7 @@ if (check_acl ($config['id_user'], 0, "AW")) { $sub["godmode/servers/manage_recontask"]["text"] = __('Manage recontask'); //This subtabs are only for Pandora Admin - if (give_acl ($config['id_user'], 0, "PM")) { + if (check_acl ($config['id_user'], 0, "PM")) { $sub["godmode/servers/plugin"]["text"] = __('Manage plugins'); $sub["godmode/servers/recon_script"]["text"] = __('Manage recon script'); diff --git a/pandora_console/godmode/servers/manage_recontask.php b/pandora_console/godmode/servers/manage_recontask.php index d0612e8167..792fcbcdfa 100644 --- a/pandora_console/godmode/servers/manage_recontask.php +++ b/pandora_console/godmode/servers/manage_recontask.php @@ -170,14 +170,14 @@ if (isset($_GET["create"])) { // SHOW TABLE WITH ALL RECON TASKs // -------------------------------- //Pandora Admin must see all columns -if (! give_acl ($config['id_user'], 0, "PM")) { +if (! check_acl ($config['id_user'], 0, "PM")) { $sql = sprintf('SELECT * FROM trecon_task RT, tusuario_perfil UP WHERE UP.id_usuario = "%s" AND UP.id_grupo = RT.id_group', $config['id_user']); - $result = db_get_db_all_rows_sql ($sql); + $result = db_get_all_rows_sql ($sql); } else { - $result = db_get_db_all_rows_in_table('trecon_task'); + $result = db_get_all_rows_in_table('trecon_task'); } $color=1; if ($result !== false) { diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index 9b436dc1e3..f25a750d74 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -107,7 +107,7 @@ else { $table->head[5] = __('Updated'); //Only Pandora Administrator can delete servers - if (give_acl ($config["id_user"], 0, "PM")) { + if (check_acl ($config["id_user"], 0, "PM")) { $table->head[6] = __('Delete'); } @@ -128,7 +128,7 @@ else { $data[5] = human_time_comparation ($server["keepalive"]); //Only Pandora Administrator can delete servers - if (give_acl ($config["id_user"], 0, "PM")) { + if (check_acl ($config["id_user"], 0, "PM")) { $data[6] = ''; $data[6] .= html_print_image ('images/cross.png', true, array ('title' => __('Delete'), 'onclick' => "if (! confirm ('" . __('Modules run by this server will stop working. Do you want to continue?') ."')) return false")); $data[6] .= '';