diff --git a/htdocs/adherents/adherent.class.php b/htdocs/adherents/adherent.class.php index bdc1ac1ef6e9dbef2e5f181072a891b8fdf73d0b..3b84c1847ed7d122f5919e1d099d0c924ce7d4b8 100644 --- a/htdocs/adherents/adherent.class.php +++ b/htdocs/adherents/adherent.class.php @@ -444,7 +444,7 @@ class Adherent $sql .= ",fk_adherent_type=".$this->typeid; $sql .= ",morphy=" ."'".$this->morphy."'"; - $sql .= ",naiss=" .($this->naiss?"'".$this->db->idate($this->naiss)."'":"null"); + $sql .= ",naiss=" .($this->naiss?"'".$this->naiss."'":"null"); if ($this->datefin) $sql .= ",datefin='".$this->db->idate($this->datefin)."'"; // Ne doit etre modifi� que par effacement cotisation if ($this->datevalid) $sql .= ",datevalid='".$this->db->idate($this->datevalid)."'"; // Ne doit etre modifi� que par validation adherent @@ -604,7 +604,7 @@ class Adherent $sql.= " ".$this->db->pdate("d.datec")." as datec,"; $sql.= " ".$this->db->pdate("d.tms")." as datem,"; $sql.= " ".$this->db->pdate("d.datefin")." as datefin,"; - $sql.= " ".$this->db->pdate("d.naiss")." as datenaiss,"; + $sql.= " d.naiss as datenaiss,"; $sql.= " ".$this->db->pdate("d.datevalid")." as datev,"; $sql.= " d.pays,"; $sql.= " p.rowid as pays_id, p.code as pays_code, p.libelle as pays_lib,"; diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index a3d7aa6ceba3c58596e196ac18b5054928c81696..c159ade397072e05c313db547643f9ba6a195afc 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -135,10 +135,18 @@ if ($_REQUEST["action"] == 'update' && ! $_POST["cancel"]) { $datenaiss=''; if (isset($_POST["naissday"]) && $_POST["naissday"] - && isset($_POST["naissmonth"]) + && isset($_POST["naissmonth"]) && $_POST["naissmonth"] && isset($_POST["naissyear"]) && $_POST["naissyear"]) { - $datenaiss=@mktime(12, 0 , 0, $_POST["naissmonth"], $_POST["naissday"], $_POST["naissyear"]); + #$datenaiss=@mktime(12, 0 , 0, $_POST["naissmonth"], $_POST["naissday"], $_POST["naissyear"]); + $naissday = (int) $_POST["naissday"]; + $naissmonth = (int) $_POST["naissmonth"]; + $naissyear = (int) $_POST["naissyear"]; + if($naissmonth>=1 && $naissmonth<=12 + && $naissday>=1 && $naissday<=31 + && $naissyear>=1850 && $naissyear<=date('Y')) { + $datenaiss=$naissyear.$naissmonth.$naissday; + } } $adh->id = $_POST["rowid"]; @@ -199,6 +207,14 @@ if ($_POST["action"] == 'add') && isset($_POST["naissyear"]) && $_POST["naissyear"]) { $datenaiss=@mktime(12, 0 , 0, $_POST["naissmonth"], $_POST["naissday"], $_POST["naissyear"]); + $naissday = (int) $_POST["naissday"]; + $naissmonth = (int) $_POST["naissmonth"]; + $naissyear = (int) $_POST["naissyear"]; + if($naissmonth>=1 && $naissmonth<=12 + && $naissday>=1 && $naissday<=31 + && $naissyear>=1850 && $naissyear<=date('Y')) { + $datenaiss=$naissyear.$naissmonth.$naissday; + } } $datecotisation=''; if (isset($_POST["naissday"]) && isset($_POST["naissmonth"]) && isset($_POST["naissyear"]))