From 5a910ad63a0314068650cc3c61dc1d8bebc19fb7 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Sat, 27 Jan 2018 23:30:25 +0100
Subject: [PATCH] Move css and img to assets dir and set an expires policy

---
 htdocs/assets/.htaccess            |  13 +++++++++++++
 htdocs/{img => assets}/favicon.ico | Bin
 htdocs/{img => assets}/logo.png    | Bin
 htdocs/{css => assets}/main.css    |   0
 htdocs/auth.php                    |   2 +-
 htdocs/favicon.ico                 |   1 -
 htdocs/inc/debut.php               |   2 +-
 htdocs/inc/haut.php                |   4 ++--
 htdocs/lib/config.php              |   2 ++
 9 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 htdocs/assets/.htaccess
 rename htdocs/{img => assets}/favicon.ico (100%)
 rename htdocs/{img => assets}/logo.png (100%)
 rename htdocs/{css => assets}/main.css (100%)
 delete mode 120000 htdocs/favicon.ico

diff --git a/htdocs/assets/.htaccess b/htdocs/assets/.htaccess
new file mode 100644
index 0000000..eede59f
--- /dev/null
+++ b/htdocs/assets/.htaccess
@@ -0,0 +1,13 @@
+<IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteRule   "^([^/]+)/(.+)$"  "$2"   [PT]
+</IfModule>
+
+<IfModule mod_expires.c>
+    ExpiresActive On
+    ExpiresDefault "access plus 1 year"
+    <IfModule mod_headers.c>
+        Header unset ETag
+        Header set Cache-Control "public, max-age=30672000"
+    </IfModule>
+</IfModule>
diff --git a/htdocs/img/favicon.ico b/htdocs/assets/favicon.ico
similarity index 100%
rename from htdocs/img/favicon.ico
rename to htdocs/assets/favicon.ico
diff --git a/htdocs/img/logo.png b/htdocs/assets/logo.png
similarity index 100%
rename from htdocs/img/logo.png
rename to htdocs/assets/logo.png
diff --git a/htdocs/css/main.css b/htdocs/assets/main.css
similarity index 100%
rename from htdocs/css/main.css
rename to htdocs/assets/main.css
diff --git a/htdocs/auth.php b/htdocs/auth.php
index f01e5a3..1a65a68 100644
--- a/htdocs/auth.php
+++ b/htdocs/auth.php
@@ -33,7 +33,7 @@ if (!empty($_POST['login'])) {
 <div class="loginpage">
     <div class="loginbox">
         <div class="illustration">
-            <img src="img/logo.png" class="img-responsive" alt="Responsive image">
+            <img src="assets/<?php print VERSION; ?>/logo.png" class="img-responsive" alt="Responsive image">
         </div>
         <form method="POST" action="auth.php" method="post" name="auth">
             <div class="form-group has-feedback has-feedback-left">
diff --git a/htdocs/favicon.ico b/htdocs/favicon.ico
deleted file mode 120000
index 2082fb7..0000000
--- a/htdocs/favicon.ico
+++ /dev/null
@@ -1 +0,0 @@
-img/favicon.ico
\ No newline at end of file
diff --git a/htdocs/inc/debut.php b/htdocs/inc/debut.php
index c6bad67..505b32e 100644
--- a/htdocs/inc/debut.php
+++ b/htdocs/inc/debut.php
@@ -2,7 +2,7 @@
     <div id="top" class="container">
         <div class="navbar-brand logo">
             <a href="https://evolix.com/" target="_blank">
-                <img src="img/logo.png" alt="Evolix" class="img-responsive"/>
+                <img src="assets/<?php print VERSION; ?>/logo.png" alt="Evolix" class="img-responsive"/>
             </a>
         </div>
         <ul class="nav navbar-nav">
diff --git a/htdocs/inc/haut.php b/htdocs/inc/haut.php
index 2b39e8a..09c0c72 100644
--- a/htdocs/inc/haut.php
+++ b/htdocs/inc/haut.php
@@ -5,8 +5,8 @@
         <meta name="robots" content="noindex,nofollow"/>
         <meta name="referrer" content="same-origin"/>
         <title><?php print $config['global']['name']; ?></title>
-        <link rel="stylesheet" href="css/main.css" type="text/css"/>
-        <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
+        <link rel="stylesheet" href="assets/<?php print VERSION; ?>/main.css"/>
+        <link rel="shortcut icon" href="assets/<?php print VERSION; ?>/favicon.ico"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha256-916EbMg70RQy9LHiGkXzG8hSg9EdNy97GazNG/aiY1w=" crossorigin="anonymous"/>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/datatables/1.10.16/css/dataTables.bootstrap.min.css" integrity="sha256-PbaYLBab86/uCEz3diunGMEYvjah3uDFIiID+jAtIfw=" crossorigin="anonymous"/>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
diff --git a/htdocs/lib/config.php b/htdocs/lib/config.php
index 1b7ad75..78bb8f9 100644
--- a/htdocs/lib/config.php
+++ b/htdocs/lib/config.php
@@ -1,5 +1,7 @@
 <?php
 
+define("VERSION", "2.0.0");
+
 spl_autoload_register(function ($class) {
     $class = strtolower($class);
     include_once("lib/class.$class.php");