From f567d7645df305c7559cc083fa92d9e02a71340a Mon Sep 17 00:00:00 2001
From: fredtempez <frederic.tempez@outlook.com>
Date: Thu, 28 Apr 2022 12:51:25 +0200
Subject: [PATCH] Disable rewrite not apache

---
 .htaccess                               | 21 +++++----------------
 core/module/config/view/setup/setup.php |  4 ++--
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/.htaccess b/.htaccess
index ec3c06d9..eac84f25 100644
--- a/.htaccess
+++ b/.htaccess
@@ -27,22 +27,11 @@
 # Bloque l'accès à la liste des fichiers
 Options -Indexes
 
+
+# URL rewriting
+
+
 # Désactive l'option de substitution automatique
 <IfModule mod_negotiation.c>
     Options -MultiViews
-</IfModule>
-
-
-
-
-# URL rewriting
-<IfModule mod_rewrite.c>
-	RewriteEngine on
-	RewriteBase /ZwiiCMS/
-	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteCond %{REQUEST_FILENAME} !-d
-	RewriteRule ^(.*)$ index.php?$1 [L]
-</IfModule>
-# URL rewriting
-
-
+</IfModule>
\ No newline at end of file
diff --git a/core/module/config/view/setup/setup.php b/core/module/config/view/setup/setup.php
index 7c6528f3..3b371908 100644
--- a/core/module/config/view/setup/setup.php
+++ b/core/module/config/view/setup/setup.php
@@ -42,9 +42,9 @@
 							]); ?>
 					</div>
 					<div class="col6">
-						<?php echo template::checkbox('configRewrite', true, 'Réécritures URL Apache', [
+						<?php echo template::checkbox('configRewrite', true, 'Apache URL intelligentes', [
 							'checked' => helper::checkRewrite(),
-							'help' => 	'Supprime le point d\'interrogation dans les URL, option indisponible sous Nginx',
+							'help' => 	'Supprime le point d\'interrogation dans les URL, l\'option est indisponible avec les autres serveurs Web',
 							'disabled' =>  strpos($_SERVER["SERVER_SOFTWARE"], 'Apache') > 0 ? true : false
 						]); ?>
 					</div>