Skip to content

Commit

Permalink
Merge pull request #105 from iftakharul-islam/security-improvement
Browse files Browse the repository at this point in the history 
Security improvement
  • Loading branch information
@iftakharul-islam
iftakharul-islam authored Oct 24, 2024
2 parents 0ebedd5 + 4a689aa commit bb4e6ac
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 25 deletions.
2 changes: 1 addition & 1 deletion inc/class-wp_recaptcha_cforms2.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function check_response($post) {
public function get_request($input_id, $input_classes, $input_title) {
$wp_recaptcha = WP_reCaptcha::instance();
$request = $wp_recaptcha->begin_inject(true);
$request.= $wp_recaptcha->recaptcha_html( $attr );
$request.= $wp_recaptcha->recaptcha_html( );
$request.= $wp_recaptcha->end_inject(true);
return $request;
}
Expand Down
49 changes: 25 additions & 24 deletions inc/class-wp_recaptcha_options.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ function api_key_notice() {
?><div class="notice error above-h1"><p><?php
printf(
__( '<strong>reCaptcha needs your attention:</strong> To make it work You need to enter an api key. <br />You can do so at the <a href="%s">reCaptcha settings page</a>.' , 'wp-recaptcha-integration' ),
admin_url( add_query_arg( 'page' , 'recaptcha' , 'options-general.php' ) )
esc_url( admin_url( add_query_arg( 'page' , 'recaptcha' , 'options-general.php' ) ) )
);
?></p></div><?php
}
Expand Down Expand Up @@ -487,7 +487,7 @@ public function ajax_test_api_key_verification() {
*/
public function cancel_enter_api_key() {
$url = $this->remove_new_apikey_url( add_query_arg(null,null) );
?><a class="button" href="<?php echo $url ?>"><?php _e( 'Cancel' ) ?></a><?php
?><a class="button" href="<?php echo esc_url( $url ) ?>"><?php _e( 'Cancel' ) ?></a><?php
}

/**
Expand All @@ -509,10 +509,10 @@ public function input_radio( $args ) {
$option = WP_reCaptcha::instance()->get_option( $name );
foreach ( $items as $item ) {
extract( $item ); // value, label
?><label for="<?php echo "$name-$value" ?>"><?php
?><input id="<?php echo "$name-$value" ?>" type="radio" name="<?php echo $name ?>" value="<?php echo $value ?>" <?php checked($value,$option,true) ?> />
?><label for="<?php echo esc_attr( "$name-$value" ) ?>"><?php
?><input id="<?php echo esc_attr( "$name-$value" ) ?>" type="radio" name="<?php echo esc_attr( $name ) ?>" value="<?php echo esc_attr( $value ) ?>" <?php checked($value,$option,true) ?> />
<?php
echo $label;
echo esc_html( $label );
?></label><br /><?php
}
}
Expand All @@ -534,14 +534,15 @@ public function input_checkbox($args) {
));
extract($args);
$value = WP_reCaptcha::instance()->get_option( $name );
$class_attr = $class ? "class=\"{$class}\"" : '';
?><label <?php echo $class_attr ?> for="<?php echo $name ?>"><?php
?><input type="hidden" name="<?php echo $name ?>" value="0" /><?php
?><input id="<?php echo $name ?>" type="checkbox" name="<?php echo $name ?>" value="1" <?php checked($value,1,true) ?> />
$class_attr = $class ? 'class="' . esc_attr( $class ) . '"' : '';

?><label <?php echo $class_attr ?> for="<?php echo esc_attr( $name ) ?>"><?php
?><input type="hidden" name="<?php echo esc_attr( $name ) ?>" value="0" /><?php
?><input id="<?php echo esc_attr( $name ) ?>" type="checkbox" name="<?php echo esc_attr( $name ) ?>" value="1" <?php checked($value,1,true) ?> />
<?php
echo $label;
echo esc_html( $label );
if ( $description ) {
?><p class="description"><?php echo $description ?></p><?php
?><p class="description"><?php echo wp_kses_post( $description ) ?></p><?php
}
?></label><?php
}
Expand All @@ -565,12 +566,12 @@ public function input_check_onoff($args) {
extract($args);
$value = WP_reCaptcha::instance()->get_option( $name );

?><div class="recaptcha-onoff <?php echo $class ?>"><?php
?><input type="hidden" name="<?php echo $name ?>" value="0" /><?php
?><input id="<?php echo $name ?>" type="checkbox" name="<?php echo $name ?>" value="1" <?php checked($value,1,true) ?> /><?php
?><div class="recaptcha-onoff <?php echo esc_attr( $class ) ?>"><?php
?><input type="hidden" name="<?php echo esc_attr( $name ) ?>" value="0" /><?php
?><input id="<?php echo esc_attr( $name ) ?>" type="checkbox" name="<?php echo esc_attr( $name )?>" value="1" <?php checked($value,1,true) ?> /><?php
?><label for="<?php echo $name ?>"><?php
?><span class="dashicons dashicons-lock"></span><?php
?><span class="title"><?php echo $label ?></span><?php
?><span class="title"><?php echo esc_html( $label ) ?></span><?php
?></label><?php
?></div><?php
}
Expand All @@ -591,7 +592,7 @@ public function input_protect( $switches ) {
public function secret_input_text( $args ) {
extract( $args );
$value = WP_reCaptcha::instance()->get_option( $name );
?><input type="text" class="regular-text ltr" name="<?php echo $name ?>" value="<?php //echo $value ?>" /><?php
?><input type="text" class="regular-text ltr" name="<?php echo esc_attr( $name ) ?>" value="<?php //echo $value ?>" /><?php
}
/**
* Selector for recaptcha theme
Expand All @@ -606,14 +607,14 @@ public function select_language() {
'grecaptcha' => WP_reCaptcha_NoCaptcha::instance()->get_supported_languages(),
);

?><div class="recaptcha-select-language flavor-<?php echo $option_flavor ?>"><?php
?><div class="recaptcha-select-language flavor-<?php echo esc_attr( $option_flavor ) ?>"><?php
foreach( $all_available_langs as $flavor => $available_langs ) {
?><select class="flavor-<?php echo $flavor ?>" name="<?php echo $option_name ?>[<?php echo $flavor ?>]"><?php
?><select class="flavor-<?php echo esc_attr( $flavor ) ?>" name="<?php echo esc_attr( $option_name ) ?>[<?php echo esc_attr( $flavor ) ?>]"><?php
?><option <?php selected($option_value,'',true); ?> value=""><?php _e( 'Automatic','wp-recaptcha-integration' ); ?></option><?php
?><option <?php selected($option_value,'WPLANG',true); ?> value="WPLANG"><?php _e( 'Site Language' ); ?></option><?php
?><optgroup label="<?php _e('Other','wp-recaptcha-integration' ) ?>"><?php
foreach ( $available_langs as $lang => $lang_name ) {
?><option <?php selected($option_value,$lang,true); ?> value="<?php echo $lang; ?>"><?php _e( $lang_name ); ?></option><?php
?><option <?php selected($option_value,$lang,true); ?> value="<?php echo esc_attr( $lang ); ?>"><?php echo esc_html( $lang_name ); ?></option><?php
}
?></optgroup><?php
?></select><?php
Expand Down Expand Up @@ -641,19 +642,19 @@ public function select_theme() {

foreach ( $themes as $value => $theme ) {
extract( $theme ); // label, flavor
?><div class="theme-item flavor-<?php echo $flavor ?>"><?php
?><input <?php checked($value,$option_theme,true); ?> id="<?php echo "$option_name-$value" ?>" type="radio" name="<?php echo $option_name ?>" value="<?php echo $value ?>" /><?php
?><label for="<?php echo "$option_name-$value" ?>"><?php
?><div class="theme-item flavor-<?php echo esc_attr( $flavor ) ?>"><?php
?><input <?php checked($value,$option_theme,true); ?> id="<?php echo esc_attr( "$option_name-$value" ) ?>" type="radio" name="<?php echo esc_attr( $option_name ) ?>" value="<?php echo esc_attr( $value ) ?>" /><?php
?><label for="<?php echo esc_attr( "$option_name-$value" ) ?>"><?php
?><span class="title"><?php
echo $label;
echo esc_html( $label );
?></span><?php
if ( $value == 'custom' ) {
?><span class="visual"><?php
_e( 'Unstyled HTML to apply your own Stylesheets.' , 'wp-recaptcha-integration' );
?></span><?php
} else {
$src = plugins_url( "images/{$flavor}-theme-{$value}.png" , dirname(__FILE__));
printf( '<img src="%s" alt="%s" />' , $src , $label );
printf( '<img src="%s" alt="%s" />' , esc_url( $src ), esc_html( $label ) );
}
?></label><?php
?></div><?php
Expand Down

0 comments on commit bb4e6ac

Please sign in to comment.