Skip to content

Commit 8e20a65

Browse files
committed
Addresses is issues with website_url form field. Fixes #60
1 parent a3d7a71 commit 8e20a65

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

assets/wpuf/js/frontend-form.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@
717717
},
718718

719719
isValidURL: function(url) {
720-
var urlregex = new RegExp("^(http:\/\/www.|https:\/\/www.|ftp:\/\/www.|www.|http:\/\/|https:\/\/){1}([0-9A-Za-z]+\.)");
720+
var urlregex = new RegExp(/^(?:(?:https?|ftp):\/\/)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:\/\S*)?$/);
721721
return urlregex.test(url);
722722
},
723723

includes/fields/class-field-url.php

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@ public function render( $field_settings, $form_id ) {
2626

2727
<div class="wpuf-fields">
2828
<input
29-
id="<?php echo esc_attr( $field_settings['name'] ) . '_' . esc_attr( $form_id ); ?>"
30-
type="url" class="url <?php echo ' wpuf_'. esc_attr( $field_settings['name'] ).'_'. esc_attr( $form_id ); ?>"
31-
data-duplicate="<?php echo esc_attr( $field_settings['duplicate'] ) ? esc_attr( $field_settings['duplicate'] ) : 'no'; ?>"
32-
data-required="<?php echo esc_attr( $field_settings['required'] ) ?>"
33-
data-type="text"
34-
name="<?php echo esc_attr( $field_settings['name'] ); ?>"
35-
placeholder="<?php echo esc_attr( $field_settings['placeholder'] ); ?>"
36-
value="<?php echo esc_attr( $value ); ?>" size="<?php echo esc_attr( $field_settings['size'] ); ?>"
37-
autocomplete="url"
29+
title = "The URL must contain a protocol i.e. http://example.com"
30+
id = "<?php echo esc_attr( $field_settings['name'] ) . '_' . esc_attr( $form_id ); ?>"
31+
type = "url" class="url <?php echo ' wpuf_'. esc_attr( $field_settings['name'] ).'_'. esc_attr( $form_id ); ?>"
32+
data-duplicate = "<?php echo esc_attr( $field_settings['duplicate'] ) ? esc_attr( $field_settings['duplicate'] ) : 'no'; ?>"
33+
data-required = "<?php echo esc_attr( $field_settings['required'] ) ?>"
34+
data-type = "url"
35+
name = "<?php echo esc_attr( $field_settings['name'] ); ?>"
36+
placeholder = "<?php echo esc_attr( $field_settings['placeholder'] ); ?>"
37+
value = "<?php echo esc_attr( $value ); ?>" size="<?php echo esc_attr( $field_settings['size'] ); ?>"
38+
autocomplete = "url"
3839
/>
3940
<?php $this->help_text( $field_settings ); ?>
4041
</div>

0 commit comments

Comments
 (0)