versioning fichiers CSS et JS

15 files changed, 61 insertions, 77 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8fce603
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+data/
diff --git a/controller/media.php b/controller/media.php
index b6774e0..71eddf9 100644
--- a/controller/media.php
+++ b/controller/media.php
@@ -3,7 +3,7 @@
 // traitement avant enregistrement dans le fichier submit.php

 // cette fonction extrait les liens pointant vers des medias embarqués

 // (liste de sites) et les restituent nus, sans les balises

-function mediaSubmit($chaine)

+function mediaSubmit(string $chaine)

 {

         // liste de sites concernés par les fonctions de ce fichiers

         $listeMedia = "youtube.com|vimeo.com|dailymotion.com|spotify.com|soundcloud.com|instagram.com|twitter.com|flickr.com|facebook.com|fb.watch|deezer.com|openstreetmap.org|goo.gl/maps|google.com/maps|itunes.apple.com|wordpress.com";

@@ -191,7 +191,7 @@ function mediaSubmit($chaine)
 

 

 // embarquement !!

-function mediaEmbed($chaine)

+function mediaEmbed(string $chaine)

 {

     //require("../Embera/src/Autoloader.php");

     //$embera = new Embera\Embera();

diff --git a/index.php b/index.php
index 182f931..7d805f2 100644
--- a/index.php
+++ b/index.php
@@ -57,6 +57,7 @@ if(isset($_GET['page'])) // utile?
 

 // contrôleurs

 // mode visiteur (sans l'éditeur)

+require 'view/Versioning.php';

 require('controller/visitor.php');

 

 // contrôleur des pages en mode admin

diff --git a/public/file_upload.js b/public/js/file_upload.js
index c24b798..737ca5f 100644
--- a/public/file_upload.js
+++ b/public/js/file_upload.js
@@ -1,4 +1,4 @@
-// public/file_upload.js
+// public/js/file_upload.js
 //
 // envoie d'un gros fichier ZIP en contournant la limite du php.ini
 // ce fichier est "caché", il n'est envoyé qu'à un utilisateur connecté et sur la page "restauration"
diff --git a/public/js/index.php b/public/js/index.php
new file mode 100644
index 0000000..f67f1d7
--- /dev/null
+++ b/public/js/index.php
@@ -0,0 +1,3 @@
+<?php
+header('Location: ../index.php');
+exit();
diff --git a/public/inversion.js b/public/js/inversion.js
index 20a6871..77c3151 100644
--- a/public/inversion.js
+++ b/public/js/inversion.js
@@ -1,4 +1,4 @@
-// public/inversion.js
+// public/js/inversion.js
 
 // inverser la position de deux "articles" ou albums d'une page
 function inversion()
diff --git a/public/main.js b/public/js/main.js
index 19a09bb..f5f602b 100644
--- a/public/main.js
+++ b/public/js/main.js
@@ -1,4 +1,4 @@
-// public/main.js

+// public/js/main.js

 

 function versMenu()

 {

diff --git a/view/Versioning.php b/view/Versioning.php
new file mode 100644
index 0000000..f75afe1
--- /dev/null
+++ b/view/Versioning.php
@@ -0,0 +1,24 @@
+<?php

+// view/Versioning.php

+

+class Versioning {

+    static function insertCSS(string $name): string

+    {

+        return '<link rel="stylesheet" href="' . self::versionedFileURL('css', $name) . '">' . "\n";

+    }

+    static function insertJS(string $name, bool $module = false): string

+    {

+        return '<script ' . ($module ? 'type="module"' : '') . ' src="' . self::versionedFileURL('js', $name) . '"></script>' . "\n";

+    }

+

+    static function versionedFileURL(string $type, string $filename, ?string $custom_path = null): string

+    {

+        $path = $custom_path ?? 'public/' . $type . '/' . $filename . '.' . $type; // si custom_path, $type et $filename ne servent à rien

+

+        if(file_exists(getcwd() . '/' . $path)){

+            $version = substr(md5_file($path), 0, 8);

+            return $path . '?v=' . $version;

+        }

+        return $path; // sécurité fichier absent

+    }

+}

diff --git a/view/accueil.php b/view/accueil.php
index 1e8db56..d7297e4 100644
--- a/view/accueil.php
+++ b/view/accueil.php
@@ -2,12 +2,12 @@
 // view/accueil.php

 

 // variable $js

+$js = Versioning::insertJS('main');

 ob_start();

 ?>

-                <script src="public/main.js" ></script>

                 <script>versMenu();</script>

 <?php

-$js = ob_get_clean();

+$js .= ob_get_clean();

 

 // variable $header

 ob_start();

diff --git a/view/album.php b/view/album.php
index 6fcca36..e568aa2 100644
--- a/view/album.php
+++ b/view/album.php
@@ -2,29 +2,18 @@
 // view/album.php
 
 // variable $css
-// utilise discographie.css
-ob_start();
-?>
-        <link rel="stylesheet" type="text/css" href="public/css/discographie.css">
-        <link rel="stylesheet" type="text/css" href="public/css/donnees_hors_editeur.css">
-<?php
-$css = ob_get_clean();
+$css = Versioning::insertCSS('discographie');
+$css .= Versioning::insertCSS('donnees_hors_editeur');
 
 // variable $js
-ob_start();
-?>
-        <script src="public/main.js" ></script>
-        <!-- <script type="text/javascript" src="public/file_upload.js" ></script> -->
-<?php
+$js = Versioning::insertJS('main');
+//$js .= Versioning::insertJS('file_upload');
+
 if(isset($_GET['action']) && $_GET['action'] === 'edition')
 {
-
     // bibliothèques JS ckeditor
-?>
-        <script src="lib/ckeditor5/build/ckeditor.js"></script>
-<?php
+    $js .= '<script src="' . Versioning::versionedFileURL('', '', 'lib/ckeditor5/build/ckeditor.js') . '"></script>';
 }
-$js = ob_get_clean();
 
 // variable $header
 ob_start();
diff --git a/view/backup.php b/view/backup.php
index 78e2d04..c56661f 100644
--- a/view/backup.php
+++ b/view/backup.php
@@ -77,12 +77,12 @@ elseif(isset($_GET['action']) && $_GET['action'] == 'restauration')
             <title><?= $title ?></title>
             <!-- <link rel="shortcut icon" type="image/x-icon" href="favicon.ico" /> -->
         <link rel="icon" type="image/png" href="public/mouette-logo.png">
-            <link rel="stylesheet" type="text/css" href="public/css/normalize.css">
-                <link rel="stylesheet" type="text/css" href="public/css/main.css">
+                <?= Versioning::insertCSS('normalize') ?>
+        <?= Versioning::insertCSS('main') ?>
 <?php
 if(isset($_GET['action']) && $_GET['action'] == 'restauration')
 {
-        echo('<script src="public/file_upload.js" ></script>');
+        echo Versioning::insertJS('file_upload');
 }
 ?>
                 <meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/view/discographie.php b/view/discographie.php
index 84358db..96026bf 100644
--- a/view/discographie.php
+++ b/view/discographie.php
@@ -2,30 +2,18 @@
 // view/discographie.php
 
 // variable $css
-ob_start();
-?>
-        <link rel="stylesheet" type="text/css" href="public/css/<?= $page ?>.css">
-        <link rel="stylesheet" type="text/css" href="public/css/donnees_hors_editeur.css">
-<?php
-$css = ob_get_clean();
-
+$css = Versioning::insertCSS($page);
+$css .= Versioning::insertCSS('donnees_hors_editeur');
 
 // variable $js
-ob_start();
-?>
-        <script src="public/main.js"></script>
-        <!-- <script type="text/javascript" src="public/file_upload.js" ></script> -->
-<?php
+$js = Versioning::insertJS('main');
+//$js .= Versioning::insertJS('file_upload');
+
 if(isset($_GET['action']) && $_GET['action'] === 'edition')
 {
-
     // bibliothèques JS ckeditor
-?>
-        <script src="lib/ckeditor5/build/ckeditor.js"></script>
-<?php
+    $js .= '<script src="' . Versioning::versionedFileURL('', '', 'lib/ckeditor5/build/ckeditor.js') . '"></script>';
 }
-$js = ob_get_clean();
-
 
 // variable $header
 ob_start();
diff --git a/view/pageArticlesSimples.php b/view/pageArticlesSimples.php
index d282964..fcb453a 100644
--- a/view/pageArticlesSimples.php
+++ b/view/pageArticlesSimples.php
@@ -2,39 +2,17 @@
 // view/pageArticleSimple.php

 

 // variable $css

-ob_start();

-if($page == 'menu')

-{

-?>

-        <link rel="stylesheet" type="text/css" href="public/css/menu.css">

-<?php

-}

-else

-{

-?>

-        <link rel="stylesheet" type="text/css" href="public/css/pages_articles_simples.css">

-<?php

-}

-?>

-        <link rel="stylesheet" type="text/css" href="public/css/donnees_hors_editeur.css">

-<?php

-$css = ob_get_clean();

+$css = $page === 'menu' ? Versioning::insertCSS('menu') : Versioning::insertCSS('pages_articles_simples');

+$css .= Versioning::insertCSS('donnees_hors_editeur');

 

 //variable $js

-ob_start();

-?>

-        <script src="public/main.js"></script>

-<?php

+$js = Versioning::insertJS('main');

+

 if(isset($_GET['action']) && $_GET['action'] == 'editor')

 {

-

     // bibliothèques JS ckeditor

-?>

-        <script src="lib/ckeditor5/build/ckeditor.js"></script>

-<?php

+    $js .= '<script src="' . Versioning::versionedFileURL('', '', 'lib/ckeditor5/build/ckeditor.js') . '"></script>';

 }

-$js = ob_get_clean();

-

 

 // message lecteur multimedia

 if($page == 'archives')

diff --git a/view/password.php b/view/password.php
index ae153b5..62f53ec 100644
--- a/view/password.php
+++ b/view/password.php
@@ -75,9 +75,9 @@ ob_start();
 

         <!-- <link rel="shortcut icon" type="image/x-icon" href="favicon.ico" /> -->

         <link rel="icon" type="image/png" href="public/mouette-logo.png">

-        <link rel="stylesheet" type="text/css" href="public/css/normalize.css">

-        <link rel="stylesheet" type="text/css" href="public/css/main.css">

-        <script src="public/main.js" ></script>

+        <?= Versioning::insertCSS('normalize') ?>

+        <?= Versioning::insertCSS('main') ?>

+        <?= Versioning::insertJS('main') ?>

         <meta name="viewport" content="width=device-width, initial-scale=1.0">

     </head>

 

diff --git a/view/template.php b/view/template.php
index dfe68bd..3facc13 100644
--- a/view/template.php
+++ b/view/template.php
@@ -10,9 +10,9 @@
 

         <!-- <link rel="shortcut icon" type="image/x-icon" href="public/favicon.ico" /> -->

         <link rel="icon" type="image/png" href="public/mouette-logo.png">

-        <link rel="stylesheet" type="text/css" href="public/css/normalize.css">

-        <link rel="stylesheet" type="text/css" href="public/css/main.css">

 <?php

+echo Versioning::insertCSS('normalize');

+echo Versioning::insertCSS('main');

 if(isset($css)) // fichiers CSS supplémentaires

 {

     echo($css);