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 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_agents.php: fixed the fields as sql operations as field.
	
	Fixes: #3400237



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4863 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2011-08-31 16:42:56 +00:00
parent 624c2edaff
commit e9f5fc64cd
2 changed files with 37 additions and 20 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-08-31 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_agents.php: fixed the fields as sql operations as field.
Fixes: #3400237
2011-08-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2011-08-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_alerts.php: Fixed alerts_get_agents_with_alert_template * include/functions_alerts.php: Fixed alerts_get_agents_with_alert_template

51
pandora_console/include/functions_agents.php
View File

@ -540,7 +540,7 @@ function agents_process_manage_config ($source_id_agent, $destiny_id_agents, $co
echo '<h3 class="suc">'.__('Successfully copied').'</h3>'; echo '<h3 class="suc">'.__('Successfully copied').'</h3>';
switch ($config['dbtype']) { switch ($config['dbtype']) {
case "mysql": case "mysql":
case "postgresql": case "postgresql":
db_process_sql ('COMMIT'); db_process_sql ('COMMIT');
break; break;
case "oracle": case "oracle":
@ -592,15 +592,15 @@ function agents_get_next_contact($idAgent, $maxModules = false) {
* @param bool Wheter to return the modules indexed by the id_agente_modulo or * @param bool Wheter to return the modules indexed by the id_agente_modulo or
* not. Default is indexed. * not. Default is indexed.
* Example: * Example:
<code> <code>
Both are similars: Both are similars:
$modules = agents_get_modules ($id_agent, false, array ('disabled' => 0)); $modules = agents_get_modules ($id_agent, false, array ('disabled' => 0));
$modules = agents_get_modules ($id_agent, false, 'disabled = 0'); $modules = agents_get_modules ($id_agent, false, 'disabled = 0');
Both are similars: Both are similars:
$modules = agents_get_modules ($id_agent, '*', array ('disabled' => 0, 'history_data' => 0)); $modules = agents_get_modules ($id_agent, '*', array ('disabled' => 0, 'history_data' => 0));
$modules = agents_get_modules ($id_agent, '*', 'disabled = 0 AND history_data = 0'); $modules = agents_get_modules ($id_agent, '*', 'disabled = 0 AND history_data = 0');
</code> </code>
* *
* @return array An array with all modules in the agent. * @return array An array with all modules in the agent.
* If multiple rows are selected, they will be in an array * If multiple rows are selected, they will be in an array
@ -617,7 +617,7 @@ function agents_common_modules_with_alerts ($id_agent, $filter = false, $indexed
WHERE t4.id_agent_module = t3.id_agente_modulo AND delete_pending = 0 WHERE t4.id_agent_module = t3.id_agente_modulo AND delete_pending = 0
AND t1.nombre = t3.nombre AND id_agente IN (%s)) = (%s)', implode (",", (array) $id_agent), implode (",", (array) $id_agent), count($id_agent)); AND t1.nombre = t3.nombre AND id_agente IN (%s)) = (%s)', implode (",", (array) $id_agent), implode (",", (array) $id_agent), count($id_agent));
} }
if (! empty ($filter)) { if (! empty ($filter)) {
$where .= ' AND '; $where .= ' AND ';
if (is_array ($filter)) { if (is_array ($filter)) {
@ -668,15 +668,15 @@ function agents_common_modules_with_alerts ($id_agent, $filter = false, $indexed
* @param bool Wheter to return the modules indexed by the id_agente_modulo or * @param bool Wheter to return the modules indexed by the id_agente_modulo or
* not. Default is indexed. * not. Default is indexed.
* Example: * Example:
<code> <code>
Both are similars: Both are similars:
$modules = agents_get_modules ($id_agent, false, array ('disabled' => 0)); $modules = agents_get_modules ($id_agent, false, array ('disabled' => 0));
$modules = agents_get_modules ($id_agent, false, 'disabled = 0'); $modules = agents_get_modules ($id_agent, false, 'disabled = 0');
Both are similars: Both are similars:
$modules = agents_get_modules ($id_agent, '*', array ('disabled' => 0, 'history_data' => 0)); $modules = agents_get_modules ($id_agent, '*', array ('disabled' => 0, 'history_data' => 0));
$modules = agents_get_modules ($id_agent, '*', 'disabled = 0 AND history_data = 0'); $modules = agents_get_modules ($id_agent, '*', 'disabled = 0 AND history_data = 0');
</code> </code>
* *
* @return array An array with all modules in the agent. * @return array An array with all modules in the agent.
* If multiple rows are selected, they will be in an array * If multiple rows are selected, they will be in an array
@ -1010,6 +1010,17 @@ function agents_get_modules ($id_agent = null, $details = false, $filter = false
break; break;
} }
} }
else if (strstr($value, '666=666', true) == '') {
switch ($config['dbtype']) {
case "mysql":
case "postgresql":
array_push ($fields, ' '.$value);
break;
case "oracle":
array_push ($fields, ' '.$value);
break;
}
}
else { else {
switch ($config["dbtype"]) { switch ($config["dbtype"]) {
case "mysql": case "mysql":
@ -1018,7 +1029,7 @@ function agents_get_modules ($id_agent = null, $details = false, $filter = false
case "postgresql": case "postgresql":
array_push ($fields, $field.' = \''.$value.'\''); array_push ($fields, $field.' = \''.$value.'\'');
break; break;
case "oracle": case "oracle":
if (is_int ($value) ||is_float ($value)||is_double ($value)) if (is_int ($value) ||is_float ($value)||is_double ($value))
array_push ($fields, $field.' = '.$value.''); array_push ($fields, $field.' = '.$value.'');
else else
@ -1262,7 +1273,7 @@ function agents_give_agentmodule_flag ($id_agent_module) {
* @param string IP address to assign * @param string IP address to assign
*/ */
function agents_add_address ($id_agent, $ip_address) { function agents_add_address ($id_agent, $ip_address) {
global $config; global $config;
// Check if already is attached to agent // Check if already is attached to agent
switch ($config["dbtype"]) { switch ($config["dbtype"]) {