From 718107e8efbcb42d6b263999a3d9f6c4f02f26e5 Mon Sep 17 00:00:00 2001 From: git-pc-greta Date: Sat, 18 Jan 2025 00:47:30 +0100 Subject: jointure (sorte de symlink) sur windows --- index.php | 8 ++++---- src/integration/ckeditor5/config.php | 4 ++-- src/integration/ckeditor5/create.php | 2 +- src/integration/ckeditor5/init.php | 14 ++++++++++++-- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/index.php b/index.php index 1ece14f..96b3259 100644 --- a/index.php +++ b/index.php @@ -2,19 +2,19 @@ // index.php require 'src/integration/ckeditor5/config.php'; -require $ckeditor_integration_path . 'init.php'; +require $ckeditor_integration . 'init.php'; makeTranslationSymLink(); // routage // upload images AJAX -require $ckeditor_integration_path . 'image_upload.php'; +require $ckeditor_integration . 'image_upload.php'; // submit normal if(isset($_GET['action']) && $_GET['action'] === 'submit') // HTML envoyé par l'éditeur { - require $ckeditor_integration_path . 'clean_html.php'; + require $ckeditor_integration . 'clean_html.php'; $html_from_editor = getAndCleanEditorOutput(); // manipule $_POST['contenu']; // enregistrement des données @@ -28,7 +28,7 @@ if(isset($_GET['action']) && $_GET['action'] === 'submit') // HTML envoyé par l // ouvrir l'éditeur elseif(isset($_GET['page']) && $_GET['page'] === 'editor') { - require $ckeditor_integration_path . 'create.php'; + require $ckeditor_integration . 'create.php'; } else // $previous_page, affichage sans l'article { diff --git a/src/integration/ckeditor5/config.php b/src/integration/ckeditor5/config.php index 822884f..e185e8e 100644 --- a/src/integration/ckeditor5/config.php +++ b/src/integration/ckeditor5/config.php @@ -1,8 +1,8 @@ '; +$ckeditor_integration = 'src/integration/ckeditor5/'; +$css_hors_editeur = ''; $server_root = $_SERVER['SERVER_NAME'] . '/ckeditor5/'; // pour l'importmap: j'ai modifié la version "installation avec CDN de la doc pour utiliser les fichiers locaux diff --git a/src/integration/ckeditor5/create.php b/src/integration/ckeditor5/create.php index 863c420..cf7242c 100644 --- a/src/integration/ckeditor5/create.php +++ b/src/integration/ckeditor5/create.php @@ -14,5 +14,5 @@ elseif($storage === 'files') } // vue -require $ckeditor_integration_path . 'view.php'; // html + JS +require $ckeditor_integration . 'view.php'; // html + JS $contenu = $editeurHTML; diff --git a/src/integration/ckeditor5/init.php b/src/integration/ckeditor5/init.php index 4d77cba..30e5fb9 100644 --- a/src/integration/ckeditor5/init.php +++ b/src/integration/ckeditor5/init.php @@ -6,8 +6,18 @@ function makeTranslationSymLink(): void { $target = '../translations'; $link = 'node_modules/ckeditor5/dist/browser/translations'; - if (!file_exists($link)) + + if(!file_exists($link)) { - symlink($target, $link); + if(PHP_OS === 'Linux') + { + symlink($target, $link); + } + elseif(PHP_OS === 'WINNT') + { + // on peut créer une jointure sans droit d'admin + $target = 'node_modules\ckeditor5\dist\translations'; + exec('mklink /J ' . str_replace('/', '\\', $link) . ' ' . $target); + } } } -- cgit v1.2.3