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

Merge branch 'ent-7738-Pandora-recien-instalado-via-cloud-enlaces-a-mensajes-del-sistema-son-url-invalida' into 'develop' 

set urls as macros in console supervisor

See merge request artica/pandorafms!4234
This commit is contained in:
Daniel Rodriguez 2021-08-06 12:53:54 +00:00
parent 604ef4bc89 fec0114801
commit 0c4b5619f5
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -810,7 +810,7 @@ class ConsoleSupervisor
'type' => 'NOTIF.LICENSE.LIMITED',
'title' => __('Limited mode.'),
'message' => io_safe_output($config['limited_mode']),
'url' => ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/license'),
'url' => '__url__/index.php?sec=gsetup&sec2=godmode/setup/license',
]
);
} else {
@ -836,7 +836,7 @@ class ConsoleSupervisor
$msg,
$days_to_expiry
),
'url' => ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/license'),
'url' => '__url__/index.php?sec=gsetup&sec2=godmode/setup/license',
]
);
} else if ($days_to_expiry < 0) {
@ -854,7 +854,7 @@ class ConsoleSupervisor
'type' => 'NOTIF.LICENSE.EXPIRATION',
'title' => $title,
'message' => $msg,
'url' => ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/license'),
'url' => '__url__/index.php?sec=gsetup&sec2=godmode/setup/license',
]
);
return false;
@ -931,7 +931,7 @@ class ConsoleSupervisor
'Directory %s is not writable. Please, configure corresponding permissions.',
$config['attachment_store']
),
'url' => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=general'),
'url' => '__url__/index.php?sec=general&sec2=godmode/setup/setup&section=general',
]
);
return;
@ -953,7 +953,7 @@ class ConsoleSupervisor
'There are more than %d files in attachment, consider cleaning up attachment directory manually.',
$config['num_files_attachment']
),
'url' => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=perf'),
'url' => '__url__/index.php?sec=general&sec2=godmode/setup/setup&section=perf',
]
);
} else {
@ -987,7 +987,7 @@ class ConsoleSupervisor
'Remote configuration directory %s is not readable. Please, adjust configuration.',
$remote_config_dir
),
'url' => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=general'),
'url' => '__url__/index.php?sec=general&sec2=godmode/setup/setup&section=general',
]
);
return;
@ -1006,7 +1006,7 @@ class ConsoleSupervisor
'Remote configuration directory %s is not writable. Please, adjust configuration.',
$remote_config_dir.'/conf'
),
'url' => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=general'),
'url' => '__url__/index.php?sec=general&sec2=godmode/setup/setup&section=general',
]
);
} else {
@ -1024,7 +1024,7 @@ class ConsoleSupervisor
'Collections directory %s is not writable. Please, adjust configuration.',
$remote_config_dir.'/collections'
),
'url' => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=general'),
'url' => '__url__/index.php?sec=general&sec2=godmode/setup/setup&section=general',
]
);
} else {
@ -1042,7 +1042,7 @@ class ConsoleSupervisor
'MD5 directory %s is not writable. Please, adjust configuration.',
$remote_config_dir.'/md5'
),
'url' => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=general'),
'url' => '__url__/index.php?sec=general&sec2=godmode/setup/setup&section=general',
]
);
} else {
@ -1073,7 +1073,7 @@ class ConsoleSupervisor
$MAX_FILES_DATA_IN,
$remote_config_dir
),
'url' => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=perf'),
'url' => '__url__/index.php?sec=general&sec2=godmode/setup/setup&section=perf',
]
);
} else {
@ -1096,7 +1096,7 @@ class ConsoleSupervisor
$MAX_BADXML_FILES_DATA_IN,
$remote_config_dir
),
'url' => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=perf'),
'url' => '__url__/index.php?sec=general&sec2=godmode/setup/setup&section=perf',
]
);
} else {
@ -1188,7 +1188,7 @@ class ConsoleSupervisor
$modules_queued,
$queue['queued_modules']
),
'url' => ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=60'),
'url' => '__url__/index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=60',
]
);
} else {
@ -1324,7 +1324,7 @@ class ConsoleSupervisor
'type' => 'NOTIF.SERVER.STATUS.'.$server['id_server'],
'title' => $msg,
'message' => $description,
'url' => ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=60'),
'url' => '__url__/index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=60',
]
);
}
@ -1636,7 +1636,7 @@ class ConsoleSupervisor
'type' => 'NOTIF.HISTORYDB',
'title' => __('Historical database not available'),
'message' => __('Historical database is enabled, though not accessible with the current configuration.'),
'url' => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=hist_db'),
'url' => '__url__/index.php?sec=general&sec2=godmode/setup/setup&section=hist_db',
]
);
} else {
@ -1683,7 +1683,7 @@ class ConsoleSupervisor
'Your database hasn\'t been through maintenance for 48hrs. Please, check documentation on how to perform this maintenance process on %s and enable it as soon as possible.',
io_safe_output(get_product_name())
),
'url' => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=perf'),
'url' => '__url__/index.php?sec=general&sec2=godmode/setup/setup&section=perf',
]
);
} else {
@ -1743,7 +1743,7 @@ class ConsoleSupervisor
'Historical database maintenance problem.'
),
'message' => __('Your historical database hasn\'t been through maintenance for 48hrs. Please, check documentation on how to perform this maintenance process on %s and enable it as soon as possible.', get_product_name()),
'url' => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=perf'),
'url' => '__url__/index.php?sec=general&sec2=godmode/setup/setup&section=perf',
]
);
} else {
@ -1782,7 +1782,7 @@ class ConsoleSupervisor
'type' => 'NOTIF.HISTORYDB.MR',
'title' => __('Historical database MR mismatch'),
'message' => __('Your historical database is not using the same schema as the main DB. This could produce anomalies while storing historical data.'),
'url' => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=hist_db'),
'url' => '__url__/index.php?sec=general&sec2=godmode/setup/setup&section=hist_db',
]
);
} else {
@ -1823,7 +1823,7 @@ class ConsoleSupervisor
'type' => 'NOTIF.EXT.ELASTICSEARCH',
'title' => __('Log collector cannot connect to ElasticSearch'),
'message' => __('ElasticSearch is not available using current configuration.'),
'url' => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=log'),
'url' => '__url__/index.php?sec=general&sec2=godmode/setup/setup&section=log',
]
);
} else {
@ -1893,7 +1893,7 @@ class ConsoleSupervisor
'type' => 'NOTIF.METACONSOLE.DB_CONNECTION',
'title' => __('Metaconsole DB is not available.'),
'message' => __('Cannot connect with Metaconsole DB using current configuration.'),
'url' => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=enterprise'),
'url' => '__url__/index.php?sec=general&sec2=godmode/setup/setup&section=enterprise',
]
);
}
@ -1922,7 +1922,7 @@ class ConsoleSupervisor
'type' => 'NOTIF.DOWNTIME',
'title' => __('Scheduled downtime running.'),
'message' => __('A scheduled downtime is running. Some monitoring data won\'t be available while downtime is taking place.'),
'url' => ui_get_full_url('index.php?sec=gagente&sec2=godmode/agentes/planned_downtime.list'),
'url' => '__url__/index.php?sec=gagente&sec2=godmode/agentes/planned_downtime.list',
]
);
return;
@ -2083,7 +2083,7 @@ class ConsoleSupervisor
date('M j, G:i:s ', $next_downtime_begin),
date('M j, G:i:s ', $next_downtime_end)
),
'url' => ui_get_full_url('index.php?sec=gagente&sec2=godmode/agentes/planned_downtime.list'),
'url' => '__url__/index.php?sec=gagente&sec2=godmode/agentes/planned_downtime.list',
]
);
return;
@ -2144,7 +2144,7 @@ class ConsoleSupervisor
'type' => 'NOTIF.SECURITY.DEFAULT_PASSWORD',
'title' => __('Default password for "Admin" user has not been changed'),
'message' => __('Please, change the default password since it is a commonly reported vulnerability.'),
'url' => ui_get_full_url('index.php?sec=gusuarios&sec2=godmode/users/user_list'),
'url' => '__url__/index.php?sec=gusuarios&sec2=godmode/users/user_list',
]
);
} else {
@ -2180,7 +2180,7 @@ class ConsoleSupervisor
'type' => 'NOTIF.MISC.FONTPATH',
'title' => __('Default font doesn\'t exist'),
'message' => __('Your defined font doesn\'t exist or is not defined. Please, check font parameters in your config'),
'url' => ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=vis'),
'url' => '__url__/index.php?sec=gsetup&sec2=godmode/setup/setup&section=vis',
]
);
} else {
@ -2207,7 +2207,7 @@ class ConsoleSupervisor
'Your %s has the "develop_bypass" mode enabled. This is a developer mode and should be disabled in a production environment. This value is located in the main index.php file',
get_product_name()
),
'url' => ui_get_full_url('index.php'),
'url' => '__url__/index.php',
]
);
} else {
@ -2230,7 +2230,7 @@ class ConsoleSupervisor
'type' => 'NOTIF.MISC.EVENTSTORMPROTECTION',
'title' => __('Event storm protection is enabled.'),
'message' => __('Some events may get lost while this mode is enabled. The server must be restarted after altering this setting.'),
'url' => ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=general'),
'url' => '__url__/index.php?sec=gsetup&sec2=godmode/setup/setup&section=general',
]
);
} else {
@ -2257,7 +2257,7 @@ class ConsoleSupervisor
'type' => 'NOTIF.UPDATEMANAGER.OPENSETUP',
'title' => __('Failed to retrieve updates, please configure utility'),
'message' => $message,
'url' => ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=general'),
'url' => '__url__/index.php?sec=gsetup&sec2=godmode/setup/setup&section=general',
]
);
}
@ -2277,7 +2277,7 @@ class ConsoleSupervisor
get_product_name()
),
'message' => __('There is a new update available. Please<a class="bolder" href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=online').'"> go to Administration:Setup:Update Manager</a> for more details.'),
'url' => ui_get_full_url('index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=online'),
'url' => '__url__/index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=online',
]
);
} else {
@ -2315,7 +2315,7 @@ class ConsoleSupervisor
'There is one or more minor releases available. <a id="aviable_updates" target="blank" href="%s">.About minor release update</a>.',
$url
),
'url' => ui_get_full_url('index.php?sec=messages&sec2=godmode/update_manager/update_manager&tab=online'),
'url' => '__url__/index.php?sec=messages&sec2=godmode/update_manager/update_manager&tab=online',
]
);
} else {
@ -2364,7 +2364,7 @@ class ConsoleSupervisor
'type' => 'NOTIF.CRON.CONFIGURED',
'title' => __('DiscoveryConsoleTasks is not configured.'),
'message' => __($message_conf_cron),
'url' => ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist'),
'url' => '__url__/index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist',
]
);
} else {
@ -2468,7 +2468,7 @@ class ConsoleSupervisor
'type' => 'NOTIF.SERVER.MISALIGNED',
'title' => __($title_ver_misaligned),
'message' => __($message_ver_misaligned),
'url' => ui_get_full_url('index.php?sec=messages&sec2=godmode/update_manager/update_manager&tab=online'),
'url' => '__url__/index.php?sec=messages&sec2=godmode/update_manager/update_manager&tab=online',
]
);
}
@ -2513,7 +2513,7 @@ class ConsoleSupervisor
'type' => 'NOTIF.ALLOWOVERRIDE.MESSAGE',
'title' => __('AllowOverride is disabled'),
'message' => __($message),
'url' => ui_get_full_url('index.php'),
'url' => '__url__/index.php',
]
);
}
@ -2559,7 +2559,7 @@ class ConsoleSupervisor
'type' => 'NOTIF.HAMASTER.MESSAGE',
'title' => __('Desynchronized operation on the node '.$node['host']),
'message' => __($message),
'url' => ui_get_full_url('index.php?sec=gservers&sec2=enterprise/godmode/servers/HA_cluster'),
'url' => '__url__/index.php?sec=gservers&sec2=enterprise/godmode/servers/HA_cluster',
]
);
} else {

2
pandora_console/include/functions_messages.php
View File

@ -662,7 +662,7 @@ function messages_get_url($message_id)
// Return URL stored if is set in database.
if (isset($messages['url'])) {
return $messages['url'];
return str_replace('__url__', ui_get_full_url('/'), $messages['url']);
}
// Return the message direction.