diff --git a/html/index.php b/html/index.php index b731455a..930fe9a3 100755 --- a/html/index.php +++ b/html/index.php @@ -42,13 +42,13 @@ $pdo = sqlConnect($sqlDatabaseHost, $sqlDatabaseName, $sqlDatabaseUser, $sqlData

Actualités récentes

prepare($sqlRequest); $request->bindParam(":userAccreditation", $_SESSION['userAccreditation']); $request->execute(); $result = $request->fetchAll(PDO::FETCH_ASSOC); if ($result) { - listArticles($result, $rootPageURL); + listArticles($result, $rootPageURL, $badges); } ?>
diff --git a/html/news/index.php b/html/news/index.php index 745b248e..a8e86293 100755 --- a/html/news/index.php +++ b/html/news/index.php @@ -117,7 +117,7 @@ $pdo = sqlConnect($sqlDatabaseHost, $sqlDatabaseName, $sqlDatabaseUser, $sqlData } else { $search = isset($_GET['search']) ? "%" . htmlspecialchars($_GET['search']) . "%" : "%%"; - $sqlRequest = "SELECT articles.ID, articles.title, articles.date, articles.miniature, articles.resume, users.username, users.display_name FROM articles JOIN users ON articles.author = users.ID WHERE (articles.title LIKE :search OR articles.ID LIKE :search OR users.username LIKE :search) AND (articles.classification <= :userAccreditation OR articles.author = :userID) ORDER BY articles.date DESC"; + $sqlRequest = "SELECT articles.ID, articles.title, articles.date, articles.miniature, articles.resume, users.username, users.display_name, users.certification FROM articles JOIN users ON articles.author = users.ID WHERE (articles.title LIKE :search OR articles.ID LIKE :search OR users.username LIKE :search) AND (articles.classification <= :userAccreditation OR articles.author = :userID) ORDER BY articles.date DESC"; $request = $pdo->prepare($sqlRequest); $request->bindParam(":search", $search); $request->bindParam(":userAccreditation", $_SESSION['userAccreditation']); @@ -134,7 +134,7 @@ $pdo = sqlConnect($sqlDatabaseHost, $sqlDatabaseName, $sqlDatabaseUser, $sqlData if ($result) { echo('
'); - listArticles($result, $rootPageURL); + listArticles($result, $rootPageURL, $badges); echo('
'); } else { echo ('Aucun article trouvé'); diff --git a/html/users/index.php b/html/users/index.php index eabe351e..82785e9f 100755 --- a/html/users/index.php +++ b/html/users/index.php @@ -129,7 +129,7 @@ if(isset($_GET['u']) && empty($_GET['u']) == false) { if ($result) { echo('
'); - listArticles($result, $rootPageURL); + listArticles($result, $rootPageURL, $badges); echo ('
'); } else { echo ($userDisplayName . ' n\'a encore rien publié'); diff --git a/include/objects.php b/include/objects.php index 9e18a17a..cbd00032 100644 --- a/include/objects.php +++ b/include/objects.php @@ -29,7 +29,7 @@ function userWidget($userPPURL, $userDisplayName, $userName, $userCertification, } -function listArticles($result, $rootPageURL) { +function listArticles($result, $rootPageURL, $badges) { foreach($result as $article) { @@ -39,8 +39,10 @@ function listArticles($result, $rootPageURL) { $articleTitle = $article['title']; $articleResume = $article['resume']; $miniatureURL = empty($article['miniature']) ? $rootPageURL . "src/img/empty.jpg" : $article['miniature']; - if(isset($article['username']) && isset($article['display_name'])) { - $authorLink = ' | ' . $article['display_name'] . ''; + + if(isset($article['username']) && isset($article['display_name']) && isset($article['certification'])) { + $badge = $article['certification'] > 0 ? '' . $badges[$userCertification] . '' : ""; + $authorLink = ' | ' . $article['display_name'] . $badge . ''; } else { $authorLink = ''; }