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

2011-08-31 Koichiro Kikuchi <koichiro@rworks.jp> 

* include/functions_api.php: Fixed join parameter to avoid
	  generating unusable module lines.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4856 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
koichirok 2011-08-31 06:36:36 +00:00
parent 2303782c36
commit c967267fbb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-08-30 Koichiro Kikuchi <koichiro@rworks.jp>
* include/functions_api.php: Fixed join parameter to avoid
generating unusable module lines.
2011-08-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/users/configure_user.php: Now action state is showed

4
pandora_console/include/functions_api.php
View File

@ -310,7 +310,7 @@ function get_tree_agents($trash1, $trahs2, $other, $returnType)
INNER JOIN (SELECT *
FROM tagente_estado
WHERE id_agente = ' . $agent['id_agente'] . ') AS t2
ON t1.id_agente = t2.id_agente');
ON t1.id_agente_modulo = t2.id_agente_modulo');
if ($modules === false) $modules = array();
$modules = str_replace('\n', $returnReplace, $modules);
@ -1583,4 +1583,4 @@ function set_new_note_incident($id, $id2, $other, $thrash2) {
else
returnData('string', array('type' => 'string', 'data' => $idNote));
}
?>
?>