'. t('Note: there is no confirmation. Be sure of your action before clicking the "Delete aliases now!" button.
You may want to make a backup of the database and/or the url_alias table prior to using this feature.') .'
' . t('Note: there is no confirmation. Be sure of your action before clicking the "Delete aliases now!" button.
You may want to make a backup of the database and/or the url_alias table prior to using this feature.') . '
'. t('Provides a mechanism for modules to automatically generate aliases for the content they manage.') .'
'; - $output .= ''. t('The maximum alias length and maximum component length values default to 100 and have a limit of 128 from Pathauto. This length is limited by the length of the "dst" column of the url_alias database table. The default database schema for this column is 128. If you set a length that is equal to that of the one set in the "dst" column it will cause problems in situations where the system needs to append additional words to the aliased URL. For example, URLs generated for feeds will have "/feed" added to the end. You should enter a value that is the length of the "dst" column minus the length of any strings that might get added to the end of the URL. The length of strings that might get added to the end of your URLs depends on which modules you have enabled and on your Pathauto settings. The recommended and default value is 100.') .'
'; - $output .= ''. t('Raw tokens: In Pathauto it is appropriate to use the -raw form of tokens. Paths are sent through a filtering system which ensures that raw user content is filtered. Failure to use -raw tokens can cause problems with the Pathauto punctuation filtering system.') .'
'; + $output = '' . t('Provides a mechanism for modules to automatically generate aliases for the content they manage.') . '
'; + $output .= '' . t('The maximum alias length and maximum component length values default to 100 and have a limit of 128 from Pathauto. This length is limited by the length of the "alias" column of the url_alias database table. The default database schema for this column is 128. If you set a length that is equal to that of the one set in the "alias" column it will cause problems in situations where the system needs to append additional words to the aliased URL. For example, URLs generated for feeds will have "/feed" added to the end. You should enter a value that is the length of the "alias" column minus the length of any strings that might get added to the end of the URL. The length of strings that might get added to the end of your URLs depends on which modules you have enabled and on your Pathauto settings. The recommended and default value is 100.') . '
'; return $output; } } /** - * Implementation of hook_perm(). + * Implement hook_permission(). */ -function pathauto_perm() { - return array('administer pathauto', 'notify of path changes'); +function pathauto_permission() { + return array( + 'administer pathauto' => array( + 'title' => t('Administer pathauto'), + 'description' => t('PLACEHOLDER'), + ), + 'notify of path changes' => array( + 'title' => t('Notify of Path Changes'), + 'description' => t('PLACEHOILDER'), + ), + ); } /** - * Implementation of hook_menu(). + * Implement hook_menu(). */ function pathauto_menu() { - $items['admin/build/path/pathauto'] = array( + $items['admin/config/search/path/pathauto'] = array( 'title' => 'Automated alias settings', 'page callback' => 'drupal_get_form', 'page arguments' => array('pathauto_admin_settings'), @@ -54,12 +62,13 @@ function pathauto_menu() { 'file' => 'pathauto.admin.inc', ); - $items['admin/build/path/delete_bulk'] = array( + $items['admin/config/search/path/delete_bulk'] = array( 'title' => 'Delete aliases', 'page callback' => 'drupal_get_form', 'page arguments' => array('pathauto_admin_delete'), 'access arguments' => array('administer url aliases'), 'type' => MENU_LOCAL_TASK, + 'weight' => 11, 'file' => 'pathauto.admin.inc', ); @@ -77,99 +86,119 @@ function _pathauto_include() { } /** - * Implementation of hook_token_values() for Pathauto specific tokens. + * Implement hook_tokens() for Pathauto specific tokens. */ -function pathauto_token_values($type, $object = NULL) { +function pathauto_tokens($type, $tokens, array $data = array(), array $options = array()) { + $replacements = array(); if (module_exists('taxonomy')) { - if ($type == 'taxonomy' || $type == 'node' || $type == 'all') { + if ($type == 'term' || $type == 'node') { _pathauto_include(); - switch ($type) { - case 'node': - // Get the bookpathalias token - $values['bookpathalias'] = ''; - // We're on a node and it's a book and it has a parent? Get the book path alias. - if (module_exists('book') && !empty($object->book['menu_name'])) { - for ($i = 1; $i < 10; $i++) { - $second_child = $i + 2; - if ($object->book["p$second_child"] === 0) { - $parent_node = db_result(db_query('SELECT link_path FROM {menu_links} WHERE mlid = %d', $object->book["p$i"])); - break; - } - } - $values['bookpathalias'] = drupal_get_path_alias($parent_node); - } - + $sanitize = !empty($options['sanitize']); + $separator = variable_get('pathauto_separator', '-'); + $catpath = $alias = ''; + + if (($type == 'node' && !empty($data['node'])) || ($type == 'term' && !empty($data['term']))) { + if ($type == 'node') { + $node = $data['node']; // Get taxonomy related data. - $vid = db_result(db_query_range("SELECT t.vid FROM {term_node} r INNER JOIN {term_data} t ON r.tid = t.tid INNER JOIN {vocabulary} v ON t.vid = v.vid WHERE r.vid = %d ORDER BY v.weight, t.weight, t.name", $object->vid, 0, 1)); - $category = db_fetch_object(db_query_range("SELECT t.tid, t.name FROM {term_data} t INNER JOIN {term_node} r ON r.tid = t.tid WHERE t.vid = %d AND r.nid = %d ORDER BY weight", $vid, $object->nid, 0, 1)); - $category->vid = $vid; - // In the realm of nodes these are terms, in the realm of Taxonomy, cats - $label = 'term'; - - case 'taxonomy': - default: - if (!isset($category)) { - $category = $object; - } - if (!isset($label)) { - $label = 'cat'; + $vid = db_query_range("SELECT t.vid FROM {taxonomy_index} i INNER JOIN {taxonomy_term_data} t ON i.tid = t.tid INNER JOIN {taxonomy_vocabulary} v ON t.vid = v.vid WHERE i.nid = :nid ORDER BY v.weight, t.weight, t.name", 0, 1, array(':nid' => $node->nid))->fetchColumn(); + $term = db_query_range("SELECT t.tid, t.name FROM {taxonomy_term_data} t INNER JOIN {taxonomy_index} i ON i.tid = t.tid WHERE t.vid = :vid AND i.nid = :nid ORDER BY weight", 0, 1, array(':vid' => $vid, ':nid' => $node->nid))->fetchObject(); + $term->vid = $vid; + } + elseif ($type == 'term') { + $term = $data['term']; + } + + if (isset($term->tid)) { + $parents = taxonomy_get_parents_all($term->tid); + array_shift($parents); + foreach ($parents as $parent) { + // Replace any '/' characters in individual terms which might create confusing URLs + $catpath = '/' . pathauto_cleanstring(check_plain(preg_replace('/\//', '', $parent->name))) . $catpath; } - if (isset($category->tid)) { - $separator = variable_get('pathauto_separator', '-'); - $parents = taxonomy_get_parents_all($category->tid); - array_shift($parents); - $catpath = ''; - $catpath_raw = ''; - foreach ($parents as $parent) { - // Replace any / characters in individual terms which might create confusing URLs - $catpath = pathauto_cleanstring(check_plain(preg_replace('/\//', '', $parent->name))) .'/'. $catpath; - $catpath_raw = pathauto_cleanstring(preg_replace('/\//', '', $parent->name)) .'/'. $catpath_raw; - } - $values[$label .'path'] = $catpath .'/'. check_plain($category->name); - $values[$label .'path-raw'] = $catpath_raw .'/'. $category->name; - $values[$label .'alias'] = drupal_get_path_alias('taxonomy/term/'. $category->tid); - if (!strncasecmp($values[$label .'alias'], 'taxonomy', 8)) { - $values[$label .'alias'] = check_plain($category->name); - } + + $catpath = $catpath . '/' . check_plain($term->name); + $alias = drupal_get_path_alias('taxonomy/term/' . $term->tid); + if (!strncasecmp($alias, 'taxonomy', 8)) { + $alias = check_plain($term->name); } - else { // Provide some defaults if they aren't set. - $values[$label .'path'] = ''; - $values[$label .'path-raw'] = ''; - $values[$label .'alias'] = ''; + } + + foreach ($tokens as $name => $original) { + switch ($name) { + case 'bookpathalias': + if (module_exists('book') && !empty($node->book['menu_name'])) { + for ($i = 1; $i < 10; $i++) { + $second_child = $i + 2; + if ($node->book["p$second_child"] === 0) { + $parent_node = db_query('SELECT link_path FROM {menu_links} WHERE mlid = :mlid', array(':mlid' => $node->book["p$i"]))->fetchObject(); + break; + } + } + $replacements[$original] = drupal_get_path_alias($parent_node); + } + else { + $replacements[$original] = ''; + } + break; + + case 'termpath': + case 'catpath': + $replacements[$original] = $catpath; + break; + + case 'termalias': + case 'catalias': + $replacements[$original] = $alias; + break; } + } } - return $values; } } + return $replacements; } /** - * Implementation of hook_token_list() for Pathauto specific tokens. + * Implement hook_token_info() for Pathauto specific tokens. */ -function pathauto_token_list($type = 'all') { +function pathauto_token_info() { $tokens = array(); + if (module_exists('taxonomy')) { - if ($type == 'taxonomy' || $type == 'all') { - $tokens['taxonomy']['catpath'] = t('As [cat], but including its supercategories separated by /.'); - $tokens['taxonomy']['catpath-raw'] = t('As [cat-raw], but including its supercategories separated by /. WARNING - raw user input.'); - $tokens['taxonomy']['catalias'] = t('URL alias for the term.'); - } - if ($type == 'node' || $type == 'all') { - $tokens['node']['termpath'] = t('As [term], but including its supercategories separated by /.'); - $tokens['node']['termpath-raw'] = t('As [term-raw], but including its supercategories separated by /. WARNING - raw user input.'); - $tokens['node']['termalias'] = t('URL alias for the term.'); - } - } - if (module_exists('book')) { - if ($type == 'node' || $type == 'all') { - $tokens['node']['bookpathalias'] = t('URL alias for the parent book.'); + $tokens['term']['catpath'] = array( + 'name' => t("Node's Term Path"), + 'description' => t('As [cat], but including its supercategories separated by /.'), + ); + $tokens['term']['catalias'] = array( + 'name' => t("Node's Term Alias"), + 'description' => t('URL alias for the term.'), + ); + + $tokens['node']['termpath'] = array( + 'name' => t('Term Path'), + 'description' => t('As [term], but including its supercategories separated by /.'), + ); + $tokens['node']['termalias'] = array( + 'name' => t('Term Alias'), + 'description' => t('URL alias for the term.'), + ); + + if (module_exists('book')) { + $tokens['node']['bookpathalias'] = array( + 'name' => t('Book Path Alias'), + 'description' => t('URL alias for the parent book.'), + ); } } - return $tokens; + + return array( + 'tokens' => $tokens, + ); } /** - * Implementation of hook_path_alias_types(). + * Implement hook_path_alias_types(). * * Used primarily by the bulk delete form. */ @@ -194,77 +223,95 @@ function pathauto_path_alias_types() { // Some node related functions. /** - * Implementation of hook_nodeapi(). + * Implement hook_node_presave(). */ -function pathauto_nodeapi(&$node, $op, $teaser, $page) { +function pathauto_node_presave($node) { if (module_exists('path')) { - switch ($op) { - case 'presave': - // About to be saved (before insert/update) - if (!empty($node->pathauto_perform_alias) && isset($node->old_alias) - && $node->path == '' && $node->old_alias != '') { - /** - * There was an old alias, but when pathauto_perform_alias was checked - * the javascript disabled the textbox which led to an empty value being - * submitted. Restoring the old path-value here prevents the Path module - * from deleting any old alias before Pathauto gets control. - */ - $node->path = $node->old_alias; - } - break; - case 'insert': - case 'update': - _pathauto_include(); - // Get the specific pattern or the default - if (variable_get('language_content_type_'. $node->type, 0)) { - $pattern = trim(variable_get('pathauto_node_'. $node->type .'_'. $node->language .'_pattern', FALSE)); - } - if (empty($pattern)) { - $pattern = trim(variable_get('pathauto_node_'. $node->type .'_pattern', FALSE)); - if (empty($pattern)) { - $pattern = trim(variable_get('pathauto_node_pattern', FALSE)); - } - } - // Only do work if there's a pattern - if ($pattern) { - // Only create an alias if the checkbox was not provided or if the checkbox was provided and is checked - if (!isset($node->pathauto_perform_alias) || $node->pathauto_perform_alias) { - $placeholders = pathauto_get_placeholders('node', $node); - $src = "node/$node->nid"; - $alias = pathauto_create_alias('node', $op, $placeholders, $src, $node->nid, $node->type, $node->language); - } - } - break; - case 'delete': - path_set_alias('node/'. $node->nid); - path_set_alias('node/'. $node->nid .'/feed'); - break; - default: - break; + // About to be saved (before insert/update) + if (!empty($node->path['pathauto_perform_alias']) && isset($node->path['old_alias']) + && $node->path['alias'] == '' && $node->path['old_alias'] != '') { + /** + * There was an old alias, but when pathauto_perform_alias was checked + * the javascript disabled the textbox which led to an empty value being + * submitted. Restoring the old path-value here prevents the Path module + * from deleting any old alias before Pathauto gets control. + */ + $node->path['alias'] = $node->path['old_alias']; + } + } +} + +/** + * Implement hook_node_insert(). + */ +function pathauto_node_insert($node) { + _pathauto_node_insert_update($node, 'insert'); +} + +/** + * Implement hook_node_update(). + */ +function pathauto_node_update($node) { + _pathauto_node_insert_update($node, 'update'); +} + +/** + * Internal helper for node insert/update duplicate functionality. + */ +function _pathauto_node_insert_update($node, $op) { + if (module_exists('path')) { + _pathauto_include(); + // Get the specific pattern or the default + if (variable_get('language_content_type_' . $node->type, 0)) { + $pattern = trim(variable_get('pathauto_node_' . $node->type . '_' . $node->language . '_pattern', FALSE)); } + if (empty($pattern)) { + $pattern = trim(variable_get('pathauto_node_' . $node->type . '_pattern', FALSE)); + if (empty($pattern)) { + $pattern = trim(variable_get('pathauto_node_pattern', FALSE)); + } + } + // Only do work if there's a pattern + if ($pattern) { + // Only create an alias if the checkbox was not provided or if the checkbox was provided and is checked + if (!isset($node->path['pathauto_perform_alias']) || $node->path['pathauto_perform_alias']) { + $source = "node/$node->nid"; + $alias = pathauto_create_alias('node', $op, $source, array('node' => $node), $node->type, $node->language); + } + } + } +} + +/** + * Implement hook_node_delete(). + */ +function pathauto_node_delete($node) { + if (module_exists('path')) { + path_delete(array('source' => 'node/' . $node->nid)); + path_delete(array('source' => 'node/' . $node->nid . '/feed')); } } /** - * Implementation of hook_form_alter(). + * Implement hook_form_alter(). * * This allows alias creators to override Pathauto and specify their * own aliases (Pathauto will be invisible to other users). Inserted * into the path module's fieldset in the node form. */ -function pathauto_form_alter(&$form, $form_state, $form_id) { - // Process only node forms. - if (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id) { +function pathauto_form_alter(&$form, &$form_state, $form_id) { + // Only do this for node forms + if (!empty($form['#node_edit_form'])) { $node = $form['#node']; $pattern = FALSE; // Find if there is an automatic alias pattern for this node type. if (isset($form['language'])) { $language = isset($form['language']['#value']) ? $form['language']['#value'] : $form['language']['#default_value']; - $pattern = trim(variable_get('pathauto_node_'. $form['type']['#value'] .'_'. $language .'_pattern', '')); + $pattern = trim(variable_get('pathauto_node_' . $form['type']['#value'] . '_' . $language . '_pattern', '')); } if (!$pattern) { - $pattern = trim(variable_get('pathauto_node_'. $form['type']['#value'] .'_pattern', '')); + $pattern = trim(variable_get('pathauto_node_' . $form['type']['#value'] . '_pattern', '')); if (!$pattern) { $pattern = trim(variable_get('pathauto_node_pattern', '')); } @@ -278,9 +325,9 @@ function pathauto_form_alter(&$form, $fo // alias that would be genereted by pathauto. If they are the same, // then keep the automatic alias enabled. _pathauto_include(); - $placeholders = pathauto_get_placeholders('node', $node); - $pathauto_alias = pathauto_create_alias('node', 'return', $placeholders, "node/{$node->nid}", $node->nid, $node->type, $node->language); - $node->pathauto_perform_alias = isset($node->path) && $node->path == $pathauto_alias; + $path = path_load(array('source' => 'node/' . $node->nid)); + $pathauto_alias = pathauto_create_alias('node', 'return', "node/{$node->nid}", array('node' => $node), $node->type, $node->language); + $node->pathauto_perform_alias = !empty($path['alias']) && $path['alias'] == $pathauto_alias; } else { // If this is a new node, enable the automatic alias. @@ -290,7 +337,7 @@ function pathauto_form_alter(&$form, $fo // Add JavaScript that will disable the path textfield when the automatic // alias checkbox is checked. - drupal_add_js(drupal_get_path('module', 'pathauto') .'/pathauto.js'); + drupal_add_js(drupal_get_path('module', 'pathauto') . '/pathauto.js'); $form['path']['pathauto_perform_alias'] = array( '#type' => 'checkbox', @@ -301,19 +348,19 @@ function pathauto_form_alter(&$form, $fo ); if (user_access('administer pathauto')) { - $form['path']['pathauto_perform_alias']['#description'] .= ' '. t('To control the format of the generated aliases, see the automated alias settings.', array('@pathauto' => url('admin/build/path/pathauto'))); + $form['path']['pathauto_perform_alias']['#description'] .= ' ' . t('To control the format of the generated aliases, see the automated alias settings.', array('@pathauto' => url('admin/config/search/path/pathauto'))); } - if ($node->pathauto_perform_alias && !empty($node->old_alias) && empty($node->path)) { - $form['path']['path']['#default_value'] = $node->old_alias; - $node->path = $node->old_alias; + if ($node->pathauto_perform_alias && !empty($node->old_alias) && empty($path['alias'])) { + $form['path']['alias']['#default_value'] = $node->old_alias; + $path['alias'] = $node->old_alias; } // For Pathauto to remember the old alias and prevent the Path-module from deleteing it when Pathauto wants to preserve it - if (isset($node->path)) { + if (!empty($path['alias'])) { $form['path']['old_alias'] = array( '#type' => 'value', - '#value' => $node->path, + '#value' => $path['alias'], ); } } @@ -321,7 +368,7 @@ function pathauto_form_alter(&$form, $fo } /** - * Implementation of hook_node_operations(). + * Implement hook_node_operations(). */ function pathauto_node_operations() { $operations = array( @@ -341,10 +388,9 @@ function pathauto_node_operations() { */ function pathauto_node_operations_update($nodes) { _pathauto_include(); - foreach ($nodes as $nid) { - $node = node_load($nid); - $placeholders = pathauto_get_placeholders('node', $node); - pathauto_create_alias('node', 'bulkupdate', $placeholders, "node/$node->nid", $node->nid, $node->type); + $nodes = node_load_multiple($nodes); + foreach ($nodes as $node) { + pathauto_create_alias('node', 'bulkupdate', "node/$node->nid", array('node' => $node), $node->type); } } @@ -352,100 +398,123 @@ function pathauto_node_operations_update // Taxonomy related functions. /** - * Implementation of hook_taxonomy(). + * Implement hook_taxonomy_term_insert(). */ -function pathauto_taxonomy($op, $type, $object = NULL) { - switch ($type) { - case 'term': - switch ($op) { - case 'insert': - case 'update': - _pathauto_include(); - // Use the category info to automatically create an alias - $category = (object) $object; - if ($category->name) { - $count = _taxonomy_pathauto_alias($category, $op); - } +function pathauto_taxonomy_term_insert($term) { + // taxonomy.tokens.inc expects a description + if (!isset($term->description)) { + $term->description = NULL; + } + _pathauto_taxonomy_term_insert_update($term, 'insert'); +} - // For all children generate new alias (important if [catpath] used) - foreach (taxonomy_get_tree($category->vid, $category->tid) as $subcategory) { - $count = _taxonomy_pathauto_alias($subcategory, $op); - } +/** + * Implement hook_taxonomy_term_update(). + */ +function pathauto_taxonomy_term_update($term) { + _pathauto_taxonomy_term_insert_update($term, 'update'); +} - break; - case 'delete': - // If the category is deleted, remove the path aliases - $category = (object) $object; - path_set_alias('taxonomy/term/'. $category->tid); - path_set_alias(taxonomy_term_path($category)); - path_set_alias('forum/'. $category->tid); - path_set_alias('taxonomy/term/'. $category->tid .'/0/feed'); - break; - default: - break; - } - break; - default: - break; +/** + * Internal helper for taxonomy term insert/update duplicate functionality + */ +function _pathauto_taxonomy_term_insert_update($term, $op) { + _pathauto_include(); + if ($term->name) { + $count = _taxonomy_pathauto_alias($term, $op); + } + + // For all children generate new alias (important if [catpath] used) + foreach (taxonomy_get_tree($term->vid, $term->tid) as $subterm) { + $count = _taxonomy_pathauto_alias($subterm, $op); } } +/** + * Implement hook_taxonomy_term_delete(). + */ +function pathauto_taxonomy_term_delete($term) { + path_delete(array('source' => 'taxonomy/term/' . $term->tid)); + path_delete(array('source' => 'forum/' . $term->tid)); + path_delete(array('source' => 'taxonomy/term/' . $term->tid . '/0/feed')); +} + //============================================================================== -// User related functions. +// User related functions. For users, trackers, and blogs. /** - * Implementation of hook_user() for users, trackers, and blogs. + * Implement hook_user_insert(). */ -function pathauto_user($op, &$edit, &$user, $category = FALSE) { - switch ($op) { - case 'insert': - case 'update': - _pathauto_include(); - // Use the username to automatically create an alias - $pathauto_user = (object) array_merge((array) $user, $edit); - if ($user->name) { - $placeholders = pathauto_get_placeholders('user', $pathauto_user); - $src = 'user/'. $user->uid; - $alias = pathauto_create_alias('user', $op, $placeholders, $src, $user->uid); - - if (module_exists('blog')) { - $new_user = drupal_clone($user); - if ($category == 'account') { - $new_user->roles = isset($edit['roles']) ? $edit['roles'] : array(); - $new_user->roles[DRUPAL_AUTHENTICATED_RID] = t('authenticated user'); // Add this back - } - if (user_access('create blog entries', $new_user)) { - $src = 'blog/'. $user->uid; - $alias = pathauto_create_alias('blog', $op, $placeholders, $src, $user->uid); - } - else { - path_set_alias('blog/'. $user->uid); - path_set_alias('blog/'. $user->uid .'/feed'); - } - } - if (module_exists('tracker')) { - $src = 'user/'. $user->uid .'/track'; - $alias = pathauto_create_alias('tracker', $op, $placeholders, $src, $user->uid); - } - if (module_exists('contact')) { - $src = 'user/'. $user->uid .'/contact'; - $alias = pathauto_create_alias('contact', $op, $placeholders, $src, $user->uid); - } +function pathauto_user_insert(&$edit, $account, $category) { + _pathauto_user_insert_update($edit, $account, $category, 'insert'); +} + +/** + * Implement hook_user_update(). + */ +function pathauto_user_update(&$edit, $account, $category) { + _pathauto_user_insert_update($edit, $account, $category, 'update'); +} + +/** + * Internal helper for user insert/update duplicate functionality. + */ +function _pathauto_user_insert_update(&$edit, $account, $category, $op) { + _pathauto_include(); + // Use the username to automatically create an alias + $pathauto_user = (object) array_merge((array) $account, $edit); + if ($pathauto_user->name) { + $source = 'user/' . $pathauto_user->uid; + $alias = pathauto_create_alias('user', $op, $source, array('user' => $pathauto_user)); + + if (module_exists('blog')) { + $new_user = clone $pathauto_user; + if ($category == 'account') { + $new_user->roles = isset($edit['roles']) ? $edit['roles'] : array(); + $new_user->roles[DRUPAL_AUTHENTICATED_RID] = t('authenticated user'); // Add this back + } + if (user_access('create blog entries', $new_user)) { + $source = 'blog/' . $new_user->uid; + $alias = pathauto_create_alias('blog', $op, $source, array('user' => $new_user)); } + else { + path_delete(array('source' => 'blog/' . $new_user->uid)); + path_delete(array('source' => 'blog/' . $new_user->uid . '/feed')); + } + } + if (module_exists('tracker')) { + $source = 'user/' . $new_user->uid . '/track'; + $alias = pathauto_create_alias('tracker', $op, $source, array('user' => $new_user)); + } + if (module_exists('contact')) { + $source = 'user/' . $new_user->uid . '/contact'; + $alias = pathauto_create_alias('contact', $op, $source, array('user' => $new_user)); + } + } +} + +/** + * Implement hook_user_delete(). + */ +function pathauto_user_cancel($edit, $account, $method) { + switch ($method) { + case 'user_cancel_block': + case 'user_cancel_block_unpublish': + // Don't remove aliases because the user may become active again later. break; - case 'delete': - // If the user is deleted, remove the path aliases - $user = (object) $user; - path_set_alias('user/'. $user->uid); + + case 'user_cancel_reassign': + case 'user_cancel_delete': + // Remove the users's path aliases + $user = (object) $account; + path_delete(array('source' => 'user/' . $user->uid)); // They may have enabled these modules and/or feeds when the user was created, so let's try to delete all of them - path_set_alias('blog/'. $user->uid); - path_set_alias('blog/'. $user->uid .'/feed'); - path_set_alias('user/'. $user->uid .'/track'); - path_set_alias('user/'. $user->uid .'/track/feed'); - path_set_alias('user/'. $user->uid .'/contact'); - break; - default: + path_delete(array('source' => 'blog/' . $user->uid)); + path_delete(array('source' => 'blog/' . $user->uid . '/feed')); + path_delete(array('source' => 'user/' . $user->uid . '/track')); + path_delete(array('source' => 'user/' . $user->uid . '/track/feed')); + path_delete(array('source' => 'user/' . $user->uid . '/contact')); break; } } Index: pathauto_node.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/pathauto/pathauto_node.inc,v retrieving revision 1.48 diff -u -p -r1.48 pathauto_node.inc --- pathauto_node.inc 28 Jun 2008 15:41:15 -0000 1.48 +++ pathauto_node.inc 10 Nov 2009 00:24:09 -0000 @@ -9,7 +9,7 @@ */ /** - * Implementation of hook_pathauto(). + * Implement hook_pathauto(). */ function node_pathauto($op) { switch ($op) { @@ -19,17 +19,13 @@ function node_pathauto($op) { $settings['token_type'] = 'node'; $settings['groupheader'] = t('Node path settings'); $settings['patterndescr'] = t('Default path pattern (applies to all node types with blank patterns below)'); - $settings['patterndefault'] = t('content/[title-raw]'); + $settings['patterndefault'] = t('content/[node:title]'); $settings['bulkname'] = t('Bulk generate aliases for nodes that are not aliased'); $settings['bulkdescr'] = t('Generate aliases for all existing nodes which do not already have aliases.'); - $patterns = token_get_list('node'); - foreach ($patterns as $type => $pattern_set) { - if ($type != 'global') { - foreach ($pattern_set as $pattern => $description) { - $settings['placeholders']['['. $pattern .']'] = $description; - } - } + $tokens = token_info(); + foreach ($tokens['tokens']['node'] as $key => $info) { + $settings['tokens']["[node:$key]"] = $info['description']; } $settings['supportsfeeds'] = 'feed'; @@ -39,15 +35,15 @@ function node_pathauto($op) { else { $languages = array(); } - foreach (node_get_types('names') as $node_type => $node_name) { - if (variable_get('language_content_type_'. $node_type, 0) && count($languages)) { + foreach (node_type_get_names() as $node_type => $node_name) { + if (variable_get('language_content_type_' . $node_type, 0) && count($languages)) { $settings['patternitems'][$node_type] = t('Default path pattern for @node_type (applies to all @node_type node types with blank patterns below)', array('@node_type' => $node_name)); foreach ($languages as $lang_code => $lang_name) { if (!empty($lang_code)) { - $settings['patternitems'][$node_type .'_'. $lang_code] = t('Pattern for all @node_type paths in @language', array('@node_type' => $node_name, '@language' => $lang_name)); + $settings['patternitems'][$node_type . '_' . $lang_code] = t('Pattern for all @node_type paths in @language', array('@node_type' => $node_name, '@language' => $lang_name)); } else { - $settings['patternitems'][$node_type .'_'. $lang_code] = t('Pattern for all language neutral @node_type paths', array('@node_type' => $node_name)); + $settings['patternitems'][$node_type . '_' . $lang_code] = t('Pattern for all language neutral @node_type paths', array('@node_type' => $node_name)); } } } @@ -70,7 +66,7 @@ function node_pathauto_bulkupdate() { // If there's a default pattern we assume all types might be updated. if (trim(variable_get('pathauto_node_pattern', ''))) { - $pattern_types = array_keys(node_get_types('names')); + $pattern_types = array_keys(node_type_get_types()); } else { // Check first for a node specific pattern... @@ -78,15 +74,15 @@ function node_pathauto_bulkupdate() { if (module_exists('locale')) { $languages = array('' => t('Language neutral')) + locale_language_list('name'); } - foreach (array_keys(node_get_types('names')) as $type) { - if (trim(variable_get('pathauto_node_'. $type .'_pattern', ''))) { + foreach (array_keys(node_type_get_types()) as $type) { + if (trim(variable_get('pathauto_node_' . $type . '_pattern', ''))) { $pattern_types[$type] = $type; continue; } // ...then for a node-language pattern. - if (variable_get('language_content_type_'. $type, 0) && $languages) { + if (variable_get('language_content_type_' . $type, 0) && $languages) { foreach ($languages as $lang_code => $lang_name) { - if (trim(variable_get('pathauto_node_'. $type .'_'. $lang_code .'_pattern', ''))) { + if (trim(variable_get('pathauto_node_' . $type . '_' . $lang_code . '_pattern', ''))) { $pattern_types[$type] = $type; continue 2; } @@ -97,22 +93,22 @@ function node_pathauto_bulkupdate() { $count = 0; if (count($pattern_types)) { - $query = "SELECT n.nid, n.vid, n.type, n.title, n.uid, n.created, n.language, alias.src, alias.dst FROM {node} n LEFT JOIN {url_alias} alias ON CONCAT('node/', CAST(n.nid AS CHAR)) = alias.src WHERE alias.src IS NULL AND n.type IN (". db_placeholders($pattern_types, 'varchar') .')'; - $result = db_query_range($query, $pattern_types, 0, variable_get('pathauto_max_bulk_update', 50)); + // @TODO We could rewrite this section to use node_load_multiple + $query = "SELECT n.nid, n.vid, n.type, n.title, n.uid, n.created, n.language, ua.source, ua.alias FROM {node} n LEFT JOIN {url_alias} ua ON CONCAT('node/', CAST(n.nid AS CHAR)) = ua.source WHERE ua.source IS NULL AND n.type IN (:pattern_types)"; + $result = db_query_range($query, 0, variable_get('pathauto_max_bulk_update', 50), array(':pattern_types' => $pattern_types)); - $placeholders = array(); - while ($node_ref = db_fetch_object($result)) { + foreach ($result as $node_ref) { $node = node_load($node_ref->nid, NULL, TRUE); - $node->src = $node_ref->src; - $node->dst = $node_ref->dst; + $node->source = $node_ref->source; + $node->alias = $node_ref->alias; if (module_exists('taxonomy')) { // Must populate the terms for the node here for the category // placeholders to work - $node->taxonomy = array_keys(taxonomy_node_get_terms($node)); + // @TODO Find the Drupal 7 alternative for this if necessary + //$node->taxonomy = array_keys(taxonomy_node_get_terms($node)); } - $placeholders = pathauto_get_placeholders('node', $node); - $src = "node/$node->nid"; - if (pathauto_create_alias('node', 'bulkupdate', $placeholders, $src, $node->nid, $node->type, $node->language)) { + $source = "node/$node->nid"; + if (pathauto_create_alias('node', 'bulkupdate', $source, array('node' => $node), $node->type, $node->language)) { $count++; } } Index: pathauto_taxonomy.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/pathauto/pathauto_taxonomy.inc,v retrieving revision 1.41 diff -u -p -r1.41 pathauto_taxonomy.inc --- pathauto_taxonomy.inc 28 Aug 2008 16:14:06 -0000 1.41 +++ pathauto_taxonomy.inc 10 Nov 2009 00:24:09 -0000 @@ -9,24 +9,24 @@ */ /** - * Implementation of hook_pathauto() for taxonomy module. + * Implement hook_pathauto() for taxonomy module. */ function taxonomy_pathauto($op) { switch ($op) { case 'settings': $settings = array(); $settings['module'] = 'taxonomy'; - $settings['token_type'] = 'taxonomy'; + $settings['token_type'] = 'term'; $settings['groupheader'] = t('Taxonomy term path settings'); $settings['patterndescr'] = t('Default path pattern (applies to all vocabularies with blank patterns below)'); - $settings['patterndefault'] = t('category/[vocab-raw]/[catpath-raw]'); - $patterns = token_get_list('taxonomy'); - foreach ($patterns as $type => $pattern_set) { - if ($type != 'global') { - foreach ($pattern_set as $pattern => $description) { - $settings['placeholders']['['. $pattern .']'] = $description; - } - } + $settings['patterndefault'] = t('category/[vocabulary:name]/[term:catpath]'); + + $tokens = token_info(); + foreach ($tokens['tokens']['term'] as $key => $info) { + $settings['tokens']["[term:$key]"] = $info['description']; + } + foreach ($tokens['tokens']['vocabulary'] as $key => $info) { + $settings['tokens']["[vocabulary:$key]"] = $info['description']; } $settings['supportsfeeds'] = '0/feed'; $settings['bulkname'] = t('Bulk generate aliases for terms that are not aliased'); @@ -54,39 +54,47 @@ function taxonomy_pathauto($op) { * Generate aliases for all categories without aliases. */ function taxonomy_pathauto_bulkupdate() { - // From all node types, only attempt to update those with patterns - $pattern_vids = array(); + // Initialize db_or(). + $pattern_or = db_or(); + + // From all vocabularies, only attempt to update those with patterns. foreach (taxonomy_get_vocabularies() as $vid => $info) { - $pattern = trim(variable_get('pathauto_taxonomy_'. $vid .'_pattern', '')); + $pattern = trim(variable_get('pathauto_taxonomy_' . $vid . '_pattern', '')); // If it's not set, check the default - // TODO - if there's a default we shouldn't do this crazy where statement because all vocabs get aliases - // TODO - special casing to exclude the forum vid (and the images vid and...?) + // TODO - If there's a default we shouldn't do this crazy where statement because all vocabularies get aliases. + // TODO - Special casing to exclude the forum vid (and the images vid and...?). if (empty($pattern)) { $pattern = trim(variable_get('pathauto_taxonomy_pattern', '')); } if (!empty($pattern)) { - $pattern_vids[] = $vid; - if (empty($vid_where)) { - $vid_where = " AND (vid = '%s' "; - } - else { - $vid_where .= " OR vid = '%s'"; - } + $pattern_or->condition('vid', $vid); } } - $vid_where .= ')'; - // Exclude the forums and join all the args into one array so they can be passed to db_query - $forum_vid[] = variable_get('forum_nav_vocabulary', ''); - $query_args = array_merge($forum_vid, $pattern_vids); - $query = "SELECT tid, vid, name, src, dst FROM {term_data} LEFT JOIN {url_alias} ON CONCAT('taxonomy/term/', CAST(tid AS CHAR)) = src WHERE src IS NULL AND vid <> %d ". $vid_where; - $result = db_query_range($query, $query_args, 0, variable_get('pathauto_max_bulk_update', 50)); + // Set up the query object. + $query = db_select('taxonomy_term_data', 'td'); + $query->leftJoin('url_alias', 'ua', "CONCAT('taxonomy/term/', CAST(tid AS CHAR)) = source"); + $query->fields('td', array('tid', 'vid', 'name')); + $query->fields('ua', array('source', 'alias')); + $query->isNull('source'); + + // Exclude the forums. + $query->condition('vid', variable_get('forum_nav_vocabulary', ''), '<>'); + + // Add $pattern_or condition to query. + $query->condition($pattern_or); + + // Add range to query. + $query->range(0, variable_get('pathauto_max_bulk_update', 50)); + + // Execute query. + $result = $query->execute(); $count = 0; $placeholders = array(); - while ($category = db_fetch_object($result)) { - $count += _taxonomy_pathauto_alias($category, 'bulkupdate'); + foreach ($result as $term) { + $count += _taxonomy_pathauto_alias($term, 'bulkupdate'); } drupal_set_message(format_plural($count, @@ -100,22 +108,22 @@ function taxonomy_pathauto_bulkupdate() * @param $category * A taxonomy object. */ -function _taxonomy_pathauto_alias($category, $op) { +function _taxonomy_pathauto_alias($term, $op) { $count = 0; - - $placeholders = pathauto_get_placeholders('taxonomy', $category); + $term = taxonomy_term_load($term->tid); + $vocabulary = taxonomy_vocabulary_load($term->vid); $forum_vid = variable_get('forum_nav_vocabulary', ''); // If we're in a forum vocabulary, also create a forum container, forum, or forum topic alias. - if (module_exists('forum') && $forum_vid == (int)$category->vid) { - $src = 'forum/'. $category->tid; - if (pathauto_create_alias('forum', $op, $placeholders, $src, $category->tid, $category->vid)) { + if (module_exists('forum') && $forum_vid == (int)$term->vid) { + $source = 'forum/' . $term->tid; + if (pathauto_create_alias('forum', $op, $source, array('term' => $term, 'vocabulary' => $vocabulary), $term->vid)) { $count++; } } else { - $src = taxonomy_term_path($category); - if (pathauto_create_alias('taxonomy', $op, $placeholders, $src, $category->tid, $category->vid)) { + $source = 'taxonomy/term/' . $term->tid; + if (pathauto_create_alias('taxonomy', $op, $source, array('term' => $term, 'vocabulary' => $vocabulary), $term->vid)) { $count++; } } @@ -123,28 +131,29 @@ function _taxonomy_pathauto_alias($categ } /** - * Implementation of hook_pathauto() for forum module. + * Implement hook_pathauto() for forum module. */ function forum_pathauto($op) { switch ($op) { case 'settings': $settings = array(); $settings['module'] = 'forum'; - $settings['token_type'] = 'taxonomy'; + $settings['token_type'] = 'term'; $settings['groupheader'] = t('Forum path settings'); $settings['patterndescr'] = t('Pattern for forums and forum containers'); - $settings['patterndefault'] = t('[vocab-raw]/[catpath-raw]'); - $patterns = token_get_list('taxonomy'); - foreach ($patterns as $type => $pattern_set) { - if ($type != 'global') { - foreach ($pattern_set as $pattern => $description) { - $settings['placeholders']['['. $pattern .']'] = $description; - } - } + $settings['patterndefault'] = t('[vocabulary:name]/[term:catpath]'); + + $tokens = token_info(); + foreach ($tokens['tokens']['term'] as $key => $info) { + $settings['tokens']["[term:$key]"] = $info['description']; + } + foreach ($tokens['tokens']['vocabulary'] as $key => $info) { + $settings['tokens']["[vocabulary:$key]"] = $info['description']; } $settings['supportsfeeds'] = '0/feed'; $settings['bulkname'] = t('Bulk generate forum paths'); $settings['bulkdescr'] = t('Generate aliases for all existing forums and forum containers which do not already have aliases.'); + return (object) $settings; default: break; @@ -155,14 +164,24 @@ function forum_pathauto($op) { * Generate aliases for all forums and forum containers without aliases. */ function forum_pathauto_bulkupdate() { - $forum_vid = variable_get('forum_nav_vocabulary', ''); - $query = "SELECT tid, vid, name, src, dst FROM {term_data} LEFT JOIN {url_alias} ON CONCAT('forum/', CAST(tid AS CHAR)) = src WHERE vid = %d AND src IS NULL"; - $result = db_query_range($query, $forum_vid, 0, variable_get('pathauto_max_bulk_update', 50)); + // Set up the query object and limit it to the forum vocabulary. + $query = db_select('taxonomy_term_data', 'td'); + $query->leftJoin('url_alias', 'ua', "CONCAT('forum/', CAST(tid AS CHAR)) = source"); + $query->condition('vid', variable_get('forum_nav_vocabulary', '')); + $query->fields('td', array('tid', 'vid', 'name')); + $query->fields('ua', array('source', 'alias')); + $query->isNull('source'); + + // Add range to query. + $query->range(0, variable_get('pathauto_max_bulk_update', 50)); + + // Execute query. + $result = $query->execute(); $count = 0; $placeholders = array(); - while ($category = db_fetch_object($result)) { - $count = _taxonomy_pathauto_alias($category, 'bulkupdate') + $count; + foreach ($result as $term) { + $count += _taxonomy_pathauto_alias($term, 'bulkupdate'); } drupal_set_message(format_plural($count, Index: pathauto_user.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/pathauto/pathauto_user.inc,v retrieving revision 1.31 diff -u -p -r1.31 pathauto_user.inc --- pathauto_user.inc 11 Jul 2008 20:01:22 -0000 1.31 +++ pathauto_user.inc 10 Nov 2009 00:24:09 -0000 @@ -9,7 +9,7 @@ */ /** - * Implementation of hook_pathauto() for user aliases. + * Implement hook_pathauto() for user aliases. */ function user_pathauto($op) { switch ($op) { @@ -19,14 +19,11 @@ function user_pathauto($op) { $settings['token_type'] = 'user'; $settings['groupheader'] = t('User path settings'); $settings['patterndescr'] = t('Pattern for user account page paths'); - $settings['patterndefault'] = t('users/[user-raw]'); - $patterns = token_get_list('user'); - foreach ($patterns as $type => $pattern_set) { - if ($type != 'global') { - foreach ($pattern_set as $pattern => $description) { - $settings['placeholders']['['. $pattern .']'] = $description; - } - } + $settings['patterndefault'] = t('users/[user:name]'); + + $tokens = token_info(); + foreach ($tokens['tokens']['user'] as $key => $info) { + $settings['tokens']["[user:$key]"] = $info['description']; } $settings['bulkname'] = t('Bulk generate aliases for users that are not aliased'); @@ -38,7 +35,7 @@ function user_pathauto($op) { } /** - * Implementation of hook_pathauto() for blog aliases. + * Implement hook_pathauto() for blog aliases. */ function blog_pathauto($op) { switch ($op) { @@ -48,11 +45,13 @@ function blog_pathauto($op) { $settings['token_type'] = 'user'; $settings['groupheader'] = t('Blog path settings'); $settings['patterndescr'] = t('Pattern for blog page paths'); - $settings['patterndefault'] = t('blogs/[user-raw]'); - $patterns = token_get_list('user'); - foreach ($patterns['user'] as $pattern => $description) { - $settings['placeholders']['['. $pattern .']'] = $description; + $settings['patterndefault'] = t('blogs/[user:name]'); + + $tokens = token_info(); + foreach ($tokens['tokens']['user'] as $key => $info) { + $settings['tokens']["[user:$key]"] = $info['description']; } + $settings['supportsfeeds'] = 'feed'; $settings['bulkname'] = t('Bulk generate aliases for blogs that are not aliased'); $settings['bulkdescr'] = t('Generate aliases for all existing blog pages which do not already have aliases.'); @@ -63,7 +62,7 @@ function blog_pathauto($op) { } /** - * Implementation of hook_pathauto() for user-tracker aliases. + * Implement hook_pathauto() for user-tracker aliases. */ function tracker_pathauto($op) { switch ($op) { @@ -73,11 +72,13 @@ function tracker_pathauto($op) { $settings['token_type'] = 'user'; $settings['groupheader'] = t('User-tracker path settings'); $settings['patterndescr'] = t('Pattern for user-tracker page paths'); - $settings['patterndefault'] = t('users/[user-raw]/track'); - $patterns = token_get_list('user'); - foreach ($patterns['user'] as $pattern => $description) { - $settings['placeholders']['['. $pattern .']'] = $description; + $settings['patterndefault'] = t('users/[user:name]/track'); + + $tokens = token_info(); + foreach ($tokens['tokens']['user'] as $key => $info) { + $settings['tokens']["[user:$key]"] = $info['description']; } + $settings['supportsfeeds'] = 'feed'; $settings['bulkname'] = t('Bulk generate aliases for user-tracker paths that are not aliased'); $settings['bulkdescr'] = t('Generate aliases for all existing user-tracker pages which do not already have aliases.'); @@ -88,7 +89,7 @@ function tracker_pathauto($op) { } /** - * Implementation of hook_pathauto() for contact form aliases. + * Implement hook_pathauto() for contact form aliases. */ function contact_pathauto($op) { switch ($op) { @@ -98,11 +99,13 @@ function contact_pathauto($op) { $settings['token_type'] = 'user'; $settings['groupheader'] = t('User contact form path settings'); $settings['patterndescr'] = t('Pattern for the user contact form paths'); - $settings['patterndefault'] = t('users/[user-raw]/contact'); - $patterns = token_get_list('user'); - foreach ($patterns['user'] as $pattern => $description) { - $settings['placeholders']['['. $pattern .']'] = $description; + $settings['patterndefault'] = t('users/[user:name]/contact'); + + $tokens = token_info(); + foreach ($tokens['tokens']['user'] as $key => $info) { + $settings['tokens']["[user:$key]"] = $info['description']; } + $settings['bulkname'] = t('Bulk generate aliases for user contact form paths that are not aliased'); $settings['bulkdescr'] = t('Generate aliases for all existing user contact form pages which do not already have aliases.'); return (object) $settings; @@ -115,15 +118,14 @@ function contact_pathauto($op) { * Bulk generate aliases for all users without aliases. */ function user_pathauto_bulkupdate() { - $query = "SELECT uid, name, src, dst FROM {users} LEFT JOIN {url_alias} ON CONCAT('user/', CAST(uid AS CHAR)) = src WHERE uid > 0 AND src IS NULL"; + $query = "SELECT uid, name, source, alias FROM {users} LEFT JOIN {url_alias} ON CONCAT('user/', CAST(uid AS CHAR)) = source WHERE uid > 0 AND source IS NULL"; $result = db_query_range($query, 0, variable_get('pathauto_max_bulk_update', 50)); $count = 0; $placeholders = array(); - while ($user = db_fetch_object($result)) { - $placeholders = pathauto_get_placeholders('user', $user); - $src = 'user/'. $user->uid; - if (pathauto_create_alias('user', 'bulkupdate', $placeholders, $src, $user->uid)) { + foreach ($result as $user) { + $source = 'user/' . $user->uid; + if (pathauto_create_alias('user', 'bulkupdate', $source, array('user' => $user))) { $count++; } } @@ -137,15 +139,13 @@ function user_pathauto_bulkupdate() { * Bulk generate aliases for all blogs without aliases. */ function blog_pathauto_bulkupdate() { - $query = "SELECT uid, name, src, dst FROM {users} LEFT JOIN {url_alias} ON CONCAT('blog/', CAST(uid AS CHAR)) = src WHERE uid > 0 AND src IS NULL"; + $query = "SELECT uid, name, source, alias FROM {users} LEFT JOIN {url_alias} ON CONCAT('blog/', CAST(uid AS CHAR)) = source WHERE uid > 0 AND source IS NULL"; $result = db_query_range($query, 0, variable_get('pathauto_max_bulk_update', 50)); $count = 0; - $placeholders = array(); - while ($user = db_fetch_object($result)) { - $placeholders = pathauto_get_placeholders('user', $user); - $src = 'blog/'. $user->uid; - if (pathauto_create_alias('blog', 'bulkupdate', $placeholders, $src, $user->uid)) { + foreach ($result as $user) { + $source = 'blog/' . $user->uid; + if (pathauto_create_alias('blog', 'bulkupdate', $source, array('user' => $user))) { $count++; } } @@ -161,15 +161,13 @@ function blog_pathauto_bulkupdate() { function tracker_pathauto_bulkupdate() { // We do the double CONCAT because Pgsql8.1 doesn't support more than three arguments to CONCAT // Hopefully some day we can remove that. - $query = "SELECT uid, name, src, dst FROM {users} LEFT JOIN {url_alias} ON CONCAT(CONCAT('user/', CAST(uid AS CHAR)), '/track') = src WHERE uid > 0 AND src IS NULL"; + $query = "SELECT uid, name, source, alias FROM {users} LEFT JOIN {url_alias} ON CONCAT(CONCAT('user/', CAST(uid AS CHAR)), '/track') = source WHERE uid > 0 AND source IS NULL"; $result = db_query_range($query, 0, variable_get('pathauto_max_bulk_update', 50)); $count = 0; - $placeholders = array(); - while ($user = db_fetch_object($result)) { - $placeholders = pathauto_get_placeholders('user', $user); - $src = 'user/'. $user->uid .'/track'; - if (pathauto_create_alias('tracker', 'bulkupdate', $placeholders, $src, $user->uid)) { + foreach ($result as $user) { + $source = 'user/' . $user->uid . '/track'; + if (pathauto_create_alias('tracker', 'bulkupdate', $source, array('user' => $user))) { $count++; } } @@ -183,15 +181,13 @@ function tracker_pathauto_bulkupdate() { * Bulk generate aliases for all users without aliases */ function contact_pathauto_bulkupdate() { - $query = "SELECT uid, name, src, dst FROM {users} LEFT JOIN {url_alias} ON CONCAT(CONCAT('user/', CAST(uid AS CHAR)), '/contact') = src WHERE uid > 0 AND src IS NULL"; + $query = "SELECT uid, name, source, alias FROM {users} LEFT JOIN {url_alias} ON CONCAT(CONCAT('user/', CAST(uid AS CHAR)), '/contact') = source WHERE uid > 0 AND source IS NULL"; $result = db_query_range($query, 0, variable_get('pathauto_max_bulk_update', 50)); $count = 0; - $placeholders = array(); - while ($user = db_fetch_object($result)) { - $placeholders = pathauto_get_placeholders('user', $user); - $src = 'user/'. $user->uid .'/contact'; - if (pathauto_create_alias('contact', 'bulkupdate', $placeholders, $src, $user->uid)) { + foreach ($result as $user) { + $source = 'user/' . $user->uid . '/contact'; + if (pathauto_create_alias('contact', 'bulkupdate', $source, array('user' => $user))) { $count++; } } Index: tests/pathauto.test =================================================================== RCS file: /cvs/drupal/contributions/modules/pathauto/tests/pathauto.test,v retrieving revision 1.5 diff -u -p -r1.5 pathauto.test --- tests/pathauto.test 20 Oct 2009 18:02:18 -0000 1.5 +++ tests/pathauto.test 10 Nov 2009 00:24:09 -0000 @@ -18,10 +18,10 @@ class PathautoTestCase extends DrupalWeb /** * Implementation of getInfo(). */ - function getInfo() { + public static function getInfo() { return array( - 'name' => t('Pathauto basic tests'), - 'description' => t('Test basic pathauto functionality.'), + 'name' => 'Pathauto basic tests', + 'description' => 'Test basic pathauto functionality.', 'group' => 'Pathauto', ); } @@ -30,19 +30,19 @@ class PathautoTestCase extends DrupalWeb * Implementation of setUp(). */ function setUp() { - parent::setUp('path', 'token', 'pathauto'); + parent::setUp('path', 'pathauto'); $this->content_type = $this->drupalCreateContentType(); $this->web_user = $this->drupalCreateUser(array( 'administer pathauto', - 'create '. $this->content_type->type .' content', - 'edit own '. $this->content_type->type .' content', + 'create ' . $this->content_type->type . ' content', + 'edit own ' . $this->content_type->type . ' content', 'administer url aliases', 'create url aliases', )); // Set pathauto settings we assume to be as-is in this test. - variable_set('pathauto_node_'. $this->content_type->type .'_pattern', 'content/[title-raw]'); + variable_set('pathauto_node_' . $this->content_type->type . '_pattern', 'content/[node:title]'); variable_set('pathauto_separator', '-'); variable_set('pathauto_case', '1'); // lowercase variable_set('pathauto_max_length', '100'); @@ -51,7 +51,6 @@ class PathautoTestCase extends DrupalWeb $this->assertTrue(module_exists('pathauto'), t('Pathauto module is loaded.')); $this->assertTrue(module_exists('path'), t('Path module is loaded.')); - $this->assertTrue(module_exists('token'), t('Token module is loaded.')); } /** @@ -60,31 +59,34 @@ class PathautoTestCase extends DrupalWeb function testPathautoFunctionalTest() { $this->drupalLogin($this->web_user); - $this->drupalGet('admin/build/path/pathauto'); + $this->drupalGet('admin/config/search/path/pathauto'); $this->assertRaw(t('General settings'), 'Settings page displayed.', 'Functionality test'); // Create node for testing. $random_title = $this->randomName(10); // this contains _ - $expected_alias = 'content/simpletest-title-'. strtolower($random_title); + $expected_alias = 'content/simpletest-title-' . strtolower($random_title); + $langcode = FIELD_LANGUAGE_NONE; // Extra characters at the beginning and end of the title tests that extra separator characters are removed. $edit = array( - 'title' => ' Simpletest title '. $random_title .' [', - 'body' => 'Simpletest body '. $this->randomName(10), + "title[$langcode][0][value]" => ' Simpletest title ' . $random_title . ' [', + "body[$langcode][0][value]" => 'Simpletest body ' . $this->randomName(10), ); + $title = $edit["title[$langcode][0][value]"]; - $this->drupalPost('node/add/'. str_replace('_', '-', $this->content_type->type), $edit, 'Save'); - $this->assertRaw(t('@type %title has been created.', array('@type' => $this->content_type->name, '%title' => $edit['title'])), 'Test node submitted.', 'Functionality test'); + $this->drupalPost('node/add/' . str_replace('_', '-', $this->content_type->type), $edit, 'Save'); + $this->assertRaw(t('@type %title has been created.', array('@type' => $this->content_type->name, '%title' => $title)), 'Test node submitted.', 'Functionality test'); // Look for alias generated in the form. - $node = node_load(array('title' => $edit['title'])); - $this->drupalGet('node/'. $node->nid .'/edit'); + $nodes = node_load_multiple(array(), array('title' => $title)); + $node = reset($nodes); + $this->drupalGet('node/' . $node->nid . '/edit'); - $this->assertPattern('!