Piou-piou / ribs-framework

core/mail/Mail.class.php

Indentation +53 added lines, -53 removed lines

@@ -1,69 +1,69 @@
 <?php
 
-    namespace core\mail;
+	namespace core\mail;
         
-    class Mail {
-        private $mail;
+	class Mail {
+		private $mail;
     
     
-        //-------------------------- CONSTRUCTEUR ----------------------------------------------------------------------------//
-        public function __construct($mail = null) {
-            $this->mail = $mail;
-        }
-        //-------------------------- FIN CONSTRUCTEUR ----------------------------------------------------------------------------//
+		//-------------------------- CONSTRUCTEUR ----------------------------------------------------------------------------//
+		public function __construct($mail = null) {
+			$this->mail = $mail;
+		}
+		//-------------------------- FIN CONSTRUCTEUR ----------------------------------------------------------------------------//
     
     
     
-        //-------------------------- GETTER ----------------------------------------------------------------------------//
-        //-------------------------- FIN GETTER ----------------------------------------------------------------------------//
+		//-------------------------- GETTER ----------------------------------------------------------------------------//
+		//-------------------------- FIN GETTER ----------------------------------------------------------------------------//
 
 
     
-        //-------------------------- SETTER ----------------------------------------------------------------------------//
-        /**
-         * fonction qui permet de valider si un E-mail est valide
-         * @return bool
-         */
-        public function setVerifierMail() {
-            if (filter_var($this->mail, FILTER_VALIDATE_EMAIL)) {
-                return true;
-            }
-            else {
-                return false;
-            }
-        }
+		//-------------------------- SETTER ----------------------------------------------------------------------------//
+		/**
+		 * fonction qui permet de valider si un E-mail est valide
+		 * @return bool
+		 */
+		public function setVerifierMail() {
+			if (filter_var($this->mail, FILTER_VALIDATE_EMAIL)) {
+				return true;
+			}
+			else {
+				return false;
+			}
+		}
 
-        /**
-         * fonction qui permet d'envoyer un mail
-         * @param $sujet
-         * @param $message
-         * @param null $destinataire -> si  null on envoi un mail au gerant du site
-         * @param null $destinataire -> si  null on emet le gerant du site car mail vient depuis l'admin
-         * @return bool
-         */
-        public function setEnvoyerMail($sujet, $message, $destinataire = null, $from = null) {
-            //on récupere le mail du site
-            $config = new \core\Configuration();
+		/**
+		 * fonction qui permet d'envoyer un mail
+		 * @param $sujet
+		 * @param $message
+		 * @param null $destinataire -> si  null on envoi un mail au gerant du site
+		 * @param null $destinataire -> si  null on emet le gerant du site car mail vient depuis l'admin
+		 * @return bool
+		 */
+		public function setEnvoyerMail($sujet, $message, $destinataire = null, $from = null) {
+			//on récupere le mail du site
+			$config = new \core\Configuration();
 
-            if ($from == null) $from = $config->getMailSite();
+			if ($from == null) $from = $config->getMailSite();
 
-            $headers = 'Content-type: text/html; charset=utf-8'."\r\n";
-            $headers .= "From: ".$from;
+			$headers = 'Content-type: text/html; charset=utf-8'."\r\n";
+			$headers .= "From: ".$from;
 
-            //si pas de destinataire on envoi le mail au gérant du site car c'est un mail envoyé par le site lui même
-            if (($destinataire == null) && ($this->mail == null)) {
-                $destinataire = $config->getMailSite();
-            }
-            else if ($destinataire == null) {
-                $destinataire = $this->mail;
-            }
+			//si pas de destinataire on envoi le mail au gérant du site car c'est un mail envoyé par le site lui même
+			if (($destinataire == null) && ($this->mail == null)) {
+				$destinataire = $config->getMailSite();
+			}
+			else if ($destinataire == null) {
+				$destinataire = $this->mail;
+			}
 
-            if (mail($destinataire, $sujet, $message, $headers)) {
-                return true;
-            }
-            else {
-                return false;
-            }
-        }
-        //-------------------------- FIN SETTER ----------------------------------------------------------------------------//
-    }
\ No newline at end of file
+			if (mail($destinataire, $sujet, $message, $headers)) {
+				return true;
+			}
+			else {
+				return false;
+			}
+		}
+		//-------------------------- FIN SETTER ----------------------------------------------------------------------------//
+	}
\ No newline at end of file

core/Configuration.class.php

Indentation +43 added lines, -43 removed lines

@@ -1,14 +1,14 @@ 
 <?php
-    namespace core;
+	namespace core;
 
 
 	class Configuration {
 		//pour la configuration générale du site
-        private $nom_site; //-> nom du site
-        private $mail_site; //-> pour le gérant du site contact@nomdedomaine;com
-        private $gerant_site; //->nom du gérant du site
-        private $url_site; //-> url de site
-        private $mail_administrateur; //-> mail de l'administrateur web@clicand.com
+		private $nom_site; //-> nom du site
+		private $mail_site; //-> pour le gérant du site contact@nomdedomaine;com
+		private $gerant_site; //->nom du gérant du site
+		private $url_site; //-> url de site
+		private $mail_administrateur; //-> mail de l'administrateur web@clicand.com
 		private $last_save; //-> derniere sauvegarde de la bdd
 		private $acces_admin; //-> si == 1 on a acces à l'admin
 		private $contenu_dynamique; //->savoir si es contenus sont dynamique (stockés in DB)
@@ -21,24 +21,24 @@ 
 		private $activer_connexion;
 
 
-        //-------------------------- CONSTRUCTEUR ----------------------------------------------------------------------------//
-        public function __construct() {
-            $dbc = \core\App::getDb();
+		//-------------------------- CONSTRUCTEUR ----------------------------------------------------------------------------//
+		public function __construct() {
+			$dbc = \core\App::getDb();
 
 			//pour la configuration générale du site
-            $query = $dbc->query("SELECT * FROM configuration WHERE ID_configuration=1");
-            foreach ($query as $obj) {
-                $this->nom_site = $obj->nom_site;
-                $this->mail_site = $obj->mail_site;
-                $this->gerant_site = $obj->gerant_site;
-                $this->url_site = $obj->url_site;
-                $this->mail_administrateur = $obj->mail_administrateur;
-                $this->last_save = $obj->last_save;
+			$query = $dbc->query("SELECT * FROM configuration WHERE ID_configuration=1");
+			foreach ($query as $obj) {
+				$this->nom_site = $obj->nom_site;
+				$this->mail_site = $obj->mail_site;
+				$this->gerant_site = $obj->gerant_site;
+				$this->url_site = $obj->url_site;
+				$this->mail_administrateur = $obj->mail_administrateur;
+				$this->last_save = $obj->last_save;
 				$this->acces_admin = $obj->acces_admin;
 				$this->contenu_dynamique = $obj->contenu_dynamique;
 				$this->responsive = $obj->responsive;
 				$this->cache = $obj->cache;
-            }
+			}
 
 			//pour la configuration des comptes
 			$query = $dbc->query("SELECT * FROM configuration_compte WHERE ID_configuration_compte=1");
@@ -47,31 +47,31 @@ 
 				$this->activer_inscription = $obj->activer_inscription;
 				$this->activer_connexion = $obj->activer_connexion;
 			}
-        }
-        //-------------------------- FIN CONSTRUCTEUR ----------------------------------------------------------------------------//
+		}
+		//-------------------------- FIN CONSTRUCTEUR ----------------------------------------------------------------------------//
 
 
 
-        //-------------------------- GETTER ----------------------------------------------------------------------------//
+		//-------------------------- GETTER ----------------------------------------------------------------------------//
 		//pour la configuration générale du site
-        public function getNomSite() {
-            return $this->nom_site;
-        }
-        public function getMailSite() {
-            return $this->mail_site;
-        }
-        public function getGerantSite() {
-            return $this->gerant_site;
-        }
-        public function getUrlSite() {
-            return $this->url_site;
-        }
-        public function getMailAdministrateur() {
-            return $this->mail_administrateur;
-        }
-        public function getLastSave() {
-            return $this->last_save;
-        }
+		public function getNomSite() {
+			return $this->nom_site;
+		}
+		public function getMailSite() {
+			return $this->mail_site;
+		}
+		public function getGerantSite() {
+			return $this->gerant_site;
+		}
+		public function getUrlSite() {
+			return $this->url_site;
+		}
+		public function getMailAdministrateur() {
+			return $this->mail_administrateur;
+		}
+		public function getLastSave() {
+			return $this->last_save;
+		}
 		public function getAccesAdmin() {
 			return $this->acces_admin;
 		}
@@ -95,11 +95,11 @@ 
 		public function getActiverConnexion() {
 			return $this->activer_connexion;
 		}
-        //-------------------------- FIN GETTER ----------------------------------------------------------------------------//
+		//-------------------------- FIN GETTER ----------------------------------------------------------------------------//
 
 
 
-        //-------------------------- SETTER ----------------------------------------------------------------------------//
+		//-------------------------- SETTER ----------------------------------------------------------------------------//
 		/**
 		 * fonction qui permet de mettre à jour la date de la derniere save de la bdd
 		 * + supprimer la sauverde ancienne d'il y a 1 mois
@@ -123,5 +123,5 @@ 
 				unlink(ROOT."bdd_backup/".$nom_save);
 			}
 		}
-        //-------------------------- FIN SETTER ----------------------------------------------------------------------------//
-    }
\ No newline at end of file
+		//-------------------------- FIN SETTER ----------------------------------------------------------------------------//
+	}
\ No newline at end of file

core/modules/GestionModule.class.php

Spacing +2 added lines, -2 removed lines

@@ -198,12 +198,12 @@
 						}
 
 						//on recupere le nom du dossier + extention
-						$explode  = explode(".", $obj->url_telechargement);
+						$explode = explode(".", $obj->url_telechargement);
 						array_pop($explode);
 
 						$version_txt = implode(".", $explode)."_version.txt";
 
-						if(file_get_contents($version_txt) !== "") {
+						if (file_get_contents($version_txt) !== "") {
 
 							//online pour bdd
 							$version_online_txt = file_get_contents($version_txt);

core/images/Resize.class.php

Spacing +6 added lines, -6 removed lines

@@ -195,14 +195,14 @@ 
 			private function crop($optimalWidth, $optimalHeight, $newWidth, $newHeight)
 			{
 				// *** Find center - this will be used for the crop
-				$cropStartX = ( $optimalWidth / 2) - ( $newWidth /2 );
-				$cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 );
+				$cropStartX = ($optimalWidth / 2) - ($newWidth / 2);
+				$cropStartY = ($optimalHeight / 2) - ($newHeight / 2);
 
 				$crop = $this->imageResized;
 
 				// *** Now crop from center to exact requested size
-				$this->imageResized = imagecreatetruecolor($newWidth , $newHeight);
-				imagecopyresampled($this->imageResized, $crop , 0, 0, $cropStartX, $cropStartY, $newWidth, $newHeight , $newWidth, $newHeight);
+				$this->imageResized = imagecreatetruecolor($newWidth, $newHeight);
+				imagecopyresampled($this->imageResized, $crop, 0, 0, $cropStartX, $cropStartY, $newWidth, $newHeight, $newWidth, $newHeight);
 			}
 
 			## --------------------------------------------------------
@@ -210,13 +210,13 @@ 
 			 * @param string $savePath
 			 * @param string $imageQuality
 			 */
-			public function saveImage($savePath, $imageQuality="100")
+			public function saveImage($savePath, $imageQuality = "100")
 			{
 				// *** Get extension
         		$extension = strrchr($savePath, '.');
        			$extension = strtolower($extension);
 
-				switch($extension)
+				switch ($extension)
 				{
 					case '.jpg':
 					case '.jpeg':

Braces +7 added lines, -7 removed lines

@@ -139,19 +139,19 @@
 
 			private function getSizeByAuto($newWidth, $newHeight)
 			{
-				if ($this->height < $this->width)
-				// *** Image to be resized is wider (landscape)
+				if ($this->height < $this->width) {
+								// *** Image to be resized is wider (landscape)
 				{
 					$optimalWidth = $newWidth;
-					$optimalHeight = $this->getSizeByFixedWidth($newWidth);
 				}
-				elseif ($this->height > $this->width)
-				// *** Image to be resized is taller (portrait)
+					$optimalHeight = $this->getSizeByFixedWidth($newWidth);
+				} elseif ($this->height > $this->width) {
+								// *** Image to be resized is taller (portrait)
 				{
 					$optimalWidth = $this->getSizeByFixedHeight($newHeight);
-					$optimalHeight = $newHeight;
 				}
-				else
+					$optimalHeight = $newHeight;
+				} else
 				// *** Image to be resizerd is a square
 				{
 					if ($newHeight < $newWidth) {

core/auth/Membre.class.php

Braces +11 added lines, -22 removed lines

@@ -36,8 +36,7 @@ 
 
 					if ($obj->img_profil == "") {
 						$this->img = $this->debut_lien."defaut.png";
-					}
-					else {
+					} else {
 						$this->img = $obj->img_profil;
 					}
 				}
@@ -122,16 +121,13 @@ 
 			if (strlen($new_pseudo) < 5) {
 				$err = "Votre pseudo est trop court";
 				$this->erreur = $err;
-			}
-			else if (strlen($new_pseudo) > 15) {
+			} else if (strlen($new_pseudo) > 15) {
 				$err = "Votre pseudo est trop long";
 				$this->erreur = $err;
-			}
-			else if ($new_pseudo == $pseudo_bdd) {
+			} else if ($new_pseudo == $pseudo_bdd) {
 				$err = "Ce pseudo est déjà utilisé, veuillez en choisir un autre";
 				$this->erreur = $err;
-			}
-			else {
+			} else {
 				$dbc->query("UPDATE identite set pseudo=$new_pseudo WHERE ID_identite=".$_SESSION["idlogin".CLEF_SITE]);
 				$this->pseudo = $new_pseudo;
 			}
@@ -152,24 +148,20 @@ 
 			if (md5($old_mdp) != $mdp) {
 				$err = "Votre mot de passe est incorrect";
 				$this->erreur = $err;
-			}
-			else {
+			} else {
 				if ($new_mdp != $verif_new_mdp) {
 					$err = "Vos mots de passe sont différents";
 					$this->erreur = $err;
-				}
-				else {
+				} else {
 					$testmdp = $this->testpassword($new_mdp);
 					
 					if (strlen($new_mdp) < 5) {
 						$err = "Votre mot de passe est trop court";
 						$this->erreur = $err;
-					}
-					else if ($testmdp < 40) {
+					} else if ($testmdp < 40) {
 						$err = "Votre mot de passe est trop simple";
 						$this->erreur = $err;
-					}
-					else {
+					} else {
 						$mdpok = Encrypt::setEncryptMdp($new_mdp, $this->id_identite);
 						//le nouveau mdp est bon on update
 						$dbc->query("UPDATE identite SET mdp='$mdpok' WHERE ID_identite=".$this->id_identite);
@@ -199,16 +191,13 @@ 
 				if ($lettre >= 'a' && $lettre <= 'z') {
 					$point = $point + 1;
 					$point_min = 1;
-				}
-				else if ($lettre >= 'A' && $lettre <= 'Z') {
+				} else if ($lettre >= 'A' && $lettre <= 'Z') {
 					$point = $point + 2;
 					$point_maj = 2;
-				}
-				else if ($lettre >= '0' && $lettre <= '9') {
+				} else if ($lettre >= '0' && $lettre <= '9') {
 					$point = $point + 3;
 					$point_chiffre = 3;
-				}
-				else {
+				} else {
 					$point = $point + 5;
 					$point_caracteres = 5;
 				}

core/auth/Encrypt.class.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 		 * @param null $id_identite
 		 * @return mixed
 		 */
-		public static function getParams($id_identite=null) {
+		public static function getParams($id_identite = null) {
 			if ($id_identite != null) {
 				$dbc = App::getDb();
 

core/form/FormValidator.class.php

Indentation +36 added lines, -36 removed lines

@@ -1,48 +1,48 @@
 <?php
-    namespace core\form;
+	namespace core\form;
 
-    class FormValidator {
-        private $datas = [];
-        private $errors = [];
+	class FormValidator {
+		private $datas = [];
+		private $errors = [];
 
 
-        //-------------------------- CONSTRUCTEUR ----------------------------------------------------------------------------//
-        public function __construct($datas) {
-            $this->datas = $datas;
-        }
-        //-------------------------- FIN CONSTRUCTEUR ----------------------------------------------------------------------------//
+		//-------------------------- CONSTRUCTEUR ----------------------------------------------------------------------------//
+		public function __construct($datas) {
+			$this->datas = $datas;
+		}
+		//-------------------------- FIN CONSTRUCTEUR ----------------------------------------------------------------------------//
 
 
-        //-------------------------- GETTER ----------------------------------------------------------------------------//
-        public function Check($name, $rule, $option = null) {
-            $validator = "validate".ucfirst($rule);
+		//-------------------------- GETTER ----------------------------------------------------------------------------//
+		public function Check($name, $rule, $option = null) {
+			$validator = "validate".ucfirst($rule);
 
-            if (!$this->$validator($name, $option)) {
-                $this->errors[$name] = "Le champ $name n'a pas été rempli correctement";
-            }
-        }
+			if (!$this->$validator($name, $option)) {
+				$this->errors[$name] = "Le champ $name n'a pas été rempli correctement";
+			}
+		}
 
-        public function getErrors() {
-            if (!empty($this->errors)) {
-                $errors = "<ul>";
-                foreach ($this->errors as $error) {
-                    $errors .= "<li>".$error."</li>";
-                }
-                $errors .= "</ul>";
+		public function getErrors() {
+			if (!empty($this->errors)) {
+				$errors = "<ul>";
+				foreach ($this->errors as $error) {
+					$errors .= "<li>".$error."</li>";
+				}
+				$errors .= "</ul>";
 
-                return $errors;
-            }
-        }
-        //-------------------------- FIN GETTER ----------------------------------------------------------------------------//
+				return $errors;
+			}
+		}
+		//-------------------------- FIN GETTER ----------------------------------------------------------------------------//
 
 
-        //-------------------------- SETTER ----------------------------------------------------------------------------//
-        public function validateRequired($name) {
-            return array_key_exists($name, $this->datas) && $this->datas[$name] != "";
-        }
+		//-------------------------- SETTER ----------------------------------------------------------------------------//
+		public function validateRequired($name) {
+			return array_key_exists($name, $this->datas) && $this->datas[$name] != "";
+		}
 
-        public function validateEmail($name) {
-            return array_key_exists($name, $this->datas) && filter_var($this->datas[$name], FILTER_VALIDATE_EMAIL);
-        }
-        //-------------------------- FIN SETTER ----------------------------------------------------------------------------//
-    }
\ No newline at end of file
+		public function validateEmail($name) {
+			return array_key_exists($name, $this->datas) && filter_var($this->datas[$name], FILTER_VALIDATE_EMAIL);
+		}
+		//-------------------------- FIN SETTER ----------------------------------------------------------------------------//
+	}
\ No newline at end of file