diff --git a/mod/data/classes/template.php b/mod/data/classes/template.php index fef8999476895..ff36ae5d3e3a5 100644 --- a/mod/data/classes/template.php +++ b/mod/data/classes/template.php @@ -993,7 +993,7 @@ private function get_field_input( $errors .= $renderer->notification(get_string( 'missingfieldtype', 'data', - (object)['name' => $field->field->name] + (object)['name' => s($field->field->name)] )); } } else { diff --git a/mod/data/export_form.php b/mod/data/export_form.php index 75f27f4b5d269..470596afe6e23 100644 --- a/mod/data/export_form.php +++ b/mod/data/export_form.php @@ -71,7 +71,7 @@ function definition() { $exportfields = []; $unsupportedfields = []; foreach ($this->_datafields as $field) { - $label = get_string('fieldnametype', 'data', (object)['name' => $field->field->name, 'type' => $field->name()]); + $label = get_string('fieldnametype', 'data', (object)['name' => s($field->field->name), 'type' => $field->name()]); if ($field->text_export_supported()) { $numfieldsthatcanbeselected++; $exportfields[] = $mform->createElement('advcheckbox', 'field_' . $field->field->id, '', $label, diff --git a/mod/data/field.php b/mod/data/field.php index f5385b839aedf..171e4aa055b0c 100644 --- a/mod/data/field.php +++ b/mod/data/field.php @@ -240,7 +240,7 @@ } else { $fieldtypename = $field->name(); } - echo $OUTPUT->confirm('' . $fieldtypename . ': ' . $field->field->name . '

' . + echo $OUTPUT->confirm('' . $fieldtypename . ': ' . s($field->field->name) . '

' . get_string('confirmdeletefield', 'data'), 'field.php?d=' . $data->id . '&mode=delete&fid=' . $fid . '&confirm=1', 'field.php?d=' . $data->id, @@ -410,7 +410,7 @@ $actionmenutemplate = $actionmenu->export_for_template($OUTPUT); $table->data[] = [ - $field->field->name, + s($field->field->name), $fieltypedata, $field->field->required ? get_string('yes') : get_string('no'), shorten_text($field->field->description, 30), @@ -435,9 +435,9 @@ echo ''; foreach ($fields as $field) { if ($data->defaultsort == $field->id) { - echo ''; + echo ''; } else { - echo ''; + echo ''; } } echo ''; diff --git a/mod/data/field/checkbox/field.class.php b/mod/data/field/checkbox/field.class.php index d022e9b1477c8..f4b4c3417d265 100644 --- a/mod/data/field/checkbox/field.class.php +++ b/mod/data/field/checkbox/field.class.php @@ -66,7 +66,7 @@ function display_add_field($recordid = 0, $formdata = null) { } $str = '
'; - $str .= '
'.$this->field->name; + $str .= '
'.s($this->field->name); if ($this->field->required) { $str .= '$nbsp;' . get_string('requiredelement', 'form'); $str .= ''; diff --git a/mod/data/field/file/field.class.php b/mod/data/field/file/field.class.php index 16fe7ce15d87e..2e455ca59e8a4 100644 --- a/mod/data/field/file/field.class.php +++ b/mod/data/field/file/field.class.php @@ -70,7 +70,7 @@ function display_add_field($recordid = 0, $formdata = null) { // database entry label $html = '
'; - $html .= '
'.$this->field->name; + $html .= '
'.s($this->field->name); if ($this->field->required) { $html .= ' ' . get_string('requiredelement', 'form') . ''; @@ -105,7 +105,7 @@ function display_add_field($recordid = 0, $formdata = null) { } function display_search_field($value = '') { - return '' . + return '' . ''; } diff --git a/mod/data/field/latlong/field.class.php b/mod/data/field/latlong/field.class.php index 4d25d261ecc16..24e147596f7f8 100644 --- a/mod/data/field/latlong/field.class.php +++ b/mod/data/field/latlong/field.class.php @@ -77,7 +77,7 @@ function display_add_field($recordid = 0, $formdata = null) { } } $str = '
'; - $str .= '
'.$this->field->name.''; + $str .= '
'.s($this->field->name).''; $str .= '
'; $classes = 'mod-data-input form-control-static'; $str .= '