From 5d0a768992f314a8686566e366051c5fb23980cd Mon Sep 17 00:00:00 2001
From: marknl <marknl@ispconfig3>
Date: Sun, 07 Aug 2011 17:01:47 -0400
Subject: [PATCH] http://bugtracker.ispconfig.org/index.php?do=details&task_id=1348&project=3
---
interface/lib/classes/tform.inc.php | 16 ++++++++++++----
interface/web/mail/templates/mail_user_autoresponder_edit.htm | 2 +-
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index 3ca2c06..6725a1d 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -430,6 +430,7 @@
// HTML schreiben
$out = '';
+ $elementNo = 0;
foreach($field['value'] as $k => $v) {
$checked = '';
@@ -437,7 +438,8 @@
if(trim($tvl) == trim($k)) $checked = ' CHECKED';
}
// $out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v</label>\r\n";
- $out .= "<input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v <br/>\r\n";
+ $out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"checkbox\" $checked /> $v</label><br/>\r\n";
+ $elementNo++;
}
}
$new_record[$key] = $out;
@@ -448,10 +450,12 @@
// HTML schreiben
$out = '';
+ $elementNo = 0;
foreach($field['value'] as $k => $v) {
$checked = ($k == $val)?' CHECKED':'';
//$out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";
- $out .= "<input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v\r\n";
+ $out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"radio\" $checked/> $v </label>\r\n";
+ $elementNo++;
}
}
$new_record[$key] = $out;
@@ -539,6 +543,7 @@
// HTML schreiben
$out = '';
+ $elementNo = 0;
foreach($field['value'] as $k => $v) {
$checked = '';
@@ -546,7 +551,8 @@
if(trim($tvl) == trim($k)) $checked = ' CHECKED';
}
// $out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v</label>\r\n";
- $out .= "<input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v \r\n";
+ $out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"checkbox\" $checked /> $v</label> \r\n";
+ $elementNo++;
}
}
$new_record[$key] = $out;
@@ -557,10 +563,12 @@
// HTML schreiben
$out = '';
+ $elementNo = 0;
foreach($field['value'] as $k => $v) {
$checked = ($k == $field["default"])?' CHECKED':'';
//$out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";
- $out .= "<input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v\r\n";
+ $out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";
+ $elementNo++;
}
}
$new_record[$key] = $out;
diff --git a/interface/web/mail/templates/mail_user_autoresponder_edit.htm b/interface/web/mail/templates/mail_user_autoresponder_edit.htm
index 2bec5b9..2ea2100 100644
--- a/interface/web/mail/templates/mail_user_autoresponder_edit.htm
+++ b/interface/web/mail/templates/mail_user_autoresponder_edit.htm
@@ -13,7 +13,7 @@
<p class="label">{tmpl_var name='autoresponder_txt'}</p>
<div class="multiField">
<div class="ctrlHolder" style="margin-bottom: 5px;">
- <input type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} /> {tmpl_var name='autoresponder_active'}<br />
+ <label for="autoresponder"><input type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} /> {tmpl_var name='autoresponder_active'}</label><br />
</div>
<p style="margin-bottom: 3px;">
--
Gitblit v1.9.1