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 + + RewriteEngine on + RewriteBase /ZwiiCMS/ + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule ^(.*)$ index.php?$1 [L] + \ 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 @@ + + + + + http://localhost/ZwiiCMS/accueil + 2019-05-19T09:44:02+02:00 + + + http://localhost/ZwiiCMS/enfant + 2019-05-19T09:44:02+02:00 + + + http://localhost/ZwiiCMS/mise-en-page + 2019-05-19T09:44:02+02:00 + + + http://localhost/ZwiiCMS/menu-lateral + 2019-05-19T09:44:02+02:00 + + + http://localhost/ZwiiCMS/blog + 2019-05-19T09:44:02+02:00 + + + http://localhost/ZwiiCMS/galeries + 2019-05-19T09:44:02+02:00 + + + http://localhost/ZwiiCMS/site-de-zwii + 2019-05-19T09:44:02+02:00 + + + http://localhost/ZwiiCMS/contact + 2019-05-19T09:44:02+02:00 + + diff --git a/sitemap.xml.gz b/sitemap.xml.gz new file mode 100644 index 00000000..50a13244 Binary files /dev/null and b/sitemap.xml.gz differ