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

2009-01-07 Esteban Sanchez <estebans@artica.es> 

* godmode/agentes/modificar_agente.php: Old functions replace with new
	ones. Removed one indentation level when there's no access rights.
	
	* include/functions_ui.php: Wrong variable was being used in
	print_group_icon() to store the output and an incosistent behaviour
	was happening.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1320 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
esanchezm 2009-01-07 10:49:42 +00:00
parent 8a0a6c05fb
commit ee4e38351e
3 changed files with 63 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2009-01-07 Esteban Sanchez <estebans@artica.es>
* godmode/agentes/modificar_agente.php: Old functions replace with new
ones. Removed one indentation level when there's no access rights.
* include/functions_ui.php: Wrong variable was being used in
print_group_icon() to store the output and an incosistent behaviour
was happening.
2009-01-07 Esteban Sanchez <estebans@artica.es>
* include/functions_ui.php: Added to repository. Functions that prints

23
pandora_console/godmode/agentes/modificar_agente.php
View File

@ -234,9 +234,12 @@ if (mysql_num_rows($result)){
$tdcolor = "datos2";
$color = 1;
}
if (give_acl($config["id_user"], $id_grupo, "AW")==1){
if (! give_acl($config["id_user"], $id_grupo, "AW"))
continue;
// Agent name
echo "<tr><td class='$tdcolor'>";
echo "<tr class='$tdcolor' >";
echo "<td>";
if ($row["disabled"] == 1){
echo "<i>";
}
@ -248,9 +251,9 @@ if (mysql_num_rows($result)){
}
echo "</td>";
echo "<td align='center' class='$tdcolor'>";
echo "<td align='center'>";
// Has remote configuration ?
$agent_md5 = md5($row["nombre"], FALSE);
$agent_md5 = md5 ($row["nombre"], false);
if (file_exists ($config["remote_config"]."/".$agent_md5.".md5")) {
echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=".$row["id_agente"]."&disk_conf=" . $agent_md5 . "'>";
@ -259,21 +262,21 @@ if (mysql_num_rows($result)){
}
echo "</td>";
// Operating System icon
echo "<td class='$tdcolor' align='center'>";
echo "<td align='center'>";
print_os_icon ($row["id_os"], false);
echo "</td>";
// Group icon and name
echo "<td class='$tdcolor' align='center'>".print_group_icon ($id_grupo, true)."</td>";
echo "<td>";
print_group_icon ($id_grupo);
echo "&nbsp; ".get_group_name ($id_grupo)."</td>";
// Description
echo "<td class='".$tdcolor."f9'>".$row["comentarios"]."</td>";
// Action
echo "<td class='$tdcolor' align='center'><a href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&
echo "<td align='center'><a href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&
borrar_agente=".$row["id_agente"]."'";
echo ' onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
echo "<img border='0' src='images/cross.png'></a></td>";
}
echo "<img src='images/cross.png'></a></td>";
}
echo "</table>";
echo "<table width='750'><tr><td align='right'>";

10
pandora_console/include/functions_ui.php
View File

@ -155,14 +155,14 @@ function print_group_icon ($id_group, $return = false, $path = "groups_small") {
return "-";
}
$return = '<a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id='.$id_group.'">';
$return .= '<img class="bot" src="images/'.$path.'/'.$icon.'.png" alt="'.get_group_name ($id_group).'" title="'.get_group_name ($id_group).'" />';
$return .= '</a>';
$output = '<a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id='.$id_group.'">';
$output .= '<img class="bot" src="images/'.$path.'/'.$icon.'.png" alt="'.get_group_name ($id_group).'" title="'.get_group_name ($id_group).'" />';
$output .= '</a>';
if ($return)
return $return;
return $output;
echo $return;
echo $output;
}
/**