query string as default instead of htaccess filemtime

Signed-off-by: Bruno Meilick <[email protected]>

Author: bnomei

classes/fingerprint.php

@@ -23,14 +23,14 @@ static private function isLocalhost() {
         return in_array( $_SERVER['REMOTE_ADDR'], array( '127.0.0.1', '::1' ));
     }
 
-    static private function fingerprint($file) {
+    static private function fingerprint($file, $extension) {
         $callback = option('bnomei.fingerprint.hash', null);
 
         if($callback && is_callable($callback)) {
-            return call_user_func_array($callback, [$file]);
+            return call_user_func_array($callback, [$file, $extension]);
         }
 
-        return \filemtime($file);
+        return \filemtime($file) . '.' . $extension;
     }
 
     static public function injectFileMTime($url) {
@@ -40,7 +40,7 @@ static public function injectFileMTime($url) {
             \Kirby\CMS\App::instance()->roots()->index() . DIRECTORY_SEPARATOR . ltrim($url, '/');
 
         if(\F::exists($file)) {
-            $filename = \F::name($file) . '.' . static::fingerprint($file) . '.' . \F::extension($file);
+            $filename = \F::name($file) . '.' . static::fingerprint($file, \F::extension($file));
             $dirname = \dirname($file);
             $url = ($dirname === '.') ? $filename : ($dirname . '/' . $filename);
         }

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "bnomei/kirby3-fingerprint",
     "type": "plugin",
-    "version": "1.1.2",
+    "version": "1.2.0",
     "license": "MIT",
     "autoload": {
         "files": [
@@ -25,5 +25,6 @@
       ],
     "require": {
         "getkirby/cms": "3.0.*"
-      }
+      },
+      "minimum-stability": "beta"
 }

config.php

@@ -2,7 +2,9 @@
 
 Kirby::plugin('bnomei/fingerprint', [
   'options' => [
-    'hash' => null, // defaults to: function ($file) { return \filemtime($file); }
+    'hash' => function ($file, $extension) { 
+      return $extension . '?v=' . \filemtime($file); 
+    }
   ],
   'fileMethods' => [
     'fingerprint' => function ($file) {

readme.md

@@ -12,7 +12,12 @@ echo Bnomei\Fingerprint::js('/assets/js/index.min.js');
 echo $page->image('ukulele.jpg')->fingerprint();
 ```
 
-## Setup
+## Settings
+
+**hash**
+default: will lead to query string and does not require htaccess setup. thanks @fabianmichael. [#1](https://github.com/bnomei/kirby3-fingerprint/issues/1)
+
+## Setup for filemtime()
 
 Add the following lines to your htaccess file (after RewriteBase) unless you use a different hash function (see settings):
 
@@ -31,14 +36,6 @@ location /assets {
 }
 ```
 
-## Settings
-
-**hash**
-_default: null_
-which yields `function ($file) { return \filemtime($file); }`.
-
-> NOTE: config settings do not override plugin settings (yet). issue pending.
-
 ## TODO
 
 - hijack `css` and `js` and their auto variant helpers