Skip to content

Commit fd1ed58

Browse files
imantskimantsk
committed
fix: prefix globals in import and cloud search views
1 parent bd21d15 commit fd1ed58

File tree

2 files changed

+47
-46
lines changed

2 files changed

+47
-46
lines changed

‎src/php/views/import.php‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
return;
1919
}
2020

21-
$max_size_bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() );
21+
// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound -- Core hook name expected by WordPress importers.
22+
$code_snippets_max_size_bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() );
2223

2324
?>
2425
<div class="wrap">
@@ -40,18 +41,18 @@
4041

4142
<p><?php esc_html_e( 'Upload one or more Code Snippets export files and the snippets will be imported.', 'code-snippets' ); ?></p>
4243

43-
<p>
44-
<?php
45-
/* translators: %s: link to snippets admin menu */
46-
$text = __( 'Afterward, you will need to visit the <a href="%s" >All Snippets</a> page to activate the imported snippets.', 'code-snippets' );
47-
$url = esc_url( code_snippets()->get_menu_url( 'manage' ) );
48-
49-
echo wp_kses(
50-
sprintf( $text, $url ),
51-
array(
52-
'a' => array(
53-
'href' => array(),
54-
'target' => array(),
44+
<p>
45+
<?php
46+
/* translators: %s: link to snippets admin menu */
47+
$code_snippets_import_notice = __( 'Afterward, you will need to visit the <a href="%s" >All Snippets</a> page to activate the imported snippets.', 'code-snippets' );
48+
$code_snippets_manage_url = esc_url( code_snippets()->get_menu_url( 'manage' ) );
49+
50+
echo wp_kses(
51+
sprintf( $code_snippets_import_notice, $code_snippets_manage_url ),
52+
array(
53+
'a' => array(
54+
'href' => array(),
55+
'target' => array(),
5556
),
5657
)
5758
);
@@ -98,17 +99,17 @@
9899
</p>
99100

100101
<fieldset>
101-
<p>
102-
<label for="upload"><?php esc_html_e( 'Choose files from your computer:', 'code-snippets' ); ?></label>
103-
<?php
104-
/* translators: %s: size in bytes */
105-
printf( esc_html__( '(Maximum size: %s)', 'code-snippets' ), esc_html( size_format( $max_size_bytes ) ) ); ?>
106-
<input type="file" id="upload" name="code_snippets_import_files[]" size="25"
107-
accept="application/json,.json,text/xml" multiple="multiple">
108-
<input type="hidden" name="action" value="save">
109-
<input type="hidden" name="max_file_size" value="<?php echo esc_attr( $max_size_bytes ); ?>">
110-
</p>
111-
</fieldset>
102+
<p>
103+
<label for="upload"><?php esc_html_e( 'Choose files from your computer:', 'code-snippets' ); ?></label>
104+
<?php
105+
/* translators: %s: size in bytes */
106+
printf( esc_html__( '(Maximum size: %s)', 'code-snippets' ), esc_html( size_format( $code_snippets_max_size_bytes ) ) ); ?>
107+
<input type="file" id="upload" name="code_snippets_import_files[]" size="25"
108+
accept="application/json,.json,text/xml" multiple="multiple">
109+
<input type="hidden" name="action" value="save">
110+
<input type="hidden" name="max_file_size" value="<?php echo esc_attr( $code_snippets_max_size_bytes ); ?>">
111+
</p>
112+
</fieldset>
112113

113114
<?php
114115

‎src/php/views/partials/cloud-search.php‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* @var Manage_Menu $this
1515
*/
1616

17-
$search_query = isset( $_REQUEST['cloud_search'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['cloud_search'] ) ) : '';
18-
$cloud_select = sanitize_key( wp_unslash( $_REQUEST['cloud_select'] ?? '' ) );
17+
$code_snippets_search_query = isset( $_REQUEST['cloud_search'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['cloud_search'] ) ) : '';
18+
$code_snippets_cloud_select = sanitize_key( wp_unslash( $_REQUEST['cloud_select'] ?? '' ) );
1919

2020
?>
2121

@@ -30,32 +30,32 @@
3030
<form method="get" action="" id="cloud-search-form">
3131
<?php List_Table::required_form_fields( 'search_box' ); ?>
3232
<label class="screen-reader-text" for="cloud_search">
33-
<?php esc_html_e( 'Search cloud snippets', 'code-snippets' ); ?>
34-
</label>
35-
<?php
36-
if ( isset( $_REQUEST['type'] ) ) {
37-
printf( '<input type="hidden" name="type" value="%s">', esc_attr( sanitize_text_field( wp_unslash( $_REQUEST['type'] ) ) ) );
33+
<?php esc_html_e( 'Search cloud snippets', 'code-snippets' ); ?>
34+
</label>
35+
<?php
36+
if ( isset( $_REQUEST['type'] ) ) {
37+
printf( '<input type="hidden" name="type" value="%s">', esc_attr( sanitize_text_field( wp_unslash( $_REQUEST['type'] ) ) ) );
3838
}
3939
?>
4040
<div class="heading-box">
4141
<p class="cloud-search-heading">
4242
<label for="cloud-select-prepend"><?php esc_html_e( 'Search Cloud', 'code-snippets' ); ?></label>
4343
</p>
44-
</div>
45-
<div class="input-group">
46-
<select id="cloud-select-prepend" class="select-prepend" name="cloud_select">
47-
<option value="term"<?php selected( $cloud_select, 'term' ); ?>>
48-
<?php esc_html_e( 'Search by keyword(s)', 'code-snippets' ); ?>
49-
</option>
50-
<option value="codevault"<?php selected( $cloud_select, 'codevault' ); ?>>
51-
<?php esc_html_e( 'Name of codevault', 'code-snippets' ); ?>
52-
</option>
53-
</select>
54-
<input type="text" id="cloud_search" name="cloud_search" class="cloud_search"
55-
value="<?php echo esc_html( $search_query ); ?>"
56-
placeholder="<?php esc_attr_e( 'e.g. Remove unused javascript…', 'code-snippets' ); ?>">
44+
</div>
45+
<div class="input-group">
46+
<select id="cloud-select-prepend" class="select-prepend" name="cloud_select">
47+
<option value="term"<?php selected( $code_snippets_cloud_select, 'term' ); ?>>
48+
<?php esc_html_e( 'Search by keyword(s)', 'code-snippets' ); ?>
49+
</option>
50+
<option value="codevault"<?php selected( $code_snippets_cloud_select, 'codevault' ); ?>>
51+
<?php esc_html_e( 'Name of codevault', 'code-snippets' ); ?>
52+
</option>
53+
</select>
54+
<input type="text" id="cloud_search" name="cloud_search" class="cloud_search"
55+
value="<?php echo esc_html( $code_snippets_search_query ); ?>"
56+
placeholder="<?php esc_attr_e( 'e.g. Remove unused javascript…', 'code-snippets' ); ?>">
5757

58-
<button type="submit" id="cloud-search-submit" class="button">
58+
<button type="submit" id="cloud-search-submit" class="button">
5959
<?php esc_html_e( 'Search Cloud', 'code-snippets' ); ?>
6060
<span class="dashicons dashicons-search cloud-search"></span>
6161
</button>
@@ -68,7 +68,7 @@
6868
<?php
6969
List_Table::required_form_fields();
7070

71-
if ( $search_query ) {
71+
if ( $code_snippets_search_query ) {
7272
$this->cloud_search_list_table->display();
7373
}
7474

0 commit comments

Comments
 (0)