? boost-592886.1.patch
? boost-592886.patch
Index: boost.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/boost/boost.admin.inc,v
retrieving revision 1.1.2.1.2.3.2.79
diff -u -p -r1.1.2.1.2.3.2.79 boost.admin.inc
--- boost.admin.inc 30 Sep 2009 09:17:31 -0000 1.1.2.1.2.3.2.79
+++ boost.admin.inc 1 Oct 2009 09:57:25 -0000
@@ -41,7 +41,7 @@ function boost_admin_performance_page_su
drupal_set_message(t('Boost: Static page cache cleared.'));
}
}
- else if ($boost_ignore_flush == 0 && (variable_get('preprocess_css', FALSE)==TRUE || variable_get('preprocess_js', FALSE)==TRUE)) {
+ elseif ($boost_ignore_flush == 0 && (variable_get('preprocess_css', FALSE)==TRUE || variable_get('preprocess_js', FALSE)==TRUE)) {
if (boost_cache_clear_all()) {
drupal_set_message(t('Boost: Static page cache cleared.'), 'warning');
}
@@ -361,7 +361,7 @@ function boost_admin_boost_performance_p
'#options' => array(
0 => t('Disabled'),
1 => t('Enabled'),
- ),
+ ),
'#description' => t('Caution - If disabled you will need some other method of clearing cached pages. If Disabled, files have to be manually deleted from server or cleared using the administrative interface (Enable the Boost: Pages cache status block).', array('@blocks' => url('admin/build/block'), '@status' => url('admin/build/block/configure/boost/status'))),
);
$form['advanced']['boost_check_before_cron_expire'] = array(
@@ -486,7 +486,7 @@ function boost_admin_boost_performance_p
'#type' => 'checkbox',
'#title' => t('Do not flush expired content on cron run, instead recrawl and overwrite it.'),
'#default_value' => BOOST_LOOPBACK_BYPASS,
- '#description' => !BOOST_CRAWL_ON_CRON ? t('Enable the crawler first to enable this checkbox.') :!BOOST_OVERWRITE_FILE ? t('The "Overwrite the cached file if it already exits" must be turnned on inorder to enable this') : t('Bypass cron cache expiration and load to be expired content in the crawler. Allow this servers IP to bypass the boost cache. Check for fast but potentially stale; uncheck for slow but always fresh.'),
+ '#description' => !BOOST_CRAWL_ON_CRON ? t('Enable the crawler first to enable this checkbox.') :!BOOST_OVERWRITE_FILE ? t('The "Overwrite the cached file if it already exists" must be turned on in order to enable this') : t('Bypass cron cache expiration and load to be expired content in the crawler. Allow this servers IP to bypass the boost cache. Check for fast but potentially stale; uncheck for slow but always fresh.'),
'#disabled' => !BOOST_CRAWL_ON_CRON || !BOOST_OVERWRITE_FILE,
);
$form['crawler']['boost_push_html'] = array(
@@ -587,7 +587,7 @@ function boost_admin_boost_performance_p
$form['htaccess'] = array(
'#type' => 'fieldset',
'#title' => t('Boost Apache .htaccess settings generation'),
- '#description' => t('Explanation of .htaccess variables
Be sure to save the configuration and then go to the htaccess rules generation page and copy the rules.', array('!link' => url('http://www.askapache.com/htaccess/mod_rewrite-variables-cheatsheet.html'), '!rules' => url('admin/settings/performance/boost-rules'))),
+ '#description' => t('Explanation of .htaccess variables
Be sure to save the configuration and then go to the htaccess rules generation page and copy the rules.', array('!link' => url('http://www.askapache.com/htaccess/mod_rewrite-variables-cheatsheet.html'), '!rules' => url('admin/settings/performance/boost-rules'))),
);
$form['htaccess']['boost_server_name_http_host'] = array(
'#type' => 'radios',
@@ -610,7 +610,7 @@ function boost_admin_boost_performance_p
$rejects = array('SCRIPT_FILENAME', 'DOCUMENT_ROOT'); // values to ignore
$output = boost_array_find($document_root, $_SERVER, $rejects); //search for values that match getcwd
if (!empty($output)) {
- foreach ($output as $key=>$value) {
+ foreach ($output as $key => $value) {
$temp = '%{ENV:' . $key . '}';
$options[$temp] = $temp; // adding values to options
if ($value == $document_root) {
@@ -621,7 +621,7 @@ function boost_admin_boost_performance_p
if ($_SERVER['DOCUMENT_ROOT'] == $document_root) {
$best = '%{DOCUMENT_ROOT}';
}
- $description = t("Value of $best is recommended for this server.");
+ $description = t('Value of %best is recommended for this server.', array('%best' => $best));
if (!isset($best)) {
$best = $document_root;
$description .= t(' Please open an boost issue on drupal.org, since apache and php are not configured correctly.');
@@ -944,7 +944,7 @@ function boost_count_core_db($all = FALS
/**
* Flushes boost page cache
*/
-function boost_clear_cache_submit () {
+function boost_clear_cache_submit() {
if (boost_cache_clear_all()) {
drupal_set_message(t('Boost: Static page cache cleared.'));
}
@@ -957,19 +957,19 @@ function boost_clear_cache_submit () {
/**
* Flushes all expired pages from database
*/
-function boost_clear_expired_cache_submit () {
+function boost_clear_expired_cache_submit() {
if (boost_cache_db_expire()) {
drupal_set_message(t('Boost: Expired stale files from static page cache.'));
}
else {
- drupal_set_message(t('Boost: Set "Ignore cache flushing:" to \'Disabled\' OR \'Only Ignore Complete Flushes\' in the boost advanced settings & try again.', array('@link' => url('admin/settings/performance/boost', array('fragment' => 'edit-boost-ignore-flush-0-wrapper')))), 'warning');
+ drupal_set_message(t('Boost: Set "Ignore cache flushing:" to \'Disabled\' OR \'Only Ignore Complete Flushes\' in the boost advanced settings & try again.', array('@link' => url('admin/settings/performance/boost', array('fragment' => 'edit-boost-ignore-flush-0-wrapper')))), 'warning');
}
}
/**
* Flushes core page cache
*/
-function boost_clear_core_page_cache_submit () {
+function boost_clear_core_page_cache_submit() {
cache_clear_all('*', 'cache_page', TRUE);
drupal_set_message(t('Core page cache cleared.'));
}
@@ -977,7 +977,7 @@ function boost_clear_core_page_cache_sub
/**
* Resets boost database & cache
*/
-function boost_reset_database_submit () {
+function boost_reset_database_submit() {
if (boost_cache_clear_all()) {
db_query("TRUNCATE {boost_cache}");
db_query("TRUNCATE {boost_cache_settings}");
@@ -1020,10 +1020,10 @@ function boost_reset_crawler_submit() {
*/
function boost_array_find($needle, $haystack, $a_not = array()) {
$out = array();
- foreach($haystack as $key=>$value) {
+ foreach ($haystack as $key => $value) {
if ($value == $needle) {
$good = TRUE;
- foreach($a_not as $not) {
+ foreach ($a_not as $not) {
if (strpos($key, $not) !== FALSE) {
$good = FALSE;
}
Index: boost.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/boost/boost.install,v
retrieving revision 1.2.2.1.2.3.2.48
diff -u -p -r1.2.2.1.2.3.2.48 boost.install
--- boost.install 30 Sep 2009 09:17:31 -0000 1.2.2.1.2.3.2.48
+++ boost.install 1 Oct 2009 09:57:26 -0000
@@ -81,7 +81,7 @@ function boost_requirements($phase) {
$crawler_response = drupal_http_request(BOOST_CRAWLER_SELF . '&test=1');
$crawler_response = $crawler_response->code;
}
- foreach($cache_directories as $cache_directory) {
+ foreach ($cache_directories as $cache_directory) {
_boost_mkdir_p($cache_directory);
$root_file = file_put_contents($cache_directory . '/' . variable_get('boost_root_file', '.boost'), $cache_directory);
if (!is_dir($cache_directory)) {
@@ -120,7 +120,7 @@ function boost_requirements($phase) {
if (!boost_chk_module_versions()) {
$requirements['boost_other_modules'] = array(
'title' => $t('Boost'),
- 'description' => $t('You need to get a newer version of poormanscron, most likely the latest dev.', array('@url' => "http://drupal.org/project/poormanscron")),
+ 'description' => $t('You need to get a newer version of poormanscron, most likely the latest dev, or the 2.0 branch.', array('@url' => "http://drupal.org/project/poormanscron")),
'severity' => REQUIREMENT_ERROR,
'value' => $t('poormanscron is the wrong version'),
);
@@ -128,13 +128,7 @@ function boost_requirements($phase) {
if (variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE) == LANGUAGE_NEGOTIATION_PATH) {
$requirements['boost_language'] = array(
'title' => $t('Boost'),
- 'description' => $t('Boost is not compatible with '.
- 'language negotiation set to "language '.
- 'fallback". An anonymous user with their browser set to a '.
- "language other than the site's default language will navigate ".
- "to a non-cached page. The page will be displayed in the user's ".
- 'browser language. Boost will cache the non-default-language '.
- 'page. ', array('!url' => url('admin/settings/language/configure'))),
+ 'description' => $t('Boost is not compatible with language negotiation set to "language fallback". An anonymous user with their browser set to a language other than the site\'s default language will navigate to a non-cached page. The page will be displayed in the user\'s browser language. Boost will cache the non-default-language page. ', array('!url' => url('admin/settings/language/configure'))),
'severity' => REQUIREMENT_ERROR,
'value' => $t('Cannot use "language fallback" language negotiation'),
);
@@ -694,8 +688,8 @@ function boost_update_6109() {
}
/**
-* Update 6110 - Flush core caches
-*/
+ * Update 6110 - Flush core caches
+ */
function boost_update_6110() {
// Flush caches, needed since the menus where changed around.
drupal_flush_all_caches();
Index: boost.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/boost/boost.module,v
retrieving revision 1.3.2.2.2.5.2.162
diff -u -p -r1.3.2.2.2.5.2.162 boost.module
--- boost.module 30 Sep 2009 19:57:36 -0000 1.3.2.2.2.5.2.162
+++ boost.module 1 Oct 2009 09:57:26 -0000
@@ -407,7 +407,7 @@ function boost_nodeapi(&$node, $op, $tea
function boost_votingapi_insert($votes) {
if (!BOOST_ENABLED) return;
- foreach($votes as $vote) {
+ foreach ($votes as $vote) {
$node = node_load($vote['content_id']);
boost_expire_node($node);
}
@@ -422,7 +422,7 @@ function boost_votingapi_insert($votes)
function boost_votingapi_delete($votes) {
if (!BOOST_ENABLED) return;
- foreach($votes as $vote) {
+ foreach ($votes as $vote) {
$node = node_load($vote['content_id']);
boost_expire_node($node);
}
@@ -447,10 +447,10 @@ function boost_expire_node($node) {
if (module_exists('taxonomy') && BOOST_FLUSH_NODE_TERMS) {
$tids = boost_taxonomy_node_get_tids($node->nid);
$filenames = array();
- foreach($tids as $tid) {
+ foreach ($tids as $tid) {
$filenames = array_merge($filenames, boost_get_db_term($tid));
}
- foreach($filenames as $filename) {
+ foreach ($filenames as $filename) {
boost_cache_kill($filename);
}
}
@@ -576,10 +576,7 @@ function boost_block($op = 'list', $delt
if (boost_is_cached($GLOBALS['_boost_path'])) {
$ttl = boost_db_get_ttl(boost_file_path($GLOBALS['_boost_path']));
$output = t('This page is being served to anonymous visitors from the static page cache.') . ' ';
- $output .= t($ttl < 0 ?
- 'The cached copy expired %interval ago.' :
- 'The cached copy will expire in %interval.',
- array('%interval' => format_interval(abs($ttl))));
+ $output .= $ttl < 0 ? t('The cached copy expired %interval ago.', array('%interval' => format_interval(abs($ttl)))) : t('The cached copy will expire in %interval.', array('%interval' => format_interval(abs($ttl))));
$output .= drupal_get_form('boost_block_flush_form');
}
$error = FALSE;
@@ -896,11 +893,10 @@ function _boost_ob_handler() {
}
- // Check the currently set content type and the HTTP response code. We're
- // going to be exceedingly conservative here and only cache 'text' pages that
- // were output with a 200 OK status. If it didn't get a 200 then remove that
- // entry from the cache.
- if ($GLOBALS['_boost_cache_this'] && strlen($buffer) > 0) {
+ // Check the currently set content type and the HTTP response code. only cache
+ // 'text/*' pages that were output with a 200 OK status. If it didn't get a
+ // 200 then TODO: remove that entry from the cache.
+ if ($GLOBALS['_boost_cache_this'] && !empty($buffer) > 0) {
switch (_boost_get_content_type()) {
case 'text/html':
if (boost_check_http_status()) {
@@ -1039,7 +1035,7 @@ function _boost_get_http_header($regex,
*/
function boost_is_cacheable($path) {
$path = (empty($path)) ? variable_get('site_frontpage', 'node') : $path;
- $normal_path = drupal_get_normal_path($path); // normalize pathW
+ $normal_path = drupal_get_normal_path($path); // normalize path
$full = $normal_path . '-' . $GLOBALS['_boost_query'];
// Never cache
@@ -1081,7 +1077,7 @@ function boost_is_cacheable($path) {
// http://en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
// " * : < > |
$chars = '"*:<>|';
- if (stristr(PHP_OS, 'WIN') && preg_match("/[".$chars."]/", $full)) {
+ if (stristr(PHP_OS, 'WIN') && preg_match("/[" . $chars . "]/", $full)) {
return FALSE;
}
@@ -1589,9 +1585,9 @@ function boost_get_settings_db($router_i
* Returns all cached pages associated with the taxonomy term.
*/
function boost_get_db_term($term) {
- $filenames = array();
- $result = db_query("SELECT filename FROM {boost_cache} WHERE expire > 0 AND page_id = %d AND page_callback = 'taxonomy'", $term);
- while ($filename = db_fetch_array($result)) {
+ $filenames = array();
+ $result = db_query("SELECT filename FROM {boost_cache} WHERE expire > 0 AND page_id = %d AND page_callback = 'taxonomy'", $term);
+ while ($filename = db_fetch_array($result)) {
$filenames[] = $filename['filename'];
}
return $filenames;
@@ -1893,7 +1889,7 @@ function boost_cache_css_js_files($buffe
* Based on return_array() By Matthew Ruivo (mruivo at gmail)
* (http://www.php.net/manual/en/function.print-r.php#73436)
*/
-function boost_print_r($var, $return = false, $html = false, $level = 0) {
+function boost_print_r($var, $return = FALSE, $html = FALSE, $level = 0) {
$spaces = "";
$space = $html ? " " : " ";
$newline = $html ? "
" : "\n";
@@ -1908,15 +1904,15 @@ function boost_print_r($var, $return = f
$title = "Array";
}
elseif (is_object($var)) {
- $title = get_class($var)." Object";
+ $title = get_class($var) . " Object";
}
$output = $title . $newline . $newline;
// Recursive boost_print_r
- foreach($var as $key => $value) {
+ foreach ($var as $key => $value) {
if (is_array($value) || is_object($value)) {
$level++;
- $value = boost_print_r($value, true, $html, $level);
+ $value = boost_print_r($value, TRUE, $html, $level);
$level--;
}
$output .= $tabs . "[" . $key . "] => " . $value . $newline;
@@ -1938,10 +1934,10 @@ function boost_print_r($var, $return = f
*/
function boost_glue_url($parsed) {
if (!is_array($parsed)) {
- return false;
+ return FALSE;
}
- $uri = isset($parsed['scheme']) ? $parsed['scheme'] . ':' . ((strtolower($parsed['scheme']) == 'mailto') ? '' : '//') : '';
+ $uri = isset($parsed['scheme']) ? $parsed['scheme'] . ':' . ((drupal_strtolower($parsed['scheme']) == 'mailto') ? '' : '//') : '';
$uri .= isset($parsed['user']) ? $parsed['user'] . (isset($parsed['pass']) ? ': ' . $parsed['pass'] : '') . '@' : '';
$uri .= isset($parsed['host']) ? $parsed['host'] : '';
$uri .= isset($parsed['port']) ? ':' . $parsed['port'] : '';
@@ -2152,7 +2148,7 @@ function _boost_get_menu_router() {
$original_map = arg(NULL, $_GET['q']);
$parts = array_slice($original_map, 0, MENU_MAX_PARTS);
list($ancestors, $placeholders) = menu_get_ancestors($parts);
- $router_item = db_fetch_array(db_query_range('SELECT page_callback, page_arguments FROM {menu_router} WHERE path IN ('. implode (',', $placeholders) .') ORDER BY fit DESC', $ancestors, 0, 1));
+ $router_item = db_fetch_array(db_query_range('SELECT page_callback, page_arguments FROM {menu_router} WHERE path IN ('. implode(',', $placeholders) .') ORDER BY fit DESC', $ancestors, 0, 1));
$router_item['page_arguments'] = unserialize($router_item['page_arguments']);
// Handle nodes
if (arg(0) == 'node' && is_numeric(arg(1))) {
@@ -2269,7 +2265,7 @@ function _boost_rmdir_rf($dirname, $flus
$empty = FALSE;
}
}
- else if (is_file($file) || is_link($file)) {
+ elseif (is_file($file) || is_link($file)) {
if (!$flush && !boost_db_is_expired($file)) {
$empty = FALSE;
continue;
@@ -2346,7 +2342,7 @@ ETO;
* Inject iframe gzip cookie test.
*/
function _boost_gzip_test_inject_iframe($data) {
- return str_replace('', '