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

Fixed errors

This commit is contained in:
Daniel Barbero Martin 2019-11-12 16:22:58 +01:00
parent ec72820c88
commit fa6bc254a1
5 changed files with 157 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pandora_console/general/header.php
View File

@ -635,12 +635,6 @@ if ($config['menu_type'] == 'classic') {
* Loads modal from AJAX to add feedback.
*/
function show_feedback() {
<?php
// Require specific CSS and JS.
ui_require_css_file('wizard');
ui_require_css_file('discovery');
ui_require_css_file('diagnostics');
?>
var btn_ok_text = '<?php echo __('Send'); ?>';
var btn_cancel_text = '<?php echo __('Cancel'); ?>';
var title = '<?php echo __('Report an issue'); ?>';
@ -719,13 +713,15 @@ if ($config['menu_type'] == 'classic') {
$("#agent_access").css("display","");
});
// Feedback.
$("#feedback-header").click(function () {
// Clean DOM.
$("#feedback-header").empty();
// Function charge Modal.
show_feedback();
});
<?php if (enterprise_installed()) { ?>
// Feedback.
$("#feedback-header").click(function () {
// Clean DOM.
$("#feedback-header").empty();
// Function charge Modal.
show_feedback();
});
<?php } ?>
function blinkpubli(){
$(".publienterprise").delay(100).fadeTo(300,0.2).delay(100).fadeTo(300,1, blinkpubli);

190
pandora_console/include/class/Diagnostics.class.php
View File

@ -706,18 +706,34 @@ class Diagnostics extends Wizard
$bytes = 1048576;
$mega = 1024;
switch ($item['Variable_name']) {
case 'sql_mode':
$name = __('Sql mode');
$value = ($item['Value']);
$status = (empty($item['Value']) === true) ? 1 : 0;
$message = __('Must be empty');
case 'innodb_buffer_pool_size':
$name = __('InnoDB buffer pool size');
$value = ($item['Value'] / $bytes);
$status = (($item['Value'] / $bytes) >= 250) ? 1 : 0;
$message = __(
'It has to be 40% of the server memory not recommended to be greater or less'
);
break;
case 'innodb_log_file_size':
$name = __('InnoDB log file size');
$value = ($item['Value'] / $bytes);
$status = (($item['Value'] / $bytes) >= 64) ? 1 : 0;
$message = __('Min. Recommended Value').' 64M';
case 'innodb_file_per_table':
$name = __('InnoDB file per table');
$value = $item['Value'];
$status = ($item['Value'] === 'ON') ? 1 : 0;
$message = __('Recommended ON');
break;
case 'innodb_flush_log_at_trx_commit':
$name = __('InnoDB flush log at trx-commit');
$value = $item['Value'];
$status = ($item['Value'] == 2) ? 1 : 0;
$message = __('Recommended Value').' 2';
break;
case 'innodb_lock_wait_timeout':
$name = __('InnoDB lock wait timeout');
$value = $item['Value'];
$status = ($item['Value'] >= 90) ? 1 : 0;
$message = __('Min. Recommended Value').' 90s';
break;
case 'innodb_log_buffer_size':
@ -727,13 +743,29 @@ class Diagnostics extends Wizard
$message = __('Min. Recommended Value').' 16M';
break;
case 'innodb_flush_log_at_trx_commit':
$name = __('InnoDB flush log at trx-commit');
$value = $item['Value'];
$status = (($item['Value'] / $bytes) >= 0) ? 1 : 0;
$message = __('Min. Recommended Value').' 0';
case 'innodb_log_file_size':
$name = __('InnoDB log file size');
$value = ($item['Value'] / $bytes);
$status = (($item['Value'] / $bytes) >= 64) ? 1 : 0;
$message = __('Min. Recommended Value').' 64M';
break;
/*
case 'join_buffer_size':
$name = __('Join buffer size');
$value = ($item['Value'] / $bytes);
$status = (($item['Value'] / $bytes) >= 265) ? 1 : 0;
$message = __('Min. Recommended Value 265');
break;
case 'key_buffer_size':
$name = __('Key buffer size');
$value = ($item['Value'] / $bytes);
$status = (($item['Value'] / $bytes) >= 256) ? 1 : 0;
$message = __('Min. Recommended Value').' 256';
break;
*/
case 'max_allowed_packet':
$name = __('Maximun allowed packet');
$value = ($item['Value'] / $bytes);
@ -741,27 +773,34 @@ class Diagnostics extends Wizard
$message = __('Min. Recommended Value').' 32M';
break;
case 'innodb_buffer_pool_size':
$name = __('InnoDB buffer pool size');
$value = ($item['Value'] / $mega);
$status = (($item['Value'] / $mega) >= 250) ? 1 : 0;
$message = __(
'It has to be 40% of the server memory not recommended to be greater or less'
);
case 'max_connections':
$name = __('Maximun connections');
$value = $item['Value'];
$status = (($item['Value']) >= 90) ? 1 : 0;
$message = __('Min. Recommended Value');
$message .= ' 90 ';
$message .= __('conections');
break;
case 'sort_buffer_size':
$name = __('Sort buffer size');
$value = number_format(($item['Value'] / $mega), 2);
case 'query_cache_limit':
$name = __('Query cache limit');
$value = ($item['Value'] / $bytes);
$status = (($item['Value'] / $bytes) >= 8) ? 1 : 0;
$message = __('Min. Recommended Value').' 8M';
break;
case 'query_cache_min_res_unit':
$name = __('Query cache min-res-unit');
$value = ($item['Value'] / $mega);
$status = (($item['Value'] / $mega) >= 2) ? 1 : 0;
$message = __('Min. Recommended Value').' 2M';
break;
case 'query_cache_size':
$name = __('Query cache size');
$value = ($item['Value'] / $bytes);
$status = (($item['Value'] / $bytes) >= 32) ? 1 : 0;
$message = __('Min. Recommended Value').' 32';
break;
case 'join_buffer_size':
$name = __('Join buffer size');
$value = ($item['Value'] / $mega);
$status = (($item['Value'] / $bytes) >= 265) ? 1 : 0;
$message = __('Min. Recommended Value 265');
$message = __('Min. Recommended Value').' 32M';
break;
case 'query_cache_type':
@ -771,83 +810,48 @@ class Diagnostics extends Wizard
$message = __('Recommended ON');
break;
case 'query_cache_size':
$name = __('Query cache size');
$value = ($item['Value'] / $bytes);
$status = (($item['Value'] / $bytes) >= 32) ? 1 : 0;
$message = __('Min. Recommended Value').' 32MB';
case 'read_buffer_size':
$name = __('Read buffer size');
$value = ($item['Value'] / $mega);
$status = (($item['Value'] / $mega) >= 32) ? 1 : 0;
$message = __('Min. Recommended Value').' 32K';
break;
case 'query_cache_limit':
$name = __('Query cache limit');
$value = ($item['Value'] / $bytes);
$status = (($item['Value'] / $bytes) >= 256) ? 1 : 0;
$message = __('Min. Recommended Value').' 256K';
case 'read_rnd_buffer_size':
$name = __('Read rnd-buffer size');
$value = ($item['Value'] / $mega);
$status = (($item['Value'] / $mega) >= 32) ? 1 : 0;
$message = __('Min. Recommended Value').' 32K';
break;
case 'innodb_lock_wait_timeout':
$name = __('InnoDB lock wait timeout');
$value = $item['Value'];
$status = (($item['Value'] / $bytes) >= 90) ? 1 : 0;
$message = __('Min. Recommended Value').' 90s';
case 'sort_buffer_size':
$name = __('Sort buffer size');
$value = ($item['Value'] / $mega);
$status = (($item['Value'] / $mega) >= 32) ? 1 : 0;
$message = __('Min. Recommended Value').' 32K';
break;
case 'sql_mode':
$name = __('Sql mode');
$value = ($item['Value']);
$status = (empty($item['Value']) === true) ? 1 : 0;
$message = __('Must be empty');
break;
case 'thread_cache_size':
$name = __('Thread cache size');
$value = $item['Value'];
$status = (($item['Value'] / $bytes) >= 8) ? 1 : 0;
$status = ($item['Value'] >= 8) ? 1 : 0;
$message = __('Min. Recommended Value').' 8';
break;
case 'thread_stack':
$name = __('Thread stack');
$value = ($item['Value'] / $bytes);
$status = (($item['Value'] / $bytes) >= 256) ? 1 : 0;
$message = __('Min. Recommended Value').' 256K';
break;
case 'max_connections':
$name = __('Maximun connections');
$value = $item['Value'];
$status = (($item['Value'] / $bytes) >= 90) ? 1 : 0;
$message = __('Min. Recommended Value').' 90';
break;
case 'key_buffer_size':
$name = __('Key buffer size');
$value = ($item['Value'] / $bytes);
$status = (($item['Value'] / $bytes) >= 256) ? 1 : 0;
$value = ($item['Value'] / $mega);
$status = (($item['Value'] / $mega) >= 256) ? 1 : 0;
$message = __('Min. Recommended Value').' 256';
break;
case 'read_buffer_size':
$name = __('Read buffer size');
$value = ($item['Value'] / $bytes);
$status = (($item['Value'] / $bytes) >= 32) ? 1 : 0;
$message = __('Min. Recommended Value').' 32';
break;
case 'read_rnd_buffer_size':
$name = __('Read rnd-buffer size');
$value = ($item['Value'] / $bytes);
$status = (($item['Value'] / $bytes) >= 32) ? 1 : 0;
$message = __('Min. Recommended Value').' 32';
break;
case 'query_cache_min_res_unit':
$name = __('Query cache min-res-unit');
$value = ($item['Value'] / $bytes);
$status = (($item['Value'] / $bytes) >= 2) ? 1 : 0;
$message = __('Min. Recommended Value').' 2k';
break;
case 'innodb_file_per_table':
$name = __('InnoDB file per table');
$value = $item['Value'];
$status = ($item['Value'] === 'ON') ? 1 : 0;
$message = __('Recommended ON');
break;
default:
$name = '';
$value = 0;

6
pandora_console/include/functions_ui.php
View File

@ -3169,6 +3169,9 @@ function ui_print_datatable(array $parameters)
);
}
// Languages.
$processing = __('Processing');
// Extra html.
$extra = '';
if (isset($parameters['extra_html']) && !empty($parameters['extra_html'])) {
@ -3233,6 +3236,9 @@ function ui_print_datatable(array $parameters)
searching: false,
responsive: true,
dom: "plfrtiBp",
language: {
processing:"'.$processing.'"
},
buttons: [
{
extend: "csv",

4
pandora_console/include/styles/diagnostics.css
View File

@ -17,6 +17,10 @@
text-align: justify;
}
.dataTables_wrapper {
min-height: 150px;
}
.datatables-td-title {
width: 25% !important;
font-weight: bolder;

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

@ -5910,3 +5910,44 @@ table.table_modal_alternate tr td:first-child {
.flot-text {
width: 101%;
}
form#modal_form_feedback {
padding: 10px;
}
form#modal_form_feedback label {
margin-bottom: 10px;
color: #343434;
font-weight: bold;
font-size: 10pt;
}
form#modal_form_feedback input[type="email"] {
background-color: transparent;
border: none;
border-radius: 0;
border-bottom: 1px solid #ccc;
font-family: "lato-bolder", "Open Sans", sans-serif;
font-weight: lighter;
padding: 0px 0px 2px 0px;
box-sizing: border-box;
margin-bottom: 4px;
}
form#modal_form_feedback ul.wizard li {
padding-bottom: 10px;
padding-top: 10px;
}
form#modal_form_feedback ul.wizard li > label:not(.p-switch) {
width: 250px;
vertical-align: top;
display: inline-block;
}
form#modal_form_feedback ul.wizard li > textarea {
width: 600px;
height: 15em;
display: inline-block;
font-family: monospace;
}