Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Roll-back of #242873: This caused horrendous problems with SimpleTest on some configurations.

merge-requests/26/head
Angie Byron 2008-10-12 06:27:06 +00:00
parent f76acb2d9d
commit a3a420c3e6
29 changed files with 64 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/batch.inc
View File

@ -80,10 +80,10 @@ function _batch_start() {
function _batch_progress_page_js() {
$batch = batch_get();
// The first batch set gets to set the page title and the initialization and
// error messages. Only safe strings should be passed in to batch_set().
// The first batch set gets to set the page title
// and the initialization and error messages.
$current_set = _batch_current_set();
drupal_set_title($current_set['title'], PASS_THROUGH);
drupal_set_title($current_set['title']);
drupal_add_js('misc/progress.js', 'core', 'header', FALSE, FALSE);
$url = url($batch['url'], array('query' => array('id' => $batch['id'])));
@ -126,7 +126,7 @@ function _batch_progress_page_nojs() {
$batch =& batch_get();
$current_set = _batch_current_set();
drupal_set_title($current_set['title'], PASS_THROUGH);
drupal_set_title($current_set['title']);
$new_op = 'do_nojs';

20
includes/bootstrap.inc
View File

@ -185,26 +185,6 @@ define('LANGUAGE_NEGOTIATION_DOMAIN', 3);
*/
define('REQUEST_TIME', $_SERVER['REQUEST_TIME']);
/**
* @name Title text filtering flags
* @{
* Flags for use in drupal_set_title().
*/
/**
* Flag for drupal_set_title(); text is not sanitized, so run check_plain().
*/
define('CHECK_PLAIN', 0);
/**
* Flag for drupal_set_title(); text has already been sanitized.
*/
define('PASS_THROUGH', -1);
/**
* @} End of "Title text filtering flags".
*/
/**
* Start the timer with the specified name. If you start and stop
* the same timer multiple times, the measured intervals will be

21
includes/common.inc
View File

@ -24,6 +24,27 @@ define('SAVED_UPDATED', 2);
*/
define('SAVED_DELETED', 3);
/**
* @name Title text filtering flags
* @{
* Flags for use in drupal_set_title().
*/
/**
* Flag for drupal_set_title(); text is not sanitized, so run check_plain().
*/
define('CHECK_PLAIN', 0);
/**
* Flag for drupal_set_title(); text has already been sanitized.
*/
define('PASS_THROUGH', -1);
/**
* @} End of "Title text filtering flags".
*/
/**
* Set content for a specified region.
*

5
includes/form.inc
View File

@ -2379,11 +2379,6 @@ function form_clean_id($id = NULL, $flush = FALSE) {
* batch_process();
* @endcode
*
* Note - if the batch 'title', 'init_message', 'progress_message',
* or 'error_message' could contain any user input, it is the responsibility of
* the code calling batch_set() to sanitize them first with a function like
* check_plain() or filter_xss().
*
* Sample batch operations:
* @code
* // Simple and artificial: load a node of a given type for a given user

9
includes/path.inc
View File

@ -196,20 +196,15 @@ function drupal_get_title() {
* @param $title
* Optional string value to assign to the page title; or if set to NULL
* (default), leaves the current title unchanged.
* @param $output
* Optional flag - normally should be left as CHECK_PLAIN. Only set to
* PASS_THROUGH if you have already removed any possibly dangerous code
* from $title using a function like check_plain() or filter_xss(). With this
* flag the string will be passed through unchanged.
*
* @return
* The updated title of the current page.
*/
function drupal_set_title($title = NULL, $output = CHECK_PLAIN) {
function drupal_set_title($title = NULL) {
static $stored_title;
if (isset($title)) {
$stored_title = ($output == PASS_THROUGH) ? $title : check_plain($title);
$stored_title = $title;
}
return $stored_title;
}

2
modules/aggregator/aggregator.pages.inc
View File

@ -37,7 +37,7 @@ function aggregator_page_source($arg1, $arg2 = NULL) {
// $arg1 is $form_state and $arg2 is $feed. Otherwise, $arg1 is $feed.
$feed = is_array($arg2) ? $arg2 : $arg1;
$feed = (object)$feed;
drupal_set_title($feed->title);
drupal_set_title(check_plain($feed->title));
$feed_source = theme('aggregator_feed_source', $feed);
// It is safe to include the fid in the query because it's loaded from the

2
modules/block/block.admin.inc
View File

@ -174,7 +174,7 @@ function block_admin_configure(&$form_state, $module = NULL, $delta = 0) {
// Get the block subject for the page title.
$info = module_invoke($module, 'block', 'list');
if (isset($info[$delta])) {
drupal_set_title(t("'%name' block", array('%name' => $info[$delta]['info'])), PASS_THROUGH);
drupal_set_title(t("'%name' block", array('%name' => $info[$delta]['info'])));
}
// Standard block configurations.

2
modules/blog/blog.pages.inc
View File

@ -12,7 +12,7 @@
function blog_page_user($account) {
global $user;
drupal_set_title($title = t("@name's blog", array('@name' => $account->name)), PASS_THROUGH);
drupal_set_title($title = t("@name's blog", array('@name' => $account->name)));
$items = array();

2
modules/book/book.admin.inc
View File

@ -70,7 +70,7 @@ function book_admin_settings_validate($form, &$form_state) {
* @ingroup forms.
*/
function book_admin_edit($form_state, $node) {
drupal_set_title($node->title);
drupal_set_title(check_plain($node->title));
$form = array();
$form['#node'] = $node;
_book_admin_table($node, $form);

2
modules/book/book.pages.inc
View File

@ -90,7 +90,7 @@ function book_export_html($nid) {
* Menu callback; show the outline form for a single node.
*/
function book_outline($node) {
drupal_set_title($node->title);
drupal_set_title(check_plain($node->title));
return drupal_get_form('book_outline_form', $node);
}

2
modules/comment/comment.module
View File

@ -1442,7 +1442,7 @@ function comment_form_box($edit, $title = NULL) {
function comment_form_add_preview($form, &$form_state) {
global $user;
$edit = $form_state['values'];
drupal_set_title(t('Preview comment'), PASS_THROUGH);
drupal_set_title(t('Preview comment'));
$output = '';
$node = node_load($edit['nid']);

2
modules/contact/contact.pages.inc
View File

@ -164,7 +164,7 @@ function contact_user_page($account) {
$output = t("You cannot send more than %number messages per hour. Please try again later.", array('%number' => variable_get('contact_hourly_threshold', 3)));
}
else {
drupal_set_title($account->name);
drupal_set_title(check_plain($account->name));
$output = drupal_get_form('contact_mail_user', $account);
}

6
modules/filter/filter.admin.inc
View File

@ -94,7 +94,7 @@ function theme_filter_admin_overview($form) {
*/
function filter_admin_format_page($format = NULL) {
if (!isset($format->name)) {
drupal_set_title(t('Add input format'), PASS_THROUGH);
drupal_set_title(t("Add input format"));
$format = (object)array('name' => '', 'roles' => '', 'format' => '');
}
return drupal_get_form('filter_admin_format_form', $format);
@ -302,7 +302,7 @@ function filter_admin_delete_submit($form, &$form_state) {
* Menu callback; display settings defined by a format's filters.
*/
function filter_admin_configure_page($format) {
drupal_set_title(t("Configure %format", array('%format' => $format->name)), PASS_THROUGH);
drupal_set_title(t("Configure %format", array('%format' => $format->name)));
return drupal_get_form('filter_admin_configure', $format);
}
@ -343,7 +343,7 @@ function filter_admin_configure_submit($form, &$form_state) {
* Menu callback; display form for ordering filters for a format.
*/
function filter_admin_order_page($format) {
drupal_set_title(t("Rearrange %format", array('%format' => $format->name)), PASS_THROUGH);
drupal_set_title(t("Rearrange %format", array('%format' => $format->name)));
return drupal_get_form('filter_admin_order', $format);
}

4
modules/forum/forum.module
View File

@ -723,7 +723,7 @@ function template_preprocess_forums(&$variables) {
}
}
drupal_set_breadcrumb($breadcrumb);
drupal_set_title($title);
drupal_set_title(check_plain($title));
if ($variables['forums_defined'] = count($variables['forums']) || count($variables['parents'])) {
// Format the "post new content" links listing.
@ -784,7 +784,7 @@ function template_preprocess_forums(&$variables) {
}
else {
drupal_set_title(t('No forums defined'), PASS_THROUGH);
drupal_set_title(t('No forums defined'));
$variables['links'] = array();
$variables['forums'] = '';
$variables['topics'] = '';

4
modules/node/node.module
View File

@ -1142,7 +1142,7 @@ function node_build_content($node, $teaser = FALSE, $page = FALSE) {
*/
function node_show($node, $cid, $message = FALSE) {
if ($message) {
drupal_set_title(t('Revision of %title from %date', array('%title' => $node->title, '%date' => format_date($node->revision_timestamp))), PASS_THROUGH);
drupal_set_title(t('Revision of %title from %date', array('%title' => $node->title, '%date' => format_date($node->revision_timestamp))));
}
$output = node_view($node, FALSE, TRUE);
@ -1857,7 +1857,7 @@ function node_page_default() {
* Menu callback; view a single node.
*/
function node_page_view($node, $cid = NULL) {
drupal_set_title($node->title);
drupal_set_title(check_plain($node->title));
return node_show($node, $cid);
}

8
modules/node/node.pages.inc
View File

@ -11,7 +11,7 @@
* Menu callback; presents the node editing form, or redirects to delete confirmation.
*/
function node_page_edit($node) {
drupal_set_title($node->title);
drupal_set_title(check_plain($node->title));
return drupal_get_form($node->type . '_node_form', $node);
}
@ -59,7 +59,7 @@ function node_add($type) {
// Initialize settings:
$node = array('uid' => $user->uid, 'name' => (isset($user->name) ? $user->name : ''), 'type' => $type, 'language' => '');
drupal_set_title(t('Create @name', array('@name' => $types[$type]->name)), PASS_THROUGH);
drupal_set_title(t('Create @name', array('@name' => $types[$type]->name)));
$output = drupal_get_form($type . '_node_form', $node);
}
@ -381,7 +381,7 @@ function node_preview($node) {
$cloned_node->build_mode = NODE_BUILD_PREVIEW;
$output = theme('node_preview', $cloned_node);
}
drupal_set_title(t('Preview'), PASS_THROUGH);
drupal_set_title(t('Preview'));
return $output;
}
@ -504,7 +504,7 @@ function node_delete_confirm_submit($form, &$form_state) {
* Generate an overview table of older revisions of a node.
*/
function node_revision_overview($node) {
drupal_set_title(t('Revisions for %title', array('%title' => $node->title)), PASS_THROUGH);
drupal_set_title(t('Revisions for %title', array('%title' => $node->title)));
$header = array(t('Revision'), array('data' => t('Operations'), 'colspan' => 2));

2
modules/openid/openid.pages.inc
View File

@ -28,7 +28,7 @@ function openid_authentication_page() {
* Menu callback; Manage OpenID identities for the specified user.
*/
function openid_user_identities($account) {
drupal_set_title($account->name);
drupal_set_title(check_plain($account->name));
drupal_add_css(drupal_get_path('module', 'openid') . '/openid.css', 'module');
// Check to see if we got a response

2
modules/path/path.admin.inc
View File

@ -66,7 +66,7 @@ function path_admin_overview($keys = NULL) {
function path_admin_edit($pid = 0) {
if ($pid) {
$alias = path_load($pid);
drupal_set_title($alias['dst']);
drupal_set_title(check_plain($alias['dst']));
$output = drupal_get_form('path_admin_form', $alias);
}
else {

4
modules/poll/poll.pages.inc
View File

@ -28,7 +28,7 @@ function poll_page() {
* Callback for the 'votes' tab for polls you can see other votes on
*/
function poll_votes($node) {
drupal_set_title($node->title);
drupal_set_title(check_plain($node->title));
$output = t('This table lists all the recorded votes for this poll. If anonymous users are allowed to vote, they will be identified by the IP address of the computer they used when they voted.');
$header[] = array('data' => t('Visitor'), 'field' => 'u.name');
@ -51,7 +51,7 @@ function poll_votes($node) {
* Callback for the 'results' tab for polls you can vote on
*/
function poll_results($node) {
drupal_set_title($node->title);
drupal_set_title(check_plain($node->title));
$node->show_results = TRUE;
return node_show($node, 0);
}

4
modules/profile/profile.admin.inc
View File

@ -175,7 +175,7 @@ function profile_field_form(&$form_state, $arg = NULL) {
drupal_not_found();
return;
}
drupal_set_title(t('edit %title', array('%title' => $edit['title'])), PASS_THROUGH);
drupal_set_title(t('edit %title', array('%title' => $edit['title'])));
$form['fid'] = array('#type' => 'value',
'#value' => $fid,
);
@ -193,7 +193,7 @@ function profile_field_form(&$form_state, $arg = NULL) {
return;
}
$type = $arg;
drupal_set_title(t('add new %type', array('%type' => $types[$type])), PASS_THROUGH);
drupal_set_title(t('add new %type', array('%type' => $types[$type])));
$edit = array('name' => 'profile_');
$form['type'] = array('#type' => 'value', '#value' => $type);
}

4
modules/profile/profile.pages.inc
View File

@ -73,7 +73,7 @@ function profile_browse() {
$title = check_plain($field->page);
}
drupal_set_title($title, PASS_THROUGH);
drupal_set_title($title);
return $output;
}
elseif ($name && !$field->fid) {
@ -99,7 +99,7 @@ function profile_browse() {
$output = theme('profile_wrapper', $content);
$output .= theme('pager', NULL, 20);
drupal_set_title(t('User list'), PASS_THROUGH);
drupal_set_title(t('User list'));
return $output;
}
}

6
modules/statistics/statistics.admin.inc
View File

@ -64,7 +64,7 @@ function statistics_top_pages() {
$rows[] = array(array('data' => t('No statistics available.'), 'colspan' => 4));
}
drupal_set_title(t('Top pages in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))), PASS_THROUGH);
drupal_set_title(t('Top pages in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
$output = theme('table', $header, $rows);
$output .= theme('pager', NULL, 30, 0);
return $output;
@ -97,7 +97,7 @@ function statistics_top_visitors() {
$rows[] = array(array('data' => t('No statistics available.'), 'colspan' => 4));
}
drupal_set_title(t('Top visitors in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))), PASS_THROUGH);
drupal_set_title(t('Top visitors in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
$output = theme('table', $header, $rows);
$output .= theme('pager', NULL, 30, 0);
return $output;
@ -109,7 +109,7 @@ function statistics_top_visitors() {
function statistics_top_referrers() {
$query = "SELECT url, COUNT(url) AS hits, MAX(timestamp) AS last FROM {accesslog} WHERE url NOT LIKE :host AND url <> '' GROUP BY url";
$query_cnt = "SELECT COUNT(DISTINCT(url)) FROM {accesslog} WHERE url <> '' AND url NOT LIKE :host";
drupal_set_title(t('Top referrers in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))), PASS_THROUGH);
drupal_set_title(t('Top referrers in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
$header = array(
array('data' => t('Hits'), 'field' => 'hits', 'sort' => 'desc'),

4
modules/statistics/statistics.pages.inc
View File

@ -29,7 +29,7 @@ function statistics_node_tracker() {
$rows[] = array(array('data' => t('No statistics available.'), 'colspan' => 4));
}
drupal_set_title($node->title);
drupal_set_title(check_plain($node->title));
$output = theme('table', $header, $rows);
$output .= theme('pager', NULL, 30, 0);
return $output;
@ -60,7 +60,7 @@ function statistics_user_tracker() {
$rows[] = array(array('data' => t('No statistics available.'), 'colspan' => 3));
}
drupal_set_title($account->name);
drupal_set_title(check_plain($account->name));
$output = theme('table', $header, $rows);
$output .= theme('pager', NULL, 30, 0);
return $output;

7
modules/system/system.module
View File

@ -1296,11 +1296,6 @@ function system_node_type($op, $info) {
* confirmed the action. You should never directly inspect $_POST to see if an
* action was confirmed.
*
* Note - if the parameters $question, $description, $yes, or $no could contain
* any user input (such as node titles or taxonomy terms), it is the
* responsibility of the code calling confirm_form() to sanitize them first with
* a function like check_plain() or filter_xss().
*
* @ingroup forms
* @param $form
* Additional elements to inject into the form, for example hidden elements.
@ -1334,7 +1329,7 @@ function confirm_form($form, $question, $path, $description = NULL, $yes = NULL,
}
$cancel = l($no ? $no : t('Cancel'), $path, array('query' => $query, 'fragment' => $fragment));
drupal_set_title($question, PASS_THROUGH);
drupal_set_title($question);
// Confirm form fails duplication check, as the form values rarely change -- so skip it.
$form['#skip_duplicate_check'] = TRUE;

65
modules/system/system.test
View File

@ -467,68 +467,3 @@ class PageNotFoundTestCase extends DrupalWebTestCase {
$this->assertNoText(t('User login'), t('Blocks are not shown on the default 404 page'));
}
}
class PageTitleFiltering extends DrupalWebTestCase {
protected $content_user;
protected $saved_title;
/**
* Implementation of getInfo().
*/
function getInfo() {
return array(
'name' => t('HTML in page titles'),
'description' => t('Tests correct handling or conversion by drupal_set_title() and drupal_get_title().'),
'group' => t('System')
);
}
/**
* Implementation of setUp().
*/
function setUp() {
parent::setUp();
$this->content_user = $this->drupalCreateUser(array('create page content', 'access content'));
$this->drupalLogin($this->content_user);
$this->saved_title = drupal_get_title();
}
/**
* Reset page title.
*/
function tearDown() {
// Restore the page title.
drupal_set_title($this->saved_title, PASS_THROUGH);
parent::tearDown();
}
/**
* Tests the handling of HTML by drupal_set_title() and drupal_get_title()
*/
function testTitleTags() {
$title = "string with <em>HTML</em>";
// drupal_set_title's $filter is CHECK_PLAIN by default, so the title should be
// returned with check_plain().
drupal_set_title($title, CHECK_PLAIN);
$this->assertTrue(strpos(drupal_get_title(), '<em>') === FALSE, t('Tags in title converted to entities when $output is CHECK_PLAIN.'));
// drupal_set_title's $filter is passed as PASS_THROUGH, so the title should be
// returned with HTML.
drupal_set_title($title, PASS_THROUGH);
$this->assertTrue(strpos(drupal_get_title(), '<em>') !== FALSE, t('Tags in title are not converted to entities when $output is PASS_THROUGH.'));
// Generate node content.
$edit = array(
'title' => '!SimpleTest! ' . $title . $this->randomName(20),
'body' => '!SimpleTest! test body' . $this->randomName(200),
);
// Create the node with HTML in the title.
$this->drupalPost('node/add/page', $edit, t('Save'));
$node = node_load(array('title' => $edit['title']));
$this->assertNotNull($node, 'Node created and found in database');
$this->drupalGet("node/" . $node->nid);
$this->assertText(check_plain($edit['title']), 'Check to make sure tags in the node title are converted.');
}
}

2
modules/taxonomy/taxonomy.pages.inc
View File

@ -112,7 +112,7 @@ function theme_taxonomy_term_page($tids, $result) {
*/
function taxonomy_term_edit($term) {
if (isset($term)) {
drupal_set_title($term->name);
drupal_set_title(check_plain($term->name));
return drupal_get_form('taxonomy_form_term', taxonomy_vocabulary_load($term->vid), (array)$term);
}
return drupal_not_found();

2
modules/tracker/tracker.pages.inc
View File

@ -19,7 +19,7 @@ function tracker_page($account = NULL, $set_title = FALSE) {
// When viewed from user/%user/track, display the name of the user
// as page title -- the tab title remains Track so this needs to be done
// here and not in the menu definiton.
drupal_set_title($account->name);
drupal_set_title(check_plain($account->name));
}
// TODO: These queries are very expensive, see http://drupal.org/node/105639
$sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, GREATEST(n.changed, l.last_comment_timestamp) AS last_updated, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d) ORDER BY last_updated DESC';

2
modules/translation/translation.pages.inc
View File

@ -54,6 +54,6 @@ function translation_node_overview($node) {
$rows[] = array($language_name, $title, $status, implode(" | ", $options));
}
drupal_set_title(t('Translations of %title', array('%title' => $node->title)), PASS_THROUGH);
drupal_set_title(t('Translations of %title', array('%title' => $node->title)));
return theme('table', $header, $rows);
}

4
modules/user/user.pages.inc
View File

@ -147,7 +147,7 @@ function user_logout() {
* Menu callback; Displays a user or user profile page.
*/
function user_view($account) {
drupal_set_title($account->name);
drupal_set_title(check_plain($account->name));
// Retrieve all profile fields and attach to $account->content.
user_build_content($account);
@ -218,7 +218,7 @@ function template_preprocess_user_profile_category(&$variables) {
* @see user_edit_submit()
*/
function user_edit($account, $category = 'account') {
drupal_set_title($account->name);
drupal_set_title(check_plain($account->name));
return drupal_get_form('user_profile_form', $account, $category);
}