maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Import default subject/body for e-mails templates; fixes #496

Browse Source 
Signed-off-by: Marco Vogt (vogti) <mail@mdvogt.de>
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Marco Vogt (vogti)
2014-12-11 14:07:18 +01:00
committed by Michael Kaufmann (d00p)
parent b0d5049e68
commit 6bfa95f8a8
17 changed files with 420 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/formfields/admin/templates/formfield.template_add.php
View File

@@ -32,16 +32,19 @@ return array(
),
'template' => array(
'label' => $lng['admin']['templates']['action'],
'type' => 'select',
'select_var' => $template_options
'type' => 'hidden',
'value' => $template,
'display' => $lng['admin']['templates'][$template]
),
'subject' => array(
'label' => $lng['admin']['templates']['subject'],
'type' => 'text'
'type' => 'text',
'value' => $subject
),
'mailbody' => array(
'label' => $lng['admin']['templates']['mailbody'],
'type' => 'textarea',
'value' => $body,
'cols' => 60,
'rows' => 12
)

9
lib/functions/output/function.makeoption.php
View File

@@ -29,7 +29,7 @@
* @author Florian Lippert <flo@syscp.org>
*/
function makeoption($title, $value, $selvalue = NULL, $title_trusted = false, $value_trusted = false)
function makeoption($title, $value, $selvalue = NULL, $title_trusted = false, $value_trusted = false, $id = NULL)
{
if($selvalue !== NULL
&& ((is_array($selvalue) && in_array($value, $selvalue)) || $value == $selvalue))
@@ -51,6 +51,11 @@ function makeoption($title, $value, $selvalue = NULL, $title_trusted = false, $v
$value = htmlspecialchars($value);
}
$option = '<option value="' . $value . '" ' . $selected . ' >' . $title . '</option>';
$id_str = ' ';
if($id !== NULL) {
$id_str = 'id="' . $id . '"';
}
$option = '<option value="' . $value . '" ' . $id_str . $selected . ' >' . $title . '</option>';
return $option;
}