From: Kilian Saffran Date: Wed, 20 Mar 2019 16:25:27 +0000 (+0100) Subject: before release X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=6d7420a401aaaf16b7fb0bdd1e6056add69d614d;p=juridig.git before release --- diff --git a/api.php b/api.php index eb49a6e..9765d7c 100644 --- a/api.php +++ b/api.php @@ -24,6 +24,7 @@ $dhnew = array(); if ($exception != null){ $exp = explode(',',$exception["dayhours"]); + // $daydata["ex"] = $exp; foreach ($daydata["hour_values"] as $val){ if (!in_array($val,$exp)){ array_push($dhnew,$val); @@ -33,13 +34,14 @@ } } //exclude taken rdv times - $sql = "select eventhour from events where eventdate=date('".$_GET['day']."') and id_user='".$iduser."' and (user_status != 'canceled' or client_status != 'canceled')"; + $sql = "select GROUP_CONCAT(distinct(eventhour)) as eventhour from events where eventdate=date('".$_GET['day']."') and id_user='".$iduser."' and (user_status != 'canceled' or client_status != 'canceled')"; $takenevents = $db->dbquery($sql); if ($daydata["hour_values"] != null){ $dhnew = array(); if ($takenevents != null){ $tev = explode(',',$takenevents["eventhour"]); + // $daydata["used"] = $tev; foreach ($daydata["hour_values"] as $val){ if (!in_array($val,$tev)){ array_push($dhnew,$val); diff --git a/img/annuaire.svg b/img/annuaire.svg new file mode 100644 index 0000000..c249b8f --- /dev/null +++ b/img/annuaire.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/logocatalog_h75.png b/img/logocatalog_h75.png new file mode 100644 index 0000000..b8bd2d8 Binary files /dev/null and b/img/logocatalog_h75.png differ diff --git a/img/logorendezvous_h75.png b/img/logorendezvous_h75.png new file mode 100644 index 0000000..fde5255 Binary files /dev/null and b/img/logorendezvous_h75.png differ diff --git a/img/rendezvous.svg b/img/rendezvous.svg new file mode 100644 index 0000000..b4a5c5e --- /dev/null +++ b/img/rendezvous.svg @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/lib/mail.log b/lib/mail.log new file mode 100644 index 0000000..2ef460e --- /dev/null +++ b/lib/mail.log @@ -0,0 +1,6 @@ +Mar 20 11:27:02 dks-laptop sendEmail[493]: ERROR => mail.your-server.de:587 returned a zero byte response to our query. +Mar 20 11:30:33 dks-laptop sendEmail[497]: 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:33:10 dks-laptop sendEmail[499]: ERROR => mail.your-server.de:587 returned a zero byte response to our query. +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] diff --git a/lib/mailtemplate.txt b/lib/mailtemplate.txt new file mode 100644 index 0000000..fd525b1 --- /dev/null +++ b/lib/mailtemplate.txt @@ -0,0 +1,25 @@ + + + + + + +
+ juridig +
+
+ %%BODYCONTENT%% +
+
+
+ juridig
+ l'avocat en ère numerique +
+
+ + \ No newline at end of file diff --git a/lib/process_email.php b/lib/process_email.php index cf7dcac..53e866d 100644 --- a/lib/process_email.php +++ b/lib/process_email.php @@ -26,10 +26,16 @@ $subject = str_replace('%%'.$key.'%%',$value,$subject); } } - $body = str_replace(chr(13),"",$body); - $body = str_replace(chr(10),"",$body); - $body = str_replace('"','\"',$body); - $body = str_replace("'","\\'",$body); + $myfile = fopen($_SERVER["DOCUMENT_ROOT"].$baseurl."/lib/mailtemplate.txt", "r") or error_log($_SERVER["DOCUMENT_ROOT"].$baseurl."/lib/mailtemplate.txt"); + $bodytmpl = fread($myfile,filesize($_SERVER["DOCUMENT_ROOT"].$baseurl."/lib/mailtemplate.txt")); + fclose($myfile); + + $body = str_replace('%%BODYCONTENT%%',$body,$bodytmpl); + $body = str_replace('%%SITEURL%%',$_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["HTTP_HOST"].$baseurl,$body); + $body = str_replace(chr(13),"",$body); + $body = str_replace(chr(10),"",$body); + $body = str_replace('"','\"',$body); + if (strpos($body,'%%') !== false) { error_log("body element not replaced: ".$body); return 1; @@ -38,17 +44,20 @@ error_log("subject element not replaced: ".$subject); return 1; } - + + if (($body != "") && ($subject != "")){ $cmd= 'perl "'.$_SERVER['DOCUMENT_ROOT'].''.$baseurl.'/lib/sendEmail" -f '.$tmpl["from"].' '; $cmd .= ' -s "mail.your-server.de:587" -xu "ksaffran@dks.lu" -xp "FB1ia1ka" -q '; + $cmd .= '-l "'.$_SERVER['DOCUMENT_ROOT'].''.$baseurl.'/lib/mail.log" '; $cmd .= '-o tls=auto '; $cmd .= '-o message-content-type=html '; $cmd .= '-o message-charset=utf-8 '; $cmd .= '-t "'.$data["email"].'" '; $cmd .= '-u "'.$subject.'" '; $cmd .= '-m "'.$body.'" '; + if ($attach){ $cmd .= " -a"; foreach ($attach as $a){ @@ -56,11 +65,13 @@ } } $status = 1; + file_put_contents($_SERVER['DOCUMENT_ROOT'].$baseurl.'/lib/mail.log', $cmd, FILE_APPEND | LOCK_EX); - //$retdata =shell_exec($cmd); system($cmd,$status); if ($status==0){ error_log("Mail sended to ".$data["email"].' with template:'.$template); + }else { + error_log("Mail send failed ".$cmd); } return $status; diff --git a/style.css b/style.css index ad03403..fa93d56 100644 --- a/style.css +++ b/style.css @@ -26,7 +26,7 @@ a{ text-decoration: none; } -h1{text-align: center;} + .module-title{ text-align: center; } diff --git a/tmpl/blocks/avocatsearch.php b/tmpl/blocks/avocatsearch.php index 223e6ae..3cbbea1 100644 --- a/tmpl/blocks/avocatsearch.php +++ b/tmpl/blocks/avocatsearch.php @@ -9,8 +9,12 @@ ?> -
+
+
+ logo annuaire juridig

Annuaire des avocats au Luxembourg

+
+
+
-
-
-
-
- Se connecter -
-
-
-
- Créer un compte -
-
-
-
Demande de nouveau mot de passe!
-
-
- - -
-
- -
- - -
+
+ +
+
+
Demande de nouveau mot de passe!
+
+
+
+ + +
+
+ +
+
+
+
+
+ Se connecter +
+
+
+
+ Créer un compte +
+
+
+
+
+
- +
+ +