correction bug

- added mail return address to expeditor of ap\n- debug of error on peripetie datetime
Merge branch 'master' of git.labolyon.fr:DTux/avion-poeme
2022-02-15 15:52:12 +01:00 · 2022-02-10 19:57:35 +01:00 · 2022-02-02 15:34:24 +01:00 · 2022-02-02 15:31:46 +01:00 · 2022-02-02 14:43:34 +01:00 · 2022-02-02 14:42:14 +01:00
7 changed files with 100 additions and 62 deletions
--- a/cron.php
+++ b/cron.php
@ -1,5 +1,6 @@
 <?php
 	//chdir('/var/www/html/avion-poeme/');
+
 	require_once 'session_init.php';
 	require_once 'config.inc.php';
 	require_once 'db.class.php';
@ -9,11 +10,10 @@
 	$db = new db();
 	//test();
 	 $_SERVER["PHP_AUTH_USER"] = "cron";
-	//peripetieDatee();
-	print "envoi des courriers en attente" . EOLH;
+	//peripetieDatee();				// désactivée pour l'instant
 	envoiCourrielEnattente();
 	print "envoi des péripéties" . EOLH;
-	peripeties();
+	//peripeties();
 	print "Envoi des arrivées" . EOLH;
 	arrivee();
 	anonymisation();
@ -42,9 +42,9 @@
 				$mailText = $dicoExpe[$p['indexText']] .EOL .EOL ;
 				print $objetMail . EOLH;
 				print $mailText . EOLH;
-				envoiMail( $result['destMail'], $objetMail, $mailText, false);
+				envoiMail($result['expeMail'], $result['destMail'], $objetMail, $mailText, false);
 				sleep(1);
-				envoiMail( $result['expeMail'], $objetMail, $mailText, true);
+				envoiMail("contact@avion-poe.me",  $result['expeMail'], $objetMail, $mailText, true);
 				sleep(1);
 			}
 		}
@ -62,6 +62,7 @@
 		$dbPeripetie->query($query);
 		$peripeties = $dbPeripetie->result->fetch_all(MYSQLI_ASSOC);
 		$dbPeripetie->close();
+		//print_r($peripeties);
 		foreach ( $peripeties as $peripetie)
 		{
 			print "péripétie " . $peripetie["idAP"] . " - avion poème n° " . $peripetie['idAvion'] .EOLH;
@ -77,11 +78,15 @@
 				$dicoExpe = getLang( $db->expeLang );
 				$dicoDest = getLang( $db->destLang );
 				// TODO calcul de la nouvelle date d'arrivée
-				$dateExpe = new DateTime("@$db->startTime");
-				$dateDest = new DateTime("@$db->deliveryTime");
+				$startTime = date("c", $db->startTime);
+				$deliveryTime = date("c", $db->deliveryTime);
+				$dateExpe = new DateTime($startTime);
+				print_r($dateExpe);
+				$dateDest = new DateTime($deliveryTime);
+				print_r($dateDest);
 				$interval = $dateExpe->diff($dateDest);
 				$numericInterval = (($interval->days*24 + $interval->h)*60 + $interval->i)*60 + $interval->s;
-				$addDate = $numericInterval * 15/100;
+				$addDate = $numericInterval * 15/100;		//TODO calculer d'après les données de la péripétie(voir table péripétie de la base de données)
 				$db->deliveryTime += $addDate;
 				$db->deliveryTimeServer += $addDate;
 				$query = "UPDATE avionpoeme SET deliveryTime=FROM_UNIXTIME(" . $db->deliveryTime . "), deliveryTimeServer=FROM_UNIXTIME(" . $db->deliveryTimeServer . ") WHERE idAvion='" . $peripetie['idAvion'] . "'" ;
@ -96,17 +101,16 @@
 				//$html = $result['html'];
 				sleep(1);
 				print "envoi courriel à l'expéditeur : " . $db->expeMail . EOLH . $mailText .EOLH;
-				$r = envoiMail( $db->expeMail, $objetMail, $mailText);
+				$r = envoiMail("contact@avion-poe.me", $db->expeMail, $objetMail, $mailText);
 				$db->datePeripetie = formatteDate($db->destLang, $db->deliveryTime, $db->deliveryTZ);
 				$result = replaceVariables($db, $dicoDest["Objet_" . $peripetie['indexText']], $dicoDest);
 				$objetMail = $result["text"];
 				$result = replaceVariables($db, $dicoDest[$peripetie['indexText']], $dicoDest);
 				$mailText = $result["text"];
 				print "envoi courriel au destinataire : " . $db->destMail . EOLH  . $mailText .EOLH;
-				$s = envoiMail( $db->destMail, $objetMail, $mailText);
+				$s = envoiMail($db->expeMail, $db->destMail, $objetMail, $mailText);
 				sleep(1);
 				//print "r=" . $r ." => s=" .$s .EOLH;
-
 				if ($r AND $s)
 				{
 					$query = "UPDATE avionPeripetie SET mailSent=true WHERE idAP='" . $peripetie['idAP'] ."'";
@ -146,7 +150,7 @@
 			$result = replaceVariables((object)$avion, $dicoExpe[$index], $dicoExpe);
 			$mailText= $result["text"];
 			print "envoi courriel à l'expéditeur : " . $avion['expeMail'] . EOLH . $mailText .EOLH;
-			$r = envoiMail( $avion['expeMail'], $objetMail["text"], $mailText);
+			$r = envoiMail("contact@avion-poe.me", $avion['expeMail'], $objetMail["text"], $mailText);

 			//envoi notification arrivée destinataire
 			$index = "Notification_Arrivee_Destinataire";
@ -159,14 +163,14 @@
 				$mailText = "<html><head></head>\n<body>" . $mailText . "</body></html>";
 			}
 			print "envoi courriel au destinataire : " . $avion['destMail'] . EOLH . $mailText .EOLH;
-			sleep(1);
-			$s = envoiMail( $avion['destMail'], $objetMail["text"], $mailText, $html);
+			sleep(3);
+			$s = envoiMail($avion['expeMail'], $avion['destMail'], $objetMail["text"], $mailText, $html);
 			if ($r AND $s)
 			{
 				$query = "UPDATE avionpoeme SET atteri=true WHERE idAvion='" . $avion['idAvion'] ."'";
 				$db->query($query);
 			}
-			sleep(1);
+			sleep(3);
 		}
 	}

@ -178,13 +182,14 @@
 		$courriels = $db->result->fetch_all(MYSQLI_ASSOC);
 		foreach( $courriels as $courriel)
 		{
-			$r = envoiMail( $courriel['destinataire'], $courriel['objet'], $courriel['message'], $courriel['html']);
+			//TODO changer l'expéditeur, doit être l'expéditeur de l'avion-poême.
+			$r = envoiMail("contact@avion-poe.me", $courriel['destinataire'], $courriel['objet'], $courriel['message'], $courriel['html']);
 			if ($r)
 			{
 				$query = "DELETE FROM courriels WHERE id='" . $courriel['id'] . "'";
 				$db->query($query);
 			}
-			sleep(1);
+			sleep(3);
 		}
 	}

@ -213,3 +218,4 @@
 		}
 	}
 	$db->close();
+?>
--- a/include/config.inc.php
+++ b/include/config.inc.php
@ -20,8 +20,18 @@ $site 			= "Avion Poème";
 $dossier 		= "/www";
 $basedir 		= dirname($_SERVER['DOCUMENT_ROOT']) . $dossier;

+$testMode		= true;
+
+if ($testMode)
+{
 	$base_url 		= "https://avion-poe.me";
 	$base_path 		=  "/flex/storage/avion-poe.me/site/www/";
+}else
+{
+	$base_url 		= "https://dev.avion-poe.me";
+	$base_path 		=  "/flex/storage/avion-poe.me/site/dev/";
+}
+
 $url_admin		= $base_url . "/gestion";
 $accueil		= $base_url . "/index.html";
 if (empty($_SERVER["PHP_AUTH_USER"])) {
--- a/include/db.class.php
+++ b/include/db.class.php
@ -7,7 +7,6 @@ if (!isset($site)) {
 require_once "config.inc.php";
 require_once "log.php";
 require_once "fonctions.inc.php";
-require_once "envoi_courriel.inc.php";

 $table_prefix = "";
 class db
@ -197,10 +196,18 @@ class db
 	function savePeripetie()
 	{

-		$query = "INSERT INTO avionPeripetie VALUES ('0','";
-		$query .= $this->protect($this->uid) . "','";
-		$query .= $this->protect($this->idPeripetie) . "', ";
-		$query .= "FROM_UNIXTIME(" . $this->protect($this->datePeripetie) . "), '0')";
+		$query = "INSERT INTO avionPeripetie ('idAvion', 'idPeripetie', 'date', 'expeMail'), VALUES (";
+		$query .= "'" . $this->protect($this->uid) . "',";
+		$query .= "'" . $this->protect($this->idPeripetie) . "', ";
+		$query .= "FROM_UNIXTIME(" . $this->protect($this->datePeripetie) . "),";
+		if ($this->expeKnown)
+		{
+			$query .= "'" . $this->protect($this->expeMail) . "'";
+		}else
+		{
+			$query .= "'contact@avion-poe.me'";
+		}
+		$query .= ")";
 		log_write("savePeripetie " . $query);
 		//$query .= $this->protect($this->effetPeripetie) . "', '";
 		//$query .= $this->protect($this->expeMail) . "', '";
--- a/include/envoi_courriel.inc.php
+++ b/include/envoi_courriel.inc.php
@ -2,7 +2,6 @@
 require_once 'log.php';
 require_once 'fonctions.inc.php';

-
 function courrielEnvoi( $db )
 {
 	$dicoExpe = getLang( $db->expeLang );
@ -20,7 +19,7 @@ function courrielEnvoi( $db )
 	$mailText = $result['text'];
 	$html = $result['html'];

-	saveMail( $db, $db->expeMail, $objetMail, $mailText, $html);
+	saveMail( $db, "contact@avion-poe.me", $db->expeMail, $objetMail, $mailText, $html);

 	//log_write(print_r($db,true));

@ -47,19 +46,21 @@ function courrielEnvoi( $db )
 	{
 		$message = "<html><head></head>\n<body>" . $message . "</body></html>";
 	}
-	saveMail( $db, $db->destMail, $objetMail, $mailText, $html);
+	saveMail( $db, $db->expeMail, $db->destMail, $objetMail, $mailText, $html);
 }

-function saveMail( $db, $destinataire, $objet, $text, $html=false)
+function saveMail( $db, $expediteur, $destinataire, $objet, $text, $html=false)
 {
 	$query = "INSERT INTO courriels VALUES ('0', '" . $db->protect($destinataire) . "', '" . $db->protect($objet) .  "', '" . $db->protect($text) . "', '" . (int)$html .  "')";
 	$db->query($query);
 }

-function envoiMail($destinataire, $sujet, $text, $html=false, $cc='', $bcc='')
+function envoiMail($expediteur, $destinataire, $sujet, $text, $html=false, $cc='', $bcc='')
 {
 	require_once 'include/swiftmailer/autoload.php';
 	//require_once 'include/swiftmailer/swiftmailer/lib/swift_init.php';
+	try
+	{
 		$transport = (new Swift_SmtpTransport('smtpauth.online.net', 465, 'ssl'))
 			->setUsername('contact@avion-poe.me')
 			->setPassword('AvionPoème*27juillet');
@ -86,7 +87,8 @@ function envoiMail($destinataire, $sujet, $text, $html=false, $cc='', $bcc='')
 		$message->setBody($text);
 		//add date header
 		$headers = $message->getHeaders();
-	$headers->addDateHeader('Your-Header', new DateTimeImmutable('3 days ago'));
+		//$headers->addDateHeader('Date', new DateTimeImmutable('3 days ago'));
+		$headers->addPathHeader('Return-Path', $expediteur);
 		if (!$mailer->send($message, $failures))
 		{
 			echo "Failures:";
@ -94,6 +96,11 @@ function envoiMail($destinataire, $sujet, $text, $html=false, $cc='', $bcc='')
 			log_write(__FILE__ . EOL . __LINE__ .  EOL . "Le courriel n'est pas parti:" . $destinataire . EOL . $sujet . EOL . print_r($failure, true) . EOL . wordwrap($text, 1000 , "\r\n"), ERROR);
 			return false;
 		}
+	}
+	catch (\Swift_TransportException $ex)
+	{
+		return false;
+	}
 	return true;
 }
 ?>
--- a/parts/header.php
+++ b/parts/header.php
@ -21,7 +21,7 @@
            </li>
        </ul>
        <form class="nav-button form-inline mt-2 mt-md-0">
-            <input id="buttonNewPlane" type="button" class="btn btn-warning my-2 my-sm-0" data-toggle="modal" data-target="#newPlaneModal" value='Envoyer un avion'>
+            <input id="buttonNewPlane" type="button" class="btn btn-warning my-2 my-sm-0" data-toggle="modal" data-target="#newPlaneModal" value='Lancer un avion-poème 0/100'>
            </input>&nbsp;
            <i id="planeLimitTooltip" class="fas fa-question-circle" data-toggle="tooltip" data-placement="auto" title="coucou"></i>
        </form>
--- a/src/app.css
+++ b/src/app.css
@ -375,6 +375,13 @@ a#navbarDropdownLang.nav-link.dropdown-toggle::after {
  background-color: white;
  opacity: 0;
  visibility: hidden;
+  transition: opacity 0.3s ease-in;
+}
+
+@media (max-width: 480px) {
+  #downloadPlaneMessage {
+    bottom: 15%;
+  }
 }

 #downloadPlaneMessage:before {
--- a/src/map.js
+++ b/src/map.js
@ -399,6 +399,7 @@ loader.load(function (loader, resources) {
                  $("#downloadPlaneMessage").css("visibility", "visible");
                  $("#closePlane").on("click", function () {
                    $("#canvas3d").css("display", "none");
+                    $("#downloadPlaneMessage").css("display", "none");
                    $(this).css("display", "none");
                  });
                  $("#downloadPlaneMessage").on("click", function () {
Author	SHA1	Message	Date
Daniel Tartavel	80af7b029a	correction bug	2022-02-15 15:52:12 +01:00
Daniel Tartavel	4dd37cda7b	- added mail return address to expeditor of ap\n- debug of error on peripetie datetime	2022-02-10 19:57:35 +01:00
Daniel Tartavel	ecf570ee87	Merge branch 'master' of git.labolyon.fr:DTux/avion-poeme	2022-02-02 15:34:24 +01:00
Daniel Tartavel	d3f8d78b73	ajout de la gestion du sous-domaine dev\ntypo dans db.class.php	2022-02-02 15:31:46 +01:00
Daniel Tartavel	276a21b3a3	ajout de l'expediteur du message dans l'adresse de retour- Return-Path du mail	2022-02-02 14:43:34 +01:00
Daniel Tartavel	bd7c519426	ajout de l'expediteur du message dans l'adresse de retour- Retrun-Path du mail	2022-02-02 14:42:14 +01:00
mberard	e35bc4accf	update repo	2022-01-20 22:18:55 +01:00
mathieu_berard	8429233511	Merge branch 'fix-bug-button-header' of DTux/avion-poeme into master	2021-12-14 21:40:01 +00:00