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-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round

This commit is contained in:
Jonathan 2023-03-21 14:23:15 +01:00
parent a960644975 64fc4bcd46
commit 93f5b62bd2
11 changed files with 192 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
pandora_console/general/login_page.php
View File

@ -27,6 +27,22 @@ require_once __DIR__.'/../include/functions_ui.php';
require_once __DIR__.'/../include/functions.php';
require_once __DIR__.'/../include/functions_html.php';
echo '<style>
:root {';
if ($config['style'] === 'pandora') {
echo '--login-background-color: rgba(255, 255, 255, 0.2);';
echo '--login-label-color: #545454;';
echo '--login-text-color: #000;';
$style_theme = 'white-theme';
} else {
echo '--login-background-color: rgba(0, 0, 0, 0.8);';
echo '--login-label-color: #c5c5c5;';
echo '--login-text-color: #fff;';
$style_theme = '';
}
echo '}
</style>';
if ($config['visual_animation']) {
// form#login_form, div.login_data {
@ -121,7 +137,13 @@ if (empty($config['background_opacity']) === false) {
$opacity = 30;
}
$login_body_style = 'style="'.$background_100.'background: linear-gradient(rgba(0,0,0,.'.$opacity.'), rgba(0,0,0,.'.$opacity.")), url('".$background_url."');\"";
if ($config['style'] === 'pandora') {
$opacity_color = '255, 255, 255, .';
} else {
$opacity_color = '0, 0, 0, .';
}
$login_body_style = 'style="'.$background_100.'background: linear-gradient(rgba('.$opacity_color.$opacity.'), rgba('.$opacity_color.$opacity.")), url('".$background_url."');\"";
// Get alternative custom in case of db fail.
$custom_fields = [
@ -148,7 +170,7 @@ foreach ($custom_fields as $field) {
$docs_logo = ui_get_docs_logo();
$support_logo = ui_get_support_logo();
echo '<div id="login_body" '.$login_body_style.'>';
echo '<div id="header_login">';
echo '<div id="header_login" class="'.$style_theme.'">';
echo '<div id="list_icon_docs_support"><ul>';
@ -298,7 +320,7 @@ switch ($login_screen) {
);
echo '</div>';
} else {
echo '<div class="login_nick">';
echo '<div class="login_nick '.$style_theme.'">';
html_print_input_text_extended(
'nick',
'',
@ -312,7 +334,7 @@ switch ($login_screen) {
);
echo '<label for="nick" class="placeholder">'.__('User').'</label>';
echo '</div>';
echo '<div class="login_pass">';
echo '<div class="login_pass '.$style_theme.'">';
html_print_input_text_extended(
'pass',
'',
@ -322,7 +344,7 @@ switch ($login_screen) {
'',
false,
'',
'autocomplete="off" class="input" placeholder=" "',
'autocomplete="off" class="input " placeholder=" " style="background-image: url(images/enable.svg);"',
false,
true
);
@ -346,7 +368,7 @@ switch ($login_screen) {
}
}
echo '<div class="login_nick">';
echo '<div class="login_nick '.$style_theme.'">';
echo '<div>';
echo '</div>';
@ -495,31 +517,28 @@ if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
echo '</div>';
echo '<div class ="text_banner_login">';
// echo '<div><span class="span1">';
// if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
// if ($config['custom_title1_login']) {
// echo io_safe_output($config['custom_title1_login']);
// } else {
// echo __('WELCOME TO %s', get_product_name());
// }
// } else {
// echo __('WELCOME TO %s', get_product_name());
// }
// echo '</span></div>';
echo '<div><span class="span2">';
echo '<div><span class="span1">';
if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
if ($config['custom_title1_login']) {
echo io_safe_output($config['custom_title1_login']);
} else {
echo __('ONE TOOL TO MONITOR THEM ALL');
}
} else {
echo __('ONE TOOL TO MONITOR THEM ALL');
}
echo '</span></div>';
echo '<div><span class="span2">';
if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
if ($config['custom_title2_login']) {
echo io_safe_output($config['custom_title2_login']);
} else {
echo __('NEXT GENERATION');
}
} else {
echo __('NEXT GENERATION');
}
echo '</span></div>';
echo '</div>';
echo '</div>';
echo '</span></div>';
echo '</div>';
echo '</div>';
echo '</div>';
echo '</div>';

6
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -679,7 +679,7 @@ foreach ($simple_alerts as $alert) {
true,
[
'id' => 'template-details-'.$alert['id_alert_template'],
'class' => 'img_help action_button_img invert_filter',
'class' => 'img_help main_menu_icon invert_filter',
]
);
$data[2] .= '</a> ';
@ -757,7 +757,7 @@ foreach ($simple_alerts as $alert) {
true,
[
'title' => __('Delete action'),
'class' => 'action_button_img invert_filter',
'class' => 'main_menu_icon invert_filter',
]
);
$data[3] .= html_print_input_hidden('delete_action', 1, true);
@ -772,7 +772,7 @@ foreach ($simple_alerts as $alert) {
true,
[
'title' => __('Update action'),
'class' => 'action_button_img invert_filter',
'class' => 'main_menu_icon invert_filter',
'onclick' => 'show_display_update_action(\''.$action['id'].'\',\''.$alert['id'].'\',\''.$alert['id_agent_module'].'\',\''.$action_id.'\',\''.$alert['id_agent_module'].'\')',
]
);

4
pandora_console/godmode/setup/setup_visuals.php
View File

@ -431,7 +431,7 @@ $table_styles->data[$row][] = html_print_label_input_block(
$config['login_background'],
'',
__('Default'),
'background_pandora_console_keys.jpg',
'',
true,
false,
true,
@ -571,7 +571,7 @@ if (enterprise_installed() === true) {
$config['custom_splash_login'],
'',
__('Default'),
'default.svg',
'default',
true,
false,
true,

4
pandora_console/include/class/SatelliteAgent.class.php
View File

@ -393,7 +393,7 @@ class SatelliteAgent extends HTML
true,
[
'border' => '0',
'class' => 'action_button_img mrgn_lft_05em invert_filter',
'class' => 'main_menu_icon mrgn_lft_05em invert_filter',
'onclick' => 'disable_agent(\''.$tmp->address.'\',\''.strip_tags($tmp->name).'\',\''.(int) $disable.'\',\''.$id_agente.'\')',
]
);
@ -405,7 +405,7 @@ class SatelliteAgent extends HTML
true,
[
'border' => '0',
'class' => 'action_button_img mrgn_lft_05em invert_filter',
'class' => 'main_menu_icon mrgn_lft_05em invert_filter',
'onclick' => 'delete_agent(\''.$tmp->address.'\',\''.strip_tags($tmp->name).'\',\''.(int) $delete.'\',\''.$id_agente.'\')',
]
);

12
pandora_console/include/functions_config.php
View File

@ -2561,7 +2561,7 @@ function config_process_config()
}
if (!isset($config['custom_splash_login'])) {
config_update_value('custom_splash_login', 'default');
config_update_value('custom_splash_login', 'none.png');
}
if (!isset($config['custom_docs_logo'])) {
@ -2597,11 +2597,11 @@ function config_process_config()
}
if (!isset($config['custom_title1_login'])) {
config_update_value('custom_title1_login', __('PANDORA FMS'));
config_update_value('custom_title1_login', __('ONE TOOL TO MONITOR THEM ALL'));
}
if (!isset($config['custom_title2_login'])) {
config_update_value('custom_title2_login', __('ONE TOOL TO MONITOR THEM ALL'));
config_update_value('custom_title2_login', '');
}
if (!isset($config['custom_docs_url'])) {
@ -2649,11 +2649,11 @@ function config_process_config()
}
if (!isset($config['meta_custom_title1_login'])) {
config_update_value('meta_custom_title1_login', __('PANDORA FMS NEXT GENERATION'));
config_update_value('meta_custom_title1_login', __('ONE TOOL TO MONITOR THEM ALL'));
}
if (!isset($config['meta_custom_title2_login'])) {
config_update_value('meta_custom_title2_login', __('METACONSOLE'));
config_update_value('meta_custom_title2_login', __('COMMAND CENTER'));
}
if (!isset($config['vc_favourite_view'])) {
@ -3482,7 +3482,7 @@ function config_process_config()
}
if (!isset($config['random_background'])) {
config_update_value('random_background', '');
config_update_value('random_background', 1);
}
if (!isset($config['meta_random_background'])) {

57
pandora_console/include/functions_reporting_html.php
View File

@ -6002,6 +6002,7 @@ function reporting_get_last_activity()
$table = new stdClass();
$table->width = '100%';
$table->data = [];
$table->class = 'info_table';
$table->size = [];
$table->size[2] = '150px';
$table->size[3] = '130px';
@ -6015,37 +6016,13 @@ function reporting_get_last_activity()
$table->head[5] = __('Comments');
$table->title = '<span>'.__('Last activity in %s console', get_product_name()).'</span>';
switch ($config['dbtype']) {
case 'mysql':
$sql = sprintf(
'SELECT id_usuario,accion,fecha,ip_origen,descripcion,utimestamp
FROM tsesion
WHERE (`utimestamp` > UNIX_TIMESTAMP(NOW()) - '.SECONDS_1WEEK.")
AND `id_usuario` = '%s' ORDER BY `utimestamp` DESC LIMIT 5",
$config['id_user']
);
break;
case 'postgresql':
$sql = sprintf(
"SELECT \"id_usuario\", accion, fecha, \"ip_origen\", descripcion, utimestamp
FROM tsesion
WHERE (\"utimestamp\" > ceil(date_part('epoch', CURRENT_TIMESTAMP)) - ".SECONDS_1WEEK.")
AND \"id_usuario\" = '%s' ORDER BY \"utimestamp\" DESC LIMIT 5",
$config['id_user']
);
break;
case 'oracle':
$sql = sprintf(
"SELECT id_usuario, accion, fecha, ip_origen, descripcion, utimestamp
FROM tsesion
WHERE ((utimestamp > ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.')) - '.SECONDS_1WEEK.")
AND id_usuario = '%s') AND rownum <= 10 ORDER BY utimestamp DESC",
$config['id_user']
);
break;
}
$sql = sprintf(
'SELECT id_usuario,accion,fecha,ip_origen,descripcion,utimestamp
FROM tsesion
WHERE (`utimestamp` > UNIX_TIMESTAMP(NOW()) - '.SECONDS_1WEEK.")
AND `id_usuario` = '%s' ORDER BY `utimestamp` DESC LIMIT 5",
$config['id_user']
);
$sessions = db_get_all_rows_sql($sql);
@ -6056,18 +6033,8 @@ function reporting_get_last_activity()
foreach ($sessions as $session) {
$data = [];
switch ($config['dbtype']) {
case 'mysql':
case 'oracle':
$session_id_usuario = $session['id_usuario'];
$session_ip_origen = $session['ip_origen'];
break;
case 'postgresql':
$session_id_usuario = $session['id_usuario'];
$session_ip_origen = $session['ip_origen'];
break;
}
$session_id_usuario = $session['id_usuario'];
$session_ip_origen = $session['ip_origen'];
$data[0] = '<strong>'.$session_id_usuario.'</strong>';
$data[1] = ui_print_session_action_icon($session['accion'], true);
@ -6079,10 +6046,6 @@ function reporting_get_last_activity()
array_push($table->data, $data);
}
if (defined('METACONSOLE')) {
$table->class = 'databox_tactical';
}
return html_print_table($table, true);
}

48
pandora_console/include/functions_ui.php
View File

@ -5020,30 +5020,22 @@ function ui_print_standard_header(
$applyBreadcrumbs,
true
);
// Create the header.
// if (is_metaconsole() === true) {
// $output = ui_meta_print_header(
// $title,
// false,
// $options
// );
// } else {
$output = ui_print_page_header(
$title,
$icon,
true,
$help,
$godmode,
$options,
false,
'',
GENERIC_SIZE_TEXT,
'',
$headerInformation->printHeader(true),
false,
$fav_menu_config
);
// }
$output = ui_print_page_header(
$title,
$icon,
true,
$help,
$godmode,
$options,
false,
'',
GENERIC_SIZE_TEXT,
'',
$headerInformation->printHeader(true),
false,
$fav_menu_config
);
if ($return !== true) {
echo $output;
} else {
@ -7327,9 +7319,6 @@ function ui_get_inventory_module_add_form(
$table->rowstyle = [];
$table->rowstyle['hidden-custom-field-row'] = 'display: none;';
$table->rowstyle['custom-fields-button'] = 'display: none;';
// $table->colspan = [];
// $table->colspan['custom-fields-row'] = [];
// $table->colspan['custom-fields-row']['custom-fields-column'] = 2;
$table->data = [];
$row = [];
@ -7593,13 +7582,10 @@ function ui_get_inventory_module_add_form(
ob_start();
echo '<form name="modulo" method="post" action="'.$form_action.'" class="max_floating_element_size">';
echo '<form id="policy_inventory_module_edit_form" name="modulo" method="post" action="'.$form_action.'" class="max_floating_element_size">';
echo html_print_table($table);
echo '<div class="action-buttons w100p">';
echo $form_buttons;
echo '</div>';
echo '</form>';
?>
<script type="text/javascript">

117
pandora_console/include/styles/login.css
View File

@ -26,7 +26,7 @@ div#error_buttons a {
/* Set rules to fill background */
/* background-color:#000 !important; */
min-height: 100%;
min-width: 1200px;
/* min-width: 1200px; */
width: 100%;
position: absolute;
background-repeat: repeat;
@ -68,7 +68,7 @@ div#login_f {
#ver_num {
width: 100%;
color: #878787;
color: #dddddd;
text-align: center;
font-weight: 350;
font-size: 10px;
@ -105,7 +105,7 @@ div#list_icon_docs_support ul {
div#list_icon_docs_support ul li {
display: inline-block;
color: white;
color: #fff;
vertical-align: middle;
margin-right: 5px;
font-size: 10pt;
@ -140,7 +140,9 @@ li#li_margin_support {
}
div.login_page {
background-color: rgba(0, 0, 0, 0.8);
/* background-color: rgba(0, 0, 0, 0.8); */
/* background-color: rgba(255, 255, 255, 0.2); */
background-color: var(--login-background-color);
width: 40vw;
min-width: 300px;
height: 100vh;
@ -164,7 +166,8 @@ div.login_logo_icon {
div.login_logo_icon img {
margin: 0 auto;
width: 300px;
max-height: 185px;
max-width: 300px;
}
div.login_double_auth_code,
@ -174,7 +177,6 @@ div.login_pass {
width: 300px;
height: 40px;
margin-bottom: 20px;
box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.1);
border-radius: 3px;
}
@ -195,8 +197,8 @@ div.login_pass input {
box-sizing: border-box;
}
div.login_pass > input#pass {
background-image: url(../../images/enable.svg);
input {
background-color: transparent;
}
input:not([type="image"]):focus,
@ -335,23 +337,26 @@ div.login_data {
div.text_banner_login {
width: 100%;
color: white;
color: #fff;
margin-top: 40px;
display: flex;
flex-direction: column;
}
span.span1 {
font-size: 38px;
letter-spacing: -0.38px;
display: block;
max-width: 700px;
font-size: 80pt;
line-height: 80pt;
font-family: "lato-bolder";
color: white;
line-height: 49pt;
color: #fff;
}
span.span2 {
display: block;
width: 700px;
font-size: 80pt;
line-height: 80pt;
max-width: 700px;
font-size: 30pt;
line-height: 30pt;
font-family: "lato-bolder";
color: #fff;
}
@ -377,16 +382,18 @@ div.img_banner_login img {
@media all and (max-width: 1266px) {
span.span1 {
font-size: 38px;
letter-spacing: -0.38px;
font-weight: bold;
color: white;
line-height: 49pt;
}
span.span2 {
width: 550px;
display: block;
max-width: 500px;
font-size: 60pt;
line-height: 60pt;
font-weight: bold;
color: #fff;
}
span.span2 {
display: block;
max-width: 500px;
font-size: 20pt;
line-height: 20pt;
font-family: "lato-bolder";
color: #fff;
}
@ -682,7 +689,7 @@ div.button_message_alert_form input {
bottom: 10px;
/* background: transparent; */
background: #f1f1f1;
border: solid white 10px;
border: solid #fff 10px;
border-radius: 50%;
}
@ -715,6 +722,7 @@ div.login_pass input:-webkit-autofill:active {
background-size: 27px;
background-position: right 10px bottom 50%;
box-sizing: border-box;
-webkit-box-shadow: 0 0 0 30px rgba(0, 0, 0, 0) inset !important;
}
div.login_pass input:-webkit-autofill,
@ -796,3 +804,62 @@ button.submitButton > span {
font-size: 9pt;
top: -10px;
}
div.login_nick.white-theme input,
div.login_pass.white-theme input {
background-color: #f6f7fb;
border: 0px;
color: #343434;
border-radius: 3px;
width: 100%;
height: 40px;
font-size: 10pt;
padding: 0px 0px 0px 8%;
background-repeat: no-repeat;
background-size: 27px;
background-position: right 10px bottom 50%;
box-sizing: border-box;
}
div.white-theme > .placeholder {
color: #8b8b8b;
left: 24px;
}
div.white-theme > .input:not(:placeholder-shown) ~ .placeholder {
top: 15px;
color: transparent;
}
div.white-theme > .input:focus ~ .placeholder {
top: 15px;
color: transparent;
}
div.white-theme input:-webkit-autofill,
div.white-theme input:-webkit-autofill:hover,
div.white-theme input:-webkit-autofill:focus,
div.white-theme input:-webkit-autofill:active {
-webkit-text-fill-color: #343434;
border: 0px;
border-bottom: 0px;
border-radius: 3px;
width: 100%;
height: 40px;
font-size: 12pt;
background-repeat: no-repeat;
background-size: 27px;
background-position: right 10px bottom 50%;
box-sizing: border-box;
-webkit-box-shadow: 0 0 0 30px rgba(0, 0, 0, 0) inset !important;
}
div.white-theme input:not([type="image"]):focus,
textarea:focus,
select:focus {
border: 2px solid #8a96a6;
}
div#header_login.white-theme {
background-color: rgba(0, 0, 0, 0.5);
}

13
pandora_console/include/styles/pandora.css
View File

@ -707,6 +707,10 @@ select:-internal-list-box {
width: 60%;
}
.w67p {
width: 67%;
}
.w70p {
width: 70%;
}
@ -970,6 +974,10 @@ select:-internal-list-box {
padding-left: 2em !important;
}
.padding10 {
padding: 10px;
}
.margin-soft {
margin: 0.3em 1em;
}
@ -11720,3 +11728,8 @@ div.relative > div > div#ui-datepicker-div {
top: 55px !important;
left: 5px !important;
}
.ui-widget-overlay {
background: #aaa;
opacity: 0.3 !important;
}

8
pandora_console/include/styles/pandora_black.css
View File

@ -31,7 +31,7 @@ ul.subsubmenu li,
input.search_input,
.filters input,
input#text-id_parent.ac_input,
input,
input:not(div.login_pass > input):not(div.login_nick > input),
textarea,
select,
.edit_user_comments #textarea_comments,
@ -466,12 +466,6 @@ ul.tree-group
filter: invert(100%);
}
/* login.css */
div.login_nick input,
div.login_pass input {
background-color: #111 !important;
}
/* user edit */
.edit_user_info_right input {
border-bottom: 1px solid #5f5f5f;

4
pandora_console/update_manager_client/views/register.php
View File

@ -85,7 +85,7 @@ $product_name = get_product_name(); ?>
__('Cancel'),
'cancel_registration',
false,
'class="lato ui-widget
'id="submit-cancel_registration" class="lato ui-widget
ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel"',
true
);
@ -97,7 +97,7 @@ $product_name = get_product_name(); ?>
__('OK!'),
'register',
false,
'class="lato ui-widget
'id="submit-register" class="lato ui-widget
ui-state-default ui-corner-all ui-button-text-only sub ok submit-next w100px"',
true
);