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

2011-06-03 Javier Lanz <javier.lanz@artica.es> 

* godmode/agentes/module_manager_editor_prediction.php: Edited to get
	"custom_integer_2" parameter & Added period combo 
	* godmode/agentes/module_manager_editor.php: Edited to get
	"custom_integer_2" parameter


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4400 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
javilanz 2011-06-03 13:16:35 +00:00
parent 2171d8f48b
commit a51b7517fe
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2011-06-03 Javier Lanz <javier.lanz@artica.es>
* godmode/agentes/module_manager_editor_prediction.php: Edited to get
"custom_integer_2" parameter & Added period combo
* godmode/agentes/module_manager_editor.php: Edited to get
"custom_integer_2" parameter
2011-06-01 Ramon Novoa <rnovoa@artica.es>
* include/auth/mysql.php: Do not allow empty passwords when

2
pandora_console/godmode/agentes/module_manager_editor.php
View File

@ -165,6 +165,7 @@ if ($id_agent_module) {
$id_plugin = $module['id_plugin'];
$post_process = $module['post_process'];
$prediction_module = $module['prediction_module'];
$custom_integer_2 = $module ['custom_integer_2'];
$max_timeout = $module['max_timeout'];
$custom_id = $module['custom_id'];
$history_data = $module['history_data'];
@ -191,6 +192,7 @@ else {
$max = '';
$interval = '';
$prediction_module = '';
$custom_integer_2 = 0;
$id_plugin = '';
$id_export = '';
$disabled = "0";

11
pandora_console/godmode/agentes/module_manager_editor_prediction.php
View File

@ -22,11 +22,13 @@ $page = get_parameter('page', '');
$id_agente = get_parameter('id_agente', '');
$agent_name = get_parameter('agent_name', agents_get_name($id_agente));
$id_agente_modulo= get_parameter('id_agent_module',0);
$custom_integer_2 = get_parameter ('custom_integer_2', 0);
$sql = 'SELECT * FROM tagente_modulo WHERE id_agente_modulo = '.$id_agente_modulo;
$row = db_get_row_sql($sql);
$is_service = false;
if ($row !== false && is_array($row)) {
$prediction_module = $row['prediction_module'];
$custom_integer_2 = $row ['custom_integer_2'];
// Services are an Enterprise feature.
$service_select = $row['custom_integer_1'];
if ($service_select > 0) {
@ -73,6 +75,15 @@ if($id_agente) {
else {
$data[1] .= '<select id="prediction_module" name="prediction_module" disabled="disabled"><option value="0">Select an Agent first</option></select>';
}
$data[1] .= html_print_label(__("Period"), 'custom_integer_2', true)."<br/>";
$periods [0] = __('Weekly');
$periods [1] = __('Monthly');
$periods [2] = __('Daily');
$data[1] .= html_print_select ($periods, 'custom_integer_2', $custom_integer_2, '', '', 0, true); //html_debug_print ($custom_integer_2);
$data[1] .= html_print_input_hidden ('id_agente', $id_agente, true);
$data[1] .= '</div>';