diff --git a/Controleur/ControleurAjaxuserrhclient.php b/Controleur/ControleurAjaxuserrhclient.php index 20c72c5..cebee0b 100755 --- a/Controleur/ControleurAjaxuserrhclient.php +++ b/Controleur/ControleurAjaxuserrhclient.php @@ -65,14 +65,11 @@ class ControleurAjaxuserrhclient extends Controleur { $email = $this->requete->getParametreFormulaire("email"); $motPass = $this->requete->getParametreFormulaire("motPass"); $codeLangue = $this->requete->getParametreFormulaire("codeLangue"); - $actVisible = $this->requete->getParametreFormulaire("actVisible"); - $AffectionVisible = $this->requete->getParametreFormulaire("AffectionVisible"); $codeModeGenerationPass = $this->requete->getParametreFormulaire("codeModeGenerationPass"); $codeModeEnvoiPass = $this->requete->getParametreFormulaire("codeModeEnvoiPass"); $codeProfil = $this->requete->getParametreFormulaire("codeProfil"); - if($this->client->existelogin($codeUtilisateur)) { @@ -80,8 +77,8 @@ class ControleurAjaxuserrhclient extends Controleur { } else { - $this->client->creeruser($codeUtilisateur, $nom, $prenoms, $telephone, $email, $motPass, $codeLangue, $actVisible, - $AffectionVisible, $codeModeGenerationPass, $codeModeEnvoiPass, $codeProfil); + $this->client->creeruser($codeUtilisateur, $nom, $prenoms, $telephone, $email, $motPass, $codeLangue, + $codeModeGenerationPass, $codeModeEnvoiPass, $codeProfil); $this->genererVueAjax(array('uniciteLogin' => "1", 'msgErreur' => "Utlisateur $codeUtilisateur créé avec succès!")); } diff --git a/Controleur/ControleurConnexion.php b/Controleur/ControleurConnexion.php index d98e91f..40bb52b 100644 --- a/Controleur/ControleurConnexion.php +++ b/Controleur/ControleurConnexion.php @@ -325,16 +325,6 @@ require_once 'Framework/Localisation.php'; $this->requete->getSession()->setAttribut("nomClient_C", $utilisateur['nomClient']); $this->requete->getSession()->setAttribut("prenomClient_C", $utilisateur['prenomClient']); - $this->requete->getSession()->setAttribut("adresseGeoClient_C", $utilisateur['adresseGeoClient']); - $this->requete->getSession()->setAttribut("boitepostaleClient_C", $utilisateur['boitepostaleClient']); - $this->requete->getSession()->setAttribut("telephoneBureauClient_C", $utilisateur['telephoneBureauClient']); - $this->requete->getSession()->setAttribut("telephonePortableClient_C", $utilisateur['telephonePortableClient']); - $this->requete->getSession()->setAttribut("faxClient_C", $utilisateur['faxClient']); - $this->requete->getSession()->setAttribut("emailClient_C", $utilisateur['emailClient']); - - $this->requete->getSession()->setAttribut("villeClient_C", $utilisateur['villeClient']); - $this->requete->getSession()->setAttribut("paysClient_C", $utilisateur['paysClient']); - $this->requete->getSession()->setAttribut("idPolice_C", ""); $this->requete->getSession()->setAttribut("numeroPolice_C", ""); $this->requete->getSession()->setAttribut("codeGcAssureur_C", ""); @@ -520,7 +510,6 @@ require_once 'Framework/Localisation.php'; $this->requete->getSession()->setAttribut("largeurPhoto", $utilisateur['largeurPhoto']); $this->requete->getSession()->setAttribut("longueurPhoto", $utilisateur['longueurPhoto']); - $this->requete->getSession()->setAttribut("assureAjoutPhoto", $utilisateur['assureAjoutPhoto']); $_SESSION['fingerActif'] = '0'; $_SESSION['faceActif'] = '0'; @@ -531,8 +520,8 @@ require_once 'Framework/Localisation.php'; $logo = 'Societes/'.$_SESSION['codeSociete'].'/images/logo_etat.png'; $this->requete->getSession()->setAttribut("lienLogo", $logo); - $this->requete->getSession()->setAttribut("dossierAssure", $utilisateur['dossierAssure']); - $dossierLogo=$_SESSION['dossierAssure']."/images/logo_etat.png"; + $this->requete->getSession()->setAttribut("dossierRh", $utilisateur['dossierRh']); + $dossierLogo=$_SESSION['dossierRh']."/images/logo_etat.png"; $this->requete->getSession()->setAttribut("dossierLogo", $dossierLogo); $_SESSION['idLogapiface'] = "0"; @@ -543,6 +532,32 @@ require_once 'Framework/Localisation.php'; $_SESSION['derniere_action'] = time(); $_SESSION['superUser'] = '0'; + + $passExpired = ( ($dureeViePassWord>"0") && ($agePass>$dureeViePassWord) ); + $_SESSION['passExpired'] = $passExpired; + + /* + var_dump( + array( + "verifierLongueurPass" => $_SESSION['verifierLongueurPass'], + "longueurPassWord" => $longueurPassWord, + "motCourt" => $motCourt, + "motCourt" => $changerMotPassDefaut, + "dureeViePassWord" => $dureeViePassWord, + "agePass" => $agePass, + "agePass" => $agePass, + "passExpired" => $passExpired, + "dossierRh" => $_SESSION['dossierRh'], + "dossierLogo" => $_SESSION['dossierLogo'], + ) + ); + exit(); + */ + + $this->requete->getSession()->setAttribut("dossierRh", $utilisateur['dossierRh']); + $dossierLogo=$_SESSION['dossierRh']."/images/logo_etat.png"; + $this->requete->getSession()->setAttribut("dossierLogo", $dossierLogo); + if(($motCourt===true) or ($changerMotPassDefaut===true) or ($passExpired===true)) diff --git a/Js/fonctions.js b/Js/fonctions.js index e7ef695..7fddee2 100755 --- a/Js/fonctions.js +++ b/Js/fonctions.js @@ -4383,8 +4383,6 @@ function creer_user_rh_client() codeProfil = $("#codeProfil").val(); codeLangue = $("#codeLangueUser").val(); - actVisible = "0"; - AffectionVisible = "0"; nvmdp = $("#nvmdp").val(); cfnvmdp = $("#cfnvmdp").val(); @@ -4491,8 +4489,7 @@ function creer_user_rh_client() donnees = 'codeUtilisateur='+codeUtilisateur; donnees += '&nom='+nom+'&prenoms='+prenoms; donnees += '&telephone='+telephone+'&email='+email+'&motPass='+motPass; - donnees += '&codeLangue='+codeLangue+'&actVisible='+actVisible; - donnees += '&AffectionVisible='+AffectionVisible; + donnees += '&codeLangue='+codeLangue, donnees += '&codeModeGenerationPass='+codeModeGenerationPass; donnees += '&codeModeEnvoiPass='+codeModeEnvoiPass; donnees += '&codeProfil=' + codeProfil; diff --git a/Modele/Client.php b/Modele/Client.php index 1fd8153..dee7497 100755 --- a/Modele/Client.php +++ b/Modele/Client.php @@ -1,5 +1,6 @@ $codeSociete, + "idClient" => $idClient, + "numeroClient" => $numeroClient, + "codeUtilisateur" => $codeUtilisateur, + "nom" => $nom, + "prenoms" => $prenoms, + "telephone" => $telephone, + "email" => $email, + "hash" => $hash, + "codeLangue" => $codeLangue, + "user" => $user, + "user" => $user, + "codeModeGenerationPass" => $codeModeGenerationPass, + "passAutoGen" => $passAutoGen, + "codeModeEnvoiPass" => $codeModeEnvoiPass, + "motPass" => $motPass, + "codeProfil" => $codeProfil, + ) + ); + exit(); + */ + $this->executerRequete($sql, array($codeSociete, $idClient, $numeroClient, $codeUtilisateur, $nom, $prenoms, $telephone, - $email, $hash, $codeLangue, $actVisible, $AffectionVisible, $user, $codeModeGenerationPass, - $passAutoGen, $codeModeEnvoiPass, $motPass, $codeProfil)); + $email, $hash, $codeLangue, $user, $codeModeGenerationPass, $passAutoGen, $codeModeEnvoiPass, $motPass, $codeProfil)); } } \ No newline at end of file diff --git a/Vue/gabarit.php b/Vue/gabarit.php index dc524e6..5e963a9 100755 --- a/Vue/gabarit.php +++ b/Vue/gabarit.php @@ -665,7 +665,7 @@ $photoAssureCrypte = $_SESSION['photoAssureCrypte']; - +