stiti/SAE_2.02
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit de Louay : Modifications pour éviter des bugs

Browse Source
This commit is contained in:
stiti
2024-06-07 13:41:17 +02:00
parent 417b16011f
commit 3bc08d6bd2
4 changed files with 95 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
CodeIgniter-3.1.13/application/controllers/Albums.php
View File

@@ -27,7 +27,7 @@ class Albums extends CI_Controller {
$total_pages = ceil($total_albums / $limit);
// Vérifier si la page demandée est valide
if ($page < 1 || $page > $total_pages) {
if ($page < 1 || ($total_pages > 0 && $page > $total_pages)) {
redirect('errors/error_404');
return;
}
@@ -36,30 +36,30 @@ class Albums extends CI_Controller {
$user_id = $this->session->userdata('user_id');
$data['user_playlists'] = $this->Model_playlist->get_user_playlists($user_id);
}
$data['total_pages'] = $total_pages;
$data['current_page'] = $page;
$data['albums'] = $albums;
$data['order_by'] = $order_by;
$data['genre_id'] = $genre_id;
$data['artist_id'] = $artist_id;
$data['title']= 'Albums - Onzeur';
$data['css']='assets/css/style';
$data['title'] = 'Albums - Onzeur';
$data['css'] = 'assets/css/style';
// Récupérer les genres et les artistes pour les filtres
$data['genres'] = $this->model_music->getGenres();
$data['artists'] = $this->model_music->getArtists();
$this->load->view('layout/header_dark', $data);
$this->load->view('albums_list',$data);
$this->load->view('albums_list', $data);
$this->load->view('layout/footer_dark');
}
public function view($id){
[$album,$tracks] = $this->model_music->get_album_by_id($id);
$data['album'] = $album;
$data['title'] = $album->name." - Details";
$data['css']='assets/css/album_view';
$data['title'] = $album->name . " - Details";
$data['css'] = 'assets/css/album_view';
$data['tracks'] = $tracks;
if ($this->session->userdata('user_id')) {
$user_id = $this->session->userdata('user_id');
@@ -67,8 +67,7 @@ class Albums extends CI_Controller {
}
$this->load->view('layout/header_dark', $data);
$this->load->view('album_view');
$this->load->view('album_view', $data);
$this->load->view('layout/footer_dark');
}
}
?>

19
CodeIgniter-3.1.13/application/controllers/Musiques.php
View File

@@ -14,11 +14,6 @@ class Musiques extends CI_Controller {
}
public function index($page = 1){
$this->load->model('Model_music');
$this->load->library('pagination');
$this->load->helper('url');
$this->load->helper('html');
$limit = 30;
$offset = ($page - 1) * $limit;
$sort = $this->input->get('sort');
@@ -26,24 +21,24 @@ class Musiques extends CI_Controller {
$artist_id = $this->input->get('artist_id');
$musiques = $this->Model_music->getMusiques($limit, $offset, $sort, 'ASC', $genre_id, $artist_id);
$total_musiques = $this->Model_music->get_total_musiques();
$total_pages = ceil($total_musiques / $limit);
$total_musiques = $this->Model_music->get_total_musiques_filtered($genre_id, $artist_id); // Utiliser la nouvelle méthode ici
$total_pages = ceil($total_musiques / $limit);
// Vérifier si la page demandée est valide
if ($page < 1 || $page > $total_pages) {
redirect('errors/error_404');
return;
}
$current_page = $page;
$genres = $this->Model_music->getGenres();
$artists = $this->Model_music->getArtists();
if ($this->session->userdata('user_id')) {
$user_id = $this->session->userdata('user_id');
$data['user_playlists'] = $this->Model_playlist->get_user_playlists($user_id);
}
$data['musiques'] = $musiques;
$data['total_pages'] = $total_pages;
$data['current_page'] = $current_page;
@@ -59,6 +54,6 @@ class Musiques extends CI_Controller {
$this->load->view('layout/header_dark', $data);
$this->load->view('musiques_list', $data);
$this->load->view('layout/footer_dark');
}
}
}