fix #152

* Upgrade tinymce 5 => 6 * Adaptation des plugins tinymce * Fix bug filemanager * fix bug divers contact (admin) * Nouvelle configuration pour tinyMce * fix loop actualité (add link)
magix-cms · Nov 3, 2023 · 3d6e5a7 · 3d6e5a7
1 parent 3a2e8ff
commit 3d6e5a7
Show file tree

Hide file tree

Showing 483 changed files with 5,931 additions and 48,652 deletions.
diff --git a/admin/baseadmin.php b/admin/baseadmin.php
@@ -48,5 +48,5 @@
 /**
  * Version de tinyMCE
  */
-define('VERSION_EDITOR', '5.10.2');
+define('VERSION_EDITOR', '6.7.2');
 ?>
diff --git a/admin/min/groupsConfig.php b/admin/min/groupsConfig.php
@@ -45,7 +45,7 @@
         '//'.PATHADMIN.'/template/css/bootstrap-tagsinput-typeahead.css',
     ),
     'tinymce' => array(
-        '//'.PATHADMIN.'/template/js/vendor/tiny_mce.'.VERSION_EDITOR.'/jquery.tinymce.min.js',
+        '//'.PATHADMIN.'/template/js/vendor/tiny_mce.'.VERSION_EDITOR.'/tinymce-jquery.min.js',
         '//'.PATHADMIN.'/template/js/tinymce-config.min.js'
     ),
     'pdfcss' => array(

diff --git a/admin/template/about/pages/form/edit.tpl b/admin/template/about/pages/form/edit.tpl
@@ -1,6 +1,6 @@
 {include file="language/brick/dropdown-lang.tpl"}
 <div class="row">
-    <form id="edit_pages" action="{$smarty.server.SCRIPT_NAME}?controller={$smarty.get.controller}&amp;action=edit&edit={$page.id_pages}&amp;tabs=pages" method="post" class="validate_form edit_form_extend col-ph-12 col-lg-6">
+    <form id="edit_pages" action="{$smarty.server.SCRIPT_NAME}?controller={$smarty.get.controller}&amp;action=edit&edit={$page.id_pages}&amp;tabs=pages" method="post" class="validate_form edit_form_extend col-ph-12">
         <div class="tab-content">
             <div class="row">
                 <div class="col-ph-12 col-md-2">

diff --git a/admin/template/home/form/edit.tpl b/admin/template/home/form/edit.tpl
@@ -1,6 +1,6 @@
 {include file="language/brick/dropdown-lang.tpl"}
 <div class="row">
-    <form id="edit_home" action="{$smarty.server.SCRIPT_NAME}?controller={$smarty.get.controller}&amp;action=edit" method="post" class="validate_form edit_form col-ph-12 col-md-8">
+    <form id="edit_home" action="{$smarty.server.SCRIPT_NAME}?controller={$smarty.get.controller}&amp;action=edit" method="post" class="validate_form edit_form col-ph-12">
         <div class="row">
             <div class="col-ph-12">
                 <div class="tab-content">

diff --git a/admin/template/js/src/tinymce-config.js b/admin/template/js/src/tinymce-config.js
diff --git a/admin/template/js/tinymce-config.min.js b/admin/template/js/tinymce-config.min.js
diff --git a/admin/template/js/vendor/filemanager/config/config.php b/admin/template/js/vendor/filemanager/config/config.php
@@ -65,6 +65,7 @@ public function tinyMceVersion(){
 mb_internal_encoding('UTF-8');
 mb_http_output('UTF-8');
 //mb_http_input('UTF-8');
+mb_http_input();
 mb_language('uni');
 mb_regex_encoding('UTF-8');
 ob_start('mb_output_handler');

diff --git a/admin/template/js/vendor/filemanager/include/php_image_magician.php b/admin/template/js/vendor/filemanager/include/php_image_magician.php
@@ -483,8 +483,8 @@ private function crop($optimalWidth, $optimalHeight, $newWidth, $newHeight, $cro
 
         // *** Get cropping co-ordinates
         $cropArray = $this->getCropPlacing($optimalWidth, $optimalHeight, $newWidth, $newHeight, $cropPos);
-        $cropStartX = $cropArray['x'];
-        $cropStartY = $cropArray['y'];
+        $cropStartX = (int)$cropArray['x'];
+        $cropStartY = (int)$cropArray['y'];
 
         // *** Crop this bad boy
         $crop = imagecreatetruecolor($newWidth, $newHeight);

diff --git a/admin/template/js/vendor/tiny_mce.5.10.2/icons/default/icons.min.js b/admin/template/js/vendor/tiny_mce.5.10.2/icons/default/icons.min.js
diff --git a/admin/template/js/vendor/tiny_mce.5.10.2/jquery.tinymce.min.js b/admin/template/js/vendor/tiny_mce.5.10.2/jquery.tinymce.min.js
diff --git a/admin/template/js/vendor/tiny_mce.5.10.2/langs/README.md b/admin/template/js/vendor/tiny_mce.5.10.2/langs/README.md