Skip to content

Update Auth.php #1566

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
dgvirtual wants to merge 1 commit into
base: 4
Choose a base branch
from
+12 −12
Open

Update Auth.php #1566

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
24 changes: 12 additions & 12 deletions Controllers/Auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,19 +540,19 @@ public function create_user()
$this->data['identity_column'] = $identityColumn;

// validate form input
$this->validation->setRule('first_name', lang('Auth.create_user_validation_fname_label'), 'trim|required');
$this->validation->setRule('last_name', lang('Auth.create_user_validation_lname_label'), 'trim|required');
$this->validation->setRule('first_name', lang('Auth.create_user_validation_fname_label'), 'required');
$this->validation->setRule('last_name', lang('Auth.create_user_validation_lname_label'), 'required');
if ($identityColumn !== 'email')
{
$this->validation->setRule('identity', lang('Auth.create_user_validation_identity_label'), 'trim|required|is_unique[' . $tables['users'] . '.' . $identityColumn . ']');
$this->validation->setRule('email', lang('Auth.create_user_validation_email_label'), 'trim|required|valid_email');
$this->validation->setRule('identity', lang('Auth.create_user_validation_identity_label'), 'required|is_unique[' . $tables['users'] . '.' . $identityColumn . ']');
$this->validation->setRule('email', lang('Auth.create_user_validation_email_label'), 'required|valid_email');
}
else
{
$this->validation->setRule('email', lang('Auth.create_user_validation_email_label'), 'trim|required|valid_email|is_unique[' . $tables['users'] . '.email]');
$this->validation->setRule('email', lang('Auth.create_user_validation_email_label'), 'required|valid_email|is_unique[' . $tables['users'] . '.email]');
}
$this->validation->setRule('phone', lang('Auth.create_user_validation_phone_label'), 'trim');
$this->validation->setRule('company', lang('Auth.create_user_validation_company_label'), 'trim');
//$this->validation->setRule('phone', lang('Auth.create_user_validation_phone_label'), 'required');// if it does not trim, it does nothing
//$this->validation->setRule('company', lang('Auth.create_user_validation_company_label'), 'required');
$this->validation->setRule('password', lang('Auth.create_user_validation_password_label'), 'required|min_length[' . $this->configIonAuth->minPasswordLength . ']|matches[password_confirm]');
$this->validation->setRule('password_confirm', lang('Auth.create_user_validation_password_confirm_label'), 'required');

Expand Down Expand Up @@ -672,10 +672,10 @@ public function edit_user(int $id)
if (! empty($_POST))
{
// validate form input
$this->validation->setRule('first_name', lang('Auth.edit_user_validation_fname_label'), 'trim|required');
$this->validation->setRule('last_name', lang('Auth.edit_user_validation_lname_label'), 'trim|required');
$this->validation->setRule('phone', lang('Auth.edit_user_validation_phone_label'), 'trim|required');
$this->validation->setRule('company', lang('Auth.edit_user_validation_company_label'), 'trim|required');
$this->validation->setRule('first_name', lang('Auth.edit_user_validation_fname_label'), 'required');
$this->validation->setRule('last_name', lang('Auth.edit_user_validation_lname_label'), 'required');
$this->validation->setRule('phone', lang('Auth.edit_user_validation_phone_label'), 'required');
$this->validation->setRule('company', lang('Auth.edit_user_validation_company_label'), 'required');

// do we have a valid request?
if ($id !== $this->request->getPost('id', FILTER_VALIDATE_INT))
Expand Down Expand Up @@ -801,7 +801,7 @@ public function create_group()
}

// validate form input
$this->validation->setRule('group_name', lang('Auth.create_group_validation_name_label'), 'trim|required|alpha_dash');
$this->validation->setRule('group_name', lang('Auth.create_group_validation_name_label'), 'required|alpha_dash');

if ($this->request->getPost() && $this->validation->withRequest($this->request)->run())
{
Expand Down