Small changes

.idea/Projet-web-2016-SAHA.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

.idea/copyright/profiles_settings.xml

+<component name="CopyrightManager">
+  <settings default="" />
+</component>
\ No newline at end of file

.idea/deployment.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" serverName="ProjetWebSAHA">
+  <component name="PublishConfigData" serverName="proj_web">
     <serverData>
-      <paths name="ProjetWebSAHA">
+      <paths name="proj_web">
         <serverdata>
           <mappings>
             <mapping deploy="/" local="$PROJECT_DIR$" web="/" />
+            <mapping deploy="/" local="/var/www/html/Projet-web-2016-SAHA" web="/" />
           </mappings>
         </serverdata>
       </paths>

.idea/modules.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Projet-web-2016-SAHA.iml" filepath="$PROJECT_DIR$/.idea/Projet-web-2016-SAHA.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file

.idea/sqlDataSources.xml

@@ -13,12 +13,28 @@
           </option>
         </State>
         <State>
-          <option name="id" value="e3987d78-a391-4fb0-bfaa-139908e6b0b3" />
-          <option name="name" value="DDL data source" />
+          <option name="id" value="b3e54fb2-6e47-4b60-9e5e-174eaea27ef8" />
+          <option name="name" value="DDL data source 2" />
           <option name="urls">
             <array>
               <option value="file://$PROJECT_DIR$/Code/BD/fill_assoc.sql" />
+            </array>
+          </option>
+        </State>
+        <State>
+          <option name="id" value="042e722a-9429-48e3-bdf6-fecf0cb84879" />
+          <option name="name" value="DDL data source 3" />
+          <option name="urls">
+            <array>
               <option value="file://$PROJECT_DIR$/Code/BD/fill_assoc_eleve.sql" />
+            </array>
+          </option>
+        </State>
+        <State>
+          <option name="id" value="8edadab5-ed24-4fb7-9f59-f11431a76563" />
+          <option name="name" value="DDL data source 4" />
+          <option name="urls">
+            <array>
               <option value="file://$PROJECT_DIR$/Code/BD/fill_eleve.sql" />
             </array>
           </option>

.idea/webServers.xml

@@ -2,8 +2,8 @@
 <project version="4">
   <component name="WebServers">
     <option name="servers">
-      <webServer id="eb75e46f-7761-4b10-9544-ec9a0f456eea" name="ProjetWebSAHA" url="http://localhost">
-        <fileTransfer port="0" mountedRoot="$PROJECT_DIR$" accessType="MOUNT" />
+      <webServer id="eb75e46f-7761-4b10-9544-ec9a0f456eea" name="proj_web" url="http://proj_web.com">
+        <fileTransfer port="0" mountedRoot="/var/www/html/Projet-web-2016-SAHA" accessType="MOUNT" />
       </webServer>
     </option>
   </component>

Code/BD/create_eleve.sql

@@ -19,7 +19,7 @@ CREATE TABLE eleve (
        ddn DATE,
        tel INTEGER,
        mail VARCHAR(115) UNIQUE NOT NULL,
-       lieu VARCHAR(10),
+       lieu VARCHAR(10) NOT NULL,
        gpe_td VARCHAR(3),
        admins VARCHAR(1),
        situation VARCHAR(10),

Code/BD/create_eleve.sql.orig

+-- ###################################################################
+-- # Application : SQL script
+-- # File        : create_bases.sql
+-- # Revision    : april 2016
+-- # Author      : SAHA
+-- # Function    : Create the client relation
+-- ###################################################################
+
+-- If table already exists
+
+DROP TABLE eleve;
+
+CREATE TABLE eleve (
+<<<<<<< HEAD:Code/BD/create_eleve.sql
+       login_eleve VARCHAR(100),
+       nom_eleve VARCHAR(50) NOT NULL,
+       prenom VARCHAR(50) NOT NULL,
+       surnom VARCHAR(50),
+       promo INTEGER,
+       ddn DATE,
+       tel INTEGER,
+       mail VARCHAR(115),
+       lieu VARCHAR NOT NULL,
+       gpe_td VARCHAR(3),
+       admins VARCHAR(1),
+       situation VARCHAR(10),
+       CONSTRAINT pk_eleve PRIMARY KEY (login_eleve),
+       CONSTRAINT dom_lieu CHECK (lieu='Evry' OR lieu='Strasbourg'),
+       CONSTRAINT dom_date CHECK (promo > 1975),
+       CONSTRAINT dom_tel CHECK (tel > 0 AND tel < 9999999999),
+       CONSTRAINT dom_situation CHECK (situation='FIPA' OR situation='Initiale'),
+       CONSTRAINT dom_admins CHECK (admins='y' OR admins='n'));
+
+GRANT ALL PRIVILEGES ON eleve TO postgres;
+
+DROP TABLE IF EXISTS assoc;
+
+CREATE TABLE assoc (
+       id_assoc INTEGER,
+       nom VARCHAR(50),
+       resume VARCHAR(150),
+       CONSTRAINT pk_assoc PRIMARY KEY (id_assoc));
+
+GRANT ALL PRIVILEGES ON assoc TO postgres;
+=======
+  login_eleve VARCHAR(100),
+  nom_eleve VARCHAR(50) NOT NULL,
+  prenom VARCHAR(50) NOT NULL,
+  surnom VARCHAR(50),
+  promo INTEGER,
+  ddn DATE,
+  tel INTEGER,
+  mail VARCHAR(115),
+  lieu VARCHAR NOT NULL,
+  gpe_td VARCHAR(3),
+  admins VARCHAR(1),
+  situation VARCHAR(10),
+  CONSTRAINT pk_eleve PRIMARY KEY (login_eleve),
+  CONSTRAINT dom_tel CHECK(tel < 1000000000 AND tel > 100000000),
+  CONSTRAINT dom_mail CHECK (mail LIKE '%@%.%'),
+  CONSTRAINT dom_lieu CHECK(lieu IN ('Evry', 'Strasbourg')),
+  CONSTRAINT dom_gpe_td CHECK (gpe_td LIKE '%.%'),
+  CONSTRAINT dom_promo CHECK (promo > 1975),
+  CONSTRAINT dom_situation CHECK (situation IN ('FIPA', 'Initiale')),
+  CONSTRAINT dom_admins CHECK (admins IN ('y', 'n')));
+
+--GRANT ALL PRIVILEGES ON eleve TO admin;
+
+DROP TABLE assoc;
+
+CREATE TABLE assoc (
+  id_assoc INTEGER,
+  nom VARCHAR(50),
+  resume VARCHAR(150),
+  CONSTRAINT pk_assoc PRIMARY KEY (id_assoc));
+
+--GRANT ALL PRIVILEGES ON assoc TO admin;
+>>>>>>> 6123cc64a146ed36e9dded90a99c3d29c32c0cf3:Code/create_eleve.sql
+
+DROP TABLE liens;
+
+CREATE TABLE liens (
+<<<<<<< HEAD:Code/BD/create_eleve.sql
+       parrain VARCHAR(50),
+       filleul VARCHAR(50),
+       valide BOOLEAN,
+       CONSTRAINT pk_admin_liens PRIMARY KEY (parrain,filleul));
+
+GRANT ALL PRIVILEGES ON liens TO postgres;
+
+DROP TABLE IF EXISTS liens_eleve;
+
+CREATE TABLE liens_eleve (
+       login_eleve VARCHAR(100),
+       id_lien INTEGER,
+       CONSTRAINT pk_admin_liens_eleve PRIMARY KEY (id_lien));
+
+GRANT ALL PRIVILEGES ON liens_eleve TO postgres;
+=======
+  parrain VARCHAR(50),
+  filleul VARCHAR(50),
+  valide VARCHAR(1),
+  CONSTRAINT pk_liens PRIMARY KEY (parrain,filleul),
+  CONSTRAINT fk_parrain FOREIGN KEY (parrain) REFERENCES eleve,
+  CONSTRAINT fk_filleul FOREIGN KEY (filleul) REFERENCES eleve,
+  CONSTRAINT dom_valide CHECK (valide IN ('y', 'n')));
+
+--GRANT ALL PRIVILEGES ON liens TO admin;
+
+>>>>>>> 6123cc64a146ed36e9dded90a99c3d29c32c0cf3:Code/create_eleve.sql
+
+DROP TABLE assoc_eleve;
+
+CREATE TABLE assoc_eleve (
+<<<<<<< HEAD:Code/BD/create_eleve.sql
+       login_eleve VARCHAR(100),
+       id_assoc INTEGER,
+       CONSTRAINT pk_admin_assoc_eleve PRIMARY KEY (id_assoc));
+
+GRANT ALL PRIVILEGES ON assoc_eleve TO postgres;
+=======
+  login_eleve VARCHAR(100),
+  id_assoc INTEGER,
+  CONSTRAINT pk_assoc_eleve PRIMARY KEY (login_eleve, id_assoc),
+  CONSTRAINT fk_eleve FOREIGN KEY (login_eleve) REFERENCES eleve,
+  CONSTRAINT fk_assoc FOREIGN KEY (id_assoc) REFERENCES assoc);
+
+--GRANT ALL PRIVILEGES ON assoc_eleve TO admin;
+>>>>>>> 6123cc64a146ed36e9dded90a99c3d29c32c0cf3:Code/create_eleve.sql

Code/BD/fill_assoc_eleve.csv

-MichautSandra,1
-MichautSandra,3
-GentyAnaïs,1
-GentyAnaïs,2
-GentyAnaïs,4
+michaut.sandra,1
+michaut.sandra,3
+genty.anaïs,1
+genty.anaïs,2
+genty.anaïs,4

Code/checkForm.js

@@ -93,9 +93,9 @@ function validateForm3() {
     var x6 = document.forms["creation"]["Surnom"].value;
     var x7 = document.forms["creation"]["promo"].value;
     var x8 = document.forms["creation"]["Tel"].value;
-    var x9 = document.forms["creation"]["Ddn"].value;/*
+    var x9 = document.forms["creation"]["Ddn"].value;
     var x10_1 = document.getElementById("ecole1").checked;
-    var x10_2 = document.getElementById("ecole2").checked;*/
+    var x10_2 = document.getElementById("ecole2").checked;
     validateForm2();
     if (x7 == null || x7 == "") {
         alert("The field promo must be filled");
@@ -128,11 +128,11 @@ function validateForm3() {
     if (x7.length != 4) {
         alert("Please enter a valid year");
         return false;
-    }/*
+    }
     if (x10_1 == false && !x10_2 == false) {
         alert("Please select your campus");
         return false;
-    }*/
+    }
 }
 
 function validateForm4() {

Code/config.php

@@ -5,4 +5,4 @@ $nomBase = "project_web";
 $nomRoot = "postgres";
 $mdpRoot = "postgres";
 $nomHost="proj_web.com";
-?>
+

Code/config_s.php

@@ -10,4 +10,3 @@ $nomBase = "test1";
 $nomRoot = "sandra";
 $mdpRoot = "Sandra";
 $nomHost="localhost";
-?>

Code/creer_profil1.php

@@ -10,7 +10,7 @@ session_start();
 
 include("mise_en_page.php");
 
-enTete("Création de profil",$_SESSION['nomUser']); // A revoir
+enTete("Création de profil",$_SESSION['nomUser']);
 
 print "<form name=\"creation\" action=\"creation_donnees_perso.php\" method='get' onsubmit='return validateForm2()'>\n";
 

Code/creer_profil2.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: genty
+ * Date: 06/05/16
+ * Time: 02:22
+ */
+
+include("mise_en_page.php");
+include("creation_donnees_perso.php");
+
+enTete("Création de profil",$_SESSION['nomUser']);
+
+print "<form name=\"creation\" action='profil_modif.php' method='get' onsubmit='return validateForm3()'>\n";
+
+print "<h4>Données personnelles: </h4>\n";
+
+print "<script src=\"checkForm.js\"></script>\n";
+
+print "<input type='hidden' name='submitted' value='1'/>\n";
+
+$nomUser = $_SESSION['nomUser'];
+$prenomUser = $_SESSION['prenomUser'];
+$login = $_SESSION['login'];
+$mdp = $_SESSION['mdp'];
+$mail = $_SESSION['mail'];
+
+print "<p>Nom: $nomUser (non modifiable)\n<br/>\n";
+print "Prénom: $prenomUser (non modifiable)<br/>\n";
+print "Surnom: <input type=\"text\" size=\"8\" name=\"Surnom\" pattern=\"[^'()\[\]{}\\/\x22]+\" title=\"Cannot contain {,(,[,),],},',/,\ or ''\"/> <br/>\n "; /* Rq : pb ici */
+print "Promo: <input type=\"number\" size=\"5\" min=\"1960\" max=\"2020\" maxlength=\"4\" name=\"promo\"/> <br/>\n";
+print "Date de naissance (AAAA-MM-JJ): <input type=\"date\" name=\"Ddn\" min='1940-01-01' max='2010-12-31'/><br/>\n";
+print "Téléphone: <input type=\"number\" size=\"12\" min='0000000000' maxlength='10' name=\"Tel\"/> <br/>\n";
+print "Mail: <input type=\"email\" size=\"15\" name=\"Mail\" value=$mail pattern='[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,3}$' title='Must be valid email format'/> <br/><br/>\n";
+
+print "ENSIIE de: <br/>\n";
+
+print "<input type=\"radio\" name=\"ecole\" value=\"Evry\" /> Evry <br/>\n";
+print "<input type=\"radio\" name=\"ecole\" value=\"Strasbourg\" /> Strasbourg <br/><br/>\n";
+
+print "Groupe de TP/TD: <br/>\n";
+
+print "<input type=\"radio\" name=\"gpe\" value=\"1.1\" /> 1.1 \n";
+print "<input type=\"radio\" name=\"gpe\" value=\"1.2\" /> 1.2 <br/>\n";
+print "<input type=\"radio\" name=\"gpe\" value=\"2.1\" /> 2.1 \n";
+print "<input type=\"radio\" name=\"gpe\" value=\"2.2\" /> 2.2 <br/>\n";
+print "<input type=\"radio\" name=\"gpe\" value=\"3.1\" /> 3.1 \n";
+print "<input type=\"radio\" name=\"gpe\" value=\"3.2\" /> 3.2 <br/>\n";
+print "<input type=\"radio\" name=\"gpe\" value=\"4.1\" /> 4.1 \n";
+print "<input type=\"radio\" name=\"gpe\" value=\"4.2\" /> 4.2 <br/>\n";
+print "<input type=\"radio\" name=\"gpe\" value=\"0\" /> Pas de groupe<br/>\n<br/>\n";
+
+print "Membre de: <ul>\n";
+
+print "<input type='checkbox' name='assoc' value=\"aperitife\">AperItIfE<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"arise\">ARISE<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"astronomiie\">Astronomiie<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"manga\">Bakaclub<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"bda\">BDA<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"bdsf\">BDSF<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"aeiie\">Bureau des Eleves<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"cccm\">CCCM<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"cid\">CID<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"comdiie\">comDiie<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"craftiie\">CraftIIE<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"cuisine\">CuIsInE<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"dansiie\">Dansiie<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"diese\">Dièse<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"forumiie\">ForumIIE<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"gala\">Gala<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"guiilde\">GuIIldE<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"humaniie\">HUMANIIE<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"iiepp\">IIE++<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"iimage\">IImagE<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"iimonde\">IImondE<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"i-tv\">i-TV<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"lanpartiie\">LanPartIIE<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"bar\">Le Bar(c)<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"liien\">Liien<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"ludiie\">LudIIE<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"lumiiere\">LumIIEre<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"magiie\">MagIIE<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"muzzik\">Muzzik'<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"nightiies\">NightIIE's<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"robot\">ORiGiNe<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"securitiie\">SecuritIIE<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"radioactive\">RadIoactIvE<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"realitiie\">RealitIIE<br/>\n";
+print "<input type='checkbox' name='assoc' value=\"resiie\">ResIIE<br/>\n";
+
+print "</ul></p>\n";
+
+print "Mot de passe : <input type='password' name='psw' value=$pwd pattern=\"(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}\" title='Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters'/>\n";
+print "Vérification du mot de passe : <input type='password' name='psw2' value=$pwd pattern=\"(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}\" title='Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters'/>\n";
+
+print "<p><input type=\"submit\" value=\"Valider\" name=\"validation\" /></p>\n";
+
+print "</form>\n";
+
+retourAuMenu();
+
+pied();

Code/style.css

@@ -3,12 +3,12 @@
 h1{
     text-align: center;
     color: OrangeRed;
-    text-shadow: 0px 2px #665544;
+    text-shadow: 0 2px #665544;
 }
 
 h4{
     color: Orange;
-    text-shadow: 0px 1px #996633;
+    text-shadow: 0 1px #996633;
 }
 
 p.erreur{
@@ -18,7 +18,7 @@ p.erreur{
 p.up{
     text-align: center;
     color: #665544;
-    text-shadow: 0px 1px #996633;
+    text-shadow: 0 1px #996633;
 }
 
 p.down{

Code/style_form.css

@@ -14,16 +14,15 @@ form{
 fieldset{
     margin-left: auto;
     margin-right: auto;
-    border-color : teal;
-    border-style : groove;
-    width:600;
+    border: groove teal;
+    width:600px;
     text-align: center;
     vertical-align: top;
     }
 
 legend{
     color:teal;
-    left:50;
+    left:50px;
     text-align: center;
     font-weight:bolder;
     font-size:large;

Code/style_mail.css

 fieldset{
 border-color: purple;
-width: 400;
+width: 400px;
 margin-left: auto;
 margin-right: auto;
 text-align: center;