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

Added module crontab to local modules with rc. Ticket #246

This commit is contained in:
Arturo Gonzalez 2017-02-10 11:43:12 +01:00
parent 6b168873fa
commit 9a73cb56d7
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -499,7 +499,7 @@ if ($agents !== false) {
/* Begin Update tagente.remote 0/1 with remote agent function return */ /* Begin Update tagente.remote 0/1 with remote agent function return */
if(enterprise_hook('config_agents_has_remote_configuration',$agent['id_agente'])){ if(enterprise_hook('config_agents_has_remote_configuration',array($agent['id_agente']))){
db_process_sql_update('tagente', array('remote' => 1),'id_agente = '.$agent['id_agente'].''); db_process_sql_update('tagente', array('remote' => 1),'id_agente = '.$agent['id_agente'].'');
} }
else{ else{
@ -584,7 +584,7 @@ if ($agents !== false) {
// Has remote configuration ? // Has remote configuration ?
if (enterprise_installed()) { if (enterprise_installed()) {
enterprise_include_once('include/functions_config_agents.php'); enterprise_include_once('include/functions_config_agents.php');
if (enterprise_hook('config_agents_has_remote_configuration',$agent["id_agente"])) { if (enterprise_hook('config_agents_has_remote_configuration',array($agent["id_agente"]))) {
echo "<a href='index.php?" . echo "<a href='index.php?" .
"sec=gagente&" . "sec=gagente&" .
"sec2=godmode/agentes/configurar_agente&" . "sec2=godmode/agentes/configurar_agente&" .

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

@ -396,7 +396,7 @@ switch ($moduletype) {
$remote_conf = false; $remote_conf = false;
if (enterprise_installed()) { if (enterprise_installed()) {
enterprise_include_once('include/functions_config_agents.php'); enterprise_include_once('include/functions_config_agents.php');
$remote_conf = enterprise_hook('config_agents_has_remote_configuration',$id_agente); $remote_conf = enterprise_hook('config_agents_has_remote_configuration',array($id_agente));
} }
/* Categories is an array containing the allowed module types /* Categories is an array containing the allowed module types

17
pandora_console/godmode/agentes/module_manager_editor_common.php
View File

@ -576,11 +576,20 @@ $table_advanced->data[10][1] = html_print_textarea ('unknown_instructions', 2, 6
$table_advanced->colspan[10][1] = 6; $table_advanced->colspan[10][1] = 6;
if (isset($id_agente) && $moduletype == MODULE_DATA) { if (isset($id_agente) && $moduletype == MODULE_DATA) {
$table_advanced->data[11][0] = __('Cron') . $has_remote_conf = enterprise_hook('config_agents_has_remote_configuration',array($agent["id_agente"]));
ui_print_help_tip (__('If cron is set the module interval is ignored and the module runs on the specified date and time'), true); if ($has_remote_conf) {
$table_advanced->data[11][1] = html_print_extended_select_for_cron ($hour, $minute, $mday, $month, $wday, true, true); $table_advanced->data[11][0] = __('Cron') .
$table_advanced->colspan[11][1] = 6; ui_print_help_tip (__('If cron is set the module interval is ignored and the module runs on the specified date and time'), true);
$table_advanced->data[11][1] = html_print_extended_select_for_cron ($hour, $minute, $mday, $month, $wday, true, $disabledBecauseInPolicy);
$table_advanced->colspan[11][1] = 6;
} }
else {
$table_advanced->data[11][0] = __('Cron') .
ui_print_help_tip (__('If cron is set the module interval is ignored and the module runs on the specified date and time'), true);
$table_advanced->data[11][1] = html_print_extended_select_for_cron ($hour, $minute, $mday, $month, $wday, true, true);
$table_advanced->colspan[11][1] = 6;
}
}
else { else {
$table_advanced->data[11][0] = __('Cron') . $table_advanced->data[11][0] = __('Cron') .
ui_print_help_tip (__('If cron is set the module interval is ignored and the module runs on the specified date and time'), true); ui_print_help_tip (__('If cron is set the module interval is ignored and the module runs on the specified date and time'), true);

2
pandora_console/include/functions_modules.php
View File

@ -231,7 +231,7 @@ function modules_copy_agent_module_to_agent ($id_agent_module, $id_destiny_agent
if ($module['id_modulo'] == MODULE_DATA) { if ($module['id_modulo'] == MODULE_DATA) {
if (enterprise_installed()) { if (enterprise_installed()) {
if (enterprise_hook('config_agents_has_remote_configuration',$id_agente)) { if (enterprise_hook('config_agents_has_remote_configuration',array($id_agente))) {
$result = enterprise_hook( $result = enterprise_hook(
'config_agents_copy_agent_module_to_agent', 'config_agents_copy_agent_module_to_agent',
array($id_agent_module, $id_new_module)); array($id_agent_module, $id_new_module));

2
pandora_console/operation/agentes/estado_agente.php
View File

@ -586,7 +586,7 @@ foreach ($agents as $agent) {
if (enterprise_installed()) { if (enterprise_installed()) {
enterprise_include_once('include/functions_config_agents.php'); enterprise_include_once('include/functions_config_agents.php');
if (enterprise_hook('config_agents_has_remote_configuration',$agent["id_agente"])) { if (enterprise_hook('config_agents_has_remote_configuration',array($agent["id_agente"]))) {
$data[9] = html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Remote config'))); $data[9] = html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Remote config')));