Skip to content

GitLab

B
boost
Commit 5f532f07 authored by mikeytown2's avatar mikeytown2
Browse files
Options

#592886: Update boost.pot file and fix some minor text formatting issues.

parent 0799b01b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 941 additions and 134 deletions
boost.admin.inc
View file @ 5f532f07
......@@ -41,7 +41,7 @@ function boost_admin_performance_page_submit($form, &$form_state) {
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_page() {
'#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 (<a href="@blocks">Enable</a> the <a href="@status">Boost: Pages cache status</a> 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_page() {
'#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 exits" 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_page() {
$form['htaccess'] = array(
'#type' => 'fieldset',
'#title' => t('Boost Apache .htaccess settings generation'),
'#description' => t('<a href="!link">Explanation of .htaccess variables</a> <br><br> <strong>Be sure to save the configuration and then go to the <a href="!rules">htaccess rules generation page</a> and copy the rules.</strong>', array('!link' => url('http://www.askapache.com/htaccess/mod_rewrite-variables-cheatsheet.html'), '!rules' => url('admin/settings/performance/boost-rules'))),
'#description' => t('<a href="!link">Explanation of .htaccess variables</a> <br /><br /> <strong>Be sure to save the configuration and then go to the <a href="!rules">htaccess rules generation page</a> and copy the rules.</strong>', 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_page() {
$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_page() {
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 = FALSE) {
/**
* 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 <a href="@link">boost advanced settings</a> & 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 <a href="@link">boost advanced settings</a> & 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_submit () {
/**
* 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;
}
......
boost.install
View file @ 5f532f07
......@@ -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 <a href="@url">poormanscron</a>, most likely the latest dev.', array('@url' => "http://drupal.org/project/poormanscron")),
'description' => $t('You need to get a newer version of <a href="@url">poormanscron</a>, 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 '.
'<a href="!url">language negotiation</a> 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 <a href="!url">language negotiation</a> 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();
......
boost.module
View file @ 5f532f07
This diff is collapsed.
boost.test
View file @ 5f532f07
<?php
// $Id$
/**
* @file
* Boost unit testings; currently very incomplete.
*/
//////////////////////////////////////////////////////////////////////////////
// Unit tests for Simpletest 2.x
......
stats/boost_stats.ajax.inc
View file @ 5f532f07
<?php
// $Id$
/**
* @file
* Boost & core stats logic
*/
/**
* AJAX Menu Callback.
*/
function boost_stats_ajax_callback() {
if (!isset($_GET['js'])) {
// stats not called via JS, send image out & close connection.
boost_async_opp('1px image', TRUE, 'image/gif');
boost_async_opp("\x47\x49\x46\x38\x39\x61\x1\x0\x1\x0\x80\xff\x0\xc0\xc0\xc0\x0\x0\x0\x21\xf9\x4\x1\x0\x0\x0\x0\x2c\x0\x0\x0\x0\x1\x0\x1\x0\x0\x2\x2\x44\x1\x0\x3b", TRUE, 'image/gif', 43);
}
// Exit if nothing was passed to this.
......
stats/boost_stats.php
View file @ 5f532f07
<?php
// $Id$
/**
* @file
* Place in webroot, for faster stats if needed.
*/
if (!isset($_GET['js'])) {
// stats not called via JS, send image out & close connection.
boost_stats_async_image();
......
translations/boost.pot
View file @ 5f532f07
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment