little update

ClicShopping · Jul 22, 2022 · b36726b · b36726b
1 parent 4af11bf
commit b36726b
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -38,8 +38,8 @@ Easy to install in just some clicks on a server or on your computer, you can use
 
 #Requirement (more information in the wiki)
  - Apache 2.4<br>
- - MYSQL 7 / MariaDb 10.3 - 10.4 / Postgres<br>
- - PHP > 8.0 and 8.1
+ - MYSQL 7 / MariaDb 10.x / Postgres<br>
+ - PHP > 8.1
  - More information in the Wiki
 
 #Installation
@@ -90,7 +90,7 @@ ClicShopping(tm) has a trademark deposed : https://www.clicshopping.org/forum/tr
 
 #Functionnalities (some)
 - B2B - B2C  full functionalities
-- WYSIWYG to create your products description, content with CKeditor4.x
+- WYSIWYG to create your products description, content with CKeditor5.x
 - Image Editor management with El-Finder 2.x - drag and drop - webp
 - Full SEO functionalities optimization ad url
 - Payment and Shipping modules included inside the application with Paypal
@@ -99,7 +99,7 @@ ClicShopping(tm) has a trademark deposed : https://www.clicshopping.org/forum/tr
 - Some dynamic statistics inside the dashboard and all the back-office
 - GDRP included and some regulation aspect
 - Some configuration capacities to adapt the settings in function of your needs in B2B or B2C
-- Ready for mobile, tablet and desktop with BootStrap 4.x technology
+- Ready for mobile, tablet and desktop with BootStrap 5.x technology
 - Several modes of payment / delivery can be installed
 - More 250 modules available and free functional on the marketplace and available on Github !
 - Full responsive design  application with Bootstrap 4.x

diff --git a/_config.yml b/_config.yml
diff --git a/_htaccess b/_htaccess
@@ -3,7 +3,7 @@
 #Options -MultiViews
 
 #AllowOverride All
-#AcceptPathInfo on
+AcceptPathInfo on
 
 
 ##################################

diff --git a/error_documents/404.php b/error_documents/404.php
@@ -32,7 +32,7 @@
   <link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin>
 <!-- CSS only -->
 <!-- CSS only -->
-   <link href="https://cdn.jsdelivr.net/npm/[email protected]-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-0evHe/X+R7YkIZDRvuzKMRqM+OrBnVFBL6DOitfPri4tjfHxaWutUpFmBp4vmVor" crossorigin="anonymous">
+   <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css">
 </head>
 <body>
@@ -65,7 +65,6 @@
 </div>
 <!-- JavaScript Bundle with Popper -->
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>
-
 <?php
   exit;
 ?>

diff --git a/error_documents/error_template.php b/error_documents/error_template.php
@@ -18,7 +18,7 @@
   <link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin>
 <!-- CSS only -->
 <!-- CSS only -->
-  <link href="https://cdn.jsdelivr.net/npm/[email protected]-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-0evHe/X+R7YkIZDRvuzKMRqM+OrBnVFBL6DOitfPri4tjfHxaWutUpFmBp4vmVor" crossorigin="anonymous">
+  <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
   <base href="<?php echo $_SERVER['HTTP_HOST']; ?>">
   <title>Template problem !</title>
 </head>

diff --git a/error_documents/maintenance.php b/error_documents/maintenance.php
@@ -23,7 +23,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <title>Maintenance</title>
   <link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin>
-  <link href="https://cdn.jsdelivr.net/npm/[email protected]-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-0evHe/X+R7YkIZDRvuzKMRqM+OrBnVFBL6DOitfPri4tjfHxaWutUpFmBp4vmVor" crossorigin="anonymous">
+  <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
 </head>
 <body>
 <div class="text-center" style="padding-top:150px;">

diff --git a/includes/ClicShopping/External/vendor/composer/installed.php b/includes/ClicShopping/External/vendor/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../../../../',
         'aliases' => array(),
-        'reference' => 'd4533fba17cc201eb4ed69932d6b3cfe6a25cb74',
+        'reference' => '4af11bfb1da1c39afad6a763f80c6833593ab957',
         'name' => '__root__',
         'dev' => true,
     ),
@@ -16,7 +16,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../../../../',
             'aliases' => array(),
-            'reference' => 'd4533fba17cc201eb4ed69932d6b3cfe6a25cb74',
+            'reference' => '4af11bfb1da1c39afad6a763f80c6833593ab957',
             'dev_requirement' => false,
         ),
         'darkghosthunter/preloader' => array(

diff --git a/includes/ClicShopping/Sites/Shop/RewriteUrl.php b/includes/ClicShopping/Sites/Shop/RewriteUrl.php
@@ -438,7 +438,7 @@ private static function getRemoveAccents(string $string ): string
       }
 
       if ( static::seemsUtf8( $string )) {
-        $chars =[
+        $chars = [
           // Decompositions for Latin-1 Supplement
           'ª' => 'a',
           'º' => 'o',

diff --git a/includes/Module/Hooks/ClicShoppingAdmin/Header/HeaderOutputBootstrap.php b/includes/Module/Hooks/ClicShoppingAdmin/Header/HeaderOutputBootstrap.php
@@ -24,7 +24,7 @@ public function display(): string
 //Note : Could be relation with a meta tag allowing to implement a new boostrap theme : Must be installed
       $output = '<!-- Start Bootstrap -->' . "\n";
       $output .= '<!-- CSS only -->';
-      $output .= '<link href="https://cdn.jsdelivr.net/npm/[email protected]-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-0evHe/X+R7YkIZDRvuzKMRqM+OrBnVFBL6DOitfPri4tjfHxaWutUpFmBp4vmVor" crossorigin="anonymous">' . "\n";
+      $output .= '<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">' . "\n";
       $output .= '<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css">';
       $output .= '<link rel="stylesheet" href="' . CLICSHOPPING::link('css/bootstrap_icons_customize.css')  . '" media="screen, print">';
       $output .= '<!-- Start Bootstrap -->' . "\n";

diff --git a/includes/Module/Hooks/Shop/Footer/FooterOutputBootStrap.php b/includes/Module/Hooks/Shop/Footer/FooterOutputBootStrap.php
@@ -19,8 +19,7 @@ class FooterOutputBootStrap
     public function display(): string
     {
       $output = '<!--Bootstrap Script start-->' . "\n";
-      $output .= '<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>
-';
+      $output .= '<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>';
       $output .= '<!--End Bootstrap Script-->' . "\n";
 
       return $output;

diff --git a/includes/Module/Hooks/Shop/Header/HeaderOutputBootstrap.php b/includes/Module/Hooks/Shop/Header/HeaderOutputBootstrap.php
@@ -26,7 +26,7 @@ public function display()
 //Note : Could be relation with a meta tag allowing to implement a new boostrap theme : Must be installed
       if (!\defined('MODULE_HEADER_TAGS_BOOTSTRAP_SELECT_THEME') || MODULE_HEADER_TAGS_BOOTSTRAP_SELECT_THEME == 'False') {
         $output = '<!-- CSS only -->
-        <link href="https://cdn.jsdelivr.net/npm/[email protected]-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-0evHe/X+R7YkIZDRvuzKMRqM+OrBnVFBL6DOitfPri4tjfHxaWutUpFmBp4vmVor" crossorigin="anonymous">' . "\n";
+        <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">' . "\n";
         $output .= '<link rel="stylesheet" media="screen, print" href="' . $CLICSHOPPING_Template->getTemplateCSS() . '" />' . "\n";
         $output .= '<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css">';
 

diff --git a/install/templates/main_page.php b/install/templates/main_page.php
@@ -33,7 +33,7 @@
   <meta name="generator" content="ClicShopping, Social E-Commerce B2B/B2C Open Source Solutions /">
 
 <!-- CSS only -->
-    <link href="https://cdn.jsdelivr.net/npm/[email protected]-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-0evHe/X+R7YkIZDRvuzKMRqM+OrBnVFBL6DOitfPri4tjfHxaWutUpFmBp4vmVor" crossorigin="anonymous">
+    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css">
     <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
 

diff --git a/offline.php b/offline.php
@@ -13,7 +13,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin>
-    <link href="https://cdn.jsdelivr.net/npm/[email protected]-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-0evHe/X+R7YkIZDRvuzKMRqM+OrBnVFBL6DOitfPri4tjfHxaWutUpFmBp4vmVor" crossorigin="anonymous">
+    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
     <title>Site offline</title>
   </head>
   <body width="0" height="0" topmargin="0" leftmargin="0" bgcolor="#f0edec">
@@ -34,5 +34,4 @@
   </body>
   <!-- JavaScript Bundle with Popper -->
       <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>
-
 </html>