tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-06-06 Dario Rodriguez <dario.rodriguez@artica.es> 

* 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
This commit is contained in:
juanmanuelr 2011-06-06 14:15:03 +00:00
parent e99f60754f
commit 205d298a9d
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2011-06-06 Dario Rodriguez <dario.rodriguez@artica.es>
* 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 <dario.rodriguez@artica.es>
* godmode/servers/manage_recontask.php: User with flag AW can manage recon

2
pandora_console/godmode/menu.php
View File

@ -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');

6
pandora_console/godmode/servers/manage_recontask.php
View File

@ -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) {

4
pandora_console/godmode/servers/modificar_server.php
View File

@ -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] = '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_del='.$server["id_server"].'&amp;delete=1">';
$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] .= '</a>';