Skip to content

modern-signup-form-customize #51

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
RumanCodes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

modern-signup-form-customize #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 28 additions & 31 deletions app/Hooks/Handlers/LoginCustomizerHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,16 +178,24 @@ public function addExtendedRegFields()
$policyUrl = apply_filters('fluent_auth/signup_policy_url', $policyUrl);

// We will add the custom fields here
$fullName = Arr::get($_POST, 'user_full_name', '');
$firstName = Arr::get($_POST, 'first_name', '');
$lastName = Arr::get($_POST, 'last_name', '');
$password = Arr::get($_POST, 'user_password', '');
$confirmPassword = Arr::get($_POST, 'user_confirm_password', '');
$agreeTerms = Arr::get($_POST, 'agree_terms', '');
?>
<p class="fs_reg_item fs_reg_item_full_name">
<label for="user_full_name"><?php _e('Your Full Name', 'fluent-security'); ?></label>
<input type="text" name="user_full_name" id="user_full_name" class="input" value="<?php echo esc_attr($fullName); ?>" size="100" autocomplete="name" required="required"/>
<p class="fs_reg_item fs_reg_item_first_name">
<label for="first_name"><?php _e('First Name', 'fluent-security'); ?></label>
<input type="text" name="first_name" id="first_name" class="input"
value="<?php echo esc_attr($firstName) ?>"
size="50" autocomplete="given-name" required="required" />
</p>
<p class="fs_reg_item fs_reg_item_last_name">
<label for="last_name"><?php _e('Last Name', 'fluent-security'); ?></label>
<input type="text" name="last_name" id="last_name" class="input"
value="<?php echo esc_attr($lastName) ?>"
size="50" autocomplete="family-name" required="required" />
</p>

<p class="fs_reg_item fs_reg_item_password">
<label for="user_password"><?php _e('Password', 'fluent-security'); ?></label>
<input type="password" name="user_password" id="user_password" class="input" value="<?php echo htmlspecialchars($password, ENT_QUOTES, 'UTF-8'); ?>" size="50" required="required"/>
Expand Down Expand Up @@ -237,11 +245,8 @@ public function maybeInterceptRegistration(\WP_Error $errors, $sanitized_user_lo

$errors->add('confirm_token', sprintf(__('A verification code has been sent to %s. Please provide the code below:', 'fluent-security'), $user_email));

$fullName = Arr::get($_POST, 'user_full_name', '');

$nameArr = explode(' ', $fullName);
$firstName = array_shift($nameArr);
$lastName = implode(' ', $nameArr);
$firstName = Arr::get($_POST, 'first_name', '');
$lastName = Arr::get($_POST, 'last_name', '');

$formData = [
'email' => $user_email,
Expand Down Expand Up @@ -297,10 +302,8 @@ public function maybeIntercept2FaRegistration($sanitized_user_login, $user_email
return false;
}

$fullName = Arr::get($_POST, 'user_full_name', '');
$fullNameArr = explode(' ', $fullName);
$firstName = array_shift($fullNameArr);
$lastName = implode(' ', $fullNameArr);
$firstName = Arr::get($_POST, 'first_name', '');
$lastName = Arr::get($_POST, 'last_name', '');

$formData = [
'username' => $sanitized_user_login,
Expand Down Expand Up @@ -358,26 +361,20 @@ private function validateRegistrationData($data)
{
$errors = new \WP_Error();

if (!empty($data['first_name'])) {
$data['user_full_name'] = trim(Arr::get($data, 'first_name') . ' ' . Arr::get($data, 'last_name'));
}

if (empty($data['user_full_name'])) {
$errors->add('user_full_name', __('Please enter your full name.', 'fluent-security'));
}

$fullName = Arr::get($data, 'user_full_name', '');
$firstName = trim(Arr::get($data, 'first_name', ''));

// check if the name is valid
// Consider if there has any special characters like +, -, *, /, etc
// only check the +,-,*,$,/,=,%,!,@,#,^,&,*,(,),_,{,},[,],:,;,',",<,>,?,|,`,~,,
if (preg_match('/[\'^£$%&*()}{@#~?><>,|=_+¬-]/u', $fullName)) {
$errors->add('user_full_name', __('Please provide a full name.', 'fluent-security'));
if (empty($firstName)) {
$errors->add('first_name', __('Please enter your first name.', 'fluent-security'));
} elseif (preg_match('/[\'^£$%&*()}{@#~?><>,|=_+¬-]/u', $firstName)) {
$errors->add('first_name', __('Invalid characters in first name.', 'fluent-security'));
}

// check if there has any http or https
if (preg_match('/http|https/', $fullName)) {
$errors->add('user_full_name', __('Please provide a valid name.', 'fluent-security'));
// Validate last name
$lastName = trim(Arr::get($data, 'last_name', ''));
if (empty($lastName)) {
$errors->add('last_name', __('Please enter your last name.', 'fluent-security'));
} elseif (preg_match('/[\'^£$%&*()}{@#~?><>,|=_+¬-]/u', $lastName)) {
$errors->add('last_name', __('Invalid characters in last name.', 'fluent-security'));
}

if (empty($data['user_password'])) {
Expand Down
23 changes: 0 additions & 23 deletions app/Services/AuthService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,6 @@ private static function maybeUpdateUser($user, $userData)
}

if (!$user->first_name || !$user->last_name) {
if (!empty($userData['full_name'])) {
// extract the names
$fullNameArray = explode(' ', $userData['full_name']);
$updateData['first_name'] = array_shift($fullNameArray);
if ($fullNameArray) {
$updateData['last_name'] = implode(' ', $fullNameArray);
} else {
$updateData['last_name'] = '';
}
}

if (!empty($userData['first_name'])) {
$updateData['first_name'] = $userData['first_name'];
}
Expand Down Expand Up @@ -194,18 +183,6 @@ public static function registerNewUser($user_login, $user_email, $user_pass = ''
$data['last_name'] = sanitize_text_field($extraData['last_name']);
}

if (!empty($extraData['full_name']) && empty($extraData['first_name']) && empty($extraData['last_name'])) {
$extraData['full_name'] = sanitize_text_field($extraData['full_name']);
// extract the names
$fullNameArray = explode(' ', $extraData['full_name']);
$data['first_name'] = array_shift($fullNameArray);
if ($fullNameArray) {
$data['last_name'] = implode(' ', $fullNameArray);
} else {
$data['last_name'] = '';
}
}

if (!empty($extraData['description'])) {
$data['description'] = sanitize_textarea_field($extraData['description']);
}
Expand Down
4 changes: 1 addition & 3 deletions mix-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
"/dist/public/fls_login.js": "/dist/public/fls_login.js",
"/dist/public/login_helper.js": "/dist/public/login_helper.js",
"/dist/public/login_customizer.css": "/dist/public/login_customizer.css",
"/dist/images/index.php": "/dist/images/index.php",
"/dist/images/logo.png": "/dist/images/logo.png",
"/dist/images/logo.svg": "/dist/images/logo.svg",
"/dist/images/success.png": "/dist/images/success.png",
"/dist/libs/diff.js": "/dist/libs/diff.js",
"/dist/libs/index.php": "/dist/libs/index.php"
"/dist/libs/diff.js": "/dist/libs/diff.js"
}
2 changes: 1 addition & 1 deletion src/admin/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ ul.fls_listed_data {

p {
font-size: 12px;
line-height: 15px;
line-height: 22px;
}

h3 {
Expand Down