Skip to content

Commit 553f154

Browse files
TommsNLclaude
TommsNL
and
claude
committed
Fix text domain issues and replace eme_esc_html() with esc_html()
Text domain fixes (18 instances): - Fix 'events_made_easy' (underscore) -> 'events-made-easy' (8x) - Fix 'event-made-easy' (missing 's') -> 'events-made-easy' (4x) - Add missing text domain to 3 translation calls - Add phpcs:ignore for WP core weekday translations (3 locations) eme_esc_html() cleanup (455 of 461 calls replaced): - Replace eme_esc_html() with esc_html() for scalar string inputs - Replace array inputs with array_map('esc_html', $array) - Fix eme_esc_html('text', 'domain') bug: second arg was silently ignored, now correctly using esc_html__() for translation+escaping - Remove redundant double-escaping in eme-rsvp.php - Keep 2 calls where eme_unserialize() returns mixed types - Keep function definition in eme-functions.php Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 3a67e44 commit 553f154

23 files changed

+472
-470
lines changed

‎eme-actions.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ function eme_add_events_locations_link_search( $results, $query ) {
240240
foreach ( $events as $event ) {
241241
$results[] = [
242242
'ID' => $event['event_id'],
243-
'title' => trim( eme_esc_html( strip_tags( $event['event_name'] ) . ' (' . eme_localized_datetime( $event['event_start'], EME_TIMEZONE ) . ')' ) ),
243+
'title' => trim( esc_html( strip_tags( $event['event_name'] ) . ' (' . eme_localized_datetime( $event['event_start'], EME_TIMEZONE ) . ')' ) ),
244244
'permalink' => eme_event_url( $event ),
245245
'info' => __( 'Event', 'events-made-easy' ),
246246
];
@@ -249,7 +249,7 @@ function eme_add_events_locations_link_search( $results, $query ) {
249249
foreach ( $locations as $location ) {
250250
$results[] = [
251251
'ID' => $location['location_id'],
252-
'title' => trim( eme_esc_html( strip_tags( $location['location_name'] ) ) ),
252+
'title' => trim( esc_html( strip_tags( $location['location_name'] ) ) ),
253253
'permalink' => eme_location_url( $location ),
254254
'info' => __( 'Location', 'events-made-easy' ),
255255
];

‎eme-attendances.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ function eme_ajax_attendances_list() {
241241
$person_info_shown .= ' ' . $person['firstname'];
242242
}
243243
$person_info_shown .= ' (' . $person['email'] . ')';
244-
$rows[ $key ]['person'] = "<a href='" . esc_url( admin_url( 'admin.php?page=eme-people&eme_admin_action=edit_person&person_id=' . $person['person_id'] ) ) . "' title='" . esc_attr__( 'Edit person', 'events-made-easy' ) . "'>" . eme_esc_html( $person_info_shown ) . '</a>';
244+
$rows[ $key ]['person'] = "<a href='" . esc_url( admin_url( 'admin.php?page=eme-people&eme_admin_action=edit_person&person_id=' . $person['person_id'] ) ) . "' title='" . esc_attr__( 'Edit person', 'events-made-easy' ) . "'>" . esc_html( $person_info_shown ) . '</a>';
245245
$rows[ $key ]['related_name'] = '';
246246
if ( $row['type'] == 'event' ) {
247247
$event = eme_get_event( $row['related_id'] );

‎eme-calendar.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ function eme_get_calendar( $category=0, $notcategory=0, $full=0, $month='', $yea
390390
if ( $holidays ) {
391391
foreach ( $holidays as $day_key => $info ) {
392392
if ( ! empty( $info['name'] ) ) {
393-
$holiday_title = trim( eme_esc_html( $info['name'] ) );
393+
$holiday_title = trim( esc_html( $info['name'] ) );
394394
$eme_holiday_class = 'eme-cal-holidays';
395395
if ( empty( $info['class'] ) ) {
396396
$class = $eme_holiday_class;
@@ -580,6 +580,7 @@ function eme_get_calendar( $category=0, $notcategory=0, $full=0, $month='', $yea
580580
$sCalDivRows .= "</div>\n";
581581
}
582582

583+
// phpcs:ignore WordPress.WP.I18n.MissingArgDomain -- WordPress core weekday translations for $wp_locale
583584
$weekday_names = [ __( 'Sunday' ), __( 'Monday' ), __( 'Tuesday' ), __( 'Wednesday' ), __( 'Thursday' ), __( 'Friday' ), __( 'Saturday' ) ];
584585
$weekday_header_class = [ 'Sun_header', 'Mon_header', 'Tue_header', 'Wed_header', 'Thu_header', 'Fri_header', 'Sat_header' ];
585586
$sCalTblDayNames = '';

‎eme-categories.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ function eme_replace_categories_placeholders( $format, $cat = '', $target = 'htm
513513
$replacement = apply_filters( 'eme_text', $replacement );
514514
}
515515
if ( $need_escape ) {
516-
$replacement = eme_esc_html( preg_replace( '/\n|\r/', '', $replacement ) );
516+
$replacement = esc_html( preg_replace( '/\n|\r/', '', $replacement ) );
517517
}
518518
if ( $need_urlencode ) {
519519
$replacement = rawurlencode( $replacement );

‎eme-countries.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1030,7 +1030,7 @@ function eme_ajax_state_edit() {
10301030
$record = eme_get_state( $res );
10311031
// for the new record, we also need to provide the lang (as done in eme_get_states)
10321032
$record['lang'] = eme_get_state_lang( $res );
1033-
$fTableResult['Record'] = eme_esc_html( $record );
1033+
$fTableResult['Record'] = array_map( 'esc_html', $record );
10341034
}
10351035
}
10361036

‎eme-discounts.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ function eme_discounts_page() {
156156
++$inserted;
157157
} else {
158158
++$errors;
159-
$error_msg .= '<br>' . eme_esc_html( sprintf( __( 'Not imported: %s', 'events-made-easy' ), implode( ',', $row ) ) );
159+
$error_msg .= '<br>' . esc_html( sprintf( __( 'Not imported: %s', 'events-made-easy' ), implode( ',', $row ) ) );
160160
}
161161
}
162162
$message = sprintf( __( 'Import finished: %d inserts, %d errors', 'events-made-easy' ), $inserted, $errors );
@@ -215,7 +215,7 @@ function eme_discounts_page() {
215215
++$inserted;
216216
} else {
217217
++$errors;
218-
$error_msg .= '<br>' . eme_esc_html( sprintf( __( 'Not imported: %s', 'events-made-easy' ), implode( ',', $row ) ) );
218+
$error_msg .= '<br>' . esc_html( sprintf( __( 'Not imported: %s', 'events-made-easy' ), implode( ',', $row ) ) );
219219
}
220220
}
221221
$message = sprintf( __( 'Import finished: %d inserts, %d errors', 'events-made-easy' ), $inserted, $errors );

‎eme-events.php‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,7 @@ function eme_events_page_content() {
11181118
$format .= "<div class='eme-message-error eme-attendance-message-error'>$img" . sprintf( __( 'Error updating attendance count, but ignoring', 'events-made-easy' ) ) . '</div>';
11191119
}
11201120

1121-
$format .= '<br>' . sprintf( __( 'Event : %s', 'events-made-easy' ), eme_esc_html( $event['event_name'] ) );
1121+
$format .= '<br>' . sprintf( __( 'Event : %s', 'events-made-easy' ), esc_html( $event['event_name'] ) );
11221122
if ( $event['event_properties']['attendancerecord'] || $event['event_properties']['attendanceperday']) {
11231123
$res = eme_db_insert_attendance( 'event', $booking['person_id'], '', $booking['event_id'] );
11241124
if ( $res ) {
@@ -2241,7 +2241,7 @@ function eme_replace_generic_placeholders( $format, $target = 'html' ) {
22412241
if (!empty($t_person) && !empty($t_person['person_id']))
22422242
$replacement = join( ', ', eme_get_persongroup_names( $t_person['person_id'] ) );
22432243
if ( $target == 'html' ) {
2244-
$replacement = eme_esc_html( $replacement );
2244+
$replacement = esc_html( $replacement );
22452245
$replacement = apply_filters( 'eme_general', $replacement );
22462246
} else {
22472247
$replacement = apply_filters( 'eme_text', $replacement );
@@ -2255,7 +2255,7 @@ function eme_replace_generic_placeholders( $format, $target = 'html' ) {
22552255
if (!empty($t_person) && !empty($t_person['person_id']))
22562256
$replacement = eme_get_activemembership_names_by_personid( $t_person['person_id'] );
22572257
if ( $target == 'html' ) {
2258-
$replacement = eme_esc_html( $replacement );
2258+
$replacement = esc_html( $replacement );
22592259
$replacement = apply_filters( 'eme_general', $replacement );
22602260
} else {
22612261
$replacement = apply_filters( 'eme_text', $replacement );
@@ -2325,7 +2325,7 @@ function eme_replace_generic_placeholders( $format, $target = 'html' ) {
23252325
$replacement = "";
23262326
}
23272327
if ( $need_escape ) {
2328-
$replacement = eme_esc_html( preg_replace( '/\n|\r/', '', $replacement ) );
2328+
$replacement = esc_html( preg_replace( '/\n|\r/', '', $replacement ) );
23292329
}
23302330
if ( $need_urlencode ) {
23312331
$replacement = rawurlencode( $replacement );
@@ -2399,7 +2399,7 @@ function eme_replace_event_placeholders( $format, $event, $target = 'html', $lan
23992399
}
24002400

24012401
if ( $need_escape ) {
2402-
$replacement = eme_esc_html( preg_replace( '/\n|\r/', '', $replacement ) );
2402+
$replacement = esc_html( preg_replace( '/\n|\r/', '', $replacement ) );
24032403
}
24042404
if ( $need_urlencode ) {
24052405
$replacement = rawurlencode( $replacement );
@@ -4034,7 +4034,7 @@ function eme_replace_event_placeholders( $format, $event, $target = 'html', $lan
40344034
$replacement = "";
40354035
}
40364036
if ( $need_escape ) {
4037-
$replacement = eme_esc_html( preg_replace( '/\n|\r/', '', $replacement ) );
4037+
$replacement = esc_html( preg_replace( '/\n|\r/', '', $replacement ) );
40384038
}
40394039
if ( $need_urlencode ) {
40404040
$replacement = rawurlencode( $replacement );
@@ -4079,7 +4079,7 @@ function eme_replace_event_placeholders( $format, $event, $target = 'html', $lan
40794079
$replacement = eme_localized_date( $event[ $my_dt ], EME_TIMEZONE, substr( $result, $offset, ( strlen( $result ) - ( $offset + 1 ) ) ) );
40804080

40814081
if ( $need_escape ) {
4082-
$replacement = eme_esc_html( preg_replace( '/\n|\r/', '', $replacement ) );
4082+
$replacement = esc_html( preg_replace( '/\n|\r/', '', $replacement ) );
40834083
}
40844084
if ( $need_urlencode ) {
40854085
$replacement = rawurlencode( $replacement );
@@ -4208,7 +4208,7 @@ function eme_replace_notes_placeholders( $format, $event = '', $target = 'html'
42084208
$replacement = "";
42094209
}
42104210
if ( $need_escape ) {
4211-
$replacement = eme_esc_html( preg_replace( '/\n|\r/', '', $replacement ) );
4211+
$replacement = esc_html( preg_replace( '/\n|\r/', '', $replacement ) );
42124212
}
42134213
$format = substr_replace( $format, $replacement, $orig_result_needle, $orig_result_length );
42144214
$needle_offset += $orig_result_length - strlen( $replacement );
@@ -5892,13 +5892,13 @@ function eme_import_csv_events() {
58925892
// location_id is returned if update is ok, and we use the location id later on
58935893
$location_id = eme_update_location( $line, $location_id );
58945894
if ( ! $location_id ) {
5895-
$error_msg .= '<br>' . eme_esc_html( sprintf( __( 'Location not imported: %s', 'events-made-easy' ), implode( ',', $row ) ) );
5895+
$error_msg .= '<br>' . esc_html( sprintf( __( 'Location not imported: %s', 'events-made-easy' ), implode( ',', $row ) ) );
58965896
}
58975897
} else {
58985898
$location_id = eme_insert_location( $line );
58995899
if ( ! $location_id ) {
59005900
++$errors;
5901-
$error_msg .= '<br>' . eme_esc_html( sprintf( __( 'Location not imported: %s', 'events-made-easy' ), implode( ',', $row ) ) );
5901+
$error_msg .= '<br>' . esc_html( sprintf( __( 'Location not imported: %s', 'events-made-easy' ), implode( ',', $row ) ) );
59025902
}
59035903
}
59045904
if ( $location_id ) {
@@ -5922,10 +5922,10 @@ function eme_import_csv_events() {
59225922

59235923
if ( ! empty( $line['event_start_date'] ) && ! eme_is_date( $line['event_start_date'] ) ) {
59245924
++$errors;
5925-
$error_msg .= '<br>' . eme_esc_html( sprintf( __( 'Not imported (field %s not valid): %s', 'events-made-easy' ), 'event_start_date', implode( ',', $row ) ) );
5925+
$error_msg .= '<br>' . esc_html( sprintf( __( 'Not imported (field %s not valid): %s', 'events-made-easy' ), 'event_start_date', implode( ',', $row ) ) );
59265926
} elseif ( ! empty( $line['event_end_date'] ) && ! eme_is_date( $line['event_end_date'] ) ) {
59275927
++$errors;
5928-
$error_msg .= '<br>' . eme_esc_html( sprintf( __( 'Not imported (field %s not valid): %s', 'events-made-easy' ), 'event_end_date', implode( ',', $row ) ) );
5928+
$error_msg .= '<br>' . esc_html( sprintf( __( 'Not imported (field %s not valid): %s', 'events-made-easy' ), 'event_end_date', implode( ',', $row ) ) );
59295929
} elseif ( isset( $line['event_name'] ) ) {
59305930
if ( ! isset( $line['location_id'] ) ) {
59315931
$line['location_id'] = $location_id;
@@ -5967,15 +5967,15 @@ function eme_import_csv_events() {
59675967
++$updated;
59685968
} else {
59695969
++$errors;
5970-
$error_msg .= '<br>' . eme_esc_html( sprintf( __( 'Not imported (problem updating the event in the db): %s', 'events-made-easy' ), implode( ',', $row ) ) );
5970+
$error_msg .= '<br>' . esc_html( sprintf( __( 'Not imported (problem updating the event in the db): %s', 'events-made-easy' ), implode( ',', $row ) ) );
59715971
}
59725972
} else {
59735973
$event_id = eme_db_insert_event( $line );
59745974
if ( $event_id ) {
59755975
++$inserted;
59765976
} else {
59775977
++$errors;
5978-
$error_msg .= '<br>' . eme_esc_html( sprintf( __( 'Not imported (problem inserting the event in the db): %s', 'events-made-easy' ), implode( ',', $row ) ) );
5978+
$error_msg .= '<br>' . esc_html( sprintf( __( 'Not imported (problem inserting the event in the db): %s', 'events-made-easy' ), implode( ',', $row ) ) );
59795979
}
59805980
}
59815981
if ( $event_id ) {
@@ -5997,7 +5997,7 @@ function eme_import_csv_events() {
59975997
}
59985998
} else {
59995999
++$errors;
6000-
$error_msg .= '<br>' . eme_esc_html( sprintf( __( 'Not imported (not all required fields are present): %s', 'events-made-easy' ), implode( ',', $row ) ) );
6000+
$error_msg .= '<br>' . esc_html( sprintf( __( 'Not imported (not all required fields are present): %s', 'events-made-easy' ), implode( ',', $row ) ) );
60016001
}
60026002
}
60036003
$result = sprintf( __( 'Import finished: %d inserts, %d updates, %d errors', 'events-made-easy' ), $inserted, $updated, $errors );
@@ -6121,7 +6121,7 @@ function eme_events_table( $message = '' ) {
61216121
if ( ! empty( $formfields_searchable ) ) {
61226122
echo '<input type="search" name="search_customfields" id="search_customfields" placeholder="' . esc_attr__( 'Custom field value to search', 'events-made-easy' ) . '" class="eme_searchfilter" size=20>';
61236123
$label = __( 'Custom fields to filter on', 'events-made-easy' );
6124-
$extra_attributes = 'aria-label="' . eme_esc_html( $label ) . '" data-placeholder="' . eme_esc_html( $label ) . '"';
6124+
$extra_attributes = 'aria-label="' . esc_html( $label ) . '" data-placeholder="' . esc_html( $label ) . '"';
61256125
echo eme_ui_multiselect_key_value( '', 'search_customfieldids', $formfields_searchable, 'field_id', 'field_name', 5, '', 0, 'eme_snapselect', $extra_attributes, 1 ); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- trusted HTML from eme_ui_multiselect_key_value()
61266126
}
61276127
?>
@@ -7142,6 +7142,7 @@ function eme_meta_box_div_recurrence_info( $recurrence, $edit_recurrence = 0 ) {
71427142
'specific' => __( 'Specific days', 'events-made-easy' ),
71437143
'specific_months' => __( 'Specific months', 'events-made-easy' ),
71447144
];
7145+
// phpcs:ignore WordPress.WP.I18n.MissingArgDomain -- WordPress core weekday translations for $wp_locale
71457146
$days_names = [
71467147
1 => $wp_locale->get_weekday_abbrev( __( 'Monday' ) ),
71477148
2 => $wp_locale->get_weekday_abbrev( __( 'Tuesday' ) ),

‎eme-filters.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ function eme_replace_filter_form_placeholders( $format, $multiple, $multisize, $
220220
} else {
221221
$label = __( 'Select a category', 'events-made-easy' );
222222
}
223-
$aria_label = 'aria-label="' . eme_esc_html( $label ) . '"';
223+
$aria_label = 'aria-label="' . esc_html( $label ) . '"';
224224

225225
$categories = eme_get_categories( $eventful, 'future', $extra_conditions );
226226
if ( $categories ) {
@@ -255,7 +255,7 @@ function eme_replace_filter_form_placeholders( $format, $multiple, $multisize, $
255255
} else {
256256
$label = __( 'Select a location', 'events-made-easy' );
257257
}
258-
$aria_label = 'aria-label="' . eme_esc_html( $label ) . '"';
258+
$aria_label = 'aria-label="' . esc_html( $label ) . '"';
259259
$locations = eme_get_locations( eventful: $eventful, scope: 'future', ignore_filter: true );
260260
if ( ! empty( $locations ) ) {
261261
$loc_list = [];
@@ -289,7 +289,7 @@ function eme_replace_filter_form_placeholders( $format, $multiple, $multisize, $
289289
} else {
290290
$label = __( 'Select a city', 'events-made-easy' );
291291
}
292-
$aria_label = 'aria-label="' . eme_esc_html( $label ) . '"';
292+
$aria_label = 'aria-label="' . esc_html( $label ) . '"';
293293
$cities = eme_get_locations( eventful: $eventful, scope: 'future', ignore_filter: true );
294294
if ( ! empty( $cities ) ) {
295295
$city_list = [];
@@ -323,7 +323,7 @@ function eme_replace_filter_form_placeholders( $format, $multiple, $multisize, $
323323
} else {
324324
$label = __( 'Select a country', 'events-made-easy' );
325325
}
326-
$aria_label = 'aria-label="' . eme_esc_html( $label ) . '"';
326+
$aria_label = 'aria-label="' . esc_html( $label ) . '"';
327327
$countries = eme_get_locations( eventful: $eventful, scope: 'future', ignore_filter: true );
328328
if ( ! empty( $countries ) ) {
329329
$country_list = [];
@@ -363,7 +363,7 @@ function eme_replace_filter_form_placeholders( $format, $multiple, $multisize, $
363363
}
364364
if ( $scope_fieldcount == 0 ) {
365365
$label = __( 'Select Week', 'events-made-easy' );
366-
$aria_label = 'aria-label="' . eme_esc_html( $label ) . '"';
366+
$aria_label = 'aria-label="' . esc_html( $label ) . '"';
367367
$replacement = eme_ui_select( $selected_scope, $scope_post_name, eme_create_week_scope( $past_count, $future_count, $eventful ), $label, 0, '', $aria_label );
368368
++$scope_fieldcount;
369369
}
@@ -425,7 +425,7 @@ function eme_replace_filter_form_placeholders( $format, $multiple, $multisize, $
425425
$args = [
426426
'echo' => 0,
427427
'name' => $contact_post_name,
428-
'show_option_none' => eme_esc_html( $label ),
428+
'show_option_none' => esc_html( $label ),
429429
'option_none_value'=> '',
430430
'selected' => $selected_contact,
431431
'class' => 'eme_snapselect_allow_empty',
@@ -454,7 +454,7 @@ function eme_replace_filter_form_placeholders( $format, $multiple, $multisize, $
454454
$args = [
455455
'echo' => 0,
456456
'name' => $author_post_name,
457-
'show_option_none' => eme_esc_html( $label ),
457+
'show_option_none' => esc_html( $label ),
458458
'option_none_value'=> '',
459459
'selected' => $selected_author,
460460
'class' => 'eme_snapselect_allow_empty',

0 commit comments

Comments
 (0)