gestion des $page, $from et $id

3 files changed, 90 insertions, 29 deletions

diff --git a/src/integration/ckeditor5/CKEditor.php b/src/integration/ckeditor5/CKEditor.php
index f3a60e0..6f630c8 100644
--- a/src/integration/ckeditor5/CKEditor.php
+++ b/src/integration/ckeditor5/CKEditor.php
@@ -1,41 +1,94 @@
 <?php
+// src/integration/ckeditor5/CKEditor.php
+
 class CKEditor
 {
         public const string INTEGRATION_PATH = 'src/integration/ckeditor5/';
-        private string $from = 'index.php';
-        public string $open_editor_link = 'index.php?action=editor';
-        private string $form_action_file = 'index.php?action=submit';
-        private string $upload_ajax_url = 'index.php?action=upload_image';
-        private string $php_ini_max_size;
-        public string $css_editor_tag = '';
-        public string $css_outside_editor_tag;
-        private string $toolbar_language = 'fr';
-        public string $storage = 'files';
-        public string $data_path = 'data/page';
-        public string $nom_article = "article";
 
-        private string $server_root;
+        //public const string SERVER_PATH = '/';
+        private const string SERVER_PATH = '/ckeditor5/';
+        private string $server_root; // pour les "imports" en javascript
         // pour l'importmap: j'ai modifié la version "installation avec CDN de la doc pour utiliser les fichiers locaux
         // l'"importmap" permet d'utiliser "import" (ça ressemble pas mal au python) dans le navigateur comme n'importe quel langage de programmation normal
 
+        private string $storage_mode = 'files';
+        private string $page = 'accueil';
+        private string $from = '';
+        private string $id_article = '';
+
+        private string $php_ini_max_size;
+        private string $css_editor_tag = '';
+        private string $css_outside_editor_tag = '';
+        private string $toolbar_language = 'fr';
+        private string $data_path = 'data/page';
+
 
         public function __construct()
         {
                 $this->makeTranslationSymLink();
-                $this->from .= isset($_GET['from']) ? '?page=' . $_GET['from'] : '';
+
                 $this->php_ini_max_size = $this->returnBytes(ini_get('upload_max_filesize')); // = 2M par défaut dans le php.ini
                 $this->css_outside_editor_tag = '<link rel="stylesheet" href="' . self::INTEGRATION_PATH . 'article_hors_editeur.css" />';
-                $this->server_root = $_SERVER['SERVER_NAME'] . '/ckeditor5/';
+                $this->server_root = $_SERVER['SERVER_NAME'] . self::SERVER_PATH;
         }
 
-        public function checkAjaxReqest()
+        // getters
+        public function getPage(): string
+        {
+                return $this->page;
+        }
+        public function getFrom(): string
+        {
+                return $this->from;
+        }
+        public function getIdArticle(): string
+        {
+                return $this->id_article;
+        }
+        public function getDataPath(): string
+        {
+                return $this->data_path;
+        }
+        public function getCSSOutsideEditorTag(): string
+        {
+                return $this->css_outside_editor_tag;
+        }
+        public function getCSSEditorTag(): string
+        {
+                return $this->css_editor_tag;
+        }
+        public function getStorageMode(): string
+        {
+                return $this->storage_mode;
+        }
+
+        // setters
+        public function setPage(string $page): void
+        {
+                $this->page = $page;
+        }
+        public function setFrom(string $from): void
+        {
+                $this->from = $from;
+        }
+        public function setIdArticle(string $id_article): void
+        {
+                $this->id_article = $id_article;
+        }
+        public function setStorageMode($mode): void
+        {
+                $this->storage_mode = $mode;
+        }
+
+        public function checkAjaxReqest(): void
         {
                 // dans un fichier à part parce que trop de lignes
                 require self::INTEGRATION_PATH . 'image_upload.php';
                 die;
         }
 
-        public function checkSubmitPOST()
+
+        public function checkSubmitPOST(): void
         {
                 $html_from_editor = $this->getAndCleanEditorOutput($_POST["contenu"]); // manipule $_POST['contenu'];
 
@@ -47,18 +100,18 @@ class CKEditor
                 die;
         }
 
-        public function openEditor()
+        public function openEditor(): string
         {
                 // version "minifiée"
                 $this->css_editor_tag = '<link rel="stylesheet" href="node_modules/ckeditor5/dist/browser/ckeditor5.css" />';
                 // version normale aérée et commentée"
                 $this->css_editor_tag = '<link rel="stylesheet" href="node_modules/ckeditor5/dist/ckeditor5.css" />';
 
-                if($this->storage === 'database')
+                if($this->getStorageMode() === 'database')
                 {}
-                elseif($this->storage === 'files')
+                elseif($this->getStorageMode() === 'files')
                 {
-                    $texte = file_get_contents($this->data_path . '/html/' . $this->nom_article . '.html');
+                    $texte = file_get_contents($this->data_path . '/html/' . $this->id_article . '.html');
 
                     $texte = trim(addcslashes($texte, "'")); // échapper les simples quotes pour javascript
                     //$texte = trim(addslashes($texte)); // échappe ', ", \ et NULL, je sais pas si c'est bien
@@ -99,9 +152,9 @@ class CKEditor
 
         // conversion des 2M du php.ini en 2000000
         // note: les kibi, mébi et gibi sont inutiles ici
-        private function returnBytes($size_str) // chaine du style '2M'
+        private function returnBytes(string $size_str): int // chaine du style '2M'
         {
-            switch (substr ($size_str, -1))
+            switch(substr($size_str, -1))
             {
                 case 'Ki': case 'ki': return (int)$size_str * 1024;
                 case 'Mi': case 'mi': return (int)$size_str * 1048576;
@@ -109,7 +162,7 @@ class CKEditor
                 case 'K': case 'k': return (int)$size_str * 1000;
                 case 'M': case 'm': return (int)$size_str * 1000000;
                 case 'G': case 'g': return (int)$size_str * 1000000000;
-                default: return $size_str;
+                default: return (int)$size_str;
             }
         }
 
@@ -150,4 +203,4 @@ class CKEditor
             fclose($fichier);
             chmod('data/' . $page . '/' . $nom_fichier, 0666);
         }
-}
\ No newline at end of file
+}
diff --git a/src/integration/ckeditor5/view.php b/src/integration/ckeditor5/view.php
index ed1d0f7..bb1f6a2 100644
--- a/src/integration/ckeditor5/view.php
+++ b/src/integration/ckeditor5/view.php
@@ -1,13 +1,21 @@
 <?php
 // src/integration/ckeditor5/view.php
 
+$submit_action = 'index.php?from=' . $this->page . '&action=submit_editor&id=' . $this->id_article;
+
+$cancel_button = 'index.php?page=' . $this->page;
+$cancel_button .= !empty($this->id_article) ? '&id=' . $this->id_article : '';
+
+$upload_ajax = 'index.php?action=upload_image_editor';
+$upload_ajax .= !empty($this->id_article) ? '&id=' . $this->id_article : '';
+
 ob_start();
 ?>
 <div class="conteneur_article" >
-    <form action="<?= $this->form_action_file ?>" method="POST" enctype="multipart/form-data" >
+    <form action="<?= $submit_action ?>" method="POST" enctype="multipart/form-data" >
         <textarea id="editor" name="contenu" ></textarea>
         <input class="boutonSubmitEditeur" type="submit" value="Valider">
-        <a class="boutonAnnuler" href="<?= $this->from ?>" >
+        <a class="boutonAnnuler" href="<?= $cancel_button ?>" >
             <input type="button" value="Annuler"></a>
         <script type="importmap">
         {
@@ -34,7 +42,7 @@ ob_start();
             
             let editor;
             let html_existant = '<?= $texte ?>'; // $texte doit avoir été sécurisé: simple quotes échappées au minimum
-            let upload_url = '<?= $this->upload_ajax_url ?>';
+            let upload_url = '<?= $upload_ajax ?>';
             
             // ATTENTION: si l'éditeur ne fonctionne pas, empêcher qu'on puisse cliquer sur Valider!
             // Il y a aussi des paramètres dans le fichier de config: ckeditor/webpack.config.js
diff --git a/src/view/templates/page.php b/src/view/templates/page.php
index 5051a5f..05c7444 100644
--- a/src/view/templates/page.php
+++ b/src/view/templates/page.php
@@ -4,8 +4,8 @@
     <meta charset="utf-8">

     <title></title>

     <link rel="icon" type="image/png" href="">

-    <?= $ckeditor->css_outside_editor_tag ?>

-    <?= $ckeditor->css_editor_tag ?>

+    <?= $ckeditor->getCSSOutsideEditorTag() ?>

+    <?= $ckeditor->getCSSEditorTag() ?>

 </head>

 <body>

     <div>