[4.0] [a11y] Correctly use aria-describedby

For fields where there is a description we are trying to add an aria-describedby with a value of the _DESC language string.

Unfortunately the code was not doing that.

### Testing
Before applying the patch view the generated source of the search field in the article manager. It will display aria-describedby="filter[search]-desc"

After applying the patch it will correctly be
aria-describeby="Search in title and alias. Prefix with ID: or AUTHOR: to search for an article ID or article author."

The display of this text with a tooltip or similar is beyond the scope of this pr

layouts/joomla/form/field/accesslevel.php

@@ -55,6 +55,6 @@
 $attr .= $required ? ' required' : '';
 $attr .= $autofocus ? ' autofocus' : '';
 $attr .= $onchange ? ' onchange="' . $onchange . '"' : '';
-$attr .= !empty($description) ? ' aria-describedby="' . $name . '-desc"' : '';
+$attr .= !empty($description) ? 'aria-describedby="' . htmlspecialchars($description, ENT_COMPAT, 'UTF-8') . '"' : '';
 
 echo HTMLHelper::_('access.level', $name, $value, $attr, $options, $id);

layouts/joomla/form/field/calendar.php

@@ -110,7 +110,7 @@
             id="<?php echo $id; ?>"
             name="<?php echo $name; ?>"
 			value="<?php echo htmlspecialchars(($value !== '0000-00-00 00:00:00') ? $value : '', ENT_COMPAT, 'UTF-8'); ?>"
-			<?php echo !empty($description) ? ' aria-describedby="' . $name . '-desc"' : ''; ?>
+			<?php echo !empty($description) ? 'aria-describedby="' . htmlspecialchars($description, ENT_COMPAT, 'UTF-8') . '"' : ''; ?>
 			<?php echo $attributes; ?>
 			<?php echo !empty($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : ''; ?>
 			data-alt-value="<?php echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>" autocomplete="off">

layouts/joomla/form/field/combo.php

@@ -52,7 +52,7 @@
 $attr .= !empty($readonly) ? ' readonly' : '';
 $attr .= !empty($disabled) ? ' disabled' : '';
 $attr .= !empty($required) ? ' required' : '';
-$attr .= !empty($description) ? ' aria-describedby="' . $name . '-desc"' : '';
+$attr .= !empty($description) ? 'aria-describedby="' . htmlspecialchars($description, ENT_COMPAT, 'UTF-8') . '"' : '';
 
 // Initialize JavaScript field attributes.
 $attr .= !empty($onchange) ? ' onchange="' . $onchange . '"' : '';

layouts/joomla/form/field/email.php

@@ -53,7 +53,7 @@
 $attributes = array(
 	$spellcheck ? '' : 'spellcheck="false"',
 	!empty($size) ? 'size="' . $size . '"' : '',
-	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
+	!empty($description) ? 'aria-describedby="' . htmlspecialchars($description, ENT_COMPAT, 'UTF-8') . '"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',
 	$onchange ? 'onchange="' . $onchange . '"' : '',

layouts/joomla/form/field/list.php

@@ -55,7 +55,7 @@
 $attr .= $required ? ' required' : '';
 $attr .= $autofocus ? ' autofocus' : '';
 $attr .= $onchange ? ' onchange="' . $onchange . '"' : '';
-$attr .= !empty($description) ? ' aria-describedby="' . $name . '-desc"' : '';
+$attr .= !empty($description) ? 'aria-describedby="' . htmlspecialchars($description, ENT_COMPAT, 'UTF-8') . '"' : '';
 
 // To avoid user's confusion, readonly="readonly" should imply disabled="disabled".
 if ($readonly || $disabled)

layouts/joomla/form/field/number.php

@@ -49,7 +49,7 @@
 
 $attributes = array(
 	!empty($class) ? 'class="form-control ' . $class . '"' : 'class="form-control"',
-	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
+	!empty($description) ? 'aria-describedby="' . htmlspecialchars($description, ENT_COMPAT, 'UTF-8') . '"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',
 	strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',

layouts/joomla/form/field/range.php

@@ -48,7 +48,7 @@
 
 $attributes = array(
 	$class ? 'class="form-control ' . $class . '"' : 'class="form-control"',
-	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
+	!empty($description) ? 'aria-describedby="' . htmlspecialchars($description, ENT_COMPAT, 'UTF-8') . '"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',
 	!empty($onchange) ? 'onchange="' . $onchange . '"' : '',

layouts/joomla/form/field/tel.php

@@ -50,7 +50,7 @@
 
 $attributes = array(
 	!empty($size) ? 'size="' . $size . '"' : '',
-	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
+	!empty($description) ? 'aria-describedby="' . htmlspecialchars($description, ENT_COMPAT, 'UTF-8') . '"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',
 	strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',

layouts/joomla/form/field/text.php

@@ -59,7 +59,7 @@
 $attributes = array(
 	!empty($class) ? 'class="form-control ' . $class . '"' : 'class="form-control"',
 	!empty($size) ? 'size="' . $size . '"' : '',
-	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
+	!empty($description) ? 'aria-describeby="' . htmlspecialchars($description, ENT_COMPAT, 'UTF-8') . '"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',
 	$list,

layouts/joomla/form/field/textarea.php

@@ -52,7 +52,7 @@
 	$columns ?: '',
 	$rows ?: '',
 	!empty($class) ? 'class="form-control ' . $class . '"' : 'class="form-control"',
-	!empty($description) ? 'aria-describedby="' . $name . '-desc"' : '',
+	!empty($description) ? 'aria-describedby="' . htmlspecialchars($description, ENT_COMPAT, 'UTF-8') . '"' : '',
 	strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
 	$disabled ? 'disabled' : '',
 	$readonly ? 'readonly' : '',

layouts/joomla/form/field/url.php

@@ -51,7 +51,7 @@
 
 $attributes = array(
 	!empty($size) ? ' size="' . $size . '"' : '',
-	!empty($description) ? ' aria-describedby="' . $name . '-desc"' : '',
+	!empty($description) ? 'aria-describedby="' . htmlspecialchars($description, ENT_COMPAT, 'UTF-8') . '"' : '',
 	$disabled ? ' disabled' : '',
 	$readonly ? ' readonly' : '',
 	strlen($hint) ? ' placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',