Skip to content

reduce code #1

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

reduce code #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbf4c1d
new instance
jonathancastrodeveloper Nov 11, 2022
d2e6f93
new changes instance users
jonathancastrodeveloper Nov 11, 2022
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
48 changes: 29 additions & 19 deletions app_34/app/Controllers/User/UserController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@

class UserController extends BaseController
{
//
protected $userModel;

public function __construct()
{
// create instance
$this->userModel = new UserModel();

}

public function index()
{
//Index
Expand Down Expand Up @@ -60,18 +70,18 @@ public function login_submit()
// Ckeck if validation has failed (Verifique se a validação falhou)
if(!$validation){
return redirect()
->back()
->withInput()
->with('validation_errors', $this->validator->getErrors());
->back()
->withInput()
->with('validation_errors', $this->validator->getErrors());
}

$users = new UserModel();
// $users = new UserModel();

$username = $this->request->getPost('text_username');
$passwrd = $this->request->getPost('text_passwrd');

//Check if login is ok
$results = $users->verify_login($username, $passwrd);
$results = $this->userModel->verify_login($username, $passwrd);

if(!$results['status']){
// login error
Expand All @@ -80,7 +90,7 @@ public function login_submit()

/* Get user available data */
$id_user = $results['id_user'];
$results = $users->get_user_data($id_user);
$results = $this->userModel->get_user_data($id_user);

/* Create user session */
session()->set('user', $results[0]);
Expand Down Expand Up @@ -153,14 +163,14 @@ public function new_user_account_submit(){
// Ckeck if validation has failed (Verifique se a validação falhou)
if(!$validation){
return redirect()
->back()
->withInput()
->with('validation_errors', $this->validator->getErrors());
->back()
->withInput()
->with('validation_errors', $this->validator->getErrors());
}

//Check if username already exists in database/ Verifique se o nome de usuário já existe no banco de dados
$user = new UserModel();
$result = $user->check_if_user_account_already_exists($this->request->getPost('text_username'));
// $user = new UserModel();
$result = $this->userModel->check_if_user_account_already_exists($this->request->getPost('text_username'));

if($result){
die('Já existe uma conta com o mesmo email!');
Expand All @@ -185,11 +195,11 @@ public function new_user_account_submit(){

$message =
'
<h3>CI Auth - Confirmação de conta de usuário</h3>
<p>Para concluir o seu registro, clique no link abaixo.</p>
<p>
<a href="' . $purl . '">Confirmar email</a>
</p>
<h3>CI Auth - Confirmação de conta de usuário</h3>
<p>Para concluir o seu registro, clique no link abaixo.</p>
<p>
<a href="' . $purl . '">Confirmar email</a>
</p>
';
$email->setMessage($message);
$email->send();
Expand All @@ -206,14 +216,14 @@ private function show_confirmation_email($username){

/*======================================================*/
public function verify_email($purl = null){

//Check if is purl valid
if(empty($purl) || strlen($purl) != 12){
return redirect()->to('/');
}

$user = new UserModel();
$results = $user->check_confirm_email_address($purl);
// $user = new UserModel();
$results = $this->userModel->check_confirm_email_address($purl);



Expand Down