diff --git a/.~lock.brainstorming.odt# b/.~lock.brainstorming.odt#
new file mode 100644
index 0000000000000000000000000000000000000000..530947fd193e00183f01c09852e68b5c08cbaa79
--- /dev/null
+++ b/.~lock.brainstorming.odt#
@@ -0,0 +1 @@
+,koumaar,koumaar-VirtualBox,28.04.2016 19:49,file:///home/koumaar/.config/libreoffice/4;
\ No newline at end of file
diff --git a/Captain-America-Civil-War-banner-101.jpg b/Captain-America-Civil-War-banner-101.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..74a5b663717ecf3be4fc5885102245be852c1360
Binary files /dev/null and b/Captain-America-Civil-War-banner-101.jpg differ
diff --git a/authentification.php b/authentification.php
index c38a5bd5d5239b7e755b6d8bd2c335b9fa0087b2..2b1faa0e99081551609e2522a5360fbf88247020 100644
--- a/authentification.php
+++ b/authentification.php
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<?php
include("Miseenpage_login.php");
@@ -27,3 +28,56 @@ entete("Authentification");
<?php
pied();
?>
+=======
+<?php
+include("Miseenpage.php");
+
+entete("Authentification");
+if (isset($_POST['connexion'] && $_POST['connexion']=='Se connecter'{
+ if ((isset($_POST['noma']) && !empty($_POST['noma'])) && (isset($_POST['mdpa']) && !empty($_POST['mdpa'])){
+ if( $bd= (pg_connect("host=pgsql2 user))){
+ $requete='SELECT COUNT(*) FROM compte_client WHERE nom=$_POST['noma'] AND MdP=$_POST['mdpa']';
+ $response=pg_query($bd,$requete);
+ if($response){
+ $nbrow=pg_num_rows($response);
+ if($nbrow==0){
+ $erreur="Ce compte n'existe pas, veuillez vérifiez vore nom et votre mot de passe";
+ }
+ else if($nbrow>1){
+ $erreur="plusieurs comptes de meme nom et mot de passe";
+ }
+ else{
+ session_start();
+ $_SESSION['nom']=$_POST['nom'];
+ header(...);
+ exit();
+
+ }
+ }
+ }
+ else{
+ $erreur="problème de connexion au base de données"
+ }
+ }
+ else {
+ $erreur="un des champs est vide"
+ }
+}
+
+ ?>
+
+<h1>Connectez vous</h1>
+<p>
+<form action="authentification.php" method="POST">
+Nom <input type="text" name="noma" value="<?php if (isset($_POST['noma'])) echo $_POST['noma']; ?>"><br/>
+Mot de passe <input type="password" name="mdpa" value="<?php if (isset($_POST['mdpa'])) echo $_POST['mdpa']; ?>"/>
+<input type="submit" name="connexion" value="Se connecter">
+</p>
+</form>
+<a href="creation_compte">Inscription</a>
+
+<?php
+if (isset($erreur)) echo'</br>',$erreur;
+pied();
+?>
+>>>>>>> 97aae529857f74eae932ce60288adc2cbada47f0
diff --git a/authentification.php~ b/authentification.php~
new file mode 100644
index 0000000000000000000000000000000000000000..9ba9c0e826d8faba15a1166f110d97f9478815a1
--- /dev/null
+++ b/authentification.php~
@@ -0,0 +1,32 @@
+<?php
+include("Miseenpage.php");
+
+entete("Authentification");
+if (isset($_POST['connexion'] && $_POST['connexion']=='Se connecter'{
+ if ((isset($_POST['noma']) && !empty($_POST['noma'])) && (isset($_POST['mdpa']) && !empty($_POST['mdpa'])){
+ if( $bd= (pg_connect("host=pgsql2 user))){
+ $requete='SELECT COUNT(*) FROM compte_client WHERE nom=$_POST['noma'] AND MdP=$_POST['mdpa']';
+ $response=pg_query($bd,$requete);
+
+ }
+ }
+ else {
+ $erreur="un des champs est vide"
+ }
+}
+
+ ?>
+
+<h1>Connectez vous</h1>
+<p>
+<form action="authentification.php" method="POST">
+Nom <input type="text" name="noma" value="<?php if (isset($_POST['noma'])) echo $_POST['noma']; ?>"><br/>
+Mot de passe <input type="password" name="mdpa" value="<?php if (isset($_POST['mdpa'])) echo $_POST['mdpa']; ?>"/>
+<input type="submit" name="connexion" value="Se connecter">
+</p>
+</form>
+
+<?php
+if (isset($erreur)) echo'</br>',$erreur;
+pied();
+?>
\ No newline at end of file
diff --git a/create.sql b/create.sql
index c6b0d4307280a7f3404de4eb25b3aae1d1d71bfc..2a403ef894e9f5a0bfff1d17aed6dc671efcf279 100644
--- a/create.sql
+++ b/create.sql
@@ -3,7 +3,11 @@
-- # File : create.sql
-- # Date : 04/2016
-- # Function : Create the database
+<<<<<<< HEAD
-- # Nom de base : postgres
+=======
+-- # Nom de base : gestion
+>>>>>>> 97aae529857f74eae932ce60288adc2cbada47f0
-- ###################################################################
DROP TABLE IF EXISTS billet;
@@ -14,8 +18,12 @@ DROP TABLE IF EXISTS piece;
DROP TABLE IF EXISTS compte_client;
CREATE TABLE compte_client(
+<<<<<<< HEAD
n_compte SERIAL,
login VARCHAR(100) NOT NULL,
+=======
+ n_compte INTEGER NOT NULL auto_increment,
+>>>>>>> 97aae529857f74eae932ce60288adc2cbada47f0
nom VARCHAR(100) NOT NULL,
prenom VARCHAR(100) NOT NULL,
DoB DATE,
diff --git a/creation_compte.php b/creation_compte.php
index b131f2851d348cfd0e677d21cb3ac55ea2c942d8..27c2db2796ef8a0379e13f1433077a7e0bc588ba 100644
--- a/creation_compte.php
+++ b/creation_compte.php
@@ -1,4 +1,5 @@
<?php
+<<<<<<< HEAD
include("Miseenpage_create.php");
entete("Création de compte");
@@ -35,3 +36,63 @@ entete("Création de compte");
<?php
pied();
?>
+=======
+include("Miseenpage.php");
+
+entete("Création de compte");
+
+if (isset($_POST['inscription'] && $_POST['inscription']=='Inscription'{
+ if ((isset($_POST['nom']) && !empty($_POST['nom'])) && (isset($_POST['prenom']) && !empty($_POST['prenom'])) && (isset($_POST['DoB']) && !empty($_POST['DoB'])) && (isset($_POST['mdp']) && !empty($_POST['mdp'])) && (isset($_POST['mdp_c']) && !empty($_POST['mdp_c']))){
+ if ($_POST['mdp']!=$_POST['mdp_c']){
+ $erreur="Les deux mot de passes sont différents";
+ }
+ else {
+ if( $bd= (pg_connect("host=pgsql2 user))){
+ $requete='SELECT COUNT(*) FROM compte_client WHERE nom=$_POST['nom']';
+ $response=pg_query($bd,$requete);
+ if ($response){
+ if(($nbrow=pg_num_rows($response))==0){
+ $requete='INSERT INTO compte_client VALUES ("",$_POST['nom'],$_POST['prenom'],$_POST['DoB'],$_POST['mdp']);
+ $response=pg_query($bd,$requete);
+ }
+ else{
+ $erreur="Ce Nom est déjà utilisé";
+ }
+ }
+ else{
+ $erreur="Requete non effectué"
+ }
+ }
+ else{
+ $erreur="Problème de connexion au base de données";
+ }
+ }
+ }
+ else{
+ $erreur="au moins un des champs est vide";
+ }
+}
+?>
+
+<ul>
+<li>Home</li>
+<li>Reservation</li>
+</ul>
+
+<h1>Complétez ce formulaire</h1>
+<p>
+<form action="creation_compte.php" method="POST">
+Nom <input type="text" name="nom" value="<?php if (isset($_POST['nom'])) echo $_POST['nom']; ?>"><br/>
+Prénom <input type="text" name="prenom" value="<?php if (isset($_POST['prenom'])) echo $_POST['prenom']; ?>" /><br/>
+Date de Naissance <input type="text" name="DoB" value="<?php if (isset($_POST['DoB'])) echo $_POST['DoB']; ?>" /><br/>
+Mot de passe <input type="password" name="mdp" value="<?php if (isset($_POST['mdp'])) echo $_POST['mdp']; ?>"/><br/>
+Confirmez mot de passe <input type="password" name="mdp_c" value="<?php if (isset($_POST['mdp_c'])) echo $_POST['mdp_c']; ?>" /><br/>
+</p>
+<input type="submit" name="inscription" value="Inscription">
+</form>
+
+<?php
+if (isset($erreur)) echo'</br>',$erreur;
+pied();
+?>
+>>>>>>> 97aae529857f74eae932ce60288adc2cbada47f0
diff --git a/creation_compte.php~ b/creation_compte.php~
new file mode 100644
index 0000000000000000000000000000000000000000..4eee87be744ef74cb61adffcacb67cbbb374dac5
--- /dev/null
+++ b/creation_compte.php~
@@ -0,0 +1,54 @@
+<?php
+include("Miseenpage.php");
+
+entete("Création de compte");
+
+if (isset($_POST['inscription'] && $_POST['inscription']=='Inscription'{
+ if ((isset($_POST['nom']) && !empty($_POST['nom'])) && (isset($_POST['prenom']) && !empty($_POST['prenom'])) && (isset($_POST['DoB']) && !empty($_POST['DoB'])) && (isset($_POST['mdp']) && !empty($_POST['mdp'])) && (isset($_POST['mdp_c']) && !empty($_POST['mdp_c']))){
+ if ($_POST['mdp']!=$_POST['mdp_c']){
+ $erreur="Les deux mot de passes sont différents";
+ }
+ else {
+ if( $bd= (pg_connect("host=pgsql2 user))){
+ $requete='SELECT COUNT(*) FROM compte_client WHERE nom=$_POST['nom']';
+ $response=pg_query($bd,$requete);
+ if ($response){
+ if($nbrow=pg_num_rows($response)==0){
+ $requete='INSERT INTO compte_client VALUES ("",$_POST['nom'],$_POST['prenom'],$_POST['DoB'],$_POST['mdp']);
+ $response=pg_query($bd,$requete);
+ }
+ else{
+ $erreur="Ce Nom est déjà utilisé";
+ }
+ }
+ else{
+ $erreur="Requete non effectué"
+ }
+ }
+ else{
+ $erreur="Problème de connexion au base de données";
+ }
+ }
+ }
+ else{
+ $erreur="au moins un des champs est vide";
+ }
+}
+?>
+
+<h1>Complétez ce formulaire</h1>
+<p>
+<form action="creation_compte.php" method="POST">
+Nom <input type="text" name="nom" value="<?php if (isset($_POST['nom'])) echo $_POST['nom']; ?>"><br/>
+Prénom <input type="text" name="prenom" value="<?php if (isset($_POST['prenom'])) echo $_POST['prenom']; ?>" /><br/>
+Date de Naissance <input type="text" name="DoB" value="<?php if (isset($_POST['DoB'])) echo $_POST['DoB']; ?>" /><br/>
+Mot de passe <input type="password" name="mdp" value="<?php if (isset($_POST['mdp'])) echo $_POST['mdp']; ?>"/><br/>
+Confirmez mot de passe <input type="password" name="mdp_c" value="<?php if (isset($_POST['mdp_c'])) echo $_POST['mdp_c']; ?>" /><br/>
+</p>
+<input type="submit" name="inscription" value="Inscription">
+</form>
+
+<?php
+if (isset($erreur)) echo'</br>',$erreur;
+pied();
+?>
\ No newline at end of file
diff --git a/style.css b/style.css
new file mode 100644
index 0000000000000000000000000000000000000000..403252ac89bf3562cce6920b9374760a42064139
--- /dev/null
+++ b/style.css
@@ -0,0 +1,33 @@
+h1{
+ text-align:center;
+ color: blue;
+
+}
+
+body{
+ background-image:url("Captain-America-Civil-War-banner-101.jpg");
+ background-position:top;
+ background-attachement:fixed;
+}
+
+ul {
+ list-style-type:none;
+ margin:0;
+ padding:0;
+ overflow:hidden;
+ background-color: #333;
+}
+
+li{
+ float:left;
+}
+
+li a{
+ display:block;
+ color:white;
+ text-align:center;
+}
+
+li a:hover{
+ background-color:#111;
+}
\ No newline at end of file
diff --git a/style.css~ b/style.css~
new file mode 100644
index 0000000000000000000000000000000000000000..8f23cb06ddb80760cbcfdb5cf6ae7c493df91058
--- /dev/null
+++ b/style.css~
@@ -0,0 +1,11 @@
+h1{
+ text-align:center;
+ color: blue;
+
+}
+
+body{
+ background-image:url("Captain-America-Civil-War-banner-101.jpg");
+ background-position:top;
+ background-attachement:fixed;
+}
\ No newline at end of file