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

MR 28 and minor fixes

Browse Source 
Former-commit-id: 99292ecb6401cf20066dd09188a32e24b9194b25
This commit is contained in:
fbsanchez 2019-05-14 18:09:34 +02:00
parent 920786216b
commit 8004e096fd
5 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/extras/mr/28.sql
View File

@ -8,5 +8,5 @@ DELETE FROM `tevent_response` WHERE `name` LIKE 'Create Integria IMS&#
INSERT INTO `tnotification_source_user` (`id_source`, `id_user`, `enabled`, `also_mail`) VALUES ((SELECT `id` FROM `tnotification_source` WHERE `description`="Official communication"), "admin", 1, 0); INSERT INTO `tnotification_source_user` (`id_source`, `id_user`, `enabled`, `also_mail`) VALUES ((SELECT `id` FROM `tnotification_source` WHERE `description`="Official communication"), "admin", 1, 0);
INSERT INTO `tnotification_source_group` SELECT `id`,0 FROM `tnotification_source` WHERE `description`="Official communication"; INSERT INTO `tnotification_source_group` SELECT `id`,0 FROM `tnotification_source` WHERE `description`="Official communication";
UPDATE `tnotification_source` SET `enabled`=1 WHERE `description` = 'System status' OR `description` = 'Official communication';
COMMIT; COMMIT;

1
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
View File

@ -2085,6 +2085,7 @@ INSERT INTO `tnotification_source_group` SELECT `id`,0 FROM `tnotification_sourc
INSERT INTO `tnotification_user` (`id_mensaje`, `id_user`) SELECT `id_mensaje`, `id_usuario_destino` FROM `tmensajes` WHERE `id_usuario_destino` != ''; INSERT INTO `tnotification_user` (`id_mensaje`, `id_user`) SELECT `id_mensaje`, `id_usuario_destino` FROM `tmensajes` WHERE `id_usuario_destino` != '';
INSERT INTO `tnotification_source_user` (`id_source`, `id_user`, `enabled`, `also_mail`) VALUES ((SELECT `id` FROM `tnotification_source` WHERE `description`="Official communication"), "admin", 1, 0); INSERT INTO `tnotification_source_user` (`id_source`, `id_user`, `enabled`, `also_mail`) VALUES ((SELECT `id` FROM `tnotification_source` WHERE `description`="Official communication"), "admin", 1, 0);
INSERT INTO `tnotification_source_group` SELECT `id`,0 FROM `tnotification_source` WHERE `description`="Official communication"; INSERT INTO `tnotification_source_group` SELECT `id`,0 FROM `tnotification_source` WHERE `description`="Official communication";
UPDATE `tnotification_source` SET `enabled`=1 WHERE `description` = 'System status' OR `description` = 'Official communication';
-- ---------------------------------------------------------------------- -- ----------------------------------------------------------------------
-- Add custom internal recon scripts -- Add custom internal recon scripts

15
pandora_console/include/class/ConsoleSupervisor.php
View File

@ -422,6 +422,21 @@ class ConsoleSupervisor
$this->checkCronRunning(); $this->checkCronRunning();
} }
/*
* Check if instance is registered.
* NOTIF.UPDATEMANAGER.REGISTRATION
*/
$this->checkUpdateManagerRegistration();
/*
* Check if there're new messages in UM.
* NOTIF.UPDATEMANAGER.MESSAGES
*/
if (update_manager_verify_registration()) {
$this->getUMMessages();
}
} }

3
pandora_console/include/config_process.php
View File

@ -208,8 +208,7 @@ if (!isset($config['inventory_changes_blacklist'])) {
if (!isset($config['url_update_manager'])) { if (!isset($config['url_update_manager'])) {
config_update_value( config_update_value(
'url_update_manager', 'url_update_manager',
// 'https://licensing.artica.es/pandoraupdate7/server.php' 'https://licensing.artica.es/pandoraupdate7/server.php'
'https://172.17.0.3/server.php'
); );
} }

1
pandora_console/pandoradb_data.sql
View File

@ -1320,4 +1320,5 @@ INSERT INTO `tnotification_source_user` (`id_source`, `id_user`, `enabled`, `als
INSERT INTO `tnotification_source_group` SELECT `id`,0 FROM `tnotification_source` WHERE `description`="Official communication"; INSERT INTO `tnotification_source_group` SELECT `id`,0 FROM `tnotification_source` WHERE `description`="Official communication";
UPDATE `tnotification_source` SET `enabled`=1 WHERE `description` = 'System status' OR `description` = 'Official communication';