Changeset 2664756

Timestamp:

01/25/2022 04:45:53 PM (4 years ago)

Author:

speedien

Message:

v1.1.0

Location:

speedien

Files:

• tags/1.1 (deleted)
• tags/1.1.0 (copied) (copied from speedien/trunk)
• tags/1.1.0/advanced-cache.php (deleted)
• tags/1.1.0/readme.txt (modified) (4 diffs)
• tags/1.1.0/speedien.php (modified) (2 diffs)
• tags/1.1.0/speedien_admin_bar.php (deleted)
• tags/1.1.0/speedien_admin_notice.php (deleted)
• tags/1.1.0/speedien_cache.php (modified) (4 diffs)
• tags/1.1.0/speedien_config.php (added)
• tags/1.1.0/speedien_purge_hooks.php (deleted)
• tags/1.1.0/speedien_ui.php (modified) (12 diffs)
• trunk/readme.txt (added)
• trunk/speedien.php (added)
• trunk/speedien_cache.php (added)
• trunk/speedien_config.php (added)
• trunk/speedien_ui.php (added)

speedien/tags/1.1.0/readme.txt

@@ -1 @@
-=== Core Web Vitals Booster by Speedien ===
-Contributors: speedien
+=== Core Web Vitals Booster ===
+Contributors: speedien, nestify
 Tags: pagespeed, cache, webperf, core web vitals, vitals
-Requires at least: 4.5
-Tested up to: 5.7
+Requires at least: 4.6
+Tested up to: 5.8
 Requires PHP: 5.6
-Stable tag: 1.0.1
+Stable tag: 1.1.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
-Core web vitals booster by Speedien. This plugin will link your Speedien.com account and your site to improve page speed.
+Core web vitals booster for Nestify.io. This plugin will optimize pagespeed of your sites hosted on Nestify.
 
 == Description ==
-**This plugin requires an active subscription from Speedien.com to function properly. You can signup for a free trial subscription at My.speedien.com**
+**This plugin only supports WordPress sites hosted on https://nestify.io. You can signup for a free trial subscription at https://nestify.io**
 
 Speedien optmizes your site for best performance on desktop and mobile devices automatically. No coding required. We start by prioritizing resources needed for above-the-fold content and deferring everything else. This helps improve core web vitals metrics automatically and help with search engine rankings.
-
-Speedien is a cloud based service that performs the heavy lifting on remote servers. This approach ensures that your hosting performance plays a very little role in overall site speed. 
 
 This plugin enables a high speed global CDN that automatically optimizes site's static assets, images, and videos. CDN also converts images to WebP format to reduce the file size. Images are automatically resized according to visitor's screen size. 
@@ -62 +60 @@
 All paid subscriptions have access to 24x7 priority support with 1 hour response time or less
 
+## Known incompatible plugins
+
+This plugin contains functionality that overlaps with the following plugins. It is recommended that you deactivate these plugins when using core web vitals booster.
+
+* Autoptimize
+* Breeze
+* Cloudflare
+* Comet Cache by WP Sharks
+* EWWW Image Optimizer
+* Hummingbird
+* Imagify
+* JetPack
+* Lazy Load
+* Litespeed Cache
+* Nitropack
+* PageSpeed Ninja
+* Perfmatters
+* PhastPress 
+* SG Optimizer
+* ShortPixel
+* Smush
+* Swift Performance
+* W3 Total Cache
+* WP Cloudflare
+* WP Fastest Cache
+* WP Optimize
+* WP Rocket
+* WP Super Cache
+
 ## 3rd Party Services Used By The Speedien Plugin
 
@@ -69 +96 @@
 * Speedien Terms of Service - [https://speedien.com/terms-of-service/](https://speedien.com/terms-of-service/)
 * Speedien Privacy Policy - [https://speedien.com/privacy-policy/](https://speedien.com/privacy-policy/)
+
+Speedien uses Nestify.io for WordPress hosting and optimization services. For more information about Nestify, please visit:
+
+* Nestify website - [https://nestify.io](https://nestify.io/)
+* Nestify Terms of Service - [https://nestify.io/terms-of-service/](https://nestify.io/terms-of-service/)
+* Nestify Privacy Policy - [https://nestify.io/privacy-policy/](https://nestify.io/privacy-policy/)
 
 Speedien uses Bunny CDN for some of our optimization functionality. For more information about Bunny CDN, please visit:
@@ -102 +135 @@
 
 == Screenshots ==
-1. Optimization settings
-2. Plugin options
-3. Core web vitals report
+1. Plugin options
+2. Core web vitals report
 
 == Changelog ==
+
+= 1.1.0 - 25 Jan, 2022 =
+- Major redesign to replace existing cache-preload model with real-time optimizations.
+- Added pagespeed optimization settings panel in wp-admin.
+
+= 1.0.8 - 4 Aug, 2021 =
+- Improved cache purge error handling
+- Added cache bypass mechanism for Divi page builder
+
+= 1.0.7 - 30 Jun, 2021 =
+- Added support for defining credentials through wp-config.php
+
+= 1.0.6 - 22 Jun, 2021 =
+- Enabled 'always-on' CDN for all pages
+
+= 1.0.5 - 19 Jun, 2021 =
+- Improved 404 and error handling
+- Minor bug fixes
+
+= 1.0.4 - 14 Jun, 2021 =
+- Improved javascript optimization
+- Improved cache handling
+- Added cache bypass mechanism using cookies or query parameters
+
+= 1.0.3 - 19 Apr, 2021 =
+- Added support for preloading cache via Speedien console
+- Improved error handling for empty cache directory
+
+= 1.0.2 - 30 Mar, 2021 =
+- Improved cache preloading
+- Updated deactivation handling
 
 = 1.0.1 - 25 Mar, 2021 =

speedien/tags/1.1.0/speedien.php

@@ -1 +1 @@
 <?php
 /**
- * Plugin Name:     Core Web Vitals Booster by Speedien
+ * Plugin Name:     Core Web Vitals Booster
  * Plugin URI:      https://speedien.com
- * Description:     Plugin to auto-purge speedien.com cache.
+ * Description:     Plugin to help with core web vitals metrics and page speed.
  * Author:          Speedien Team
  * Text Domain:     speedien
  * Domain Path:     /
- * Version:         1.0.1
+ * Version:         1.1.0
  */
 
@@ -17 +17 @@
 define('SPEEDIEN_API_URL', 'https://my.speedien.com');
 
+require_once 'speedien_config.php';
 require_once 'speedien_ui.php';
-require_once 'speedien_admin_bar.php';
-require_once 'speedien_admin_notice.php';
 require_once 'speedien_cache.php';
-require_once 'speedien_purge_hooks.php';
+
+register_activation_hook( __FILE__, 'speedien_cache_init' );
+
+/**
+ * Deactivation hook.
+ */
+function speedien_deactivate() {
+    unlink(WP_CONTENT_DIR . '/advanced-cache.php');
+    $wp_config = file_get_contents($wp_config_file);
+    $wp_cache = '/define\([\'\"]WP_CACHE[\'\"].*/';
+    $wp_config = preg_replace($wp_cache, '', $wp_config);
+    file_put_contents($wp_config_file, $wp_config);
+}
+register_deactivation_hook( __FILE__, 'speedien_deactivate' );

speedien/tags/1.1.0/speedien_cache.php

@@ -5 +5 @@
     $bypass_cache = 0;
 
-    $speedien_cache_exclusions = array('wp-login.php','wp-cron.php','wc-api','wp-json','my-account','cart','checkout','amp','feed','xmlrpc');
+    $speedien_cache_exclusions = array('wp-login.php','wp-cron.php','wp-admin','wc-api','wp-json','my-account','cart','checkout','amp','feed','page','tag','search','xmlrpc','.xml','disable');
 
     foreach($speedien_cache_exclusions as $slug)
     {
-        if(strpos($_SERVER['REQUEST_URI'], $slug) !== false)
+        if(strpos(strtolower($_SERVER['REQUEST_URI']), $slug) !== false)
         {
             $bypass_cache = 1;
@@ -18 +18 @@
         $bypass_cache = 1;
     }
+ 
+    if ( is_404() ) {
+        $bypass_cache = 1;
+    }
 
     if (!isset($_SERVER['REQUEST_METHOD']) || !in_array($_SERVER['REQUEST_METHOD'], ['HEAD', 'GET'])) {
@@ -23 +27 @@
     }
 
+    if(!empty($_GET['s']) || !empty($_GET['no-optimization'])) {
+        $bypass_cache = 1;
+    }
+
     if(!empty($_COOKIE)) 
     {
-        $cookielist = '/(wordpress_[a-f0-9]+|comment_author|wp-postpass|wordpress_no_cache|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|woocommerce_recently_viewed|edd_items_in_cart)/';
+        if(!empty($_COOKIE['wordpress_logged_in_1']))
+        {
+            if($_COOKIE['wordpress_logged_in_1'] !== 'speedien')
+            {
+                $bypass_cache = 1;
+            }
+        }
+        $cookielist = '/(wordpress_[a-f0-9]+|comment_author|wp-postpass|wordpress_no_cache|woocommerce_cart_hash|woocommerce_items_in_cart|woocommerce_recently_viewed|edd_items_in_cart)/';
         $cookies = sanitize_text_field(implode('', array_keys($_COOKIE)));
         if (preg_match($cookielist, $cookies)) {
             $bypass_cache = 1;
+        }
+    }
+
+    $options = get_option('speedien_options');
+    if(!empty($options['speedien_field_pagelist']))
+    {
+        $page_exclusions = explode(PHP_EOL, $options['speedien_field_pagelist']);
+        foreach($page_exclusions as $exclusion)
+        {
+            if(strpos(strtolower($_SERVER['REQUEST_URI']), trim($exclusion)) !== false)
+            {
+                $bypass_cache = 1;
+            }
         }
     }
@@ -40 +68 @@
     if(!$bypass_cache)
     {
-        ob_start("speedien_submit_to_cloud");
-    }
-}
-
-function speedien_submit_to_cloud($buffer)
+        ob_start("speedien_cdn_rewrite");
+    }
+}
+
+function speedien_cdn_rewrite($buffer)
 {
+    $REPLACEMENTS = [];
+        $searchOffset = 0;
+        while (preg_match('/<script\b[^>]*?>/is', $buffer, $matches, PREG_OFFSET_CAPTURE, $searchOffset)) {
+            $offset = $matches[0][1];
+            $searchOffset = $offset + 1;
+            if (preg_match('/<\/\s*script>/is', $buffer, $endMatches, PREG_OFFSET_CAPTURE, $matches[0][1])) {
+                $len = $endMatches[0][1] - $matches[0][1] + strlen($endMatches[0][0]);
+                $everything = substr($buffer, $matches[0][1], $len);
+                $tag = $matches[0][0];
+                $closingTag = $endMatches[0][0];
+
+                $hasSrc = preg_match('/\s+src=/i', $tag);
+                $hasType = preg_match('/\s+type=/i', $tag);
+                $shouldReplace = !$hasType || preg_match('/\s+type=([\'"])((application|text)\/(javascript|ecmascript|html|template)|module)\1/i', $tag);
+                $noOptimize = preg_match('/data-wpspdn-nooptimize="true"/i', $tag);
+                if ($shouldReplace && !$hasSrc && !$noOptimize) {
+                    // inline script
+                    $content = substr($buffer, $matches[0][1] + strlen($matches[0][0]), $endMatches[0][1] - $matches[0][1] - strlen($matches[0][0]));
+                    if (apply_filters('wpspdn_exclude', false, $content)) {
+                        $replacement = preg_replace('/^<script\b/i', '<script data-wpspdn-nooptimize="true"', $everything);
+                        $buffer = substr_replace($buffer, $replacement, $offset, $len);
+                        continue;
+                    }
+                    $replacement = $tag . "wpspdn[" . count($REPLACEMENTS) . "]wpspdn" . $closingTag;
+                    $REPLACEMENTS[] = $content;
+                    $buffer = substr_replace($buffer, $replacement, $offset, $len);
+                    continue;
+                }
+            }
+        }
+
+        $buffer = preg_replace_callback('/<script\b[^>]*?>/i', function ($matches) {
+            list($tag) = $matches;
+
+            $EXTRA = constant('wpspdn_EXTRA_ATTRS') ?: '';
+
+            $result = $tag;
+            if (!preg_match('/\s+data-src=/i', $result) 
+                && !preg_match('/data-wpspdn-nooptimize="true"/i', $result)
+                && !preg_match('/data-rocketlazyloadscript=/i', $result)) {
+
+                $src = preg_match('/\s+src=([\'"])(.*?)\1/i', $result, $matches)
+                    ? $matches[2]
+                    : null;
+                if (!$src) {
+                    // trying to detect src without quotes
+                    $src = preg_match('/\s+src=([\/\w\-\.\~\:\[\]\@\!\$\?\&\#\(\)\*\+\,\;\=\%]+)/i', $result, $matches)
+                        ? $matches[1]
+                        : null;
+                }
+                $hasType = preg_match('/\s+type=/i', $result);
+                $isJavascript = !$hasType
+                    || preg_match('/\s+type=([\'"])((application|text)\/(javascript|ecmascript)|module)\1/i', $result)
+                    || preg_match('/\s+type=((application|text)\/(javascript|ecmascript)|module)/i', $result);
+                if ($isJavascript) {
+                    if ($src) {
+                        if (apply_filters('wpspdn_exclude', false, $src)) {
+                            return $result;
+                        }
+                        $result = preg_replace('/\s+src=/i', " data-src=", $result);
+                        $result = preg_replace('/\s+(async|defer)\b/i', " data-\$1", $result);
+                    }
+                    if ($hasType) {
+                        $result = preg_replace('/\s+type=([\'"])module\1/i', " type=\"javascript/blocked\" data-wpspdn-module ", $result);
+                        $result = preg_replace('/\s+type=module\b/i', " type=\"javascript/blocked\" data-wpspdn-module ", $result);
+                        $result = preg_replace('/\s+type=([\'"])(application|text)\/(javascript|ecmascript)\1/i', " type=\"javascript/blocked\"", $result);
+                        $result = preg_replace('/\s+type=(application|text)\/(javascript|ecmascript)\b/i', " type=\"javascript/blocked\"", $result);
+                    } else {
+                        $result = preg_replace('/<script/i', "<script type=\"javascript/blocked\"", $result);
+                    }
+                    $result = preg_replace('/<script/i', "<script ${EXTRA} data-wpspdn-after=\"REORDER\"", $result);
+                }
+            }
+            return preg_replace('/\s*data-wpspdn-nooptimize="true"/i', '', $result);
+        }, $buffer);
+
+        $buffer = preg_replace_callback('/wpspdn\[(\d+)\]wpspdn/', function ($matches) use (&$REPLACEMENTS) {
+            return $REPLACEMENTS[(int)$matches[1]];
+        }, $buffer);
+
+        $buffer = str_replace('</head>','<script data-cfasync="false">var _wpspdn={"rdelay":86400000,"elementor-animations":true,"elementor-pp":true,"v":"2.3.10"};if(navigator.userAgent.match(/MSIE|Internet Explorer/i)||navigator.userAgent.match(/Trident\/7\..*?rv:11/i)){var href=document.location.href;if(!href.match(/[?&]wpspdndisable/)){if(href.indexOf("?")==-1){if(href.indexOf("#")==-1){document.location.href=href+"?wpspdndisable=1"}else{document.location.href=href.replace("#","?wpspdndisable=1#")}}else{if(href.indexOf("#")==-1){document.location.href=href+"&wpspdndisable=1"}else{document.location.href=href.replace("#","&wpspdndisable=1#")}}}}</script><script data-cfasync="false">!function(t){var e={};function n(r){if(e[r])return e[r].exports;var o=e[r]={i:r,l:!1,exports:{}};return t[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var o in t)n.d(r,o,function(e){return t[e]}.bind(null,o));return r},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="/",n(n.s=0)}([function(t,e,n){t.exports=n(1)},function(t,e,n){"use strict";n.r(e);var r=new(function(){function t(){this.l=[]}var e=t.prototype;return e.emit=function(t,e){void 0===e&&(e=null),this.l[t]&&this.l[t].forEach((function(t){return t(e)}))},e.on=function(t,e){var n;(n=this.l)[t]||(n[t]=[]),this.l[t].push(e)},e.off=function(t,e){this.l[t]=(this.l[t]||[]).filter((function(t){return t!==e}))},t}()),o=new Date,i=document,a=function(){function t(){this.known=[]}var e=t.prototype;return e.init=function(){var t,e=this,n=!1,o=function(t){if(!n&&t&&t.fn&&!t.__wpspdn){var r=function(e){return i.addEventListener("DOMContentLoaded",(function(n){e.bind(i)(t,n)})),this};e.known.push([t,t.fn.ready,t.fn.init.prototype.ready]),t.fn.ready=r,t.fn.init.prototype.ready=r,t.__wpspdn=!0}return t};window.jQuery&&(t=o(window.jQuery)),Object.defineProperty(window,"jQuery",{get:function(){return t},set:function(e){return t=o(e)}}),r.on("l",(function(){return n=!0}))},e.unmock=function(){this.known.forEach((function(t){var e=t[0],n=t[1],r=t[2];e.fn.ready=n,e.fn.init.prototype.ready=r}))},t}(),c={};!function(t,e){try{var n=Object.defineProperty({},e,{get:function(){c[e]=!0}});t.addEventListener(e,null,n),t.removeEventListener(e,null,n)}catch(t){}}(window,"passive");var u=c,f=window,d=document,s=["mouseover","keydown","touchmove","touchend","wheel"],l=["mouseover","mouseout","touchstart","touchmove","touchend","click"],p="data-wpspdn-",v=function(){function t(){}return t.prototype.init=function(t){var e=!1,n=!1,o=function t(o){e||(e=!0,s.forEach((function(e){return d.body.removeEventListener(e,t,u)})),clearTimeout(n),location.href.match(/wpspdnnopreload/)||r.emit("pre"),r.emit("fi"))},i=function(t){var e=new MouseEvent("click",{view:t.view,bubbles:!0,cancelable:!0});return Object.defineProperty(e,"target",{writable:!1,value:t.target}),e};t<1e4&&r.on("i",(function(){e||(n=setTimeout(o,t))}));var a=[],c=function(t){t.target&&"dispatchEvent"in t.target&&("click"===t.type?(t.preventDefault(),t.stopPropagation(),a.push(i(t))):"touchmove"!==t.type&&a.push(t),t.target.setAttribute(p+t.type,!0))};r.on("l",(function(){var t;for(l.forEach((function(t){return f.removeEventListener(t,c)}));t=a.shift();){var e=t.target;e.getAttribute(p+"touchstart")&&e.getAttribute(p+"touchend")&&!e.getAttribute(p+"click")?(e.getAttribute(p+"touchmove")||(e.removeAttribute(p+"touchmove"),a.push(i(t))),e.removeAttribute(p+"touchstart"),e.removeAttribute(p+"touchend")):e.removeAttribute(p+t.type),e.dispatchEvent(t)}}));d.addEventListener("DOMContentLoaded",(function t(){s.forEach((function(t){return d.body.addEventListener(t,o,u)})),l.forEach((function(t){return f.addEventListener(t,c)})),d.removeEventListener("DOMContentLoaded",t)}))},t}(),m=document,h=m.createElement("span");h.setAttribute("id","elementor-device-mode"),h.setAttribute("class","elementor-screen-only");var y=window,b=document,g=b.documentElement,w=function(t){return t.getAttribute("class")||""},E=function(t,e){return t.setAttribute("class",e)},L=function(){window.addEventListener("load",(function(){var t=(m.body.appendChild(h),getComputedStyle(h,":after").content.replace(/"/g,"")),e=Math.max(g.clientWidth||0,y.innerWidth||0),n=Math.max(g.clientHeight||0,y.innerHeight||0),o=["_animation_"+t,"animation_"+t,"_animation","_animation","animation"];Array.from(b.querySelectorAll(".elementor-invisible")).forEach((function(t){var i=t.getBoundingClientRect();if(i.top+y.scrollY<=n&&i.left+y.scrollX<e)try{var a=JSON.parse(t.getAttribute("data-settings"));if(a.trigger_source)return;for(var c,u=a._animation_delay||a.animation_delay||0,f=0;f<o.length;f++)if(a[o[f]]){o[f],c=a[o[f]];break}if(c){var d=w(t),s="none"===c?d:d+" animated "+c,l=setTimeout((function(){E(t,s.replace(/\belementor\-invisible\b/,"")),o.forEach((function(t){return delete a[t]})),t.setAttribute("data-settings",JSON.stringify(a))}),u);r.on("fi",(function(){clearTimeout(l),E(t,w(t).replace(new RegExp("\b"+c+"\b"),""))}))}}catch(t){console.error(t)}}))}))},S=document,A="querySelectorAll",O="data-in-mega_smartmenus",_="DOMContentLoaded",j="readystatechange",P="message",k=console.error;!function(t,e,n,i,c,u,f,d,s){var l,p,m=t.constructor.name+"::",h=e.constructor.name+"::",y=function(e,n){n=n||t;for(var r=0;r<this.length;r++)e.call(n,this[r],r,this)};"NodeList"in t&&!NodeList.prototype.forEach&&(NodeList.prototype.forEach=y),"HTMLCollection"in t&&!HTMLCollection.prototype.forEach&&(HTMLCollection.prototype.forEach=y),_wpspdn["elementor-animations"]&&L(),_wpspdn["elementor-pp"]&&function(){var t=S.createElement("div");t.innerHTML=\'<span class="sub-arrow --wp-meteor"><i class="fa" aria-hidden="true"></i></span>\';var e=t.firstChild;S.addEventListener("DOMContentLoaded",(function(){Array.from(S[A](".pp-advanced-menu ul")).forEach((function(t){if(!t.getAttribute(O)){(t.getAttribute("class")||"").match(/\bmega\-menu\b/)&&t[A]("ul").forEach((function(t){t.setAttribute(O,!0)}));var n=function(t){for(var e=[];t=t.previousElementSibling;)e.push(t);return e}(t),r=n.filter((function(t){return t})).filter((function(t){return"A"===t.tagName})).pop();if(r||(r=n.map((function(t){return Array.from(t[A]("a"))})).filter((function(t){return t})).flat().pop()),r){var o=e.cloneNode(!0);r.appendChild(o),new MutationObserver((function(t){t.forEach((function(t){t.addedNodes.forEach((function(t){if(1===t.nodeType&&"SPAN"===t.tagName)try{r.removeChild(o)}catch(t){}}))}))})).observe(r,{childList:!0})}}}))}))}();var b,g,w=[],E=[],x={},C=!1,T=!1,M=setTimeout;var N=e[n].bind(e),R=e[i].bind(e),H=t[n].bind(t),D=t[i].bind(t);"undefined"!=typeof EventTarget&&(b=EventTarget.prototype.addEventListener,g=EventTarget.prototype.removeEventListener,N=b.bind(e),R=g.bind(e),H=b.bind(t),D=g.bind(t));var z,q=e.createElement.bind(e),B=e.__proto__.__lookupGetter__("readyState").bind(e);Object.defineProperty(e,"readyState",{get:function(){return z||B()},set:function(t){return z=t}});var Q=function(t){return E.filter((function(e,n){var r=e[0],o=(e[1],e[2]);if(!(t.indexOf(r.type)<0)){o||(o=r.target);try{for(var i=o.constructor.name+"::"+r.type,a=0;a<x[i].length;a++){if(x[i][a])if(!W[i+"::"+n+"::"+a])return!0}}catch(t){}}})).length},W={},I=function(t){E.forEach((function(n,r){var o=n[0],i=n[1],a=n[2];if(!(t.indexOf(o.type)<0)){a||(a=o.target);try{var c=a.constructor.name+"::"+o.type;if((x[c]||[]).length)for(var u=0;u<x[c].length;u++){var f=x[c][u];if(f){var d=c+"::"+r+"::"+u;if(!W[d]){W[d]=!0,e.readyState=i;try{f.hasOwnProperty("prototype")&&f.prototype.constructor!==f?f(o):f.bind(a)(o)}catch(t){k(t,f)}}}}}catch(t){k(t)}}}))};N(_,(function(t){E.push([t,e.readyState,e])})),N(j,(function(t){E.push([t,e.readyState,e])})),H(_,(function(n){E.push([n,e.readyState,t])})),H(d,(function(n){E.push([n,e.readyState,t]),G||I([_,j,P,d])}));var J=function(n){E.push([n,e.readyState,t])};H(P,J),r.on("fi",(function(){T=!0,G=!0,e.readyState="loading",M(X)}));H(d,(function t(){C=!0,T&&!G&&(e.readyState="loading",M(X)),D(d,t)})),(new v).init(_wpspdn.rdelay);var F=new a;F.init();var G=!1,X=function n(){var o=w.shift();if(o)if(o[c]("data-src"))o.hasAttribute("data-async")?(U(o),M(n)):U(o,n);else if("javascript/blocked"==o.type)U(o),M(n);else if(o.hasAttribute("data-wpspdn-onload")){var i=o[c]("data-wpspdn-onload");try{new Function(i).call(o)}catch(t){k(t)}M(n)}else M(n);else if(Q([_,j,P]))I([_,j,P]),M(n);else if(T&&C)if(Q([d,P]))I([d,P]),M(n);else{if(t.RocketLazyLoadScripts)try{RocketLazyLoadScripts.run()}catch(t){k(t)}e.readyState="complete",D(P,J),(x[m+"message"]||[]).forEach((function(t){H(P,t)})),F.unmock(),Z=N,$=R,nt=H,rt=D,G=!1,setTimeout((function(){return r.emit("l")}))}else G=!1},Y=function(t){for(var n=e.createElement("SCRIPT"),r=t.attributes,o=r.length-1;o>=0;o--)n.setAttribute(r[o].name,r[o].value);return n.bypass=!0,n.type=t.hasAttribute("data-wpspdn-module")?"module":"text/javascript",(t.text||"").match(/^\s*class RocketLazyLoadScripts/)?n.text=t.text.replace(/^\s*class RocketLazyLoadScripts/,"window.RocketLazyLoadScripts=class").replace("RocketLazyLoadScripts.run();",""):n.text=t.text,n[f]("data-wpspdn-after"),n},K=function(t,e){var n=t.parentNode;n&&n.replaceChild(e,t)},U=function(t,e){if(t[c]("data-src")){var r=Y(t),o=b?b.bind(r):r[n].bind(r);if(e){var i=function(){return M(e)};o(d,i),o(s,i)}r.src=t[c]("data-src"),r[f]("data-src"),K(t,r)}else"javascript/blocked"===t.type?K(t,Y(t)):onLoad&&onLoad()},V=function(t,e){var n=(x[t]||[]).indexOf(e);if(n>=0)return x[t][n]=void 0,!0},Z=function(t,e){if(e&&(t===_||t===j)){var n=h+t;return x[n]=x[n]||[],void x[n].push(e)}for(var r=arguments.length,o=new Array(r>2?r-2:0),i=2;i<r;i++)o[i-2]=arguments[i];return N.apply(void 0,[t,e].concat(o))},$=function(t,e){t===_&&V(h+t,e);return R(t,e)};Object.defineProperties(e,((l={})[n]={get:function(){return Z},set:function(){return Z}},l[i]={get:function(){return $},set:function(){return $}},l)),r.on("pre",(function(){return w.forEach((function(t){var n=t[c]("data-src");if(n){var r=q("link");r.rel="pre"+d,r.as="script",r.href=n,r.crossorigin=!0,e.head.appendChild(r)}}))})),N(_,(function(){e.querySelectorAll("script[data-wpspdn-after]").forEach((function(t){return w.push(t)}));var t=["link"].map((function(t){return t+"[data-wpspdn-onload]"})).join(",");e.querySelectorAll(t).forEach((function(t){return w.push(t)}))}));var tt=function(t){if(e.currentScript)try{var n=e.currentScript.parentElement,r=e.currentScript.nextSibling,i=document.createElement("div");i.innerHTML=t,Array.from(i.childNodes).forEach((function(t){"SCRIPT"===t.nodeName?n.insertBefore(Y(t),r):n.insertBefore(t,r)}))}catch(t){console.error(t)}else k((new Date-o)/1e3,"document.currentScript not set",t)},et=function(t){return tt(t+"\n")};Object.defineProperties(e,{write:{get:function(){return tt},set:function(t){return tt=t}},writeln:{get:function(){return et},set:function(t){return et=t}}});var nt=function(t,e){if(e&&(t===d||t===_||t===P)){var n=t===_?h+t:m+t;return x[n]=x[n]||[],void x[n].push(e)}for(var r=arguments.length,o=new Array(r>2?r-2:0),i=2;i<r;i++)o[i-2]=arguments[i];return H.apply(void 0,[t,e].concat(o))},rt=function(t,e){t===d&&V(t===_?h+t:m+t,e);return D(t,e)};Object.defineProperties(t,((p={})[n]={get:function(){return nt},set:function(){return nt}},p[i]={get:function(){return rt},set:function(){return rt}},p));var ot=function(t){var e;return{get:function(){return e},set:function(n){return e&&V(t,n),x[t]=x[t]||[],x[t].push(n),e=n}}},it=ot(m+d);Object.defineProperty(t,"onload",it),N(_,(function(){Object.defineProperty(e.body,"onload",it)})),Object.defineProperty(e,"onreadystatechange",ot(h+j)),Object.defineProperty(t,"onmessage",ot(m+P));var at=1,ct=function(){--at||r.emit("i")};H(d,(function t(){M((function(){e.querySelectorAll("img").forEach((function(t){if(!t.complete&&(t.currentSrc||t.src)&&"lazy"==!(t.loading||"").toLowerCase()||(r=t.getBoundingClientRect(),o=window.innerHeight||document.documentElement.clientHeight,i=window.innerWidth||document.documentElement.clientWidth,r.top>=-1*o*1&&r.left>=-1*i*1&&r.bottom<=2*o&&r.right<=2*i)){var e=new Image;e[n](d,ct),e[n](s,ct),e.src=t.currentSrc||t.src,at++}var r,o,i})),ct()})),D(d,t)}));var ut=Object.defineProperty;Object.defineProperty=function(n,r,o){return n===t&&["jQuery","onload"].indexOf(r)>=0||(n===e||n===e.body)&&["readyState","write"].indexOf(r)>=0?n:ut(n,r,o)},Object.defineProperties=function(t,e){for(var n in e)Object.defineProperty(t,n,e[n]);return t}}(window,document,"addEventListener","removeEventListener","getAttribute",0,"removeAttribute","load","error")}]);
+</script></head>',$buffer);
+        
+    $cdnurl = str_replace('https://','',get_option('speedien_cdnurl'));
+    
+    if(empty($cdnurl))
+    {
+        $options = get_option('speedien_options');
+        $data = array('api_key'=>$options['speedien_field_api_key'], 'site_id' => $options['speedien_field_site_id']);
+
+        $response = wp_remote_post(SPEEDIEN_API_URL . '/cdnurl', array('body' => $data, 'timeout' => 10));
+        if(!empty($response['body']))
+        {
+            $cdnurl = str_replace('https://','',$response['body']);
+        }
+        else
+        {
+            $cdnurl = 'nocdn';
+        }
+        update_option('speedien_cdnurl',$cdnurl);
+    }
+    
+    if($cdnurl!== 'nocdn')
+    {
+        $site_url = str_replace('https://','',get_site_url());
+        $buffer = str_replace($site_url.'/wp-content',$cdnurl.'/wp-content',$buffer);
+        $buffer = str_replace($site_url.'\/wp-content',$cdnurl.'\/wp-content',$buffer);
+        $buffer = str_replace($site_url.'/wp-includes',$cdnurl.'/wp-includes',$buffer);
+    }
+    $buffer = str_replace('</head>','<img width="2100" height="2100" style="pointer-events: none; position: absolute; top: 0; left: 0; width: 90vw; height: 99vh; max-width: 90vw; max-height: 99vh;"  src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSI5OTk5OXB4IiBoZWlnaHQ9Ijk5OTk5cHgiIHZpZXdCb3g9IjAgMCA5OTk5OSA5OTk5OSIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj48ZyBzdHJva2U9Im5vbmUiIGZpbGw9Im5vbmUiIGZpbGwtb3BhY2l0eT0iMCI+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9Ijk5OTk5IiBoZWlnaHQ9Ijk5OTk5Ij48L3JlY3Q+IDwvZz4gPC9zdmc+"></head>',$buffer);
+    return $buffer;
+}
+
+add_action( 'template_redirect', 'speedien_process_page');
+
+function speedien_exclusion_handler($replace, $string ) {
     $options = get_option('speedien_options');
-    $api_key = sanitize_key($options['speedien_field_api_key']);
-    $site_id = sanitize_key($options['speedien_field_site_id']);
-    if(!empty($_GET))
-    {
-    $query = '?';
-    $get = array_map( 'sanitize_text_field', $_GET );
-    foreach($get as $k => $v)
-    {
-        if(strpos($k, 'utm') !== false)
-        {
-            unset($_GET[$k]); continue;
-        }
-        if(strpos($k, 'clid') !== false)
-        {
-            unset($_GET[$k]); continue;
-        }
-        if(strpos($k, 'ref') !== false)
-        {
-            unset($_GET[$k]); continue;
-        }
-        $query .= $k.'='.$v.'&';
-    }
-    }
-
-    $host = $_SERVER['HTTP_HOST'];
-    $path = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
-    if(!empty($query))
-    {
-        $path = $path.urlencode($query);
-    }
-    $response = wp_remote_post(SPEEDIEN_API_URL . '/process', array('body' => array('api_key' => $api_key, 'site_id' => $site_id, 'host' => $host, 'path' => $path, 'buffer' => $buffer,),'timeout' => 10,));
-    return $buffer;
-}
-
-speedien_process_page();
-
-function speedien_verify_hmac()
-{
-    $options = get_option('speedien_options');
-    $api_key = $options['speedien_field_api_key'];
-    $site_id = $options['speedien_field_site_id'];
-
-    if(empty($_POST))
-    {
+    $jse_type = 1;
+    if(!empty($options['speedien_field_jse_type']))
+    {
+        $jse_type = $options['speedien_field_jse_type'];
+    }
+    if($jse_type == 1)
+    {
+        if(!empty($options['speedien_field_jslist']))
+        {
+            $js_exclusions = explode(PHP_EOL, $options['speedien_field_jslist']);
+            foreach($js_exclusions as $exclusion)
+            {
+                if(strpos($string, trim($exclusion)) !== false)
+                {
+                    return $string;
+                }
+                if(strpos('exclude_all', trim($exclusion)) !== false)
+                {
+                    return true;
+                }
+            }
+        }
         return false;
     }
     else
     {
-        $response = sanitize_html_class($_POST['response']);
-
-        $data = json_decode(base64_decode($response), true);
-        $signature = $data['signature'];
-        $contents = $data['contents'];
-    }
-    $parameters = sanitize_text_field($api_key. $site_id . $contents);
-    $hmac = hash_hmac('sha256', $parameters, $api_key);
-    return ($hmac == $signature);
-}
-
-function speedien_store_cache()
-{
-    if($_SERVER["REQUEST_URI"] == '/wp-admin/speedien' && $_SERVER['REQUEST_METHOD'] == 'POST') 
-    {
-        if(speedien_verify_hmac())
-        {
-            $response = sanitize_html_class($_POST['response']);
-
-            $data = json_decode(base64_decode($response), true);
-            $url = urldecode($data['url']);
-            $cleaned_url = str_replace(array('?','&','='),'-',$url);
-            $url = rtrim($cleaned_url, '/') . '/';
-            $action = $data['action'];
-            if($action == 'cache')
-            {
-                $cache_file_path = WP_CONTENT_DIR . "/cache/speedien/$url" . 'index.html';
-                $contents = base64_decode($data['contents']);
-                mkdir(WP_CONTENT_DIR . "/cache/speedien/$url",0755,true);
-                if(!file_put_contents($cache_file_path,$contents))
+        if(!empty($options['speedien_field_jslist']))
+        {
+            $js_exclusions = explode(PHP_EOL, $options['speedien_field_jslist']);
+            foreach($js_exclusions as $exclusion)
+            {
+                if(strpos($string, trim($exclusion)) !== false)
                 {
-                    die('Encountered an error while storing cached response.');
-                }
-                $css = base64_decode($data['css']);
-                if(!file_put_contents(WP_CONTENT_DIR . "/cache/speedien/$url" . "style.css",$css))
-                {
-                    die('Encountered an error while storing css.');
-                }
-            }
-            if($action == 'dropin')
-            {
-                $cache_file_path = WP_CONTENT_DIR . '/advanced-cache.php';
-                $contents = base64_decode($data['contents']);
-                if(!file_put_contents($cache_file_path,$contents))
-                {
-                    die('Encountered an error while updating cache drop-in.');
-                }
-            }
-            if($action == 'purge')
-            {
-                speedien_purge();
-            }
-        }
-        else
-        {
-            header('HTTP/1.0 403 Forbidden');
-        }
-        exit();
-    }
-}
-
-add_action('parse_request', 'speedien_store_cache');
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+    
+}
+add_filter( 'wpspdn_exclude', 'speedien_exclusion_handler', 10, 3 );

speedien/tags/1.1.0/speedien_ui.php

@@ -1 +1 @@
 <?php
 
-/**
- * @internal never define functions inside callbacks.
- * these functions could be run multiple times; this would result in a fatal error.
- */
-
-/**
- * custom option and settings
- */
 function speedien_settings_init()
 {
@@ -15 +7 @@
 
     // Register a new section in the "speedien" page.
+    $options = get_option('speedien_options');
+    
     add_settings_section(
         'speedien_section_developers',
-        __('Connect to your Speedien Account ', 'speedien'),
+        __('Pagespeed Optimization Settings ', 'speedien'),
         'speedien_section_developers_callback',
         'speedien'
@@ -38 +32 @@
     // Register a new field in the "speedien_section_developers" section, inside the "speedien" page.
     add_settings_field(
-        'speedien_field_api_key', // As of WP 4.6 this value is used only internally.
-        // Use $args' label_for to populate the id inside the callback.
+        'speedien_field_api_key',
         __('Speedien API Key', 'speedien'),
         'speedien_field_api_key_cb',
@@ -51 +44 @@
     );
 
-    speedien_cache_init();
+    add_settings_field(
+        'speedien_field_jse_type',
+        __('Javascript Exclusion Type', 'speedien'),
+        'speedien_field_jse_type_cb',
+        'speedien',
+        'speedien_section_developers',
+        array(
+            'label_for'            => 'speedien_field_jse_type',
+            'class'                => 'speedien_row',
+            'speedien_custom_data' => 'custom',
+        )
+    );
+
+    add_settings_field(
+        'speedien_field_jslist',
+        __('Javascript Exclusion List', 'speedien'),
+        'speedien_field_jslist_cb',
+        'speedien',
+        'speedien_section_developers',
+        array(
+            'label_for'            => 'speedien_field_jslist',
+            'class'                => 'speedien_row',
+            'speedien_custom_data' => 'custom',
+        )
+    );
+
+    add_settings_field(
+        'speedien_field_pagelist',
+        __('Exclude pages from optimization', 'speedien'),
+        'speedien_field_pagelist_cb',
+        'speedien',
+        'speedien_section_developers',
+        array(
+            'label_for'            => 'speedien_field_pagelist',
+            'class'                => 'speedien_row',
+            'speedien_custom_data' => 'custom',
+        )
+    );
 
 }
@@ -62 +92 @@
 function speedien_cache_init()
 {
-    $wp_config_file = ABSPATH . 'wp-config.php';
-    if (!file_exists($wp_config_file)) {
-        $wp_config_file = dirname(ABSPATH) . '/wp-config.php';
-    }
-    if (!file_exists($wp_config_file) || !is_writable($wp_config_file)) {
-        return;
-    }
-
-    $content = "\ndefine('WP_CACHE', true); // Speedien cache handler";
-    $wp_config = file_get_contents($wp_config_file);
-    $wp_cache = '/define\([\'\"]WP_CACHE[\'\"].*/';
-    $wp_config = preg_replace($wp_cache, '', $wp_config);
-    $wp_config = str_replace('<?php', '<?php' . $content, $wp_config);
-    file_put_contents($wp_config_file, $wp_config);
-
-    $plugindir = plugin_dir_path( __FILE__ );
-    $advanced_cache = file_get_contents($plugindir . '/advanced-cache.php');
-    file_put_contents(WP_CONTENT_DIR . '/advanced-cache.php', $advanced_cache);
+    file_put_contents(WP_CONTENT_DIR . '/advanced-cache.php', '');
 }
 
@@ -95 +108 @@
 function speedien_section_developers_callback($args)
 {
-?>
-
-<p id="<?php echo esc_attr($args['id']); ?>">Please visit <a href="https://my.speedien.com/sites">https://my.speedien.com/sites</a> to find your API key and Site ID.</p>
-<?php
+
+    $options = get_option('speedien_options');
+    
+    if(empty($options['speedien_field_api_key']) || empty($options['speedien_field_site_id']))
+    {
+?>
+
+<p id="<?php echo esc_attr($args['id']); ?>">Please visit <a href="https://my.speedien.com/signup" target="_blank">https://my.speedien.com/signup</a> to generate a new API key and Site ID.</p>
+<?php
+    }
 }
 
-    /**
-     * Pill field callback function.
-     *
-     * WordPress has magic interaction with the following keys: label_for, class.
-     * - the "label_for" key value is used for the "for" attribute of the <label>.
-     * - the "class" key value is used for the "class" attribute of the <tr> containing the field.
-     * Note: you can add custom key value pairs to be used inside your callbacks.
-     *
-     * @param array $args
-     */
     function speedien_field_api_key_cb($args)
     {
@@ -123 +132 @@
     ?>
 
-<input type="text" name="speedien_options[<?php echo esc_attr($args['label_for']); ?>]"
+<input type="password" name="speedien_options[<?php echo esc_attr($args['label_for']); ?>]"
     id="<?php echo esc_attr($args['label_for']); ?>" value="<?php echo $api_key; ?>" />
 
@@ -141 +150 @@
 ?>
 
-<input type="text" name="speedien_options[<?php echo esc_attr($args['label_for']); ?>]"
+<input type="password" name="speedien_options[<?php echo esc_attr($args['label_for']); ?>]"
     id="<?php echo esc_attr($args['label_for']); ?>" value="<?php echo $api_key; ?>" />
 
@@ -147 +156 @@
     }
 
+    function speedien_field_pagelist_cb($args)
+    {
+        // Get the value of the setting we've registered with register_setting()
+        $options = get_option('speedien_options');
+        if (isset($options[$args['label_for']])) {
+            $page_exclusions = esc_attr($options[$args['label_for']]);
+        } else {
+            $page_exclusions = '';
+        }
+
+?>
+
+<textarea name="speedien_options[<?php echo esc_attr($args['label_for']); ?>]"
+    id="<?php echo esc_attr($args['label_for']); ?>" rows="4" cols="40"><?php echo $page_exclusions; ?></textarea>
+    <br><span>Enter the slugs of the pages that you wish to exclude from optimization. (Example: /contact)</span>
+<?php
+    }
+
+    function speedien_field_jse_type_cb($args)
+    {
+        // Get the value of the setting we've registered with register_setting()
+        $options = get_option('speedien_options');
+        if (isset($options[$args['label_for']])) {
+            $jse_type = esc_attr($options[$args['label_for']]);
+        } else {
+            $jse_type = '1';
+        }
+
+?>
+<input type="radio" name="speedien_options[<?php echo esc_attr($args['label_for']); ?>]" value="1" <?php checked(1, $jse_type, true); ?>>Exclude all Javascript except for the following list.<br /><br />
+<input type="radio" name="speedien_options[<?php echo esc_attr($args['label_for']); ?>]" value="2" <?php checked(2, $jse_type, true); ?>>Exclude only Javascript matching the following list.
+
+
+<?php
+    }
+
+    function speedien_field_jslist_cb($args)
+    {
+        // Get the value of the setting we've registered with register_setting()
+        $options = get_option('speedien_options');
+        if (isset($options[$args['label_for']])) {
+            $js_exclusions = esc_attr($options[$args['label_for']]);
+        } else {
+            $js_exclusions = '';
+        }
+
+?>
+
+<textarea name="speedien_options[<?php echo esc_attr($args['label_for']); ?>]"
+    id="<?php echo esc_attr($args['label_for']); ?>" rows="4" cols="40"><?php echo $js_exclusions; ?></textarea>
+    <br><span>Enter the keyword from javascript code or url. (Example: gtm.js)</span>
+<?php
+    }
+
+    
     /**
      * Add the top level menu page.
@@ -153 +217 @@
     {
         add_menu_page(
-            'Speedien Options',
-            'Speedien ',
+            'Pagespeed Optimization Settings',
+            'Pagespeed ',
             'manage_options',
             'speedien',
@@ -190 +254 @@
 
         settings_errors('speedien_messages');
+
+        $options = get_option('speedien_options');
+
 ?>
 <div class="wrap">
 
     <form action="options.php" method="post" class="speedien-form-bg">
-        <h1><?php echo esc_html(get_admin_page_title()); ?></h1>
-        <hr />
         <?php
             // output security fields for the registered setting "speedien"
@@ -218 +283 @@
 
 </div>
-<?php
-    }
+
+<?php
+    }
+
+    function speedien_section_preload_callback( $arg ) { ?>
+        <input type="hidden" name="action" value="speedien_preload_content">
+        <?php
+    }
+
+    function speedien_preload_content_handler() {
+        update_option('speedien_preload_status','In Progress');
+        
+        $preloadurls = array();
+        $pages = get_pages(array('number' => 100));
+        foreach($pages as $page)
+        {
+            $preloadurls[] = get_permalink($page->ID);
+        }
+        $posts = get_posts(array('number' => 50));
+        foreach($posts as $post)
+        {
+            $preloadurls[] = get_permalink($post->ID);
+        }
+
+        $options = get_option('speedien_options');
+        $data = array('api_key'=>$options['speedien_field_api_key'], 'site_id' => $options['speedien_field_site_id'], 'urls' => $preloadurls);
+
+        $response = wp_remote_post(SPEEDIEN_API_URL . '/preload', array('body' => $data, 'timeout' => 10));
+        wp_redirect(admin_url('admin.php?page=speedien'));
+    }
+    add_action( 'admin_post_speedien_preload_content', 'speedien_preload_content_handler' );