'. t('If the site is experiencing problems with permissions to content, you may have to rebuild the permissions cache. Possible causes for permission problems are disabling modules or configuration changes to permissions. Rebuilding will remove all privileges to posts, and replace them with permissions based on the current modules and settings.') .'
'; - $status .= ''. t('Rebuilding may take some time if there is a lot of content or complex permission settings. After rebuilding has completed posts will automatically use the new permissions.') .'
'; - - $form['access'] = array( - '#type' => 'fieldset', - '#title' => t('Node access status'), - ); - $form['access']['status'] = array('#value' => $status); - $form['access']['rebuild'] = array( - '#type' => 'submit', - '#value' => t('Rebuild permissions'), - '#submit' => array('node_configure_access_submit'), - ); - } + $status = ''. t('If the site is experiencing problems with permissions to content, you may have to rebuild the permissions cache. Possible causes for permission problems are disabling modules or configuration changes to permissions. Rebuilding will remove all privileges to posts, and replace them with permissions based on the current modules and settings.') .'
'; + $status .= ''. t('Rebuilding may take some time if there is a lot of content or complex permission settings. After rebuilding has completed posts will automatically use the new permissions.') .'
'; + + $form['access'] = array( + '#type' => 'fieldset', + '#title' => t('Node access status'), + ); + $form['access']['status'] = array('#value' => $status); + $form['access']['rebuild'] = array( + '#type' => 'submit', + '#value' => t('Rebuild permissions'), + '#submit' => array('node_configure_access_submit'), + ); $form['default_nodes_main'] = array( '#type' => 'select', '#title' => t('Number of posts on main page'), '#default_value' => variable_get('default_nodes_main', 10), diff --git a/modules/openid/openid.module b/modules/openid/openid.module index c8c5063..8ae0539 100644 --- a/modules/openid/openid.module +++ b/modules/openid/openid.module @@ -1,5 +1,5 @@ '. t('This site supports OpenID, a secure way to log into many websites using a single username and password. OpenID can reduce the necessity of managing many usernames and passwords for many websites.', array('@openid-net' => url('http://openid.net'))) .''; - $output .= ''. t('To use OpenID you must first establish an identity on a public or private OpenID server. If you do not have an OpenID and would like one, look into one of the free public providers. You can find out more about OpenID at this website.', array('@openid-providers' => url('http://openid.net/wiki/index.php/OpenIDServers'), '@openid-net' => url('http://openid.net'))) .'
'; + $output = ''. t('This site supports OpenID, a secure way to log into many websites using a single username and password. OpenID can reduce the necessity of managing many usernames and passwords for many websites.', array('@openid-net' => 'http://openid.net')) .'
'; + $output .= ''. t('To use OpenID you must first establish an identity on a public or private OpenID server. If you do not have an OpenID and would like one, look into one of the free public providers. You can find out more about OpenID at this website.', array('@openid-providers' => 'http://openid.net/get/', '@openid-net' => 'http://openid.net')) .'
'; $output .= ''. t('If you already have an OpenID, enter the URL to your OpenID server below (e.g. myusername.openidprovider.com). Next time you login, you will be able to use this URL instead of a regular username and password. You can have multiple OpenID servers if you like; just keep adding them here.') .'
'; return $output; diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index e3f5b6b..ad0e5f6 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -1,5 +1,5 @@ 'int', + 'size' => 'small', + 'not null' => TRUE, + 'default' => FILTER_FORMAT_DEFAULT, + 'description' => 'The {filter_formats}.format of the signature.', + ); + + db_add_field($ret, 'users', 'signature_format', $schema); + + // Set the format of existing signatures to the current default input format. + if ($current_default_filter = variable_get('filter_default_format', 0)) { + $ret[] = update_sql("UPDATE {users} SET signature_format = ". $current_default_filter); + } + + drupal_set_message("User signatures no longer inherit comment input formats. Each user's signature now has its own associated format that can be selected on the user's account page. Existing signatures have been set to your site's default input format."); + } + + return $ret; +} + +/** * @} End of "defgroup updates-6.x-extra" * The next series of updates should start at 7000. */ diff --git a/modules/system/system.module b/modules/system/system.module index deb0f55..259517d 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -1,5 +1,5 @@ 'cron', - 'op' => '', + 'op' => 'run', ); // Cron does not act on any specific object. $object = NULL; diff --git a/modules/update/update.compare.inc b/modules/update/update.compare.inc index 7206999..b9f88a0 100644 --- a/modules/update/update.compare.inc +++ b/modules/update/update.compare.inc @@ -1,5 +1,5 @@ t('This project is no longer supported, and is no longer available for download. Disabling everything included by this project is strongly recommended!'), ); break; + case 'not-fetched': + $projects[$project]['status'] = UPDATE_NOT_FETCHED; + $projects[$project]['reason'] = t('Failed to fetch available update data'); + break; + default: // Assume anything else (e.g. 'published') is valid and we should // perform the rest of the logic in this function. diff --git a/modules/update/update.fetch.inc b/modules/update/update.fetch.inc index d1fb74c..961a512 100644 --- a/modules/update/update.fetch.inc +++ b/modules/update/update.fetch.inc @@ -1,5 +1,5 @@ $project) { $url = _update_build_fetch_url($project, $site_key); - $xml = drupal_http_request($url); - if (isset($xml->data)) { - $data[] = $xml->data; + $fetch_url_base = _update_get_fetch_url_base($project); + if (empty($fail[$fetch_url_base]) || count($fail[$fetch_url_base]) < $max_fetch_attempts) { + $xml = drupal_http_request($url); + if (isset($xml->data)) { + $data[] = $xml->data; + } + else { + // Connection likely broken; prepare to give up. + $fail[$fetch_url_base][$key] = 1; + } + } + else { + // Didn't bother trying to fetch. + $fail[$fetch_url_base][$key] = 1; } } @@ -58,14 +71,21 @@ function _update_refresh() { $available = $parser->parse($data); } if (!empty($available) && is_array($available)) { + // Record the projects where we failed to fetch data. + foreach ($fail as $fetch_url_base => $failures) { + foreach ($failures as $key => $value) { + $available[$key]['project_status'] = 'not-fetched'; + } + } $frequency = variable_get('update_check_frequency', 1); _update_cache_set('update_available_releases', $available, time() + (60 * 60 * 24 * $frequency)); - variable_set('update_last_check', time()); - watchdog('update', 'Fetched information about all available new releases and updates.', array(), WATCHDOG_NOTICE, l(t('view'), 'admin/reports/updates')); + watchdog('update', 'Attempted to fetch information about all available new releases and updates.', array(), WATCHDOG_NOTICE, l(t('view'), 'admin/reports/updates')); } else { watchdog('update', 'Unable to fetch any information about available new releases and updates.', array(), WATCHDOG_ERROR, l(t('view'), 'admin/reports/updates')); } + // Whether this worked or not, we did just (try to) check for updates. + variable_set('update_last_check', time()); return $available; } @@ -85,14 +105,13 @@ function _update_refresh() { * @see update_get_projects() */ function _update_build_fetch_url($project, $site_key = '') { - $default_url = variable_get('update_fetch_url', UPDATE_DEFAULT_URL); - if (!isset($project['info']['project status url'])) { - $project['info']['project status url'] = $default_url; - } $name = $project['name']; - $url = $project['info']['project status url']; + $url = _update_get_fetch_url_base($project); $url .= '/'. $name .'/'. DRUPAL_CORE_COMPATIBILITY; - if (!empty($site_key)) { + // Only append a site_key and the version information if we have a site_key + // in the first place, and if this is not a disabled module or theme. We do + // not want to record usage statistics for disabled code. + if (!empty($site_key) && (strpos($project['project_type'], 'disabled') === FALSE)) { $url .= (strpos($url, '?') === TRUE) ? '&' : '?'; $url .= 'site_key='; $url .= drupal_urlencode($site_key); @@ -105,6 +124,22 @@ function _update_build_fetch_url($project, $site_key = '') { } /** + * Return the base of the URL to fetch available update data for a project. + * + * @param $project + * The array of project information from update_get_projects(). + * @return + * The base of the URL used for fetching available update data. This does + * not include the path elements to specify a particular project, version, + * site_key, etc. + * + * @see _update_build_fetch_url() + */ +function _update_get_fetch_url_base($project) { + return isset($project['info']['project status url']) ? $project['info']['project status url'] : variable_get('update_fetch_url', UPDATE_DEFAULT_URL); +} + +/** * Perform any notifications that should be done once cron fetches new data. * * This method checks the status of the site using the new data and depending diff --git a/modules/update/update.module b/modules/update/update.module index 8d5981e..8978d1a 100644 --- a/modules/update/update.module +++ b/modules/update/update.module @@ -1,5 +1,5 @@ '', 'description' => "User's signature.", ), + 'signature_format' => array( + 'type' => 'int', + 'size' => 'small', + 'not null' => TRUE, + 'default' => 0, + 'description' => 'The {filter_formats}.format of the signature.', + ), 'created' => array( 'type' => 'int', 'not null' => TRUE, diff --git a/modules/user/user.module b/modules/user/user.module index e9bd2b8..298375d 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1,5 +1,5 @@ $edit['signature'], '#description' => t('Your signature will be publicly displayed at the end of your comments.'), ); + + // Prevent a "validation error" message when the user attempts to save with a default value they + // do not have access to. + if (!filter_access($edit['signature_format']) && empty($_POST)) { + drupal_set_message(t("The signature input format has been set to a format you don't have access to. It will be changed to a format you have access to when you save this page.")); + $edit['signature_format'] = FILTER_FORMAT_DEFAULT; + } + + $form['signature_settings']['signature_format'] = filter_form($edit['signature_format'], NULL, array('signature_format')); } // Picture/avatar: @@ -2031,7 +2040,7 @@ function user_comment(&$comment, $op) { // Validate signature. if ($op == 'view') { if (variable_get('user_signatures', 0) && !empty($comment->signature)) { - $comment->signature = check_markup($comment->signature, $comment->format); + $comment->signature = check_markup($comment->signature, $comment->signature_format, FALSE); } else { $comment->signature = ''; diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php index 91af133..666989f 100644 --- a/sites/default/default.settings.php +++ b/sites/default/default.settings.php @@ -1,5 +1,5 @@