Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.299 diff -u -r1.299 common.inc --- includes/common.inc 2 Jan 2004 12:15:37 -0000 1.299 +++ includes/common.inc 5 Jan 2004 15:40:26 -0000 @@ -801,10 +801,14 @@ * Given an old url, return the alias. */ function drupal_get_path_alias($path) { - $map = drupal_get_path_map(); - - if ($map) { - return array_search($path, $map); + if (($map = drupal_get_path_map()) && ($newpath = array_search($path, $map))) { + return $newpath; + } + elseif (function_exists("conf_url_rewrite")) { + return conf_url_rewrite($path, 'outgoing'); + } + else { + return $path; } } @@ -812,9 +816,15 @@ * Given an alias, return the default url. */ function drupal_get_normal_path($path) { - $map = drupal_get_path_map(); - - return $map[$path] ? $map[$path] : $path; + if (($map = drupal_get_path_map()) && isset($map[$path])) { + return $map[$path]; + } + elseif (function_exists("conf_url_rewrite")) { + return conf_url_rewrite($path, 'incoming'); + } + else { + return $path; + } } function url($url = NULL, $query = NULL, $fragment = NULL) { Index: modules/path.module =================================================================== RCS file: /cvs/drupal/drupal/modules/path.module,v retrieving revision 1.23 diff -u -r1.23 path.module --- modules/path.module 29 Dec 2003 17:14:26 -0000 1.23 +++ modules/path.module 5 Jan 2004 15:40:27 -0000 @@ -103,7 +103,6 @@ } function path_help($section = "admin/help#path") { - $output = ""; switch ($section) { case "admin/system/modules#description": @@ -116,10 +115,38 @@ $output = t("Enter the path you wish to create the alias for, followed by the name of the new alias. Each path can be associated with only one alias."); break; case "admin/help#path": - $output .= "

Background

A very powerful feature of Drupal is the ability to have control over all paths. The path module is the tool that provides this functionality and is part of the basic Drupal installation, although it is not enabled by default. Some examples of re-mapping paths are:

user/login => login\n\nimage/tid/16 => store\n\ntaxonomy/page/or/7,19,20,21 => store/products/whirlygigs\n\nnode/view/3 => contact

"; - $output .= "

This functionality integrates seamlessly into node forms and also provides the administrator an interface to view all aliases that have been created.

Aliases have a 1 to 1 relationship with their original Drupal URLs. In other words you cannot have an alias map to more than one path. Likewise, a Drupal URL can't be mapped to more than one alias.

"; - $output .= "

Permissions

Two new permissions are introduced for aliasing URLs: create url aliases and administer url aliases.

  1. create url aliases - Allows users to create aliases for nodes. Enabling this permission will display a new path field to the user in any node form, allowing them to enter an alias for that node. They will be able to edit/delete the alias after it is created using the same form.
  2. administer url aliases - Allows users to access the alias administration interface. They must also have the access administration pages permission set as well. This interface displays all aliases and provides a way to create and modify them. This is also the location to build aliases for things other than nodes. For example, you can create an alias for a taxonomy URL or even re-map the admin path (although the original admin path will still be accessible since aliases do not cancel out original paths).
"; - $output = t($output); + $output = t("

Background

+

A very powerful feature of Drupal is the ability to have control over all paths. The path module is the tool that provides this functionality and is part of the basic Drupal installation, although it is not enabled by default. Some examples of re-mapping paths are:

+
+user/login => login
+
+image/tid/16 => store
+
+taxonomy/page/or/7,19,20,21 => store/products/whirlygigs
+
+node/view/3 => contact
+
+

This functionality integrates seamlessly into node forms and also provides the administrator an interface to view all aliases that have been created.

+

Aliases have a 1 to 1 relationship with their original Drupal URLs. In other words you cannot have an alias map to more than one path. Likewise, a Drupal URL can't be mapped to more than one alias.

+ +

Permissions

+

Two permissions are related to URL aliasing: create url aliases and administer url aliases.

+
  1. create url aliases - Allows users to create aliases for nodes. Enabling this permission will display a path field to the user in any node form, allowing them to enter an alias for that node. They will be able to edit/delete the alias after it is created using the same form.
  2. administer url aliases - Allows users to access the alias administration interface. They must also have the access administration pages permission set as well. This interface displays all aliases and provides a way to create and modify them. This is also the location to build aliases for things other than nodes. For example, you can create an alias for a taxonomy URL or even re-map the admin path (although the original admin path will still be accessible since aliases do not cancel out original paths).
+ +

Mass URL aliasing

+

Drupal also comes with user defined mass URL aliasing capabilities. You might like to see completely different URLs used by Drupal, or even URLs translated to the visitors' native language, in which case this feature is handy. Only an administrator with access to the website source code can set up this kind of aliases. You can define a conf_url_rewrite function in conf.php, following this example:

+
+function conf_url_rewrite(\$path, \$mode = 'incoming') {
+  if (\$mode == 'incoming') { // URL coming from a client
+    return preg_replace('!^display/(\d+)$!', 'node/view/\1', \$path);
+  }
+  else { // URL going out to a client
+    return preg_replace('!^node/view/(\d+)$!', 'display/\1', \$path);
+  }
+}
+
+

This function will shorten every node/view/\$node_id type of URL to display/\$node_id. Individual URL aliases defined on the browser interface of Drupal take precedence, so if you have the 'contact' page alias from the example above, then the display/3 alias will not be effective when outgoing links are created. Incoming URLs however always work with the mass URL aliased variant. Only the 'incoming' and 'outgoing' modes are supposed to be supported by your conf_url_rewrite function.

+

You cannot only use this feature to shorten the URLs, or to translate them to you own language, but also to add completely new subURLs to an already existing module's URL space, or to compose a bunch of existing stuff together to a common URL space. You can create a news section for example aliasing nodes and taxonomy overview pages falling under a 'news' vocabulary, thus having news/15 and news/sections/3 instead of node/view/15 and taxonomy/view/or/3.

"); break; }