From dd154c632d7e154b1211ca770d19911910b753aa Mon Sep 17 00:00:00 2001
From: Esenjin <esenjin@sangigi-fuchsia.fr>
Date: Mon, 17 Feb 2025 21:18:17 +0100
Subject: [PATCH] =?UTF-8?q?correction=20du=20traitement=20des=20urls=20des?=
 =?UTF-8?q?=20images=20dans=20les=20diff=C3=A9rents=20contenus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 about.php                        | 2 +-
 admin/api/about-image-upload.php | 2 +-
 admin/api/upload-image.php       | 9 +++++----
 assets/css/public.css            | 9 +++++++++
 assets/js/story-edit.js          | 9 ++++++++-
 chapitre.php                     | 2 +-
 includes/config.php              | 4 ++++
 roman.php                        | 2 +-
 8 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/about.php b/about.php
index edd02c6..9468f16 100644
--- a/about.php
+++ b/about.php
@@ -39,7 +39,7 @@ $siteStats = $stats->getStats();
     <!-- Contenu principal -->
     <div class="about-content">
         <div class="about-description">
-            <?= $about['content'] // Le contenu est déjà en HTML ?>
+            <?= $about['content'] = Config::fixImagePaths($about['content']); ?>
         </div>
 
         <aside class="sidebar">
diff --git a/admin/api/about-image-upload.php b/admin/api/about-image-upload.php
index f4cfb74..fbbd2ea 100644
--- a/admin/api/about-image-upload.php
+++ b/admin/api/about-image-upload.php
@@ -82,7 +82,7 @@ class AboutImageUploadHandler {
             // Retourner le chemin relatif pour l'éditeur
             return [
                 'success' => true,
-                'url' => '../assets/images/about/' . $filename,
+                'url' => 'assets/images/about/' . $filename,
                 'width' => $needsResize ? $newWidth : $width,
                 'height' => $needsResize ? $newHeight : $height
             ];
diff --git a/admin/api/upload-image.php b/admin/api/upload-image.php
index 9517532..e317357 100644
--- a/admin/api/upload-image.php
+++ b/admin/api/upload-image.php
@@ -81,9 +81,12 @@ class ImageUploadHandler {
             }
             
             // Retourner le chemin relatif pour l'éditeur
+            $relativePath = $this->getRelativePath($targetPath);
+            $adminPreviewPath = '../' . $relativePath;
             return [
                 'success' => true,
-                'url' => $this->getRelativePath($targetPath),
+                'url' => $adminPreviewPath,
+                'storage_url' => $relativePath,
                 'width' => $needsResize ? $newWidth : $width,
                 'height' => $needsResize ? $newHeight : $height
             ];
@@ -149,9 +152,7 @@ class ImageUploadHandler {
     }
     
     private function getRelativePath($absolutePath) {
-        $relativePath = str_replace(__DIR__ . '/../../', '', $absolutePath);
-        // Ajout de '../' car on est dans admin/api/
-        return '../' . str_replace('\\', '/', $relativePath); // Pour la compatibilité Windows
+        return str_replace(__DIR__ . '/../../', '', $absolutePath);
     }
     
     private function getUploadErrorMessage($error) {
diff --git a/assets/css/public.css b/assets/css/public.css
index 71c9a67..4852f85 100644
--- a/assets/css/public.css
+++ b/assets/css/public.css
@@ -537,6 +537,15 @@ body {
     padding: var(--spacing-lg);
     border-radius: var(--radius-md);
     border: 1px solid var(--border-color);
+    overflow: hidden;
+}
+
+.about-description img {
+    max-width: 100%;
+    height: auto;
+    display: block;
+    margin: var(--spacing-md) 0;
+    border-radius: var(--radius-sm);
 }
 
 /* Sidebar */
diff --git a/assets/js/story-edit.js b/assets/js/story-edit.js
index 8975376..7318416 100644
--- a/assets/js/story-edit.js
+++ b/assets/js/story-edit.js
@@ -1,6 +1,7 @@
 document.addEventListener('DOMContentLoaded', function() {
+    const urlParams = new URLSearchParams(window.location.search);
+    const storyId = document.querySelector('input[name="id"]')?.value || urlParams.get('id');
     let currentChapterId = null;
-    const storyId = document.querySelector('input[name="id"]')?.value;
 
     // Fonction de notification
     function showNotification(message, type = 'success') {
@@ -96,6 +97,12 @@ document.addEventListener('DOMContentLoaded', function() {
                                     if (result.success) {
                                         const range = quill.getSelection(true);
                                         quill.insertEmbed(range.index, 'image', result.url);
+                                        const insertOp = quill.getContents().ops.find(op => 
+                                            op.insert && op.insert.image === result.url
+                                        );
+                                        if (insertOp) {
+                                            insertOp.insert.image = result.storage_url;
+                                        }
                                         quill.setSelection(range.index + 1);
                                     } else {
                                         showNotification(result.error || 'Erreur lors de l\'upload', 'error');
diff --git a/chapitre.php b/chapitre.php
index 0f932f3..bc22cb9 100644
--- a/chapitre.php
+++ b/chapitre.php
@@ -68,7 +68,7 @@ $config = Config::load();
     <!-- Contenu principal -->
     <div class="novel-content">
         <div class="novel-description chapter-content">
-            <?= $currentChapter['content'] ?>
+            <?= $currentChapter['content'] = Config::fixImagePaths($currentChapter['content']); ?>
             
             <!-- Navigation entre chapitres -->
             <div class="chapter-navigation">
diff --git a/includes/config.php b/includes/config.php
index aecc2e9..0903ea0 100644
--- a/includes/config.php
+++ b/includes/config.php
@@ -31,6 +31,10 @@ class Config {
         return $config[$key] ?? $default;
     }
 
+    public static function fixImagePaths($content) {
+        return preg_replace('/(src|url)=(["\'])\.\.\//i', '$1=$2', $content);
+    }
+
     public static function save($newConfig) {
         $configFile = __DIR__ . '/../config.json';
         
diff --git a/roman.php b/roman.php
index 0e54fd6..0ae1171 100644
--- a/roman.php
+++ b/roman.php
@@ -46,7 +46,7 @@ $config = Config::load();
     <!-- Contenu principal -->
     <div class="novel-content">
         <div class="novel-description">
-            <?= $story['description'] ?>
+            <?= $story['description'] = Config::fixImagePaths($story['description']); ?>
         </div>
 
         <aside class="chapters-menu">