@@ -6,7 +6,12 @@ # Maitenance mode: (uncoment following line) # RewriteRule ^(.*)$ app/webroot/offline.html [L] + + # HTML cache + RewriteCond %{REQUEST_METHOD} ^GET$ + RewriteCond %{DOCUMENT_ROOT}/wildflower/app/webroot/cache/$1/index.html -f + RewriteRule ^(.*)$ app/webroot/cache/$1/index.html [L] RewriteRule ^$ app/webroot/ [L] RewriteRule (.*) app/webroot/$1 [L] -</IfModule> \ No newline at end of file +</IfModule> .htaccess @@ -3,12 +3,3 @@ RewriteRule ^$ webroot/ [L] RewriteRule (.*) webroot/$1 [L] </IfModule> - -<IfModule mod_deflate.c> - # compress content with type html, - AddOutputFilterByType DEFLATE text/html application/rss+xml - <IfModule mod_headers.c> - # properly handle requests coming from behind proxies - Header append Vary User-Agent - </IfModule> -</IfModule> \ No newline at end of file app/.htaccess @@ -272,6 +272,7 @@ class AppController extends Controller { 'isPosts' => false, 'isHome' => $this->isHome, 'homePageId' => $this->homePageId, + // Here without base 'here' => substr($this->here, strlen($this->base) - strlen($this->here)), ); $this->params['Wildflower']['view'] = $params; app/app_controller.php @@ -38,7 +38,7 @@ * In production mode, flash messages redirect after a time interval. * In development mode, you need to click the flash message to continue. */ - Configure::write('debug', 1); + Configure::write('debug', 0); /** * Application wide charset encoding */ app/config/core.php @@ -1,9 +1,6 @@ <IfModule mod_rewrite.c> RewriteEngine On - RewriteCond %{REQUEST_METHOD} ^GET$ - RewriteCond %{DOCUMENT_ROOT}/cache/$1/index.html -f - RewriteRule ^(.*)$ /cache/$1/index.html [L] RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-f RewriteRule ^(.*)$ index.php?url=$1 [QSA,L] -</IfModule> \ No newline at end of file +</IfModule> app/webroot/.htaccess @@ -30,5 +30,7 @@ Configure::write(array('Wildflower' => array( 'blogIndex' => 'blog', // Disabling the root page cache may be useful in debugging // (the cache file won't be created, page routes load from the database) - 'disableRootPageCache' => false + 'disableRootPageCache' => false, + // 60000% speed increase with pure HTML caching into the webroot + 'htmlCache' => true ))); wildflower/config/core.php @@ -8,13 +8,20 @@ uses('Sanitize'); class WildPagesController extends AppController { public $components = array('RequestHandler', 'Seo'); - public $helpers = array('Cache', 'Form', 'Html', 'Text', 'Time', 'Wildflower.List', 'Wildflower.Tree'); + public $helpers = array('Form', 'Html', 'Text', 'Time', 'List', 'Tree'); public $paginate = array( 'limit' => 25, 'order' => array('WildPage.lft' => 'asc') ); public $pageTitle = 'Pages'; + function beforeFilter() { + parent::beforeFilter(); + if (Configure::read('Wildflower.htmlCache') and $this->params['action'] == 'view') { + $this->helpers[] = 'HtmlCache'; + } + } + /** * A static about Wildflower page * @@ -301,10 +308,6 @@ class WildPagesController extends AppController { * Handles redirect if the correct url for page is not entered. */ function view() { - if (Configure::read('AppSettings.cache') == 'on') { - $this->cacheAction = 60 * 60 * 24 * 3; // Cache for 3 days - } - // Parse attributes $args = func_get_args(); $corrected = false; wildflower/controllers/wild_pages_controller.php @@ -7,33 +7,34 @@ * http://www.pseudocoder.com/archives/2008/09/03/cakephp-html-cache-helper/ * * @author mattc <matt@pseudocoder.com> + * @modifiedBy klevo for Wildflower * @license MIT - * */ - class HtmlCacheHelper extends Helper { - function afterLayout() { - if (Configure::read('debug') > 0) { - return; - } + + function afterLayout() { + if (Configure::read('debug') > 0) { + return; + } - $view =& ClassRegistry::getObject('view'); + $view = ClassRegistry::getObject('view'); - //handle 404s - if ($view->name == 'CakeError') { - $path = $this->params['url']['url']; - } else { - $path = $this->here; - } + //handle 404s + if ($view->name == 'CakeError') { + $path = $this->params['url']['url']; + } else { + $path = substr($this->here, strlen($this->base) - strlen($this->here)); + } - $path = implode(DS, array_filter(explode('/', $path))); - if($path !== '') { - $path = DS . ltrim($path, DS); - } - $path = WWW_ROOT . 'cache' . $path . DS . 'index.html'; + $path = implode(DS, array_filter(explode('/', $path))); + if($path !== '') { + $path = DS . ltrim($path, DS); + } + $path = WWW_ROOT . 'cache' . $path . DS . 'index.html'; - $file = new File($path, true); - $file->write($view->output); - } + $file = new File($path, true); + $file->write($view->output); + } + } -?> \ No newline at end of file + wildflower/views/helpers/html_cache.php 253f60648c35f2e52dca11959492464c2441f443 klevo klevo@klevo.sk http://github.com/klevo/wildflower/commit/53cde19b9c0dc7ede7ed78c70b12afa1795abbf3 53cde19b9c0dc7ede7ed78c70b12afa1795abbf3 2009-04-19T03:04:34-07:00 2009-04-19T03:04:34-07:00 HTML cache tested and working for page view 031481ff01ac71bd9cc522102768b23b09127d8c klevo klevo@klevo.sk