Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add server field and validation #10

Merged
merged 10 commits into from
Apr 18, 2024
Merged

Add server field and validation #10

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
37ed5a7
Add server back in
NickGreen Apr 16, 2024
d2ed2a3
Add server field and validation back in
NickGreen Apr 17, 2024
47da9bd
Bump version
NickGreen Apr 17, 2024
a046b93
Remove "Display Title" checkbox & PHPCS fixes
NickGreen Apr 17, 2024
1e5fb31
Add category back in
NickGreen Apr 17, 2024
dd16763
Default cat empty
NickGreen Apr 17, 2024
ac39968
No default username
NickGreen Apr 18, 2024
6e11772
No default username
NickGreen Apr 18, 2024
7fd983c
Add Author
NickGreen Apr 18, 2024
0480c5e
PHPCS
NickGreen Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions feedland-blogroll.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Description: Show a Blogroll on your site.
* Requires at least: 6.1
* Requires PHP: 7.4
* Version: 1.1.0
* Version: 1.1.1
* Author: WordPress.com Special Projects
* Author URI: https://wpspecialprojects.wordpress.com
* Update URI: https://github.com/a8cteam51/feedland-blogroll
Expand Down Expand Up @@ -222,7 +222,7 @@ function feedland_get_opml_url() {
'screenname' => $options['feedland_blogroll_username'] ?: FEEDLAND_DEFAULT_USERNAME, // phpcs:ignore Universal.Operators.DisallowShortTernary.Found
)
),
FEEDLAND_DEFAULT_SERVER . 'opml'
trailingslashit( $options['feedland_blogroll_server'] ?: FEEDLAND_DEFAULT_SERVER ) . 'opml'
);
}

Expand All @@ -240,6 +240,6 @@ function feedland_get_blogroll_url() {
'username' => $options['feedland_blogroll_username'] ?: FEEDLAND_DEFAULT_USERNAME, // phpcs:ignore Universal.Operators.DisallowShortTernary.Found
)
),
FEEDLAND_DEFAULT_SERVER
trailingslashit( $options['feedland_blogroll_server'] ?: FEEDLAND_DEFAULT_SERVER )
);
}
2 changes: 1 addition & 1 deletion includes/self-update.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function feedland_blogroll_self_update( $update, array $plugin_data, string $plu
);

if ( is_wp_error( $response ) ) {
return;
return false;
} else {
$output = json_decode( wp_remote_retrieve_body( $response ), true );
}
Expand Down
96 changes: 78 additions & 18 deletions includes/settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,21 @@ function feedland_blogroll_settings_init(): void {
'description' => esc_html__( 'Username associated with the FeedLand feed you want to display on your site.', 'feedland-blogroll' ),
)
);

add_settings_field(
'feedland_blogroll_server',
__( 'FeedLand Server', 'feedland-blogroll' ),
'feedland_blogroll_settings_field_callback',
'feedland_blogroll_settings',
'feedland_blogroll_settings_section',
array(
'label_for' => 'feedland_blogroll_server',
'type' => 'url',
'name' => 'feedland_blogroll_server',
'class' => 'regular-text',
'placeholder' => FEEDLAND_DEFAULT_SERVER,
)
);
}

/**
Expand All @@ -126,6 +141,15 @@ function feedland_blogroll_settings_field_callback( array $args ): void {

switch ( $args['type'] ) {
case 'text':
printf(
'<input type="%1$s" id="%2$s" name="feedland_blogroll_options[%2$s]" value="%3$s" class="%4$s" placeholder="%5$s" />',
esc_attr( $args['type'] ),
esc_attr( $args['name'] ),
esc_attr( $value ),
esc_attr( $args['class'] ),
esc_attr( $args['placeholder'] ?? '' )
);
break;
NickGreen marked this conversation as resolved.
Show resolved Hide resolved
case 'url':
printf(
'<input type="%1$s" id="%2$s" name="feedland_blogroll_options[%2$s]" value="%3$s" class="%4$s" placeholder="%5$s" />',
Expand Down Expand Up @@ -174,36 +198,72 @@ function feedland_blogroll_add_action_links( array $links ): array {
* @return array Validated options
*/
function feedland_blogroll_validate_options( array $input ): array {
$input = array_map( 'sanitize_text_field', $input );
$user_endpoint = sprintf( '%1$sisuserindatabase?screenname=%2$s', FEEDLAND_DEFAULT_SERVER, $input['feedland_blogroll_username'] );

$request = wp_remote_get( $user_endpoint );

if ( is_wp_error( $request ) ) {
add_settings_error(
'feedland_blogroll_settings',
'feedland_blogroll_username',
esc_html__( 'There was an error communicating with the server.', 'feedland-blogroll' )
);

$input['feedland_blogroll_username'] = FEEDLAND_DEFAULT_USERNAME;
// Validate server URL
if ( ! empty( $input['feedland_blogroll_server'] ) ) {
// Ensure the server URL is properly formatted and sanitize it
if ( filter_var( $input['feedland_blogroll_server'], FILTER_VALIDATE_URL ) ) {
$input['feedland_blogroll_server'] = esc_url_raw( $input['feedland_blogroll_server'] );
} else {
add_settings_error(
'feedland_blogroll_settings',
'feedland_blogroll_server',
esc_html__( 'The FeedLand server URL is not valid.', 'feedland-blogroll' )
);
$input['feedland_blogroll_server'] = FEEDLAND_DEFAULT_SERVER;
}
} else {
$input['feedland_blogroll_server'] = FEEDLAND_DEFAULT_SERVER;
}

$response = json_decode( wp_remote_retrieve_body( $request ), true );

if ( ! $response['flInDatabase'] ) {
// Sanitize and validate username
if ( ! empty( $input['feedland_blogroll_username'] ) ) {
NickGreen marked this conversation as resolved.
Show resolved Hide resolved
$input['feedland_blogroll_username'] = sanitize_text_field( $input['feedland_blogroll_username'] );
} else {
add_settings_error(
'feedland_blogroll_settings',
'feedland_blogroll_username',
sprintf(
/* translators: %s: Default username placeholder */
esc_html__( 'The username provided is not associated with a FeedLand account. Using default "%s".', 'feedland-blogroll' ),
esc_html__( 'The username cannot be empty. Using default "%s".', 'feedland-blogroll' ),
FEEDLAND_DEFAULT_USERNAME
)
);

$input['feedland_blogroll_username'] = FEEDLAND_DEFAULT_USERNAME;
}

// Now that we have sanitized server and username, we can perform the remote check
if ( ! empty( $input['feedland_blogroll_server'] ) && ! empty( $input['feedland_blogroll_username'] ) ) {
NickGreen marked this conversation as resolved.
Show resolved Hide resolved
$user_endpoint = sprintf( '%1$sisuserindatabase?screenname=%2$s', $input['feedland_blogroll_server'], $input['feedland_blogroll_username'] );

$request = wp_remote_get( $user_endpoint );

// Handle error in communication with the server
if ( is_wp_error( $request ) ) {
add_settings_error(
'feedland_blogroll_settings',
'feedland_blogroll_server',
esc_html__( 'There was an error communicating with the server. Resetting to default server.', 'feedland-blogroll' )
);
$input['feedland_blogroll_server'] = FEEDLAND_DEFAULT_SERVER;
} else {
$response = json_decode( wp_remote_retrieve_body( $request ), true );

// Verify that the username exists in the database
if ( ! $response['flInDatabase'] ) {
add_settings_error(
'feedland_blogroll_settings',
'feedland_blogroll_username',
sprintf(
/* translators: %s: Default username placeholder */
esc_html__( 'The username provided is not associated with a FeedLand account. Using default "%s".', 'feedland-blogroll' ),
FEEDLAND_DEFAULT_USERNAME
)
);

$input['feedland_blogroll_username'] = FEEDLAND_DEFAULT_USERNAME;
}
}
}

return $input;
}