diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aafa768 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +Thumbs.db \ No newline at end of file diff --git a/controleur/membre/connexion/index.php b/controleur/membre/connexion/index.php index ac374e4..cd113e5 100644 --- a/controleur/membre/connexion/index.php +++ b/controleur/membre/connexion/index.php @@ -11,8 +11,8 @@ if (!isset($_POST['pseudo'])) { //Page de formulaire

Connexion


-
- +

+

diff --git a/controleur/membre/functions.php b/controleur/membre/functions.php index b1059df..78658bc 100644 --- a/controleur/membre/functions.php +++ b/controleur/membre/functions.php @@ -13,13 +13,56 @@ function erreur($err='') '); } -function move_avatar($avatar) +function edit_avatar($avatar, $pseudo) { - $extension_upload = strtolower(substr( strrchr($avatar['name'], '.') ,1)); - $name = time(); - $nomavatar = str_replace(' ','',$name).".".$extension_upload; - $name = "./images/avatars/".str_replace(' ','',$name).".".$extension_upload; - move_uploaded_file($avatar['tmp_name'],$name); - return $nomavatar; + if (isset ($avatar)){ + $imagename = $avatar['name'];// exemple.png + $source = $avatar['tmp_name'];// /volume1/@tmp/phpiES0qN + $locate = "./images/avatars/".$pseudo."/"; + $dir = $locate."img_user.jpeg"; + move_uploaded_file($source,$dir); + changeToJpeg($dir,$dir); + resize_avatar($dir,$dir); + $rdir = substr($dir,1); + return $rdir; + } +} + +function changeToJpeg($source, $dir) +{ + $ext = substr($_FILES['avatar']['type'],6); //jpeg + switch($ext) { + case 'jpg': + $image = imagecreatefromjpeg($source); + break; + + case 'jpeg': + $image = imagecreatefromjpeg($source); + break; + + case 'png': + $image = imagecreatefrompng($source); + break; + + case 'gif': + $image = imagecreatefromgif($source); + break; + default: + throw new Exception('Unknown image type.'); + } + imagejpeg($image, $dir); +} + +function resize_avatar($dir,$out ) +{ + list($width, $height) = getimagesize($dir); + $modwidth = 150; //target width + $diff = $width / $modwidth; + $modheight = $height / $diff; + + $tn = imagecreatetruecolor($modwidth, $modheight); + $image = imagecreatefromjpeg($dir); + imagecopyresampled($tn, $image, 0, 0, 0, 0, $modwidth, $modheight, $width, $height); + imagejpeg($tn, $out); } ?> diff --git a/controleur/membre/inscription/index.php b/controleur/membre/inscription/index.php index 37d2e16..dd600fe 100644 --- a/controleur/membre/inscription/index.php +++ b/controleur/membre/inscription/index.php @@ -12,15 +12,23 @@ if (empty($_POST['pseudo'])) // Si on la variable est vide, on peut considérer

Inscription




- -
+ +
-

+

-

+

+

+

+
+
+
+

+
+

Profil sur le forum -

(Taille max : 10Ko) +



Les champs précédés d'un * sont obligatoires

@@ -33,15 +41,17 @@ if (empty($_POST['pseudo'])) // Si on la variable est vide, on peut considérer else //On est dans le cas traitement { $pseudo_erreur1 = NULL;$pseudo_erreur2 = NULL; - $email_erreur1 = NULL;$email_erreur2 = NULL; - $avatar_erreur = NULL;$avatar_erreur1 = NULL; - $avatar_erreur2 = NULL;$avatar_erreur3 = NULL; + $email_erreur1 = NULL; $mdp_erreur = NULL; + $avatar_erreur3 = NULL; //On récupère les variables $i = 0; + $extensions_valides = array( 'jpg' , 'jpeg' , 'gif' , 'png' ); $pseudo=$_POST['pseudo']; $email = $_POST['email']; $localisation = $_POST['localisation']; + $prenom = $_POST['prenom']; + $nom = $_POST['nom']; $pass = /*md5*/($_POST['password']); $confirm = /*md5*/($_POST['confirm']); //Verification des champs formulaire @@ -67,43 +77,12 @@ else //On est dans le cas traitement $email_erreur1 = "Votre adresse email est déjà utilisée par un membre"; $i++; } - if (!preg_match("#^[a-zA-Z0-9._-]+@[a-zA-Z0-9._-]{2,}\.[a-z]{2,4}$#", $email) || empty($email)) + $extension_upload = strtolower(substr( strrchr($_FILES['avatar']['name'], '.') ,1)); + if (!in_array($extension_upload,$extensions_valides) ) { - $email_erreur2 = "Votre adresse email n'a pas un format valide"; + $avatar_erreur3 = "Extension de l'avatar incorrecte"; $i++; } - if (!empty($_FILES['avatar']['size'])) - { - $maxsize = 10024; //Poid de l'image - $maxwidth = 100; //Largeur de l'image - $maxheight = 100; //Longueur de l'image - //Liste des extensions valides - $extensions_valides = array( 'jpg' , 'jpeg' , 'gif' , 'png', 'bmp' ); - if ($_FILES['avatar']['error'] > 0) - { - $avatar_erreur = "Erreur lors du transfert de l'avatar : "; - } - if ($_FILES['avatar']['size'] > $maxsize) - { - $i++; - $avatar_erreur1 = "Le fichier est trop gros : (".$_FILES['avatar']['size']." Octets contre ".$maxsize." Octets)"; - } - - $image_sizes = getimagesize($_FILES['avatar']['tmp_name']); - if ($image_sizes[0] > $maxwidth OR $image_sizes[1] > $maxheight) - { - $i++; - $avatar_erreur2 = "Image trop large ou trop longue : - (".$image_sizes[0]."x".$image_sizes[1]." contre ".$maxwidth."x".$maxheight.")"; - } - - $extension_upload = strtolower(substr( strrchr($_FILES['avatar']['name'], '.') ,1)); - if (!in_array($extension_upload,$extensions_valides) ) - { - $i++; - $avatar_erreur3 = "Extension de l'avatar incorrecte"; - } - } if ($i==0) { ?> @@ -113,7 +92,6 @@ else //On est dans le cas traitement

Cliquez ici pour revenir dans votre espace membre

Inscription interrompue


erreurs se sont produites lors de votre incription


Cliquez ici pour recommencer

diff --git a/controleur/membre/profil/index.php b/controleur/membre/profil/index.php index c076c8e..e054859 100644 --- a/controleur/membre/profil/index.php +++ b/controleur/membre/profil/index.php @@ -14,13 +14,27 @@ switch($action)
-

Profil de


- Acun avatar
-

Adresse E-Mail : -

- Ce membre est inscrit depuis le

- Localisation : -

+

Profil


+ Pseudo
+

+ Avatar
+ Acun avatar

+

+ Email
+
+ Prénom
+
+ Nom
+
+ Age
+
+ Galop
+
+ Adresse
+

+ Inscrit depuis :
+

+

@@ -41,31 +55,40 @@ switch($action)

Edition du profil de


-
+

Mot de passe

+



-

- -
Contacts +


+

Contacts



-

-
Informations supplémentaires +


+

Informations supplémentaires

+
+
+
+
+
+
+
+

-

-
Profil sur le forum - Avatar actuel pas d avatar

-
-
(Taille max : 10 ko)

- +


+

Profil sur le forum

+
+ pas d avatar

+ Nouvelle image : +

+ Supprimer mon avatar



-

Les champs avec une * sont obligatoires


+ Les champs avec une * sont obligatoires

@@ -77,10 +100,6 @@ switch($action) //On déclare les variables $mdp_erreur = NULL; $email_erreur1 = NULL; - $email_erreur2 = NULL; - $avatar_erreur = NULL; - $avatar_erreur1 = NULL; - $avatar_erreur2 = NULL; $avatar_erreur3 = NULL; //Encore et toujours notre belle variable $i :p $i = 0; @@ -89,6 +108,7 @@ switch($action) $localisation = $_POST['localisation']; $pass = /*md5*/($_POST['password']); $confirm = /*md5*/($_POST['confirm']); + $extensions_valides = array( 'jpg' , 'jpeg' , 'gif' , 'png' ); //Vérification des champs du formulaire if ($pass != $confirm || empty($confirm) || empty($pass)) { @@ -104,52 +124,19 @@ switch($action) $email_erreur1 = "Votre adresse email est déjà utilisé par un membre"; $i++; } - if (!preg_match("#^[a-z0-9A-Z._-]+@[a-z0-9._-]{2,}\.[a-z]{2,4}$#", $email) || empty($email)) - { - $email_erreur2 = "Votre nouvelle adresse E-Mail n'a pas un format valide"; - $i++; - } } - if (!empty($_FILES['avatar']['size'])) + $data = get_Pseudo(); + $extension_upload = strtolower(substr( strrchr($_FILES['avatar']['name'], '.') ,1)); + if (!in_array($extension_upload,$extensions_valides) ) { - $maxsize = 30072; //Poid de l'image - $maxwidth = 100; //Largeur de l'image - $maxheight = 150; //Longueur de l'image - //Liste des extensions valides - $extensions_valides = array( 'jpg' , 'jpeg' , 'gif' , 'png', 'bmp' ); - if ($_FILES['avatar']['error'] > 0) - { - $avatar_erreur = "Erreur lors du tranfsert de l'avatar : "; - } - if ($_FILES['avatar']['size'] > $maxsize) - { - $i++; - $avatar_erreur1 = "Le fichier est trop gros : - (".$_FILES['avatar']['size']." Octets - contre ".$maxsize." Octets)"; - } - - $image_sizes = getimagesize($_FILES['avatar']['tmp_name']); - if ($image_sizes[0] > $maxwidth OR $image_sizes[1] > $maxheight) - { - $i++; - $avatar_erreur2 = "Image trop large ou trop longue : - (".$image_sizes[0]."x".$image_sizes[1]." contre - ".$maxwidth."x".$maxheight.")"; - } - - $extension_upload = strtolower(substr( strrchr($_FILES['avatar']['name'], '.') ,1)); - if (!in_array($extension_upload,$extensions_valides) ) - { - $i++; - $avatar_erreur3 = "Extension de l'avatar incorrecte"; - } + $i++; + $avatar_erreur3 = "Extension de l'avatar incorrecte"; } if ($i == 0) // Si $i est vide, il n'y a pas d'erreur sur l'avatar { if (!empty($_FILES['avatar']['size'])) { - post_UpdateAvatar(); + post_UpdateAvatar($data['pseudo']); } if (isset($_POST['delete'])) { diff --git a/css/style.css b/css/style.css index 2ab37f0..c0b6a66 100644 --- a/css/style.css +++ b/css/style.css @@ -10,6 +10,7 @@ footer { overflow:hidden; } .container-fluid{ + min-height: 80vh; margin:0 !important; padding:0 !important; } diff --git a/images/activites/Thumbs.db b/images/activites/Thumbs.db deleted file mode 100644 index 46c3a1d..0000000 Binary files a/images/activites/Thumbs.db and /dev/null differ diff --git a/images/articles/Thumbs.db b/images/articles/Thumbs.db deleted file mode 100644 index b842a64..0000000 Binary files a/images/articles/Thumbs.db and /dev/null differ diff --git a/images/autres/Thumbs.db b/images/autres/Thumbs.db index 5fb447d..db35106 100644 Binary files a/images/autres/Thumbs.db and b/images/autres/Thumbs.db differ diff --git a/images/avatars/CCB/img_user.jpeg b/images/avatars/CCB/img_user.jpeg new file mode 100644 index 0000000..b307fb4 Binary files /dev/null and b/images/avatars/CCB/img_user.jpeg differ diff --git a/images/avatars/img_user4.jpg b/images/avatars/DARKY91/img_user.jpg similarity index 100% rename from images/avatars/img_user4.jpg rename to images/avatars/DARKY91/img_user.jpg diff --git a/images/avatars/img_user3.jpg b/images/avatars/FOFO36/img_user.jpg similarity index 100% rename from images/avatars/img_user3.jpg rename to images/avatars/FOFO36/img_user.jpg diff --git a/images/avatars/img_user5.jpg b/images/avatars/MIBO466/img_user.jpg similarity index 100% rename from images/avatars/img_user5.jpg rename to images/avatars/MIBO466/img_user.jpg diff --git a/images/avatars/img_user1.jpg b/images/avatars/PAPI91/img_user.jpg similarity index 100% rename from images/avatars/img_user1.jpg rename to images/avatars/PAPI91/img_user.jpg diff --git a/images/avatars/img_user6.jpg b/images/avatars/RARA/img_user.jpg similarity index 100% rename from images/avatars/img_user6.jpg rename to images/avatars/RARA/img_user.jpg diff --git a/images/avatars/Thumbs.db b/images/avatars/Thumbs.db index 17e90c8..49e10bf 100644 Binary files a/images/avatars/Thumbs.db and b/images/avatars/Thumbs.db differ diff --git a/images/avatars/img_user2.jpg b/images/avatars/sa/img_user.jpg similarity index 100% rename from images/avatars/img_user2.jpg rename to images/avatars/sa/img_user.jpg diff --git a/images/centre/Thumbs.db b/images/centre/Thumbs.db index 5e1ed0f..ac281ad 100644 Binary files a/images/centre/Thumbs.db and b/images/centre/Thumbs.db differ diff --git a/images/chevaux/Thumbs.db b/images/chevaux/Thumbs.db deleted file mode 100644 index 5824e2d..0000000 Binary files a/images/chevaux/Thumbs.db and /dev/null differ diff --git a/images/evenements/Thumbs.db b/images/evenements/Thumbs.db deleted file mode 100644 index 157f068..0000000 Binary files a/images/evenements/Thumbs.db and /dev/null differ diff --git a/images/home/Thumbs.db b/images/home/Thumbs.db deleted file mode 100644 index bc46d89..0000000 Binary files a/images/home/Thumbs.db and /dev/null differ diff --git a/images/sponsors/Thumbs.db b/images/sponsors/Thumbs.db index 934b526..a8e7bee 100644 Binary files a/images/sponsors/Thumbs.db and b/images/sponsors/Thumbs.db differ diff --git a/images/tarifs/Thumbs.db b/images/tarifs/Thumbs.db deleted file mode 100644 index 7b83155..0000000 Binary files a/images/tarifs/Thumbs.db and /dev/null differ diff --git a/modele/connexion_sql.php b/modele/connexion_sql.php index cf94b78..e46d1c4 100644 --- a/modele/connexion_sql.php +++ b/modele/connexion_sql.php @@ -1,9 +1,9 @@ "SET NAMES utf8")); + $bdd = new PDO('mysql:host=nasccb:PORT;dbname=Ecurie', 'USER', 'PASS',array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8")); } catch(Exception $e) { diff --git a/modele/membre/inscription.php b/modele/membre/inscription.php index 7fc4e9b..1d3fd4b 100644 --- a/modele/membre/inscription.php +++ b/modele/membre/inscription.php @@ -27,14 +27,26 @@ function post_Registre() $pseudo=$_POST['pseudo']; $pass = /*md5*/($_POST['password']); $email = $_POST['email']; - $nomavatar=(!empty($_FILES['avatar']['size']))?move_avatar($_FILES['avatar']):''; + mkdir("./images/avatars/".$pseudo."/", 0700); + $nomavatar=(!empty($_FILES['avatar']['size']))?edit_avatar($_FILES['avatar'], $pseudo):''; $localisation = $_POST['localisation']; - $req = $bdd->prepare('INSERT INTO Eleve (pseudo, mdp, adressemail, imageeleve, adresse, dateenregistre) - VALUES (:pseudo, :pass, :email, :nomavatar, :localisation, NOW())'); + $prenom = $_POST['prenom']; + $nom = $_POST['nom']; + $sexe = $_POST['sexe']; + $age = $_POST['age']; + $galop = $_POST['galop']; + $req = $bdd->prepare('INSERT INTO Eleve (pseudo, mdp, adressemail, imageeleve, adresse, prenom, nom, sexe, age, galop, dateenregistre) + VALUES (:pseudo, :pass, :email, :nomavatar, :localisation, :prenom, :nom, :sexe, :age, :galop, NOW())'); $req->bindValue(':pseudo', $pseudo, PDO::PARAM_STR); - $req->bindValue(':pass', $pass, PDO::PARAM_INT); + $req->bindValue(':pass', $pass, PDO::PARAM_STR); $req->bindValue(':email', $email, PDO::PARAM_STR); $req->bindValue(':nomavatar', $nomavatar, PDO::PARAM_STR); $req->bindValue(':localisation', $localisation, PDO::PARAM_STR); + $req->bindValue(':prenom', $prenom, PDO::PARAM_STR); + $req->bindValue(':nom', $nom, PDO::PARAM_STR); + $req->bindValue(':sexe', $sexe, PDO::PARAM_STR); + $req->bindValue(':age', $age, PDO::PARAM_INT); + $req->bindValue(':galop', $galop, PDO::PARAM_INT); + $req->execute(); } \ No newline at end of file diff --git a/modele/membre/profil.php b/modele/membre/profil.php index 9b2ea7d..b59ac56 100644 --- a/modele/membre/profil.php +++ b/modele/membre/profil.php @@ -4,7 +4,7 @@ function get_MemberInfo() global $bdd; $membre = isset($_GET['m'])?(int) $_GET['m']:''; //On récupère les infos du membre - $req = $bdd->prepare('SELECT pseudo, imageeleve, adressemail, dateenregistre, adresse FROM Eleve WHERE ideleve=:membre'); + $req = $bdd->prepare('SELECT pseudo, imageeleve, adressemail, dateenregistre, adresse, prenom, nom, age, galop FROM Eleve WHERE ideleve=:membre'); $req->bindValue(':membre',$membre, PDO::PARAM_INT); $req->execute(); $data = $req->fetch(); @@ -14,8 +14,9 @@ function get_MemberInfoId() { global $bdd; $id=(isset($_SESSION['ideleve']))?(int) $_SESSION['ideleve']:0; + //On prend les infos du membre - $req = $bdd->prepare('SELECT pseudo, adressemail,adresse,imageeleve FROM Eleve WHERE ideleve=:id'); + $req = $bdd->prepare('SELECT pseudo, imageeleve, adressemail, adresse, prenom, nom, age, galop FROM Eleve WHERE ideleve=:id'); $req->bindValue(':id',$id,PDO::PARAM_INT); $req->execute(); $data = $req->fetch(); @@ -32,6 +33,17 @@ function get_checkMail() $data = $req->fetch(); return $data; } +function get_Pseudo() +{ + global $bdd; + $id=(isset($_SESSION['ideleve']))?(int) $_SESSION['ideleve']:0; + //On commence donc par récupérer le pseudo + $req = $bdd->prepare('SELECT pseudo FROM Eleve WHERE ideleve =:id'); + $req->bindValue(':id',$id,PDO::PARAM_INT); + $req->execute(); + $data = $req->fetch(); + return $data; +} function get_checkCopyMail() { global $bdd; @@ -44,11 +56,11 @@ function get_checkCopyMail() $req->CloseCursor(); return $mail_free; } -function post_UpdateAvatar() +function post_UpdateAvatar($pseudo) { global $bdd; $id=(isset($_SESSION['ideleve']))?(int) $_SESSION['ideleve']:0; - $nomavatar=move_avatar($_FILES['avatar']); + $nomavatar=edit_avatar($_FILES['avatar'], $pseudo ); $req = $bdd->prepare('UPDATE Eleve SET imageeleve = :avatar WHERE ideleve = :id'); $req->bindValue(':avatar',$nomavatar,PDO::PARAM_STR); $req->bindValue(':id',$id,PDO::PARAM_INT); @@ -72,7 +84,7 @@ function post_UpdateMember() $email = $_POST['email']; $localisation = $_POST['localisation']; $req = $bdd->prepare('UPDATE Eleve SET mdp = :mdp, adressemail=:mail, adresse=:loc WHERE ideleve=:id'); - $req->bindValue(':mdp',$pass,PDO::PARAM_INT); + $req->bindValue(':mdp',$pass,PDO::PARAM_STR); $req->bindValue(':mail',$email,PDO::PARAM_STR); $req->bindValue(':loc',$localisation,PDO::PARAM_STR); $req->bindValue(':id',$id,PDO::PARAM_INT); diff --git a/vue/footer.html b/vue/footer.html index 499afab..a6a942b 100644 --- a/vue/footer.html +++ b/vue/footer.html @@ -2,7 +2,6 @@ - diff --git a/vue/information/centre/index.html b/vue/information/centre/index.html index 7516f39..f345ca2 100644 --- a/vue/information/centre/index.html +++ b/vue/information/centre/index.html @@ -32,7 +32,7 @@
- +

@@ -49,7 +49,7 @@
- +

@@ -66,7 +66,7 @@
- +

@@ -83,7 +83,7 @@
- +

@@ -100,7 +100,7 @@
- +

@@ -117,7 +117,7 @@
- +
@@ -133,7 +133,7 @@
- +

@@ -150,7 +150,7 @@
- +