diff options
-rw-r--r-- | data/page/html/1646148841.html | 2 | ||||
-rw-r--r-- | data/page/html/1646148842.html | 2 | ||||
-rw-r--r-- | installation ckeditor.txt (renamed from installation dans une application PHP.txt) | 1 | ||||
-rw-r--r-- | public/css/article_hors_editeur.css (renamed from src/integration/ckeditor5/article_hors_editeur.css) | 0 | ||||
-rw-r--r-- | public/index.php (renamed from index.php) | 2 | ||||
-rw-r--r-- | src/service/ckeditor5/CKEditor.php (renamed from src/integration/ckeditor5/CKEditor.php) | 16 | ||||
-rw-r--r-- | src/service/ckeditor5/image_upload.php (renamed from src/integration/ckeditor5/image_upload.php) | 0 | ||||
-rw-r--r-- | src/service/ckeditor5/view.php (renamed from src/integration/ckeditor5/view.php) | 0 |
8 files changed, 12 insertions, 11 deletions
diff --git a/data/page/html/1646148841.html b/data/page/html/1646148841.html index 291f6d0..ecb0d54 100644 --- a/data/page/html/1646148841.html +++ b/data/page/html/1646148841.html | |||
@@ -1 +1 @@ | |||
<figure class="image image-style-side"><img src="data/page/images/chirurgien jaune.jpg" alt="image" /><figcaption>image</figcaption></figure><h2>hello</h2><figure class="table"><table><tbody><tr><td>okok</td><td>peut-être</td><td>bon</td></tr><tr><td><p>c'est pas</p><p>grave</p></td><td><p>on verra</p><p>plus tard</p></td><td>coucou</td></tr></tbody></table></figure><p><i><mark class="marker-green">goodbye</mark></i></p> \ No newline at end of file | <figure class="image image-style-side"><img style="aspect-ratio:800/673;" src="../data/page/images/chirurgien jaune.jpg" width="800" height="673" alt="image" /></figure><h2>hello</h2><figure class="table"><table><tbody><tr><td>okok</td><td>peut-être</td><td>bon</td></tr><tr><td><p>c'est pas</p><p>grave</p></td><td><p>on verra</p><p>plus tard</p></td><td>coucou</td></tr></tbody></table></figure><p><i><mark class="marker-green">goodbye</mark></i></p> \ No newline at end of file | ||
diff --git a/data/page/html/1646148842.html b/data/page/html/1646148842.html index 78264ee..1572c1e 100644 --- a/data/page/html/1646148842.html +++ b/data/page/html/1646148842.html | |||
@@ -1 +1 @@ | |||
<figure class="image image-style-side"><img src="data/page/images/garfield4.png" alt="image" /><figcaption>image</figcaption></figure><h2>good bye</h2><figure class="table"><table><tbody><tr><td>ok</td><td>ah oui</td><td>bon</td></tr><tr><td><p>c'est super</p><p>grave</p></td><td><p>on verra</p><p>plus tard</p></td><td>salut</td></tr></tbody></table></figure><p><i><mark class="marker-green">goodbye</mark></i></p> \ No newline at end of file | <figure class="image image-style-side"><img src="../data/page/images/garfield4.png" alt="image" /><figcaption>image</figcaption></figure><h2>good bye</h2><figure class="table"><table><tbody><tr><td>ok</td><td>ah oui</td><td>bon</td></tr><tr><td><p>c'est super</p><p>grave</p></td><td><p>on verra</p><p>plus tard</p></td><td>salut</td></tr></tbody></table></figure><p><i><mark class="marker-green">goodbye</mark></i></p> | ||
diff --git a/installation dans une application PHP.txt b/installation ckeditor.txt index 76ec201..08f19ae 100644 --- a/installation dans une application PHP.txt +++ b/installation ckeditor.txt | |||
@@ -27,6 +27,7 @@ data/page/images/garfield4.png | |||
27 | 2/ lien symbolique nécéssaire pour trouver les traductions (commande pour debian): | 27 | 2/ lien symbolique nécéssaire pour trouver les traductions (commande pour debian): |
28 | un problème de chemin se produit à la ligne: import coreTranslations from 'ckeditor5/translations/fr.js'; dans lib/ckeditor5/template.php | 28 | un problème de chemin se produit à la ligne: import coreTranslations from 'ckeditor5/translations/fr.js'; dans lib/ckeditor5/template.php |
29 | gràce à un lien symbolique, le programme s'attend à trouver un dossier "translations" dans "browser" | 29 | gràce à un lien symbolique, le programme s'attend à trouver un dossier "translations" dans "browser" |
30 | le dossier concerné est node_modules/ckeditor5/dist/browser, on doit lui donner plus de droits | ||
30 | 31 | ||
31 | PHP l'ajoute avec symlink dans index.php | 32 | PHP l'ajoute avec symlink dans index.php |
32 | si le lien symbolique /srv/http/ckeditor5/node_modules/ckeditor5/dist/browser/translations | 33 | si le lien symbolique /srv/http/ckeditor5/node_modules/ckeditor5/dist/browser/translations |
diff --git a/src/integration/ckeditor5/article_hors_editeur.css b/public/css/article_hors_editeur.css index 622b539..622b539 100644 --- a/src/integration/ckeditor5/article_hors_editeur.css +++ b/public/css/article_hors_editeur.css | |||
diff --git a/index.php b/public/index.php index 3e89113..f674f0f 100644 --- a/index.php +++ b/public/index.php | |||
@@ -6,7 +6,7 @@ $from = isset($_GET['from']) ? $_GET['from'] : 'accueil'; // pour revenir au mê | |||
6 | $id_article = isset($_GET['id']) && !empty($_GET['id']) ? $_GET['id'] : ''; | 6 | $id_article = isset($_GET['id']) && !empty($_GET['id']) ? $_GET['id'] : ''; |
7 | 7 | ||
8 | 8 | ||
9 | require 'src/integration/ckeditor5/CKEditor.php'; | 9 | require '../src/service/ckeditor5/CKEditor.php'; |
10 | $ckeditor = new CKEditor(); | 10 | $ckeditor = new CKEditor(); |
11 | $ckeditor->setLanguage('fr'); // attention, exécute une autre fonction qui peut échouer | 11 | $ckeditor->setLanguage('fr'); // attention, exécute une autre fonction qui peut échouer |
12 | $ckeditor->setStorageMode('files'); | 12 | $ckeditor->setStorageMode('files'); |
diff --git a/src/integration/ckeditor5/CKEditor.php b/src/service/ckeditor5/CKEditor.php index c53f236..3adf223 100644 --- a/src/integration/ckeditor5/CKEditor.php +++ b/src/service/ckeditor5/CKEditor.php | |||
@@ -5,8 +5,8 @@ declare(strict_types=1); | |||
5 | 5 | ||
6 | class CKEditor | 6 | class CKEditor |
7 | { | 7 | { |
8 | public const string INTEGRATION_PATH = 'src/integration/ckeditor5/'; | 8 | public const string INTEGRATION_PATH = '../src/service/ckeditor5/'; |
9 | public const string DATA_PATH = 'data/page'; | 9 | public const string DATA_PATH = '../data/page'; |
10 | //public const string SERVER_PATH = '/'; | 10 | //public const string SERVER_PATH = '/'; |
11 | private const string SERVER_PATH = '/ckeditor5/'; | 11 | private const string SERVER_PATH = '/ckeditor5/'; |
12 | 12 | ||
@@ -27,7 +27,7 @@ class CKEditor | |||
27 | public function __construct() | 27 | public function __construct() |
28 | { | 28 | { |
29 | $this->php_ini_max_size = $this->returnBytes(ini_get('upload_max_filesize')); // = 2M par défaut dans le php.ini | 29 | $this->php_ini_max_size = $this->returnBytes(ini_get('upload_max_filesize')); // = 2M par défaut dans le php.ini |
30 | $this->css_outside_editor_tag = '<link rel="stylesheet" href="' . self::INTEGRATION_PATH . 'article_hors_editeur.css" />'; | 30 | $this->css_outside_editor_tag = '<link rel="stylesheet" href="css/article_hors_editeur.css" />'; |
31 | $this->server_root = $_SERVER['SERVER_NAME'] . self::SERVER_PATH; | 31 | $this->server_root = $_SERVER['SERVER_NAME'] . self::SERVER_PATH; |
32 | } | 32 | } |
33 | 33 | ||
@@ -98,9 +98,9 @@ class CKEditor | |||
98 | public function openEditor(string $id = '', string $texte = ''): string | 98 | public function openEditor(string $id = '', string $texte = ''): string |
99 | { | 99 | { |
100 | // version "minifiée" | 100 | // version "minifiée" |
101 | $this->css_editor_tag = '<link rel="stylesheet" href="node_modules/ckeditor5/dist/browser/ckeditor5.css" />'; | 101 | $this->css_editor_tag = '<link rel="stylesheet" href="../node_modules/ckeditor5/dist/browser/ckeditor5.css" />'; |
102 | // version normale aérée et commentée" | 102 | // version normale aérée et commentée" |
103 | $this->css_editor_tag = '<link rel="stylesheet" href="node_modules/ckeditor5/dist/ckeditor5.css" />'; | 103 | $this->css_editor_tag = '<link rel="stylesheet" href="../node_modules/ckeditor5/dist/ckeditor5.css" />'; |
104 | 104 | ||
105 | require self::INTEGRATION_PATH . 'view.php'; // html + JS | 105 | require self::INTEGRATION_PATH . 'view.php'; // html + JS |
106 | return $editeurHTML; | 106 | return $editeurHTML; |
@@ -127,7 +127,7 @@ class CKEditor | |||
127 | private function makeTranslationSymLink(): void | 127 | private function makeTranslationSymLink(): void |
128 | { | 128 | { |
129 | $target = '../translations'; | 129 | $target = '../translations'; |
130 | $link = 'node_modules/ckeditor5/dist/browser/translations'; | 130 | $link = '../node_modules/ckeditor5/dist/browser/translations'; |
131 | 131 | ||
132 | if(!file_exists($link)) | 132 | if(!file_exists($link)) |
133 | { | 133 | { |
@@ -138,7 +138,7 @@ class CKEditor | |||
138 | elseif(PHP_OS_FAMILY === 'Windows') // note: PHP_OS = WINNT | 138 | elseif(PHP_OS_FAMILY === 'Windows') // note: PHP_OS = WINNT |
139 | { | 139 | { |
140 | // on peut créer une jointure sans droit d'admin | 140 | // on peut créer une jointure sans droit d'admin |
141 | $target = 'node_modules\ckeditor5\dist\translations'; | 141 | $target = '..\node_modules\ckeditor5\dist\translations'; |
142 | exec('mklink /J ' . str_replace('/', '\\', $link) . ' ' . $target); | 142 | exec('mklink /J ' . str_replace('/', '\\', $link) . ' ' . $target); |
143 | } | 143 | } |
144 | else | 144 | else |
@@ -173,7 +173,7 @@ class CKEditor | |||
173 | //$this->checkContentInFile($html, 'avant'); | 173 | //$this->checkContentInFile($html, 'avant'); |
174 | 174 | ||
175 | // sécurisation du HTML (faille XSS) | 175 | // sécurisation du HTML (faille XSS) |
176 | require 'vendor/htmlawed/htmlawed/htmLawed.php'; | 176 | require '../vendor/htmlawed/htmlawed/htmLawed.php'; |
177 | $configHtmLawed = array( | 177 | $configHtmLawed = array( |
178 | 'safe'=>1, // protection contre les élements et attributs dangereux | 178 | 'safe'=>1, // protection contre les élements et attributs dangereux |
179 | 179 | ||
diff --git a/src/integration/ckeditor5/image_upload.php b/src/service/ckeditor5/image_upload.php index 5cef369..5cef369 100644 --- a/src/integration/ckeditor5/image_upload.php +++ b/src/service/ckeditor5/image_upload.php | |||
diff --git a/src/integration/ckeditor5/view.php b/src/service/ckeditor5/view.php index 57115d1..57115d1 100644 --- a/src/integration/ckeditor5/view.php +++ b/src/service/ckeditor5/view.php | |||