Merge branch 'ent-8421-extension-antigua-backups' into 'develop'
Ent 8421 extension antigua backups Closes pandora_enterprise#8421 See merge request artica/pandorafms!4614
This commit is contained in:
commit
0f82255904
|
@ -116,3 +116,5 @@ mobile/include/javascript/jquery.mobile-1.3.1.js
|
||||||
mobile/include/style/jquery.mobile-1.3.1.css
|
mobile/include/style/jquery.mobile-1.3.1.css
|
||||||
godmode/alerts/configure_alert_special_days.php
|
godmode/alerts/configure_alert_special_days.php
|
||||||
godmode/admin_access_logs.php
|
godmode/admin_access_logs.php
|
||||||
|
enterprise/extensions/backup/main.php
|
||||||
|
enterprise/extensions/backup.php
|
|
@ -406,6 +406,7 @@ if (check_acl($config['id_user'], 0, 'PM') || check_acl($config['id_user'], 0, '
|
||||||
$sub['extensions/dbmanager']['text'] = __('DB Interface');
|
$sub['extensions/dbmanager']['text'] = __('DB Interface');
|
||||||
$sub['extensions/dbmanager']['id'] = 'DB Interface';
|
$sub['extensions/dbmanager']['id'] = 'DB Interface';
|
||||||
$sub['extensions/dbmanager']['sec'] = 'gbman';
|
$sub['extensions/dbmanager']['sec'] = 'gbman';
|
||||||
|
enterprise_hook('dbBackupManager');
|
||||||
enterprise_hook('elasticsearch_interface_menu');
|
enterprise_hook('elasticsearch_interface_menu');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2435,6 +2435,38 @@ function html_print_div(
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Render an <pre> tag for show code.
|
||||||
|
* For debug purposes, see for `hd()` function.
|
||||||
|
*
|
||||||
|
* @param string $content Content of tag.
|
||||||
|
* @param boolean $return Return the tag string formed.
|
||||||
|
* @param array $attributes Attributes availables for pre tags.
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
function html_print_code(
|
||||||
|
string $content,
|
||||||
|
bool $return=true,
|
||||||
|
array $attributes=[]
|
||||||
|
) {
|
||||||
|
$output = '<pre';
|
||||||
|
if (empty($attributes) === false) {
|
||||||
|
foreach ($attributes as $attribute => $value) {
|
||||||
|
$output .= ' '.$attribute.'="'.io_safe_input_html($value).'"';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$output .= sprintf('>%s</pre>', $content);
|
||||||
|
|
||||||
|
if ($return === true) {
|
||||||
|
return $output;
|
||||||
|
} else {
|
||||||
|
echo $output;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Render an anchor <a> html element.
|
* Render an anchor <a> html element.
|
||||||
*
|
*
|
||||||
|
|
|
@ -545,11 +545,12 @@ function io_input_password($password)
|
||||||
* Process the given password read from the Pandora FMS Database,
|
* Process the given password read from the Pandora FMS Database,
|
||||||
* decrypting it if necessary.
|
* decrypting it if necessary.
|
||||||
*
|
*
|
||||||
* @param string password Password read from the DB.
|
* @param string $password Password read from the DB.
|
||||||
|
* @param string $wrappedBy Wrap the password with the informed character.
|
||||||
*
|
*
|
||||||
* @return string The processed password.
|
* @return string The processed password.
|
||||||
*/
|
*/
|
||||||
function io_output_password($password)
|
function io_output_password($password, $wrappedBy='')
|
||||||
{
|
{
|
||||||
global $config;
|
global $config;
|
||||||
|
|
||||||
|
@ -562,11 +563,14 @@ function io_output_password($password)
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($plaintext === ENTERPRISE_NOT_HOOK) {
|
$output = ($plaintext === ENTERPRISE_NOT_HOOK) ? $password : $plaintext;
|
||||||
return io_safe_output($password);
|
|
||||||
}
|
|
||||||
|
|
||||||
return io_safe_output($plaintext);
|
return sprintf(
|
||||||
|
'%s%s%s',
|
||||||
|
$wrappedBy,
|
||||||
|
io_safe_output($output),
|
||||||
|
$wrappedBy
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -8435,6 +8435,12 @@ div.stat-win-spinner img {
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* For backups dt, can be useful for others */
|
||||||
|
#backups_list > thead > tr > th:last-child,
|
||||||
|
#backups_list > tbody > tr > td:last-child {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
/* err_msg_centralised */
|
/* err_msg_centralised */
|
||||||
div#err_msg_centralised div {
|
div#err_msg_centralised div {
|
||||||
margin-top: 1em;
|
margin-top: 1em;
|
||||||
|
|
Loading…
Reference in New Issue