Added Apache Optimization panel and features, edited Pro Features label

src/includes/classes/AdvCacheBackCompat.php

@@ -66,4 +66,23 @@ public static function zenCacheConstants()
 
         unset($_constant, $_value, $_global_ns); // Housekeeping.
     }
+
+    /**
+     * Back compat. with `COMET_CACHE_ALLOW_BROWSER_CACHE` constants.
+     *
+     * @since 16xxxx Renaming COMET_CACHE_ALLOW_BROWSER_CACHE to COMET_CACHE_ALLOW_CLIENT_SIDE_CACHE
+     */
+    public static function browserCacheConstant()
+    {
+        $_global_ns = mb_strtoupper(GLOBAL_NS);
+
+        if (!($constants = get_defined_constants(true)) || empty($constants['user'])) {
+            return; // Nothing to do; i.e. no user-defined constants.
+        }
+        if (in_array('COMET_CACHE_ALLOW_BROWSER_CACHE', $constants['user'])) {
+            if (!defined($_global_ns.'_ALLOW_CLIENT_SIDE_CACHE')) {
+                define($_global_ns.'_ALLOW_CLIENT_SIDE_CACHE', $constants['user']['COMET_CACHE_ALLOW_BROWSER_CACHE']);
+            }
+        }
+    }
 }

src/includes/classes/AdvancedCache.php

@@ -13,7 +13,7 @@ class AdvancedCache extends AbsBaseAp
     /*[.build.php-auto-generate-use-Traits]*/
     use Traits\Ac\AbortUtils;
     use Traits\Ac\AcPluginUtils;
-    use Traits\Ac\BrowserUtils;
+    use Traits\Ac\ClientSideUtils;
     use Traits\Ac\HtmlCUtils;
     use Traits\Ac\NcDebugUtils;
     use Traits\Ac\ObUtils;

src/includes/classes/MenuPageOptions.php

@@ -572,9 +572,9 @@ public function __construct()
         echo '      <p>'.__('<strong>This option is NOT the same as "Leverage Browser Caching"</strong>, which refers to the caching of static resources in the browser (e.g., images, CSS, JS). This Client-Side Cache option is different in that it controls the caching of <em>page content</em> in the browser, i.e., the caching of HTML content generated by PHP itself, which is generally NOT static. If you\'re looking to Leverage Browser Caching for static resources (highly recommended), see the <strong>Apache Optimizations</strong> panel below.', SLUG_TD).'</p>'."\n";
         echo '      <p>'.sprintf(__('%1$s handles content delivery through its ability to communicate with a browser using PHP. If you allow a browser to (cache) the caching system itself, you are momentarily losing some control; and this can have a negative impact on users that see more than one version of your site; e.g., one version while logged-in, and another while NOT logged-in. For instance, a user may log out of your site, but upon logging out they report seeing pages on the site which indicate they are STILL logged in (even though they\'re not — that\'s bad). This can happen if you allow a client-side cache, because their browser may cache web pages they visited while logged into your site which persist even after logging out. Sending no-cache headers will work to prevent this issue.', SLUG_TD), esc_html(NAME)).'</p>'."\n";
         echo '      <p>'.__('All of that being said, if all you care about is blazing fast speed and users don\'t log in/out of your site (only you do); you can safely set this to <code>Yes</code> (recommended in this case). Allowing a client-side browser cache will improve speed and reduce outgoing bandwidth when this option is feasible.', SLUG_TD).'</p>'."\n";
-        echo '      <p><select name="'.esc_attr(GLOBAL_NS).'[saveOptions][allow_browser_cache]" data-toggle="enable-disable" data-target=".-client-side-cache-options">'."\n";
-        echo '            <option value="0"'.selected($this->plugin->options['allow_browser_cache'], '0', false).'>'.__('No, prevent a client-side browser cache of dynamic page content (safest option).', SLUG_TD).'</option>'."\n";
-        echo '            <option value="1"'.selected($this->plugin->options['allow_browser_cache'], '1', false).'>'.__('Yes, I will allow a client-side browser cache of pages on the site.', SLUG_TD).'</option>'."\n";
+        echo '      <p><select name="'.esc_attr(GLOBAL_NS).'[saveOptions][allow_client_side_cache]" data-toggle="enable-disable" data-target=".-client-side-cache-options">'."\n";
+        echo '            <option value="0"'.selected($this->plugin->options['allow_client_side_cache'], '0', false).'>'.__('No, prevent a client-side browser cache of dynamic page content (safest option).', SLUG_TD).'</option>'."\n";
+        echo '            <option value="1"'.selected($this->plugin->options['allow_client_side_cache'], '1', false).'>'.__('Yes, I will allow a client-side browser cache of pages on the site.', SLUG_TD).'</option>'."\n";
         echo '         </select></p>'."\n";
         echo '      <p class="info">'.__('<strong>Tip:</strong> Setting this to <code>No</code> is highly recommended when running a membership plugin like <a href="http://wordpress.org/plugins/s2member/" target="_blank">s2Member</a> (as one example). In fact, many plugins like s2Member will send <a href="http://codex.wordpress.org/Function_Reference/nocache_headers" target="_blank">nocache_headers()</a> on their own, so your configuration here will likely be overwritten when you run such plugins (which is better anyway). In short, if you run a membership plugin, you should NOT allow a client-side browser cache.', SLUG_TD).'</p>'."\n";
         echo '      <p class="info">'.__('<strong>Tip:</strong> Setting this to <code>No</code> will NOT impact static content; e.g., CSS, JS, images, or other media. This setting pertains only to dynamic PHP scripts which produce content generated by WordPress.', SLUG_TD).'</p>'."\n";

src/includes/classes/Plugin.php

@@ -357,7 +357,7 @@ public function setup()
 
             /* Misc. cache behaviors. */
 
-            'allow_browser_cache'               => '0', // `0|1`.
+            'allow_client_side_cache'           => '0', // `0|1`.
             'when_logged_in'                    => '0', // `0|1|postload`.
             'get_requests'                      => '0', // `0|1`.
             'feeds_enable'                      => '0', // `0|1`.

src/includes/classes/VsUpgrades.php

@@ -226,13 +226,21 @@ protected function fromLte160227()
 
     /**
      * Before we changed the Auto-Cache Engine requirements check to include cURL (notice name changed)
+     * and before we renamed the `allow_browser_cache` option to `allow_client_side_cache`.
      *
      * @since 16xxxx
      */
     protected function fromLte160521()
     {
         if (version_compare($this->prev_version, '160521', '<=')) {
             $this->plugin->dismissMainNotice('allow_url_fopen_disabled');
+
+            if (is_array($existing_options = get_site_option(GLOBAL_NS.'_options'))) {
+                if (isset($existing_options['allow_browser_cache'])) {
+                    $this->plugin->options['allow_client_side_cache'] = $existing_options['allow_browser_cache'];
+                    $this->plugin->updateOptions($this->plugin->options); // Save/update options.
+                }
+            }
         }
     }
 }

src/includes/templates/advanced-cache.txt

@@ -37,6 +37,7 @@ if (defined('WP_DEBUG') && WP_DEBUG) {
 }
 Classes\AdvCacheBackCompat::zenCacheConstants();
 Classes\AdvCacheBackCompat::zcRequestVars();
+Classes\AdvCacheBackCompat::browserCacheConstant();
 
 if (!defined('COMET_CACHE_PRO')) {
     /**
@@ -68,7 +69,7 @@ if (!defined('COMET_CACHE_DEBUGGING_ENABLE')) {
      */
     define('COMET_CACHE_DEBUGGING_ENABLE', '%%COMET_CACHE_DEBUGGING_ENABLE%%');
 }
-if (!defined('COMET_CACHE_ALLOW_BROWSER_CACHE')) {
+if (!defined('COMET_CACHE_ALLOW_CLIENT_SIDE_CACHE')) {
     /**
      * Allow browsers to cache each document?
      *
@@ -79,7 +80,7 @@ if (!defined('COMET_CACHE_ALLOW_BROWSER_CACHE')) {
      * @note If this is a `FALSE` (or an empty) value; Comet Cache will send no-cache headers.
      *    If `TRUE`, Comet Cache will NOT send no-cache headers.
      */
-    define('COMET_CACHE_ALLOW_BROWSER_CACHE', '%%COMET_CACHE_ALLOW_BROWSER_CACHE%%');
+    define('COMET_CACHE_ALLOW_CLIENT_SIDE_CACHE', '%%COMET_CACHE_ALLOW_CLIENT_SIDE_CACHE%%');
 }
 if (!defined('COMET_CACHE_GET_REQUESTS')) {
     /**

src/includes/traits/Ac/BrowserUtils.php

@@ -3,7 +3,7 @@
 
 use WebSharks\CometCache\Pro\Classes;
 
-trait BrowserUtils
+trait ClientSideUtils
 {
     /**
      * Sends no-cache headers (if applicable).
@@ -12,7 +12,7 @@ trait BrowserUtils
      */
     public function maybeStopBrowserCaching()
     {
-        switch ((bool) COMET_CACHE_ALLOW_BROWSER_CACHE) {
+        switch ((bool) COMET_CACHE_ALLOW_CLIENT_SIDE_CACHE) {
 
             case true: // If global config allows, check exclusions.
 
@@ -24,7 +24,7 @@ public function maybeStopBrowserCaching()
                 } elseif (COMET_CACHE_EXCLUDE_CLIENT_SIDE_URIS && (empty($_SERVER['REQUEST_URI']) || preg_match(COMET_CACHE_EXCLUDE_CLIENT_SIDE_URIS, $_SERVER['REQUEST_URI']))) {
                     return $this->sendNoCacheHeaders(); // Disallow.
                 }
-                return; // Allow browser caching; default behavior in this mode.
+                return; // Allow client-side caching; default behavior in this mode.
 
             case false: // Global config disallows; check inclusions.