Version Description
- 16/03/2018 = Feature - Pending users approval notice for admin Feature - Form filled data in email Fix - Pending email issue Fix - Redirect from email url to default login message issue Fix - Load email classes only on demand
Download this release
Release Info
Developer | wpeverest |
Plugin | User Registration – Custom Registration Form, Login Form And User Profile For WordPress |
Version | 1.2.1 |
Comparing to | |
See all releases |
Code changes from version 1.2.0 to 1.2.1
- includes/abstracts/abstract-ur-form-field.php +1 -1
- includes/admin/class-ur-admin-user-list-manager.php +18 -1
- includes/class-ur-autoloader.php +4 -1
- includes/class-ur-email-confirmation.php +1 -1
- includes/class-ur-emailer.php +41 -56
- includes/class-ur-user-approval.php +1 -1
- languages/user-registration.pot +46 -26
- package-lock.json +7 -7
- readme.txt +9 -1
- user-registration.php +2 -2
includes/abstracts/abstract-ur-form-field.php
CHANGED
@@ -329,7 +329,7 @@ abstract class UR_Form_Field {
|
|
329 |
|
330 |
echo '</div>';
|
331 |
}
|
332 |
-
|
333 |
}
|
334 |
|
335 |
public abstract function validation( $single_form_field, $form_data, $filter_hook, $form_id );
|
329 |
|
330 |
echo '</div>';
|
331 |
}
|
332 |
+
do_action( 'user_registration_after_advance_settings', $this->id, $this->admin_data );
|
333 |
}
|
334 |
|
335 |
public abstract function validation( $single_form_field, $form_data, $filter_hook, $form_id );
|
includes/admin/class-ur-admin-user-list-manager.php
CHANGED
@@ -29,7 +29,8 @@ class UR_Admin_User_List_Manager {
|
|
29 |
// -------------------- ACTIONS & FILTERS --------------------
|
30 |
add_action( 'load-users.php', array( $this, 'trigger_query_actions' ) );
|
31 |
add_action( 'admin_notices', array( $this, 'display_admin_notices' ), 99 );
|
32 |
-
|
|
|
33 |
//Functions about users listing
|
34 |
add_action( 'restrict_manage_users', array($this, 'add_status_filter') );
|
35 |
add_action( 'admin_footer-users.php', array( $this, 'add_bulk_actions' ) );
|
@@ -44,6 +45,7 @@ class UR_Admin_User_List_Manager {
|
|
44 |
add_filter( 'manage_users_custom_column', array( $this, 'add_column_cell' ), 10, 3 );
|
45 |
add_filter( 'pre_get_users', array($this, 'filter_users_by_approval_status') );
|
46 |
|
|
|
47 |
}
|
48 |
|
49 |
/**
|
@@ -127,6 +129,21 @@ class UR_Admin_User_List_Manager {
|
|
127 |
}
|
128 |
}
|
129 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
130 |
/**
|
131 |
* Display a notice to admin if some users have been approved or denied
|
132 |
*/
|
29 |
// -------------------- ACTIONS & FILTERS --------------------
|
30 |
add_action( 'load-users.php', array( $this, 'trigger_query_actions' ) );
|
31 |
add_action( 'admin_notices', array( $this, 'display_admin_notices' ), 99 );
|
32 |
+
add_action( 'admin_notices', array($this, 'pending_users_notices') );
|
33 |
+
|
34 |
//Functions about users listing
|
35 |
add_action( 'restrict_manage_users', array($this, 'add_status_filter') );
|
36 |
add_action( 'admin_footer-users.php', array( $this, 'add_bulk_actions' ) );
|
45 |
add_filter( 'manage_users_custom_column', array( $this, 'add_column_cell' ), 10, 3 );
|
46 |
add_filter( 'pre_get_users', array($this, 'filter_users_by_approval_status') );
|
47 |
|
48 |
+
|
49 |
}
|
50 |
|
51 |
/**
|
129 |
}
|
130 |
}
|
131 |
|
132 |
+
//Display a notice to admin notifying the pending users
|
133 |
+
public function pending_users_notices() {
|
134 |
+
$user_query = new WP_User_Query(
|
135 |
+
array(
|
136 |
+
'meta_key' => 'ur_user_status',
|
137 |
+
'meta_value' => 0
|
138 |
+
)
|
139 |
+
);
|
140 |
+
// Get the results from the query, returning the first user
|
141 |
+
$users = $user_query->get_results();
|
142 |
+
if( count( $users ) > 0 ) {
|
143 |
+
echo '<div id="user-approvation-result" class="notice notice-success is-dismissible"><p><strong>'.__( 'User Registration:', 'user-registration').'</strong> ' . count( $users ) . ' <a href="'. admin_url('users.php') .'">'.( ( count( $users ) === 1 ) ? __('User', 'user-registration') : __('Users', 'user-registration') ).'</a> '.__( 'pending approval.', 'user-registration').'</p></div>';
|
144 |
+
}
|
145 |
+
}
|
146 |
+
|
147 |
/**
|
148 |
* Display a notice to admin if some users have been approved or denied
|
149 |
*/
|
includes/class-ur-autoloader.php
CHANGED
@@ -82,7 +82,10 @@ class UR_Autoloader {
|
|
82 |
$path = $this->include_path . 'admin/meta-boxes/';
|
83 |
} elseif ( strpos( $class, 'ur_admin' ) === 0 ) {
|
84 |
$path = $this->include_path . 'admin/';
|
85 |
-
} elseif ( strpos(
|
|
|
|
|
|
|
86 |
$path = $this->include_path . 'form/';
|
87 |
} elseif ( strpos( $class, 'ur_log_handler_' ) === 0 ) {
|
88 |
$path = $this->include_path . 'log-handlers/';
|
82 |
$path = $this->include_path . 'admin/meta-boxes/';
|
83 |
} elseif ( strpos( $class, 'ur_admin' ) === 0 ) {
|
84 |
$path = $this->include_path . 'admin/';
|
85 |
+
} elseif ( strpos($class, 'ur_settings') === 0 ) {
|
86 |
+
$path = $this->include_path . 'admin/settings/emails/';
|
87 |
+
}
|
88 |
+
elseif ( strpos( $class, 'ur_form' ) === 0 ) {
|
89 |
$path = $this->include_path . 'form/';
|
90 |
} elseif ( strpos( $class, 'ur_log_handler_' ) === 0 ) {
|
91 |
$path = $this->include_path . 'log-handlers/';
|
includes/class-ur-email-confirmation.php
CHANGED
@@ -68,7 +68,7 @@ class UR_Email_Confirmation {
|
|
68 |
update_user_meta( $user_id, 'ur_confirm_email', 1 );
|
69 |
delete_user_meta( $user_id, 'ur_confirm_email_token');
|
70 |
add_filter('login_message', array( $this,'custom_registration_message' ) );
|
71 |
-
add_filter('user_registration_login_form_before_notice', array( $this,'
|
72 |
}
|
73 |
else
|
74 |
{
|
68 |
update_user_meta( $user_id, 'ur_confirm_email', 1 );
|
69 |
delete_user_meta( $user_id, 'ur_confirm_email_token');
|
70 |
add_filter('login_message', array( $this,'custom_registration_message' ) );
|
71 |
+
add_filter('user_registration_login_form_before_notice', array( $this,'custom_registration_message' ) );
|
72 |
}
|
73 |
else
|
74 |
{
|
includes/class-ur-emailer.php
CHANGED
@@ -52,7 +52,7 @@ class UR_Emailer {
|
|
52 |
public static function ur_get_header() {
|
53 |
$header = "From: ". self::ur_sender_name()." <".self::ur_sender_email().">\r\n";
|
54 |
$header .= "Reply-To: ".self::ur_sender_email()."\r\n";
|
55 |
-
$header .= "Content-Type: text/html; charset=UTF-8";
|
56 |
|
57 |
return $header;
|
58 |
}
|
@@ -64,6 +64,33 @@ class UR_Emailer {
|
|
64 |
*/
|
65 |
public static function ur_after_register_mail( $valid_form_data, $form_id, $user_id ) {
|
66 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
67 |
$email_object = isset( $valid_form_data['user_email'] ) ? $valid_form_data['user_email'] : array();
|
68 |
|
69 |
$user_username_object = isset( $valid_form_data['user_username'] ) ? $valid_form_data['user_username'] : array();
|
@@ -74,9 +101,9 @@ class UR_Emailer {
|
|
74 |
|
75 |
if ( ! empty( $email ) && ! empty ( $username ) && ! empty( $user_id ) ) {
|
76 |
|
77 |
-
self::send_mail_to_user( $email, $username, $user_id );
|
78 |
|
79 |
-
self::send_mail_to_admin( $email, $username, $user_id );
|
80 |
}
|
81 |
}
|
82 |
|
@@ -85,7 +112,7 @@ class UR_Emailer {
|
|
85 |
* @param $email
|
86 |
*/
|
87 |
|
88 |
-
private static function send_mail_to_user( $email, $username, $user_id ) {
|
89 |
|
90 |
$status = ur_get_user_approval_status( $user_id );
|
91 |
|
@@ -93,24 +120,20 @@ class UR_Emailer {
|
|
93 |
|
94 |
$email_token = get_user_meta($user_id, 'ur_confirm_email_token', true);
|
95 |
|
96 |
-
$
|
|
|
|
|
97 |
|
98 |
if( $email_status === '0' ) {
|
99 |
|
100 |
$subject = get_option('user_registration_email_confirmation_subject', __('Please confirm your registration on {{blog_info}}', 'user-registration') );
|
101 |
|
102 |
-
include_once( UR_ABSPATH . 'includes/admin/settings/emails/class-ur-settings-email-confirmation.php' );
|
103 |
-
|
104 |
$message = new UR_Settings_Email_Confirmation();
|
105 |
|
106 |
$message = $message->ur_get_email_confirmation();
|
107 |
|
108 |
$message = get_option( 'user_registration_email_confirmation', $message );
|
109 |
|
110 |
-
$to_replace = array("{{username}}", "{{email}}", "{{blog_info}}", "{{home_url}}","{{email_token}}");
|
111 |
-
|
112 |
-
$replace_with = array( $username, $email, $blog_info, get_home_url(), $email_token );
|
113 |
-
|
114 |
$message = str_replace( $to_replace, $replace_with, $message );
|
115 |
|
116 |
$subject = str_replace( $to_replace, $replace_with, $subject );
|
@@ -123,18 +146,12 @@ class UR_Emailer {
|
|
123 |
|
124 |
$subject = get_option( 'user_registration_awaiting_admin_approval_email_subject', __('Thank you for registration on {{blog_info}}', 'user-registration') );
|
125 |
|
126 |
-
include_once( UR_ABSPATH . 'includes/admin/settings/emails/class-ur-settings-awaiting-admin-approval-email.php' );
|
127 |
-
|
128 |
$message = new UR_Settings_Awaiting_Admin_Approval_Email();
|
129 |
|
130 |
$message = $message->ur_get_awaiting_admin_approval_email();
|
131 |
|
132 |
$message = get_option( 'user_registration_awaiting_admin_approval_email', $message );
|
133 |
|
134 |
-
$to_replace = array("{{username}}", "{{email}}", "{{blog_info}}", "{{home_url}}");
|
135 |
-
|
136 |
-
$replace_with = array( $username, $email, $blog_info, get_home_url() );
|
137 |
-
|
138 |
$message = str_replace( $to_replace, $replace_with, $message );
|
139 |
|
140 |
$subject = str_replace( $to_replace, $replace_with, $subject );
|
@@ -148,18 +165,12 @@ class UR_Emailer {
|
|
148 |
|
149 |
$subject = get_option( 'user_registration_registration_denied_email_subject', __('Sorry! Registration denied on {{blog_info}}', 'user-registration') );
|
150 |
|
151 |
-
include_once( UR_ABSPATH . 'includes/admin/settings/emails/class-ur-settings-registration-denied-email.php' );
|
152 |
-
|
153 |
$message = new UR_Settings_Registration_Denied_Email();
|
154 |
|
155 |
$message = $message->ur_get_registration_denied_email();
|
156 |
|
157 |
$message = get_option( 'user_registration_registration_denied_email', $message );
|
158 |
|
159 |
-
$to_replace = array( "{{username}}", "{{email}}", "{{blog_info}}", "{{home_url}}" );
|
160 |
-
|
161 |
-
$replace_with = array( $username, $email, $blog_info, get_home_url() );
|
162 |
-
|
163 |
$message = str_replace( $to_replace, $replace_with, $message );
|
164 |
|
165 |
$subject = str_replace( $to_replace, $replace_with, $subject );
|
@@ -171,18 +182,12 @@ class UR_Emailer {
|
|
171 |
} else {
|
172 |
$subject = get_option( 'user_registration_successfully_registered_email_subject',__('Congratulations! Registration Complete on {{blog_info}}', 'user-registration') );
|
173 |
|
174 |
-
include_once( UR_ABSPATH . 'includes/admin/settings/emails/class-ur-settings-successfully-registered-email.php' );
|
175 |
-
|
176 |
$message = new UR_Settings_Successfully_Registered_Email();
|
177 |
|
178 |
$message = $message->ur_get_successfully_registered_email();
|
179 |
|
180 |
$message = get_option( 'user_registration_successfully_registered_email', $message );
|
181 |
|
182 |
-
$to_replace = array("{{username}}", "{{email}}", "{{blog_info}}", "{{home_url}}");
|
183 |
-
|
184 |
-
$replace_with = array( $username, $email, $blog_info, get_home_url() );
|
185 |
-
|
186 |
$message = str_replace( $to_replace, $replace_with, $message );
|
187 |
|
188 |
$subject = str_replace( $to_replace, $replace_with, $subject );
|
@@ -196,7 +201,7 @@ class UR_Emailer {
|
|
196 |
/**
|
197 |
* @param $user_email
|
198 |
*/
|
199 |
-
private static function send_mail_to_admin( $user_email, $username, $user_id ) {
|
200 |
|
201 |
$header = "Reply-To: {{email}} \r\n";
|
202 |
|
@@ -206,19 +211,15 @@ class UR_Emailer {
|
|
206 |
|
207 |
$subject = get_option( 'user_registration_admin_email_subject', __('A New User Registered', 'user-registration') );
|
208 |
|
209 |
-
$blog_info = get_bloginfo();
|
210 |
-
|
211 |
-
include_once( UR_ABSPATH . 'includes/admin/settings/emails/class-ur-settings-admin-email.php' );
|
212 |
-
|
213 |
$message = new UR_Settings_Admin_Email();
|
214 |
|
215 |
$message = $message->ur_get_admin_email();
|
216 |
|
217 |
$message = get_option( 'user_registration_admin_email', $message );
|
218 |
|
219 |
-
$to_replace = array("{{username}}", "{{email}}", "{{blog_info}}", "{{home_url}}");
|
220 |
|
221 |
-
$replace_with = array( $username, $user_email,
|
222 |
|
223 |
$message = str_replace( $to_replace, $replace_with, $message );
|
224 |
|
@@ -238,7 +239,9 @@ class UR_Emailer {
|
|
238 |
*/
|
239 |
public static function status_change_email( $email, $username, $status ) {
|
240 |
|
241 |
-
$
|
|
|
|
|
242 |
|
243 |
$headers = array( 'Content-Type: text/html; charset=UTF-8' );
|
244 |
|
@@ -246,18 +249,12 @@ class UR_Emailer {
|
|
246 |
|
247 |
$subject = get_option( 'user_registration_registration_pending_email_subject', __('Sorry! Registration changed to pending on {{blog_info}}', 'user-registration') );
|
248 |
|
249 |
-
include_once( UR_ABSPATH . 'includes/admin/settings/emails/class-ur-settings-registration-pending-email.php' );
|
250 |
-
|
251 |
$message = new UR_Settings_Registration_Pending_Email();
|
252 |
|
253 |
$message = $message->ur_get_registration_pending_email();
|
254 |
|
255 |
$message = get_option( 'user_registration_registration_pending_email', $message );
|
256 |
|
257 |
-
$to_replace = array( "{{username}}", "{{email}}", "{{blog_info}}", "{{home_url}}" );
|
258 |
-
|
259 |
-
$replace_with = array( $username, $email, $blog_info, get_home_url() );
|
260 |
-
|
261 |
$message = str_replace( $to_replace, $replace_with, $message );
|
262 |
|
263 |
$subject = str_replace( $to_replace, $replace_with, $subject );
|
@@ -270,18 +267,12 @@ class UR_Emailer {
|
|
270 |
|
271 |
$subject = get_option( 'user_registration_registration_denied_email_subject', __('Sorry! Registration denied on {{blog_info}}', 'user-registration') );
|
272 |
|
273 |
-
include_once( UR_ABSPATH . 'includes/admin/settings/emails/class-ur-settings-registration-denied-email.php' );
|
274 |
-
|
275 |
$message = new UR_Settings_Registration_Denied_Email();
|
276 |
|
277 |
$message = $message->ur_get_registration_denied_email();
|
278 |
|
279 |
$message = get_option( 'user_registration_registration_denied_email', $message );
|
280 |
|
281 |
-
$to_replace = array( "{{username}}", "{{email}}", "{{blog_info}}", "{{home_url}}" );
|
282 |
-
|
283 |
-
$replace_with = array( $username, $email, $blog_info, get_home_url() );
|
284 |
-
|
285 |
$message = str_replace( $to_replace, $replace_with, $message );
|
286 |
|
287 |
$subject = str_replace( $to_replace, $replace_with, $subject );
|
@@ -292,19 +283,13 @@ class UR_Emailer {
|
|
292 |
|
293 |
} else {
|
294 |
$subject = get_option( 'user_registration_registration_approved_email_subject', __('Congratulations! Registration approved on {{blog_info}}', 'user-registration') );
|
295 |
-
|
296 |
-
include_once( UR_ABSPATH . 'includes/admin/settings/emails/class-ur-settings-registration-approved-email.php' );
|
297 |
-
|
298 |
$message = new UR_Settings_Registration_Approved_Email();
|
299 |
|
300 |
$message = $message->ur_get_registration_approved_email();
|
301 |
|
302 |
$message = get_option( 'user_registration_registration_approved_email', $message );
|
303 |
|
304 |
-
$to_replace = array( "{{username}}", "{{email}}", "{{blog_info}}", "{{home_url}}" );
|
305 |
-
|
306 |
-
$replace_with = array( $username, $email, $blog_info, get_home_url() );
|
307 |
-
|
308 |
$message = str_replace( $to_replace, $replace_with, $message );
|
309 |
|
310 |
$subject = str_replace( $to_replace, $replace_with, $subject );
|
52 |
public static function ur_get_header() {
|
53 |
$header = "From: ". self::ur_sender_name()." <".self::ur_sender_email().">\r\n";
|
54 |
$header .= "Reply-To: ".self::ur_sender_email()."\r\n";
|
55 |
+
$header .= "Content-Type: text/html\r\n; charset=UTF-8";
|
56 |
|
57 |
return $header;
|
58 |
}
|
64 |
*/
|
65 |
public static function ur_after_register_mail( $valid_form_data, $form_id, $user_id ) {
|
66 |
|
67 |
+
$data_html = '';
|
68 |
+
$valid_form_data = isset( $valid_form_data ) ? $valid_form_data : '';
|
69 |
+
|
70 |
+
foreach( $valid_form_data as $field_meta => $form_data ) {
|
71 |
+
if( $field_meta === 'user_confirm_password' ) {
|
72 |
+
continue;
|
73 |
+
}
|
74 |
+
|
75 |
+
if( isset( $field_meta->extra_params['field_key'] ) && $field_meta->extra_params['field_key'] === 'privacy_policy') {
|
76 |
+
continue;
|
77 |
+
}
|
78 |
+
|
79 |
+
$label = isset( $form_data->extra_params['label'] ) ? $form_data->extra_params['label'] : '';
|
80 |
+
$value = isset( $form_data->value ) ? $form_data->value : '';
|
81 |
+
|
82 |
+
if( $field_meta === 'user_password') {
|
83 |
+
$value = __('Chosen Password', 'user-registration');
|
84 |
+
}
|
85 |
+
|
86 |
+
|
87 |
+
if ( is_array( $value ) ) {
|
88 |
+
$value = implode( ',', $value );
|
89 |
+
}
|
90 |
+
|
91 |
+
$data_html .= $label . ' : ' . $value . '<br/>';
|
92 |
+
}
|
93 |
+
|
94 |
$email_object = isset( $valid_form_data['user_email'] ) ? $valid_form_data['user_email'] : array();
|
95 |
|
96 |
$user_username_object = isset( $valid_form_data['user_username'] ) ? $valid_form_data['user_username'] : array();
|
101 |
|
102 |
if ( ! empty( $email ) && ! empty ( $username ) && ! empty( $user_id ) ) {
|
103 |
|
104 |
+
self::send_mail_to_user( $email, $username, $user_id, $data_html );
|
105 |
|
106 |
+
self::send_mail_to_admin( $email, $username, $user_id, $data_html );
|
107 |
}
|
108 |
}
|
109 |
|
112 |
* @param $email
|
113 |
*/
|
114 |
|
115 |
+
private static function send_mail_to_user( $email, $username, $user_id, $data_html ) {
|
116 |
|
117 |
$status = ur_get_user_approval_status( $user_id );
|
118 |
|
120 |
|
121 |
$email_token = get_user_meta($user_id, 'ur_confirm_email_token', true);
|
122 |
|
123 |
+
$to_replace = array("{{username}}", "{{email}}", "{{blog_info}}", "{{home_url}}", "{{email_token}}", "{{all_fields}}");
|
124 |
+
|
125 |
+
$replace_with = array( $username, $email, get_bloginfo(), get_home_url(), $email_token, $data_html );
|
126 |
|
127 |
if( $email_status === '0' ) {
|
128 |
|
129 |
$subject = get_option('user_registration_email_confirmation_subject', __('Please confirm your registration on {{blog_info}}', 'user-registration') );
|
130 |
|
|
|
|
|
131 |
$message = new UR_Settings_Email_Confirmation();
|
132 |
|
133 |
$message = $message->ur_get_email_confirmation();
|
134 |
|
135 |
$message = get_option( 'user_registration_email_confirmation', $message );
|
136 |
|
|
|
|
|
|
|
|
|
137 |
$message = str_replace( $to_replace, $replace_with, $message );
|
138 |
|
139 |
$subject = str_replace( $to_replace, $replace_with, $subject );
|
146 |
|
147 |
$subject = get_option( 'user_registration_awaiting_admin_approval_email_subject', __('Thank you for registration on {{blog_info}}', 'user-registration') );
|
148 |
|
|
|
|
|
149 |
$message = new UR_Settings_Awaiting_Admin_Approval_Email();
|
150 |
|
151 |
$message = $message->ur_get_awaiting_admin_approval_email();
|
152 |
|
153 |
$message = get_option( 'user_registration_awaiting_admin_approval_email', $message );
|
154 |
|
|
|
|
|
|
|
|
|
155 |
$message = str_replace( $to_replace, $replace_with, $message );
|
156 |
|
157 |
$subject = str_replace( $to_replace, $replace_with, $subject );
|
165 |
|
166 |
$subject = get_option( 'user_registration_registration_denied_email_subject', __('Sorry! Registration denied on {{blog_info}}', 'user-registration') );
|
167 |
|
|
|
|
|
168 |
$message = new UR_Settings_Registration_Denied_Email();
|
169 |
|
170 |
$message = $message->ur_get_registration_denied_email();
|
171 |
|
172 |
$message = get_option( 'user_registration_registration_denied_email', $message );
|
173 |
|
|
|
|
|
|
|
|
|
174 |
$message = str_replace( $to_replace, $replace_with, $message );
|
175 |
|
176 |
$subject = str_replace( $to_replace, $replace_with, $subject );
|
182 |
} else {
|
183 |
$subject = get_option( 'user_registration_successfully_registered_email_subject',__('Congratulations! Registration Complete on {{blog_info}}', 'user-registration') );
|
184 |
|
|
|
|
|
185 |
$message = new UR_Settings_Successfully_Registered_Email();
|
186 |
|
187 |
$message = $message->ur_get_successfully_registered_email();
|
188 |
|
189 |
$message = get_option( 'user_registration_successfully_registered_email', $message );
|
190 |
|
|
|
|
|
|
|
|
|
191 |
$message = str_replace( $to_replace, $replace_with, $message );
|
192 |
|
193 |
$subject = str_replace( $to_replace, $replace_with, $subject );
|
201 |
/**
|
202 |
* @param $user_email
|
203 |
*/
|
204 |
+
private static function send_mail_to_admin( $user_email, $username, $user_id, $data_html ) {
|
205 |
|
206 |
$header = "Reply-To: {{email}} \r\n";
|
207 |
|
211 |
|
212 |
$subject = get_option( 'user_registration_admin_email_subject', __('A New User Registered', 'user-registration') );
|
213 |
|
|
|
|
|
|
|
|
|
214 |
$message = new UR_Settings_Admin_Email();
|
215 |
|
216 |
$message = $message->ur_get_admin_email();
|
217 |
|
218 |
$message = get_option( 'user_registration_admin_email', $message );
|
219 |
|
220 |
+
$to_replace = array("{{username}}", "{{email}}", "{{blog_info}}", "{{home_url}}", "{{all_fields}}");
|
221 |
|
222 |
+
$replace_with = array( $username, $user_email, get_bloginfo(), get_home_url(), $data_html );
|
223 |
|
224 |
$message = str_replace( $to_replace, $replace_with, $message );
|
225 |
|
239 |
*/
|
240 |
public static function status_change_email( $email, $username, $status ) {
|
241 |
|
242 |
+
$to_replace = array( "{{username}}", "{{email}}", "{{blog_info}}", "{{home_url}}" );
|
243 |
+
|
244 |
+
$replace_with = array( $username, $email, get_bloginfo(), get_home_url() );
|
245 |
|
246 |
$headers = array( 'Content-Type: text/html; charset=UTF-8' );
|
247 |
|
249 |
|
250 |
$subject = get_option( 'user_registration_registration_pending_email_subject', __('Sorry! Registration changed to pending on {{blog_info}}', 'user-registration') );
|
251 |
|
|
|
|
|
252 |
$message = new UR_Settings_Registration_Pending_Email();
|
253 |
|
254 |
$message = $message->ur_get_registration_pending_email();
|
255 |
|
256 |
$message = get_option( 'user_registration_registration_pending_email', $message );
|
257 |
|
|
|
|
|
|
|
|
|
258 |
$message = str_replace( $to_replace, $replace_with, $message );
|
259 |
|
260 |
$subject = str_replace( $to_replace, $replace_with, $subject );
|
267 |
|
268 |
$subject = get_option( 'user_registration_registration_denied_email_subject', __('Sorry! Registration denied on {{blog_info}}', 'user-registration') );
|
269 |
|
|
|
|
|
270 |
$message = new UR_Settings_Registration_Denied_Email();
|
271 |
|
272 |
$message = $message->ur_get_registration_denied_email();
|
273 |
|
274 |
$message = get_option( 'user_registration_registration_denied_email', $message );
|
275 |
|
|
|
|
|
|
|
|
|
276 |
$message = str_replace( $to_replace, $replace_with, $message );
|
277 |
|
278 |
$subject = str_replace( $to_replace, $replace_with, $subject );
|
283 |
|
284 |
} else {
|
285 |
$subject = get_option( 'user_registration_registration_approved_email_subject', __('Congratulations! Registration approved on {{blog_info}}', 'user-registration') );
|
286 |
+
|
|
|
|
|
287 |
$message = new UR_Settings_Registration_Approved_Email();
|
288 |
|
289 |
$message = $message->ur_get_registration_approved_email();
|
290 |
|
291 |
$message = get_option( 'user_registration_registration_approved_email', $message );
|
292 |
|
|
|
|
|
|
|
|
|
293 |
$message = str_replace( $to_replace, $replace_with, $message );
|
294 |
|
295 |
$subject = str_replace( $to_replace, $replace_with, $subject );
|
includes/class-ur-user-approval.php
CHANGED
@@ -99,7 +99,7 @@ class UR_User_Approval {
|
|
99 |
*/
|
100 |
public function send_notification_to_user_about_status_changing( $status, $user_id, $alert_user ) {
|
101 |
|
102 |
-
if ( ! $alert_user
|
103 |
return;
|
104 |
}
|
105 |
|
99 |
*/
|
100 |
public function send_notification_to_user_about_status_changing( $status, $user_id, $alert_user ) {
|
101 |
|
102 |
+
if ( ! $alert_user ) {
|
103 |
return;
|
104 |
}
|
105 |
|
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.2.
|
6 |
"Report-Msgid-Bugs-To: wpeverest@gmail.com\n"
|
7 |
-
"POT-Creation-Date: 2018-
|
8 |
"MIME-Version: 1.0\n"
|
9 |
"Content-Type: text/plain; charset=utf-8\n"
|
10 |
"Content-Transfer-Encoding: 8bit\n"
|
@@ -99,7 +99,7 @@ msgid "User Registration Status"
|
|
99 |
msgstr ""
|
100 |
|
101 |
#: includes/admin/class-ur-admin-menus.php:313
|
102 |
-
#: includes/admin/class-ur-admin-user-list-manager.php:
|
103 |
msgid "Status"
|
104 |
msgstr ""
|
105 |
|
@@ -271,45 +271,61 @@ msgstr ""
|
|
271 |
msgid "Select a page…"
|
272 |
msgstr ""
|
273 |
|
274 |
-
#: includes/admin/class-ur-admin-user-list-manager.php:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
275 |
msgid "User approved."
|
276 |
msgid_plural "%s users approved."
|
277 |
msgstr[0] ""
|
278 |
msgstr[1] ""
|
279 |
|
280 |
-
#: includes/admin/class-ur-admin-user-list-manager.php:
|
281 |
msgid "User denied."
|
282 |
msgid_plural "%s users denied."
|
283 |
msgstr[0] ""
|
284 |
msgstr[1] ""
|
285 |
|
286 |
-
#: includes/admin/class-ur-admin-user-list-manager.php:
|
287 |
msgid "All statuses"
|
288 |
msgstr ""
|
289 |
|
290 |
-
#: includes/admin/class-ur-admin-user-list-manager.php:
|
291 |
msgid "All approval statuses"
|
292 |
msgstr ""
|
293 |
|
294 |
-
#: includes/admin/class-ur-admin-user-list-manager.php:
|
295 |
msgid "Filter"
|
296 |
msgstr ""
|
297 |
|
298 |
-
#: includes/admin/class-ur-admin-user-list-manager.php:
|
299 |
-
#: includes/admin/class-ur-admin-user-list-manager.php:
|
300 |
msgid "Approve"
|
301 |
msgstr ""
|
302 |
|
303 |
-
#: includes/admin/class-ur-admin-user-list-manager.php:
|
304 |
-
#: includes/admin/class-ur-admin-user-list-manager.php:
|
305 |
msgid "Deny"
|
306 |
msgstr ""
|
307 |
|
308 |
-
#: includes/admin/class-ur-admin-user-list-manager.php:
|
309 |
msgid "Approval Status"
|
310 |
msgstr ""
|
311 |
|
312 |
-
#: includes/admin/class-ur-admin-user-list-manager.php:
|
313 |
msgid "If user has access to sign in or not."
|
314 |
msgstr ""
|
315 |
|
@@ -601,7 +617,7 @@ msgid "The email subject you want to customize."
|
|
601 |
msgstr ""
|
602 |
|
603 |
#: includes/admin/settings/emails/class-ur-settings-admin-email.php:59
|
604 |
-
#: includes/class-ur-emailer.php:
|
605 |
msgid "A New User Registered"
|
606 |
msgstr ""
|
607 |
|
@@ -644,7 +660,7 @@ msgid ""
|
|
644 |
msgstr ""
|
645 |
|
646 |
#: includes/admin/settings/emails/class-ur-settings-awaiting-admin-approval-email.php:62
|
647 |
-
#: includes/class-ur-emailer.php:
|
648 |
msgid "Thank you for registration on {{blog_info}}"
|
649 |
msgstr ""
|
650 |
|
@@ -660,7 +676,7 @@ msgid ""
|
|
660 |
msgstr ""
|
661 |
|
662 |
#: includes/admin/settings/emails/class-ur-settings-email-confirmation.php:51
|
663 |
-
#: includes/class-ur-emailer.php:
|
664 |
msgid "Please confirm your registration on {{blog_info}}"
|
665 |
msgstr ""
|
666 |
|
@@ -680,7 +696,7 @@ msgid "Enable this email sent to admin after successfull user registration."
|
|
680 |
msgstr ""
|
681 |
|
682 |
#: includes/admin/settings/emails/class-ur-settings-registration-approved-email.php:62
|
683 |
-
#: includes/class-ur-emailer.php:
|
684 |
msgid "Congratulations! Registration approved on {{blog_info}}"
|
685 |
msgstr ""
|
686 |
|
@@ -694,7 +710,7 @@ msgid "Email sent to the user notifying the registration is denied by the admin"
|
|
694 |
msgstr ""
|
695 |
|
696 |
#: includes/admin/settings/emails/class-ur-settings-registration-denied-email.php:62
|
697 |
-
#: includes/class-ur-emailer.php:
|
698 |
msgid "Sorry! Registration denied on {{blog_info}}"
|
699 |
msgstr ""
|
700 |
|
@@ -708,7 +724,7 @@ msgid "Email sent to the user notifying the registration is pending"
|
|
708 |
msgstr ""
|
709 |
|
710 |
#: includes/admin/settings/emails/class-ur-settings-registration-pending-email.php:61
|
711 |
-
#: includes/class-ur-emailer.php:
|
712 |
msgid "Sorry! Registration changed to pending on {{blog_info}}"
|
713 |
msgstr ""
|
714 |
|
@@ -726,7 +742,7 @@ msgid "Enable this email sent after successful user registration."
|
|
726 |
msgstr ""
|
727 |
|
728 |
#: includes/admin/settings/emails/class-ur-settings-successfully-registered-email.php:62
|
729 |
-
#: includes/class-ur-emailer.php:
|
730 |
msgid "Congratulations! Registration Complete on {{blog_info}}"
|
731 |
msgstr ""
|
732 |
|
@@ -945,15 +961,19 @@ msgstr ""
|
|
945 |
msgid "Email not verified!"
|
946 |
msgstr ""
|
947 |
|
948 |
-
#: includes/class-ur-emailer.php:
|
|
|
|
|
|
|
|
|
949 |
msgid "Someone has requested a password reset for the following account:"
|
950 |
msgstr ""
|
951 |
|
952 |
-
#: includes/class-ur-emailer.php:
|
953 |
msgid "If this was a mistake, just ignore this email and nothing will happen."
|
954 |
msgstr ""
|
955 |
|
956 |
-
#: includes/class-ur-emailer.php:
|
957 |
msgid "To reset your password, visit the following address:"
|
958 |
msgstr ""
|
959 |
|
@@ -2846,12 +2866,12 @@ msgid_plural "All <span class=\"count\">(%s)</span>"
|
|
2846 |
msgstr[0] ""
|
2847 |
msgstr[1] ""
|
2848 |
|
2849 |
-
#: includes/admin/class-ur-admin-user-list-manager.php:
|
2850 |
msgctxt "The action on users list page"
|
2851 |
msgid "Approve"
|
2852 |
msgstr ""
|
2853 |
|
2854 |
-
#: includes/admin/class-ur-admin-user-list-manager.php:
|
2855 |
msgctxt "The action on users list page"
|
2856 |
msgid "Deny"
|
2857 |
msgstr ""
|
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.2.1\n"
|
6 |
"Report-Msgid-Bugs-To: wpeverest@gmail.com\n"
|
7 |
+
"POT-Creation-Date: 2018-03-15 10:32:50+00:00\n"
|
8 |
"MIME-Version: 1.0\n"
|
9 |
"Content-Type: text/plain; charset=utf-8\n"
|
10 |
"Content-Transfer-Encoding: 8bit\n"
|
99 |
msgstr ""
|
100 |
|
101 |
#: includes/admin/class-ur-admin-menus.php:313
|
102 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:181
|
103 |
msgid "Status"
|
104 |
msgstr ""
|
105 |
|
271 |
msgid "Select a page…"
|
272 |
msgstr ""
|
273 |
|
274 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:143
|
275 |
+
msgid "User Registration:"
|
276 |
+
msgstr ""
|
277 |
+
|
278 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:143
|
279 |
+
msgid "User"
|
280 |
+
msgstr ""
|
281 |
+
|
282 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:143
|
283 |
+
msgid "Users"
|
284 |
+
msgstr ""
|
285 |
+
|
286 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:143
|
287 |
+
msgid "pending approval."
|
288 |
+
msgstr ""
|
289 |
+
|
290 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:163
|
291 |
msgid "User approved."
|
292 |
msgid_plural "%s users approved."
|
293 |
msgstr[0] ""
|
294 |
msgstr[1] ""
|
295 |
|
296 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:165
|
297 |
msgid "User denied."
|
298 |
msgid_plural "%s users denied."
|
299 |
msgstr[0] ""
|
300 |
msgstr[1] ""
|
301 |
|
302 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:226
|
303 |
msgid "All statuses"
|
304 |
msgstr ""
|
305 |
|
306 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:228
|
307 |
msgid "All approval statuses"
|
308 |
msgstr ""
|
309 |
|
310 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:237
|
311 |
msgid "Filter"
|
312 |
msgstr ""
|
313 |
|
314 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:321
|
315 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:322
|
316 |
msgid "Approve"
|
317 |
msgstr ""
|
318 |
|
319 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:324
|
320 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:325
|
321 |
msgid "Deny"
|
322 |
msgstr ""
|
323 |
|
324 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:404
|
325 |
msgid "Approval Status"
|
326 |
msgstr ""
|
327 |
|
328 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:416
|
329 |
msgid "If user has access to sign in or not."
|
330 |
msgstr ""
|
331 |
|
617 |
msgstr ""
|
618 |
|
619 |
#: includes/admin/settings/emails/class-ur-settings-admin-email.php:59
|
620 |
+
#: includes/class-ur-emailer.php:212
|
621 |
msgid "A New User Registered"
|
622 |
msgstr ""
|
623 |
|
660 |
msgstr ""
|
661 |
|
662 |
#: includes/admin/settings/emails/class-ur-settings-awaiting-admin-approval-email.php:62
|
663 |
+
#: includes/class-ur-emailer.php:147
|
664 |
msgid "Thank you for registration on {{blog_info}}"
|
665 |
msgstr ""
|
666 |
|
676 |
msgstr ""
|
677 |
|
678 |
#: includes/admin/settings/emails/class-ur-settings-email-confirmation.php:51
|
679 |
+
#: includes/class-ur-emailer.php:129
|
680 |
msgid "Please confirm your registration on {{blog_info}}"
|
681 |
msgstr ""
|
682 |
|
696 |
msgstr ""
|
697 |
|
698 |
#: includes/admin/settings/emails/class-ur-settings-registration-approved-email.php:62
|
699 |
+
#: includes/class-ur-emailer.php:285
|
700 |
msgid "Congratulations! Registration approved on {{blog_info}}"
|
701 |
msgstr ""
|
702 |
|
710 |
msgstr ""
|
711 |
|
712 |
#: includes/admin/settings/emails/class-ur-settings-registration-denied-email.php:62
|
713 |
+
#: includes/class-ur-emailer.php:166 includes/class-ur-emailer.php:268
|
714 |
msgid "Sorry! Registration denied on {{blog_info}}"
|
715 |
msgstr ""
|
716 |
|
724 |
msgstr ""
|
725 |
|
726 |
#: includes/admin/settings/emails/class-ur-settings-registration-pending-email.php:61
|
727 |
+
#: includes/class-ur-emailer.php:250
|
728 |
msgid "Sorry! Registration changed to pending on {{blog_info}}"
|
729 |
msgstr ""
|
730 |
|
742 |
msgstr ""
|
743 |
|
744 |
#: includes/admin/settings/emails/class-ur-settings-successfully-registered-email.php:62
|
745 |
+
#: includes/class-ur-emailer.php:183
|
746 |
msgid "Congratulations! Registration Complete on {{blog_info}}"
|
747 |
msgstr ""
|
748 |
|
961 |
msgid "Email not verified!"
|
962 |
msgstr ""
|
963 |
|
964 |
+
#: includes/class-ur-emailer.php:83
|
965 |
+
msgid "Chosen Password"
|
966 |
+
msgstr ""
|
967 |
+
|
968 |
+
#: includes/class-ur-emailer.php:315
|
969 |
msgid "Someone has requested a password reset for the following account:"
|
970 |
msgstr ""
|
971 |
|
972 |
+
#: includes/class-ur-emailer.php:318
|
973 |
msgid "If this was a mistake, just ignore this email and nothing will happen."
|
974 |
msgstr ""
|
975 |
|
976 |
+
#: includes/class-ur-emailer.php:319
|
977 |
msgid "To reset your password, visit the following address:"
|
978 |
msgstr ""
|
979 |
|
2866 |
msgstr[0] ""
|
2867 |
msgstr[1] ""
|
2868 |
|
2869 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:77
|
2870 |
msgctxt "The action on users list page"
|
2871 |
msgid "Approve"
|
2872 |
msgstr ""
|
2873 |
|
2874 |
+
#: includes/admin/class-ur-admin-user-list-manager.php:78
|
2875 |
msgctxt "The action on users list page"
|
2876 |
msgid "Deny"
|
2877 |
msgstr ""
|
package-lock.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1 |
{
|
2 |
"name": "user-registration",
|
3 |
-
"version": "1.2.
|
4 |
"lockfileVersion": 1,
|
5 |
"requires": true,
|
6 |
"dependencies": {
|
@@ -3929,6 +3929,12 @@
|
|
3929 |
}
|
3930 |
}
|
3931 |
},
|
|
|
|
|
|
|
|
|
|
|
|
|
3932 |
"string-width": {
|
3933 |
"version": "1.0.2",
|
3934 |
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
|
@@ -3940,12 +3946,6 @@
|
|
3940 |
"strip-ansi": "3.0.1"
|
3941 |
}
|
3942 |
},
|
3943 |
-
"string_decoder": {
|
3944 |
-
"version": "0.10.31",
|
3945 |
-
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
|
3946 |
-
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
|
3947 |
-
"dev": true
|
3948 |
-
},
|
3949 |
"stringify-entities": {
|
3950 |
"version": "1.3.1",
|
3951 |
"resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.1.tgz",
|
1 |
{
|
2 |
"name": "user-registration",
|
3 |
+
"version": "1.2.1",
|
4 |
"lockfileVersion": 1,
|
5 |
"requires": true,
|
6 |
"dependencies": {
|
3929 |
}
|
3930 |
}
|
3931 |
},
|
3932 |
+
"string_decoder": {
|
3933 |
+
"version": "0.10.31",
|
3934 |
+
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
|
3935 |
+
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
|
3936 |
+
"dev": true
|
3937 |
+
},
|
3938 |
"string-width": {
|
3939 |
"version": "1.0.2",
|
3940 |
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
|
3946 |
"strip-ansi": "3.0.1"
|
3947 |
}
|
3948 |
},
|
|
|
|
|
|
|
|
|
|
|
|
|
3949 |
"stringify-entities": {
|
3950 |
"version": "1.3.1",
|
3951 |
"resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.1.tgz",
|
readme.txt
CHANGED
@@ -3,7 +3,7 @@ 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 |
Tested up to: 4.9
|
6 |
-
Stable tag: 1.2.
|
7 |
License: GPLv3
|
8 |
License URI: http://www.gnu.org/licenses/gpl-3.0.html
|
9 |
|
@@ -93,6 +93,14 @@ Yes, the plugin is designed to work with any themes that have been coded followi
|
|
93 |
|
94 |
== Changelog ==
|
95 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
96 |
= 1.2.0 - 22/02/2018 =
|
97 |
* Fix - Design issue in mobile view.
|
98 |
* Fix - Missing closing anchor tag.
|
3 |
Tags: user registration, registration, profile-builder, user profile, form, registration form, login form, user login, membership
|
4 |
Requires at least: 4.0
|
5 |
Tested up to: 4.9
|
6 |
+
Stable tag: 1.2.1
|
7 |
License: GPLv3
|
8 |
License URI: http://www.gnu.org/licenses/gpl-3.0.html
|
9 |
|
93 |
|
94 |
== Changelog ==
|
95 |
|
96 |
+
= 1.2.1 - 16/03/2018 =
|
97 |
+
Feature - Pending users approval notice for admin
|
98 |
+
Feature - Form filled data in email
|
99 |
+
Fix - Pending email issue
|
100 |
+
Fix - Redirect from email url to default login message issue
|
101 |
+
Fix - Load email classes only on demand
|
102 |
+
|
103 |
+
|
104 |
= 1.2.0 - 22/02/2018 =
|
105 |
* Fix - Design issue in mobile view.
|
106 |
* Fix - Missing closing anchor tag.
|
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.2.
|
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.2.
|
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.2.1
|
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.2.1';
|
34 |
|
35 |
/**
|
36 |
* Session instance.
|