? drupal-193897-23.patch ? drupal-193897-27.patch ? sites/default/files ? sites/default/settings.php Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.471 diff -u -p -r1.471 theme.inc --- includes/theme.inc 4 Apr 2009 00:58:09 -0000 1.471 +++ includes/theme.inc 15 Apr 2009 00:23:17 -0000 @@ -1671,7 +1671,7 @@ function theme_username($object) { $name = $object->name; } - if (user_access('access user profiles')) { + if (user_access('view user profiles')) { $output = l($name, 'user/' . $object->uid, array('attributes' => array('title' => t('View user profile.')))); } else { Index: modules/aggregator/aggregator.install =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.install,v retrieving revision 1.20 diff -u -p -r1.20 aggregator.install --- modules/aggregator/aggregator.install 22 Dec 2008 19:38:31 -0000 1.20 +++ modules/aggregator/aggregator.install 15 Apr 2009 00:23:17 -0000 @@ -259,10 +259,36 @@ function aggregator_schema() { } /** + * Drupal 6.x to 7.x updates. + */ + +/** * Add hash column to aggregator_feed table. */ function aggregator_update_7000() { $ret = array(); + db_add_field($ret, 'aggregator_feed', 'hash', array('type' => 'varchar', 'length' => 32, 'not null' => TRUE, 'default' => '')); + return $ret; } + +/** + * Update permissions to use new names. + */ +function aggregator_update_7001() { + $ret = array(); + + // Fix role permissions to account for the changed names. Setup the replace + // array which holds strings both the old and new permissions. + $replace = array( + 'access news feeds' => 'view news feeds', + ); + + // Loop over all the changes, performing necessary updates. + foreach ($replace as $old_permission => $new_permission) { + $ret[] = update_sql("UPDATE {role_permission} SET permission = '$new_permission' WHERE permission = '$old_permission'"); + } + + return $ret; +} \ No newline at end of file Index: modules/aggregator/aggregator.module =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v retrieving revision 1.405 diff -u -p -r1.405 aggregator.module --- modules/aggregator/aggregator.module 1 Mar 2009 07:21:02 -0000 1.405 +++ modules/aggregator/aggregator.module 15 Apr 2009 00:23:17 -0000 @@ -141,13 +141,13 @@ function aggregator_menu() { $items['aggregator'] = array( 'title' => 'Feed aggregator', 'page callback' => 'aggregator_page_last', - 'access arguments' => array('access news feeds'), + 'access arguments' => array('view news feeds'), 'weight' => 5, ); $items['aggregator/sources'] = array( 'title' => 'Sources', 'page callback' => 'aggregator_page_sources', - 'access arguments' => array('access news feeds'), + 'access arguments' => array('view news feeds'), ); $items['aggregator/categories'] = array( 'title' => 'Categories', @@ -157,13 +157,13 @@ function aggregator_menu() { $items['aggregator/rss'] = array( 'title' => 'RSS feed', 'page callback' => 'aggregator_page_rss', - 'access arguments' => array('access news feeds'), + 'access arguments' => array('view news feeds'), 'type' => MENU_CALLBACK, ); $items['aggregator/opml'] = array( 'title' => 'OPML feed', 'page callback' => 'aggregator_page_opml', - 'access arguments' => array('access news feeds'), + 'access arguments' => array('view news feeds'), 'type' => MENU_CALLBACK, ); $items['aggregator/categories/%aggregator_category'] = array( @@ -172,7 +172,7 @@ function aggregator_menu() { 'page callback' => 'aggregator_page_category', 'page arguments' => array(2), 'access callback' => 'user_access', - 'access arguments' => array('access news feeds'), + 'access arguments' => array('view news feeds'), ); $items['aggregator/categories/%aggregator_category/view'] = array( 'title' => 'View', @@ -197,7 +197,7 @@ function aggregator_menu() { $items['aggregator/sources/%aggregator_feed'] = array( 'page callback' => 'aggregator_page_source', 'page arguments' => array(2), - 'access arguments' => array('access news feeds'), + 'access arguments' => array('view news feeds'), 'type' => MENU_CALLBACK, ); $items['aggregator/sources/%aggregator_feed/view'] = array( @@ -262,7 +262,7 @@ function aggregator_init() { * TRUE if there is at least one category and the user has access to them, FALSE otherwise. */ function _aggregator_has_categories() { - return user_access('access news feeds') && db_query('SELECT COUNT(*) FROM {aggregator_category}')->fetchField(); + return user_access('view news feeds') && db_query('SELECT COUNT(*) FROM {aggregator_category}')->fetchField(); } /** @@ -274,8 +274,8 @@ function aggregator_perm() { 'title' => t('Administer news feeds'), 'description' => t('Add, edit or delete news feeds that are aggregated to your site.'), ), - 'access news feeds' => array( - 'title' => t('Access news feeds'), + 'view news feeds' => array( + 'title' => t('View news feeds'), 'description' => t('View aggregated news feed items.'), ), ); @@ -345,7 +345,7 @@ function aggregator_block_save($delta = * Generates blocks for the latest news items in each category and feed. */ function aggregator_block_view($delta = '') { - if (user_access('access news feeds')) { + if (user_access('view news feeds')) { $block = array(); list($type, $id) = explode('-', $delta); switch ($type) { Index: modules/aggregator/aggregator.test =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.test,v retrieving revision 1.22 diff -u -p -r1.22 aggregator.test --- modules/aggregator/aggregator.test 2 Apr 2009 20:50:37 -0000 1.22 +++ modules/aggregator/aggregator.test 15 Apr 2009 00:23:18 -0000 @@ -11,7 +11,7 @@ class AggregatorTestCase extends DrupalW function setUp() { parent::setUp('aggregator', 'aggregator_test'); - $web_user = $this->drupalCreateUser(array('administer news feeds', 'access news feeds', 'create article content')); + $web_user = $this->drupalCreateUser(array('administer news feeds', 'view news feeds', 'create article content')); $this->drupalLogin($web_user); } Index: modules/aggregator/tests/aggregator_test.module =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/tests/aggregator_test.module,v retrieving revision 1.1 diff -u -p -r1.1 aggregator_test.module --- modules/aggregator/tests/aggregator_test.module 2 Apr 2009 20:50:37 -0000 1.1 +++ modules/aggregator/tests/aggregator_test.module 15 Apr 2009 00:23:18 -0000 @@ -9,7 +9,7 @@ function aggregator_test_menu() { 'title' => 'Test feed static last modified date', 'description' => "A cached test feed with a static last modified date.", 'page callback' => 'aggregator_test_feed', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); return $items; Index: modules/block/block.test =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.test,v retrieving revision 1.14 diff -u -p -r1.14 block.test --- modules/block/block.test 31 Mar 2009 01:49:50 -0000 1.14 +++ modules/block/block.test 15 Apr 2009 00:23:18 -0000 @@ -16,7 +16,7 @@ class BlockTestCase extends DrupalWebTes parent::setUp(); // Create and login user - $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer filters', 'access administration pages')); + $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer filters', 'use administration pages')); $this->drupalLogin($admin_user); // Define the existing regions Index: modules/blog/blog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v retrieving revision 1.317 diff -u -p -r1.317 blog.module --- modules/blog/blog.module 8 Mar 2009 04:25:03 -0000 1.317 +++ modules/blog/blog.module 15 Apr 2009 00:23:18 -0000 @@ -119,7 +119,7 @@ function blog_menu() { $items['blog'] = array( 'title' => 'Blogs', 'page callback' => 'blog_page_last', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_SUGGESTED_ITEM, ); $items['blog/%user_uid_optional'] = array( @@ -140,7 +140,7 @@ function blog_menu() { $items['blog/feed'] = array( 'title' => 'Blogs', 'page callback' => 'blog_feed_last', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); @@ -154,7 +154,7 @@ function blog_page_user_access($account) // The visitor must be able to access the site's content. // For a blog to 'exist' the user must either be able to // create new blog entries, or it must have existing posts. - return $account->uid && user_access('access content') && (user_access('create blog content', $account) || _blog_post_exists($account)); + return $account->uid && user_access('view content') && (user_access('create blog content', $account) || _blog_post_exists($account)); } /** @@ -180,7 +180,7 @@ function blog_block_list() { function blog_block_view($delta = '') { global $user; - if (user_access('access content')) { + if (user_access('view content')) { $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0, 10); if ($node_title_list = node_title_list($result)) { $block['content'] = $node_title_list; Index: modules/blog/blog.test =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.test,v retrieving revision 1.9 diff -u -p -r1.9 blog.test --- modules/blog/blog.test 3 Apr 2009 20:24:57 -0000 1.9 +++ modules/blog/blog.test 15 Apr 2009 00:23:18 -0000 @@ -22,7 +22,7 @@ class BlogTestCase extends DrupalWebTest // Create users. $this->big_user = $this->drupalCreateUser(array('administer blocks')); $this->own_user = $this->drupalCreateUser(array('create blog content', 'edit own blog content', 'delete own blog content')); - $this->any_user = $this->drupalCreateUser(array('create blog content', 'edit any blog content', 'delete any blog content', 'access administration pages')); + $this->any_user = $this->drupalCreateUser(array('create blog content', 'edit any blog content', 'delete any blog content', 'use administration pages')); } /** @@ -60,7 +60,7 @@ class BlogTestCase extends DrupalWebTest * @param object $user * The logged in user. * @param boolean $admin - * User has 'access administration pages' privilege. + * User has 'use administration pages' privilege. */ private function doBasicTests($user, $admin) { // Login the user. @@ -81,7 +81,7 @@ class BlogTestCase extends DrupalWebTest * @param object $node * A node object. * @param boolean $admin - * User has 'access administration pages' privilege. + * User has 'use administration pages' privilege. * @param integer $response * HTTP response code. */ Index: modules/blogapi/blogapi.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.module,v retrieving revision 1.147 diff -u -p -r1.147 blogapi.module --- modules/blogapi/blogapi.module 1 Apr 2009 01:28:24 -0000 1.147 +++ modules/blogapi/blogapi.module 15 Apr 2009 00:23:18 -0000 @@ -815,7 +815,7 @@ function blogapi_menu() { $items['blogapi/rsd'] = array( 'title' => 'RSD', 'page callback' => 'blogapi_rsd', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); $items['admin/settings/blogapi'] = array( Index: modules/book/book.install =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.install,v retrieving revision 1.27 diff -u -p -r1.27 book.install --- modules/book/book.install 19 Jan 2009 10:46:50 -0000 1.27 +++ modules/book/book.install 15 Apr 2009 00:23:18 -0000 @@ -247,6 +247,29 @@ function book_update_6000() { } /** + * Drupal 6.x to 7.x update. + * + * Updates all roles to utilize the new permission names. + * + */ +function book_update_7000() { + $ret = array(); + + // Fix role permissions to account for the changed names. Setup the replace + // array which holds strings both the old and new permissions. + $replace = array( + 'access printer-friendly version' => 'view printer-friendly version', + ); + + // Loop over all the changes, performing necessary updates. + foreach ($replace as $old_permission => $new_permission) { + $ret[] = update_sql("UPDATE {role_permission} SET permission = '$new_permission' WHERE permission = '$old_permission'"); + } + + return $ret; +} + +/** * Implementation of hook_schema(). */ function book_schema() { Index: modules/book/book.module =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.module,v retrieving revision 1.489 diff -u -p -r1.489 book.module --- modules/book/book.module 11 Apr 2009 22:19:44 -0000 1.489 +++ modules/book/book.module 15 Apr 2009 00:23:18 -0000 @@ -53,8 +53,8 @@ function book_perm() { 'title' => t('Add content to books'), 'description' => t('Add new content and child pages to books.'), ), - 'access printer-friendly version' => array( - 'title' => t('Access printer-friendly version'), + 'view printer-friendly version' => array( + 'title' => t('View printer-friendly version'), 'description' => t('View a book page and all of its sub-pages as a single document for ease of printing. Can be performance heavy.'), ), ); @@ -77,7 +77,7 @@ function book_node_view_link($node, $tea ); } - if (user_access('access printer-friendly version')) { + if (user_access('view printer-friendly version')) { $links['book_printer'] = array( 'title' => t('Printer-friendly version'), 'href' => 'book/export/html/' . $node->nid, @@ -128,13 +128,13 @@ function book_menu() { $items['book'] = array( 'title' => 'Books', 'page callback' => 'book_render', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_SUGGESTED_ITEM, ); $items['book/export/%/%'] = array( 'page callback' => 'book_export', 'page arguments' => array(2, 3), - 'access arguments' => array('access printer-friendly version'), + 'access arguments' => array('view printer-friendly version'), 'type' => MENU_CALLBACK, ); $items['node/%node/outline'] = array( @@ -156,7 +156,7 @@ function book_menu() { ); $items['book/js/form'] = array( 'page callback' => 'book_form_update', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); Index: modules/book/book.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.pages.inc,v retrieving revision 1.14 diff -u -p -r1.14 book.pages.inc --- modules/book/book.pages.inc 14 Mar 2009 20:13:26 -0000 1.14 +++ modules/book/book.pages.inc 15 Apr 2009 00:23:18 -0000 @@ -71,7 +71,7 @@ function book_export($type, $nid) { * the book hierarchy. */ function book_export_html($nid) { - if (user_access('access printer-friendly version')) { + if (user_access('view printer-friendly version')) { $export_data = array(); $node = node_load($nid); if (isset($node->book)) { Index: modules/book/book.test =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.test,v retrieving revision 1.8 diff -u -p -r1.8 book.test --- modules/book/book.test 31 Mar 2009 01:49:50 -0000 1.8 +++ modules/book/book.test 15 Apr 2009 00:23:18 -0000 @@ -22,7 +22,7 @@ class BookTestCase extends DrupalWebTest function testBook() { // Create users. $book_author = $this->drupalCreateUser(array('create new books', 'create book content', 'edit own book content', 'add content to books')); - $web_user = $this->drupalCreateUser(array('access printer-friendly version')); + $web_user = $this->drupalCreateUser(array('view printer-friendly version')); // Create new book. $this->drupalLogin($book_author); Index: modules/comment/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v retrieving revision 1.702 diff -u -p -r1.702 comment.module --- modules/comment/comment.module 11 Apr 2009 22:19:44 -0000 1.702 +++ modules/comment/comment.module 15 Apr 2009 00:23:19 -0000 @@ -242,8 +242,8 @@ function comment_perm() { 'title' => t('Administer comments'), 'description' => t('Manage and approve comments, and configure comment administration settings.'), ), - 'access comments' => array( - 'title' => t('Access comments'), + 'view comments' => array( + 'title' => t('View comments'), 'description' => t('View comments attached to content.'), ), 'post comments' => array( @@ -294,7 +294,7 @@ function comment_block_save($delta = '', * Generates a block with the most recent comments. */ function comment_block_view($delta = '') { - if (user_access('access comments')) { + if (user_access('view comments')) { $block['subject'] = t('Recent comments'); $block['content'] = theme('comment_block'); @@ -422,7 +422,7 @@ function comment_node_view($node, $tease if ($node->comment) { if ($teaser) { // Main page: display the number of comments that have been posted. - if (user_access('access comments')) { + if (user_access('view comments')) { if (!empty($node->comment_count)) { $links['comment_comments'] = array( 'title' => format_plural($node->comment_count, '1 comment', '@count comments'), @@ -1086,7 +1086,7 @@ function comment_render($node, $cid = 0) global $user; $output = ''; - if (user_access('access comments')) { + if (user_access('view comments')) { // Pre-process variables. $nid = $node->nid; if (empty($nid)) { Index: modules/comment/comment.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.pages.inc,v retrieving revision 1.16 diff -u -p -r1.16 comment.pages.inc --- modules/comment/comment.pages.inc 17 Mar 2009 12:41:54 -0000 1.16 +++ modules/comment/comment.pages.inc 15 Apr 2009 00:23:19 -0000 @@ -33,7 +33,7 @@ function comment_edit($cid) { * - replies to comments * - replies to nodes * - attempts to reply to nodes that can no longer accept comments - * - respecting access permissions ('access comments', 'post comments', etc.) + * - respecting access permissions ('view comments', 'post comments', etc.) * * The node or comment that is being replied to must appear above the comment * form to provide the user context while authoring the comment. @@ -54,7 +54,7 @@ function comment_reply($node, $pid = NUL $op = isset($_POST['op']) ? $_POST['op'] : ''; $output = ''; - if (user_access('access comments')) { + if (user_access('view comments')) { // The user is previewing a comment prior to submitting it. if ($op == t('Preview')) { if (user_access('post comments')) { @@ -91,7 +91,7 @@ function comment_reply($node, $pid = NUL } } // This is the case where the comment is in response to a node. Display the node. - elseif (user_access('access content')) { + elseif (user_access('view content')) { $output .= drupal_render(node_build($node)); } Index: modules/comment/comment.test =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.test,v retrieving revision 1.28 diff -u -p -r1.28 comment.test --- modules/comment/comment.test 31 Mar 2009 01:49:50 -0000 1.28 +++ modules/comment/comment.test 15 Apr 2009 00:23:19 -0000 @@ -10,7 +10,7 @@ class CommentHelperCase extends DrupalWe parent::setUp('comment'); // Create users. $this->admin_user = $this->drupalCreateUser(array('administer content types', 'administer comments', 'administer permissions', 'administer blocks')); - $this->web_user = $this->drupalCreateUser(array('access comments', 'post comments', 'create article content')); + $this->web_user = $this->drupalCreateUser(array('view comments', 'post comments', 'create article content')); $this->drupalLogin($this->web_user); $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1)); @@ -171,7 +171,7 @@ class CommentHelperCase extends DrupalWe */ function setAnonymousUserComment($enabled, $without_approval) { $edit = array(); - $edit['1[access comments]'] = $enabled; + $edit['1[view comments]'] = $enabled; $edit['1[post comments]'] = $enabled; $edit['1[post comments without approval]'] = $without_approval; $this->drupalPost('admin/user/permissions', $edit, t('Save permissions')); @@ -571,7 +571,7 @@ class CommentBlockFunctionalTest extends $comment2 = $this->postComment($this->node, $this->randomName(), $this->randomName()); $comment3 = $this->postComment($this->node, '', $this->randomName()); - // Test that a user without the 'access comments' permission can not see the block. + // Test that a user without the 'view comments' permission can not see the block. $this->drupalLogout(); $this->drupalGet(''); $this->assertNoText($block['title'], t('Block was not found.')); Index: modules/contact/contact.install =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.install,v retrieving revision 1.11 diff -u -p -r1.11 contact.install --- modules/contact/contact.install 15 Nov 2008 13:01:05 -0000 1.11 +++ modules/contact/contact.install 15 Apr 2009 00:23:19 -0000 @@ -79,3 +79,23 @@ function contact_schema() { return $schema; } + +/** + * Update permissions to use new names. + */ +function contact_update_7000() { + $ret = array(); + + // Fix role permissions to account for the changed names. Setup the replace + // array which holds strings both the old and new permissions. + $replace = array( + 'access site-wide contact form' => 'use site-wide contact form', + ); + + // Loop over all the changes, performing necessary updates + foreach ($replace as $old_permission => $new_permission) { + $ret[] = update_sql("UPDATE {role_permission} SET permission = '$new_permission' WHERE permission = '$old_permission'"); + } + + return $ret; +} \ No newline at end of file Index: modules/contact/contact.module =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.module,v retrieving revision 1.112 diff -u -p -r1.112 contact.module --- modules/contact/contact.module 8 Mar 2009 05:08:22 -0000 1.112 +++ modules/contact/contact.module 15 Apr 2009 00:23:19 -0000 @@ -14,7 +14,7 @@ function contact_help($path, $arg) { case 'admin/help#contact': $output = '

' . t('The contact module facilitates communication via e-mail, by allowing your site\'s visitors to contact one another (personal contact forms), and by providing a simple way to direct messages to a set of administrator-defined recipients (the contact page). With either form, users specify a subject, write their message, and (optionally) have a copy of their message sent to their own e-mail address.', array('@contact' => url('contact'))) . '

'; $output .= '

' . t("Personal contact forms allow users to be contacted via e-mail, while keeping recipient e-mail addresses private. Users may enable or disable their personal contact forms by editing their My account page. If enabled, a Contact tab leading to their personal contact form is available on their user profile. Site administrators have access to all personal contact forms (even if they have been disabled). The Contact tab is only visible when viewing another user's profile (users do not see their own Contact tab).") . '

'; - $output .= '

' . t('The contact page provides a simple form for visitors to leave comments, feedback, or other requests. Messages are routed by selecting a category from a list of administrator-defined options; each category has its own set of e-mail recipients. Common categories for a business site include, for example, "Website feedback" (messages are forwarded to web site administrators) and "Product information" (messages are forwarded to members of the sales department). The actual e-mail addresses defined within a category are not displayed. Only users in roles with the access site-wide contact form permission may access the contact page.', array('@contact' => url('contact'))) . '

'; + $output .= '

' . t('The contact page provides a simple form for visitors to leave comments, feedback, or other requests. Messages are routed by selecting a category from a list of administrator-defined options; each category has its own set of e-mail recipients. Common categories for a business site include, for example, "Website feedback" (messages are forwarded to web site administrators) and "Product information" (messages are forwarded to members of the sales department). The actual e-mail addresses defined within a category are not displayed. Only users in roles with the use site-wide contact form permission may access the contact page.', array('@contact' => url('contact'))) . '

'; $output .= '

' . t('A link to your site\'s contact page from the main Navigation menu is created, but is disabled by default. Create a similar link on another menu by adding a menu item pointing to the path "contact"', array('@contact' => url('contact'))) . '

'; $output .= '

' . t('Customize the contact page with additional information (like physical location, mailing address, and telephone number) using the contact form settings page. The settings page also provides configuration options for the maximum number of contact form submissions a user may perform per hour, and the default status of users\' personal contact forms.', array('@contact-settings' => url('admin/build/contact/settings'), '@contact' => url('contact'))) . '

'; $output .= '

' . t('For more information, see the online handbook entry for Contact module.', array('@contact' => url('http://drupal.org/handbook/modules/contact/', array('absolute' => TRUE)))) . '

'; @@ -41,8 +41,8 @@ function contact_perm() { 'title' => t('Administer site-wide contact form'), 'description' => t('Configure site-wide contact form administration settings.'), ), - 'access site-wide contact form' => array( - 'title' => t('Access site-wide contact form'), + 'use site-wide contact form' => array( + 'title' => t('Use site-wide contact form'), 'description' => t('Send feedback to administrators via e-mail using the site-wide contact form.'), ), ); @@ -96,7 +96,7 @@ function contact_menu() { $items['contact'] = array( 'title' => 'Contact', 'page callback' => 'contact_site_page', - 'access arguments' => array('access site-wide contact form'), + 'access arguments' => array('use site-wide contact form'), 'type' => MENU_SUGGESTED_ITEM, ); $items['user/%user/contact'] = array( Index: modules/contact/contact.test =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.test,v retrieving revision 1.17 diff -u -p -r1.17 contact.test --- modules/contact/contact.test 5 Apr 2009 12:10:56 -0000 1.17 +++ modules/contact/contact.test 15 Apr 2009 00:23:19 -0000 @@ -38,7 +38,7 @@ class ContactSitewideTestCase extends Dr $this->deleteCategories(); // Ensure that the contact form won't be shown without categories. - $this->setPermission('anonymous user', array('access site-wide contact form' => TRUE)); + $this->setPermission('anonymous user', array('use site-wide contact form' => TRUE)); $this->drupalLogout(); $this->drupalGet('contact'); $this->assertText(t('The contact form has not been configured.'), t('Contact form will not work without categories configured.')); @@ -73,7 +73,7 @@ class ContactSitewideTestCase extends Dr $this->assertRaw(t('Category %category has been updated.', array('%category' => $category)), t('Category successfully updated.')); // Ensure that the contact form is shown without a category selection input. - $this->setPermission('anonymous user', array('access site-wide contact form' => TRUE)); + $this->setPermission('anonymous user', array('use site-wide contact form' => TRUE)); $this->drupalLogout(); $this->drupalGet('contact'); $this->assertText($contact_form_information, t('Contact form is shown when there is one category.')); @@ -93,7 +93,7 @@ class ContactSitewideTestCase extends Dr $this->assertIdentical($num_records_after, '0', t('Flood table emptied.')); // Check to see that anonymous user cannot see contact page without permission. - $this->setPermission('anonymous user', array('access site-wide contact form' => FALSE)); + $this->setPermission('anonymous user', array('use site-wide contact form' => FALSE)); $this->drupalLogout(); $this->drupalGet('contact'); @@ -101,7 +101,7 @@ class ContactSitewideTestCase extends Dr // Give anonymous user permission and see that page is viewable. $this->drupalLogin($admin_user); - $this->setPermission('anonymous user', array('access site-wide contact form' => TRUE)); + $this->setPermission('anonymous user', array('use site-wide contact form' => TRUE)); $this->drupalLogout(); $this->drupalGet('contact'); Index: modules/dblog/dblog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/dblog/dblog.module,v retrieving revision 1.37 diff -u -p -r1.37 dblog.module --- modules/dblog/dblog.module 13 Apr 2009 08:48:58 -0000 1.37 +++ modules/dblog/dblog.module 15 Apr 2009 00:23:19 -0000 @@ -46,7 +46,7 @@ function dblog_menu() { 'title' => 'Recent log entries', 'description' => 'View events that have recently been logged.', 'page callback' => 'dblog_overview', - 'access arguments' => array('access site reports'), + 'access arguments' => array('view site reports'), 'weight' => -1, ); $items['admin/reports/page-not-found'] = array( @@ -54,20 +54,20 @@ function dblog_menu() { 'description' => "View 'page not found' errors (404s).", 'page callback' => 'dblog_top', 'page arguments' => array('page not found'), - 'access arguments' => array('access site reports'), + 'access arguments' => array('view site reports'), ); $items['admin/reports/access-denied'] = array( 'title' => "Top 'access denied' errors", 'description' => "View 'access denied' errors (403s).", 'page callback' => 'dblog_top', 'page arguments' => array('access denied'), - 'access arguments' => array('access site reports'), + 'access arguments' => array('view site reports'), ); $items['admin/reports/event/%'] = array( 'title' => 'Details', 'page callback' => 'dblog_event', 'page arguments' => array(3), - 'access arguments' => array('access site reports'), + 'access arguments' => array('view site reports'), 'type' => MENU_CALLBACK, ); return $items; Index: modules/dblog/dblog.test =================================================================== RCS file: /cvs/drupal/drupal/modules/dblog/dblog.test,v retrieving revision 1.18 diff -u -p -r1.18 dblog.test --- modules/dblog/dblog.test 13 Apr 2009 08:48:59 -0000 1.18 +++ modules/dblog/dblog.test 15 Apr 2009 00:23:19 -0000 @@ -19,7 +19,7 @@ class DBLogTestCase extends DrupalWebTes function setUp() { parent::setUp('dblog', 'blog', 'poll'); // Create users. - $this->big_user = $this->drupalCreateUser(array('administer site configuration', 'access administration pages', 'access site reports', 'administer users')); + $this->big_user = $this->drupalCreateUser(array('administer site configuration', 'use administration pages', 'view site reports', 'administer users')); $this->any_user = $this->drupalCreateUser(array()); } Index: modules/field/field.module =================================================================== RCS file: /cvs/drupal/drupal/modules/field/field.module,v retrieving revision 1.7 diff -u -p -r1.7 field.module --- modules/field/field.module 26 Mar 2009 13:31:24 -0000 1.7 +++ modules/field/field.module 15 Apr 2009 00:23:19 -0000 @@ -128,7 +128,7 @@ function field_menu() { // Callback for AHAH add more buttons. $items['field/js_add_more'] = array( 'page callback' => 'field_add_more_js', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); Index: modules/forum/forum.module =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v retrieving revision 1.489 diff -u -p -r1.489 forum.module --- modules/forum/forum.module 17 Mar 2009 12:41:54 -0000 1.489 +++ modules/forum/forum.module 15 Apr 2009 00:23:19 -0000 @@ -85,7 +85,7 @@ function forum_menu() { $items['forum'] = array( 'title' => 'Forums', 'page callback' => 'forum_page', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_SUGGESTED_ITEM, ); $items['admin/build/forum'] = array( @@ -498,7 +498,7 @@ function forum_block_save($delta = '', $ * most recently added forum topics. */ function forum_block_view($delta = '') { - if (user_access('access content')) { + if (user_access('view content')) { switch ($delta) { case 'active': $title = t('Active forum topics'); Index: modules/forum/forum.test =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.test,v retrieving revision 1.17 diff -u -p -r1.17 forum.test --- modules/forum/forum.test 2 Apr 2009 20:39:44 -0000 1.17 +++ modules/forum/forum.test 15 Apr 2009 00:23:20 -0000 @@ -25,9 +25,9 @@ class ForumTestCase extends DrupalWebTes function setUp() { parent::setUp('taxonomy', 'comment', 'forum'); // Create users. - $this->big_user = $this->drupalCreateUser(array('administer blocks', 'administer forums', 'administer menu', 'administer taxonomy', 'create forum content')); // 'access administration pages')); + $this->big_user = $this->drupalCreateUser(array('administer blocks', 'administer forums', 'administer menu', 'administer taxonomy', 'create forum content')); // 'use administration pages')); $this->own_user = $this->drupalCreateUser(array('create forum content', 'edit own forum content', 'delete own forum content')); - $this->any_user = $this->drupalCreateUser(array('create forum content', 'edit any forum content', 'delete any forum content', 'access administration pages')); + $this->any_user = $this->drupalCreateUser(array('create forum content', 'edit any forum content', 'delete any forum content', 'use administration pages')); $this->nid_user = $this->drupalCreateUser(array()); } @@ -205,7 +205,7 @@ class ForumTestCase extends DrupalWebTes * Run basic tests on the indicated user. * * @param object $user The logged in user. - * @param boolean $admin User has 'access administration pages' privilege. + * @param boolean $admin User has 'use administration pages' privilege. */ private function doBasicTests($user, $admin) { // Login the user. @@ -272,7 +272,7 @@ class ForumTestCase extends DrupalWebTes * * @param object $node_user The user who creates the node. * @param object $node Node. - * @param boolean $admin User has 'access administration pages' privilege. + * @param boolean $admin User has 'use administration pages' privilege. * @param integer $response HTTP response code. */ private function verifyForums($node_user, $node, $admin, $response = 200) { Index: modules/help/help.module =================================================================== RCS file: /cvs/drupal/drupal/modules/help/help.module,v retrieving revision 1.81 diff -u -p -r1.81 help.module --- modules/help/help.module 6 May 2008 12:18:47 -0000 1.81 +++ modules/help/help.module 15 Apr 2009 00:23:20 -0000 @@ -13,7 +13,7 @@ function help_menu() { $items['admin/help'] = array( 'title' => 'Help', 'page callback' => 'help_main', - 'access arguments' => array('access administration pages'), + 'access arguments' => array('use administration pages'), 'weight' => 9, ); @@ -22,7 +22,7 @@ function help_menu() { 'title' => $module, 'page callback' => 'help_page', 'page arguments' => array(2), - 'access arguments' => array('access administration pages'), + 'access arguments' => array('use administration pages'), 'type' => MENU_CALLBACK, ); } Index: modules/help/help.test =================================================================== RCS file: /cvs/drupal/drupal/modules/help/help.test,v retrieving revision 1.6 diff -u -p -r1.6 help.test --- modules/help/help.test 31 Mar 2009 01:49:52 -0000 1.6 +++ modules/help/help.test 15 Apr 2009 00:23:20 -0000 @@ -25,7 +25,7 @@ class HelpTestCase extends DrupalWebTest $this->getModuleList(); // Create users. - $this->big_user = $this->drupalCreateUser(array('access administration pages')); // 'administer blocks', 'administer site configuration', + $this->big_user = $this->drupalCreateUser(array('use administration pages')); // 'administer blocks', 'administer site configuration', $this->any_user = $this->drupalCreateUser(array()); } Index: modules/locale/locale.module =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v retrieving revision 1.238 diff -u -p -r1.238 locale.module --- modules/locale/locale.module 31 Mar 2009 02:02:21 -0000 1.238 +++ modules/locale/locale.module 15 Apr 2009 00:23:20 -0000 @@ -76,7 +76,7 @@ function locale_menu() { 'position' => 'left', 'weight' => -7, 'page callback' => 'system_admin_menu_block_page', - 'access arguments' => array('access administration pages'), + 'access arguments' => array('use administration pages'), ); $items['admin/international/language'] = array( 'title' => 'Languages', Index: modules/locale/locale.test =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.test,v retrieving revision 1.22 diff -u -p -r1.22 locale.test --- modules/locale/locale.test 1 Apr 2009 20:00:46 -0000 1.22 +++ modules/locale/locale.test 15 Apr 2009 00:23:20 -0000 @@ -42,7 +42,7 @@ class LocaleConfigurationTest extends Dr global $base_url; // User to add and remove language. - $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages')); + $admin_user = $this->drupalCreateUser(array('administer languages', 'use administration pages')); $this->drupalLogin($admin_user); // Add predefined language. @@ -184,9 +184,9 @@ class LocaleTranslationFunctionalTest ex global $base_url; // User to add and remove language. - $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages')); + $admin_user = $this->drupalCreateUser(array('administer languages', 'use administration pages')); // User to translate and delete string. - $translate_user = $this->drupalCreateUser(array('translate interface', 'access administration pages')); + $translate_user = $this->drupalCreateUser(array('translate interface', 'use administration pages')); // Code for the language. $langcode = 'xx'; // The English name for the language. This will be translated. @@ -312,7 +312,7 @@ class LocaleTranslationFunctionalTest ex global $base_url; // User to add language and strings. - $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages', 'translate interface')); + $admin_user = $this->drupalCreateUser(array('administer languages', 'use administration pages', 'translate interface')); $this->drupalLogin($admin_user); $langcode = 'xx'; // The English name for the language. This will be translated. @@ -376,9 +376,9 @@ class LocaleTranslationFunctionalTest ex global $base_url; // User to add and remove language. - $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages')); + $admin_user = $this->drupalCreateUser(array('administer languages', 'use administration pages')); // User to translate and delete string. - $translate_user = $this->drupalCreateUser(array('translate interface', 'access administration pages')); + $translate_user = $this->drupalCreateUser(array('translate interface', 'use administration pages')); // Code for the language. $langcode = 'xx'; @@ -555,7 +555,7 @@ class LocaleImportFunctionalTest extends function setUp() { parent::setUp('locale', 'locale_test'); - $this->admin_user = $this->drupalCreateUser(array('administer languages', 'translate interface', 'access administration pages')); + $this->admin_user = $this->drupalCreateUser(array('administer languages', 'translate interface', 'use administration pages')); $this->drupalLogin($this->admin_user); } @@ -805,7 +805,7 @@ class LocaleExportFunctionalTest extends function setUp() { parent::setUp('locale', 'locale_test'); - $this->admin_user = $this->drupalCreateUser(array('administer languages', 'translate interface', 'access administration pages')); + $this->admin_user = $this->drupalCreateUser(array('administer languages', 'translate interface', 'use administration pages')); $this->drupalLogin($this->admin_user); } @@ -914,7 +914,7 @@ class LocaleUninstallFunctionalTest exte variable_set('locale_js_directory', 'js_translations'); // Build the JavaScript translation file for French. - $user = $this->drupalCreateUser(array('translate interface', 'access administration pages')); + $user = $this->drupalCreateUser(array('translate interface', 'use administration pages')); $this->drupalLogin($user); $this->drupalGet('admin/international/translate/translate'); $string = db_fetch_object(db_query('SELECT min(lid) AS lid FROM {locales_source} WHERE location LIKE \'%.js%\' AND textgroup = \'default\'')); @@ -1009,7 +1009,7 @@ class LanguageSwitchingFunctionalTest ex parent::setUp('locale'); // Create and login user. - $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer languages', 'translate interface', 'access administration pages')); + $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer languages', 'translate interface', 'use administration pages')); $this->drupalLogin($admin_user); } @@ -1095,7 +1095,7 @@ class LocaleUserLanguageFunctionalTest e global $base_url; // User to add and remove language. - $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages')); + $admin_user = $this->drupalCreateUser(array('administer languages', 'use administration pages')); // User to change their default language. $web_user = $this->drupalCreateUser(); @@ -1190,7 +1190,7 @@ class LocalePathFunctionalTest extends D global $base_url; // User to add and remove language. - $admin_user = $this->drupalCreateUser(array('administer languages', 'create page content', 'administer url aliases', 'create url aliases', 'access administration pages')); + $admin_user = $this->drupalCreateUser(array('administer languages', 'create page content', 'administer url aliases', 'create url aliases', 'use administration pages')); // Add custom language. $this->drupalLogin($admin_user); @@ -1274,7 +1274,7 @@ class LocaleContentFunctionalTest extend global $base_url; // User to add and remove language. - $admin_user = $this->drupalCreateUser(array('administer languages', 'administer content types', 'access administration pages')); + $admin_user = $this->drupalCreateUser(array('administer languages', 'administer content types', 'use administration pages')); // User to create a node. $web_user = $this->drupalCreateUser(array('create page content', 'edit any page content')); Index: modules/menu/menu.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.api.php,v retrieving revision 1.6 diff -u -p -r1.6 menu.api.php --- modules/menu/menu.api.php 12 Apr 2009 19:52:38 -0000 1.6 +++ modules/menu/menu.api.php 15 Apr 2009 00:23:20 -0000 @@ -71,13 +71,13 @@ function hook_menu() { $items['blog'] = array( 'title' => 'blogs', 'page callback' => 'blog_page', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_SUGGESTED_ITEM, ); $items['blog/feed'] = array( 'title' => 'RSS feed', 'page callback' => 'blog_feed', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); Index: modules/menu/menu.test =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.test,v retrieving revision 1.9 diff -u -p -r1.9 menu.test --- modules/menu/menu.test 31 Mar 2009 01:49:52 -0000 1.9 +++ modules/menu/menu.test 15 Apr 2009 00:23:20 -0000 @@ -18,7 +18,7 @@ class MenuTestCase extends DrupalWebTest function setUp() { parent::setUp('menu'); // Create users. - $this->big_user = $this->drupalCreateUser(array('access administration pages', 'administer blocks', 'administer menu', 'create article content')); + $this->big_user = $this->drupalCreateUser(array('use administration pages', 'administer blocks', 'administer menu', 'create article content')); $this->std_user = $this->drupalCreateUser(array()); } Index: modules/node/node.install =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.install,v retrieving revision 1.14 diff -u -p -r1.14 node.install --- modules/node/node.install 17 Mar 2009 12:41:54 -0000 1.14 +++ modules/node/node.install 15 Apr 2009 00:23:20 -0000 @@ -417,5 +417,25 @@ function node_update_7002() { } /** + * Update permissions to use new names. + */ +function node_update_7003() { + $ret = array(); + + // Fix role permissions to account for the changed names. Setup the replace + // array which holds strings both the old and new permissions. + $replace = array( + 'access content' => 'view content', + ); + + // Loop over all the changes, performing necessary updates. + foreach ($replace as $old_permission => $new_permission) { + $ret[] = update_sql("UPDATE {role_permission} SET permission = '$new_permission' WHERE permission = '$old_permission'"); + } + + return $ret; +} + +/** * End of 6.x to 7.x updates */ Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.1033 diff -u -p -r1.1033 node.module --- modules/node/node.module 26 Mar 2009 13:31:25 -0000 1.1033 +++ modules/node/node.module 15 Apr 2009 00:23:21 -0000 @@ -53,7 +53,7 @@ function node_help($path, $arg) { // for rebuild. We don't need to issue the message on the confirm form, or // while the rebuild is being processed. if ($path != 'admin/content/node-settings/rebuild' && $path != 'batch' && strpos($path, '#') === FALSE - && user_access('access administration pages') && node_access_needs_rebuild()) { + && user_access('use administration pages') && node_access_needs_rebuild()) { if ($path == 'admin/content/node-settings') { $message = t('The content access permissions need to be rebuilt.'); } @@ -1323,8 +1323,8 @@ function node_perm() { 'title' => t('Administer nodes'), 'description' => t('Manage all information associated with site content, such as author, publication date and current revision. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))), ), - 'access content' => array( - 'title' => t('Access content'), + 'view content' => array( + 'title' => t('View content'), 'description' => t('View published content.'), ), 'bypass node access' => array( @@ -1701,7 +1701,7 @@ function node_menu() { 'page arguments' => array('node_configure_rebuild_confirm'), // Any user than can potentially trigger a node_access_needs_rebuild(TRUE) // has to be allowed access to the 'node access rebuild' confirm form. - 'access arguments' => array('access administration pages'), + 'access arguments' => array('use administration pages'), 'type' => MENU_CALLBACK, ); @@ -1726,7 +1726,7 @@ function node_menu() { $items['node'] = array( 'title' => 'Content', 'page callback' => 'node_page_default', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); $items['node/add'] = array( @@ -1739,7 +1739,7 @@ function node_menu() { $items['rss.xml'] = array( 'title' => 'RSS feed', 'page callback' => 'node_feed', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); foreach (node_get_types('types', NULL, TRUE) as $type) { @@ -2318,7 +2318,7 @@ function node_access($op, $node, $accoun return TRUE; } - if (!user_access('access content', $account)) { + if (!user_access('view content', $account)) { return FALSE; } Index: modules/node/node.test =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.test,v retrieving revision 1.19 diff -u -p -r1.19 node.test --- modules/node/node.test 31 Mar 2009 01:49:52 -0000 1.19 +++ modules/node/node.test 15 Apr 2009 00:23:21 -0000 @@ -459,7 +459,7 @@ class PageViewTestCase extends DrupalWeb $this->assertResponse(403); // Create a user without permission to edit node. - $web_user = $this->drupalCreateUser(array('access content')); + $web_user = $this->drupalCreateUser(array('view content')); $this->drupalLogin($web_user); // Attempt to access edit page. @@ -555,7 +555,7 @@ class NodePostSettingsTestCase extends D function setUp() { parent::setUp(); - $web_user = $this->drupalCreateUser(array('create page content', 'administer content types', 'access user profiles')); + $web_user = $this->drupalCreateUser(array('create page content', 'administer content types', 'view user profiles')); $this->drupalLogin($web_user); } Index: modules/path/path.test =================================================================== RCS file: /cvs/drupal/drupal/modules/path/path.test,v retrieving revision 1.8 diff -u -p -r1.8 path.test --- modules/path/path.test 31 Mar 2009 02:02:22 -0000 1.8 +++ modules/path/path.test 15 Apr 2009 00:23:21 -0000 @@ -141,7 +141,7 @@ class PathLanguageTestCase extends Drupa parent::setUp('path', 'locale', 'translation'); // Create and login user. - $web_user = $this->drupalCreateUser(array('edit any page content', 'create page content', 'administer url aliases', 'create url aliases', 'administer languages', 'translate content', 'access administration pages')); + $web_user = $this->drupalCreateUser(array('edit any page content', 'create page content', 'administer url aliases', 'create url aliases', 'administer languages', 'translate content', 'use administration pages')); $this->drupalLogin($web_user); // Enable French language. Index: modules/php/php.test =================================================================== RCS file: /cvs/drupal/drupal/modules/php/php.test,v retrieving revision 1.8 diff -u -p -r1.8 php.test --- modules/php/php.test 31 Mar 2009 01:49:53 -0000 1.8 +++ modules/php/php.test 15 Apr 2009 00:23:21 -0000 @@ -56,7 +56,7 @@ class PHPFilterTestCase extends PHPTestC $this->assertText(t('The text format settings have been updated.'), t('PHP format available to authenticated users.')); // Create node with PHP filter enabled. - $web_user = $this->drupalCreateUser(array('access content', 'create page content', 'edit own page content')); + $web_user = $this->drupalCreateUser(array('view content', 'create page content', 'edit own page content')); $this->drupalLogin($web_user); $node = $this->createNodeWithCode($web_user); @@ -93,7 +93,7 @@ class PHPAccessTestCase extends PHPTestC */ function testNoPrivileges() { // Create node with PHP filter enabled. - $web_user = $this->drupalCreateUser(array('access content', 'create page content', 'edit own page content')); + $web_user = $this->drupalCreateUser(array('view content', 'create page content', 'edit own page content')); $this->drupalLogin($web_user); $node = $this->createNodeWithCode($web_user); Index: modules/poll/poll.install =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.install,v retrieving revision 1.20 diff -u -p -r1.20 poll.install --- modules/poll/poll.install 26 Feb 2009 07:30:27 -0000 1.20 +++ modules/poll/poll.install 15 Apr 2009 00:23:21 -0000 @@ -161,3 +161,23 @@ function poll_update_7002() { db_add_field($ret, 'poll_votes', 'timestamp', $field); return $ret; } + +/** + * Update permissions to use new names. + */ +function poll_update_7003() { + $ret = array(); + + // Fix role permissions to account for the changed names. Setup the replace + // array which holds strings both the old and new permissions. + $replace = array( + 'inspect all votes' => 'view all votes', + ); + + // Loop over all the changes, performing necessary updates. + foreach ($replace as $old_permission => $new_permission) { + $ret[] = update_sql("UPDATE {role_permission} SET permission = '$new_permission' WHERE permission = '$old_permission'"); + } + + return $ret; +} Index: modules/poll/poll.module =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v retrieving revision 1.290 diff -u -p -r1.290 poll.module --- modules/poll/poll.module 9 Mar 2009 20:36:58 -0000 1.290 +++ modules/poll/poll.module 15 Apr 2009 00:23:21 -0000 @@ -64,8 +64,8 @@ function poll_perm() { 'title' => t('Cancel own vote'), 'description' => t('Retract and optionally change own votes.'), ), - 'inspect all votes' => array( - 'title' => t('Inspect all votes'), + 'view all votes' => array( + 'title' => t('View all votes'), 'description' => t('View voting results.'), ), ); @@ -94,7 +94,7 @@ function poll_menu() { $items['poll'] = array( 'title' => 'Polls', 'page callback' => 'poll_page', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_SUGGESTED_ITEM, ); @@ -103,7 +103,7 @@ function poll_menu() { 'page callback' => 'poll_votes', 'page arguments' => array(1), 'access callback' => '_poll_menu_access', - 'access arguments' => array(1, 'inspect all votes', FALSE), + 'access arguments' => array(1, 'view all votes', FALSE), 'weight' => 3, 'type' => MENU_LOCAL_TASK, ); @@ -113,7 +113,7 @@ function poll_menu() { 'page callback' => 'poll_results', 'page arguments' => array(1), 'access callback' => '_poll_menu_access', - 'access arguments' => array(1, 'access content', TRUE), + 'access arguments' => array(1, 'view content', TRUE), 'weight' => 3, 'type' => MENU_LOCAL_TASK, ); @@ -132,7 +132,7 @@ function _poll_menu_access($node, $perm, * Implementation of hook_block_list(). */ function poll_block_list() { - if (user_access('access content')) { + if (user_access('view content')) { $blocks['recent']['info'] = t('Most recent poll'); return $blocks; } @@ -144,7 +144,7 @@ function poll_block_list() { * Generates a block containing the latest poll. */ function poll_block_view($delta = '') { - if (user_access('access content')) { + if (user_access('view content')) { // Retrieve the latest poll. $select = db_select('node', 'n'); $select->join('poll', 'p', 'p.nid = n.nid'); Index: modules/poll/poll.test =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.test,v retrieving revision 1.16 diff -u -p -r1.16 poll.test --- modules/poll/poll.test 31 Mar 2009 01:49:53 -0000 1.16 +++ modules/poll/poll.test 15 Apr 2009 00:23:21 -0000 @@ -14,7 +14,7 @@ class PollTestCase extends DrupalWebTest function pollCreate($title, $choices, $test_preview = TRUE) { $this->assertTrue(TRUE, 'Create a poll'); - $web_user = $this->drupalCreateUser(array('create poll content', 'access content')); + $web_user = $this->drupalCreateUser(array('create poll content', 'view content')); $this->drupalLogin($web_user); // Get the form first to initialize the state of the internal browser @@ -108,7 +108,7 @@ class PollVoteTestCase extends PollTestC $poll_nid = $this->pollCreate($title, $choices, FALSE); $this->drupalLogout(); - $web_user = $this->drupalCreateUser(array('cancel own vote', 'inspect all votes', 'vote on polls', 'access content')); + $web_user = $this->drupalCreateUser(array('cancel own vote', 'view all votes', 'vote on polls', 'view content')); $this->drupalLogin($web_user); // Record a vote for the first choice. @@ -175,7 +175,7 @@ class PollJSAddChoice extends DrupalWebT * Test adding a new choice. */ function testAddChoice() { - $web_user = $this->drupalCreateUser(array('create poll content', 'access content')); + $web_user = $this->drupalCreateUser(array('create poll content', 'view content')); $this->drupalLogin($web_user); $this->drupalGet('node/add/poll'); $edit = array( Index: modules/profile/profile.module =================================================================== RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v retrieving revision 1.252 diff -u -p -r1.252 profile.module --- modules/profile/profile.module 14 Mar 2009 23:01:37 -0000 1.252 +++ modules/profile/profile.module 15 Apr 2009 00:23:21 -0000 @@ -79,7 +79,7 @@ function profile_menu() { $items['profile'] = array( 'title' => 'User list', 'page callback' => 'profile_browse', - 'access arguments' => array('access user profiles'), + 'access arguments' => array('view user profiles'), 'type' => MENU_SUGGESTED_ITEM, ); $items['admin/user/profile'] = array( @@ -119,7 +119,7 @@ function profile_menu() { $items['profile/autocomplete'] = array( 'title' => 'Profile autocomplete', 'page callback' => 'profile_autocomplete', - 'access arguments' => array('access user profiles'), + 'access arguments' => array('view user profiles'), 'type' => MENU_CALLBACK, ); return $items; @@ -166,7 +166,7 @@ function profile_block_save($delta = '', * Implementation of hook_block_view(). */ function profile_block_view($delta = '') { - if (user_access('access user profiles')) { + if (user_access('view user profiles')) { $output = ''; if ((arg(0) == 'node') && is_numeric(arg(1)) && (arg(2) == NULL)) { $node = node_load(arg(1)); @@ -292,7 +292,7 @@ function profile_view_field($user, $fiel // Only allow browsing of private fields for admins, if browsing is enabled, // and if a user has permission to view profiles. Note that this check is // necessary because a user may always see their own profile. - $browse = user_access('access user profiles') + $browse = user_access('view user profiles') && (user_access('administer users') || $field->visibility != PROFILE_PRIVATE) && !empty($field->page); Index: modules/profile/profile.test =================================================================== RCS file: /cvs/drupal/drupal/modules/profile/profile.test,v retrieving revision 1.12 diff -u -p -r1.12 profile.test --- modules/profile/profile.test 31 Mar 2009 01:49:53 -0000 1.12 +++ modules/profile/profile.test 15 Apr 2009 00:23:21 -0000 @@ -12,7 +12,7 @@ class ProfileTestCase extends DrupalWebT parent::setUp('profile'); variable_set('user_register', 1); - $this->admin_user = $this->drupalCreateUser(array('administer users', 'access user profiles')); + $this->admin_user = $this->drupalCreateUser(array('administer users', 'view user profiles')); // This is the user whose profile will be edited. $this->normal_user = $this->drupalCreateUser(); @@ -277,7 +277,7 @@ class ProfileTestAutocomplete extends Pr $this->assertResponse(200, t('Autocomplete path allowed to user with permission.')); $this->assertRaw($field['value'], t('Autocomplete value found.')); - // Logout and login with a user without the 'access user profiles' permission. + // Logout and login with a user without the 'view user profiles' permission. $this->drupalLogout(); $this->drupalLogin($this->normal_user); Index: modules/search/search.module =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.module,v retrieving revision 1.287 diff -u -p -r1.287 search.module --- modules/search/search.module 27 Mar 2009 00:16:16 -0000 1.287 +++ modules/search/search.module 15 Apr 2009 00:23:21 -0000 @@ -208,7 +208,7 @@ function search_menu() { 'description' => 'View most popular search phrases.', 'page callback' => 'dblog_top', 'page arguments' => array('search'), - 'access arguments' => array('access site reports'), + 'access arguments' => array('view site reports'), 'file path' => drupal_get_path('module', 'dblog'), ); Index: modules/search/search.test =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.test,v retrieving revision 1.17 diff -u -p -r1.17 search.test --- modules/search/search.test 31 Mar 2009 01:49:53 -0000 1.17 +++ modules/search/search.test 15 Apr 2009 00:23:21 -0000 @@ -238,7 +238,7 @@ class SearchAdvancedSearchForm extends D function setUp() { parent::setUp('search'); // Create and login user. - $test_user = $this->drupalCreateUser(array('access content', 'search content', 'use advanced search', 'administer nodes')); + $test_user = $this->drupalCreateUser(array('view content', 'search content', 'use advanced search', 'administer nodes')); $this->drupalLogin($test_user); // Create initial node. Index: modules/simpletest/simpletest.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.test,v retrieving revision 1.17 diff -u -p -r1.17 simpletest.test --- modules/simpletest/simpletest.test 31 Mar 2009 01:49:53 -0000 1.17 +++ modules/simpletest/simpletest.test 15 Apr 2009 00:23:22 -0000 @@ -72,7 +72,7 @@ class SimpleTestFunctionalTest extends D function testWebTestRunner() { $this->pass = t('SimpleTest pass.'); $this->fail = t('SimpleTest fail.'); - $this->valid_permission = 'access content'; + $this->valid_permission = 'view content'; $this->invalid_permission = 'invalid permission'; if ($this->inCURL()) { Index: modules/simpletest/tests/file.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/file.test,v retrieving revision 1.27 diff -u -p -r1.27 file.test --- modules/simpletest/tests/file.test 31 Mar 2009 01:49:53 -0000 1.27 +++ modules/simpletest/tests/file.test 15 Apr 2009 00:23:22 -0000 @@ -521,7 +521,7 @@ class FileSaveUploadTest extends FileHoo function setUp() { parent::setUp(); - $account = $this->drupalCreateUser(array('access content')); + $account = $this->drupalCreateUser(array('view content')); $this->drupalLogin($account); $this->image = current($this->drupalGetTestFiles('image')); Index: modules/simpletest/tests/file_test.module =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/file_test.module,v retrieving revision 1.8 diff -u -p -r1.8 file_test.module --- modules/simpletest/tests/file_test.module 20 Jan 2009 02:56:05 -0000 1.8 +++ modules/simpletest/tests/file_test.module 15 Apr 2009 00:23:22 -0000 @@ -17,7 +17,7 @@ function file_test_menu() { 'title' => t('Upload test'), 'page callback' => 'drupal_get_form', 'page arguments' => array('_file_test_form'), - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); return $items; Index: modules/simpletest/tests/form_test.module =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/form_test.module,v retrieving revision 1.3 diff -u -p -r1.3 form_test.module --- modules/simpletest/tests/form_test.module 28 Mar 2009 18:09:11 -0000 1.3 +++ modules/simpletest/tests/form_test.module 15 Apr 2009 00:23:22 -0000 @@ -16,7 +16,7 @@ function form_test_menu() { 'title' => 'Tableselect checkboxes test', 'page callback' => 'drupal_get_form', 'page arguments' => array('_form_test_tableselect_multiple_true_form'), - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); @@ -24,7 +24,7 @@ function form_test_menu() { 'title' => 'Tableselect radio button test', 'page callback' => 'drupal_get_form', 'page arguments' => array('_form_test_tableselect_multiple_false_form'), - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); @@ -32,7 +32,7 @@ function form_test_menu() { 'title' => 'Tableselect empty text test', 'page callback' => 'drupal_get_form', 'page arguments' => array('_form_test_tableselect_empty_form'), - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); @@ -40,21 +40,21 @@ function form_test_menu() { 'title' => 'Tableselect js_select tests', 'page callback' => 'drupal_get_form', 'page arguments' => array('_form_test_tableselect_js_select_form'), - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); $items['form_test/form_clean_id'] = array( 'title' => 'form_clean_id test', 'page callback' => 'form_test_form_clean_id_page', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); $items['form_test/drupal_execute_batch_api'] = array( 'title' => 'BatchAPI Drupal_execute tests', 'page callback' => 'form_test_drupal_execute_batch_api', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); Index: modules/simpletest/tests/menu_test.module =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/menu_test.module,v retrieving revision 1.4 diff -u -p -r1.4 menu_test.module --- modules/simpletest/tests/menu_test.module 13 Apr 2009 12:18:52 -0000 1.4 +++ modules/simpletest/tests/menu_test.module 15 Apr 2009 00:23:22 -0000 @@ -22,14 +22,14 @@ function menu_test_menu() { 'title callback' => FALSE, 'title arguments' => array('@placeholder' => 'some other text'), 'page callback' => 'menu_test_callback', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), ); // Hidden link for menu_link_maintain tests $items['menu_test_maintain/%'] = array( 'title' => 'Menu maintain test', 'page callback' => 'node_page_default', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), ); // Hierarchical tests. $items['menu-test/hierarchy/parent'] = array( Index: modules/simpletest/tests/session.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/session.test,v retrieving revision 1.12 diff -u -p -r1.12 session.test --- modules/simpletest/tests/session.test 31 Mar 2009 01:49:53 -0000 1.12 +++ modules/simpletest/tests/session.test 15 Apr 2009 00:23:23 -0000 @@ -30,7 +30,7 @@ class SessionTestCase extends DrupalWebT $this->assertTrue(drupal_save_session(), t('drupal_save_session() correctly returns TRUE when saving has been enabled.'), t('Session')); // Test session hardening code from SA-2008-044. - $user = $this->drupalCreateUser(array('access content')); + $user = $this->drupalCreateUser(array('view content')); // Enable sessions. $this->sessionReset($user->uid); // Make sure the session cookie is set as HttpOnly. @@ -69,7 +69,7 @@ class SessionTestCase extends DrupalWebT * drupal_session_count() since session data is already generated here. */ function testDataPersistence() { - $user = $this->drupalCreateUser(array('access content')); + $user = $this->drupalCreateUser(array('view content')); // Enable sessions. $this->sessionReset($user->uid); @@ -123,7 +123,7 @@ class SessionTestCase extends DrupalWebT $this->assertNoText($value_1, t('Session has persisted for an authenticated user after logging out and then back in.'), t('Session')); // Logout and create another user. - $user2 = $this->drupalCreateUser(array('access content')); + $user2 = $this->drupalCreateUser(array('view content')); $this->sessionReset($user2->uid); $this->drupalLogin($user2); $this->session_count_authenticated = $this->session_count++; Index: modules/simpletest/tests/session_test.module =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/session_test.module,v retrieving revision 1.6 diff -u -p -r1.6 session_test.module --- modules/simpletest/tests/session_test.module 26 Jan 2009 14:08:43 -0000 1.6 +++ modules/simpletest/tests/session_test.module 15 Apr 2009 00:23:23 -0000 @@ -8,39 +8,39 @@ function session_test_menu() { $items['session-test/get'] = array( 'title' => t('Session value'), 'page callback' => '_session_test_get', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); $items['session-test/id'] = array( 'title' => t('Session ID value'), 'page callback' => '_session_test_id', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); $items['session-test/set/%'] = array( 'title' => t('Set Session value'), 'page callback' => '_session_test_set', 'page arguments' => array(2), - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); $items['session-test/no-set/%'] = array( 'title' => t('Disabled session set value'), 'page callback' => '_session_test_no_set', 'page arguments' => array(2), - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); $items['session-test/set-message'] = array( 'title' => t('Session value'), 'page callback' => '_session_test_set_message', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); $items['session-test/set-not-started'] = array( 'title' => t('Session value'), 'page callback' => '_session_test_set_not_started', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); Index: modules/simpletest/tests/system_test.module =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/system_test.module,v retrieving revision 1.8 diff -u -p -r1.8 system_test.module --- modules/simpletest/tests/system_test.module 9 Dec 2008 11:09:26 -0000 1.8 +++ modules/simpletest/tests/system_test.module 15 Apr 2009 00:23:23 -0000 @@ -14,29 +14,29 @@ function system_test_menu() { 'title' => 'Redirect', 'page callback' => 'system_test_redirect', 'page arguments' => array(2), - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); $items['system-test/redirect-noscheme'] = array( 'page callback' => 'system_test_redirect_noscheme', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); $items['system-test/redirect-noparse'] = array( 'page callback' => 'system_test_redirect_noparse', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); $items['system-test/redirect-invalid-scheme'] = array( 'page callback' => 'system_test_redirect_invalid_scheme', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); $items['system-test/destination'] = array( 'title' => 'Redirect', 'page callback' => 'system_test_destination', 'page arguments' => array(2), - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); @@ -44,7 +44,7 @@ function system_test_menu() { 'title' => 'Variable Get', 'page callback' => 'variable_get', 'page arguments' => array('simpletest_bootstrap_variable_test', NULL), - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); Index: modules/statistics/statistics.install =================================================================== RCS file: /cvs/drupal/drupal/modules/statistics/statistics.install,v retrieving revision 1.17 diff -u -p -r1.17 statistics.install --- modules/statistics/statistics.install 26 Feb 2009 07:30:27 -0000 1.17 +++ modules/statistics/statistics.install 15 Apr 2009 00:23:23 -0000 @@ -126,3 +126,23 @@ function statistics_update_7000() { db_change_field($ret, 'accesslog', 'url', 'url', array('type' => 'text', 'not null' => FALSE)); return $ret; } + +/** + * Update permissions to use new names. + */ +function statistics_update_7001() { + $ret = array(); + + // Fix role permissions to account for the changed names. Setup the replace + // array which holds strings both the old and new permissions.. + $replace = array( + 'access statistics' => 'view statistics', + ); + + // Loop over all the changes, performing necessary updates. + foreach ($replace as $old_permission => $new_permission) { + $ret[] = update_sql("UPDATE {role_permission} SET permission = '$new_permission' WHERE permission = '$old_permission'"); + } + + return $ret; +} Index: modules/statistics/statistics.module =================================================================== RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v retrieving revision 1.300 diff -u -p -r1.300 statistics.module --- modules/statistics/statistics.module 13 Apr 2009 10:40:13 -0000 1.300 +++ modules/statistics/statistics.module 15 Apr 2009 00:23:23 -0000 @@ -85,8 +85,8 @@ function statistics_exit() { */ function statistics_perm() { return array( - 'access statistics' => array( - 'title' => t('Access statistics'), + 'view statistics' => array( + 'title' => t('View statistics'), 'description' => t('View content access statistics.'), ), 'administer statistics' => array( @@ -128,34 +128,34 @@ function statistics_menu() { 'title' => 'Recent hits', 'description' => 'View pages that have recently been visited.', 'page callback' => 'statistics_recent_hits', - 'access arguments' => array('access statistics'), + 'access arguments' => array('view statistics'), ); $items['admin/reports/pages'] = array( 'title' => 'Top pages', 'description' => 'View pages that have been hit frequently.', 'page callback' => 'statistics_top_pages', - 'access arguments' => array('access statistics'), + 'access arguments' => array('view statistics'), 'weight' => 1, ); $items['admin/reports/visitors'] = array( 'title' => 'Top visitors', 'description' => 'View visitors that hit many pages.', 'page callback' => 'statistics_top_visitors', - 'access arguments' => array('access statistics'), + 'access arguments' => array('view statistics'), 'weight' => 2, ); $items['admin/reports/referrers'] = array( 'title' => 'Top referrers', 'description' => 'View top referrers.', 'page callback' => 'statistics_top_referrers', - 'access arguments' => array('access statistics'), + 'access arguments' => array('view statistics'), ); $items['admin/reports/access/%'] = array( 'title' => 'Details', 'description' => 'View access log.', 'page callback' => 'statistics_access_log', 'page arguments' => array(3), - 'access arguments' => array('access statistics'), + 'access arguments' => array('view statistics'), 'type' => MENU_CALLBACK, ); $items['admin/settings/statistics'] = array( @@ -169,7 +169,7 @@ function statistics_menu() { 'title' => 'Track page visits', 'page callback' => 'statistics_user_tracker', 'access callback' => 'user_access', - 'access arguments' => array('access statistics'), + 'access arguments' => array('view statistics'), 'type' => MENU_LOCAL_TASK, 'weight' => 2, ); @@ -177,7 +177,7 @@ function statistics_menu() { 'title' => 'Track', 'page callback' => 'statistics_node_tracker', 'access callback' => 'user_access', - 'access arguments' => array('access statistics'), + 'access arguments' => array('view statistics'), 'type' => MENU_LOCAL_TASK, 'weight' => 2, ); @@ -319,7 +319,7 @@ function statistics_block_save($delta = * Implementation of hook_block_view(). */ function statistics_block_view($delta = '') { - if (user_access('access content')) { + if (user_access('view content')) { $content = array(); $daytop = variable_get('statistics_block_top_day_num', 0); Index: modules/statistics/statistics.test =================================================================== RCS file: /cvs/drupal/drupal/modules/statistics/statistics.test,v retrieving revision 1.8 diff -u -p -r1.8 statistics.test --- modules/statistics/statistics.test 13 Apr 2009 10:40:13 -0000 1.8 +++ modules/statistics/statistics.test 15 Apr 2009 00:23:23 -0000 @@ -14,7 +14,7 @@ class StatisticsBlockVisitorsTestCase ex parent::setUp('statistics'); // Create user. - $this->blocking_user = $this->drupalCreateUser(array('block IP addresses', 'access statistics')); + $this->blocking_user = $this->drupalCreateUser(array('block IP addresses', 'view statistics')); // Insert dummy access by anonymous user into access log. db_insert('accesslog') Index: modules/system/page.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v retrieving revision 1.18 diff -u -p -r1.18 page.tpl.php --- modules/system/page.tpl.php 2 Mar 2009 19:23:54 -0000 1.18 +++ modules/system/page.tpl.php 15 Apr 2009 00:23:23 -0000 @@ -15,7 +15,7 @@ * or themes/garland. * - $is_front: TRUE if the current page is the front page. Used to toggle the mission statement. * - $logged_in: TRUE if the user is registered and signed in. - * - $is_admin: TRUE if the user has permission to access administration pages. + * - $is_admin: TRUE if the user has permission to use administration pages. * * Page metadata: * - $language: (object) The language the site is being displayed in. Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.314 diff -u -p -r1.314 system.install --- modules/system/system.install 3 Apr 2009 17:50:21 -0000 1.314 +++ modules/system/system.install 15 Apr 2009 00:23:23 -0000 @@ -359,11 +359,11 @@ function system_install() { db_query("INSERT INTO {role} (name) VALUES ('%s')", 'authenticated user'); // Anonymous role permissions. - db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 1, 'access content'); + db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 1, 'view content'); // Authenticated role permissions. - db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 2, 'access comments'); - db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 2, 'access content'); + db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 2, 'view comments'); + db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 2, 'view content'); db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 2, 'post comments'); db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 2, 'post comments without approval'); @@ -3263,6 +3263,27 @@ function system_update_7020() { } /** + * Update permissions to use new names. + */ +function system_update_7021() { + $ret = array(); + + // Fix role permissions to account for the changed names. Setup the replace + // array which holds strings both the old and new permissions. + $replace = array( + 'access site reports' => 'view site reports', + 'access administration pages' => 'use administration pages', + ); + + // Loop over all the changes, performing necessary updates. + foreach ($replace as $old_permission => $new_permission) { + $ret[] = update_sql("UPDATE {role_permission} SET permission = '$new_permission' WHERE permission = '$old_permission'"); + } + + return $ret; +} + +/** * @} End of "defgroup updates-6.x-to-7.x" * The next series of updates should start at 8000. */ Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.678 diff -u -p -r1.678 system.module --- modules/system/system.module 13 Apr 2009 18:50:43 -0000 1.678 +++ modules/system/system.module 15 Apr 2009 00:23:24 -0000 @@ -189,12 +189,12 @@ function system_perm() { 'title' => t('Administer files'), 'description' => t('Manage user-uploaded files.'), ), - 'access administration pages' => array( - 'title' => t('Access administration pages'), + 'use administration pages' => array( + 'title' => t('Use administration pages'), 'description' => t('View the administration panel and browse the help system.'), ), - 'access site reports' => array( - 'title' => t('Access site reports'), + 'view site reports' => array( + 'title' => t('View site reports'), 'description' => t('View reports from system logs and other status information.'), ), 'select different theme' => array( @@ -463,7 +463,7 @@ function system_menu() { ); $items['admin'] = array( 'title' => 'Administer', - 'access arguments' => array('access administration pages'), + 'access arguments' => array('use administration pages'), 'page callback' => 'system_main_admin_page', 'weight' => 9, 'menu_name' => 'management', @@ -471,19 +471,19 @@ function system_menu() { $items['admin/compact'] = array( 'title' => 'Compact mode', 'page callback' => 'system_admin_compact_page', - 'access arguments' => array('access administration pages'), + 'access arguments' => array('use administration pages'), 'type' => MENU_CALLBACK, ); $items['admin/by-task'] = array( 'title' => 'By task', 'page callback' => 'system_main_admin_page', - 'access arguments' => array('access administration pages'), + 'access arguments' => array('use administration pages'), 'type' => MENU_DEFAULT_LOCAL_TASK, ); $items['admin/by-module'] = array( 'title' => 'By module', 'page callback' => 'system_admin_by_module', - 'access arguments' => array('access administration pages'), + 'access arguments' => array('use administration pages'), 'type' => MENU_LOCAL_TASK, 'weight' => 2, ); @@ -493,7 +493,7 @@ function system_menu() { 'position' => 'left', 'weight' => -10, 'page callback' => 'system_admin_menu_block_page', - 'access arguments' => array('access administration pages'), + 'access arguments' => array('use administration pages'), ); // menu items that are basically just menu blocks @@ -503,7 +503,7 @@ function system_menu() { 'position' => 'right', 'weight' => -5, 'page callback' => 'system_settings_overview', - 'access arguments' => array('access administration pages'), + 'access arguments' => array('use administration pages'), ); $items['admin/build'] = array( 'title' => 'Site building', @@ -511,7 +511,7 @@ function system_menu() { 'position' => 'right', 'weight' => -10, 'page callback' => 'system_admin_menu_block_page', - 'access arguments' => array('access administration pages'), + 'access arguments' => array('use administration pages'), ); // Themes: $items['admin/build/themes'] = array( @@ -726,7 +726,7 @@ function system_menu() { 'title' => 'Reports', 'description' => 'View reports from system logs and other status information.', 'page callback' => 'system_admin_menu_block_page', - 'access arguments' => array('access site reports'), + 'access arguments' => array('view site reports'), 'weight' => 5, 'position' => 'left', ); Index: modules/system/system.test =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.test,v retrieving revision 1.40 diff -u -p -r1.40 system.test --- modules/system/system.test 31 Mar 2009 01:49:54 -0000 1.40 +++ modules/system/system.test 15 Apr 2009 00:23:24 -0000 @@ -10,7 +10,7 @@ class ModuleTestCase extends DrupalWebTe function setUp() { parent::setUp('system_test'); - $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'administer site configuration')); + $this->admin_user = $this->drupalCreateUser(array('use administration pages', 'administer site configuration')); $this->drupalLogin($this->admin_user); } @@ -337,7 +337,7 @@ class AdminOverviewTestCase extends Drup * Test the overview page by task. */ function testAdminOverview() { - $admin_user1 = $this->drupalCreateUser(array('access administration pages')); + $admin_user1 = $this->drupalCreateUser(array('use administration pages')); $this->drupalLogin($admin_user1); $this->drupalGet('admin'); @@ -348,12 +348,12 @@ class AdminOverviewTestCase extends Drup // Comments on permissions follow the format: [task], [module] that the permission relates to. $permissions = array(); - $permissions[] = 'access administration pages'; + $permissions[] = 'use administration pages'; $permissions[] = 'administer comments'; // Content management, Comment. $permissions[] = 'administer blocks'; // Site building, Block. $permissions[] = 'administer filters'; // Site configuration, Filter. $permissions[] = 'administer users'; // User management, User. - $permissions[] = 'access site reports'; // Reports, Database logging. + $permissions[] = 'view site reports'; // Reports, Database logging. $admin_user2 = $this->drupalCreateUser($permissions); $this->drupalLogin($admin_user2); @@ -601,7 +601,7 @@ class PageTitleFiltering extends DrupalW function setUp() { parent::setUp(); - $this->content_user = $this->drupalCreateUser(array('create page content', 'access content')); + $this->content_user = $this->drupalCreateUser(array('create page content', 'view content')); $this->drupalLogin($this->content_user); $this->saved_title = drupal_get_title(); } @@ -661,7 +661,7 @@ class FrontPageTestCase extends DrupalWe parent::setUp('system_test'); // Create admin user, log in admin user, and create one node. - $this->admin_user = $this->drupalCreateUser(array('access content', 'administer site configuration')); + $this->admin_user = $this->drupalCreateUser(array('view content', 'administer site configuration')); $this->drupalLogin($this->admin_user); $this->node_path = "node/" . $this->drupalCreateNode(array('promote' => 1))->nid; @@ -844,7 +844,7 @@ class SystemThemeFunctionalTest extends function setUp() { parent::setUp(); - $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'administer site configuration', 'bypass node access')); + $this->admin_user = $this->drupalCreateUser(array('use administration pages', 'administer site configuration', 'bypass node access')); $this->drupalLogin($this->admin_user); $this->node = $this->drupalCreateNode(); } Index: modules/taxonomy/taxonomy.module =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v retrieving revision 1.466 diff -u -p -r1.466 taxonomy.module --- modules/taxonomy/taxonomy.module 13 Apr 2009 18:52:38 -0000 1.466 +++ modules/taxonomy/taxonomy.module 15 Apr 2009 00:23:24 -0000 @@ -125,7 +125,7 @@ function taxonomy_menu() { 'title' => 'Taxonomy term', 'page callback' => 'taxonomy_term_page', 'page arguments' => array(2), - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); @@ -146,7 +146,7 @@ function taxonomy_menu() { $items['taxonomy/autocomplete'] = array( 'title' => 'Autocomplete taxonomy', 'page callback' => 'taxonomy_autocomplete', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'type' => MENU_CALLBACK, ); Index: modules/tracker/tracker.module =================================================================== RCS file: /cvs/drupal/drupal/modules/tracker/tracker.module,v retrieving revision 1.157 diff -u -p -r1.157 tracker.module --- modules/tracker/tracker.module 6 May 2008 12:18:51 -0000 1.157 +++ modules/tracker/tracker.module 15 Apr 2009 00:23:24 -0000 @@ -26,7 +26,7 @@ function tracker_menu() { $items['tracker'] = array( 'title' => 'Recent posts', 'page callback' => 'tracker_page', - 'access arguments' => array('access content'), + 'access arguments' => array('view content'), 'weight' => 1, ); $items['tracker/all'] = array( @@ -61,13 +61,13 @@ function tracker_menu() { */ function _tracker_myrecent_access($account) { // This path is only allowed for authenticated users looking at their own posts. - return $account->uid && ($GLOBALS['user']->uid == $account->uid) && user_access('access content'); + return $account->uid && ($GLOBALS['user']->uid == $account->uid) && user_access('view content'); } /** * Access callback for user/%user/track */ function _tracker_user_access($account) { - return user_view_access($account) && user_access('access content'); + return user_view_access($account) && user_access('view content'); } Index: modules/tracker/tracker.test =================================================================== RCS file: /cvs/drupal/drupal/modules/tracker/tracker.test,v retrieving revision 1.7 diff -u -p -r1.7 tracker.test --- modules/tracker/tracker.test 31 Mar 2009 01:49:54 -0000 1.7 +++ modules/tracker/tracker.test 15 Apr 2009 00:23:24 -0000 @@ -17,7 +17,7 @@ class TrackerTest extends DrupalWebTestC function setUp() { parent::setUp('comment', 'tracker'); - $permissions = array('access comments', 'post comments', 'post comments without approval'); + $permissions = array('view comments', 'post comments', 'post comments without approval'); $this->user = $this->drupalCreateUser($permissions); $this->other_user = $this->drupalCreateUser($permissions); } Index: modules/translation/translation.test =================================================================== RCS file: /cvs/drupal/drupal/modules/translation/translation.test,v retrieving revision 1.11 diff -u -p -r1.11 translation.test --- modules/translation/translation.test 2 Apr 2009 20:39:45 -0000 1.11 +++ modules/translation/translation.test 15 Apr 2009 00:23:24 -0000 @@ -21,7 +21,7 @@ class TranslationTestCase extends Drupal */ function testContentTranslation() { // Setup users. - $admin_user = $this->drupalCreateUser(array('administer languages', 'administer content types', 'access administration pages')); + $admin_user = $this->drupalCreateUser(array('administer languages', 'administer content types', 'use administration pages')); $translator = $this->drupalCreateUser(array('create page content', 'edit own page content', 'translate content')); $this->drupalLogin($admin_user); Index: modules/trigger/trigger.test =================================================================== RCS file: /cvs/drupal/drupal/modules/trigger/trigger.test,v retrieving revision 1.7 diff -u -p -r1.7 trigger.test --- modules/trigger/trigger.test 31 Mar 2009 01:49:54 -0000 1.7 +++ modules/trigger/trigger.test 15 Apr 2009 00:23:24 -0000 @@ -34,7 +34,7 @@ class TriggerContentTestCase extends Dru $edit = array('aid' => $hash); $this->drupalPost('admin/build/trigger/node', $edit, t('Assign')); // Create an unpublished node. - $web_user = $this->drupalCreateUser(array('create page content', 'access content', 'administer nodes')); + $web_user = $this->drupalCreateUser(array('create page content', 'view content', 'administer nodes')); $this->drupalLogin($web_user); $edit = array(); $edit['title'] = '!SimpleTest test node! ' . $this->randomName(10); Index: modules/upload/upload.test =================================================================== RCS file: /cvs/drupal/drupal/modules/upload/upload.test,v retrieving revision 1.14 diff -u -p -r1.14 upload.test --- modules/upload/upload.test 31 Mar 2009 01:49:55 -0000 1.14 +++ modules/upload/upload.test 15 Apr 2009 00:23:24 -0000 @@ -20,7 +20,7 @@ class UploadTestCase extends DrupalWebTe function testNodeUpload() { global $base_url; $admin_user = $this->drupalCreateUser(array('administer site configuration')); - $web_user = $this->drupalCreateUser(array('access content', 'edit any page content', 'upload files', 'view uploaded files')); + $web_user = $this->drupalCreateUser(array('view content', 'edit any page content', 'upload files', 'view uploaded files')); $this->drupalLogin($admin_user); @@ -88,7 +88,7 @@ class UploadTestCase extends DrupalWebTe */ function testFilesFilter() { $admin_user = $this->drupalCreateUser(array('administer site configuration')); - $web_user = $this->drupalCreateUser(array('access content', 'edit any page content', 'upload files', 'view uploaded files')); + $web_user = $this->drupalCreateUser(array('view content', 'edit any page content', 'upload files', 'view uploaded files')); $this->drupalLogin($admin_user); @@ -131,7 +131,7 @@ class UploadTestCase extends DrupalWebTe $file = current($files)->filepath; $admin_user = $this->drupalCreateUser(array('administer site configuration')); - $web_user = $this->drupalCreateUser(array('access content', 'edit any page content', 'upload files', 'view uploaded files')); + $web_user = $this->drupalCreateUser(array('view content', 'edit any page content', 'upload files', 'view uploaded files')); $this->drupalLogin($admin_user); Index: modules/user/user.install =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.install,v retrieving revision 1.22 diff -u -p -r1.22 user.install --- modules/user/user.install 13 Apr 2009 12:14:57 -0000 1.22 +++ modules/user/user.install 15 Apr 2009 00:23:24 -0000 @@ -464,6 +464,26 @@ function user_update_7004(&$sandbox) { } /** + * Update permissions to use new names. + */ +function user_update_7005() { + $ret = array(); + + // Fix role permissions to account for the changed names. Setup the replace + // array which holds strings both the old and new permissions. + $replace = array( + 'access user profiles' => 'view user profiles', + ); + + // Loop over all the changes, performing necessary updates. + foreach ($replace as $old_permission => $new_permission) { + $ret[] = update_sql("UPDATE {role_permission} SET permission = '$new_permission' WHERE permission = '$old_permission'"); + } + + return $ret; +} + +/** * @} End of "defgroup user-updates-6.x-to-7.x" * The next series of updates should start at 8000. */ Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.974 diff -u -p -r1.974 user.module --- modules/user/user.module 13 Apr 2009 12:14:57 -0000 1.974 +++ modules/user/user.module 15 Apr 2009 00:23:25 -0000 @@ -785,8 +785,8 @@ function user_perm() { 'title' => t('Administer users'), 'description' => t('Manage or block users, and manage their role assignments.'), ), - 'access user profiles' => array( - 'title' => t('Access user profiles'), + 'view user profiles' => array( + 'title' => t('View user profiles'), 'description' => t('View profiles of users on the site, which may contain personal information.'), ), 'change own username' => array( @@ -845,11 +845,11 @@ function user_file_delete($file) { function user_search($op = 'search', $keys = NULL, $skip_access_check = FALSE) { switch ($op) { case 'name': - if ($skip_access_check || user_access('access user profiles')) { + if ($skip_access_check || user_access('view user profiles')) { return t('Users'); } case 'search': - if (user_access('access user profiles')) { + if (user_access('view user profiles')) { $find = array(); // Replace wildcards with MySQL/PostgreSQL wildcards. $keys = preg_replace('!\*+!', '%', $keys); @@ -1095,7 +1095,7 @@ function user_block_view($delta = '') { return $block; case 'new': - if (user_access('access content')) { + if (user_access('view content')) { // Retrieve a list of new users who have subsequently accessed the site successfully. $items = db_query_range('SELECT uid, name FROM {users} WHERE status != 0 AND access != 0 ORDER BY created DESC', array(), 0, variable_get('user_block_whois_new_count', 5))->fetchAll(); $output = theme('user_list', $items); @@ -1106,7 +1106,7 @@ function user_block_view($delta = '') { return $block; case 'online': - if (user_access('access content')) { + if (user_access('view content')) { // Count users active within the defined period. $interval = REQUEST_TIME - variable_get('user_block_seconds_online', 900); @@ -1178,7 +1178,7 @@ function template_preprocess_user_pictur if (isset($filepath)) { $alt = t("@user's picture", array('@user' => $account->name ? $account->name : variable_get('anonymous', t('Anonymous')))); $variables['picture'] = theme('image', $filepath, $alt, $alt, '', FALSE); - if (!empty($account->uid) && user_access('access user profiles')) { + if (!empty($account->uid) && user_access('view user profiles')) { $attributes = array('attributes' => array('title' => t('View user profile.')), 'html' => TRUE); $variables['picture'] = l($variables['picture'], "user/$account->uid", $attributes); } @@ -1226,7 +1226,7 @@ function user_view_access($account) { // Administrators can view all accounts. user_access('administer users') || // The user is not blocked and logged in at least once. - ($account->access && $account->status && user_access('access user profiles')) + ($account->access && $account->status && user_access('view user profiles')) ); } @@ -1260,7 +1260,7 @@ function user_menu() { 'title' => 'User autocomplete', 'page callback' => 'user_autocomplete', 'access callback' => 'user_access', - 'access arguments' => array('access user profiles'), + 'access arguments' => array('view user profiles'), 'type' => MENU_CALLBACK, ); @@ -1315,7 +1315,7 @@ function user_menu() { 'description' => "Manage your site's users, groups and access to site features.", 'position' => 'left', 'page callback' => 'system_admin_menu_block_page', - 'access arguments' => array('access administration pages'), + 'access arguments' => array('use administration pages'), ); $items['admin/user/user'] = array( 'title' => 'Users', Index: modules/user/user.test =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.test,v retrieving revision 1.33 diff -u -p -r1.33 user.test --- modules/user/user.test 31 Mar 2009 01:49:55 -0000 1.33 +++ modules/user/user.test 15 Apr 2009 00:23:25 -0000 @@ -725,7 +725,7 @@ class UserPermissionsTestCase extends Dr function setUp() { parent::setUp(); - $this->admin_user = $this->drupalCreateUser(array('administer permissions', 'access user profiles')); + $this->admin_user = $this->drupalCreateUser(array('administer permissions', 'view user profiles')); // Find the new role ID - it must be the maximum. $all_rids = array_keys($this->admin_user->roles); @@ -750,12 +750,12 @@ class UserPermissionsTestCase extends Dr $this->assertTrue(user_access('administer nodes', $account, TRUE), t('User now has "administer nodes" permission.')); // Remove a permission. - $this->assertTrue(user_access('access user profiles', $account, TRUE), t('User has "access user profiles" permission.')); + $this->assertTrue(user_access('view user profiles', $account, TRUE), t('User has "view user profiles" permission.')); $edit = array(); - $edit[$rid . '[access user profiles]'] = FALSE; + $edit[$rid . '[view user profiles]'] = FALSE; $this->drupalPost('admin/user/permissions', $edit, t('Save permissions')); $this->assertText(t('The changes have been saved.'), t('Successful save message displayed.')); - $this->assertFalse(user_access('access user profiles', $account, TRUE), t('User no longer has "access user profiles" permission.')); + $this->assertFalse(user_access('view user profiles', $account, TRUE), t('User no longer has "view user profiles" permission.')); } } @@ -887,7 +887,7 @@ class UserAutocompleteTestCase extends D // Set up two users with different permissions to test access. $this->unprivileged_user = $this->drupalCreateUser(); - $this->privileged_user = $this->drupalCreateUser(array('access user profiles')); + $this->privileged_user = $this->drupalCreateUser(array('view user profiles')); } /**