Merge branch '10400' into 11000

Merge branch '10313' into 10400
Blog version
2021-01-02 17:24:49 +01:00 · 2021-01-02 17:24:30 +01:00 · 2021-01-02 17:21:38 +01:00 · 2021-01-02 17:16:29 +01:00 · 2020-12-31 18:02:08 +01:00
2 changed files with 7 additions and 4 deletions
--- a/module/blog/blog.php
+++ b/module/blog/blog.php
@ -634,10 +634,9 @@ class blog extends common {
 					if ($this->getData(['module', $this->getUrl(0),  'posts', $this->getUrl(1), 'commentNotification']) === true) {
 						$sent = $this->sendMail(
 							$to,
-							'Nouveau commentaire',
-							'Bonjour,'.'<br/>'. $notification.
-							' sur la page "'. $this->getData(['page', $this->getUrl(0), 'title']). '" dans l\'article "'.$this->getUrl(1) .'" :<br/>'.
-							$content,
+							'Nouveau commentaire déposé',
+							'Bonjour' . ' <strong>' . $user['firstname'] . ' ' . $user['lastname'] . '</strong>,<br><br>' .
+							'L\'article <a href="' . helper::baseUrl() . $this->getUrl(0) . '/	' . $this->getUrl(1) . '">' . $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'title']) . '</a> a  reçu un nouveau commentaire.<br><br>',
 							''
 						);
 						// Valeurs en sortie
--- a/site/data/.htaccess
+++ b/site/data/.htaccess
@ -3,6 +3,10 @@
 	Order deny,allow
 	Deny from all
 </Files>
+<Files *.json.back>
+	Order deny,allow
+	Deny from all
+</Files>
 # Bloque l'accès htaccess
 <Files .htaccess>
 	Order deny,allow
Author	SHA1	Message	Date
fredtempez	7c3c0c145c	Merge branch '10400' into 11000	2021-01-02 17:24:49 +01:00
fredtempez	7699120fe1	Merge branch '10313' into 10400	2021-01-02 17:24:30 +01:00
fredtempez	31981a39e6	Blog version	2021-01-02 17:21:38 +01:00
fredtempez	0e00d64620	Blog mail notification : nom de l'article plutôt que la page.	2021-01-02 17:16:29 +01:00
fredtempez	a082bb130e	Interdire le téléchargement des backup	2020-12-31 18:02:08 +01:00