User Registration – Custom Registration Form, Login Form And User Profile For WordPress - Version 1.4.6

Version Description

  • 31/08/2018 =
  • Fix - Remove filter to avoid plugin conflict while sending emails
  • Fix - Load assests correctly
  • Fix - Remove backend required valiation if the field is hidden by condition
Download this release

Release Info

Developer wpeverest
Plugin Icon 128x128 User Registration – Custom Registration Form, Login Form And User Profile For WordPress
Version 1.4.6
Comparing to
See all releases

Code changes from version 1.4.5 to 1.4.6

Files changed (26) hide show
  1. includes/class-ur-email-confirmation.php +2 -2
  2. includes/class-ur-emailer.php +25 -2
  3. includes/class-ur-frontend-scripts.php +18 -24
  4. includes/class-ur-shortcodes.php +5 -0
  5. includes/form/class-ur-form-field-checkbox.php +2 -1
  6. includes/form/class-ur-form-field-country.php +2 -1
  7. includes/form/class-ur-form-field-date.php +2 -1
  8. includes/form/class-ur-form-field-description.php +2 -1
  9. includes/form/class-ur-form-field-display-name.php +2 -2
  10. includes/form/class-ur-form-field-email.php +2 -2
  11. includes/form/class-ur-form-field-first-name.php +2 -1
  12. includes/form/class-ur-form-field-last-name.php +2 -1
  13. includes/form/class-ur-form-field-nickname.php +2 -1
  14. includes/form/class-ur-form-field-number.php +2 -1
  15. includes/form/class-ur-form-field-password.php +2 -1
  16. includes/form/class-ur-form-field-privacy-policy.php +2 -1
  17. includes/form/class-ur-form-field-radio.php +2 -1
  18. includes/form/class-ur-form-field-select.php +2 -1
  19. includes/form/class-ur-form-field-text.php +4 -1
  20. includes/form/class-ur-form-field-textarea.php +3 -1
  21. includes/form/class-ur-form-field-user-url.php +3 -1
  22. includes/shortcodes/class-ur-shortcode-my-account.php +4 -0
  23. languages/user-registration.pot +38 -38
  24. package-lock.json +1 -1
  25. readme.txt +20 -15
  26. user-registration.php +2 -2
includes/class-ur-email-confirmation.php CHANGED
@@ -26,7 +26,7 @@ class UR_Email_Confirmation {
26
  }
27
  add_filter( 'manage_users_columns', array( $this, 'add_column_head' ) );
28
  add_filter( 'manage_users_custom_column', array( $this, 'add_column_cell' ), 10, 3 );
29
- add_filter( 'user_row_actions', array( $this, 'ceate_quick_links' ), 10, 2 );
30
  add_action( 'load-users.php', array( $this, 'trigger_query_actions' ) );
31
 
32
  add_filter( 'wp_authenticate_user', array( $this, 'check_email_status' ),10,2);
@@ -44,7 +44,7 @@ class UR_Email_Confirmation {
44
  *
45
  * @return array
46
  */
47
- public function ceate_quick_links( $actions, $user ) {
48
 
49
  $verify_link = add_query_arg( array( 'action' => 'verify', 'user' => $user->ID ) );
50
  $verify_link = remove_query_arg( array( 'new_role' ), $verify_link );
26
  }
27
  add_filter( 'manage_users_columns', array( $this, 'add_column_head' ) );
28
  add_filter( 'manage_users_custom_column', array( $this, 'add_column_cell' ), 10, 3 );
29
+ add_filter( 'user_row_actions', array( $this, 'create_quick_links' ), 10, 2 );
30
  add_action( 'load-users.php', array( $this, 'trigger_query_actions' ) );
31
 
32
  add_filter( 'wp_authenticate_user', array( $this, 'check_email_status' ),10,2);
44
  *
45
  * @return array
46
  */
47
+ public function create_quick_links( $actions, $user ) {
48
 
49
  $verify_link = add_query_arg( array( 'action' => 'verify', 'user' => $user->ID ) );
50
  $verify_link = remove_query_arg( array( 'new_role' ), $verify_link );
includes/class-ur-emailer.php CHANGED
@@ -30,8 +30,8 @@ class UR_Emailer {
30
  return;
31
  }
32
 
33
- add_filter( 'wp_mail_from', array( __CLASS__, 'ur_sender_email' ) );
34
- add_filter( 'wp_mail_from_name', array( __CLASS__, 'ur_sender_name' ) );
35
 
36
  add_action( 'user_registration_after_register_user_action', array(
37
  __CLASS__,
@@ -39,6 +39,23 @@ class UR_Emailer {
39
  ), 10, 3 );
40
  }
41
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
42
  /**
43
  * @return string sender's email
44
  */
@@ -116,10 +133,16 @@ class UR_Emailer {
116
  $username = isset( $user_login_object->value ) && ! empty( $user_login_object->value ) ? $user_login_object->value : '';
117
 
118
  if ( ! empty( $email ) && ! empty( $user_id ) ) {
 
 
 
119
  self::send_mail_to_user( $email, $username, $user_id, $data_html, $name_value, $attachments );
120
  self::send_mail_to_admin( $email, $username, $user_id, $data_html, $name_value, $attachments );
 
 
121
  }
122
  }
 
123
  /**
124
  * @param string $email
125
  * @param string $username
30
  return;
31
  }
32
 
33
+ add_action( 'user_registration_email_send_before', array( __CLASS__, 'ur_send_email_before' ) );
34
+ add_action( 'user_registration_email_send_after', array( __CLASS__, 'ur_send_email_after' ) );
35
 
36
  add_action( 'user_registration_after_register_user_action', array(
37
  __CLASS__,
39
  ), 10, 3 );
40
  }
41
 
42
+ /**
43
+ * Apply filters to modify sender's details before email is sent.
44
+ */
45
+ public static function ur_send_email_before() {
46
+ add_filter( 'wp_mail_from', array( __CLASS__, 'ur_sender_email' ) );
47
+ add_filter( 'wp_mail_from_name', array( __CLASS__, 'ur_sender_name' ) );
48
+ }
49
+
50
+ /**
51
+ * Remove filters after the email is sent.
52
+ */
53
+ public static function ur_send_email_after() {
54
+ remove_filter( 'wp_mail_from', array( __CLASS__, 'ur_sender_email' ) );
55
+ remove_filter( 'wp_mail_from_name', array( __CLASS__, 'ur_sender_name' ) );
56
+ }
57
+
58
+
59
  /**
60
  * @return string sender's email
61
  */
133
  $username = isset( $user_login_object->value ) && ! empty( $user_login_object->value ) ? $user_login_object->value : '';
134
 
135
  if ( ! empty( $email ) && ! empty( $user_id ) ) {
136
+
137
+ do_action( 'user_registration_email_send_before' );
138
+
139
  self::send_mail_to_user( $email, $username, $user_id, $data_html, $name_value, $attachments );
140
  self::send_mail_to_admin( $email, $username, $user_id, $data_html, $name_value, $attachments );
141
+
142
+ do_action( 'user_registration_email_send_after' );
143
  }
144
  }
145
+
146
  /**
147
  * @param string $email
148
  * @param string $username
includes/class-ur-frontend-scripts.php CHANGED
@@ -63,19 +63,6 @@ class UR_Frontend_Scripts {
63
  'media' => 'all',
64
  'has_rtl' => true,
65
  ),
66
- 'jquery-ui-css' => array(
67
- 'src' => self::get_asset_url( 'assets/css/jquery-ui/jquery-ui.css' ),
68
- 'deps' => '',
69
- 'version' => '1.12.1',
70
- 'media' => 'all',
71
- ),
72
- 'flatpickr' => array(
73
- 'src' => self::get_asset_url( 'assets/css/flatpickr/flatpickr.min.css' ),
74
- 'deps' => array(),
75
- 'version' => '4.5.1',
76
- 'media' => 'all',
77
- 'has_rtl' => false,
78
- ),
79
  'user-registration-smallscreen' => array(
80
  'src' => self::get_asset_url( 'assets/css/user-registration-smallscreen.css' ),
81
  'deps' => '',
@@ -204,7 +191,7 @@ class UR_Frontend_Scripts {
204
  ),
205
  'user-registration' => array(
206
  'src' => self::get_asset_url( 'assets/js/frontend/user-registration' . $suffix . '.js' ),
207
- 'deps' => array( 'jquery' , 'flatpickr','ur-jquery-validate'),
208
  'version' => UR_VERSION,
209
  ),
210
  'ur-lost-password' => array(
@@ -234,6 +221,20 @@ class UR_Frontend_Scripts {
234
  */
235
  private static function register_styles() {
236
  $register_styles = array(
 
 
 
 
 
 
 
 
 
 
 
 
 
 
237
  'select2' => array(
238
  'src' => self::get_asset_url( 'assets/css/select2.css' ),
239
  'deps' => array(),
@@ -259,12 +260,6 @@ class UR_Frontend_Scripts {
259
  self::register_scripts();
260
  self::register_styles();
261
 
262
- if ( is_ur_account_page() || ur_post_content_has_shortcode( 'user_registration_form' ) || ur_post_content_has_shortcode( 'user_registration_login' ) ) {
263
- self::enqueue_script( 'flatpickr' );
264
- self::enqueue_script( 'ur-inputmask' );
265
- self::enqueue_script( 'user-registration' );
266
- }
267
-
268
  if ( is_ur_lost_password_page() ) {
269
  self::enqueue_script( 'ur-lost-password' );
270
  }
@@ -275,13 +270,12 @@ class UR_Frontend_Scripts {
275
  if ( ! isset( $args['has_rtl'] ) ) {
276
  $args['has_rtl'] = false;
277
  }
278
- if ( is_ur_account_page() || ur_post_content_has_shortcode( 'user_registration_form' ) ||ur_post_content_has_shortcode( 'user_registration_login' ) ) {
279
- self::enqueue_style( $handle, $args['src'], $args['deps'], $args['version'], $args['media'], $args['has_rtl'] );
280
- }
281
  }
282
  }
283
- wp_enqueue_style( 'dashicons' );
284
 
 
285
  }
286
 
287
  /**
63
  'media' => 'all',
64
  'has_rtl' => true,
65
  ),
 
 
 
 
 
 
 
 
 
 
 
 
 
66
  'user-registration-smallscreen' => array(
67
  'src' => self::get_asset_url( 'assets/css/user-registration-smallscreen.css' ),
68
  'deps' => '',
191
  ),
192
  'user-registration' => array(
193
  'src' => self::get_asset_url( 'assets/js/frontend/user-registration' . $suffix . '.js' ),
194
+ 'deps' => array( 'jquery' , 'flatpickr','ur-jquery-validate', 'ur-inputmask' ),
195
  'version' => UR_VERSION,
196
  ),
197
  'ur-lost-password' => array(
221
  */
222
  private static function register_styles() {
223
  $register_styles = array(
224
+ 'jquery-ui-css' => array(
225
+ 'src' => self::get_asset_url( 'assets/css/jquery-ui/jquery-ui.css' ),
226
+ 'deps' => '',
227
+ 'version' => '1.12.1',
228
+ 'media' => 'all',
229
+ 'has_rtl' => false,
230
+ ),
231
+ 'flatpickr' => array(
232
+ 'src' => self::get_asset_url( 'assets/css/flatpickr/flatpickr.min.css' ),
233
+ 'deps' => array(),
234
+ 'version' => '4.5.1',
235
+ 'media' => 'all',
236
+ 'has_rtl' => false,
237
+ ),
238
  'select2' => array(
239
  'src' => self::get_asset_url( 'assets/css/select2.css' ),
240
  'deps' => array(),
260
  self::register_scripts();
261
  self::register_styles();
262
 
 
 
 
 
 
 
263
  if ( is_ur_lost_password_page() ) {
264
  self::enqueue_script( 'ur-lost-password' );
265
  }
270
  if ( ! isset( $args['has_rtl'] ) ) {
271
  $args['has_rtl'] = false;
272
  }
273
+
274
+ self::enqueue_style( $handle, $args['src'], $args['deps'], $args['version'], $args['media'], $args['has_rtl'] );
 
275
  }
276
  }
 
277
 
278
+ wp_enqueue_style( 'dashicons' );
279
  }
280
 
281
  /**
includes/class-ur-shortcodes.php CHANGED
@@ -95,6 +95,7 @@ class UR_Shortcodes {
95
  * @param mixed $atts
96
  */
97
  public static function form( $atts ) {
 
98
  if ( empty( $atts ) || ! isset( $atts['id'] ) ) {
99
  return '';
100
  }
@@ -157,6 +158,10 @@ class UR_Shortcodes {
157
  $is_field_exists = false;
158
  $enable_strong_password = ur_get_single_post_meta( $form_id, 'user_registration_form_setting_enable_strong_password' );
159
 
 
 
 
 
160
  if ( 'yes' === $enable_strong_password ) {
161
  wp_enqueue_script( 'ur-password-strength-meter' );
162
  wp_localize_script( 'ur-password-strength-meter', 'enable_strong_password', $enable_strong_password );
95
  * @param mixed $atts
96
  */
97
  public static function form( $atts ) {
98
+
99
  if ( empty( $atts ) || ! isset( $atts['id'] ) ) {
100
  return '';
101
  }
158
  $is_field_exists = false;
159
  $enable_strong_password = ur_get_single_post_meta( $form_id, 'user_registration_form_setting_enable_strong_password' );
160
 
161
+ // Enqueue script.
162
+ wp_enqueue_style( 'flatpickr' );
163
+ wp_enqueue_script( 'user-registration' );
164
+
165
  if ( 'yes' === $enable_strong_password ) {
166
  wp_enqueue_script( 'ur-password-strength-meter' );
167
  wp_localize_script( 'ur-password-strength-meter', 'enable_strong_password', $enable_strong_password );
includes/form/class-ur-form-field-checkbox.php CHANGED
@@ -57,11 +57,12 @@ class UR_Form_Field_Checkbox extends UR_Form_Field {
57
  * @param $form_id
58
  */
59
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
 
60
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
61
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
62
  $value = isset( $form_data->value ) ? $form_data->value : '';
63
 
64
- if ( 'yes' == $required && empty( $value ) ) {
65
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
66
  return __( $field_label . ' is required.', 'user-registration' );
67
  });
57
  * @param $form_id
58
  */
59
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
60
+ $is_condition_enabled = isset( $single_form_field->advance_setting->enable_conditional_logic ) ? $single_form_field->advance_setting->enable_conditional_logic : '0';
61
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
62
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
63
  $value = isset( $form_data->value ) ? $form_data->value : '';
64
 
65
+ if ( $is_condition_enabled !== '1' && 'yes' == $required && empty( $value ) ) {
66
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
67
  return __( $field_label . ' is required.', 'user-registration' );
68
  });
includes/form/class-ur-form-field-country.php CHANGED
@@ -303,11 +303,12 @@ class UR_Form_Field_Country extends UR_Form_Field {
303
  }
304
 
305
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
 
306
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
307
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
308
  $value = isset( $form_data->value ) ? $form_data->value : '';
309
 
310
- if ( 'yes' == $required && empty( $value ) ) {
311
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
312
  return __( $field_label . ' is required.', 'user-registration' );
313
  });
303
  }
304
 
305
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
306
+ $is_condition_enabled = isset( $single_form_field->advance_setting->enable_conditional_logic ) ? $single_form_field->advance_setting->enable_conditional_logic : '0';
307
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
308
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
309
  $value = isset( $form_data->value ) ? $form_data->value : '';
310
 
311
+ if ( $is_condition_enabled !== '1' && 'yes' == $required && empty( $value ) ) {
312
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
313
  return __( $field_label . ' is required.', 'user-registration' );
314
  });
includes/form/class-ur-form-field-date.php CHANGED
@@ -51,11 +51,12 @@ class UR_Form_Field_Date extends UR_Form_Field {
51
 
52
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
53
 
 
54
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
55
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
56
  $value = isset( $form_data->value ) ? $form_data->value : '';
57
 
58
- if ( 'yes' == $required && empty( $value ) ) {
59
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
60
  return __( $field_label . ' is required.', 'user-registration' );
61
  });
51
 
52
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
53
 
54
+ $is_condition_enabled = isset( $single_form_field->advance_setting->enable_conditional_logic ) ? $single_form_field->advance_setting->enable_conditional_logic : '0';
55
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
56
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
57
  $value = isset( $form_data->value ) ? $form_data->value : '';
58
 
59
+ if ( $is_condition_enabled !== '1' && 'yes' == $required && empty( $value ) ) {
60
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
61
  return __( $field_label . ' is required.', 'user-registration' );
62
  });
includes/form/class-ur-form-field-description.php CHANGED
@@ -49,11 +49,12 @@ class UR_Form_Field_Description extends UR_Form_Field {
49
  }
50
 
51
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
 
52
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
53
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
54
  $value = isset( $form_data->value ) ? $form_data->value : '';
55
 
56
- if ( 'yes' == $required && empty( $value ) ) {
57
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
58
  return __( $field_label . ' is required.', 'user-registration' );
59
  });
49
  }
50
 
51
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
52
+ $is_condition_enabled = isset( $single_form_field->advance_setting->enable_conditional_logic ) ? $single_form_field->advance_setting->enable_conditional_logic : '0';
53
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
54
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
55
  $value = isset( $form_data->value ) ? $form_data->value : '';
56
 
57
+ if ( $is_condition_enabled !== '1' && 'yes' == $required && empty( $value ) ) {
58
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
59
  return __( $field_label . ' is required.', 'user-registration' );
60
  });
includes/form/class-ur-form-field-display-name.php CHANGED
@@ -48,12 +48,12 @@ class UR_Form_Field_Display_Name extends UR_Form_Field {
48
  }
49
 
50
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
51
-
52
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
53
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
54
  $value = isset( $form_data->value ) ? $form_data->value : '';
55
 
56
- if ( 'yes' == $required && empty( $value ) ) {
57
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
58
  return __( $field_label . ' is required.', 'user-registration' );
59
  });
48
  }
49
 
50
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
51
+ $is_condition_enabled = isset( $single_form_field->advance_setting->enable_conditional_logic ) ? $single_form_field->advance_setting->enable_conditional_logic : '0';
52
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
53
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
54
  $value = isset( $form_data->value ) ? $form_data->value : '';
55
 
56
+ if ( $is_condition_enabled !== '1' && 'yes' == $required && empty( $value ) ) {
57
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
58
  return __( $field_label . ' is required.', 'user-registration' );
59
  });
includes/form/class-ur-form-field-email.php CHANGED
@@ -48,12 +48,12 @@ class UR_Form_Field_Email extends UR_Form_Field {
48
  }
49
 
50
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
51
-
52
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
53
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
54
  $value = isset( $form_data->value ) ? $form_data->value : '';
55
 
56
- if ( 'yes' == $required && empty( $value ) ) {
57
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
58
  return __( $field_label . ' is required.', 'user-registration' );
59
  });
48
  }
49
 
50
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
51
+ $is_condition_enabled = isset( $single_form_field->advance_setting->enable_conditional_logic ) ? $single_form_field->advance_setting->enable_conditional_logic : '0';
52
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
53
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
54
  $value = isset( $form_data->value ) ? $form_data->value : '';
55
 
56
+ if ( $is_condition_enabled !== '1' && 'yes' == $required && empty( $value ) ) {
57
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
58
  return __( $field_label . ' is required.', 'user-registration' );
59
  });
includes/form/class-ur-form-field-first-name.php CHANGED
@@ -48,11 +48,12 @@ class UR_Form_Field_First_Name extends UR_Form_Field {
48
  }
49
 
50
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
 
51
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
52
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
53
  $value = isset( $form_data->value ) ? $form_data->value : '';
54
 
55
- if ( 'yes' == $required && empty( $value ) ) {
56
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
57
  return __( $field_label . ' is required.', 'user-registration' );
58
  });
48
  }
49
 
50
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
51
+ $is_condition_enabled = isset( $single_form_field->advance_setting->enable_conditional_logic ) ? $single_form_field->advance_setting->enable_conditional_logic : '0';
52
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
53
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
54
  $value = isset( $form_data->value ) ? $form_data->value : '';
55
 
56
+ if ( $is_condition_enabled !== '1' && 'yes' == $required && empty( $value ) ) {
57
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
58
  return __( $field_label . ' is required.', 'user-registration' );
59
  });
includes/form/class-ur-form-field-last-name.php CHANGED
@@ -48,11 +48,12 @@ class UR_Form_Field_Last_Name extends UR_Form_Field {
48
  }
49
 
50
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
 
51
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
52
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
53
  $value = isset( $form_data->value ) ? $form_data->value : '';
54
 
55
- if ( 'yes' == $required && empty( $value ) ) {
56
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
57
  return __( $field_label . ' is required.', 'user-registration' );
58
  });
48
  }
49
 
50
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
51
+ $is_condition_enabled = isset( $single_form_field->advance_setting->enable_conditional_logic ) ? $single_form_field->advance_setting->enable_conditional_logic : '0';
52
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
53
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
54
  $value = isset( $form_data->value ) ? $form_data->value : '';
55
 
56
+ if ( $is_condition_enabled !== '1' && 'yes' == $required && empty( $value ) ) {
57
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
58
  return __( $field_label . ' is required.', 'user-registration' );
59
  });
includes/form/class-ur-form-field-nickname.php CHANGED
@@ -50,11 +50,12 @@ class UR_Form_Field_Nickname extends UR_Form_Field {
50
 
51
 
52
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
 
53
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
54
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
55
  $value = isset( $form_data->value ) ? $form_data->value : '';
56
 
57
- if ( 'yes' == $required && empty( $value ) ) {
58
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
59
  return __( $field_label . ' is required.', 'user-registration' );
60
  });
50
 
51
 
52
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
53
+ $is_condition_enabled = isset( $single_form_field->advance_setting->enable_conditional_logic ) ? $single_form_field->advance_setting->enable_conditional_logic : '0';
54
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
55
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
56
  $value = isset( $form_data->value ) ? $form_data->value : '';
57
 
58
+ if ( $is_condition_enabled !== '1' && 'yes' == $required && empty( $value ) ) {
59
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
60
  return __( $field_label . ' is required.', 'user-registration' );
61
  });
includes/form/class-ur-form-field-number.php CHANGED
@@ -50,11 +50,12 @@ class UR_Form_Field_Number extends UR_Form_Field {
50
  }
51
 
52
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
 
53
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
54
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
55
  $value = isset( $form_data->value ) ? $form_data->value : '';
56
 
57
- if ( 'yes' == $required && empty( $value ) ) {
58
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
59
  return __( $field_label . ' is required.', 'user-registration' );
60
  });
50
  }
51
 
52
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
53
+ $is_condition_enabled = isset( $single_form_field->advance_setting->enable_conditional_logic ) ? $single_form_field->advance_setting->enable_conditional_logic : '0';
54
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
55
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
56
  $value = isset( $form_data->value ) ? $form_data->value : '';
57
 
58
+ if ( $is_condition_enabled !== '1' && 'yes' == $required && empty( $value ) ) {
59
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
60
  return __( $field_label . ' is required.', 'user-registration' );
61
  });
includes/form/class-ur-form-field-password.php CHANGED
@@ -50,11 +50,12 @@ class UR_Form_Field_Password extends UR_Form_Field {
50
 
51
 
52
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
 
53
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
54
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
55
  $value = isset( $form_data->value ) ? $form_data->value : '';
56
 
57
- if ( 'yes' == $required && empty( $value ) ) {
58
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
59
  return __( $field_label . ' is required.', 'user-registration' );
60
  });
50
 
51
 
52
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
53
+ $is_condition_enabled = isset( $single_form_field->advance_setting->enable_conditional_logic ) ? $single_form_field->advance_setting->enable_conditional_logic : '0';
54
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
55
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
56
  $value = isset( $form_data->value ) ? $form_data->value : '';
57
 
58
+ if ( $is_condition_enabled !== '1' && 'yes' == $required && empty( $value ) ) {
59
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
60
  return __( $field_label . ' is required.', 'user-registration' );
61
  });
includes/form/class-ur-form-field-privacy-policy.php CHANGED
@@ -58,11 +58,12 @@ class UR_Form_Field_Privacy_Policy extends UR_Form_Field {
58
  * @param $form_id
59
  */
60
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
 
61
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
62
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
63
  $value = isset( $form_data->value ) ? $form_data->value : '';
64
 
65
- if ( 'yes' == $required && empty( $value ) ) {
66
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
67
  return __( $field_label . ' is required.', 'user-registration' );
68
  });
58
  * @param $form_id
59
  */
60
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
61
+ $is_condition_enabled = isset( $single_form_field->advance_setting->enable_conditional_logic ) ? $single_form_field->advance_setting->enable_conditional_logic : '0';
62
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
63
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
64
  $value = isset( $form_data->value ) ? $form_data->value : '';
65
 
66
+ if ( $is_condition_enabled !== '1' && 'yes' == $required && empty( $value ) ) {
67
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
68
  return __( $field_label . ' is required.', 'user-registration' );
69
  });
includes/form/class-ur-form-field-radio.php CHANGED
@@ -53,11 +53,12 @@ class UR_Form_Field_Radio extends UR_Form_Field {
53
 
54
 
55
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
 
56
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
57
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
58
  $value = isset( $form_data->value ) ? $form_data->value : '';
59
 
60
- if ( 'yes' == $required && empty( $value ) ) {
61
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
62
  return __( $field_label . ' is required.', 'user-registration' );
63
  });
53
 
54
 
55
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
56
+ $is_condition_enabled = isset( $single_form_field->advance_setting->enable_conditional_logic ) ? $single_form_field->advance_setting->enable_conditional_logic : '0';
57
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
58
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
59
  $value = isset( $form_data->value ) ? $form_data->value : '';
60
 
61
+ if ( $is_condition_enabled !== '1' && 'yes' == $required && empty( $value ) ) {
62
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
63
  return __( $field_label . ' is required.', 'user-registration' );
64
  });
includes/form/class-ur-form-field-select.php CHANGED
@@ -48,11 +48,12 @@ class UR_Form_Field_Select extends UR_Form_Field {
48
  }
49
 
50
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
 
51
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
52
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
53
  $value = isset( $form_data->value ) ? $form_data->value : '';
54
 
55
- if ( 'yes' == $required && empty( $value ) ) {
56
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
57
  return __( $field_label . ' is required.', 'user-registration' );
58
  });
48
  }
49
 
50
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
51
+ $is_condition_enabled = isset( $single_form_field->advance_setting->enable_conditional_logic ) ? $single_form_field->advance_setting->enable_conditional_logic : '0';
52
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
53
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
54
  $value = isset( $form_data->value ) ? $form_data->value : '';
55
 
56
+ if ( $is_condition_enabled !== '1' && 'yes' == $required && empty( $value ) ) {
57
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
58
  return __( $field_label . ' is required.', 'user-registration' );
59
  });
includes/form/class-ur-form-field-text.php CHANGED
@@ -48,11 +48,14 @@ class UR_Form_Field_Text extends UR_Form_Field {
48
  }
49
 
50
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
 
 
 
51
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
52
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
53
  $value = isset( $form_data->value ) ? $form_data->value : '';
54
 
55
- if ( 'yes' == $required && empty( $value ) ) {
56
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
57
  return __( $field_label . ' is required.', 'user-registration' );
58
  });
48
  }
49
 
50
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
51
+
52
+ $is_condition_enabled = isset( $single_form_field->advance_setting->enable_conditional_logic ) ? $single_form_field->advance_setting->enable_conditional_logic : '0';
53
+
54
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
55
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
56
  $value = isset( $form_data->value ) ? $form_data->value : '';
57
 
58
+ if ( $is_condition_enabled !== '1' && 'yes' == $required && empty( $value ) ) {
59
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
60
  return __( $field_label . ' is required.', 'user-registration' );
61
  });
includes/form/class-ur-form-field-textarea.php CHANGED
@@ -49,11 +49,13 @@ class UR_Form_Field_Textarea extends UR_Form_Field {
49
 
50
 
51
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
 
 
52
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
53
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
54
  $value = isset( $form_data->value ) ? $form_data->value : '';
55
 
56
- if ( 'yes' == $required && empty( $value ) ) {
57
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
58
  return __( $field_label . ' is required.', 'user-registration' );
59
  });
49
 
50
 
51
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
52
+
53
+ $is_condition_enabled = isset( $single_form_field->advance_setting->enable_conditional_logic ) ? $single_form_field->advance_setting->enable_conditional_logic : '0';
54
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
55
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
56
  $value = isset( $form_data->value ) ? $form_data->value : '';
57
 
58
+ if ( $is_condition_enabled !== '1' && 'yes' == $required && empty( $value ) ) {
59
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
60
  return __( $field_label . ' is required.', 'user-registration' );
61
  });
includes/form/class-ur-form-field-user-url.php CHANGED
@@ -49,11 +49,13 @@ class UR_Form_Field_User_Url extends UR_Form_Field {
49
 
50
 
51
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
 
 
52
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
53
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
54
  $value = isset( $form_data->value ) ? $form_data->value : '';
55
 
56
- if ( 'yes' == $required && empty( $value ) ) {
57
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
58
  return __( $field_label . ' is required.', 'user-registration' );
59
  });
49
 
50
 
51
  public function validation( $single_form_field, $form_data, $filter_hook, $form_id ) {
52
+
53
+ $is_condition_enabled = isset( $single_form_field->advance_setting->enable_conditional_logic ) ? $single_form_field->advance_setting->enable_conditional_logic : '0';
54
  $required = isset( $single_form_field->general_setting->required ) ? $single_form_field->general_setting->required : 'no';
55
  $field_label = isset( $form_data->label ) ? $form_data->label : '';
56
  $value = isset( $form_data->value ) ? $form_data->value : '';
57
 
58
+ if ( $is_condition_enabled !== '1' && 'yes' == $required && empty( $value ) ) {
59
  add_filter( $filter_hook, function ( $msg ) use ( $field_label ) {
60
  return __( $field_label . ' is required.', 'user-registration' );
61
  });
includes/shortcodes/class-ur-shortcode-my-account.php CHANGED
@@ -39,6 +39,10 @@ class UR_Shortcode_My_Account {
39
 
40
  global $wp, $post;
41
 
 
 
 
 
42
  if ( ! is_user_logged_in() ) {
43
  $message = apply_filters( 'user_registration_my_account_message', '' );
44
 
39
 
40
  global $wp, $post;
41
 
42
+ // Enqueue script.
43
+ wp_enqueue_style( 'flatpickr' );
44
+ wp_enqueue_script( 'user-registration' );
45
+
46
  if ( ! is_user_logged_in() ) {
47
  $message = apply_filters( 'user_registration_my_account_message', '' );
48
 
languages/user-registration.pot CHANGED
@@ -2,9 +2,9 @@
2
  # This file is distributed under the same license as the User Registration package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: User Registration 1.4.5\n"
6
  "Report-Msgid-Bugs-To: wpeverest@gmail.com\n"
7
- "POT-Creation-Date: 2018-08-20 08:52:10+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=utf-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -569,7 +569,7 @@ msgid ""
569
  msgstr ""
570
 
571
  #: includes/admin/settings/class-ur-settings-general.php:227
572
- #: includes/class-ur-frontend-scripts.php:328
573
  msgid "User successfully registered."
574
  msgstr ""
575
 
@@ -585,7 +585,7 @@ msgid ""
585
  msgstr ""
586
 
587
  #: includes/admin/settings/class-ur-settings-general.php:237
588
- #: includes/class-ur-frontend-scripts.php:330
589
  msgid ""
590
  "User registered. Verify your email by clicking on the link sent to your "
591
  "email."
@@ -603,7 +603,7 @@ msgid ""
603
  msgstr ""
604
 
605
  #: includes/admin/settings/class-ur-settings-general.php:247
606
- #: includes/class-ur-frontend-scripts.php:329
607
  msgid "User registered. Wait until admin approves your registration."
608
  msgstr ""
609
 
@@ -621,7 +621,7 @@ msgid "Enter the error message in form submission on required fields."
621
  msgstr ""
622
 
623
  #: includes/admin/settings/class-ur-settings-general.php:269
624
- #: includes/class-ur-frontend-scripts.php:322
625
  msgid "This field is required."
626
  msgstr ""
627
 
@@ -630,7 +630,7 @@ msgid "Enter the error message in form submission on Email."
630
  msgstr ""
631
 
632
  #: includes/admin/settings/class-ur-settings-general.php:279
633
- #: includes/class-ur-frontend-scripts.php:323
634
  msgid "Please enter a valid email address."
635
  msgstr ""
636
 
@@ -643,7 +643,7 @@ msgid "Enter the error message in form submission on website/URL."
643
  msgstr ""
644
 
645
  #: includes/admin/settings/class-ur-settings-general.php:289
646
- #: includes/class-ur-frontend-scripts.php:324
647
  msgid "Please enter a valid URL."
648
  msgstr ""
649
 
@@ -658,7 +658,7 @@ msgid "Enter the error message in form submission on Number."
658
  msgstr ""
659
 
660
  #: includes/admin/settings/class-ur-settings-general.php:299
661
- #: includes/class-ur-frontend-scripts.php:325
662
  msgid "Please enter a valid number."
663
  msgstr ""
664
 
@@ -672,7 +672,7 @@ msgid "Enter the error message in form submission on Confim Password."
672
  msgstr ""
673
 
674
  #: includes/admin/settings/class-ur-settings-general.php:309
675
- #: includes/class-ur-frontend-scripts.php:326
676
  msgid "Password and confirm password not matched."
677
  msgstr ""
678
 
@@ -685,7 +685,7 @@ msgid "Enter the error message in form submission on google recaptcha."
685
  msgstr ""
686
 
687
  #: includes/admin/settings/class-ur-settings-general.php:319
688
- #: includes/class-ur-frontend-scripts.php:331
689
  msgid "Captcha code error, please try again."
690
  msgstr ""
691
 
@@ -778,7 +778,7 @@ msgid "The email subject you want to customize."
778
  msgstr ""
779
 
780
  #: includes/admin/settings/emails/class-ur-settings-admin-email.php:68
781
- #: includes/class-ur-emailer.php:219
782
  msgid "A New User Registered"
783
  msgstr ""
784
 
@@ -836,7 +836,7 @@ msgid ""
836
  msgstr ""
837
 
838
  #: includes/admin/settings/emails/class-ur-settings-awaiting-admin-approval-email.php:59
839
- #: includes/class-ur-emailer.php:162
840
  msgid "Thank you for registration on {{blog_info}}"
841
  msgstr ""
842
 
@@ -865,7 +865,7 @@ msgid ""
865
  msgstr ""
866
 
867
  #: includes/admin/settings/emails/class-ur-settings-email-confirmation.php:51
868
- #: includes/class-ur-emailer.php:150
869
  msgid "Please confirm your registration on {{blog_info}}"
870
  msgstr ""
871
 
@@ -899,7 +899,7 @@ msgid "Enable this email sent to admin after successfull user registration."
899
  msgstr ""
900
 
901
  #: includes/admin/settings/emails/class-ur-settings-registration-approved-email.php:59
902
- #: includes/class-ur-emailer.php:284
903
  msgid "Congratulations! Registration approved on {{blog_info}}"
904
  msgstr ""
905
 
@@ -927,7 +927,7 @@ msgid "Email sent to the user notifying the registration is denied by the admin"
927
  msgstr ""
928
 
929
  #: includes/admin/settings/emails/class-ur-settings-registration-denied-email.php:59
930
- #: includes/class-ur-emailer.php:176 includes/class-ur-emailer.php:271
931
  msgid "Sorry! Registration denied on {{blog_info}}"
932
  msgstr ""
933
 
@@ -954,7 +954,7 @@ msgid "Email sent to the user notifying the registration is pending"
954
  msgstr ""
955
 
956
  #: includes/admin/settings/emails/class-ur-settings-registration-pending-email.php:59
957
- #: includes/class-ur-emailer.php:258
958
  msgid "Sorry! Registration changed to pending on {{blog_info}}"
959
  msgstr ""
960
 
@@ -986,7 +986,7 @@ msgid "Enable this email sent to the user when a user requests for reset passwor
986
  msgstr ""
987
 
988
  #: includes/admin/settings/emails/class-ur-settings-reset-password-email.php:57
989
- #: includes/class-ur-emailer.php:313
990
  msgid "Password Reset Email: {{blog_info}}"
991
  msgstr ""
992
 
@@ -1020,7 +1020,7 @@ msgid "Enable this email sent after successful user registration."
1020
  msgstr ""
1021
 
1022
  #: includes/admin/settings/emails/class-ur-settings-successfully-registered-email.php:59
1023
- #: includes/class-ur-emailer.php:188
1024
  msgid "Congratulations! Registration Complete on {{blog_info}}"
1025
  msgstr ""
1026
 
@@ -1215,19 +1215,19 @@ msgstr ""
1215
  msgid "Nonce error, please reload."
1216
  msgstr ""
1217
 
1218
- #: includes/class-ur-ajax.php:79 includes/class-ur-shortcodes.php:106
1219
  msgid "Only administrators can add new users."
1220
  msgstr ""
1221
 
1222
- #: includes/class-ur-ajax.php:95 includes/class-ur-shortcodes.php:120
1223
  msgid "You are currently logged in as %1s. %2s"
1224
  msgstr ""
1225
 
1226
- #: includes/class-ur-ajax.php:95 includes/class-ur-shortcodes.php:120
1227
  msgid "Log out of this account."
1228
  msgstr ""
1229
 
1230
- #: includes/class-ur-ajax.php:95 includes/class-ur-shortcodes.php:120
1231
  #: includes/functions-ur-account.php:86
1232
  msgid "Logout"
1233
  msgstr ""
@@ -1289,7 +1289,7 @@ msgid ""
1289
  "email."
1290
  msgstr ""
1291
 
1292
- #: includes/class-ur-emailer.php:93
1293
  msgid "Chosen Password"
1294
  msgstr ""
1295
 
@@ -1345,31 +1345,31 @@ msgstr ""
1345
  msgid "Passwords do not match."
1346
  msgstr ""
1347
 
1348
- #: includes/class-ur-frontend-scripts.php:340
1349
  msgid "Confirm password"
1350
  msgstr ""
1351
 
1352
- #: includes/class-ur-frontend-scripts.php:342
1353
  msgid "Too short password"
1354
  msgstr ""
1355
 
1356
- #: includes/class-ur-frontend-scripts.php:343
1357
  msgid "Bad password"
1358
  msgstr ""
1359
 
1360
- #: includes/class-ur-frontend-scripts.php:344
1361
  msgid "Good password"
1362
  msgstr ""
1363
 
1364
- #: includes/class-ur-frontend-scripts.php:345
1365
  msgid "Strong password"
1366
  msgstr ""
1367
 
1368
- #: includes/class-ur-frontend-scripts.php:346
1369
  msgid "Password with confirm password not matched."
1370
  msgstr ""
1371
 
1372
- #: includes/class-ur-frontend-scripts.php:349
1373
  msgid ""
1374
  "Hint: The password should be at least seven characters long. To make it "
1375
  "stronger, use upper and lower case letters, numbers and symbols such as ! * "
@@ -2868,28 +2868,28 @@ msgstr ""
2868
  msgid "You are already logged in. <a href=\"%s\">Log out?</a>"
2869
  msgstr ""
2870
 
2871
- #: includes/shortcodes/class-ur-shortcode-my-account.php:51
2872
  msgid "Your password has been reset successfully."
2873
  msgstr ""
2874
 
2875
- #: includes/shortcodes/class-ur-shortcode-my-account.php:64
2876
  msgid "Are you sure you want to log out? <a href=\"%s\">Confirm and log out</a>"
2877
  msgstr ""
2878
 
2879
- #: includes/shortcodes/class-ur-shortcode-my-account.php:194
2880
  msgid "Enter a username or email address."
2881
  msgstr ""
2882
 
2883
- #: includes/shortcodes/class-ur-shortcode-my-account.php:215
2884
- #: includes/shortcodes/class-ur-shortcode-my-account.php:220
2885
  msgid "Invalid username or email."
2886
  msgstr ""
2887
 
2888
- #: includes/shortcodes/class-ur-shortcode-my-account.php:230
2889
  msgid "Password reset is not allowed for this user"
2890
  msgstr ""
2891
 
2892
- #: includes/shortcodes/class-ur-shortcode-my-account.php:243
2893
  msgid "The email could not be sent. Contact your site administrator. "
2894
  msgstr ""
2895
 
2
  # This file is distributed under the same license as the User Registration package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: User Registration 1.4.6\n"
6
  "Report-Msgid-Bugs-To: wpeverest@gmail.com\n"
7
+ "POT-Creation-Date: 2018-08-31 06:42:13+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=utf-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
569
  msgstr ""
570
 
571
  #: includes/admin/settings/class-ur-settings-general.php:227
572
+ #: includes/class-ur-frontend-scripts.php:322
573
  msgid "User successfully registered."
574
  msgstr ""
575
 
585
  msgstr ""
586
 
587
  #: includes/admin/settings/class-ur-settings-general.php:237
588
+ #: includes/class-ur-frontend-scripts.php:324
589
  msgid ""
590
  "User registered. Verify your email by clicking on the link sent to your "
591
  "email."
603
  msgstr ""
604
 
605
  #: includes/admin/settings/class-ur-settings-general.php:247
606
+ #: includes/class-ur-frontend-scripts.php:323
607
  msgid "User registered. Wait until admin approves your registration."
608
  msgstr ""
609
 
621
  msgstr ""
622
 
623
  #: includes/admin/settings/class-ur-settings-general.php:269
624
+ #: includes/class-ur-frontend-scripts.php:316
625
  msgid "This field is required."
626
  msgstr ""
627
 
630
  msgstr ""
631
 
632
  #: includes/admin/settings/class-ur-settings-general.php:279
633
+ #: includes/class-ur-frontend-scripts.php:317
634
  msgid "Please enter a valid email address."
635
  msgstr ""
636
 
643
  msgstr ""
644
 
645
  #: includes/admin/settings/class-ur-settings-general.php:289
646
+ #: includes/class-ur-frontend-scripts.php:318
647
  msgid "Please enter a valid URL."
648
  msgstr ""
649
 
658
  msgstr ""
659
 
660
  #: includes/admin/settings/class-ur-settings-general.php:299
661
+ #: includes/class-ur-frontend-scripts.php:319
662
  msgid "Please enter a valid number."
663
  msgstr ""
664
 
672
  msgstr ""
673
 
674
  #: includes/admin/settings/class-ur-settings-general.php:309
675
+ #: includes/class-ur-frontend-scripts.php:320
676
  msgid "Password and confirm password not matched."
677
  msgstr ""
678
 
685
  msgstr ""
686
 
687
  #: includes/admin/settings/class-ur-settings-general.php:319
688
+ #: includes/class-ur-frontend-scripts.php:325
689
  msgid "Captcha code error, please try again."
690
  msgstr ""
691
 
778
  msgstr ""
779
 
780
  #: includes/admin/settings/emails/class-ur-settings-admin-email.php:68
781
+ #: includes/class-ur-emailer.php:242
782
  msgid "A New User Registered"
783
  msgstr ""
784
 
836
  msgstr ""
837
 
838
  #: includes/admin/settings/emails/class-ur-settings-awaiting-admin-approval-email.php:59
839
+ #: includes/class-ur-emailer.php:185
840
  msgid "Thank you for registration on {{blog_info}}"
841
  msgstr ""
842
 
865
  msgstr ""
866
 
867
  #: includes/admin/settings/emails/class-ur-settings-email-confirmation.php:51
868
+ #: includes/class-ur-emailer.php:173
869
  msgid "Please confirm your registration on {{blog_info}}"
870
  msgstr ""
871
 
899
  msgstr ""
900
 
901
  #: includes/admin/settings/emails/class-ur-settings-registration-approved-email.php:59
902
+ #: includes/class-ur-emailer.php:307
903
  msgid "Congratulations! Registration approved on {{blog_info}}"
904
  msgstr ""
905
 
927
  msgstr ""
928
 
929
  #: includes/admin/settings/emails/class-ur-settings-registration-denied-email.php:59
930
+ #: includes/class-ur-emailer.php:199 includes/class-ur-emailer.php:294
931
  msgid "Sorry! Registration denied on {{blog_info}}"
932
  msgstr ""
933
 
954
  msgstr ""
955
 
956
  #: includes/admin/settings/emails/class-ur-settings-registration-pending-email.php:59
957
+ #: includes/class-ur-emailer.php:281
958
  msgid "Sorry! Registration changed to pending on {{blog_info}}"
959
  msgstr ""
960
 
986
  msgstr ""
987
 
988
  #: includes/admin/settings/emails/class-ur-settings-reset-password-email.php:57
989
+ #: includes/class-ur-emailer.php:336
990
  msgid "Password Reset Email: {{blog_info}}"
991
  msgstr ""
992
 
1020
  msgstr ""
1021
 
1022
  #: includes/admin/settings/emails/class-ur-settings-successfully-registered-email.php:59
1023
+ #: includes/class-ur-emailer.php:211
1024
  msgid "Congratulations! Registration Complete on {{blog_info}}"
1025
  msgstr ""
1026
 
1215
  msgid "Nonce error, please reload."
1216
  msgstr ""
1217
 
1218
+ #: includes/class-ur-ajax.php:79 includes/class-ur-shortcodes.php:107
1219
  msgid "Only administrators can add new users."
1220
  msgstr ""
1221
 
1222
+ #: includes/class-ur-ajax.php:95 includes/class-ur-shortcodes.php:121
1223
  msgid "You are currently logged in as %1s. %2s"
1224
  msgstr ""
1225
 
1226
+ #: includes/class-ur-ajax.php:95 includes/class-ur-shortcodes.php:121
1227
  msgid "Log out of this account."
1228
  msgstr ""
1229
 
1230
+ #: includes/class-ur-ajax.php:95 includes/class-ur-shortcodes.php:121
1231
  #: includes/functions-ur-account.php:86
1232
  msgid "Logout"
1233
  msgstr ""
1289
  "email."
1290
  msgstr ""
1291
 
1292
+ #: includes/class-ur-emailer.php:110
1293
  msgid "Chosen Password"
1294
  msgstr ""
1295
 
1345
  msgid "Passwords do not match."
1346
  msgstr ""
1347
 
1348
+ #: includes/class-ur-frontend-scripts.php:334
1349
  msgid "Confirm password"
1350
  msgstr ""
1351
 
1352
+ #: includes/class-ur-frontend-scripts.php:336
1353
  msgid "Too short password"
1354
  msgstr ""
1355
 
1356
+ #: includes/class-ur-frontend-scripts.php:337
1357
  msgid "Bad password"
1358
  msgstr ""
1359
 
1360
+ #: includes/class-ur-frontend-scripts.php:338
1361
  msgid "Good password"
1362
  msgstr ""
1363
 
1364
+ #: includes/class-ur-frontend-scripts.php:339
1365
  msgid "Strong password"
1366
  msgstr ""
1367
 
1368
+ #: includes/class-ur-frontend-scripts.php:340
1369
  msgid "Password with confirm password not matched."
1370
  msgstr ""
1371
 
1372
+ #: includes/class-ur-frontend-scripts.php:343
1373
  msgid ""
1374
  "Hint: The password should be at least seven characters long. To make it "
1375
  "stronger, use upper and lower case letters, numbers and symbols such as ! * "
2868
  msgid "You are already logged in. <a href=\"%s\">Log out?</a>"
2869
  msgstr ""
2870
 
2871
+ #: includes/shortcodes/class-ur-shortcode-my-account.php:55
2872
  msgid "Your password has been reset successfully."
2873
  msgstr ""
2874
 
2875
+ #: includes/shortcodes/class-ur-shortcode-my-account.php:68
2876
  msgid "Are you sure you want to log out? <a href=\"%s\">Confirm and log out</a>"
2877
  msgstr ""
2878
 
2879
+ #: includes/shortcodes/class-ur-shortcode-my-account.php:198
2880
  msgid "Enter a username or email address."
2881
  msgstr ""
2882
 
2883
+ #: includes/shortcodes/class-ur-shortcode-my-account.php:219
2884
+ #: includes/shortcodes/class-ur-shortcode-my-account.php:224
2885
  msgid "Invalid username or email."
2886
  msgstr ""
2887
 
2888
+ #: includes/shortcodes/class-ur-shortcode-my-account.php:234
2889
  msgid "Password reset is not allowed for this user"
2890
  msgstr ""
2891
 
2892
+ #: includes/shortcodes/class-ur-shortcode-my-account.php:247
2893
  msgid "The email could not be sent. Contact your site administrator. "
2894
  msgstr ""
2895
 
package-lock.json CHANGED
@@ -1,6 +1,6 @@
1
  {
2
  "name": "user-registration",
3
- "version": "1.4.5",
4
  "lockfileVersion": 1,
5
  "requires": true,
6
  "dependencies": {
1
  {
2
  "name": "user-registration",
3
+ "version": "1.4.6",
4
  "lockfileVersion": 1,
5
  "requires": true,
6
  "dependencies": {
readme.txt CHANGED
@@ -1,10 +1,10 @@
1
- === User Registration - User Profile, Membership and More ===
2
  Contributors: WPEverest
3
- Tags: user registration, registration, profile-builder, user profile, form, registration form, login form, user login, membership
4
  Requires at least: 4.0
5
  Requires PHP: 5.4
6
  Tested up to: 4.9
7
- Stable tag: 1.4.5
8
  License: GPLv3
9
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
10
 
@@ -16,11 +16,11 @@ User Registration plugin provides you with an easy way to create frontend user r
16
 
17
  Supports frontend profile account page for profile edit, password change, Log out and more.
18
 
19
- View [All features](https://wpeverest.com/wordpress-plugins/user-registration/)
20
 
21
  View [Demo](http://demo.wpeverest.com/user-registration/)
22
 
23
- Get [free support](https://wpeverest.com/support-forum/)
24
 
25
  Check [documentation](http://docs.wpeverest.com/docs/user-registration/)
26
 
@@ -52,25 +52,25 @@ Check [documentation](http://docs.wpeverest.com/docs/user-registration/)
52
 
53
  User Registration can be easily extended with some premium addons.
54
 
55
- * [Social Connect](https://wpeverest.com/wordpress-plugins/user-registration/social-connect/) - Allows users to register/login to your site with social platforms like Facebook, Twitter, Google+ or LinkedIn.
56
 
57
- * [Content Restriction](https://wpeverest.com/wordpress-plugins/user-registration/content-restriction/) - Allows you to restrict full or partial content from page, post to only logged in users or logged in users with specific roles.
58
 
59
- * [File Upload](https://wpeverest.com/wordpress-plugins/user-registration/file-upload/) - Allows you to add upload field in registration form so that users can upload documents, images and more.
60
 
61
- * [WooCommerce Integration](https://wpeverest.com/wordpress-plugins/user-registration/woocommerce/) - Integrates and syncs WooCommerce related information to user registration account page like orders, customer details, Billings.
62
 
63
- * [MailChimp](https://wpeverest.com/wordpress-plugins/user-registration/mailchimp/) - Lets you sync your registered users with MailChimp list. Automatically add users to your selected MailChimp list upon registration.
64
 
65
- * [Advanced Fields](https://wpeverest.com/wordpress-plugins/user-registration/advanced-fields/) - Lets you add advanced extra fields such as WYSIWYG, Time picker, Phone Number, HTML, Section title in form.
66
 
67
- * [Conditional Logic](https://wpeverest.com/wordpress-plugins/user-registration/conditional-logic/) - Lets you apply conditions to your fields. Conditional Logic allows you to show or hide certain fields based upon other field’s value.
68
 
69
- * [Profile Connect](https://wpeverest.com/wordpress-plugins/user-registration/profile-connect/) - Allows admin to connect users registered via other forms to User Registration selected form.
70
 
71
- * [PDF Form Submission](https://wpeverest.com/wordpress-plugins/user-registration/pdf-form-submission/) - Lets you export user's data in PDF, PDF file as email attachment on form submission.
72
 
73
- * [Payments (PayPal)](https://wpeverest.com/wordpress-plugins/user-registration/payments/) - Integrates PayPal into your forms for registration fee payments, donations, and more.
74
 
75
  == Installation ==
76
 
@@ -104,6 +104,11 @@ Yes, the plugin is designed to work with any themes that have been coded followi
104
 
105
  == Changelog ==
106
 
 
 
 
 
 
107
  = 1.4.5 - 20/08/2018 =
108
  * Fix - Load user registration assets on login page.
109
  * Tweak - Form settings UI
1
+ === User Registration - Custom Registration Form, Login and User Profile for WordPress ===
2
  Contributors: WPEverest
3
+ Tags: user registration, registration, user profile, registration form, login form,
4
  Requires at least: 4.0
5
  Requires PHP: 5.4
6
  Tested up to: 4.9
7
+ Stable tag: 1.4.6
8
  License: GPLv3
9
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
10
 
16
 
17
  Supports frontend profile account page for profile edit, password change, Log out and more.
18
 
19
+ View [All features](https://wpeverest.com/wordpress-plugins/user-registration/?utm_source=wporg&utm_medium=link&utm_campaign=user-registration-readme)
20
 
21
  View [Demo](http://demo.wpeverest.com/user-registration/)
22
 
23
+ Get [free support](https://wpeverest.com/support-forum/?utm_source=wporg&utm_medium=link&utm_campaign=user-registration-readme)
24
 
25
  Check [documentation](http://docs.wpeverest.com/docs/user-registration/)
26
 
52
 
53
  User Registration can be easily extended with some premium addons.
54
 
55
+ * [Social Connect](https://wpeverest.com/wordpress-plugins/user-registration/social-connect/?utm_source=wporg&utm_medium=link&utm_campaign=user-registration-readme) - Allows users to register/login to your site with social platforms like Facebook, Twitter, Google+ or LinkedIn.
56
 
57
+ * [Content Restriction](https://wpeverest.com/wordpress-plugins/user-registration/content-restriction/?utm_source=wporg&utm_medium=link&utm_campaign=user-registration-readme) - Allows you to restrict full or partial content from page, post to only logged in users or logged in users with specific roles.
58
 
59
+ * [File Upload](https://wpeverest.com/wordpress-plugins/user-registration/file-upload/?utm_source=wporg&utm_medium=link&utm_campaign=user-registration-readme) - Allows you to add upload field in registration form so that users can upload documents, images and more.
60
 
61
+ * [WooCommerce Integration](https://wpeverest.com/wordpress-plugins/user-registration/woocommerce/?utm_source=wporg&utm_medium=link&utm_campaign=user-registration-readme) - Integrates and syncs WooCommerce related information to user registration account page like orders, customer details, Billings.
62
 
63
+ * [MailChimp](https://wpeverest.com/wordpress-plugins/user-registration/mailchimp/?utm_source=wporg&utm_medium=link&utm_campaign=user-registration-readme) - Lets you sync your registered users with MailChimp list. Automatically add users to your selected MailChimp list upon registration.
64
 
65
+ * [Advanced Fields](https://wpeverest.com/wordpress-plugins/user-registration/advanced-fields/?utm_source=wporg&utm_medium=link&utm_campaign=user-registration-readme) - Lets you add advanced extra fields such as WYSIWYG, Time picker, Phone Number, HTML, Section title in form.
66
 
67
+ * [Conditional Logic](https://wpeverest.com/wordpress-plugins/user-registration/conditional-logic/?utm_source=wporg&utm_medium=link&utm_campaign=user-registration-readme) - Lets you apply conditions to your fields. Conditional Logic allows you to show or hide certain fields based upon other field’s value.
68
 
69
+ * [Profile Connect](https://wpeverest.com/wordpress-plugins/user-registration/profile-connect/?utm_source=wporg&utm_medium=link&utm_campaign=user-registration-readme) - Allows admin to connect users registered via other forms to User Registration selected form.
70
 
71
+ * [PDF Form Submission](https://wpeverest.com/wordpress-plugins/user-registration/pdf-form-submission/?utm_source=wporg&utm_medium=link&utm_campaign=user-registration-readme) - Lets you export user's data in PDF, PDF file as email attachment on form submission.
72
 
73
+ * [Payments (PayPal)](https://wpeverest.com/wordpress-plugins/user-registration/payments/?utm_source=wporg&utm_medium=link&utm_campaign=user-registration-readme) - Integrates PayPal into your forms for registration fee payments, donations, and more.
74
 
75
  == Installation ==
76
 
104
 
105
  == Changelog ==
106
 
107
+ = 1.4.6 - 31/08/2018 =
108
+ * Fix - Remove filter to avoid plugin conflict while sending emails
109
+ * Fix - Load assests correctly
110
+ * Fix - Remove backend required valiation if the field is hidden by condition
111
+
112
  = 1.4.5 - 20/08/2018 =
113
  * Fix - Load user registration assets on login page.
114
  * Tweak - Form settings UI
user-registration.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: User Registration
4
  * Plugin URI: https://wpeverest.com/plugins/user-registration
5
  * Description: Drag and Drop user registration and login form builder.
6
- * Version: 1.4.5
7
  * Author: WPEverest
8
  * Author URI: https://wpeverest.com
9
  * Text Domain: user-registration
@@ -30,7 +30,7 @@ final class UserRegistration {
30
  * Plugin version.
31
  * @var string
32
  */
33
- public $version = '1.4.5';
34
 
35
  /**
36
  * Session instance.
3
  * Plugin Name: User Registration
4
  * Plugin URI: https://wpeverest.com/plugins/user-registration
5
  * Description: Drag and Drop user registration and login form builder.
6
+ * Version: 1.4.6
7
  * Author: WPEverest
8
  * Author URI: https://wpeverest.com
9
  * Text Domain: user-registration
30
  * Plugin version.
31
  * @var string
32
  */
33
+ public $version = '1.4.6';
34
 
35
  /**
36
  * Session instance.