diff --git a/ci/application/controllers/Connexion.php b/ci/application/controllers/Connexion.php index 3286127..817637a 100644 --- a/ci/application/controllers/Connexion.php +++ b/ci/application/controllers/Connexion.php @@ -9,9 +9,9 @@ class Connexion extends CI_Controller{ $this->load->model('model_music'); } public function index(){ - //$this->load->view('layout/header'); + $this->load->view('layout/header'); $this->load->view('login'); - //$this->load->view('layout/footer'); + $this->load->view('layout/footer'); } public function login() { @@ -29,7 +29,7 @@ class Connexion extends CI_Controller{ $this->load->view('layout/header'); redirect('albums'); } else { - //$this->load->view('layout/header'); + $this->load->view('layout/header'); $this->load->view('login'); $this->load->view('layout/footer'); echo "Invalid login or password"; diff --git a/ci/application/controllers/Deconnexion.php b/ci/application/controllers/Deconnexion.php index 24858a8..6b03e4e 100644 --- a/ci/application/controllers/Deconnexion.php +++ b/ci/application/controllers/Deconnexion.php @@ -10,6 +10,6 @@ class Deconnexion extends CI_Controller { public function index() { $this->session->unset_userdata('logged'); $this->session->sess_destroy(); - redirect('albums'); + redirect('welcome'); } } \ No newline at end of file diff --git a/ci/application/controllers/Enregistrer.php b/ci/application/controllers/Enregistrer.php index d5f2a40..4f1edea 100644 --- a/ci/application/controllers/Enregistrer.php +++ b/ci/application/controllers/Enregistrer.php @@ -8,9 +8,9 @@ class Enregistrer extends CI_Controller{ $this->load->model('model_music'); } public function index(){ - //$this->load->view('layout/header'); + $this->load->view('layout/header'); $this->load->view('SignUp'); - //$this->load->view('layout/footer'); + $this->load->view('layout/footer'); } public function SignUp() { $pseudo = ''; diff --git a/ci/application/index.html b/ci/application/index.html deleted file mode 100644 index b702fbc..0000000 --- a/ci/application/index.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/ci/application/views/SignUp.php b/ci/application/views/SignUp.php index 5a56f6c..1d4cadc 100644 --- a/ci/application/views/SignUp.php +++ b/ci/application/views/SignUp.php @@ -1,3 +1,4 @@ +

S'inscrire à SpotiFly

diff --git a/ci/application/views/Welcome.php b/ci/application/views/Welcome.php index 91e1475..a865d8a 100644 --- a/ci/application/views/Welcome.php +++ b/ci/application/views/Welcome.php @@ -15,21 +15,9 @@