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

minor fixes

This commit is contained in:
fbsanchez 2019-11-22 20:49:46 +01:00
parent 5423e78d62
commit 4e2bd7ed55
2 changed files with 53 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
pandora_console/include/functions_html.php
View File

@ -2480,19 +2480,27 @@ function html_print_radio_button($name, $value, $label='', $checkedvalue='', $re
/** /**
* Render a checkbox button input. Extended version, use html_print_checkbox() to simplify. * Render a checkbox button input. Extended version, use html_print_checkbox() to simplify.
* *
* @param string Input name. * @param string $name Input name.
* @param string Input value. * @param string $value Input value.
* @param string Set the button to be marked (optional, unmarked by default). * @param string $checked Set the button to be marked (optional, unmarked by default).
* @param bool Disable the button (optional, button enabled by default). * @param boolean $disabled Disable the button (optional, button enabled by default).
* @param string Script to execute when onClick event is triggered (optional). * @param string $script Script to execute when onClick event is triggered (optional).
* @param string Optional HTML attributes. It's a free string which will be * @param string $attributes Optional HTML attributes. It's a free string which will be inserted into the HTML tag, use it carefully (optional).
inserted into the HTML tag, use it carefully (optional). * @param boolean $return Whether to return an output string or echo now (optional, echo by default).
* @param bool Whether to return an output string or echo now (optional, echo by default). * @param string $id Custom id.
* *
* @return string HTML code if return parameter is true. * @return string HTML code if return parameter is true.
*/ */
function html_print_checkbox_extended($name, $value, $checked, $disabled, $script, $attributes, $return=false, $id='') function html_print_checkbox_extended(
{ $name,
$value,
$checked,
$disabled,
$script,
$attributes,
$return=false,
$id=''
) {
static $idcounter = []; static $idcounter = [];
// If duplicate names exist, it will start numbering. Otherwise it won't // If duplicate names exist, it will start numbering. Otherwise it won't
@ -2508,7 +2516,7 @@ function html_print_checkbox_extended($name, $value, $checked, $disabled, $scrip
if ($id == '') { if ($id == '') {
$output .= ' id="checkbox-'.$id_aux.'"'; $output .= ' id="checkbox-'.$id_aux.'"';
} else { } else {
$output .= ' '.$id.'"'; $output .= ' id="'.$id.'"';
} }
if ($script != '') { if ($script != '') {
@ -2534,17 +2542,39 @@ function html_print_checkbox_extended($name, $value, $checked, $disabled, $scrip
/** /**
* Render a checkbox button input. * Render a checkbox button input.
* *
* @param string Input name. * @param string $name Input name.
* @param string Input value. * @param string $value Input value.
* @param string Set the button to be marked (optional, unmarked by default). * @param string $checked Set the button to be marked (optional, unmarked by default).
* @param bool Whether to return an output string or echo now (optional, echo by default). * @param boolean $return Whether to return an output string or echo now (optional, echo by default).
* @param boolean $disabled Disable the button (optional, button enabled by default). * @param boolean $disabled Disable the button (optional, button enabled by default).
* @param string $script Script.
* @param string $disabled_hidden Disabled_hidden.
* @param string $attributes Extra attributes.
* @param string $id Custom ID.
* *
* @return string HTML code if return parameter is true. * @return string HTML code if return parameter is true.
*/ */
function html_print_checkbox($name, $value, $checked=false, $return=false, $disabled=false, $script='', $disabled_hidden=false) function html_print_checkbox(
{ $name,
$output = html_print_checkbox_extended($name, $value, (bool) $checked, $disabled, $script, '', true); $value,
$checked=false,
$return=false,
$disabled=false,
$script='',
$disabled_hidden=false,
$attributes='',
$id=''
) {
$output = html_print_checkbox_extended(
$name,
$value,
(bool) $checked,
$disabled,
$script,
$attributes,
true,
$id
);
if (!$disabled_hidden) { if (!$disabled_hidden) {
$output .= html_print_input_hidden($name.'_sent', 1, true); $output .= html_print_input_hidden($name.'_sent', 1, true);
} }
@ -3535,7 +3565,9 @@ function html_print_input($data, $wrapper='div', $input_only=false)
((isset($data['return']) === true) ? $data['return'] : false), ((isset($data['return']) === true) ? $data['return'] : false),
((isset($data['disabled']) === true) ? $data['disabled'] : false), ((isset($data['disabled']) === true) ? $data['disabled'] : false),
((isset($data['script']) === true) ? $data['script'] : ''), ((isset($data['script']) === true) ? $data['script'] : ''),
((isset($data['disabled_hidden']) === true) ? $data['disabled_hidden'] : false) ((isset($data['disabled_hidden']) === true) ? $data['disabled_hidden'] : false),
((isset($data['attributes']) === true) ? $data['attributes'] : ''),
((isset($data['id']) === true) ? $data['id'] : '')
); );
break; break;

2
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -1215,7 +1215,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
my $cid_data = "CID_IMAGE"; my $cid_data = "CID_IMAGE";
my $dataname = "CID_IMAGE.png"; my $dataname = "CID_IMAGE.png";
if ($data =~ /^data:image\/png;base64, /) { if (defined($data) && $data =~ /^data:image\/png;base64, /) {
# macro _data_ substitution in case is image. # macro _data_ substitution in case is image.
$attach_data_as_image = 1; $attach_data_as_image = 1;
my $_cid = '<img style="height: 150px;" src="cid:' . $cid_data . '"/>'; my $_cid = '<img style="height: 150px;" src="cid:' . $cid_data . '"/>';