From 263f72a48af2269c11e74011780043bb9ca18285 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Mon, 17 Sep 2018 17:55:08 +0200
Subject: [PATCH] Revert "Move css and img to assets dir and set an expires
 policy"

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

diff --git a/htdocs/assets/.htaccess b/htdocs/assets/.htaccess
deleted file mode 100644
index eede59f..0000000
--- a/htdocs/assets/.htaccess
+++ /dev/null
@@ -1,13 +0,0 @@
-<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/auth.php b/htdocs/auth.php
index 1a65a68..f01e5a3 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="assets/<?php print VERSION; ?>/logo.png" class="img-responsive" alt="Responsive image">
+            <img src="img/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/assets/main.css b/htdocs/css/main.css
similarity index 100%
rename from htdocs/assets/main.css
rename to htdocs/css/main.css
diff --git a/htdocs/favicon.ico b/htdocs/favicon.ico
new file mode 120000
index 0000000..2082fb7
--- /dev/null
+++ b/htdocs/favicon.ico
@@ -0,0 +1 @@
+img/favicon.ico
\ No newline at end of file
diff --git a/htdocs/assets/favicon.ico b/htdocs/img/favicon.ico
similarity index 100%
rename from htdocs/assets/favicon.ico
rename to htdocs/img/favicon.ico
diff --git a/htdocs/assets/logo.png b/htdocs/img/logo.png
similarity index 100%
rename from htdocs/assets/logo.png
rename to htdocs/img/logo.png
diff --git a/htdocs/inc/debut.php b/htdocs/inc/debut.php
index 505b32e..c6bad67 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="assets/<?php print VERSION; ?>/logo.png" alt="Evolix" class="img-responsive"/>
+                <img src="img/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 09c0c72..2b39e8a 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="assets/<?php print VERSION; ?>/main.css"/>
-        <link rel="shortcut icon" href="assets/<?php print VERSION; ?>/favicon.ico"/>
+        <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="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 55b01f0..96a57d8 100644
--- a/htdocs/lib/config.php
+++ b/htdocs/lib/config.php
@@ -1,7 +1,5 @@
 <?php
 
-define("VERSION", "2.0.0");
-
 spl_autoload_register(function ($class) {
     $class = strtolower($class);
     if (file_exists("lib/class.$class.php")) {