tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9645-Implementar-licencias-independientes-discovery-SAP' into 'develop'

Browse Source 
implemented per-task sap license

See merge request artica/pandorafms!5536
This commit is contained in:
Daniel Rodriguez 2023-02-14 16:26:40 +00:00
commit aa43f2cf44
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_config.php
View File

@ -463,10 +463,6 @@ function config_update_config()
if (config_update_value('ipam_ocuppied_warning_treshold', get_parameter('ipam_ocuppied_warning_treshold'), true) === false) { if (config_update_value('ipam_ocuppied_warning_treshold', get_parameter('ipam_ocuppied_warning_treshold'), true) === false) {
$error_update[] = __('Ipam Ocuppied Manager Warning'); $error_update[] = __('Ipam Ocuppied Manager Warning');
} }
if (config_update_value('sap_license', get_parameter('sap_license'), true) === false) {
$error_update[] = __('SAP/R3 Plugin Licence');
}
} }
break; break;

12
pandora_server/lib/PandoraFMS/DiscoveryServer.pm
View File

@ -221,10 +221,14 @@ sub data_consumer ($$) {
if ($task->{'type'} == DISCOVERY_APP_SAP) { if ($task->{'type'} == DISCOVERY_APP_SAP) {
# SAP TASK, retrieve license. # SAP TASK, retrieve license.
$task->{'sap_license'} = pandora_get_config_value( if (defined($task->{'field4'}) && $task->{'field4'} ne "") {
$dbh, $task->{'sap_license'} = $task->{'field4'};
'sap_license' } else {
); $task->{'sap_license'} = pandora_get_config_value(
$dbh,
'sap_license'
);
}
# Retrieve credentials for task (optional). # Retrieve credentials for task (optional).
if (defined($task->{'auth_strings'}) if (defined($task->{'auth_strings'})