WordPress.org

Plugin Directory

Changeset 420800


Ignore:
Timestamp:
08/09/11 03:37:01 (3 years ago)
Author:
fredericktownes
Message:
 
Location:
w3-total-cache/trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • w3-total-cache/trunk/inc/define.php

    r419604 r420800  
    10491049 
    10501050        case 'file': 
    1051             $engine_name = 'disk'; 
     1051            $engine_name = 'disk: basic'; 
    10521052            break; 
    10531053 
    10541054        case 'file_generic': 
    1055             $engine_name = 'disk (enhanced)'; 
     1055            $engine_name = 'disk: enhanced'; 
    10561056            break; 
    10571057 
     
    12061206    } 
    12071207 
    1208     $v = $instances[$class];   // dont return reference 
     1208    $v = $instances[$class];   // Don't return reference 
    12091209    return $v; 
    12101210} 
  • w3-total-cache/trunk/inc/options/browsercache.php

    r409551 r420800  
    7070        <?php echo $this->postbox_footer(); ?> 
    7171 
    72         <?php echo $this->postbox_header('Cascading Style Sheets &amp; JavaScript'); ?> 
    73         <p>Specify browser cache policy for cascading style sheets and JavaScript files.</p> 
     72        <?php echo $this->postbox_header('<acronym title="Cascading Style Sheet">CSS</acronym> &amp; <acronym title="JavaScript">JS</acronym>'); ?> 
     73        <p>Specify browser cache policy for Cascading Style Sheets and JavaScript files.</p> 
    7474 
    7575        <table class="form-table"> 
     
    147147        <?php echo $this->postbox_footer(); ?> 
    148148 
    149         <?php echo $this->postbox_header('<acronym title="Hypertext Markup Language">HTML</acronym>'); ?> 
     149        <?php echo $this->postbox_header('<acronym title="Hypertext Markup Language">HTML</acronym> &amp; <acronym title="Extensible Markup Language">XML</acronym>'); ?> 
    150150        <p>Specify browser cache policy for posts, pages, feeds and text-based files.</p> 
    151151 
  • w3-total-cache/trunk/inc/options/cdn.php

    r410604 r420800  
    1313    <input id="cdn_import_library" class="button {nonce: '<?php echo wp_create_nonce('w3tc'); ?>'}" type="button" value="importing attachments into the Media Library" />. 
    1414    <?php if (w3_can_cdn_purge($cdn_engine)): ?> 
    15     <input id="cdn_purge" class="button {nonce: '<?php echo wp_create_nonce('w3tc'); ?>'}" type="button" value="Purge" /> objects from the CDN using this tool. 
     15    <input id="cdn_purge" class="button {nonce: '<?php echo wp_create_nonce('w3tc'); ?>'}" type="button" value="Purge" /> objects from the <acronym title="Content Delivery Network">CDN</acronym> using this tool. 
    1616    <?php endif; ?> 
    1717</p> 
     
    136136                <th colspan="2"> 
    137137                    <input type="hidden" name="cdn.reject.admins" value="0" /> 
    138                     <label><input type="checkbox" name="cdn.reject.admins" value="1"<?php checked($this->_config->get_boolean('cdn.reject.admins'), true); ?> /> Don't replace URLs for logged in administrators</label><br /> 
     138                    <label><input type="checkbox" name="cdn.reject.admins" value="1"<?php checked($this->_config->get_boolean('cdn.reject.admins'), true); ?> /> Don't replace <acronym title="Uniform Resource Indicator">URL</acronym>s for logged in administrators</label><br /> 
    139139                    <span class="description">Authenticated administrators will use the origin server exclusively when this option is selected.</span> 
    140140                </th> 
     
    224224                    <input type="hidden" name="set_cookie_domain_new" value="0" /> 
    225225                    <label><input type="checkbox" name="set_cookie_domain_new" value="1"<?php checked($set_cookie_domain, true); ?> /> Set cookie domain to &quot;<?php echo htmlspecialchars($cookie_domain); ?>&quot;</label> 
    226                     <br /><span class="description">If using subdomain for CDN functionality, this setting helps prevent new users from sending cookies in requests to the CDN subdomain.</span> 
     226                    <br /><span class="description">If using subdomain for <acronym title="Content Delivery Network">CDN</acronym> functionality, this setting helps prevent new users from sending cookies in requests to the <acronym title="Content Delivery Network">CDN</acronym> subdomain.</span> 
    227227                </th> 
    228228            </tr> 
  • w3-total-cache/trunk/inc/options/cdn/common/cnames.php

    r409551 r420800  
    1414        switch ($index): 
    1515            case 0: 
    16                 $label = '(reserved for CSS)'; 
     16                $label = '(reserved for <acronym title="Cascading Style Sheet">CSS</acronym>)'; 
    1717                break; 
    1818 
    1919            case 1: 
    20                 $label = '(reserved for JS in <head>)'; 
     20                $label = '(reserved for <acronym title="JavaScript">JS</acronym> in <head>)'; 
    2121                break; 
    2222 
    2323            case 2: 
    24                 $label = '(reserved for JS after <body>)'; 
     24                $label = '(reserved for <acronym title="JavaScript">JS</acronym> after <body>)'; 
    2525                break; 
    2626 
    2727            case 3: 
    28                 $label = '(reserved for JS before </body>)'; 
     28                $label = '(reserved for <acronym title="JavaScript">JS</acronym> before </body>)'; 
    2929                break; 
    3030 
  • w3-total-cache/trunk/inc/options/cdn/ftp.php

    r409551 r420800  
    4848    <td> 
    4949        <?php $cnames = $this->_config->get_array('cdn.ftp.domain'); include W3TC_INC_DIR . '/options/cdn/common/cnames.php'; ?> 
    50         <br /><span class="description">Enter the hostname or CNAME(s) of your FTP server configured above, these values will replace your site's hostname in the <acronym title="Hypertext Markup Language">HTML</acronym>.</span> 
     50        <br /><span class="description">Enter the hostname or CNAME(s) of your <acronym title="File Transfer Protocol">FTP</acronym> server configured above, these values will replace your site's hostname in the <acronym title="Hypertext Markup Language">HTML</acronym>.</span> 
    5151    </td> 
    5252</tr> 
  • w3-total-cache/trunk/inc/options/common/header.php

    r405393 r420800  
    3939        <a href="?page=w3tc_mobile"<?php if ($this->_page == 'w3tc_mobile'): ?> class="w3tc-options-menu-selected"<?php endif; ?>>User Agent Groups</a> | 
    4040        <a href="?page=w3tc_referrer"<?php if ($this->_page == 'w3tc_referrer'): ?> class="w3tc-options-menu-selected"<?php endif; ?>>Referrer Groups</a> | 
    41         <a href="?page=w3tc_cdn"<?php if ($this->_page == 'w3tc_cdn'): ?> class="w3tc-options-menu-selected"<?php endif; ?>>Content Delivery Network</a> | 
     41        <a href="?page=w3tc_cdn"<?php if ($this->_page == 'w3tc_cdn'): ?> class="w3tc-options-menu-selected"<?php endif; ?>><acronym title="Content Delivery Network">CDN</acronym></a> | 
    4242        <a href="?page=w3tc_faq"<?php if ($this->_page == 'w3tc_faq'): ?> class="w3tc-options-menu-selected"<?php endif; ?>><acronym title="Frequently Asked Questions">FAQ</acronym></a> | 
    4343        <a href="?page=w3tc_support"<?php if ($this->_page == 'w3tc_support'): ?> class="w3tc-options-menu-selected"<?php endif; ?> style="color: red;">Support</a> | 
  • w3-total-cache/trunk/inc/options/install.php

    r409551 r420800  
    1010        <li>On the "<a href="admin.php?page=w3tc_general">General</a>" tab and select your caching methods for page, database and minify. In most cases, "disk enhanced" mode for page cache, "disk" mode for minify and "disk" mode for database caching are "good" settings.</li> 
    1111        <li><em>Recommended:</em> On the "<a href="admin.php?page=w3tc_minify">Minify</a>" tab all of the recommended settings are preset. Use the help button to simplify discovery of your <acronym title="Cascading Style Sheet">CSS</acronym> and <acronym title="JavaScript">JS</acronym> files and groups. Pay close attention to the method and location of your <acronym title="JavaScript">JS</acronym> group embeddings. See the plugin's <a href="admin.php?page=w3tc_faq">FAQ</a> for more information on usage.</li> 
    12         <li><em>Recommended:</em> On the "<a href="admin.php?page=w3tc_browsercache">Browser Cache</a>" tab, HTTP compression is enabled by default. Make sure to enable other options to suit your goals.</li> 
     12        <li><em>Recommended:</em> On the "<a href="admin.php?page=w3tc_browsercache">Browser Cache</a>" tab, <acronym title="Hypertext Transfer Protocol">HTTP</acronym> compression is enabled by default. Make sure to enable other options to suit your goals.</li> 
    1313        <li><em>Recommended:</em> If you already have a content delivery network (<acronym title="Content Delivery Network">CDN</acronym>) provider, proceed to the "<a href="admin.php?page=w3tc_cdn">Content Delivery Network</a>" tab and populate the fields and set your preferences. If you do not use the Media Library, you will need to import your images etc into the default locations. Use the Media Library Import Tool on the "Content Delivery Network" tab to perform this task. If you do not have a <acronym title="Content Delivery Network">CDN</acronym> provider, you can still improve your site's performance using the "Self-hosted" method. On your own server, create a subdomain and matching <acronym title="Domain Name System">DNS</acronym> Zone record; e.g. static.domain.com and configure <acronym title="File Transfer Protocol">FTP</acronym> options on the "Content Delivery Network" tab accordingly. Be sure to <acronym title="File Transfer Protocol">FTP</acronym> upload the appropriate files, using the available upload buttons.</li> 
    1414        <li><em>Optional:</em> On the "<a href="admin.php?page=w3tc_dbcache">Database Cache</a>" tab the recommended settings are preset. If using a shared hosting account use the "disk" method with caution; in either of these cases the response time of the disk may not be fast enough, so this option is disabled by default.</li> 
     
    7979 
    8080            If this succeeds skip to #5. If this fails, then let's compile. Download and extract the <a href="http://www.monkey.org/~provos/libevent/" target="_blank">latest stable version</a>: 
    81             <pre class="console"># cd /usr/local/src &amp;&amp; wget <a href="http://www.monkey.org/~provos/libevent-1.4.13-stable.tar.gz" target="_blank">http://monkey.org/~provos/libevent-1.4.13-stable.tar.gz</a> &amp;&amp; tar -xzf libevent-1.4.13-stable.tar.gz &amp;&amp; cd libevent-1.4.13-stable</pre> 
     81            <pre class="console"># cd /usr/local/src &amp;&amp; wget <a href="http://www.monkey.org/~provos/libevent-2.0.12-stable.tar.gz" target="_blank">http://monkey.org/~provos/libevent-2.0.14-stable.tar.gz</a> &amp;&amp; tar -xzf libevent-2.0.12-stable.tar.gz &amp;&amp; cd libevent-2.0.12-stable</pre> 
    8282        </li> 
    8383        <li> 
     
    9696        </li> 
    9797        <li> 
    98             Now find the <a href="http://www.danga.com/memcached/download.bml" target="_blank">latest stable memcached</a>, download and extract: 
    99             <pre class="console"># cd /usr/local/src &amp;&amp; wget <a href="http://memcached.googlecode.com/files/memcached-1.4.4.tar.gz" target="_blank">http://memcached.googlecode.com/files/memcached-1.4.4.tar.gz</a> &amp;&amp; tar -xzf memcached-1.4.4.tar.gz &amp;&amp; cd memcached-1.4.4</pre> 
     98            Now find the <a href="http://memcached.org/" target="_blank">latest stable memcached</a>, download and extract: 
     99            <pre class="console"># cd /usr/local/src &amp;&amp; wget <a href="http://memcached.googlecode.com/files/memcached-1.4.6.tar.gz" target="_blank">http://memcached.googlecode.com/files/memcached-1.4.6.tar.gz</a> &amp;&amp; tar -xzf memcached-1.4.6.tar.gz &amp;&amp; cd memcached-1.4.6</pre> 
    100100        </li> 
    101101        <li> 
     
    128128        <li> 
    129129            Or via compilation. Download the <a href="http://pecl.php.net/package/memcache" target="_blank">latest stable version</a> and extract: 
    130             <pre class="console"># cd /usr/local/src/ &amp;&amp; wget <a href="http://pecl.php.net/get/memcache-2.2.5.tgz" target="_blank">http://pecl.php.net/get/memcache-2.2.5.tgz</a> &amp;&amp; tar -xzf memcache-2.2.5.tgz &amp;&amp; cd memcache-2.2.5</pre> 
     130            <pre class="console"># cd /usr/local/src/ &amp;&amp; wget <a href="http://pecl.php.net/get/memcache-2.2.6.tgz" target="_blank">http://pecl.php.net/get/memcache-2.2.6.tgz</a> &amp;&amp; tar -xzf memcache-2.2.6.tgz &amp;&amp; cd memcache-2.2.6</pre> 
    131131        </li> 
    132132        <li> 
     
    159159        <li> 
    160160            Or via compilation. Download the <a href="http://pecl.php.net/package/APC" target="_blank">latest stable version</a> and extract: 
    161             <pre class="console"># cd /usr/local/src &amp;&amp; wget <a href="http://pecl.php.net/get/APC-3.1.6.tgz" target="_blank">http://pecl.php.net/get/APC-3.1.6.tgz</a> &amp;&amp; tar -xzf APC-3.0.19.tgz &amp;&amp; cd APC-3.1.6</pre> 
     161            <pre class="console"># cd /usr/local/src &amp;&amp; wget <a href="http://pecl.php.net/get/APC-3.1.9.tgz" target="_blank">http://pecl.php.net/get/APC-3.1.9.tgz</a> &amp;&amp; tar -xzf APC-3.1.9.tgz &amp;&amp; cd APC-3.1.9</pre> 
    162162        </li> 
    163163        <li> 
     
    193193        <li> 
    194194            Download the <a href="http://xcache.lighttpd.net/wiki/ReleaseArchive" target="_blank">latest compatible version</a> and extract: 
    195             <pre class="console"># cd /usr/local/src &amp;&amp; wget <a href="http://xcache.lighttpd.net/pub/Releases/1.3.0/xcache-1.3.0.tar.gz" target="_blank">http://xcache.lighttpd.net/pub/Releases/1.3.0/xcache-1.3.0.tar.gz</a> &amp;&amp; tar -xzf xcache-1.3.0.tar.gz &amp;&amp; cd xcache-1.3.0</pre> 
     195            <pre class="console"># cd /usr/local/src &amp;&amp; wget <a href="http://xcache.lighttpd.net/pub/Releases/1.3.2/xcache-1.3.2.tar.gz" target="_blank">http://xcache.lighttpd.net/pub/Releases/1.3.2/xcache-1.3.2.tar.gz</a> &amp;&amp; tar -xzf xcache-1.3.2.tar.gz &amp;&amp; cd xcache-1.3.2</pre> 
    196196        </li> 
    197197        <li> 
     
    226226        <li> 
    227227            If using <acronym title="Hypertext Preprocessor">PHP</acronym> v5+, download the <a href="http://eaccelerator.net/" target="_blank">lastest compatible version</a> and extract. Remember v0.9.5.3 is the last version that supports user objects, later versions only support opcode caching. 
    228             <pre class="console"># cd /usr/local/src &amp;&amp; wget <a href="http://bart.eaccelerator.net/source/0.9.5.3/eaccelerator-0.9.5.3.tar.bz2" target="_blank">http://bart.eaccelerator.net/source/0.9.5.3/eaccelerator-0.9.5.3.tar.bz2</a> &amp;&amp; tar -xjf eaccelerator-0.9.5.3.tar.bz2 &amp;&amp; cd eaccelerator-0.9.5.3</pre> 
     228            <pre class="console"># cd /usr/local/src &amp;&amp; wget <a href="http://autosetup1.googlecode.com/files/eaccelerator-0.9.5.3.tar.bz2" target="_blank">http://autosetup1.googlecode.com/files/eaccelerator-0.9.5.3.tar.bz2</a> &amp;&amp; tar -xjf eaccelerator-0.9.5.3.tar.bz2 &amp;&amp; cd eaccelerator-0.9.5.3</pre> 
    229229        </li> 
    230230        <li> 
  • w3-total-cache/trunk/inc/options/minify.php

    r409551 r420800  
    130130        <?php echo $this->postbox_footer(); ?> 
    131131 
    132         <?php echo $this->postbox_header('JavaScript'); ?> 
     132        <?php echo $this->postbox_header('<acronym title="JavaScript">JS</acronym>'); ?> 
    133133        <table class="form-table"> 
    134134            <tr> 
     
    254254        <?php echo $this->postbox_footer(); ?> 
    255255 
    256         <?php echo $this->postbox_header('Cascading Style Sheets'); ?> 
     256        <?php echo $this->postbox_header('<acronym title="Cascading Style Sheet">CSS</acronym>'); ?> 
    257257        <table class="form-table"> 
    258258            <tr> 
  • w3-total-cache/trunk/inc/options/pgcache.php

    r415717 r420800  
    3939                    <label><input type="checkbox" name="pgcache.cache.feed" value="1"<?php checked($this->_config->get_boolean('pgcache.cache.feed'), true); ?> /> Cache feeds: site, categories, tags, comments</label><br /> 
    4040                    <span class="description">Even if using a feed proxy service (like <a href="http://en.wikipedia.org/wiki/FeedBurner" target="_blank">FeedBurner</a>), enabling this option is still recommended.</span> 
     41                </th> 
     42            </tr> 
     43            <tr> 
     44                <th> 
     45                    <input type="hidden" name="pgcache.cache.ssl" value="0" /> 
     46                    <label><input type="checkbox" name="pgcache.cache.ssl" value="1"<?php checked($this->_config->get_boolean('pgcache.cache.ssl'), true); ?> /> Create separate cache for HTTPS pages</label><br /> 
     47                    <span class="description">Once set, http and https pages will be stored in separate cache entries.</span> 
    4148                </th> 
    4249            </tr> 
  • w3-total-cache/trunk/lib/W3/Config.php

    r419610 r420800  
    6262        'pgcache.cache.home' => 'boolean', 
    6363        'pgcache.cache.feed' => 'boolean', 
     64        'pgcache.cache.ssl' => 'boolean', 
    6465        'pgcache.cache.404' => 'boolean', 
    6566        'pgcache.cache.flush' => 'boolean', 
     
    393394        'pgcache.cache.home' => true, 
    394395        'pgcache.cache.feed' => false, 
     396        'pgcache.cache.ssl' => true, 
    395397        'pgcache.cache.404' => false, 
    396398        'pgcache.cache.flush' => false, 
     
    529531            'favicon.ico', 
    530532            'wp-content/gallery/*', 
    531             'wp-content/uploads/avatars/*' 
     533            'wp-content/uploads/avatars/*', 
     534            'wp-content/plugins/wordpress-seo/css/xml-sitemap.xsl' 
    532535        ), 
    533536        'cdn.import.external' => false, 
     
    13581361    function set_defaults() { 
    13591362        $this->set('pgcache.enabled', true); 
     1363        $this->set('pgcache.cache.ssl', false); 
    13601364        $this->set('minify.auto', true); 
    13611365        $this->set('browsercache.enabled', true); 
  • w3-total-cache/trunk/lib/W3/Db.php

    r419610 r420800  
    685685        # _real_escape is called on that object,  
    686686        # which requires those inst. vars 
    687         if (isset($object_doing_query->$real_escape)) { 
    688             $this->$real_escape = $object_doing_query->$real_escape; 
    689         } 
    690         if (isset($object_doing_query->$dbh)) { 
    691             $this->$dbh = $object_doing_query->$dbh; 
     687        if (isset($object_doing_query->real_escape)) { 
     688            $this->real_escape = $object_doing_query->real_escape; 
     689        } 
     690        if (isset($object_doing_query->dbh)) { 
     691            $this->dbh = $object_doing_query->dbh; 
    692692        } 
    693693 
  • w3-total-cache/trunk/lib/W3/Plugin/PgCacheAdmin.php

    r419604 r420800  
    598598         * Set HTTPS 
    599599         */ 
    600         $rules .= "    RewriteCond %{HTTPS} =on\n"; 
    601         $rules .= "    RewriteRule .* - [E=W3TC_SSL:_ssl]\n"; 
    602         $rules .= "    RewriteCond %{SERVER_PORT} =443\n"; 
    603         $rules .= "    RewriteRule .* - [E=W3TC_SSL:_ssl]\n"; 
     600        if ($this->_config->get_boolean('pgcache.cache.ssl')) { 
     601            $rules .= "    RewriteCond %{HTTPS} =on\n"; 
     602            $rules .= "    RewriteRule .* - [E=W3TC_SSL:_ssl]\n"; 
     603            $rules .= "    RewriteCond %{SERVER_PORT} =443\n"; 
     604            $rules .= "    RewriteRule .* - [E=W3TC_SSL:_ssl]\n"; 
     605        } 
    604606 
    605607        $cache_path = str_replace(w3_get_document_root(), '', $cache_dir); 
     
    952954 
    953955        $rules .= "set \$w3tc_ssl \"\";\n"; 
    954         $rules .= "if (\$scheme = https) {\n"; 
    955         $rules .= "    set \$w3tc_ssl _ssl;\n"; 
    956         $rules .= "}\n"; 
     956        if ($this->_config->get_boolean('pgcache.cache.ssl')) { 
     957            $rules .= "if (\$scheme = https) {\n"; 
     958            $rules .= "    set \$w3tc_ssl _ssl;\n"; 
     959            $rules .= "}\n"; 
     960        } 
     961 
    957962        $rules .= "set \$w3tc_enc \"\";\n"; 
    958963 
  • w3-total-cache/trunk/lib/W3/Plugin/TotalCacheAdmin.php

    r419604 r420800  
    49304930 
    49314931            if (!is_wp_error($response) && ($response['response']['code'] == 200 || ($response['response']['code'] == 404 && $template == '404'))) { 
    4932                 $js_files = $this->get_recommendations_js($content); 
    4933                 $css_files = $this->get_recommendations_css($content); 
     4932                $js_files = $this->get_recommendations_js($response['body']); 
     4933                $css_files = $this->get_recommendations_css($response['body']); 
    49344934 
    49354935                $js_groups[$template] = $js_files; 
Note: See TracChangeset for help on using the changeset viewer.