Skip to content

Commit 5d0a768

Browse files
author
marknl
committed
http://bugtracker.ispconfig.org/index.php?do=details&task_id=1348&project=3
I've changed the id HTML attributes of the check boxes. You can still group post requests on name attributes while using the id to keep the items unique in the DOM tree. i saw some commented code already being there but wasn't functioning, so i rewrote the original lines. This only goes for type: CHECKBOXARRAY and RADIO
1 parent abdfe2c commit 5d0a768

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

‎interface/lib/classes/tform.inc.php‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -430,14 +430,16 @@ function getHTML($record, $tab, $action = 'NEW') {
430430

431431
// HTML schreiben
432432
$out = '';
433+
$elementNo = 0;
433434
foreach($field['value'] as $k => $v) {
434435

435436
$checked = '';
436437
foreach($vals as $tvl) {
437438
if(trim($tvl) == trim($k)) $checked = ' CHECKED';
438439
}
439440
// $out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v</label>\r\n";
440-
$out .= "<input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v <br/>\r\n";
441+
$out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"checkbox\" $checked /> $v</label><br/>\r\n";
442+
$elementNo++;
441443
}
442444
}
443445
$new_record[$key] = $out;
@@ -448,10 +450,12 @@ function getHTML($record, $tab, $action = 'NEW') {
448450

449451
// HTML schreiben
450452
$out = '';
453+
$elementNo = 0;
451454
foreach($field['value'] as $k => $v) {
452455
$checked = ($k == $val)?' CHECKED':'';
453456
//$out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";
454-
$out .= "<input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v\r\n";
457+
$out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"radio\" $checked/> $v </label>\r\n";
458+
$elementNo++;
455459
}
456460
}
457461
$new_record[$key] = $out;
@@ -539,14 +543,16 @@ function getHTML($record, $tab, $action = 'NEW') {
539543

540544
// HTML schreiben
541545
$out = '';
546+
$elementNo = 0;
542547
foreach($field['value'] as $k => $v) {
543548

544549
$checked = '';
545550
foreach($vals as $tvl) {
546551
if(trim($tvl) == trim($k)) $checked = ' CHECKED';
547552
}
548553
// $out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v</label>\r\n";
549-
$out .= "<input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v &nbsp;\r\n";
554+
$out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"checkbox\" $checked /> $v</label> &nbsp;\r\n";
555+
$elementNo++;
550556
}
551557
}
552558
$new_record[$key] = $out;
@@ -557,10 +563,12 @@ function getHTML($record, $tab, $action = 'NEW') {
557563

558564
// HTML schreiben
559565
$out = '';
566+
$elementNo = 0;
560567
foreach($field['value'] as $k => $v) {
561568
$checked = ($k == $field["default"])?' CHECKED':'';
562569
//$out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";
563-
$out .= "<input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v\r\n";
570+
$out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";
571+
$elementNo++;
564572
}
565573
}
566574
$new_record[$key] = $out;

‎interface/web/mail/templates/mail_user_autoresponder_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
1313
<p class="label">{tmpl_var name='autoresponder_txt'}</p>
1414
<div class="multiField">
1515
<div class="ctrlHolder" style="margin-bottom: 5px;">
16-
<input type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} />&nbsp;{tmpl_var name='autoresponder_active'}<br />
16+
<label for="autoresponder"><input type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} />&nbsp;{tmpl_var name='autoresponder_active'}</label><br />
1717
</div>
1818

1919
<p style="margin-bottom: 3px;">

0 commit comments

Comments
 (0)