From 39a25de5b9e72a998e11f65e99859e070fce09d0 Mon Sep 17 00:00:00 2001 From: Kilian Saffran Date: Wed, 9 Oct 2019 18:08:45 +0200 Subject: [PATCH] v20191009 --- backoffice/api/lib/session.pm | 12 ++++++------ backoffice/tmpl/block/sidebar.tt | 12 ++++++++++++ backoffice/tmpl/module/applications/index.js | 2 +- backoffice/tmpl/module/applications/index.tt | 2 +- backoffice/tmpl/module/billjee/form_billet.js | 19 +++++++++++++++---- backoffice/tmpl/module/billjee/form_billet.tt | 8 ++++---- .../tmpl/module/billjee/form_settings.js | 8 +++++++- backoffice/tmpl/module/billjee/index.js | 2 +- backoffice/tmpl/module/billjee/mybookings.js | 2 +- backoffice/tmpl/module/billjee/mytickets.js | 2 +- .../tmpl/module/billjee/privatetickets.js | 2 +- backoffice/tmpl/module/dashboard/index.js | 4 ++-- tmpl/page/lieu/index.tt | 6 +++--- 13 files changed, 55 insertions(+), 26 deletions(-) diff --git a/backoffice/api/lib/session.pm b/backoffice/api/lib/session.pm index 6756691..9407139 100644 --- a/backoffice/api/lib/session.pm +++ b/backoffice/api/lib/session.pm @@ -28,7 +28,7 @@ sub checklogin(){ $ret->{message} = "Mot de passe ou nom d'utilisateur inconnue!"; $ret->{messagetype} = "danger"; $ret->{sid} = undef; - my $user = $self->{db}->dbquerysorted("select id from users where username= '".$self->{db}->securetext($login)."' and userpassword = '".$pwd."' and \"blocked\" is null;"); + my $user = $self->{db}->dbquerysorted("select id from users where username=LOWER(''".$self->{db}->securetext($login)."') and userpassword = '".$pwd."' and \"blocked\" is null;"); if (keys(%{$user}) > 0){ $ret->{sid} = $self->randomstring(40); $self->{db}->dbexec("DELETE FROM sessions where id_user=".$user->{0}->{id}." and remote_addr='".$ENV{REMOTE_ADDR}."' and user_agent='".$ENV{HTTP_USER_AGENT}."';"); @@ -42,7 +42,7 @@ sub passwordforgotten(){ my $email = shift; my $ret->{messagetype} ='danger'; $ret->{message} = "Email inconnue!"; - my $sql = "select id,userpassword from users where username='".$self->{db}->securetext($email)."';"; + my $sql = "select id,userpassword from users where username=LOWER(''".$self->{db}->securetext($email)."');"; my $ex = $self->{db}->dbquerysorted($sql); if (keys(%{$ex}) > 0){ my $newpwd = $self->randomstring(12); @@ -79,7 +79,7 @@ sub registeruser(){ # $usergroup = 'avocat'; # # } - my $user = $self->{db}->dbquerysorted("select id from users where username='".$data->{email}."';"); + my $user = $self->{db}->dbquerysorted("select id from users where username=LOWER('".$data->{email}."');"); if (keys(%{$user}) > 0){ $ret->{message} = "Un utilisateur avec la même adresse e-mail existe déjà!"; return $ret; @@ -87,14 +87,14 @@ sub registeruser(){ my $newpwd = $self->randomstring(12); my $pwd = sha256_hex($newpwd); my $usergroup = $self->{db}->dbquerysorted("select id from usergroups where usergroup ='avocat';"); - my $newuserid = $self->{db}->dbquerysorted("INSERT INTO users (surname, prename, id_usergroup, username,userpassword) values ('".$data->{surname}."', '".$data->{prename}."','".$usergroup->{0}->{id}."','".$data->{email}."','".$pwd."') returning id;"); + my $newuserid = $self->{db}->dbquerysorted("INSERT INTO users (surname, prename, id_usergroup, username,userpassword) values ('".$data->{surname}."', '".$data->{prename}."','".$usergroup->{0}->{id}."',LOWER(''".$data->{email}."'),'".$pwd."') returning id;"); $self->{db}->dbexec("insert into appaccess (id_user) values (".$newuserid->{0}->{id}.");"); my $maildata->{password} = $newpwd; my $eml = sendemail->new(); - my $mret = $eml->sendemail('user_registration',$newuserid->{0}->{id},$data->{email},$maildata,undef); + my $mret = $eml->sendemail('user_registration',$newuserid->{0}->{id},lc($data->{email}),$maildata,undef); if ($mret == 0){ - $ret->{message} = "Merci pour votre régistration,
nous vous avons envoyé un e-mail, avec les coordonnées de connection nécessaires!"; + $ret->{message} = "Merci pour votre inscription,
nous vous avons envoyé un e-mail, avec les coordonnées de connection nécessaires!"; $ret->{messagetype} = "success"; } return $ret; diff --git a/backoffice/tmpl/block/sidebar.tt b/backoffice/tmpl/block/sidebar.tt index 7ee73c2..4b1901a 100644 --- a/backoffice/tmpl/block/sidebar.tt +++ b/backoffice/tmpl/block/sidebar.tt @@ -9,12 +9,24 @@ Dashboard --> +
  • + + + Logout + +
  • Applications
    • +
  • + + + Profile + +
    • [% FOREACH myapps = viewapps.execute(session.id) %] [% IF myapps.id %]
  • diff --git a/backoffice/tmpl/module/applications/index.js b/backoffice/tmpl/module/applications/index.js index 720fb13..39428ec 100644 --- a/backoffice/tmpl/module/applications/index.js +++ b/backoffice/tmpl/module/applications/index.js @@ -199,7 +199,7 @@ function activation_step(data){ var msg = '
    '; msg += '
    Merci ,
    '; - msg += 'nous vous avons envoyés une email à "'+ data.senderemail + '"
    avec le code d\'activation à entrer ci-dessous!
    '; + msg += 'nous vous avons envoyés un email à "'+ data.senderemail + '"
    avec le code d\'activation à entrer ci-dessous!'; document.getElementById("moderatedmsg").innerHTML= msg; var frmact = '
    '; frmact += '
    '; diff --git a/backoffice/tmpl/module/applications/index.tt b/backoffice/tmpl/module/applications/index.tt index 0633974..16e91b9 100644 --- a/backoffice/tmpl/module/applications/index.tt +++ b/backoffice/tmpl/module/applications/index.tt @@ -95,7 +95,7 @@ [% FOREACH price = prices.execute(modules.id) %]
    [% IF price.evaluation %] - +
    (gratuit / durée: 1 mois) [% ELSIF price.price > 0 %]
    ([% price.price %]€ hTVA / mois) [% END %] diff --git a/backoffice/tmpl/module/billjee/form_billet.js b/backoffice/tmpl/module/billjee/form_billet.js index e51843c..f96b34e 100644 --- a/backoffice/tmpl/module/billjee/form_billet.js +++ b/backoffice/tmpl/module/billjee/form_billet.js @@ -14,20 +14,25 @@ function initpage(){ optcourts.push(opt); } //console.log(optcourts); + var courtvalue = document.getElementById('court').dataset.selected; + var roomvalue = document.getElementById('room').dataset.selected; + //console.log("Selected:" + courtvalue + " " + roomvalue); selcourt = new Choices('#court',{ searchEnabled: false, itemSelectText: 'Sélectionner...', choices: optcourts }); + selcourt.setChoiceByValue(courtvalue); selroom = new Choices('#room',{ searchEnabled: false, itemSelectText: 'Sélectionner...', }); + //selroom.setValue([roomvalue]); seltype = new Choices('#eventtype',{ searchEnabled: false, itemSelectText: 'Sélectionner...', }); - setrooms(); + setrooms(roomvalue); // const onlychoices = new Choices('#eventtype',{ // searchEnabled: false, @@ -81,6 +86,7 @@ function initpage(){ var evid = document.getElementById("id").value; var mindate = "today"; var evdate = document.getElementById("eventdate").value; + var evtime = document.getElementById("starttime").value; if ((evid != "") && (evdate < cdate.toJSON().substring(0,10))){ mindate = document.getElementById("eventdate").value; } @@ -96,7 +102,7 @@ function initpage(){ noCalendar: true, dateFormat: "H:i", "locale": "fr", - defaultDate: "09:00" + defaultDate: evtime }); //setdefaulttext(); @@ -124,7 +130,6 @@ function save_billet(){ } - req.reqdata("POST","process.cgi",tdata,saved_result); @@ -159,9 +164,12 @@ function cleanmsg(){ return false; } -function setrooms(){ +function setrooms(defval=null){ + var tr = document.getElementById("court").value; var ro = document.getElementById("room").value; + if (defval){ + ro = defval; } //console.log(ro); var optrooms = []; //console.log(court[tr]); @@ -179,6 +187,9 @@ function setrooms(){ selroom.setChoiceByValue(optrooms[0].value); //document.getElementById("room").value = ''; } + if (defval){ + selroom.setChoiceByValue(defval); + } return false; } diff --git a/backoffice/tmpl/module/billjee/form_billet.tt b/backoffice/tmpl/module/billjee/form_billet.tt index 2db9036..9f64fb3 100644 --- a/backoffice/tmpl/module/billjee/form_billet.tt +++ b/backoffice/tmpl/module/billjee/form_billet.tt @@ -29,7 +29,7 @@ null as eventmsg, null as eventtype, binv.invites FROM billjee bj
    - +
    @@ -55,13 +55,13 @@ null as eventmsg, null as eventtype, binv.invites FROM billjee bj
    -
    - diff --git a/backoffice/tmpl/module/billjee/form_settings.js b/backoffice/tmpl/module/billjee/form_settings.js index cef4610..ae9d044 100644 --- a/backoffice/tmpl/module/billjee/form_settings.js +++ b/backoffice/tmpl/module/billjee/form_settings.js @@ -33,7 +33,13 @@ function initpage(){ }); } }); - + console.log() + if (document.getElementById('msgrequest').innerHTML == ''){ + document.getElementById('msgrequest').innerHTML ='Nom de l\'affaire:\n\nSalle et heure:\n\nPartie adverse:\n\nAvocat adverse:\n\nInstructions:\n\n-plaise fixer\n-demande délai supplémentaire\n-plaise retenir\n\n\n'; + } + if (document.getElementById('msgoffer').innerHTML == ''){ + document.getElementById('msgoffer').innerHTML ='Nom de l\'affaire:\n\nSalle et heure:\n\nPartie adverse:\n\nAvocat adverse:\n\nInstructions:\n\n-plaise fixer\n-demande délai supplémentaire\n-plaise retenir\n\n\n'; + } } function save_settings(){ diff --git a/backoffice/tmpl/module/billjee/index.js b/backoffice/tmpl/module/billjee/index.js index 4bc525e..19bd231 100644 --- a/backoffice/tmpl/module/billjee/index.js +++ b/backoffice/tmpl/module/billjee/index.js @@ -27,7 +27,7 @@ function display_results(data){ var card = '
    '; card += '

    ' + data.events[i].dspdate + ' - ' + data.events[i].starttime + ' - ' + data.events[i].court + ' - ' + data.events[i].room +'

    '+ '
    ' + ((data.events[i].eventtype == 'offer')?'Offre de disponibilité - Présence de ':'Demande lecture de billet de ') + data.events[i].surname + ' ' + data.events[i].prename + '
    '+'
    '; - card += '
    ' + data.events[i].msg + '
    '; + card += '
    ' + ((data.events[i].msg)?data.events[i].msg:'') + '
    '; card += '
    '; card += ''; card += '
    '; diff --git a/backoffice/tmpl/module/billjee/mybookings.js b/backoffice/tmpl/module/billjee/mybookings.js index 6d5012c..89b7212 100644 --- a/backoffice/tmpl/module/billjee/mybookings.js +++ b/backoffice/tmpl/module/billjee/mybookings.js @@ -35,7 +35,7 @@ function display_results(data){ var card = '
    '; card += '

    ' + data.events[i].dspdate + ' - ' + data.events[i].starttime + ' - ' + data.events[i].court + ' - ' + data.events[i].room +'

    '+ '
    ' + ((data.events[i].eventtype == 'offer')?'Offre de disponibilité - Présence de ':'Demande lecture de billet de ') + data.events[i].surname + ' ' + data.events[i].prename + '
    '+'
    '; - card += '
    ' + data.events[i].msg + '
    '; + card += '
    ' + ((data.events[i].msg)?data.events[i].msg:'') + '
    '; card += '