From 4259e5714bdd05d3c4eb0e88acf419c5c9f5098d Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Sun, 19 May 2019 20:35:20 +0200
Subject: [PATCH] =?UTF-8?q?[9.1.06]=20nouvel=20utilisateur=20:=20mail=20en?=
 =?UTF-8?q?voy=C3=A9=20avec=20erreur=20mot=20de=20passe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .htaccess                 |   9 ++++++++-
 core/core.php             |   2 +-
 core/module/user/user.php |   6 ++++--
 robots.txt                |  12 ++++++++++++
 site/tmp/.htaccess        |   3 ---
 sitemap.xml               |  36 ++++++++++++++++++++++++++++++++++++
 sitemap.xml.gz            | Bin 0 -> 328 bytes
 7 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100644 robots.txt
 delete mode 100644 site/tmp/.htaccess
 create mode 100644 sitemap.xml
 create mode 100644 sitemap.xml.gz

diff --git a/.htaccess b/.htaccess
index 88d9b065..df7cc5db 100644
--- a/.htaccess
+++ b/.htaccess
@@ -5,4 +5,11 @@ SetEnv SESSION_USE_TRANS_SID 0
 Options -Indexes
 
 # Attention, surtout ne rien modifier ci-dessous !
-# URL rewriting
\ No newline at end of file
+# URL rewriting
+<ifModule mod_rewrite.c>
+	RewriteEngine on
+	RewriteBase /ZwiiCMS/
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^(.*)$ index.php?$1 [L]
+</ifModule>
\ No newline at end of file
diff --git a/core/core.php b/core/core.php
index a5503f5c..078c1784 100644
--- a/core/core.php
+++ b/core/core.php
@@ -28,7 +28,7 @@ class common {
 	const GROUP_ADMIN = 3;
 
 	// Numéro de version 
-	const ZWII_VERSION = '9.1.05';
+	const ZWII_VERSION = '9.1.06';
 
 	public static $actions = [];
 	public static $coreModuleIds = [
diff --git a/core/module/user/user.php b/core/module/user/user.php
index f566ce29..7c5af233 100755
--- a/core/module/user/user.php
+++ b/core/module/user/user.php
@@ -38,8 +38,10 @@ class user extends common {
 				self::$inputNotices['userAddId'] = 'Identifiant déjà utilisé';
 			}
 			// Double vérification pour le mot de passe
+			$mail = true;
 			if($this->getInput('userAddPassword', helper::FILTER_STRING_SHORT, true) !== $this->getInput('userAddConfirmPassword', helper::FILTER_STRING_SHORT, true)) {
 				self::$inputNotices['userAddConfirmPassword'] = 'Incorrect';
+				$mail = false;
 			}		
 			// Crée l'utilisateur
 			$userFirstname = $this->getInput('userAddFirstname', helper::FILTER_STRING_SHORT, true);
@@ -73,8 +75,8 @@ class user extends common {
 			// Valeurs en sortie
 			$this->addOutput([
 				'redirect' => helper::baseUrl() . 'user',
-				'notification' => ($sent === true ? 'Utilisateur créé' : $sent),
-				'state' => ($sent === true ? true : null)
+				'notification' => (($sent === true) && ($mail === true) ? 'Utilisateur créé' : $sent),
+				'state' => (($sent === true) && ($mail === true) ? true : null)
 			]);
 		}
 		// Valeurs en sortie
diff --git a/robots.txt b/robots.txt
new file mode 100644
index 00000000..7a21c7cf
--- /dev/null
+++ b/robots.txt
@@ -0,0 +1,12 @@
+
+# ZWII CONFIG ---------
+User-agent: *
+Disallow: /core/
+Disallow: /module/
+Disallow: /site/data
+Disallow: /site/tmp
+Disallow: /site/backup
+Allow: /site/file/
+Sitemap: http://localhost/ZwiiCMS/sitemap.xml
+Sitemap: http://localhost/ZwiiCMS/sitemap.xml.gz
+# ZWII CONFIG  ---------
diff --git a/site/tmp/.htaccess b/site/tmp/.htaccess
deleted file mode 100644
index e4a2c105..00000000
--- a/site/tmp/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-# Bloque l'accès aux sauvegardes
-Order deny,allow
-Deny from all
diff --git a/sitemap.xml b/sitemap.xml
new file mode 100644
index 00000000..03045253
--- /dev/null
+++ b/sitemap.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- generated-on="2019-05-19T09:44:02+02:00" -->
+<urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9                                  http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
+  <url>
+    <loc>http://localhost/ZwiiCMS/accueil</loc>
+    <lastmod>2019-05-19T09:44:02+02:00</lastmod>
+  </url>
+  <url>
+    <loc>http://localhost/ZwiiCMS/enfant</loc>
+    <lastmod>2019-05-19T09:44:02+02:00</lastmod>
+  </url>
+  <url>
+    <loc>http://localhost/ZwiiCMS/mise-en-page</loc>
+    <lastmod>2019-05-19T09:44:02+02:00</lastmod>
+  </url>
+  <url>
+    <loc>http://localhost/ZwiiCMS/menu-lateral</loc>
+    <lastmod>2019-05-19T09:44:02+02:00</lastmod>
+  </url>
+  <url>
+    <loc>http://localhost/ZwiiCMS/blog</loc>
+    <lastmod>2019-05-19T09:44:02+02:00</lastmod>
+  </url>
+  <url>
+    <loc>http://localhost/ZwiiCMS/galeries</loc>
+    <lastmod>2019-05-19T09:44:02+02:00</lastmod>
+  </url>
+  <url>
+    <loc>http://localhost/ZwiiCMS/site-de-zwii</loc>
+    <lastmod>2019-05-19T09:44:02+02:00</lastmod>
+  </url>
+  <url>
+    <loc>http://localhost/ZwiiCMS/contact</loc>
+    <lastmod>2019-05-19T09:44:02+02:00</lastmod>
+  </url>
+</urlset>
diff --git a/sitemap.xml.gz b/sitemap.xml.gz
new file mode 100644
index 0000000000000000000000000000000000000000..50a132443a101e13e8f638d7dff20f936d607e17
GIT binary patch
literal 328
zcmV-O0k{4iiwFP!000003bd3lYr`-Qh4=glS8F*-c2lU0;|zsP$&?gIH&wnm0$DOX
zr4Ie|mF;xs5JC#pB<bG!9y$&c>r-Q*FYHJ=yJAT!ScF!&O51wHUiUBX#Mb4axC4l4
zwAe|H6%5i;BpHZDNV2`i^5rrY>AgsE5dZ+eaqJACj{@FOej>eM2k+aQ^S<xn{vmc<
z%~K%~{<huh)Bzg_+LD)6A)8!(9Hf1av^4r?)Du5nauH|2Lpq-d8>gfn-*W>Xy1H(F
z{qExvRjgcGL=Igl3*%IIhKH>*2S=X2_gX)1cU&rUL~V+p6r_@T<Ervv_k->%DfkG#
zo`CjKT0dhzqX_{mw6exIW6&PKgaPg3obCEBuAUKJOM{(8nlWM+PN)#R!+FLS<*b+L
a|AWP+FQi=j00030{{sL6hek7{1ONbVs+VH`

literal 0
HcmV?d00001