Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	CSS/grid.css
#	CSS/main.css
#	Redirect/validerClasseur.redirect.php
#	Redirect/validerSecurite.redirect.php
#	activation.php
#	ajouterClasseur.php
#	index.php
#	modifierClasseur.php
  • Loading branch information
Marc-Antoine Gelinas committed May 15, 2018
2 parents 6ba3a0c + 25cf16a commit 978be39
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 138 deletions.
77 changes: 0 additions & 77 deletions Activation.php
View file

This file was deleted.

Empty file removed CSS/template
View file
Empty file.
14 changes: 14 additions & 0 deletions Logs/logConnexionReussite.log
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Connection réussite : [email protected]
validerSession.redirect.php
Adresse ip : ::1
Date : 13/05/2018
Heure : 07:23:05pm
Plateforme : Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.170 Safari/537.36
----------------------------------------------------------------
Connection réussite : [email protected]
validerSession.redirect.php
Adresse ip : ::1
Date : 13/05/2018
Heure : 08:49:36pm
Plateforme : Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.170 Safari/537.36
----------------------------------------------------------------
122 changes: 61 additions & 61 deletions activation.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,68 +10,68 @@
<title>Key Vault - Activation</title>
<link rel="stylesheet" type="text/css" href="CSS/main.css">
<link rel="stylesheet" type="text/css" href="CSS/grid.css">

</head>
<body class="main-Grid">
<div class="headerL">
<a style="font-family: impact; font-size:larger;">Keyvault</a>
</div>

<div class="headerC">

</div>

<div class="headerR">

</div>

<div class="bodyL">
<?php
if (isset($_SESSION['Notification'])) {
echo '<h1 style="Color:red">' . $_SESSION['Notification'] . '</h1>';
unset($_SESSION['Notification']);
}
?>
</div>

<div class="bodyC">
<Form name="formActivation" method="post" action="Redirect/validerActivation.redirect.php">
<label for="email">Adresse e-mail :
<input type="text" name="email" id="email">
</label>
<label for="pass">Mot de passe :
<input type="password" name="pass" id="pass">
</label>
<label for="code">Code d'activation :
<input type="text" name="code" id="code">
</label>
<br/>
<br/>
<h3>Veuillez saisir une question de sécurité pour validé votre identité en cas de perte de mot de passe.</h3>
<label for="question">Question de sécurité :
<input type="text" name="question" id="question">
</label>
<label for="reponse">Réponse :
<input type="text" name="reponse" id="reponse">
</label>
<button onclick="formActivation.submit()">Activer</button>
</Form>
</div>

<div class="bodyR">

</div>

<div class="footerL">

</div>

<div class="footerC">

</div>

<div class="footerR">

</div>
<div id="headerL">
<a href="Redirect/logoClick.redirect.php" class="logo"><img src="Ressources/Logo.png"></a>
</div>

<div id="headerC">
</div>

<div id="headerR">
</div>


<?php
if (isset($_SESSION['Notification'])) {
echo "<div id='bodyL' class='section'>";
echo '<h1 style="Color:red">' . $_SESSION['Notification'] . '</h1>';
unset($_SESSION['Notification']);
echo "</div>";
}
else
echo "<div id='bodyL'>";
echo "</div>";
?>


<div id="bodyC" class="section centerDefault">
<Form name="formActivation" method="post" action="Redirect/validerActivation.redirect.php">
<p class="titre">Entrer vos informations d'activation</p>
<label for="email">Adresse e-mail :
<input type="text" name="email" id="email">
</label>
<label for="pass">Mot de passe :
<input type="password" name="pass" id="pass">
</label>
<label for="code">Code d'activation :
<input type="text" name="code" id="code">
</label>
<p class="titre">Veuillez saisir une question de sécurité pour validé votre identité en cas de perte de mot de passe.</p>
<label for="question">Question de sécurité :
<input type="text" name="question" id="question">
</label>
<label for="reponse">Réponse :
<input type="text" name="reponse" id="reponse">
</label>
<button onclick="formActivation.submit()">Activer</button>
</Form>
</div>

<div id="bodyR">
</div>

<div id="footerL">

</div>

<div id="footerC">
<a>Fait par Marc-Antoine Gélinas</a>
<a>Dans le cadre du cours Projet Web 2018</a>
</div>

<div id="footerR">
</div>
</body>
</html>

0 comments on commit 978be39

Please sign in to comment.