Index: pathauto_node.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto_node.inc,v retrieving revision 1.29.2.1 diff -u -r1.29.2.1 pathauto_node.inc --- pathauto_node.inc 11 Dec 2006 15:44:46 -0000 1.29.2.1 +++ pathauto_node.inc 29 Dec 2006 22:33:32 -0000 @@ -225,49 +225,3 @@ "Bulk update of nodes completed, @count aliases generated.")); } -function node_pathauto_bulkupdate_indexes() { - $query = "SELECT src,dst FROM {url_alias} WHERE src LIKE 'node/%'"; - $result = db_query($query); - $alias = db_fetch_object($result); - - $count = 0; - while ($alias) { - $count += pathauto_create_index_alias($alias->dst, 'node'); - $alias = db_fetch_object($result); - } - return $count; -} - -/** - * Menu callback; presents a listing of all nodes matching an alias prefix - */ -function node_pathauto_page() { - $prefix = ''; - $lastalpha = ''; - // Skip first two components, which will always be "pathauto/node" - for ($i = 2; arg($i); $i++) { - $prefix .= arg($i) . '/'; - if (preg_match('/[a-z]/i', arg($i))) { - $lastalpha = arg($i); - } - } - - if ($lastalpha) { - $pagetitle = check_plain(drupal_ucfirst($lastalpha)); - } - else { - $pagetitle = 'Listing'; - } - - $result = pager_query(db_rewrite_sql("SELECT n.nid FROM {url_alias} a INNER JOIN {node} n ON a.src = CONCAT('node/', n.nid) WHERE n.status = 1 AND a.dst LIKE '%s%%' ORDER BY n.sticky DESC, n.created DESC"), variable_get('default_nodes_main', 10), 0, NULL, $prefix); - - $output = ''; - while ($node = db_fetch_object($result)) { - $output .= node_view(node_load($node->nid), 1); - } - - $output .= theme('pager', NULL, variable_get('default_nodes_main', 10)); - - drupal_set_title(t($pagetitle)); - return $output; -} Index: pathauto.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.module,v retrieving revision 1.44.2.2 diff -u -r1.44.2.2 pathauto.module --- pathauto.module 8 Dec 2006 22:55:00 -0000 1.44.2.2 +++ pathauto.module 29 Dec 2006 22:33:32 -0000 @@ -89,19 +89,6 @@ '#default_value' => variable_get('pathauto_max_component_length', 100), '#description' => t('Maximum text length of any component in the alias (e.g., [title]). 100 is recommended. See Pathauto help for details.', array('@pathauto-help' => url('admin/help/pathauto')))); - $form["general"]["pathauto_indexaliases"] = array('#type' => 'checkbox', - '#title' => t('Create index aliases'), - '#default_value' => variable_get('pathauto_indexaliases', FALSE), - '#description' => t('When a pattern generates a hierarchical alias (i.e., any alias containing a slash), generate aliases for each step of the hierarchy which can be used to list content within that hierarchy. For example, if a node alias "music/concert/beethoven" is created, also create an alias "music/concert" which will list all concert nodes, and an alias "music" which will list all music nodes.')); - - // If requested, do a bulk generation of index aliases - $do_index_bulkupdate = variable_get('pathauto_indexaliases_bulkupdate', FALSE); - variable_set('pathauto_indexaliases_bulkupdate', FALSE); - $form["general"]["pathauto_indexaliases_bulkupdate"] = array('#type' => 'checkbox', - '#title' => t('Bulk generate index aliases'), - '#default_value' => FALSE, - '#description' => t('Generate index aliases based on all pre-existing aliases.')); - $form["general"]["pathauto_update_action"] = array('#type' => 'radios', '#title' => t('Update action'), '#default_value' => variable_get('pathauto_update_action', 2), '#options' => array(t('Do nothing, leaving the old alias intact'), @@ -117,7 +104,6 @@ // Call the hook on all modules - an array of 'settings' objects is returned $all_settings = module_invoke_all('pathauto', 'settings'); $modulelist = ''; - $indexcount = 0; foreach ($all_settings as $settings) { $items = ''; $module = $settings->module; @@ -176,14 +162,6 @@ '#description' => $settings->bulkdescr); } - // Perform bulk updates of indexes for this module, if asked - if ($do_index_bulkupdate) { - $function = $module.'_pathauto_bulkupdate_indexes'; - if (is_callable($function)) { - $indexcount += call_user_func($function); - } - } - // If the module supports feeds, offer to generate aliases for them if ($supportsfeeds) { $variable = 'pathauto_'.$module.'_applytofeeds'; @@ -195,12 +173,6 @@ } - if ($do_index_bulkupdate) { - drupal_set_message(format_plural($indexcount, - "Bulk update of index aliases completed, one alias generated.", - "Bulk update of index aliases completed, @count aliases generated.")); - } - // Keep track of which modules currently support pathauto variable_set('pathauto_modulelist', $modulelist); @@ -421,11 +393,6 @@ _pathauto_set_alias("$src/$feedappend", "$alias/feed", NULL, $verbose); } - // Create any relevant index aliases if requested - if (variable_get('pathauto_indexaliases', FALSE)) { - pathauto_create_index_alias($alias, $module); - } - return $alias; } /** @@ -472,29 +439,6 @@ } } -function pathauto_create_index_alias($alias, $module) { - $count = 0; - $components = explode('/', $alias); - // Not interested in the trailing component - array_pop($components); - $alias = ''; - foreach ($components as $component) { - if ($alias) { - $alias .= '/'.$component; - } - else { - $alias .= $component; - } - $alias_count = db_result(db_query("SELECT COUNT(dst) FROM {url_alias} WHERE dst = '%s'", $alias)); - if (!$alias_count) { - $src = "pathauto/$module/$alias"; - _pathauto_set_alias($src, $alias); - $count++; - } - } - return $count; -} - function pathauto_menu($may_cache) { $items = array(); @@ -510,19 +454,6 @@ ); } - $modulelist = variable_get('pathauto_modulelist', array()); - if (is_array($modulelist)) { - foreach ($modulelist as $module) { - $indexfunc = $module.'_pathauto_page'; - if (function_exists($indexfunc)) { - $items[] = array('path' => 'pathauto/'.$module, - 'title' => t('Pathauto'), - 'callback' => $indexfunc, - 'access' => 1, - 'type' => MENU_CALLBACK); - } - } - } return $items; } Index: CHANGELOG.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/CHANGELOG.txt,v retrieving revision 1.25.2.1 diff -u -r1.25.2.1 CHANGELOG.txt --- CHANGELOG.txt 12 Nov 2006 17:25:39 -0000 1.25.2.1 +++ CHANGELOG.txt 29 Dec 2006 22:33:30 -0000 @@ -1,5 +1,11 @@ ***DRUPAL-5 only*** +2006-12-31 + Removed _pathauto_page capability which wasn't used by many sites + nor by any contrib modules. If your site or module used this + consider creating a separate contributed module. This also + requires removing the index alias function. + 2006-11-11 .inc files are now hardcoded instead of being dynamically included Note: may break your site if you use additional .inc files @@ -7,7 +13,7 @@ Use - (dash) as the separator by default Limit aliases and components to 100 characters Make "Create new alias, replacing the old one." the default update action - + 2006-10-12 Allow users to specify a list of words to strip out of the url