From ac167feda5ad466b2099100370b87627d182ac01 Mon Sep 17 00:00:00 2001
From: Vince <vi.teissier@gmail.com>
Date: Mon, 3 Jun 2024 10:16:09 +0200
Subject: [PATCH] essai fix bug connection
---
application/config/autoload.php | 2 +-
application/controllers/Albums.php | 9 +++--
application/controllers/Connect.php | 53 +++++++++++++++--------------
3 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/application/config/autoload.php b/application/config/autoload.php
index 10b76f3..3e17b1f 100644
--- a/application/config/autoload.php
+++ b/application/config/autoload.php
@@ -58,7 +58,7 @@ $autoload['packages'] = array();
|
| $autoload['libraries'] = array('user_agent' => 'ua');
*/
-$autoload['libraries'] = array('session');
+$autoload['libraries'] = array('database','session','form_validation');
/*
| -------------------------------------------------------------------
diff --git a/application/controllers/Albums.php b/application/controllers/Albums.php
index ba9a26d..37baf71 100644
--- a/application/controllers/Albums.php
+++ b/application/controllers/Albums.php
@@ -9,9 +9,14 @@ class Albums extends CI_Controller {
$this->load->library('session');
}
public function index(){
- $albums = $this->model_music->getAlbums();
+ $albums = $this->model_music->getAlbums();
+ $is_logged_in = $this->session->userdata('logged_in');
+ $data = array(
+ 'albums' => $albums,
+ 'is_logged_in' => $is_logged_in
+ );
$this->load->view('layout/header');
- $this->load->view('albums_list',['albums'=>$albums]);
+ $this->load->view('albums_list', $data);
$this->load->view('layout/footer');
}
diff --git a/application/controllers/Connect.php b/application/controllers/Connect.php
index ad0ebdb..1b80787 100644
--- a/application/controllers/Connect.php
+++ b/application/controllers/Connect.php
@@ -43,36 +43,37 @@ class Connect extends CI_Controller {
}
public function login()
- {
- $this->load->library('form_validation');
- $this->form_validation->set_rules('email', 'Email', 'required|valid_email');
- $this->form_validation->set_rules('password', 'Password', 'required');
+{
+ $this->load->library('form_validation');
+ $this->form_validation->set_rules('email', 'Email', 'required|valid_email');
+ $this->form_validation->set_rules('password', 'Password', 'required');
- if ($this->form_validation->run() === FALSE) {
- $this->load->view('layout/header');
- $this->load->view('login');
- $this->load->view('layout/footer');
+ if ($this->form_validation->run() === FALSE) {
+ $this->load->view('layout/header');
+ $this->load->view('login');
+ $this->load->view('layout/footer');
+ } else {
+ $email = $this->input->post('email');
+ $password = $this->input->post('password');
+
+ $user = $this->User_model->get_user_by_email($email);
+
+ if ($user && password_verify($password, $user['password'])) {
+ $this->session->set_userdata([
+ 'user_id' => $user['id'],
+ 'email' => $user['email'],
+ 'logged_in' => TRUE
+ ]);
+ redirect('albums/index');
} else {
- $email = $this->input->post('email');
- $password = $this->input->post('password');
-
- $user = $this->User_model->get_user_by_email($email);
-
- if ($user && password_verify($password, $user['password'])) {
- $this->session->set_userdata([
- 'user_id' => $user['id'],
- 'email' => $user['email'],
- 'logged_in' => TRUE
- ]);
- redirect('albums/index');
- } else {
- $data['error'] = 'Adresse email ou mot de passe incorrect';
- $this->load->view('layout/header');
- $this->load->view('login', $data);
- $this->load->view('layout/footer');
- }
+ $data['error'] = 'Adresse email ou mot de passe incorrect';
+ $this->load->view('layout/header');
+ $this->load->view('login', $data);
+ $this->load->view('layout/footer');
}
}
+}
+
public function logout()
{