' . t('This page shows you all available administration tasks for each module.') . '
'; case 'admin/appearance': $output = '' . t('Set and configure the default theme for your website. Alternative themes are available.', array('@themes' => 'http://drupal.org/project/themes')) . '
'; @@ -523,7 +524,7 @@ function system_menu() { $items['admin'] = array( 'title' => 'Administer', 'access arguments' => array('access administration pages'), - 'page callback' => 'system_main_admin_page', + 'page callback' => 'system_admin_by_module', 'weight' => 9, 'menu_name' => 'management', 'theme callback' => 'variable_get', @@ -537,19 +538,11 @@ function system_menu() { 'type' => MENU_CALLBACK, 'file' => 'system.admin.inc', ); - $items['admin/by-task'] = array( - 'title' => 'By task', - 'page callback' => 'system_main_admin_page', - 'access arguments' => array('access administration pages'), - 'type' => MENU_DEFAULT_LOCAL_TASK, - 'file' => 'system.admin.inc', - ); - $items['admin/by-module'] = array( - 'title' => 'By module', + $items['admin/index'] = array( + 'title' => 'Index', 'page callback' => 'system_admin_by_module', 'access arguments' => array('access administration pages'), - 'type' => MENU_LOCAL_TASK, - 'weight' => 2, + 'type' => MENU_DEFAULT_LOCAL_TASK, 'file' => 'system.admin.inc', ); @@ -2761,7 +2754,7 @@ function system_get_module_admin_tasks($ if (empty($items)) { $result = db_query(" SELECT m.load_functions, m.to_arg_functions, m.access_callback, m.access_arguments, m.page_callback, m.page_arguments, m.delivery_callback, m.title, m.title_callback, m.title_arguments, m.theme_callback, m.theme_arguments, m.type, ml.* - FROM {menu_links} ml INNER JOIN {menu_router} m ON ml.router_path = m.path WHERE ml.link_path LIKE 'admin/%' AND hidden >= 0 AND module = 'system' AND m.number_parts > 2", array(), array('fetch' => PDO::FETCH_ASSOC)); + FROM {menu_links} ml INNER JOIN {menu_router} m ON ml.router_path = m.path WHERE ml.link_path LIKE 'admin/%' AND hidden >= 0 AND module = 'system' AND m.number_parts > 1 AND page_callback <> 'system_admin_menu_block_page'", array(), array('fetch' => PDO::FETCH_ASSOC)); foreach ($result as $item) { _menu_link_translate($item); if ($item['access']) { @@ -2774,15 +2767,27 @@ function system_get_module_admin_tasks($ $admin_tasks = array(); $admin_task_count = 0; // Check for permissions. + $permissions_menu_item = menu_get_item('admin/people/permissions'); + $permissions_menu_item['description'] = NULL; + $permissions_menu_item['title'] = t('Configure permissions'); if (in_array($module, module_implements('permission')) && $admin_access) { - $admin_tasks[-1] = l(t('Configure permissions'), 'admin/people/permissions', array('fragment' => 'module-' . $module)); + $permissions_menu_item['link_path'] = 'admin/people/permissions'; + $permissions_menu_item['localized_options']['fragment'] = 'module-' . $module; + $admin_tasks[-1] = $permissions_menu_item; } - // Check for menu items that are admin links. if (in_array($module, module_implements('menu')) && $menu = module_invoke($module, 'menu')) { foreach (array_keys($menu) as $path) { if (isset($items[$path])) { - $admin_tasks[$items[$path]['title'] . $admin_task_count ++] = l($items[$path]['title'], $path); + // The link 'description' — either derived from the hook_menu + // 'description' or entered by the user via menu module — is saved as + // the title attribute. The title attribute is then unset to reduce + // redundancy in admin pages for screen readers. + if (!empty($items[$path]['localized_options']['attributes']['title'])) { + $items[$path]['description'] = $items[$path]['localized_options']['attributes']['title']; + unset($items[$path]['localized_options']['attributes']['title']); + } + $admin_tasks[$items[$path]['title'] . $admin_task_count ++] = $items[$path]; } } } Index: modules/taxonomy/taxonomy.install =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.install,v retrieving revision 1.43 diff -u -p -r1.43 taxonomy.install --- modules/taxonomy/taxonomy.install 23 May 2010 19:10:23 -0000 1.43 +++ modules/taxonomy/taxonomy.install 14 Aug 2010 01:02:51 -0000 @@ -394,7 +394,7 @@ function taxonomy_update_7004() { field_create_instance($instance); } } - db_drop_table('taxonomy_vocabulary_node_type'); + $fields = array('help', 'multiple', 'required', 'tags'); foreach ($fields as $field) { db_drop_field('taxonomy_vocabulary', $field); @@ -405,15 +405,6 @@ function taxonomy_update_7004() { * Migrate {taxonomy_term_node} table to field storage. */ function taxonomy_update_7005(&$sandbox) { - // Since we are upgrading from Drupal 6, we know that only - // field_sql_storage.module will be enabled. - $field = field_info_field($field['field_name']); - $data_table = _field_sql_storage_tablename($field); - $revision_table = _field_sql_storage_revision_tablename($field); - $etid = _field_sql_storage_etid('node'); - $value_column = $field['field_name'] . '_value'; - $columns = array('etid', 'entity_id', 'revision_id', 'bundle', 'delta', $value_column); - // This is a multi-pass update. On the first call we need to initialize some // variables. if (!isset($sandbox['total'])) { @@ -423,14 +414,51 @@ function taxonomy_update_7005(&$sandbox) $query = db_select('taxonomy_term_node', 't'); $sandbox['total'] = $query->countQuery()->execute()->fetchField(); $found = (bool) $sandbox['total']; + $result = db_query('SELECT v.*, n.type FROM {taxonomy_vocabulary} v LEFT JOIN {taxonomy_vocabulary_node_type} n ON v.vid = n.vid ORDER BY v.weight, v.name'); + $vocabularies = array(); + foreach ($result as $record) { + // If no node types are associated with a vocabulary, the LEFT JOIN will + // return a NULL value for type. + if (isset($record->type)) { + $node_types[$record->vid][$record->type] = $record->type; + unset($record->type); + $record->nodes = $node_types[$record->vid]; + } + elseif (!isset($record->nodes)) { + $record->nodes = array(); + } + $vocabularies[$record->vid] = $record; + } + if (!empty($vocabularies)) { + $sandbox['vocabularies'] = $vocabularies; + } } else { + // Grab the current (first) vocabulary. When this vocabulary's terms have + // all been updated, it will be removed from the sandbox. + reset($sandbox['vocabularies']); + $vid = key($sandbox['vocabularies']); + $vocabulary = $sandbox['vocabularies'][$vid]; + + // Since we are upgrading from Drupal 6, we know that only + // field_sql_storage.module will be enabled. + $field = field_info_field('taxonomy_' . $vocabulary->machine_name); + $data_table = _field_sql_storage_tablename($field); + $revision_table = _field_sql_storage_revision_tablename($field); + $etid = _field_sql_storage_etid('node'); + $value_column = $field['field_name'] . '_tid'; + $columns = array('etid', 'entity_id', 'revision_id', 'bundle', 'language', 'delta', $value_column); + // We do each pass in batches of 1000, this should result in a // maximum of 2000 insert queries each operation. - $batch = 1000 + $sandbox['last']; + $batch = 1000; + + // Track if we found rows in that run. + $found = FALSE; // Query and save data for the current revision. - $result = db_query_range('SELECT td.tid, tn.nid, td.weight, tn.vid, n2.type, n2.created, n2.sticky FROM {taxonomy_term_data} td INNER JOIN {taxonomy_term_node} tn ON td.tid = tn.tid INNER JOIN {node} n2 ON tn.nid = n2.nid INNER JOIN {node} n ON tn.vid = n.vid AND td.vid = :vocabulary_id ORDER BY td.weight ASC', array(':vocabulary_id' => $vocabulary->vid), $sandbox['last'], $batch); + $result = db_query_range('SELECT td.tid, tn.nid, td.weight, tn.vid, n2.type, n2.created, n2.sticky FROM {taxonomy_term_data} td INNER JOIN {taxonomy_term_node} tn ON td.tid = tn.tid INNER JOIN {node} n2 ON tn.nid = n2.nid INNER JOIN {node} n ON tn.vid = n.vid AND td.vid = :vocabulary_id ORDER BY td.weight ASC', $sandbox['last'], $batch, array(':vocabulary_id' => $vocabulary->vid)); + $deltas = array(); foreach ($result as $record) { $found = TRUE; @@ -438,7 +466,7 @@ function taxonomy_update_7005(&$sandbox) // Start deltas from 0, and increment by one for each // term attached to a node. $deltas[$record->nid] = isset($deltas[$record->nid]) ? ++$deltas[$record->nid] : 0; - $values = array($etid, $record->nid, $record->vid, $record->type, $deltas[$record->nid], $record->tid); + $values = array($etid, $record->nid, $record->vid, $record->type, LANGUAGE_NONE, $deltas[$record->nid], $record->tid); db_insert($data_table)->fields($columns)->values($values)->execute(); // Update the {taxonomy_index} table. @@ -449,20 +477,38 @@ function taxonomy_update_7005(&$sandbox) } // Query and save data for all revisions. - $result = db_query('SELECT td.tid, tn.nid, td.weight, tn.vid, n.type FROM {taxonomy_term_data} td INNER JOIN {taxonomy_term_node} tn ON td.tid = tn.tid AND td.vid = :vocabulary_id INNER JOIN {node} n ON tn.nid = n.nid ORDER BY td.weight ASC', array(':vocabulary_id' => $vocabulary->vid), $sandbox['last'][$batch]); + $result = db_query_range('SELECT td.tid, tn.nid, td.weight, tn.vid, n.type FROM {taxonomy_term_data} td INNER JOIN {taxonomy_term_node} tn ON td.tid = tn.tid AND td.vid = :vocabulary_id INNER JOIN {node} n ON tn.nid = n.nid ORDER BY td.weight ASC', $sandbox['last'], $batch, array(':vocabulary_id' => $vocabulary->vid)); $deltas = array(); foreach ($result as $record) { $found = TRUE; $sandbox['count'] += 1; // Start deltas at 0, and increment by one for each term attached to a revision. $deltas[$record->vid] = isset($deltas[$record->vid]) ? ++$deltas[$record->vid] : 0; - $values = array($etid, $record->nid, $record->vid, $record->type, $deltas[$record->vid], $record->tid); + $values = array($etid, $record->nid, $record->vid, $record->type, LANGUAGE_NONE, $deltas[$record->vid], $record->tid); db_insert($revision_table)->fields($columns)->values($values)->execute(); } - $sandbox['last'] = $batch; + + $sandbox['last'] += $batch; + + // If there were no rows returned, we're finished with the current vocab. + // Advance vid counter and reset batch counter or fall through and finish + // if there are no vocabularies left. + if (!$found) { + unset($sandbox['vocabularies'][$vid]); + if (!empty($sandbox['vocabularies'])) { + $found = TRUE; + $sandbox['last'] = 0; + } + } } if (!$found) { - db_drop_table('taxonomy_term_node'); + db_drop_table('taxonomy_vocabulary_node_type'); + db_drop_table('taxonomy_term_node'); + // If there are no vocabs, we're done. + $sandbox['#finished'] = TRUE; + } + else { + $sandbox['#finished'] = FALSE; } } Index: modules/user/user.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v retrieving revision 1.116 diff -u -p -r1.116 user.admin.inc --- modules/user/user.admin.inc 29 Jul 2010 01:39:32 -0000 1.116 +++ modules/user/user.admin.inc 14 Aug 2010 01:02:51 -0000 @@ -662,41 +662,32 @@ function user_admin_permissions($form, $ ); // Render role/permission overview: $options = array(); - $module_info = system_get_info('module'); $hide_descriptions = system_admin_compact_mode(); - // Get a list of all the modules implementing a hook_permission() and sort by - // display name. - $modules = array(); - foreach (module_implements('permission') as $module) { - $modules[$module_info[$module]['name']] = $module; - } - ksort($modules); - - foreach ($modules as $display_name => $module) { - if ($permissions = module_invoke($module, 'permission')) { - $form['permission'][] = array( - '#markup' => $module_info[$module]['name'], - '#id' => $module, + $module_info = system_get_info('module'); + + foreach (_user_get_permissions() as $module => $permissions) { + $form['permission'][] = array( + '#markup' => $module_info[$module]['name'], + '#id' => $module, + ); + foreach ($permissions as $perm => $perm_item) { + // Fill in default values for the permission. + $perm_item += array( + 'description' => '', + 'restrict access' => FALSE, + 'warning' => !empty($perm_item['restrict access']) ? t('Warning: Give to trusted roles only; this permission has security implications.') : '', + ); + $options[$perm] = ''; + $form['permission'][$perm] = array( + '#type' => 'item', + '#markup' => $perm_item['title'], + '#description' => theme('user_permission_description', array('permission_item' => $perm_item, 'hide' => $hide_descriptions)), ); - foreach ($permissions as $perm => $perm_item) { - // Fill in default values for the permission. - $perm_item += array( - 'description' => '', - 'restrict access' => FALSE, - 'warning' => !empty($perm_item['restrict access']) ? t('Warning: Give to trusted roles only; this permission has security implications.') : '', - ); - $options[$perm] = ''; - $form['permission'][$perm] = array( - '#type' => 'item', - '#markup' => $perm_item['title'], - '#description' => theme('user_permission_description', array('permission_item' => $perm_item, 'hide' => $hide_descriptions)), - ); - foreach ($role_names as $rid => $name) { - // Builds arrays for checked boxes for each role - if (isset($role_permissions[$rid][$perm])) { - $status[$rid][] = $perm; - } + foreach ($role_names as $rid => $name) { + // Builds arrays for checked boxes for each role + if (isset($role_permissions[$rid][$perm])) { + $status[$rid][] = $perm; } } } Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.1192 diff -u -p -r1.1192 user.module --- modules/user/user.module 11 Aug 2010 14:21:39 -0000 1.1192 +++ modules/user/user.module 14 Aug 2010 01:02:52 -0000 @@ -3678,3 +3678,22 @@ function user_rdf_mapping() { ), ); } + +/** + * Get a list of the modules that implement hook_permission(). + * + * @return $modules + * A cookie name such as 'homepage'. + */ +function _user_get_permissions() { + // Get a list of all the modules implementing a hook_permission() and sort by + // display name. + $modules = array(); + + foreach (module_implements('permission') as $module) { + $modules[$module] = module_invoke($module, 'permission'); ; + } + ksort($modules); + + return $modules; +}