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

Merge branch '1931_Cambiar_el_cuerpo_del_email_al_enviar_reportes' into 'develop' 

Be able to change the subject and body of the report message when necessary

See merge request artica/pandorafms!1925

Former-commit-id: 18ef1606525fd0cf1ecd692fd156e3fd72f7ca43
This commit is contained in:
Samuel Carcases 2019-01-10 14:49:18 +01:00
parent 00523128cf 0f3717a268
commit f14acf12d2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -119,7 +119,9 @@ if ($schedule_report != '') {
$time = date(TIME_FORMAT); $time = date(TIME_FORMAT);
$parameters[0] = get_parameter('id_schedule_report'); $parameters[0] = get_parameter('id_schedule_report');
//$parameters[1] = db_get_value('schedule_email', 'treport', 'id_report', $id_report); //$parameters[1] = db_get_value('schedule_email', 'treport', 'id_report', $id_report);
$parameters[1] = get_parameter('schedule_email'); $parameters[1] = get_parameter('schedule_email_address');
$parameters[2] = get_parameter('schedule_subject', '');
$parameters[3] = get_parameter('schedule_email', '');
$parameters['first_execution'] = strtotime ($date.' '.$time); $parameters['first_execution'] = strtotime ($date.' '.$time);
$values = array( $values = array(

2
pandora_console/include/functions_html.php
View File

@ -1017,7 +1017,7 @@ function html_print_input_text_extended ($name, $value, $id, $alt, $size, $maxle
++$idcounter; ++$idcounter;
$valid_attrs = array ("accept", "disabled", "maxlength", $valid_attrs = array ("accept", "disabled", "maxlength",
"name", "readonly", "size", "value", "accesskey", "name", "readonly", "placeholder", "size", "value", "accesskey",
"class", "dir", "id", "lang", "style", "tabindex", "class", "dir", "id", "lang", "style", "tabindex",
"title", "xml:lang", "onfocus", "onblur", "onselect", "title", "xml:lang", "onfocus", "onblur", "onselect",
"onchange", "onclick", "ondblclick", "onmousedown", "onchange", "onclick", "ondblclick", "onmousedown",