'. t('The path module allows you to specify aliases for Drupal URLs. Such aliases improve readability of URLs for your users and may help internet search engines to index your content more effectively. More than one alias may be created for a given page.') .'
'; + $output = ''. t('This module allows you to specify aliases for Drupal URLs. Such aliases improve readability of URLs for your users and may help internet search engines to index your content more effectively. More than one alias may be created for a given page.') .'
'; $output .= t('Some examples of URL aliases are:
'. t('The path module enables an extra field for aliases in all node input and editing forms (when users have the appropriate permissions). It also provides an interface to view and edit all URL aliases. The two permissions related to URL aliasing are "administer url aliases" and "create url aliases". ') .'
'; + $output .= ''. t('This module enables an extra field for aliases in all node input and editing forms when users have the appropriate permissions. It also provides an interface to view and edit all URL aliases. The two permissions related to URL aliasing are "administer url aliases" and "create url aliases". ') .'
'; $output .= ''. t('This module also comes with user-defined mass URL aliasing capabilities, which is useful if you wish to uniformly use URLs different from the default. For example, you may want to have your URLs presented in a different language. Access to the Drupal source code on the web server is required to set up these kinds of aliases. ') .'
'; - $output .= ''. t('For more information please read the configuration and customization handbook Path page.', array('@path' => 'http://drupal.org/handbook/modules/path/')) .'
'; + $output .= ''. t('For more information please read the configuration and customization handbook about URL aliases.', array('@path' => 'http://drupal.org/handbook/modules/path/')) .'
'; return $output; case 'admin/build/path': - return ''. t("Drupal provides users complete control over URLs through aliasing. This feature is typically used to make URLs human-readable or easy to remember. For example, one could map the relative URL 'node/1' onto 'about'. Each system path can have multiple aliases.") .'
'; + return ''. t("Drupal provides users complete control over URLs through aliasing. This feature is typically used to make URLs human-readable or easy to remember. For example, one could map the relative URL 'node/1' onto 'about'. Each system URL can have multiple aliases.") .'
'; case 'admin/build/path/add': return ''. t('Enter the path you wish to create the alias for, followed by the name of the new alias.') .'
'; } @@ -73,62 +73,50 @@ function path_menu() { } /** - * Post-confirmation; delete an URL alias. - */ -function path_admin_delete($pid = 0) { - db_query('DELETE FROM {url_alias} WHERE pid = %d', $pid); - drupal_set_message(t('The alias has been deleted.')); -} - -/** * Set an aliased path for a given Drupal path, preventing duplicates. */ function path_set_alias($path = NULL, $alias = NULL, $pid = NULL, $language = '') { - if ($path && !$alias) { - // Delete based on path - db_query("DELETE FROM {url_alias} WHERE src = '%s' AND language = '%s'", $path, $language); - drupal_clear_path_cache(); - } - else if (!$path && $alias) { - // Delete based on alias - db_query("DELETE FROM {url_alias} WHERE dst = '%s' AND language = '%s'", $alias, $language); - drupal_clear_path_cache(); + $path = urldecode($path); + $alias = urldecode($alias); + // First we check if we deal with an existing alias and delete or modify it based on pid. + if ($pid) { + // An existing alias. + if (!$path || !$alias) { + // Delete the alias based on pid. + db_query('DELETE FROM {url_alias} WHERE pid = %d', $pid); + drupal_set_message(t('The URL alias has been deleted.')); + } + else { + // Update the existing alias. + db_query("UPDATE {url_alias} SET src = '%s', dst = '%s', language = '%s' WHERE pid = %d", $path, $alias, $language, $pid); + drupal_set_message(t('The URL alias has been updated.')); + } } else if ($path && $alias) { - $path = urldecode($path); - $path_count = db_result(db_query("SELECT COUNT(src) FROM {url_alias} WHERE src = '%s' AND language = '%s'", $path, $language)); - $alias = urldecode($alias); - // Alias count can only be 0 or 1. - $alias_count = db_result(db_query("SELECT COUNT(dst) FROM {url_alias} WHERE dst = '%s' AND language = '%s'", $alias, $language)); - - if ($alias_count == 0) { - if ($pid) { - // Existing path changed data - db_query("UPDATE {url_alias} SET src = '%s', dst = '%s', language = '%s' WHERE pid = %d", $path, $alias, $language, $pid); - } - else { - // No such alias yet in this language - db_query("INSERT INTO {url_alias} (src, dst, language) VALUES ('%s', '%s', '%s')", $path, $alias, $language); - } + // Check for existing aliases. + if ($alias == drupal_get_path_alias($path, $language)) { + // There is already such an alias, neutral or in this language. + // Update the alias based on alias; setting the language if not yet done. + db_query("UPDATE {url_alias} SET src = '%s', dst = '%s', language = '%s' WHERE dst = '%s'", $path, $alias, $language, $alias); + drupal_set_message(t('The URL alias has been updated.')); } - // The alias exists. else { - // This path has no alias yet, so we redirect the alias here. - if ($path_count == 0) { - db_query("UPDATE {url_alias} SET src = '%s' WHERE dst = '%s' AND language = '%s'", $path, $alias, $language); - } - else { - // This will delete the path that alias was originally pointing to. - path_set_alias(NULL, $alias, NULL, $language); - // This will remove the current aliases of the path. - path_set_alias($path, NULL, NULL, $language); - path_set_alias($path, $alias, NULL, $language); - } + // A new alias. Add it to the database. + db_query("INSERT INTO {url_alias} (src, dst, language) VALUES ('%s', '%s', '%s')", $path, $alias, $language); + drupal_set_message(t('The URL alias has been saved.')); } - if ($alias_count == 0 || $path_count == 0) { - drupal_clear_path_cache(); + } + else { + // Delete the alias. + if ($alias) { + db_query("DELETE FROM {url_alias} WHERE dst = '%s'", $alias); } + else { + db_query("DELETE FROM {url_alias} WHERE src = '%s'", $path); + } + drupal_set_message(t('The URL alias has been deleted.')); } + drupal_clear_path_cache(); } /** @@ -160,7 +148,7 @@ function path_nodeapi(&$node, $op, $arg) // Don't try to insert if path is NULL. We may have already set // the alias ahead of time. if (isset($node->path)) { - path_set_alias('node/'. $node->nid, $node->path); + path_set_alias('node/'. $node->nid, $node->path, NULL, $language); } break; @@ -186,7 +174,7 @@ function path_form_alter(&$form, $form_s $path = isset($form['#node']->path) ? $form['#node']->path : NULL; $form['path'] = array( '#type' => 'fieldset', - '#title' => t('URL path settings'), + '#title' => t('Alternative URL settings'), '#collapsible' => TRUE, '#collapsed' => empty($path), '#access' => user_access('create url aliases'), @@ -198,7 +186,7 @@ function path_form_alter(&$form, $form_s '#maxlength' => 250, '#collapsible' => TRUE, '#collapsed' => TRUE, - '#description' => t('Optionally specify an alternative URL by which this node can be accessed. For example, type "about" when writing an about page. Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.'), + '#description' => t('Optionally specify an alternative URL by which this post can be accessed. For example, type "about" when writing an about page. Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.'), ); if ($path) { $form['path']['pid'] = array(