From db7101b922979c3773d0e53a2da587415de984bf Mon Sep 17 00:00:00 2001
From: Emmanuel ROY <ornithorynxe@live.fr>
Date: Wed, 4 Dec 2019 15:52:04 +0100
Subject: [PATCH] ajout de la lib Encoding et mise en place de la class
 caracter du projet VLAN
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

FIXME: appel curl ou fopen d'une methode http depuis une action ou un controlleur.

TODO: sécuriser les accès HTTP1.1 par un fichier config similaire a l'applet Discourse faite pour Tinternet

TODO: ajouter un plug-in symfony permettant de charger un utilisateur dans les apps a partir de l'authentification multiple

TODO: lire les documentation officielles provenant des 4 plate-formes tranquillement afin de comprendre commet doit on tester ces type d'auth quitte a créé un sous domaine particulier directement hebergé sur gittea
 -->Sécuriser le serveur de dev
---
 .idea/MVC---Objet.iml          |  1 +
 .idea/php.xml                  |  1 +
 application/class/Bdd.php      |  9 ++--
 application/class/Caracter.php | 80 ++++++++++++++++++++++++++++++++++
 application/parameters.php     |  7 ++-
 composer.json                  |  3 +-
 6 files changed, 96 insertions(+), 5 deletions(-)
 create mode 100644 application/class/Caracter.php

diff --git a/.idea/MVC---Objet.iml b/.idea/MVC---Objet.iml
index 6ec0a77..143bc94 100644
--- a/.idea/MVC---Objet.iml
+++ b/.idea/MVC---Objet.iml
@@ -11,6 +11,7 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/filesystem" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/support" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/view" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/neitanod/forceutf8" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/finder" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/windwalker/renderer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/windwalker/structure" />
diff --git a/.idea/php.xml b/.idea/php.xml
index c3ead44..026b825 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -12,6 +12,7 @@
       <path value="$PROJECT_DIR$/vendor/symfony/finder" />
       <path value="$PROJECT_DIR$/vendor/windwalker/structure" />
       <path value="$PROJECT_DIR$/vendor/hybridauth/hybridauth" />
+      <path value="$PROJECT_DIR$/vendor/neitanod/forceutf8" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="7.1" />
diff --git a/application/class/Bdd.php b/application/class/Bdd.php
index 4510b78..e65e1f7 100644
--- a/application/class/Bdd.php
+++ b/application/class/Bdd.php
@@ -11,12 +11,12 @@ class Bdd
         switch($bdd) {
             case 'bdd1':
                 $this->bdd = new PDO(DSN_BDD1, USER_BDD1, PASS_BDD1);
-            break;
+                break;
             case 'bdd2':
                 $this->bdd = new PDO(DSN_BDD2, USER_BDD2, PASS_BDD2);
-            break;
+                break;
             default:
-                $this->bdd = new PDO(DSN_FICHES, USER_FICHES, PASS_FICHES);
+                $this->bdd = new PDO(DSN_BDD_DEFAULT, USER_BDD_DEFAULT, PASS_BDD_DEFAULT);
         }
     }
 
@@ -30,6 +30,9 @@ class Bdd
 
         $tab = array();
         foreach($res as $key => $row){
+            if (is_string($row)) {
+                $row = Caracter::normalise_ChaineDeCaracteresDownload($row);
+            }
             $tab[$key] = $row;
         }
         return $tab;
diff --git a/application/class/Caracter.php b/application/class/Caracter.php
new file mode 100644
index 0000000..a170028
--- /dev/null
+++ b/application/class/Caracter.php
@@ -0,0 +1,80 @@
+<?php
+
+
+namespace MVC\Classe;
+
+
+use ForceUTF8\Encoding;
+
+class Caracter
+{
+
+    public static function normalise_ChaineDeCaracteresDownload($chaine)
+    {
+        //return Caracter::remplacerAccents($chaine);
+        return Encoding::fixUTF8(Caracter::fp_stripslashes($chaine));
+    }
+
+    public static function fp_stripslashes($str)
+    {
+        if (get_magic_quotes_gpc() == 1) {
+            return stripslashes($str);
+        } else {
+            return $str;
+        }
+    }
+
+    public static function normalise_ChaineDeCaracteresUpload($chaine)
+    {
+        return Caracter::fp_addslashes(Encoding::fixUTF8($chaine));
+    }
+
+    public static function fp_addslashes($str)
+    {
+        if (get_magic_quotes_gpc() == 1) {
+            return $str;
+        } else {
+            return addslashes($str);
+        }
+    }
+
+    public static function remplacerAccents($chaine)
+    {
+        $chaine = str_replace('é', '&eacute;', $chaine);
+        $chaine = str_replace('è', '&egrave;', $chaine);
+        $chaine = str_replace('ë', '&euml;', $chaine);
+        $chaine = str_replace('ê', '&ecirc;', $chaine);
+        $chaine = str_replace('ç', '&ccedil;', $chaine);
+        $chaine = str_replace('Ç', '&Ccedil;', $chaine);
+        $chaine = str_replace('à', '&agrave;', $chaine);
+        // $chaine = str_replace('','&aeacute;',$chaine);
+        $chaine = str_replace('â', '&circ;', $chaine);
+        $chaine = str_replace('ä', '&uml;', $chaine);
+        $chaine = str_replace('î', '&icirc;', $chaine);
+        $chaine = str_replace('ï', '&iuml;', $chaine);
+        $chaine = str_replace('ù', '&ugrave;', $chaine);
+        $chaine = str_replace('û', '&ucirc;', $chaine);
+        $chaine = str_replace('ü', '&uuml;', $chaine);
+        $chaine = str_replace('É', '&Eacute;', $chaine);
+        $chaine = str_replace('Ê', '&Ecirc;', $chaine);
+        $chaine = str_replace('È', '&Egrave;', $chaine);
+        $chaine = str_replace('Ë', '&Euml;', $chaine);
+        $chaine = str_replace('À', '&Agrave;', $chaine);
+        // $chaine = str_replace('','&Aeacute;',$chaine);
+        $chaine = str_replace('Â', '&Acirc;', $chaine);
+        $chaine = str_replace('Ä', '&Auml;', $chaine);
+        $chaine = str_replace('Î', '&Icirc;', $chaine);
+        $chaine = str_replace('Ï', '&Iuml;', $chaine);
+        $chaine = str_replace('Ù', '&Ugrave;', $chaine);
+        $chaine = str_replace('Û', '&Ucirc;', $chaine);
+        $chaine = str_replace('Ü', '&Uuml;', $chaine);
+        return Caracter::remplacerGuillemets($chaine);
+    }
+
+    public static function remplacerGuillemets($chaine)
+    {
+        $chaine = str_replace("'", "&#39;", $chaine);
+        $chaine = str_replace('"', '&#34;', $chaine);
+        return $chaine;
+    }
+}
\ No newline at end of file
diff --git a/application/parameters.php b/application/parameters.php
index ac5ebdf..fd46507 100644
--- a/application/parameters.php
+++ b/application/parameters.php
@@ -1,5 +1,10 @@
 <?php
 
+
+define('DSN_BDD_DEFAULT', "mysql:host=localhost;dbname=default");
+define('USER_BDD_DEFAULT', "user_default");
+define('PASS_BDD_DEFAULT', "pass_default");
+
 define('DSN_BDD1',"mysql:host=localhost;dbname=db1");
 define('USER_BDD1',"user1");
 define('PASS_BDD1',"pass1");
@@ -8,4 +13,4 @@ define('DSN_BDD2',"mysql:host=localhost;dbname=db2");
 define('USER_BDD2',"user2");
 define('PASS_BDD2',"pass2");
 
-define('PATH_URL',"http://vlan.localhost/");
\ No newline at end of file
+//define('PATH_URL',"http://localhost/");
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 061d263..2b3a5e3 100644
--- a/composer.json
+++ b/composer.json
@@ -16,6 +16,7 @@
       "ext-curl": "*",
         "windwalker/renderer": "3.*",
         "illuminate/view": "4.*",
-        "hybridauth/hybridauth": "~3.0"
+      "hybridauth/hybridauth": "~3.0",
+      "neitanod/forceutf8": "^2.0"
     }
 }