';
+ // Load feedback form.
+ echo $this->loadFeedbackForm();
+ echo '
';
+
+ ?>
+
+
+ ';
+ }
+
+
+ /**
+ * Method to cancel welcome modal window.
+ *
+ * @return void
+ */
+ public function cancelWelcome()
+ {
+ // Config update value.
+ $this->setStep(WELCOME_FINISHED);
+ }
+
+
+ /**
+ * Return current step.
+ *
+ * @return integer Step.
+ */
+ public function getStep(): int
+ {
+ global $config;
+ $this->step = $config['welcome_state'];
+
+ // Get step available.
+ if (empty($config['welcome_mail_configured']) === true
+ && get_parameter('sec2') == 'godmode/setup/setup'
+ && get_parameter('section', '') == 'general'
+ && get_parameter('update_config', false) !== false
+ ) {
+ $this->step = W_CONFIGURE_MAIL;
+ } else if (empty($config['welcome_id_agent']) === true) {
+ $this->step = W_CREATE_AGENT;
+ } else if (empty($config['welcome_module']) === true) {
+ $this->step = W_CREATE_MODULE;
+ } else if (empty($config['welcome_alert']) === true) {
+ $this->step = W_CREATE_ALERT;
+ } else if (empty($config['welcome_task']) === true) {
+ $this->step = W_CREATE_TASK;
+ }
+
+ return $this->step;
+ }
+
+
+ /**
+ * Sets current step.
+ *
+ * @param integer $step Current step.
+ *
+ * @return void
+ */
+ public function setStep(int $step)
+ {
+ $this->step = $step;
+ config_update_value('welcome_state', $step);
+ }
+
+
+ /**
+ * Completes current step.
+ *
+ * @return void
+ */
+ public function completeStep()
+ {
+ switch ($this->step) {
+ case W_CONFIGURE_MAIL:
+ config_update_value('welcome_mail_configured', true);
+ break;
+
+ case W_CREATE_AGENT:
+ config_update_value('welcome_id_agent', true);
+ break;
+
+ case W_CREATE_MODULE:
+ config_update_value('welcome_module', true);
+ break;
+
+ case W_CREATE_ALERT:
+ config_update_value('welcome_alert', true);
+ break;
+
+ case W_CREATE_TASK:
+ config_update_value('welcome_task', true);
+ break;
+
+ default:
+ // Ignore.
+ break;
+ }
+
+ }
+
+
+ /**
+ * Check if all tasks had been completed.
+ *
+ * @return boolean All completed or not.
+ */
+ public function checkAllTasks()
+ {
+ global $config;
+
+ foreach ($this->tasks as $t) {
+ if (empty($config[$t]) === true) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+
+ /**
+ * Retrieve current welcome agent id.
+ *
+ * @return integer Agent id (created).
+ */
+ public function getWelcomeAgent()
+ {
+ global $config;
+
+ return $config['welcome_id_agent'];
+ }
+
+
+ /**
+ * Saves current welcome agent (latest created).
+ *
+ * @param integer $id_agent Agent id.
+ *
+ * @return void
+ */
+ public function setWelcomeAgent(int $id_agent)
+ {
+ config_update_value('welcome_id_agent', $id_agent);
+ }
+
+
+ /**
+ * Loads a welcome window form
+ *
+ * @return string HTML code for form.
+ *
+ * @return void Runs loadWelcomeWindow (AJAX).
+ */
+ public function loadWelcomeWindow()
+ {
+ global $config;
+ $btn_configure_mail_class = 'pending';
+ $btn_create_agent_class = 'pending';
+ $btn_create_module_class = '';
+ $btn_create_alert_class = '';
+ $btn_create_discovery_class = 'pending';
+
+ $li_configure_mail_class = 'row_green';
+ $li_create_agent_class = 'row_green';
+ $li_create_module_class = 'row_grey';
+ $li_create_alert_class = 'row_grey';
+ $li_create_discovery_class = 'row_green';
+
+ if (empty($config['welcome_mail_configured']) === false) {
+ $btn_configure_mail_class = ' completed';
+ }
+
+ if (empty($config['welcome_id_agent']) === false) {
+ $btn_create_agent_class = ' completed';
+ $btn_create_module_class = ' pending';
+ $li_create_module_class = 'row_green';
+ }
+
+ if (empty($config['welcome_module']) === false) {
+ $btn_create_module_class = ' completed';
+ $btn_create_alert_class = ' pending';
+ $li_create_module_class = 'row_green';
+ }
+
+ if (empty($config['welcome_alert']) === false) {
+ $btn_create_alert_class = ' completed';
+ $li_create_alert_class = 'row_green';
+ }
+
+ if (empty($config['welcome_task']) === false) {
+ $btn_create_discovery_class = ' completed';
+ }
+
+ if ((int) $config['welcome_state'] === WELCOME_FINISHED) {
+ // Nothing left to do.
+ $btn_configure_mail_class = ' completed';
+ $btn_create_agent_class = ' completed';
+ $btn_create_module_class = ' completed';
+ $btn_create_alert_class = ' completed';
+ $btn_create_discovery_class = ' completed';
+ $li_create_module_class = 'row_green';
+ $li_create_alert_class = 'row_green';
+ }
+
+ $form = [
+ 'action' => '#',
+ 'id' => 'welcome_form',
+ 'onsubmit' => 'this.dialog("close");',
+ 'class' => 'modal',
+ ];
+
+ $logo_url = '';
+ if (enterprise_installed()) {
+ $logo_url = ENTERPRISE_DIR.'/';
+ }
+
+ $logo_url .= 'images/custom_logo/'.$config['custom_logo_white_bg'];
+
+ $inputs = [
+ [
+ 'class' => 'white_box',
+ 'block_content' => [
+ [
+ 'class' => 'centered_full',
+ 'arguments' => [
+ 'type' => 'image',
+ 'src' => $logo_url,
+ 'value' => 1,
+ 'return' => true,
+ ],
+ ],
+ ],
+ ],
+ [
+ 'wrapper' => 'div',
+ 'block_id' => 'div_configure_mail',
+ 'class' => 'hole flex-row w100p '.$li_configure_mail_class,
+ 'direct' => 1,
+ 'block_content' => [
+ [
+ 'label' => __('Please ensure mail configuration matches your needs'),
+ 'arguments' => [
+ 'class' => 'first_lbl',
+ 'name' => 'lbl_create_agent',
+ 'id' => 'lbl_create_agent',
+ ],
+ ],
+ [
+ 'arguments' => [
+ 'label' => '',
+ 'type' => 'button',
+ 'attributes' => 'class="go '.$btn_configure_mail_class.'"',
+ 'name' => 'btn_email_conf',
+ 'id' => 'btn_email_conf',
+ ],
+ ],
+ ],
+ ],
+ [
+ 'label' => 'Learn to monitor',
+ 'class' => 'extra',
+ 'arguments' => [
+ 'class' => 'class="lbl_learn"',
+ 'name' => 'lbl_learn',
+ 'id' => 'lbl_learn',
+ ],
+ ],
+ [
+ 'wrapper' => 'div',
+ 'block_id' => 'div_create_agent',
+ 'class' => 'learn_content_indented flex-row w100p '.$li_create_agent_class,
+ 'direct' => 1,
+ 'block_content' => [
+ [
+ 'label' => __('Create an agent'),
+ 'arguments' => [
+ 'class' => 'first_lbl',
+ 'name' => 'lbl_create_agent',
+ 'id' => 'lbl_create_agent',
+ ],
+ ],
+ [
+ 'arguments' => [
+ 'label' => '',
+ 'type' => 'button',
+ 'attributes' => 'class="go '.$btn_create_agent_class.'"',
+ 'name' => 'btn_create_agent',
+ 'id' => 'btn_create_agent',
+ ],
+ ],
+ ],
+ ],
+ [
+ 'wrapper' => 'div',
+ 'block_id' => 'div_monitor_actions',
+ 'class' => 'learn_content_indented flex-row w100p '.$li_create_module_class,
+ 'direct' => 1,
+ 'block_content' => [
+ [
+ 'label' => __('Create a module to check if an agent is online'),
+ 'arguments' => [
+ 'class' => 'second_lbl',
+ 'name' => 'lbl_check_agent',
+ 'id' => 'lbl_check_agent',
+ ],
+ ],
+ [
+ 'arguments' => [
+ 'label' => '',
+ 'type' => 'button',
+ 'attributes' => 'class="go '.$btn_create_module_class.'"',
+ 'name' => 'btn_create_module',
+ 'id' => 'btn_create_module',
+ ],
+ ],
+ ],
+ ],
+ [
+ 'wrapper' => 'div',
+ 'block_id' => 'div_monitor_actions',
+ 'class' => 'hole learn_content_indented flex-row w100p '.$li_create_alert_class,
+ 'direct' => 1,
+ 'block_content' => [
+ [
+ 'label' => __('Be warned if something is wrong, create an alert on the module'),
+ 'arguments' => [
+ 'class' => 'second_lbl',
+ 'name' => 'lbl_create_alert',
+ 'id' => 'lbl_create_alert',
+ ],
+ ],
+ [
+ 'arguments' => [
+ 'label' => '',
+ 'type' => 'button',
+ 'attributes' => 'class="go '.$btn_create_alert_class.'"',
+ 'name' => 'btn_create_alert',
+ 'id' => 'btn_create_alert',
+ ],
+ ],
+ ],
+ ],
+ [
+ 'wrapper' => 'div',
+ 'block_id' => 'div_discover',
+ 'class' => 'hole flex-row w100p '.$li_create_discovery_class,
+ 'direct' => 1,
+ 'block_content' => [
+ [
+ 'label' => __('Discover hosts and devices in your network'),
+ 'arguments' => [
+ 'class' => 'first_lbl',
+ 'name' => 'lbl_discover_devices',
+ 'id' => 'lbl_discover_devices',
+ ],
+ ],
+ [
+ 'arguments' => [
+ 'label' => '',
+ 'type' => 'button',
+ 'attributes' => 'class="go '.$btn_create_discovery_class.'"',
+ 'name' => 'btn_discover_devices',
+ 'id' => 'btn_discover_devices',
+ ],
+ ],
+ ],
+ ],
+ ];
+
+ if (enterprise_installed()) {
+ $inputs[] = [
+ 'wrapper' => 'div',
+ 'block_id' => 'div_not_working',
+ 'class' => 'hole flex-row w100p',
+ 'direct' => 1,
+ 'block_content' => [
+ [
+ 'label' => __('If something is not working as expected, look for this icon and report!'),
+ 'arguments' => [
+ 'class' => 'first_lbl',
+ 'name' => 'lbl_not_working',
+ 'id' => 'lbl_not_working',
+ ],
+ ],
+ [
+ 'label' => html_print_image(
+ 'images/feedback-header.png',
+ true,
+ [
+ 'onclick' => '$(\'#feedback-header\').click()',
+ 'style' => 'cursor: pointer;',
+ ]
+ ),
+
+ ],
+ ],
+ ];
+ }
+
+ $output = $this->printForm(
+ [
+ 'form' => $form,
+ 'inputs' => $inputs,
+ ],
+ true
+ );
+
+ $output .= $this->loadJS();
+ echo $output;
+
+ // Ajax methods does not continue.
+ exit();
+ }
+
+
+ /**
+ * This function acts as a constructor. Receive the condition to check with
+ * the global config (welcome_state) if continues
+ *
+ * @param boolean $must_run Must be run or not (check register.php).
+ *
+ * @return boolean True if initialized or false if must not run.
+ */
+ public function initialize($must_run)
+ {
+ global $config;
+
+ if (isset($config['welcome_state']) === false) {
+ $this->completeStep();
+ $this->setStep(W_CONFIGURE_MAIL);
+ }
+
+ // Check current page.
+ $sec2 = get_parameter('sec2', '');
+
+ // Search also does not fulfill sec2.
+ if (empty($sec2) === true) {
+ $sec2 = get_parameter('keywords', '');
+ }
+
+ if ($must_run === false
+ || ((int) $config['welcome_state']) === WELCOME_FINISHED
+ ) {
+ // Do not show if finished.
+ return false;
+ }
+
+ $this->step = $this->getStep();
+ $this->agent = $this->getWelcomeAgent();
+
+ /*
+ * Configure mail. Control current flow.
+ *
+ * On empty sec2: show current step.
+ * On setup page: do not show.
+ * After mail configuration: enable agent step.
+ */
+
+ if ($this->step === W_CONFIGURE_MAIL) {
+ if ($sec2 === 'godmode/setup/setup'
+ && get_parameter('section', '') == 'general'
+ && get_parameter('update_config', false) !== false
+ ) {
+ // Mail configuration have been processed.
+ $this->step = W_CONFIGURE_MAIL;
+ $this->completeStep();
+ $this->setStep(W_CREATE_AGENT);
+ } else if ($sec2 === 'godmode/setup/setup'
+ && get_parameter('section', '') === 'general'
+ ) {
+ // Mail configuration is being processed.
+ return false;
+ } else if (empty($sec2) === true) {
+ // Show main page.
+ return true;
+ }
+ }
+
+ /*
+ * Create agent. Control current flow.
+ *
+ * Welcome wizard is shown if you create your first agent.
+ *
+ */
+
+ if (empty($config['welcome_id_agent']) === true) {
+ // Create agent is pending.
+ if ($sec2 === 'godmode/agentes/configurar_agente'
+ && get_parameter('create_agent', false) !== false
+ ) {
+ // Agent have been created. Store.
+ // Here complete step is not needed because is already done
+ // by setWelcomeAgent.
+ $this->setWelcomeAgent(
+ // Non yet processed. Get next available ID.
+ db_get_value_sql(
+ sprintf(
+ 'SELECT AUTO_INCREMENT
+ FROM information_schema.TABLES
+ WHERE TABLE_SCHEMA = "%s"
+ AND TABLE_NAME = "%s"',
+ $config['dbname'],
+ 'tagente'
+ )
+ )
+ );
+ $this->setStep(W_CREATE_MODULE);
+ return true;
+ } else if ($sec2 === 'godmode/agentes/configurar_agente') {
+ // Agent is being created.
+ return false;
+ } else if (empty($sec2) === true) {
+ // If at main page, show welcome.
+ return true;
+ }
+ } else if ($this->step === W_CREATE_AGENT) {
+ $this->step = W_CREATE_MODULE;
+ }
+
+ /*
+ * Create module. Control current flow.
+ *
+ * On empty sec2: show current step.
+ * On module creation page: do not show.
+ * After module creation: enable alert step.
+ */
+
+ if ($this->step === W_CREATE_MODULE) {
+ // Create module is pending.
+ if ($sec2 === 'godmode/agentes/configurar_agente'
+ && get_parameter('tab', '') === 'module'
+ && get_parameter('create_module', false) !== false
+ ) {
+ // Module have been created.
+ $this->completeStep();
+ $this->setStep(W_CREATE_ALERT);
+ return true;
+ } else if ($sec2 === 'godmode/agentes/configurar_agente'
+ && get_parameter('tab', '') === 'module'
+ ) {
+ // Module is being created.
+ return false;
+ } else if (empty($sec2) === true) {
+ // If at main page, show welcome.
+ return true;
+ }
+ }
+
+ /*
+ * Create alert. Control current flow.
+ *
+ * On empty sec2: show current step.
+ * On alert creation page: do not show.
+ * After alert creation: enable discovery task step.
+ */
+
+ if ($this->step === W_CREATE_ALERT) {
+ // Create alert is pending.
+ if ($sec2 === 'godmode/agentes/configurar_agente'
+ && get_parameter('tab', '') === 'alert'
+ && get_parameter('create_alert', false) !== false
+ ) {
+ // Alert have been created.
+ $this->completeStep();
+ $this->setStep(W_CREATE_TASK);
+ return true;
+ } else if ($sec2 === 'godmode/agentes/configurar_agente'
+ && get_parameter('tab', '') === 'alert'
+ ) {
+ // Alert is being created.
+ return false;
+ } else if (empty($sec2) === true) {
+ // If at main page, show welcome.
+ return true;
+ }
+ }
+
+ /*
+ * Create discovery task. Control current flow.
+ *
+ * On empty sec2: show current step.
+ * On discovery task creation page: do not show.
+ * After discovery task creation: finish.
+ */
+
+ // Create Discovery task is pending.
+ // Host&Devices finishses on page 2.
+ if ($sec2 === 'godmode/servers/discovery'
+ && get_parameter('page', 0) == 2
+ ) {
+ // Discovery task have been created.
+ $this->step = W_CREATE_TASK;
+ $this->completeStep();
+
+ // Check if all other tasks had been completed.
+ if ($this->checkAllTasks() === true) {
+ // Finished! do not show.
+ $this->setStep(WELCOME_FINISHED);
+ return false;
+ }
+
+ return true;
+ } else if ($sec2 == 'godmode/servers/discovery') {
+ // Discovery task is being created.
+ return false;
+ }
+
+ // Check if all other tasks had been completed.
+ if ($this->checkAllTasks() === true) {
+ // Finished! do not show.
+ $this->setStep(WELCOME_FINISHED);
+ return false;
+ } else if (empty($sec2) === true) {
+ // Pending tasks.
+ return true;
+ }
+
+ if ($this->step === WELCOME_FINISHED) {
+ // Welcome tutorial finished.
+ return false;
+ }
+
+ // Return a reference to the new object.
+ return false;
+ }
+
+
+ /**
+ * Load JS content.
+ * function that enables the functions to the buttons when its action is
+ * completed.
+ * Assign the url of each button.
+ *
+ * @return string HTML code for javascript functionality.
+ */
+ public function loadJS()
+ {
+ ob_start();
+ ?>
+
+ ';
}
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index d0eab385a3..89b3c03de2 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -1281,6 +1281,10 @@ function config_update_config()
}
// Juanma (06/05/2014) New feature: Custom front page for reports.
+ if (!config_update_value('font_size_item_report', get_parameter('font_size_item_report', 2))) {
+ $error_update[] = __('Font size for items reports');
+ }
+
if (!config_update_value('custom_report_front', get_parameter('custom_report_front'))) {
$error_update[] = __('Custom report front');
}
@@ -1895,6 +1899,10 @@ function config_process_config()
config_update_value('unique_ip', 0);
}
+ if (!isset($config['welcome_state'])) {
+ config_update_value('welcome_state', WELCOME_STARTED);
+ }
+
/*
* Parse the ACL IP list for access API
*/
@@ -2805,6 +2813,10 @@ function config_process_config()
config_update_value('custom_report_front', 0);
}
+ if (!isset($config['font_size_item_report'])) {
+ config_update_value('font_size_item_report', 2);
+ }
+
if (!isset($config['custom_report_front_font'])) {
config_update_value('custom_report_front_font', 'FreeSans.ttf');
}
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index ab3aad9c7a..12a8ecfa88 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -1535,6 +1535,89 @@ function html_print_input_text($name, $value, $alt='', $size=50, $maxlength=255,
}
+/**
+ * Render an input email element.
+ *
+ * @param array $settings Array with attributes input.
+ * only name is necessary.
+ *
+ * @return string Html input.
+ */
+function html_print_input_email(array $settings):string
+{
+ // TODO: const.
+ $valid_attrs = [
+ 'accept',
+ 'disabled',
+ 'maxlength',
+ 'name',
+ 'readonly',
+ 'placeholder',
+ 'size',
+ 'value',
+ 'accesskey',
+ 'class',
+ 'dir',
+ 'id',
+ 'lang',
+ 'style',
+ 'tabindex',
+ 'title',
+ 'xml:lang',
+ 'onfocus',
+ 'onblur',
+ 'onselect',
+ 'onchange',
+ 'onclick',
+ 'ondblclick',
+ 'onmousedown',
+ 'onmouseup',
+ 'onmouseover',
+ 'onmousemove',
+ 'onmouseout',
+ 'onkeypress',
+ 'onkeydown',
+ 'onkeyup',
+ 'required',
+ 'pattern',
+ 'autocomplete',
+ ];
+
+ $output = '';
+ if (isset($settings) === true && is_array($settings) === true) {
+ // Check Name is necessary.
+ if (isset($settings['name']) === true) {
+ $output = '
$attr_value) {
+ // Check valid attribute.
+ if (in_array($attribute, $valid_attrs) === false) {
+ continue;
+ }
+
+ $output .= $attribute.'="'.$attr_value.'" ';
+ }
+
+ $output .= $function.'/>';
+ }
+ }
+
+ return $output;
+}
+
+
/**
* Render an input image element.
*
@@ -1822,7 +1905,7 @@ function html_print_button($label='OK', $name='', $disabled=false, $script='', $
*/
function html_print_textarea($name, $rows, $columns, $value='', $attributes='', $return=false, $class='')
{
- $output = '
';
@@ -1898,6 +1981,7 @@ function html_get_predefined_table($model='transparent', $columns=4)
* $table->titlestyle - Title style
* $table->titleclass - Title class
* $table->styleTable - Table style
+ * $table->autosize - Autosize
* $table->caption - Table title
* @param bool Whether to return an output string or echo now
*
@@ -2008,6 +2092,12 @@ function html_print_table(&$table, $return=false)
// $table->width = '80%';
}
+ if (isset($table->autosize) === true) {
+ $table->autosize = 'autosize = "1"';
+ } else {
+ $table->autosize = '';
+ }
+
if (empty($table->border)) {
if (empty($table)) {
$table = new stdClass();
@@ -2042,9 +2132,9 @@ function html_print_table(&$table, $return=false)
$tableid = empty($table->id) ? 'table'.$table_count : $table->id;
if (!empty($table->width)) {
- $output .= '
width.'; '.$styleTable.' '.$table->tablealign;
} else {
- $output .= 'tablealign;
}
$output .= ' cellpadding="'.$table->cellpadding.'" cellspacing="'.$table->cellspacing.'"';
@@ -2189,33 +2279,47 @@ function html_print_table(&$table, $return=false)
/**
- * Render a radio button input. Extended version, use html_print_radio_button() to simplify.
+ * Render a radio button input. Extended version, use html_print_input()
+ * to simplify.
*
- * @param string Input name.
- * @param string Input value.
- * @param string Set the button to be marked (optional, unmarked by default).
- * @param bool Disable the button (optional, button enabled by default).
- * @param string Script to execute when onClick event is triggered (optional).
- * @param string Optional HTML attributes. It's a free string which will be
- inserted into the HTML tag, use it carefully (optional).
- * @param bool Whether to return an output string or echo now (optional, echo by default).
+ * @param string $name Input name.
+ * @param string $value Input value.
+ * @param string $label Set the button to be marked (optional, unmarked by default).
+ * @param string $checkedvalue Checked value.
+ * @param string $disabled Disable the button (optional, button enabled by default).
+ * @param string $script Script to execute when onClick event is triggered (optional).
+ * @param string $attributes Optional HTML attributes. It's a free string which will be inserted tag, use it carefully (optional).
+ * @param string $returnparam Whether to return an output string or echo now (optional, echo by default).
+ * @param string $modalparam Modal param.
+ * @param string $message Message.
+ * @param string $id Use custom id.
*
* @return string HTML code if return parameter is true.
*/
- /*
- Hello there! :)
- We added some of what seems to be "buggy" messages to the openSource version recently. This is not to force open-source users to move to the enterprise version, this is just to inform people using Pandora FMS open source that it requires skilled people to maintain and keep it running smoothly without professional support. This does not imply open-source version is limited in any way. If you check the recently added code, it contains only warnings and messages, no limitations except one: we removed the option to add custom logo in header. In the Update Manager section, it warns about the 'danger’ of applying automated updates without a proper backup, remembering in the process that the Enterprise version comes with a human-tested package. Maintaining an OpenSource version with more than 500 agents is not so easy, that's why someone using a Pandora with 8000 agents should consider asking for support. It's not a joke, we know of many setups with a huge number of agents, and we hate to hear that “its becoming unstable and slow” :(
- You can of course remove the warnings, that's why we include the source and do not use any kind of trick. And that's why we added here this comment, to let you know this does not reflect any change in our opensource mentality of does the last 14 years.
- */
-
-function html_print_radio_button_extended($name, $value, $label, $checkedvalue, $disabled, $script, $attributes, $return=false, $modal=false, $message='visualmodal')
-{
+function html_print_radio_button_extended(
+ $name,
+ $value,
+ $label,
+ $checkedvalue,
+ $disabled,
+ $script,
+ $attributes,
+ $return=false,
+ $modal=false,
+ $message='visualmodal',
+ $id=null
+) {
static $idcounter = 0;
$output = '';
$output = '';
- $table .= '';
+ $table .= '';
if (isset($parameters['column_names'])
&& is_array($parameters['column_names'])
@@ -3224,11 +3231,14 @@ function ui_print_datatable(array $parameters)
},
processing: true,
serverSide: true,
- paging: true,
+ paging: '.$parameters['paging'].',
pageLength: '.$parameters['default_pagination'].',
searching: false,
responsive: true,
dom: "plfrtiBp",
+ language: {
+ processing:"'.$processing.'"
+ },
buttons: [
{
extend: "csv",
@@ -3326,10 +3336,18 @@ function ui_print_datatable(array $parameters)
$("#'.$form_id.'_search_bt").click(function (){
dt_'.$table_id.'.draw().page(0)
- });
- });
+ });';
-';
+ if (isset($parameters['caption']) === true
+ && empty($parameters['caption']) === false
+ ) {
+ $js .= '$("#'.$table_id.'").append("'.$parameters['caption'].' ");';
+ $js .= '$(".datatables_thead_tr").css("height", 0);';
+ }
+
+ $js .= '});';
+
+ $js .= '';
// Order.
$err_msg = '
';
@@ -3345,7 +3363,7 @@ function ui_print_datatable(array $parameters)
$output = $include.$output;
// Print datatable if needed.
- if (!(isset($parameters['print']) && $parameters['print'] === false)) {
+ if (isset($parameters['print']) === false || $parameters['print'] === false) {
echo $output;
}
@@ -3523,6 +3541,8 @@ function ui_print_event_priority(
* @param string $toggle_class Toggle class.
* @param string $container_class Container class.
* @param string $main_class Main object class.
+ * @param string $img_a Image (closed).
+ * @param string $img_b Image (opened).
*
* @return string HTML.
*/
@@ -3535,20 +3555,22 @@ function ui_toggle(
$return=false,
$toggle_class='',
$container_class='white-box-content',
- $main_class='box-shadow white_table_graph'
+ $main_class='box-shadow white_table_graph',
+ $img_a='images/arrow_down_green.png',
+ $img_b='images/arrow_right_green.png'
) {
// Generate unique Id.
$uniqid = uniqid('');
- $image_a = html_print_image('images/arrow_down_green.png', true, false, true);
- $image_b = html_print_image('images/arrow_right_green.png', true, false, true);
+ $image_a = html_print_image($img_a, true, false, true);
+ $image_b = html_print_image($img_b, true, false, true);
// Options.
if ($hidden_default) {
$style = 'display:none';
- $original = 'images/arrow_right_green.png';
+ $original = $img_b;
} else {
$style = '';
- $original = 'images/arrow_down_green.png';
+ $original = $img_a;
}
// Link to toggle.
@@ -3601,6 +3623,31 @@ function ui_toggle(
}
+/**
+ * Simplified way of ui_toggle ussage.
+ *
+ * @param array $data Arguments.
+ *
+ * @return string HTML code with toggle content.
+ */
+function ui_print_toggle($data)
+{
+ return ui_toggle(
+ $data['content'],
+ $data['name'],
+ (isset($data['title']) === true) ? $data['title'] : '',
+ (isset($data['id']) === true) ? $data['id'] : '',
+ (isset($data['hidden_default']) === true) ? $data['hidden_default'] : true,
+ (isset($data['return']) === true) ? $data['return'] : false,
+ (isset($data['toggle_class']) === true) ? $data['toggle_class'] : '',
+ (isset($data['container_class']) === true) ? $data['container_class'] : 'white-box-content',
+ (isset($data['main_class']) === true) ? $data['main_class'] : 'box-shadow white_table_graph',
+ (isset($data['img_a']) === true) ? $data['img_a'] : 'images/arrow_down_green.png',
+ (isset($data['img_b']) === true) ? $data['img_b'] : 'images/arrow_right_green.png'
+ );
+}
+
+
/**
* Construct and return the URL to be used in order to refresh the current page correctly.
*
@@ -5697,7 +5744,7 @@ function ui_print_comments($comments)
continue;
}
- $comments_array[] = json_decode(io_safe_output($comm), true);
+ $comments_array[] = io_safe_output(json_decode($comm, true));
}
}
diff --git a/pandora_console/include/functions_users.php b/pandora_console/include/functions_users.php
index 97d97c7273..86e4475eea 100755
--- a/pandora_console/include/functions_users.php
+++ b/pandora_console/include/functions_users.php
@@ -1236,3 +1236,29 @@ function users_get_explode_tags(&$group)
}
}
+
+
+/**
+ * Get mail admin.
+ *
+ * @return string Return mail admin.
+ */
+function get_mail_admin():string
+{
+ $mail = db_get_value('email', 'tusuario', 'is_admin', 1);
+
+ return $mail;
+}
+
+
+/**
+ * Get name admin.
+ *
+ * @return string Return name admin.
+ */
+function get_name_admin():string
+{
+ $mail = db_get_value('fullname', 'tusuario', 'is_admin', 1);
+
+ return $mail;
+}
diff --git a/pandora_console/include/javascript/jquery.validate.js b/pandora_console/include/javascript/jquery.validate.js
new file mode 100644
index 0000000000..7bc947fbc0
--- /dev/null
+++ b/pandora_console/include/javascript/jquery.validate.js
@@ -0,0 +1,4 @@
+/*! jQuery Validation Plugin - v1.19.1 - 6/15/2019
+ * https://jqueryvalidation.org/
+ * Copyright (c) 2019 Jörn Zaefferer; Licensed MIT */
+!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){a.extend(a.fn,{validate:function(b){if(!this.length)return void(b&&b.debug&&window.console&&console.warn("Nothing selected, can't validate, returning nothing."));var c=a.data(this[0],"validator");return c?c:(this.attr("novalidate","novalidate"),c=new a.validator(b,this[0]),a.data(this[0],"validator",c),c.settings.onsubmit&&(this.on("click.validate",":submit",function(b){c.submitButton=b.currentTarget,a(this).hasClass("cancel")&&(c.cancelSubmit=!0),void 0!==a(this).attr("formnovalidate")&&(c.cancelSubmit=!0)}),this.on("submit.validate",function(b){function d(){var d,e;return c.submitButton&&(c.settings.submitHandler||c.formSubmitted)&&(d=a("Warning: No message defined for "+b.name+""),e=/\$?\{(\d+)\}/g;return"function"==typeof d?d=d.call(this,c.parameters,b):e.test(d)&&(d=a.validator.format(d.replace(e,"{$1}"),c.parameters)),d},formatAndAdd:function(a,b){var c=this.defaultMessage(a,b);this.errorList.push({message:c,element:a,method:b.method}),this.errorMap[a.name]=c,this.submitted[a.name]=c},addWrapper:function(a){return this.settings.wrapper&&(a=a.add(a.parent(this.settings.wrapper))),a},defaultShowErrors:function(){var a,b,c;for(a=0;this.errorList[a];a++)c=this.errorList[a],this.settings.highlight&&this.settings.highlight.call(this,c.element,this.settings.errorClass,this.settings.validClass),this.showLabel(c.element,c.message);if(this.errorList.length&&(this.toShow=this.toShow.add(this.containers)),this.settings.success)for(a=0;this.successList[a];a++)this.showLabel(this.successList[a]);if(this.settings.unhighlight)for(a=0,b=this.validElements();b[a];a++)this.settings.unhighlight.call(this,b[a],this.settings.errorClass,this.settings.validClass);this.toHide=this.toHide.not(this.toShow),this.hideErrors(),this.addWrapper(this.toShow).show()},validElements:function(){return this.currentElements.not(this.invalidElements())},invalidElements:function(){return a(this.errorList).map(function(){return this.element})},showLabel:function(b,c){var d,e,f,g,h=this.errorsFor(b),i=this.idOrName(b),j=a(b).attr("aria-describedby");h.length?(h.removeClass(this.settings.validClass).addClass(this.settings.errorClass),h.html(c)):(h=a("<"+this.settings.errorElement+">").attr("id",i+"-error").addClass(this.settings.errorClass).html(c||""),d=h,this.settings.wrapper&&(d=h.hide().show().wrap("<"+this.settings.wrapper+"/>").parent()),this.labelContainer.length?this.labelContainer.append(d):this.settings.errorPlacement?this.settings.errorPlacement.call(this,d,a(b)):d.insertAfter(b),h.is("label")?h.attr("for",i):0===h.parents("label[for='"+this.escapeCssMeta(i)+"']").length&&(f=h.attr("id"),j?j.match(new RegExp("\\b"+this.escapeCssMeta(f)+"\\b"))||(j+=" "+f):j=f,a(b).attr("aria-describedby",j),e=this.groups[b.name],e&&(g=this,a.each(g.groups,function(b,c){c===e&&a("[name='"+g.escapeCssMeta(b)+"']",g.currentForm).attr("aria-describedby",h.attr("id"))})))),!c&&this.settings.success&&(h.text(""),"string"==typeof this.settings.success?h.addClass(this.settings.success):this.settings.success(h,b)),this.toShow=this.toShow.add(h)},errorsFor:function(b){var c=this.escapeCssMeta(this.idOrName(b)),d=a(b).attr("aria-describedby"),e="label[for='"+c+"'], label[for='"+c+"'] *";return d&&(e=e+", #"+this.escapeCssMeta(d).replace(/\s+/g,", #")),this.errors().filter(e)},escapeCssMeta:function(a){return a.replace(/([\\!"#$%&'()*+,.\/:;<=>?@\[\]^`{|}~])/g,"\\$1")},idOrName:function(a){return this.groups[a.name]||(this.checkable(a)?a.name:a.id||a.name)},validationTargetFor:function(b){return this.checkable(b)&&(b=this.findByName(b.name)),a(b).not(this.settings.ignore)[0]},checkable:function(a){return/radio|checkbox/i.test(a.type)},findByName:function(b){return a(this.currentForm).find("[name='"+this.escapeCssMeta(b)+"']")},getLength:function(b,c){switch(c.nodeName.toLowerCase()){case"select":return a("option:selected",c).length;case"input":if(this.checkable(c))return this.findByName(c.name).filter(":checked").length}return b.length},depend:function(a,b){return!this.dependTypes[typeof a]||this.dependTypes[typeof a](a,b)},dependTypes:{"boolean":function(a){return a},string:function(b,c){return!!a(b,c.form).length},"function":function(a,b){return a(b)}},optional:function(b){var c=this.elementValue(b);return!a.validator.methods.required.call(this,c,b)&&"dependency-mismatch"},startRequest:function(b){this.pending[b.name]||(this.pendingRequest++,a(b).addClass(this.settings.pendingClass),this.pending[b.name]=!0)},stopRequest:function(b,c){this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass),c&&0===this.pendingRequest&&this.formSubmitted&&this.form()?(a(this.currentForm).submit(),this.submitButton&&a("input:hidden[name='"+this.submitButton.name+"']",this.currentForm).remove(),this.formSubmitted=!1):!c&&0===this.pendingRequest&&this.formSubmitted&&(a(this.currentForm).triggerHandler("invalid-form",[this]),this.formSubmitted=!1)},previousValue:function(b,c){return c="string"==typeof c&&c||"remote",a.data(b,"previousValue")||a.data(b,"previousValue",{old:null,valid:!0,message:this.defaultMessage(b,{method:c})})},destroy:function(){this.resetForm(),a(this.currentForm).off(".validate").removeData("validator").find(".validate-equalTo-blur").off(".validate-equalTo").removeClass("validate-equalTo-blur").find(".validate-lessThan-blur").off(".validate-lessThan").removeClass("validate-lessThan-blur").find(".validate-lessThanEqual-blur").off(".validate-lessThanEqual").removeClass("validate-lessThanEqual-blur").find(".validate-greaterThanEqual-blur").off(".validate-greaterThanEqual").removeClass("validate-greaterThanEqual-blur").find(".validate-greaterThan-blur").off(".validate-greaterThan").removeClass("validate-greaterThan-blur")}},classRuleSettings:{required:{required:!0},email:{email:!0},url:{url:!0},date:{date:!0},dateISO:{dateISO:!0},number:{number:!0},digits:{digits:!0},creditcard:{creditcard:!0}},addClassRules:function(b,c){b.constructor===String?this.classRuleSettings[b]=c:a.extend(this.classRuleSettings,b)},classRules:function(b){var c={},d=a(b).attr("class");return d&&a.each(d.split(" "),function(){this in a.validator.classRuleSettings&&a.extend(c,a.validator.classRuleSettings[this])}),c},normalizeAttributeRule:function(a,b,c,d){/min|max|step/.test(c)&&(null===b||/number|range|text/.test(b))&&(d=Number(d),isNaN(d)&&(d=void 0)),d||0===d?a[c]=d:b===c&&"range"!==b&&(a[c]=!0)},attributeRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)"required"===c?(d=b.getAttribute(c),""===d&&(d=!0),d=!!d):d=f.attr(c),this.normalizeAttributeRule(e,g,c,d);return e.maxlength&&/-1|2147483647|524288/.test(e.maxlength)&&delete e.maxlength,e},dataRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)d=f.data("rule"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase()),""===d&&(d=!0),this.normalizeAttributeRule(e,g,c,d);return e},staticRules:function(b){var c={},d=a.data(b.form,"validator");return d.settings.rules&&(c=a.validator.normalizeRule(d.settings.rules[b.name])||{}),c},normalizeRules:function(b,c){return a.each(b,function(d,e){if(e===!1)return void delete b[d];if(e.param||e.depends){var f=!0;switch(typeof e.depends){case"string":f=!!a(e.depends,c.form).length;break;case"function":f=e.depends.call(c,c)}f?b[d]=void 0===e.param||e.param:(a.data(c.form,"validator").resetElements(a(c)),delete b[d])}}),a.each(b,function(d,e){b[d]=a.isFunction(e)&&"normalizer"!==d?e(c):e}),a.each(["minlength","maxlength"],function(){b[this]&&(b[this]=Number(b[this]))}),a.each(["rangelength","range"],function(){var c;b[this]&&(a.isArray(b[this])?b[this]=[Number(b[this][0]),Number(b[this][1])]:"string"==typeof b[this]&&(c=b[this].replace(/[\[\]]/g,"").split(/[\s,]+/),b[this]=[Number(c[0]),Number(c[1])]))}),a.validator.autoCreateRanges&&(null!=b.min&&null!=b.max&&(b.range=[b.min,b.max],delete b.min,delete b.max),null!=b.minlength&&null!=b.maxlength&&(b.rangelength=[b.minlength,b.maxlength],delete b.minlength,delete b.maxlength)),b},normalizeRule:function(b){if("string"==typeof b){var c={};a.each(b.split(/\s/),function(){c[this]=!0}),b=c}return b},addMethod:function(b,c,d){a.validator.methods[b]=c,a.validator.messages[b]=void 0!==d?d:a.validator.messages[b],c.length<3&&a.validator.addClassRules(b,a.validator.normalizeRule(b))},methods:{required:function(b,c,d){if(!this.depend(d,c))return"dependency-mismatch";if("select"===c.nodeName.toLowerCase()){var e=a(c).val();return e&&e.length>0}return this.checkable(c)?this.getLength(b,c)>0:void 0!==b&&null!==b&&b.length>0},email:function(a,b){return this.optional(b)||/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(a)},url:function(a,b){return this.optional(b)||/^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})).?)(?::\d{2,5})?(?:[\/?#]\S*)?$/i.test(a)},date:function(){var a=!1;return function(b,c){return a||(a=!0,this.settings.debug&&window.console&&console.warn("The `date` method is deprecated and will be removed in version '2.0.0'.\nPlease don't use it, since it relies on the Date constructor, which\nbehaves very differently across browsers and locales. Use `dateISO`\ninstead or one of the locale specific methods in `localizations/`\nand `additional-methods.js`.")),this.optional(c)||!/Invalid|NaN/.test(new Date(b).toString())}}(),dateISO:function(a,b){return this.optional(b)||/^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(a)},number:function(a,b){return this.optional(b)||/^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(a)},digits:function(a,b){return this.optional(b)||/^\d+$/.test(a)},minlength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(b,c);return this.optional(c)||e>=d},maxlength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(b,c);return this.optional(c)||e<=d},rangelength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(b,c);return this.optional(c)||e>=d[0]&&e<=d[1]},min:function(a,b,c){return this.optional(b)||a>=c},max:function(a,b,c){return this.optional(b)||a<=c},range:function(a,b,c){return this.optional(b)||a>=c[0]&&a<=c[1]},step:function(b,c,d){var e,f=a(c).attr("type"),g="Step attribute on input type "+f+" is not supported.",h=["text","number","range"],i=new RegExp("\\b"+f+"\\b"),j=f&&!i.test(h.join()),k=function(a){var b=(""+a).match(/(?:\.(\d+))?$/);return b&&b[1]?b[1].length:0},l=function(a){return Math.round(a*Math.pow(10,e))},m=!0;if(j)throw new Error(g);return e=k(d),(k(b)>e||l(b)%l(d)!==0)&&(m=!1),this.optional(c)||m},equalTo:function(b,c,d){var e=a(d);return this.settings.onfocusout&&e.not(".validate-equalTo-blur").length&&e.addClass("validate-equalTo-blur").on("blur.validate-equalTo",function(){a(c).valid()}),b===e.val()},remote:function(b,c,d,e){if(this.optional(c))return"dependency-mismatch";e="string"==typeof e&&e||"remote";var f,g,h,i=this.previousValue(c,e);return this.settings.messages[c.name]||(this.settings.messages[c.name]={}),i.originalMessage=i.originalMessage||this.settings.messages[c.name][e],this.settings.messages[c.name][e]=i.message,d="string"==typeof d&&{url:d}||d,h=a.param(a.extend({data:b},d.data)),i.old===h?i.valid:(i.old=h,f=this,this.startRequest(c),g={},g[c.name]=b,a.ajax(a.extend(!0,{mode:"abort",port:"validate"+c.name,dataType:"json",data:g,context:f.currentForm,success:function(a){var d,g,h,j=a===!0||"true"===a;f.settings.messages[c.name][e]=i.originalMessage,j?(h=f.formSubmitted,f.resetInternals(),f.toHide=f.errorsFor(c),f.formSubmitted=h,f.successList.push(c),f.invalid[c.name]=!1,f.showErrors()):(d={},g=a||f.defaultMessage(c,{method:e,parameters:b}),d[c.name]=i.message=g,f.invalid[c.name]=!0,f.showErrors(d)),i.valid=j,f.stopRequest(c,j)}},d)),"pending")}}});var b,c={};return a.ajaxPrefilter?a.ajaxPrefilter(function(a,b,d){var e=a.port;"abort"===a.mode&&(c[e]&&c[e].abort(),c[e]=d)}):(b=a.ajax,a.ajax=function(d){var e=("mode"in d?d:a.ajaxSettings).mode,f=("port"in d?d:a.ajaxSettings).port;return"abort"===e?(c[f]&&c[f].abort(),c[f]=b.apply(this,arguments),c[f]):b.apply(this,arguments)}),a});
\ No newline at end of file
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index 33ab956a1f..c3ed855213 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -1,3 +1,6 @@
+/* global $ */
+/* exported load_modal */
+
var ENTERPRISE_DIR = "enterprise";
/* Function to hide/unhide a specific Div id */
@@ -1872,8 +1875,6 @@ function logo_preview(icon_name, icon_path, incoming_options) {
}
// Advanced Form control.
-/* global $ */
-/* exported load_modal */
function load_modal(settings) {
var AJAX_RUNNING = 0;
var data = new FormData();
@@ -1899,6 +1900,169 @@ function load_modal(settings) {
buttons: []
})
.show();
+ var required_buttons = [];
+ if (settings.modal.cancel != undefined) {
+ //The variable contains a function
+ // that is responsible for executing the method it receives from settings
+ // which confirms the closure of a modal
+ var cancelModal = function() {
+ settings.target.dialog("close");
+ if (AJAX_RUNNING) return;
+ AJAX_RUNNING = 1;
+ var formdata = new FormData();
+
+ formdata.append("page", settings.oncancel.page);
+ formdata.append("method", settings.oncancel.method);
+
+ $.ajax({
+ method: "post",
+ url: settings.url,
+ processData: false,
+ contentType: false,
+ data: formdata,
+ success: function(data) {
+ if (typeof settings.oncancel.callback == "function") {
+ settings.oncancel.callback(data);
+ settings.target.dialog("close");
+ }
+ AJAX_RUNNING = 0;
+ },
+ error: function(data) {
+ // console.log(data);
+ AJAX_RUNNING = 0;
+ }
+ });
+ };
+
+ required_buttons.push({
+ class:
+ "ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel",
+ text: settings.modal.cancel,
+ click: function() {
+ if (settings.oncancel != undefined) {
+ if (typeof settings.oncancel.confirm == "function") {
+ //receive function
+ settings.oncancel.confirm(cancelModal);
+ } else if (settings.oncancel != undefined) {
+ cancelModal();
+ }
+ } else {
+ $(this).dialog("close");
+ }
+ }
+ });
+ }
+
+ if (settings.modal.ok != undefined) {
+ required_buttons.push({
+ class:
+ "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next",
+ text: settings.modal.ok,
+ click: function() {
+ if (AJAX_RUNNING) return;
+
+ if (settings.onsubmit != undefined) {
+ if (settings.onsubmit.preaction != undefined) {
+ settings.onsubmit.preaction();
+ }
+ AJAX_RUNNING = 1;
+ if (settings.onsubmit.dataType == undefined) {
+ settings.onsubmit.dataType = "html";
+ }
+
+ var formdata = new FormData();
+ if (settings.extradata) {
+ settings.extradata.forEach(function(item) {
+ if (item.value != undefined)
+ formdata.append(item.name, item.value);
+ });
+ }
+ formdata.append("page", settings.onsubmit.page);
+ formdata.append("method", settings.onsubmit.method);
+
+ var flagError = false;
+
+ $("#" + settings.form + " :input").each(function() {
+ if (this.checkValidity() === false) {
+ $(this).attr("title", this.validationMessage);
+ $(this).tooltip({
+ tooltipClass: "uitooltip",
+ position: {
+ my: "right bottom",
+ at: "right top",
+ using: function(position, feedback) {
+ $(this).css(position);
+ $("")
+ .addClass("arrow")
+ .addClass(feedback.vertical)
+ .addClass(feedback.horizontal)
+ .appendTo(this);
+ }
+ }
+ });
+ $(this).tooltip("open");
+
+ var element = $(this);
+ setTimeout(
+ function(element) {
+ element.tooltip("destroy");
+ element.removeAttr("title");
+ },
+ 3000,
+ element
+ );
+
+ flagError = true;
+ }
+
+ if (this.type == "file") {
+ if ($(this).prop("files")[0]) {
+ formdata.append(this.name, $(this).prop("files")[0]);
+ }
+ } else {
+ if ($(this).attr("type") == "checkbox") {
+ if (this.checked) {
+ formdata.append(this.name, "on");
+ }
+ } else {
+ formdata.append(this.name, $(this).val());
+ }
+ }
+ });
+
+ if (flagError === false) {
+ $.ajax({
+ method: "post",
+ url: settings.url,
+ processData: false,
+ contentType: false,
+ data: formdata,
+ dataType: settings.onsubmit.dataType,
+ success: function(data) {
+ if (settings.ajax_callback != undefined) {
+ if (settings.idMsgCallback != undefined) {
+ settings.ajax_callback(data, settings.idMsgCallback);
+ } else {
+ settings.ajax_callback(data);
+ }
+ }
+ AJAX_RUNNING = 0;
+ }
+ });
+ } else {
+ AJAX_RUNNING = 0;
+ }
+ } else {
+ // No onsumbit configured. Directly close.
+ $(this).dialog("close");
+ }
+ },
+ error: function(data) {
+ // console.log(data);
+ AJAX_RUNNING = 0;
+ }
+ });
+ }
$.ajax({
method: "post",
@@ -1921,69 +2085,131 @@ function load_modal(settings) {
opacity: 0.5,
background: "black"
},
- buttons: [
- {
- class:
- "ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel",
- text: settings.modal.cancel,
- click: function() {
- $(this).dialog("close");
- if (typeof settings.cleanup == "function") {
- settings.cleanup();
- }
- }
- },
- {
- class:
- "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next",
- text: settings.modal.ok,
- click: function() {
- if (AJAX_RUNNING) return;
- AJAX_RUNNING = 1;
- if (settings.onsubmit.preaction != undefined) {
- settings.onsubmit.preaction();
- }
- var formdata = new FormData();
- if (settings.extradata) {
- settings.extradata.forEach(function(item) {
- if (item.value != undefined)
- formdata.append(item.name, item.value);
- });
- }
- formdata.append("page", settings.onsubmit.page);
- formdata.append("method", settings.onsubmit.method);
-
- $("#" + settings.form + " :input").each(function() {
- if (this.type == "file") {
- if ($(this).prop("files")[0]) {
- formdata.append(this.name, $(this).prop("files")[0]);
- }
- } else {
- formdata.append(this.name, $(this).val());
- }
- });
-
- $.ajax({
- method: "post",
- url: settings.url,
- processData: false,
- contentType: false,
- data: formdata,
- success: function(data) {
- if (settings.ajax_callback != undefined) {
- settings.ajax_callback(data);
- }
- AJAX_RUNNING = 0;
- }
- });
- }
- }
- ],
+ buttons: required_buttons,
closeOnEscape: false,
open: function() {
$(".ui-dialog-titlebar-close").hide();
}
});
+ },
+ error: function(data) {
+ // console.log(data);
+ }
+ });
+}
+
+//Function that shows a dialog box to confirm closures of generic manners. The modal id is random
+function confirmDialog(settings) {
+ var randomStr =
+ Math.random()
+ .toString(36)
+ .substring(2, 15) +
+ Math.random()
+ .toString(36)
+ .substring(2, 15);
+
+ $("body").append(
+ '
' + settings.message + "
"
+ );
+ $("#confirm_" + randomStr);
+ $("#confirm_" + randomStr)
+ .dialog({
+ title: settings.title,
+ close: false,
+ width: 350,
+ modal: true,
+ buttons: [
+ {
+ text: "Cancel",
+ class:
+ "ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel",
+ click: function() {
+ $(this).dialog("close");
+ if (typeof settings.onDeny == "function") settings.onDeny();
+ }
+ },
+ {
+ text: "Ok",
+ class:
+ "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next",
+ click: function() {
+ $(this).dialog("close");
+ if (typeof settings.onAccept == "function") settings.onAccept();
+ }
+ }
+ ]
+ })
+ .show();
+}
+
+/**
+ * Function to show modal with message Validation.
+ *
+ * @param {json} data Json example:
+ * $return = [
+ * 'error' => 0 or 1,
+ * 'title' => [
+ * Failed,
+ * Success,
+ * ],
+ * 'text' => [
+ * Failed,
+ * Success,
+ * ],
+ *];
+ * @param {string} idMsg ID div charge modal.
+ *
+ * @return {void}
+ */
+function generalShowMsg(data, idMsg) {
+ var title = data.title[data.error];
+ var text = data.text[data.error];
+ var failed = !data.error;
+
+ $("#" + idMsg).empty();
+ $("#" + idMsg).html(text);
+ $("#" + idMsg).dialog({
+ width: 450,
+ position: {
+ my: "center",
+ at: "center",
+ of: window,
+ collision: "fit"
+ },
+ title: title,
+ buttons: [
+ {
+ class:
+ "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next",
+ text: "OK",
+ click: function(e) {
+ if (!failed) {
+ $(".ui-dialog-content").dialog("close");
+ } else {
+ $(this).dialog("close");
+ }
+ }
+ }
+ ]
+ });
+}
+
+/**
+ * Function for AJAX request.
+ *
+ * @param {string} id Id container append data.
+ * @param {json} settings Json with settings.
+ *
+ * @return {void}
+ */
+function ajaxRequest(id, settings) {
+ $.ajax({
+ type: settings.type,
+ dataType: settings.html,
+ url: settings.url,
+ data: settings.data,
+ success: function(data) {
+ $("#" + id).append(data);
}
});
}
diff --git a/pandora_console/include/javascript/pandora_modules.js b/pandora_console/include/javascript/pandora_modules.js
index d04c3d2bd6..0ba0eb5515 100644
--- a/pandora_console/include/javascript/pandora_modules.js
+++ b/pandora_console/include/javascript/pandora_modules.js
@@ -541,13 +541,13 @@ function configure_modules_form() {
}
if (data["type"] >= 15 && data["type"] <= 18) {
- $("#snmp_version").val(data["tcp_send"]);
- $("#text-snmp3_auth_user").val(data["plugin_user"]);
- $("#password-snmp3_auth_pass").val(data["plugin_pass"]);
- $("#snmp3_auth_method").val(data["plugin_parameter"]);
- $("#snmp3_privacy_method").val(data["custom_string_1"]);
- $("#password-snmp3_privacy_pass").val(data["custom_string_2"]);
- $("#snmp3_security_level").val(data["custom_string_3"]);
+ $("#snmp_version").val(data["snmp_version"]);
+ $("#text-snmp3_auth_user").val(data["snmp3_auth_user"]);
+ $("#password-snmp3_auth_pass").val(data["snmp3_auth_pass"]);
+ $("#snmp3_auth_method").val(data["snmp3_auth_method"]);
+ $("#snmp3_privacy_method").val(data["snmp3_privacy_method"]);
+ $("#password-snmp3_privacy_pass").val(data["snmp3_privacy_pass"]);
+ $("#snmp3_security_level").val(data["snmp3_security_level"]);
if (data["tcp_send"] == "3") {
$("#simple-field_snmpv3_row1").attr("style", "");
@@ -564,6 +564,14 @@ function configure_modules_form() {
if (data["id_plugin"] != undefined) {
$("#id_plugin").trigger("change");
}
+
+ if (data["type"] >= 34 && data["type"] <= 37) {
+ $("#command_text").val(data["command_text"]);
+ $("#command_credential_identifier").val(
+ data["command_credential_identifier"]
+ );
+ $("#command_os").val(data["command_os"]);
+ }
},
"json"
);
diff --git a/pandora_console/include/styles/diagnostics.css b/pandora_console/include/styles/diagnostics.css
new file mode 100644
index 0000000000..17109ed57f
--- /dev/null
+++ b/pandora_console/include/styles/diagnostics.css
@@ -0,0 +1,70 @@
+.pdf-report {
+ page-break-inside: avoid;
+}
+
+.pdf-report th,
+.title-self-monitoring,
+.caption_table caption {
+ text-align: center;
+ font-size: 1.5em;
+ font-weight: bolder;
+ color: #fff;
+ background: #282828;
+ padding: 8px;
+}
+
+.pdf-report tr {
+ text-align: justify;
+}
+
+.dataTables_wrapper {
+ min-height: 150px;
+}
+
+.datatables-td-title {
+ width: 25% !important;
+ font-weight: bolder;
+}
+
+.datatables-td-max {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+}
+
+.datatables-td-max img {
+ margin-right: 10px;
+}
+
+.datatables-td-max span {
+ width: 400px;
+ display: inline-block;
+ word-wrap: break-word;
+}
+
+.pdf-report td {
+ font-size: 1.2em;
+}
+
+.container-self-monitoring {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+}
+
+.element-self-monitoring {
+ flex: 2 1 600px;
+}
+
+.footer-self-monitoring {
+ margin: 30px;
+ font-style: italic;
+}
+
+#modal_form_feedback {
+ margin: 10px;
+}
+
+#div-what-happened label {
+ margin-bottom: 10px;
+}
diff --git a/pandora_console/include/styles/discovery.css b/pandora_console/include/styles/discovery.css
index 82b022050f..2aee23f645 100644
--- a/pandora_console/include/styles/discovery.css
+++ b/pandora_console/include/styles/discovery.css
@@ -205,7 +205,9 @@ label {
}
li > input[type="text"],
+li > input[type="email"],
li > input[type="password"],
+li > input[type="email"],
.discovery_text_input > input[type="password"],
.discovery_text_input > input[type="text"],
#interval_manual > input[type="text"] {
@@ -270,3 +272,54 @@ a.ext_link {
margin-left: 1em;
font-size: 8pt;
}
+
+div.ui-tooltip.ui-corner-all.ui-widget-shadow.ui-widget.ui-widget-content.uitooltip {
+ background: grey;
+ opacity: 0.9;
+ border-radius: 4px;
+ box-shadow: 6px 5px 9px -9px black;
+ padding: 6px;
+}
+
+.ui-tooltip-content {
+ background: transparent;
+ color: #fff;
+ font-weight: bold;
+ font-family: "lato-lighter", "Open Sans", sans-serif;
+ letter-spacing: 0.03pt;
+ font-size: 8pt;
+}
+
+.arrow {
+ width: 70px;
+ height: 16px;
+ overflow: hidden;
+ position: absolute;
+ left: 50%;
+ margin-left: -35px;
+ bottom: -16px;
+}
+.arrow.top {
+ top: -16px;
+ bottom: auto;
+}
+.arrow.left {
+ left: 50%;
+}
+.arrow:after {
+ background: grey;
+ content: "";
+ position: absolute;
+ left: 20px;
+ top: -20px;
+ width: 25px;
+ height: 25px;
+ box-shadow: 6px 5px 9px -9px black;
+ -webkit-transform: rotate(45deg);
+ -ms-transform: rotate(45deg);
+ transform: rotate(45deg);
+}
+.arrow.top:after {
+ bottom: -20px;
+ top: auto;
+}
diff --git a/pandora_console/include/styles/help_feedback.css b/pandora_console/include/styles/help_feedback.css
new file mode 100644
index 0000000000..8537262a62
--- /dev/null
+++ b/pandora_console/include/styles/help_feedback.css
@@ -0,0 +1,77 @@
+html,
+body {
+ width: 100%;
+ height: 100%;
+}
+
+div#main_pure {
+ background-color: #fefefe;
+ text-align: left;
+ margin-bottom: 0px;
+ margin-top: 0px;
+ margin-left: 0px;
+ margin-right: 0px;
+ width: 100%;
+ position: static;
+}
+
+div.help_feedback {
+ position: fixed;
+ bottom: 0;
+ height: auto;
+ background-color: #fff;
+ right: 3em;
+}
+
+.help_feedback label {
+ font-weight: normal;
+}
+
+.help_feedback * {
+ font-family: "lato", "courier", sans-serif;
+ font-size: 8pt;
+}
+
+.help_feedback .white_table_graph_header {
+ background: #82b92e;
+ color: #fff;
+}
+
+.help_feedback .white_table_graph {
+ margin-bottom: 0;
+ box-shadow: 0px 5px 6px 2px #888;
+}
+
+.help_feedback .white-box-content form {
+ margin-bottom: 0;
+ padding: 0;
+}
+
+.help_feedback .explain {
+ margin: 10px auto;
+}
+
+.textarea_feedback {
+ margin-top: 10px;
+}
+
+.email_feedback {
+ max-width: 200px;
+ margin-left: 39px;
+ margin-top: 10px;
+ margin-bottom: 10px;
+ font-weight: bolder;
+}
+
+.btn_submit_feed_back {
+ margin: 15px 0 0 0;
+}
+
+.btn {
+ margin: 0 auto;
+ cursor: pointer;
+}
+
+.flex-row-baseline.w100p label {
+ cursor: pointer;
+}
diff --git a/pandora_console/include/styles/new_installation_welcome_window.css b/pandora_console/include/styles/new_installation_welcome_window.css
new file mode 100644
index 0000000000..33903494ce
--- /dev/null
+++ b/pandora_console/include/styles/new_installation_welcome_window.css
@@ -0,0 +1,92 @@
+.modal {
+ overflow: hidden;
+}
+
+.welcome_modal_window {
+ overflow: hidden;
+}
+
+#welcome_modal_window * {
+ font-size: 10pt;
+}
+
+#welcome_form ul.wizard > li {
+ padding: 1em;
+ padding-bottom: 0.6em;
+ padding-top: 0.6em;
+ padding-left: 0.7em;
+}
+
+#welcome_form label {
+ font-family: "lato-lighter", "Open Sans", sans-serif;
+ font-weight: normal;
+}
+.content_position {
+ display: flex;
+ margin-top: 5px;
+ font-family: "lato-lighter", "Open Sans", sans-serif;
+ font-weight: normal;
+}
+
+.learn_content_indented {
+ text-indent: 1.5em;
+ font-family: "lato-lighter", "Open Sans", sans-serif;
+ font-weight: normal;
+}
+
+#lbl_learn {
+ font-family: "lato-lighter", "Open Sans", sans-serif;
+ font-weight: normal;
+}
+
+.go {
+ background-repeat: no-repeat;
+ background-size: cover;
+ width: 20px;
+ height: 20px;
+ border: none;
+}
+
+.pending {
+ background-image: url(../../images/darrowright.png);
+ background-image: url(../../images/arrow-icon.png);
+}
+
+.completed {
+ background-image: url(../../images/input_tick_badge.png);
+}
+
+.centered_full {
+ padding: 1em;
+ text-align: center;
+}
+
+#welcome_form li.centered_full > label {
+ width: auto;
+}
+
+#welcome_form ul.wizard li.white_box {
+ padding: 0;
+ margin-bottom: 2em;
+}
+
+#welcome_form ul.wizard li.centered_full {
+ padding-top: 1em;
+ padding-bottom: 1em;
+}
+
+#welcome_form li:not(.centered_full):not(.white_box) {
+ border-left: 4px solid #79a930;
+}
+
+#welcome_form li:not(.centered_full):not(.white_box).row_grey {
+ border-left: 4px solid #d6d6d6;
+}
+
+#welcome_form li.hole {
+ margin-bottom: 0.8em;
+}
+
+#welcome_form li.extra {
+ padding-bottom: 2.5em;
+}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index b3a0ebca57..ef1d250759 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -544,6 +544,13 @@ select:-internal-list-box {
align-items: baseline;
}
+.flex-row-vcenter {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ align-items: center;
+}
+
.nowrap {
flex-wrap: nowrap;
}
@@ -5910,6 +5917,47 @@ table.table_modal_alternate tr td:first-child {
width: 101%;
}
+/*Font header feedback*/
+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;
+}
/*
* ---------------------------------------------------------------------
* - FONT SIZES IN AGENT VIEW. This changes the font size of the agent
@@ -5921,3 +5969,12 @@ table.table_modal_alternate tr td:first-child {
font-size: 14px;
font-weight: bold;
}
+
+/* Generic classes to reuse and facilitate the creation of custom themes */
+.pandora_green_text {
+ color: #82b92e;
+}
+
+.pandora_green_bg {
+ background-color: #82b92e;
+}
diff --git a/pandora_console/include/styles/register.css b/pandora_console/include/styles/register.css
index ef0fdc6e1b..7fef0db90f 100644
--- a/pandora_console/include/styles/register.css
+++ b/pandora_console/include/styles/register.css
@@ -10,7 +10,8 @@ button.submit-cancel {
cursor: pointer;
text-align: center;
height: 30px;
- width: 90px;
+ width: auto;
+ min-width: 90px;
}
input[type="submit"].submit-cancel:hover,
@@ -32,6 +33,8 @@ input[type="button"].submit-next {
cursor: pointer;
text-align: center;
height: 30px;
+ width: auto;
+ min-width: 90px;
}
input[type="submit"].submit-next:hover,
diff --git a/pandora_console/include/templates/feedback_send_mail.html b/pandora_console/include/templates/feedback_send_mail.html
new file mode 100644
index 0000000000..e06b68f246
--- /dev/null
+++ b/pandora_console/include/templates/feedback_send_mail.html
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
Feedback
+
+
+
+
__title__
+
+
__p1__
+
__p2__
+
__attachment__
+
__p3__
+
+
__legal__
+
__legal1__
+
__legal2__
+
__legal3__
+
__legal4__
+
+
diff --git a/pandora_console/install.php b/pandora_console/install.php
index eaec1c8453..4478f8e75a 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
'.__('Other IP addresses').'';
if (!empty($addresses)) {
- $data_opcional[] = '
'.implode('
';
+ $data_opcional[] = '
'.implode('
';
}
}
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 783c389269..03fb79d168 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -1718,10 +1718,9 @@ if (!empty($result)) {
}
}
-// End Build List Result
-//
+// End Build List Result.
echo "
";
-// strict user hidden
+// Strict user hidden.
echo '
';
html_print_input_text('strict_user_hidden', $strict_user);
echo '
';
@@ -1758,8 +1757,8 @@ $('#moduletype').click(function() {
);
return false;
- });
-
+});
+
$('#ag_group').change (function () {
strict_user = $('#text-strict_user_hidden').val();
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 26008d88bd..bec33ed2a1 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.740
-%define release 191112
+%define release 191118
# User and Group under which Apache is running
%define httpd_name httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index d387f86504..5f30a39641 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.740
-%define release 191112
+%define release 191118
# User and Group under which Apache is running
%define httpd_name httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 567316088a..682c64d177 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.740
-%define release 191112
+%define release 191118
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2
diff --git a/pandora_console/tools/diagnostics.php b/pandora_console/tools/diagnostics.php
new file mode 100644
index 0000000000..30be89efc4
--- /dev/null
+++ b/pandora_console/tools/diagnostics.php
@@ -0,0 +1,73 @@
+ '[Diagnostics]'.$e->getMessage() ]);
+ exit;
+ } else {
+ echo '[Diagnostics]'.$e->getMessage();
+ }
+
+ // Stop this execution, but continue 'globally'.
+ return;
+}
+
+// AJAX controller.
+if (is_ajax()) {
+ $method = get_parameter('method');
+
+ if (method_exists($cs, $method) === true) {
+ if ($cs->ajaxMethod($method) === true) {
+ $cs->{$method}();
+ } else {
+ $cs->error('Unavailable method.');
+ }
+ } else {
+ $cs->error('Method not found. ['.$method.']');
+ }
+
+ // Stop any execution.
+ exit;
+} else {
+ // Run.
+ $cs->run();
+}
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index ad9da41983..c72e654976 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-server
-Version: 7.0NG.740-191112
+Version: 7.0NG.740-191118
Architecture: all
Priority: optional
Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 20565c2c71..e520420df8 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-pandora_version="7.0NG.740-191112"
+pandora_version="7.0NG.740-191118"
package_cpan=0
package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 05112ce398..0b4c584185 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.740";
-my $pandora_build = "191112";
+my $pandora_build = "191118";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash
@@ -275,6 +275,7 @@ sub pandora_load_config {
$pa_config->{"alert_recovery"} = 0; # Introduced on 1.3.1
$pa_config->{"snmp_checks"} = 1; # Introduced on 1.3.1
$pa_config->{"snmp_timeout"} = 8; # Introduced on 1.3.1
+ $pa_config->{"rcmd_timeout"} = 30; # Introduced on 7.0.740
$pa_config->{"snmp_trapd"} = '/usr/sbin/snmptrapd'; # 3.0
$pa_config->{"tcp_checks"} = 1; # Introduced on 1.3.1
$pa_config->{"tcp_timeout"} = 20; # Introduced on 1.3.1
@@ -788,6 +789,9 @@ sub pandora_load_config {
elsif ($parametro =~ m/^snmp_timeout\s+([0-9]*)/i) {
$pa_config->{"snmp_timeout"} = clean_blank($1);
}
+ elsif ($parametro =~ m/^rcmd_timeout\s+([0-9]*)/i) {
+ $pa_config->{"rcmd_timeout"} = clean_blank($1);
+ }
elsif ($parametro =~ m/^tcp_checks\s+([0-9]*)/i) {
$pa_config->{"tcp_checks"} = clean_blank($1);
}
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 98f86291e7..263ce5722c 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -205,6 +205,7 @@ our @EXPORT = qw(
pandora_get_module_phone_tags
pandora_get_module_email_tags
pandora_get_os
+ pandora_get_os_by_id
pandora_input_password
pandora_is_master
pandora_mark_agent_for_alert_update
@@ -5812,6 +5813,66 @@ sub pandora_get_os ($$) {
return 10;
}
+########################################################################
+# SUB pandora_get_os_by_id (integer)
+# Returns a chain with the name associated to target id_os.
+########################################################################
+sub pandora_get_os_by_id ($$) {
+ my ($dbh, $os_id) = @_;
+
+ if (! defined($os_id) || !is_numeric($os_id)) {
+ # Other OS
+ return 'Other';
+ }
+
+ if ($os_id eq 9) {
+ return 'Windows';
+ }
+ if ($os_id eq 7 ) {
+ return 'Cisco';
+ }
+ if ($os_id eq 2 ) {
+ return 'Solaris';
+ }
+ if ($os_id eq 3 ) {
+ return 'AIX';
+ }
+ if ($os_id eq 5) {
+ return 'HP-UX';
+ }
+ if ($os_id eq 8 ) {
+ return 'Apple';
+ }
+ if ($os_id eq 1 ) {
+ return 'Linux';
+ }
+ if ($os_id eq 1) {
+ return 'Enterasys';
+ }
+ if ($os_id eq 3) {
+ return 'Octopods';
+ }
+ if ($os_id eq 4) {
+ return 'embedded';
+ }
+ if ($os_id eq 5) {
+ return 'android';
+ }
+ if ($os_id eq 4 ) {
+ return 'BSD';
+ }
+
+ # Search for a custom OS
+ my $os_name = get_db_value ($dbh, 'SELECT name FROM tconfig_os WHERE id_os = ?', $os_id);
+ if (defined ($os_name)) {
+ return $os_name;
+ }
+
+ # Other OS
+ return 'Other';
+}
+
+
########################################################################
# Load module macros (a base 64 encoded JSON document) into the macro
# hash.
diff --git a/pandora_server/lib/PandoraFMS/NetworkServer.pm b/pandora_server/lib/PandoraFMS/NetworkServer.pm
index 72ff78d975..6f781b55aa 100644
--- a/pandora_server/lib/PandoraFMS/NetworkServer.pm
+++ b/pandora_server/lib/PandoraFMS/NetworkServer.pm
@@ -102,8 +102,8 @@ sub data_producer ($) {
WHERE server_name = ?
AND tagente_modulo.id_agente = tagente.id_agente
AND tagente.disabled = 0
- AND tagente_modulo.id_tipo_modulo > 5
- AND tagente_modulo.id_tipo_modulo < 19 '
+ AND ((tagente_modulo.id_tipo_modulo > 5 AND tagente_modulo.id_tipo_modulo < 19 )
+ OR (tagente_modulo.id_tipo_modulo > 33 AND tagente_modulo.id_tipo_modulo < 38 )) '
. (defined ($network_filter) ? $network_filter : ' ') .
'AND tagente_modulo.disabled = 0
AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
@@ -116,8 +116,8 @@ sub data_producer ($) {
AND tagente_modulo.id_agente = tagente.id_agente
AND tagente.disabled = 0
AND tagente_modulo.disabled = 0
- AND tagente_modulo.id_tipo_modulo > 5
- AND tagente_modulo.id_tipo_modulo < 19 '
+ AND ((tagente_modulo.id_tipo_modulo > 5 AND tagente_modulo.id_tipo_modulo < 19 )
+ OR (tagente_modulo.id_tipo_modulo > 33 AND tagente_modulo.id_tipo_modulo < 38 )) '
. (defined ($network_filter) ? $network_filter : ' ') .
'AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
AND (tagente_modulo.flag = 1 OR ((tagente_estado.last_execution_try + tagente_estado.current_interval) < UNIX_TIMESTAMP()))
@@ -468,6 +468,13 @@ sub exec_network_module ($$$$) {
my $tcp_rcv = $module->{'tcp_rcv'};
my $timeout = $module->{'max_timeout'};
my $retries = $module->{'max_retries'};
+ my $target_os = pandora_get_os($dbh, $module->{'custom_string_2'});
+
+ if ($module->{'custom_string_2'} eq "inherited" ) {
+ $target_os = $agent_row->{'id_os'};
+ } elsif (!defined($target_os) || "$target_os" eq '0') {
+ $target_os = $agent_row->{'id_os'};
+ }
# Use the agent address by default
if (! defined($ip_target) || $ip_target eq '' || $ip_target eq 'auto') {
@@ -545,6 +552,22 @@ sub exec_network_module ($$$$) {
$module_result = 1;
}
}
+
+ # -------------------------------------------------------
+ # CMD Module
+ # -------------------------------------------------------
+ elsif (($id_tipo_modulo == 34)
+ || ($id_tipo_modulo == 35)
+ || ($id_tipo_modulo == 36)
+ || ($id_tipo_modulo == 37)) { # CMD Module
+ $module_data = enterprise_hook('remote_execution_module',[$pa_config, $dbh, $module, $target_os, $ip_target]);
+ if (!defined($module_data) || "$module_data" eq "") {
+ $module_result = 1;
+ } else {
+ # Success.
+ $module_result = 0;
+ }
+ }
}
# Write data section
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 4e3120824e..0711bc7b20 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.740";
-my $pandora_build = "191112";
+my $pandora_build = "191118";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index ba15f03d24..3a3e1904a0 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -657,7 +657,7 @@ sub logger ($$;$) {
if (defined $parent_caller) {
$parent_caller = (split '/', $parent_caller)[-1];
$parent_caller =~ s/\.[^.]+$//;
- $parent_caller = " ** " . $parent_caller . " **: ";
+ $parent_caller = " " . $parent_caller . ": ";
} else {
$parent_caller = " ";
}
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 2bf18579b2..69183db7ca 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.740
-%define release 191112
+%define release 191118
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 0d289a56b4..226e5ec8cd 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.740
-%define release 191112
+%define release 191118
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 10ce42b946..d52c1a1e7d 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.740"
-PI_BUILD="191112"
+PI_BUILD="191118"
MODE=$1
if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 41da72d678..76b393698b 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
-my $version = "7.0NG.740 PS191112";
+my $version = "7.0NG.740 PS191118";
# Pandora server configuration
my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 2e90e184b4..bb64da8e33 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
-my $version = "7.0NG.740 PS191112";
+my $version = "7.0NG.740 PS191118";
# save program name for logging
my $progname = basename($0);