Separating component's and kirby-sri's options

This fixes 'undefined' errors if file doesn't exist, thanks @mrunkel
S1SYPHOS · Nov 17, 2017 · bbbca2f · bbbca2f
1 parent 8bd37c2
commit bbbca2f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/core/css.php b/core/css.php
@@ -36,7 +36,7 @@ public function tag($url, $media = null) {
 
     $url = ltrim($url, '/');
 
-    if (file_exists($url)) {
+    if(file_exists($url)) {
       // generate sri hash for css files
       $cssInput = (new Asset($url))->content();
       $cssIntegrity = sri_checksum($cssInput);
@@ -46,16 +46,24 @@ public function tag($url, $media = null) {
       $filename = f::name($url) . '.' . $modified . '.' . f::extension($url);
       $dirname  = f::dirname($url);
       $url = ($dirname === '.') ? $filename : $dirname . '/' . $filename;
+
+      // build an array of SRI-related attributes
+      $cssOptions = array(
+        'integrity' => $cssIntegrity, // generated SRI hash
+        'crossorigin' => c::get('plugin.kirby-sri.use-credentials') ? 'use-credentials' : 'anonymous' // user-defined 'crossorigin' attribute
+      );
     }
 
     // build the array of HTML attributes
     $attr = array(
       'rel'  => 'stylesheet',
-      'href' => url($url),
-      'integrity' => $cssIntegrity, // inject generated sri hash
-      'crossorigin' => c::get('plugin.kirby-sri.use-credentials') ? 'use-credentials' : 'anonymous' // set user-defined 'crossorigin' attribute
+      'href' => url($url)
     );
 
+    if(file_exists($url)) {
+      $attr = array_merge($attr, $cssOptions);
+    }
+
     if(is_array($media)) {
       // merge array with custom options
       $attr = array_merge($attr, $media);

diff --git a/core/js.php b/core/js.php
@@ -36,7 +36,7 @@ public function tag($src, $async = false) {
 
     $src = ltrim($src, '/');
 
-    if (file_exists($src)) {
+    if(file_exists($src)) {
       // generate sri hash for css files
       $jsInput = (new Asset($src))->content();
       $jsIntegrity = sri_checksum($jsInput);
@@ -46,14 +46,20 @@ public function tag($src, $async = false) {
       $filename = f::name($src) . '.' . $modified . '.' . f::extension($src);
       $dirname  = f::dirname($src);
       $src = ($dirname === '.') ? $filename : $dirname . '/' . $filename;
+
+      // build an array of SRI-related attributes
+      $jsOptions = array(
+        'integrity' => $jsIntegrity, // generated SRI hash
+        'crossorigin' => c::get('plugin.kirby-sri.use-credentials') ? 'use-credentials' : 'anonymous' // user-defined 'crossorigin' attribute
+      );
     }
 
     // build the array of HTML attributes
-    $attr = array(
-      'src' => url($src),
-      'integrity' => $jsIntegrity, // inject generated sri hash
-      'crossorigin' => c::get('plugin.kirby-sri.use-credentials') ? 'use-credentials' : 'anonymous' // set user-defined 'crossorigin' attribute
-    );
+    $attr = array('src' => url($src));
+
+    if(file_exists($src)) {
+      $attr = array_merge($attr, $jsOptions);
+    }
 
     if(is_array($async)) {
       // merge array with custom options