diff --git a/README.md b/README.md index 46dded7c..975aeb1c 100755 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ Le site officiel du club réseaux disponible à l'adresse https://e59.fr/ - ```sqlConnect($dbHost, $dbName, $dbUser, $dbPass)``` ## objects.php -- ```userWidget($userPPURL, $userDisplayName, $userName, $userLevel, $badges)``` +- ```userWidget($userPPURL, $userDisplayName, $userName, $userCertification, $badges, $rootPageURL)``` - ```listArticles($result, $rootPageURL)``` ## inputs.php diff --git a/html/admin/index.php b/html/admin/index.php index 007f7b22..675d8f75 100755 --- a/html/admin/index.php +++ b/html/admin/index.php @@ -55,6 +55,7 @@ $pdo = sqlConnect($sqlDatabaseHost, $sqlDatabaseName, $sqlDatabaseUser, $sqlData $result = $request->fetchAll(PDO::FETCH_ASSOC); if ($result) { + echo ('
'); foreach($result as $row) { $pubDateTime = strtotime($row['date']); $pubDate = date('d/m/Y', $pubDateTime); @@ -62,9 +63,9 @@ $pdo = sqlConnect($sqlDatabaseHost, $sqlDatabaseName, $sqlDatabaseUser, $sqlData $userDisplayName = $row['display_name']; $userCertification = $row['certification']; $userPPURL = $row['profile_picture'] == NULL ? "https://abs.twimg.com/sticky/default_profile_images/default_profile_400x400.png" : $row['profile_picture']; - userWidget($userPPURL, $userDisplayName, $userName, $userCertification, $badges, $rootPageURL); } + echo ('
'); } ?> diff --git a/html/index.php b/html/index.php index 930fe9a3..28d803ae 100755 --- a/html/index.php +++ b/html/index.php @@ -39,7 +39,6 @@ $pdo = sqlConnect($sqlDatabaseHost, $sqlDatabaseName, $sqlDatabaseUser, $sqlData echo($pageContent); ?> -

Actualités récentes

@@ -117,24 +114,40 @@ $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, 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"; + $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 OR users.display_name 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']); $request->bindParam(":userID", $_SESSION['userID']); $request->execute(); - $result = $request->fetchAll(PDO::FETCH_ASSOC); + $articlesResult = $request->fetchAll(PDO::FETCH_ASSOC); echo ('

News

'); - echo ('
'); + echo (''); $shapePath = ''; textInput("text", $shapePath, "search", "Chercher", ""); echo ('
'); - if ($result) { + if(empty($_GET['search']) == false) { + $sqlRequest = "SELECT username, display_name, certification, profile_picture FROM users WHERE username LIKE :search OR display_name LIKE :search"; + $request = $pdo->prepare($sqlRequest); + $request->bindParam(":search", $search); + $request->execute(); + $userResult = $request->fetchAll(PDO::FETCH_ASSOC); + if($userResult) { + echo ('
'); + foreach ($userResult as $user) { + $userPPURL = $user['profile_picture'] == NULL ? "https://abs.twimg.com/sticky/default_profile_images/default_profile_400x400.png" : $user['profile_picture']; + userWidget($userPPURL, $user['display_name'], $user['username'], $user['certification'], $badges, $rootPageURL); + } + echo ('
'); + } + } + + if ($articlesResult) { echo('
'); - listArticles($result, $rootPageURL, $badges); + listArticles($articlesResult, $rootPageURL, $badges); echo('
'); } else { echo ('Aucun article trouvé'); diff --git a/html/users/index.php b/html/users/index.php index 82785e9f..c390ddbc 100755 --- a/html/users/index.php +++ b/html/users/index.php @@ -3,6 +3,7 @@ require("../../include/variables.php"); require("../../include/init.php"); require("../../include/main-functions.php"); require("../../include/objects.php"); +require("../../include/inputs.php"); require("../../include/panels.php"); $pdo = sqlConnect($sqlDatabaseHost, $sqlDatabaseName, $sqlDatabaseUser, $sqlDatabasePass);