Revert changes

Author: Paul Lloyd

.htaccess

@@ -13,8 +13,8 @@
   RewriteRule ^(.*)$ http://bradshawsguide.org/$1 [R=301,L]
 
 # Rewrite cache busting query strings on static files
-# RewriteCond %{REQUEST_FILENAME} !-f
-# RewriteRule ^assets/([a-z]+)/([a-z]+).([0-9]+).(js|css)$ /assets/$1/$2.$4 [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteRule ^assets/([a-z]+)/([a-z]+).([0-9]+).(js|css)$ /assets/$1/$2.$4 [L]
 
 # Make site links work
   RewriteCond %{REQUEST_FILENAME} !-f

build.php

@@ -12,6 +12,29 @@
     header("Pragma: cache");
     header("Cache-Control: max-age=$seconds_to_cache");
 
+    // Compile and cache LESS CSS file
+    function autoCompileLess($input, $output) {
+        $inputFile = $_SERVER['DOCUMENT_ROOT'].$input;
+        $outputFile = $_SERVER['DOCUMENT_ROOT'].$output;
+        $cacheFile = $inputFile.".cache";
+
+        if (file_exists($cacheFile)) {
+            $cache = unserialize(file_get_contents($cacheFile));
+        } else {
+            $cache = $inputFile;
+        }
+
+        $less = new lessc;
+        $newCache = $less->cachedCompile($cache);
+
+        if (!is_array($cache) || $newCache["updated"] > $cache["updated"]) {
+            file_put_contents($cacheFile, serialize($newCache));
+            file_put_contents($outputFile, $newCache['compiled']);
+        }
+    }
+
+    autoCompileLess('/assets/styles/less/styles.less', '/assets/styles/styles.css');
+
     // Get modified file date
     function getFiledate($file, $format) {
         if (is_file($file)) {
@@ -33,7 +56,7 @@ function getFiledate($file, $format) {
         // Add a script element as a child of the body
         function downloadJSAtOnload() {
             var element = document.createElement("script");
-            element.src = "/assets/scripts/scripts.js?v=<?= getFiledate('assets/scripts/scripts.js','YmdHis'); ?>";
+            element.src = "/assets/scripts/scripts.<?= getFiledate('assets/scripts/scripts.js','YmdHis'); ?>.js";
             document.body.appendChild(element);
         }
 
@@ -47,7 +70,7 @@ function downloadJSAtOnload() {
         }
     </script>
 
-    <link rel="stylesheet" href="/assets/styles/styles.css?v=<?= getFiledate('assets/styles/styles.css','YmdHis'); ?>" />
+    <link rel="stylesheet" href="/assets/styles/styles.<?= getFiledate('assets/styles/styles.css','YmdHis'); ?>.css" />
     <link rel="icon" href="<?= url('assets/images/favicon.png') ?>" type="image/png"/>
     <link rel="apple-touch-icon-precomposed" href="<?= url('assets/images/apple-touch-icon.png') ?>"/>
     <link rel="license" href="<?= html($site->licenseurl) ?>"/>