From: Kilian Saffran Date: Fri, 22 Mar 2019 15:40:57 +0000 (+0100) Subject: misc bugfixes X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=ba441b48c44a360a37f80fc5a9d91202f49141e8;p=juridig.git misc bugfixes --- diff --git a/.htaccess b/.htaccess index c523b66..2f9ed54 100644 --- a/.htaccess +++ b/.htaccess @@ -1,3 +1,6 @@ +#php_flag display_startup_errors on +#php_flag display_errors on +#php_flag html_errors on RewriteEngine On RewriteCond %{REQUEST_FILENAME} !-f diff --git a/img/annuaire.svg b/img/annuaire.svg index c249b8f..d47efcb 100644 --- a/img/annuaire.svg +++ b/img/annuaire.svg @@ -5,11 +5,35 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg8" version="1.1" viewBox="0 0 88 68" height="68mm" - width="88mm"> + width="88mm" + sodipodi:docname="annuaire.svg" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)"> + image/svg+xml - + + - - - - - - - - - - - - - - - - - - + aria-label="J" + transform="matrix(1.7869838,0,0,1.9713676,-6.7342621,-350.87621)" + style="font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.6859417px;font-family:'Good Times Rg';-inkscape-font-specification:GoodTimesRg-Regular;writing-mode:lr-tb;fill:#dddad4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.33374342" + id="text857"> + + + + diff --git a/lib/mail.log b/lib/mail.log index 2ef460e..fdc9107 100644 --- a/lib/mail.log +++ b/lib/mail.log @@ -4,3 +4,4 @@ perl "/mnt/c/Users/ksaff/Workspace/Websites/juridig/lib/sendEmail" -f support@dk Mar 20 11:36:46 dks-laptop sendEmail[500]: ERROR => mail.your-server.de:587 returned a zero byte response to our query. perl "/mnt/c/Users/ksaff/Workspace/Websites/juridig/lib/sendEmail" -f support@dks.lu -s "mail.your-server.de:587" -xu "ksaffran@dks.lu" -xp "FB1ia1ka" -q -l "/mnt/c/Users/ksaff/Workspace/Websites/juridig/lib/mail.log" -o tls=auto -o message-content-type=html -o message-charset=utf-8 -t "kilian@saffran.lu" -u "Votre demande de rendezvous via juridig.lu" -m "
\"juridig\"

Bonjour,

Vous avez demandé un rendez-vous via juridig.lu,


Confirmer la demande
Annuler la demande

Meilleurs Salutations,

votre équipe de juridig.lu
\"juridig\"
l\'avocat en ère numerique
" Mar 20 11:41:46 dks-laptop sendEmail[502]: Email was sent successfully! From: To: Subject: [Votre demande de rendezvous via juridig.lu] Server: [mail.your-server.de:587] perl "/mnt/c/Users/ksaff/Workspace/Websites/juridig/lib/sendEmail" -f support@dks.lu -s "mail.your-server.de:587" -xu "ksaffran@dks.lu" -xp "FB1ia1ka" -q -l "/mnt/c/Users/ksaff/Workspace/Websites/juridig/lib/mail.log" -o tls=auto -o message-content-type=html -o message-charset=utf-8 -t "kilian@saffran.lu" -u "Votre demande de rendezvous via juridig.lu" -m "
\"juridig\"

Bonjour,

Vous avez demandé un rendez-vous via juridig.lu,


Confirmer la demande
Annuler la demande

Meilleurs Salutations,

votre équipe de juridig.lu
\"juridig\"
l'avocat en ère numerique
" Mar 20 11:49:35 dks-laptop sendEmail[504]: Email was sent successfully! From: To: Subject: [Votre demande de rendezvous via juridig.lu] Server: [mail.your-server.de:587] +perl "/mnt/c/Users/ksaff/Workspace/Websites/juridig/lib/sendEmail" -f support@dks.lu -s "mail.your-server.de:587" -xu "ksaffran@dks.lu" -xp "FB1ia1ka" -q -l "/mnt/c/Users/ksaff/Workspace/Websites/juridig/lib/mail.log" -o tls=auto -o message-content-type=html -o message-charset=utf-8 -t "kilian@saffran.lu" -u "Nouveau mot de passe pour le site juridig.lu" -m "
\"juridig\"
Bonjour Saffran Michèle,

vous avez demandé un nouveau mot de passe via juridig.lu,nouveau mot de passe: wtiQvxI*V*

votre Equipe de jurique.lu
\"juridig\"
l'avocat en ère numerique
" Mar 22 16:03:50 dks-laptop sendEmail[635]: Email was sent successfully! From: To: Subject: [Nouveau mot de passe pour le site juridig.lu] Server: [mail.your-server.de:587] diff --git a/lib/process_profile.php b/lib/process_profile.php index 4478eb5..b0919a2 100644 --- a/lib/process_profile.php +++ b/lib/process_profile.php @@ -102,7 +102,7 @@ function getsessiondata($sessid){ from usersession ses left JOIN users us on (ses.id_user=us.id) left join userservices srv on (srv.id_user=us.id) - join appprices prc on (prc.id_app=srv.id_app) + left join appprices prc on (prc.id_app=srv.id_app) where ses.sessionid='".$sessid."';"; $sesuser = $db->dbquery($sql); return $sesuser; diff --git a/lib/processdata.php b/lib/processdata.php index d9db952..daa9239 100644 --- a/lib/processdata.php +++ b/lib/processdata.php @@ -1,8 +1,10 @@ $appdata){ if (($appdata["activated"] == 1) || ($user["usergroup"] == "administrator")){ echo ''. - ''.$appdata["name"].''. + '   '.$appdata["name"].''. ''.$appdata["description"].''. ''; if (($appdata["prices"] == "0") || ($appdata["expiration"] >= $today )){ diff --git a/tmpl/pages/profile/profile.php b/tmpl/pages/profile/profile.php index e5bf6cd..e119743 100644 --- a/tmpl/pages/profile/profile.php +++ b/tmpl/pages/profile/profile.php @@ -13,8 +13,6 @@
Profile
Mon Profile - -
= CURRENT_DATE order by eventdate DESC,eventhour ASC;"; if ($user['usergroup'] == 'client'){ - $sql = "select ev.id,DATE_FORMAT(ev.eventdate,'%d/%m/%Y') as eventdate,ev.eventhour,usr.userprename,usr.usersurname,ev.user_status,ev.client_status,ev.clientuuid,ev.useruuid from events ev LEFT JOIN users usr on (ev.id_user=usr.id) where ev.id_user=".$user['id']." and ev.eventdate >= CURRENT_DATE order by eventdate DESC,eventhour ASC;"; + $sql = "select ev.id,DATE_FORMAT(ev.eventdate,'%d/%m/%Y') as eventdate,ev.eventoptions,ev.eventhour,usr.userprename,usr.usersurname,ev.user_status,ev.client_status,ev.clientuuid,ev.useruuid from events ev LEFT JOIN users usr on (ev.id_user=usr.id) where ev.id_client=".$user['id']." and ev.eventdate >= CURRENT_DATE order by eventdate DESC,eventhour ASC;"; } $tablelist = $db->dbqueryall($sql); ?> @@ -63,8 +63,13 @@ $tablelist = $db->dbqueryall($sql); } else { echo 'INCONNUE'; }; ?> - + + + + + + dbqueryall($sql); ?> @@ -14,7 +14,9 @@ $tablelist = $db->dbqueryall($sql); Options Mon status Status + Action + dbqueryall($sql); echo 'CONFIRMÉ'; } else { echo 'INCONNUE'; - }; ?> + }; ?> + + + + + + + + -