Conjunto de cambios 49072ea en sipes para modules_contrib/pathauto/pathauto.inc

Fecha y hora:

26/05/2016 18:10:02 (hace 8 años)

Autor:

José Gregorio Puentes <jpuentes@…>

Branches:

stable, version-3.0

Children:

2efe680

Parents:

cd414e9

Mensaje:

se actualizo el modulo

Fichero:

• modules_contrib/pathauto/pathauto.inc (modificado) (25 diferencias)

modules_contrib/pathauto/pathauto.inc

@@ -1 +1 @@
 <?php
-// $Id: pathauto.inc,v 1.45.2.29 2010/09/27 15:52:58 greggles Exp $
 
 /**
@@ -6 +5 @@
  * Miscellaneous functions for Pathauto.
  *
+ * This also contains some constants giving human readable names to some numeric
+ * settings; they're included here as they're only rarely used outside this file
+ * anyway. Use module_load_include('inc', 'pathauto') if the constants need to
+ * be available.
+ *
  * @ingroup pathauto
  */
+
+/**
+ * Case should be left as is in the generated path.
+ */
+define('PATHAUTO_CASE_LEAVE_ASIS', 0);
+
+/**
+ * Case should be lowercased in the generated path.
+ */
+define('PATHAUTO_CASE_LOWER', 1);
+
+/**
+ * "Do nothing. Leave the old alias intact."
+ */
+define('PATHAUTO_UPDATE_ACTION_NO_NEW', 0);
+
+/**
+ * "Create a new alias. Leave the existing alias functioning."
+ */
+define('PATHAUTO_UPDATE_ACTION_LEAVE', 1);
+
+/**
+ * "Create a new alias. Delete the old alias."
+ */
+define('PATHAUTO_UPDATE_ACTION_DELETE', 2);
+
+/**
+ * "Create a new alias. Redirect from old alias."
+ *
+ * This is only available when the Path Redirect module is.
+ */
+define('PATHAUTO_UPDATE_ACTION_REDIRECT', 3);
+
+/**
+ * Remove the punctuation from the alias.
+ */
+define('PATHAUTO_PUNCTUATION_REMOVE', 0);
+
+/**
+ * Replace the punctuation with the separator in the alias.
+ */
+define('PATHAUTO_PUNCTUATION_REPLACE', 1);
+
+/**
+ * Leave the punctuation as it is in the alias.
+ */
+define('PATHAUTO_PUNCTUATION_DO_NOTHING', 2);
+
+/**
+ * Matches Unicode characters that are word boundaries.
+ *
+ * Characters with the following General_category (gc) property values are used
+ * as word boundaries. While this does not fully conform to the Word Boundaries
+ * algorithm described in http://unicode.org/reports/tr29, as PCRE does not
+ * contain the Word_Break property table, this simpler algorithm has to do.
+ * - Cc, Cf, Cn, Co, Cs: Other.
+ * - Pc, Pd, Pe, Pf, Pi, Po, Ps: Punctuation.
+ * - Sc, Sk, Sm, So: Symbols.
+ * - Zl, Zp, Zs: Separators.
+ *
+ * Non-boundary characters include the following General_category (gc) property
+ * values:
+ * - Ll, Lm, Lo, Lt, Lu: Letters.
+ * - Mc, Me, Mn: Combining Marks.
+ * - Nd, Nl, No: Numbers.
+ *
+ * Note that the PCRE property matcher is not used because we wanted to be
+ * compatible with Unicode 5.2.0 regardless of the PCRE version used (and any
+ * bugs in PCRE property tables).
+ *
+ * @see http://unicode.org/glossary
+ */
+define('PATHAUTO_PREG_CLASS_UNICODE_WORD_BOUNDARY',
+  '\x{0}-\x{2F}\x{3A}-\x{40}\x{5B}-\x{60}\x{7B}-\x{A9}\x{AB}-\x{B1}\x{B4}' .
+  '\x{B6}-\x{B8}\x{BB}\x{BF}\x{D7}\x{F7}\x{2C2}-\x{2C5}\x{2D2}-\x{2DF}' .
+  '\x{2E5}-\x{2EB}\x{2ED}\x{2EF}-\x{2FF}\x{375}\x{37E}-\x{385}\x{387}\x{3F6}' .
+  '\x{482}\x{55A}-\x{55F}\x{589}-\x{58A}\x{5BE}\x{5C0}\x{5C3}\x{5C6}' .
+  '\x{5F3}-\x{60F}\x{61B}-\x{61F}\x{66A}-\x{66D}\x{6D4}\x{6DD}\x{6E9}' .
+  '\x{6FD}-\x{6FE}\x{700}-\x{70F}\x{7F6}-\x{7F9}\x{830}-\x{83E}' .
+  '\x{964}-\x{965}\x{970}\x{9F2}-\x{9F3}\x{9FA}-\x{9FB}\x{AF1}\x{B70}' .
+  '\x{BF3}-\x{BFA}\x{C7F}\x{CF1}-\x{CF2}\x{D79}\x{DF4}\x{E3F}\x{E4F}' .
+  '\x{E5A}-\x{E5B}\x{F01}-\x{F17}\x{F1A}-\x{F1F}\x{F34}\x{F36}\x{F38}' .
+  '\x{F3A}-\x{F3D}\x{F85}\x{FBE}-\x{FC5}\x{FC7}-\x{FD8}\x{104A}-\x{104F}' .
+  '\x{109E}-\x{109F}\x{10FB}\x{1360}-\x{1368}\x{1390}-\x{1399}\x{1400}' .
+  '\x{166D}-\x{166E}\x{1680}\x{169B}-\x{169C}\x{16EB}-\x{16ED}' .
+  '\x{1735}-\x{1736}\x{17B4}-\x{17B5}\x{17D4}-\x{17D6}\x{17D8}-\x{17DB}' .
+  '\x{1800}-\x{180A}\x{180E}\x{1940}-\x{1945}\x{19DE}-\x{19FF}' .
+  '\x{1A1E}-\x{1A1F}\x{1AA0}-\x{1AA6}\x{1AA8}-\x{1AAD}\x{1B5A}-\x{1B6A}' .
+  '\x{1B74}-\x{1B7C}\x{1C3B}-\x{1C3F}\x{1C7E}-\x{1C7F}\x{1CD3}\x{1FBD}' .
+  '\x{1FBF}-\x{1FC1}\x{1FCD}-\x{1FCF}\x{1FDD}-\x{1FDF}\x{1FED}-\x{1FEF}' .
+  '\x{1FFD}-\x{206F}\x{207A}-\x{207E}\x{208A}-\x{208E}\x{20A0}-\x{20B8}' .
+  '\x{2100}-\x{2101}\x{2103}-\x{2106}\x{2108}-\x{2109}\x{2114}' .
+  '\x{2116}-\x{2118}\x{211E}-\x{2123}\x{2125}\x{2127}\x{2129}\x{212E}' .
+  '\x{213A}-\x{213B}\x{2140}-\x{2144}\x{214A}-\x{214D}\x{214F}' .
+  '\x{2190}-\x{244A}\x{249C}-\x{24E9}\x{2500}-\x{2775}\x{2794}-\x{2B59}' .
+  '\x{2CE5}-\x{2CEA}\x{2CF9}-\x{2CFC}\x{2CFE}-\x{2CFF}\x{2E00}-\x{2E2E}' .
+  '\x{2E30}-\x{3004}\x{3008}-\x{3020}\x{3030}\x{3036}-\x{3037}' .
+  '\x{303D}-\x{303F}\x{309B}-\x{309C}\x{30A0}\x{30FB}\x{3190}-\x{3191}' .
+  '\x{3196}-\x{319F}\x{31C0}-\x{31E3}\x{3200}-\x{321E}\x{322A}-\x{3250}' .
+  '\x{3260}-\x{327F}\x{328A}-\x{32B0}\x{32C0}-\x{33FF}\x{4DC0}-\x{4DFF}' .
+  '\x{A490}-\x{A4C6}\x{A4FE}-\x{A4FF}\x{A60D}-\x{A60F}\x{A673}\x{A67E}' .
+  '\x{A6F2}-\x{A716}\x{A720}-\x{A721}\x{A789}-\x{A78A}\x{A828}-\x{A82B}' .
+  '\x{A836}-\x{A839}\x{A874}-\x{A877}\x{A8CE}-\x{A8CF}\x{A8F8}-\x{A8FA}' .
+  '\x{A92E}-\x{A92F}\x{A95F}\x{A9C1}-\x{A9CD}\x{A9DE}-\x{A9DF}' .
+  '\x{AA5C}-\x{AA5F}\x{AA77}-\x{AA79}\x{AADE}-\x{AADF}\x{ABEB}' .
+  '\x{E000}-\x{F8FF}\x{FB29}\x{FD3E}-\x{FD3F}\x{FDFC}-\x{FDFD}' .
+  '\x{FE10}-\x{FE19}\x{FE30}-\x{FE6B}\x{FEFF}-\x{FF0F}\x{FF1A}-\x{FF20}' .
+  '\x{FF3B}-\x{FF40}\x{FF5B}-\x{FF65}\x{FFE0}-\x{FFFD}');
 
 /**
@@ -54 +166 @@
  */
 function _pathauto_existing_alias_data($source, $language = '') {
-  return db_fetch_array(db_query_range("SELECT pid, dst AS alias FROM {url_alias} WHERE src = '%s' AND language IN ('%s', '') ORDER BY language DESC, pid DESC", $source, $language, 0, 1));
+  return db_fetch_array(db_query_range("SELECT pid, dst AS alias, language FROM {url_alias} WHERE src = '%s' AND language IN ('%s', '') ORDER BY language DESC, pid DESC", $source, $language, 0, 1));
 }
 
@@ -61 +173 @@
  *
  * Performs the following possible alterations:
+ * - Remove all HTML tags.
  * - Process the string through the transliteration module.
  * - Replace or remove punctuation with the separator character.
@@ -76 +189 @@
  * @param $string
  *   A string to clean.
+ * @param array $options
+ *   (optional) A keyed array of settings and flags to control the Pathauto
+ *   clean string replacement process. Supported options are:
+ *   - langcode: A language code to be used when translating strings.
+ *
  * @return
  *   The cleaned string.
  */
 function pathauto_cleanstring($string) {
-  $output = $string;
-
-  // Optionally remove accents and transliterate
-  if (variable_get('pathauto_transliterate', FALSE)) {
-    static $translations;
-
-    if (!isset($translations)) {
-      $translations = FALSE;
-      if ($file = _pathauto_get_i18n_file()) {
-        $translations = parse_ini_file($file);
-      }
-    }
-
-    if (!empty($translations)) {
-      $output = strtr($output, $translations);
-    }
-  }
-
-  // Replace or drop punctuation based on user settings
-  $separator = variable_get('pathauto_separator', '-');
-  $punctuation = pathauto_punctuation_chars();
-  foreach ($punctuation as $name => $details) {
-    $action = variable_get('pathauto_punctuation_'. $name, 0);
-    // 2 is the action for "do nothing" with the punctuation
-    if ($action != 2) {
-      // Slightly tricky inline if which either replaces with the separator or nothing
-      $output = str_replace($details['value'], ($action ? $separator : ''), $output);
-    }
-  }
-
-  // Reduce strings to letters and numbers
-  if (variable_get('pathauto_reduce_ascii', FALSE)) {
-    $pattern = '/[^a-zA-Z0-9\/]+/';
-    $output = preg_replace($pattern, $separator, $output);
-  }
-
-  // Calculate and statically cache the ignored words regex expression.
-  static $ignore_words_regex;
-  if (!isset($ignore_words_regex)) {
-    $ignore_words = array(
-      'a', 'an', 'as', 'at', 'before', 'but', 'by', 'for', 'from', 'is', 'in',
-      'into', 'like', 'of', 'off', 'on', 'onto', 'per', 'since', 'than', 'the',
-      'this', 'that', 'to', 'up', 'via', 'with',
+  // Use the advanced drupal_static() pattern, since this is called very often.
+  static $drupal_static_fast;
+  if (!isset($drupal_static_fast)) {
+    $drupal_static_fast['cache'] = &pathauto_static(__FUNCTION__);
+  }
+  $cache = &$drupal_static_fast['cache'];
+
+  // Generate and cache variables used in this function so that on the second
+  // call to pathauto_cleanstring() we focus on processing.
+  if (!isset($cache)) {
+    $cache = array(
+      'separator' => variable_get('pathauto_separator', '-'),
+      'strings' => array(),
+      'transliterate' => variable_get('pathauto_transliterate', FALSE) && module_exists('transliteration'),
+      'punctuation' => array(),
+      'reduce_ascii' => (bool) variable_get('pathauto_reduce_ascii', FALSE),
+      'ignore_words_regex' => FALSE,
+      'lowercase' => (bool) variable_get('pathauto_case', PATHAUTO_CASE_LOWER),
+      'maxlength' => min(variable_get('pathauto_max_component_length', 100), _pathauto_get_schema_alias_maxlength()),
     );
-    $ignore_words = variable_get('pathauto_ignore_words', $ignore_words);
+
+    // Generate and cache the punctuation replacements for strtr().
+    $punctuation = pathauto_punctuation_chars();
+    foreach ($punctuation as $name => $details) {
+      $action = variable_get('pathauto_punctuation_' . $name, PATHAUTO_PUNCTUATION_REMOVE);
+      switch ($action) {
+        case PATHAUTO_PUNCTUATION_REMOVE:
+          $cache['punctuation'][$details['value']] = '';
+          break;
+        case PATHAUTO_PUNCTUATION_REPLACE:
+          $cache['punctuation'][$details['value']] = $cache['separator'];
+          break;
+        case PATHAUTO_PUNCTUATION_DO_NOTHING:
+          // Literally do nothing.
+          break;
+      }
+    }
+
+    // Generate and cache the ignored words regular expression.
+    $ignore_words = variable_get('pathauto_ignore_words', PATHAUTO_IGNORE_WORDS);
     $ignore_words_regex = preg_replace(array('/^[,\s]+|[,\s]+$/', '/[,\s]+/'), array('', '\b|\b'), $ignore_words);
     if ($ignore_words_regex) {
-      $ignore_words_regex = '\b' . $ignore_words_regex . '\b';
-    }
+      $cache['ignore_words_regex'] = '\b' . $ignore_words_regex . '\b';
+      if (function_exists('mb_eregi_replace')) {
+        $cache['ignore_words_callback'] = 'mb_eregi_replace';
+      }
+      else {
+        $cache['ignore_words_callback'] = 'preg_replace';
+        $cache['ignore_words_regex'] = '/' . $cache['ignore_words_regex'] . '/i';
+      }
+    }
+  }
+
+  // Empty strings do not need any proccessing.
+  if ($string === '' || $string === NULL) {
+    return '';
+  }
+
+  $langcode = NULL;
+  if (!empty($options['language']->language)) {
+    $langcode = $options['language']->language;
+  }
+  elseif (!empty($options['langcode'])) {
+    $langcode = $options['langcode'];
+  }
+
+  // Check if the string has already been processed, and if so return the
+  // cached result.
+  if (isset($cache['strings'][$langcode][$string])) {
+    return $cache['strings'][$langcode][$string];
+  }
+
+  // Remove all HTML tags from the string.
+  $output = strip_tags(decode_entities($string));
+
+  // Optionally transliterate (by running through the Transliteration module)
+  if ($cache['transliterate']) {
+    $output = transliteration_get($output, $cache['reduce_ascii'] ? '' : '?', $langcode);
+  }
+
+  // Replace or drop punctuation based on user settings
+  $output = strtr($output, $cache['punctuation']);
+
+  // Reduce strings to letters and numbers
+  if ($cache['reduce_ascii']) {
+    $output = preg_replace('/[^a-zA-Z0-9\/]+/', $cache['separator'], $output);
   }
 
   // Get rid of words that are on the ignore list
-  if ($ignore_words_regex) {
-    if (function_exists('mb_eregi_replace')) {
-      $words_removed = mb_eregi_replace($ignore_words_regex, '', $output);
-    }
-    else {
-      $words_removed = preg_replace("/$ignore_words_regex/i", '', $output);
-    }
+  if ($cache['ignore_words_regex']) {
+    $words_removed = $cache['ignore_words_callback']($cache['ignore_words_regex'], '', $output);
     if (drupal_strlen(trim($words_removed)) > 0) {
       $output = $words_removed;
@@ -145 +295 @@
 
   // Always replace whitespace with the separator.
-  $output = preg_replace('/\s+/', $separator, $output);
+  $output = preg_replace('/\s+/', $cache['separator'], $output);
 
   // Trim duplicates and remove trailing and leading separators.
-  $output = _pathauto_clean_separators($output);
+  $output = _pathauto_clean_separators($output, $cache['separator']);
 
   // Optionally convert to lower case.
-  if (variable_get('pathauto_case', 1)) {
+  if ($cache['lowercase']) {
     $output = drupal_strtolower($output);
   }
 
-  // Enforce the maximum component length.
-  $maxlength = min(variable_get('pathauto_max_component_length', 100), _pathauto_get_schema_alias_maxlength());
-  $output = drupal_substr($output, 0, $maxlength);
+  // Shorten to a logical place based on word boundaries.
+  $output = pathauto_truncate_utf8($output, $cache['maxlength'], TRUE);
+
+  // Cache this result in the static array.
+  $cache['strings'][$langcode][$string] = $output;
 
   return $output;
@@ -176 +328 @@
  */
 function _pathauto_clean_separators($string, $separator = NULL) {
+  static $default_separator;
+
+  if (!isset($separator)) {
+    if (!isset($default_separator)) {
+      $default_separator = variable_get('pathauto_separator', '-');
+    }
+    $separator = $default_separator;
+  }
+
   $output = $string;
 
-  if (!isset($separator)) {
-    $separator = variable_get('pathauto_separator', '-');
-  }
-
-  // Clean duplicate or trailing separators.
   if (strlen($separator)) {
-    // Escape the separator.
+    // Trim any leading or trailing separators.
+    $output = trim($output, $separator);
+
+    // Escape the separator for use in regular expressions.
     $seppattern = preg_quote($separator, '/');
 
-    // Trim any leading or trailing separators.
-    $output = preg_replace("/^$seppattern+|$seppattern+$/", '', $output);
+    // Replace multiple separators with a single one.
+    $output = preg_replace("/$seppattern+/", $separator, $output);
 
     // Replace trailing separators around slashes.
     if ($separator !== '/') {
-      $output = preg_replace("/$seppattern+\/|\/$seppattern+/", "/", $output);
-    }
-
-    // Replace multiple separators with a single one.
-    $output = preg_replace("/$seppattern+/", $separator, $output);
+      $output = preg_replace("/\/+$seppattern\/+|$seppattern\/+|\/+$seppattern/", "/", $output);
+    }
   }
 
@@ -216 +372 @@
  */
 function pathauto_clean_alias($alias) {
+  $cache = &pathauto_static(__FUNCTION__);
+
+  if (!isset($cache)) {
+    $cache = array(
+      'maxlength' => min(variable_get('pathauto_max_length', 100), _pathauto_get_schema_alias_maxlength()),
+    );
+  }
+
   $output = $alias;
 
-  // Trim duplicate, leading, and trailing back-slashes.
+  // Trim duplicate, leading, and trailing separators. Do this before cleaning
+  // backslashes since a pattern like "[token1]/[token2]-[token3]/[token4]"
+  // could end up like "value1/-/value2" and if backslashes were cleaned first
+  // this would result in a duplicate blackslash.
+  $output = _pathauto_clean_separators($output);
+
+  // Trim duplicate, leading, and trailing backslashes.
   $output = _pathauto_clean_separators($output, '/');
 
-  // Trim duplicate, leading, and trailing separators.
-  $output = _pathauto_clean_separators($output);
-
-  // Enforce the maximum length.
-  $separator = variable_get('pathauto_separator', '-');
-  $maxlength = min(variable_get('pathauto_max_length', 100), _pathauto_get_schema_alias_maxlength());
-  $output = drupal_substr($output, 0, $maxlength);
+  // Shorten to a logical place based on word boundaries.
+  $output = pathauto_truncate_utf8($output, $cache['maxlength'], TRUE);
 
   return $output;
@@ -240 +405 @@
  *   Operation being performed on the content being aliased
  *   ('insert', 'update', 'return', or 'bulkupdate').
- * @param $placeholders
- *   An array whose keys consist of the translated placeholders
- *   which appear in patterns (e.g., t('[title]')) and values are the
- *   actual values to be substituted into the pattern (e.g., $node->title).
  * @param $source
  *   An internal Drupal path to be aliased.
+ * @param $data
+ *   An array of keyed objects to pass to token_replace(). For simple
+ *   replacement scenarios 'node', 'user', and others are common keys, with an
+ *   accompanying node or user object being the value.  Only one key/value pair
+ *   is supported, otherwise you may pass the results from
+ *   pathauto_get_placeholders() here.
  * @param $entity_id
- *   The entity ID (node ID, user ID, etc.).
+ *   (deprecated) The entity ID (node ID, user ID, etc.). This parameter is
+ *   deprecated and is not actually used.
  * @param $type
  *   For modules which provided pattern items in hook_pathauto(),
@@ -260 +428 @@
  * @see pathauto_get_placeholders()
  */
-function pathauto_create_alias($module, $op, $placeholders, $source, $entity_id, $type = NULL, $language = '') {
-  // Retrieve and apply the pattern for this content type
-  if (!empty($type)) {
-    $pattern = trim(variable_get("pathauto_{$module}_{$type}_{$language}_pattern", ''));
-    if (empty($pattern)) {
-      $pattern = trim(variable_get("pathauto_{$module}_{$type}_pattern", ''));
-    }
-  }
+function pathauto_create_alias($module, $op, $source, $data, $entity_id = NULL, $type = NULL, $language = '') {
+  // Retrieve and apply the pattern for this content type.
+  $pattern = pathauto_pattern_load_by_entity($module, $type, $language);
+
+  // Allow other modules to alter the pattern.
+  $context = array(
+    'module' => $module,
+    'op' => $op,
+    'source' => $source,
+    'data' => $data,
+    'type' => $type,
+    'language' => &$language,
+  );
+  drupal_alter('pathauto_pattern', $pattern, $context);
+
   if (empty($pattern)) {
-    $pattern = trim(variable_get("pathauto_{$module}_pattern", ''));
-  }
-  // No pattern? Do nothing (otherwise we may blow away existing aliases...)
-  if (empty($pattern)) {
+    // No pattern? Do nothing (otherwise we may blow away existing aliases...)
     return '';
   }
 
-  if ($module == 'taxonomy') {
-    // Get proper path for term.
-    $term_path = taxonomy_term_path(taxonomy_get_term($entity_id));
-    if ($term_path != $source) {
-      // Quietly alias 'taxonomy/term/[tid]' with proper path for term.
-      $update_data = _pathauto_existing_alias_data($source, $language);
-      _pathauto_set_alias($source, $term_path, $module, $entity_id, $update_data['pid'], FALSE, $update_data['old_alias'], $language);
-      // Set $source as proper path.
-      $source = $term_path;
-    }
+  // Support for when $source and $placeholders were swapped.
+  if (is_array($source) && is_string($data)) {
+    $placeholders = $source;
+    $source = $data;
+  }
+  elseif (is_array($data) && !isset($data['tokens']) && !isset($data['values'])) {
+    $placeholders = pathauto_get_placeholders(key($data), current($data), $pattern, array('language' => (object) array('language' => $language)));
+  }
+  else {
+    $placeholders = $data;
   }
 
@@ -292 +464 @@
   if ($op == 'update' || $op == 'bulkupdate') {
     if ($existing_alias = _pathauto_existing_alias_data($source, $language)) {
-      switch (variable_get('pathauto_update_action', 2)) {
-        case 0:
+      switch (variable_get('pathauto_update_action', PATHAUTO_UPDATE_ACTION_DELETE)) {
+        case PATHAUTO_UPDATE_ACTION_NO_NEW:
           // If an alias already exists, and the update action is set to do nothing,
           // then gosh-darn it, do nothing.
@@ -315 +487 @@
 
   // Allow other modules to alter the alias.
-  $context = array(
-    'module' => $module,
-    'op' => $op,
-    'source' => $source,
-    'entity_id' => $entity_id,
-    'type' => $type,
-    'language' => $language,
-    'pattern' => $pattern,
-  );
+  $context['source'] = &$source;
+  $context['pattern'] = $pattern;
   drupal_alter('pathauto_alias', $alias, $context);
 
@@ -331 +496 @@
   }
 
-  // If the alias already exists, generate a new, hopefully unique, variant
-  if (_pathauto_alias_exists($alias, $source, $language)) {
-    $maxlength = min(variable_get('pathauto_max_length', 100), _pathauto_get_schema_alias_maxlength());
-    $separator = variable_get('pathauto_separator', '-');
-    $original_alias = $alias;
-
-    $i = 0;
-    do {
-      // Append an incrementing numeric suffix until we find a unique alias.
-      $unique_suffix = $separator . $i;
-      $alias = drupal_substr($original_alias, 0, $maxlength - drupal_strlen($unique_suffix, TRUE)) . $unique_suffix;
-      $i++;
-    } while (_pathauto_alias_exists($alias, $source, $language));
-
+  // If the alias already exists, generate a new, hopefully unique, variant.
+  $original_alias = $alias;
+  pathauto_alias_uniquify($alias, $source, $language);
+  if ($original_alias != $alias) {
     // Alert the user why this happened.
     _pathauto_verbose(t('The automatically generated alias %original_alias conflicted with an existing alias. Alias changed to %alias.', array(
@@ -363 +518 @@
     'language' => $language,
   );
-  _pathauto_set_alias($path, $existing_alias, $op);
-
-  // Also create a related feed alias if requested and supported.
-  $feedappend = trim(variable_get('pathauto_' . $module . '_applytofeeds', ''));
-  if (drupal_strlen($feedappend)) {
-    // For forums and taxonomies, the source doesn't always form the base of the RSS feed (i.e. image galleries)
-    if ($module == 'taxonomy' || $module == 'forum' && !empty($entity_id)) {
-      $source = "taxonomy/term/{$entity_id}";
-    }
-
-    // Build the feed path alias array and send it off to be created.
-    $path = array(
-      'source' => "$source/$feedappend",
-      'alias' => "$alias/feed",
-      'language' => $language,
-    );
-    $existing_alias = _pathauto_existing_alias_data($path['source'], $path['language']);
-    _pathauto_set_alias($path, $existing_alias, $op);
-  }
-
-  return $alias;
+  $success = _pathauto_set_alias($path, $existing_alias, $op);
+  return $success ? $alias : NULL;
+}
+
+/**
+ * Check to ensure a path alias is unique and add suffix variants if necessary.
+ *
+ * Given an alias 'content/test' if a path alias with the exact alias already
+ * exists, the function will change the alias to 'content/test-0' and will
+ * increase the number suffix until it finds a unique alias.
+ *
+ * @param $alias
+ *   A string with the alias. Can be altered by reference.
+ * @param $source
+ *   A string with the path source.
+ * @param $langcode
+ *   A string with a language code.
+ */
+function pathauto_alias_uniquify(&$alias, $source, $langcode) {
+  if (!_pathauto_alias_exists($alias, $source, $langcode)) {
+    return;
+  }
+
+  // If the alias already exists, generate a new, hopefully unique, variant
+  $maxlength = min(variable_get('pathauto_max_length', 100), _pathauto_get_schema_alias_maxlength());
+  $separator = variable_get('pathauto_separator', '-');
+  $original_alias = $alias;
+
+  $i = 0;
+  do {
+    // Append an incrementing numeric suffix until we find a unique alias.
+    $unique_suffix = $separator . $i;
+    $alias = pathauto_truncate_utf8($original_alias, $maxlength - drupal_strlen($unique_suffix), TRUE) . $unique_suffix;
+    $i++;
+  } while (_pathauto_alias_exists($alias, $source, $langcode));
 }
 
@@ -399 +568 @@
   $menu = menu_get_item($path);
   if (isset($menu['path']) && $menu['path'] == $path) {
+    return TRUE;
+  }
+  elseif (is_file('./' . $path) || is_dir('./' . $path)) {
+    // Do not allow existing files or directories to get assigned an automatic
+    // alias. Note that we do not need to use is_link() to check for symbolic
+    // links since this returns TRUE for either is_file() or is_dir() already.
     return TRUE;
   }
@@ -417 +592 @@
  * @param $op
  *   An optional string with the operation being performed.
- * @return
- *   TRUE if the path was saved, or NULL otherwise.
+ *
+ * @return
+ *   The saved path from path_save() or NULL if the path was not saved.
  *
  * @see path_set_alias()
@@ -440 +616 @@
   }
 
-  $path += array(
-    'pid' => NULL,
-    'language' => '',
-  );
-
   // Skip replacing the current alias with an identical alias
   if (empty($existing_alias) || $existing_alias['alias'] != $path['alias']) {
+    $path += array('pid' => NULL, 'language' => '');
+
     // If there is already an alias, respect some update actions.
     if (!empty($existing_alias)) {
-      switch (variable_get('pathauto_update_action', 2)) {
-        case 0:
+      switch (variable_get('pathauto_update_action', PATHAUTO_UPDATE_ACTION_DELETE)) {
+        case PATHAUTO_UPDATE_ACTION_NO_NEW:
           // Do not create the alias.
           return;
-        case 1:
+        case PATHAUTO_UPDATE_ACTION_LEAVE:
           // Create a new alias instead of overwriting the existing by leaving
           // $path['pid'] empty.
           break;
-        case 3:
+        case PATHAUTO_UPDATE_ACTION_REDIRECT:
           // Create a redirect
           if (module_exists('path_redirect') && function_exists('path_redirect_save')) {
             $redirect = array(
               'source' => $existing_alias['alias'],
+              'language' => $existing_alias['language'],
               'redirect' => $path['source'],
             );
@@ -468 +642 @@
           // Intentionally fall through to the next condition since we still
           // want to replace the existing alias.
-        case 2:
+        case PATHAUTO_UPDATE_ACTION_DELETE:
           // Both the redirect and delete actions should overwrite the existing
           // alias.
@@ -491 +665 @@
     }
 
-    return TRUE;
+    return $path;
   }
 }
@@ -532 +706 @@
  * Generalized function to get tokens across all Pathauto types.
  *
+ * @param $type
+ *   The token type to pass to token_get_values().
  * @param $object
- *   A user, node, or category object.
+ *   The object to pass to token_get_values().
+ * @param $text
+ *   (optional) The string that will be replaced with tokens. If provided
+ *   and the token_scan() function is available it will be used to trim down
+ *   the number of tokens that need to be passed to
+ *   pathauto_clean_token_values().
+ *
  * @return
  *   Tokens for that object formatted in the way that
  *   Pathauto expects to see them.
  */
-function pathauto_get_placeholders($type, $object) {
-  if (!function_exists('token_get_values')) {
-    // TODO at some point try removing this and see if install profiles have problems again.
-    watchdog('Pathauto', 'It appears that you have installed Pathauto, which depends on token, but token is either not installed or not installed properly.');
-    return array('tokens' => array(), 'values' => array());
-  }
-
-  $options = array('pathauto' => TRUE);
+function pathauto_get_placeholders($type, $object, $text = '', array $options = array()) {
+  $options += array('pathauto' => TRUE);
+
   $full = token_get_values($type, $object, TRUE, $options);
+
+  // Attempt to reduce the tokens to only the ones that will actually be used
+  // before passing into pathauto_clean_token_values().
+  static $token_scan_exists;
+  if (!isset($token_scan_exists)) {
+    $token_scan_exists = function_exists('token_scan');
+  }
+  if ($token_scan_exists && !empty($text)) {
+    $used_tokens = token_scan($text);
+    foreach ($full->tokens as $index => $token) {
+      if (!in_array($token, $used_tokens)) {
+        unset($full->tokens[$index]);
+        unset($full->values[$index]);
+      }
+    }
+  }
+
   $tokens = token_prepare_tokens($full->tokens);
   $values = pathauto_clean_token_values($full, $options);
@@ -571 +765 @@
       // should have each segment cleaned, and then glued back together to
       // construct a value resembling an URL.
-      $segments = array_map('pathauto_cleanstring', $value);
+      $segments = array();
+      foreach ($value as $segment) {
+        $segments[] = pathauto_cleanstring($segment, $options);
+      }
       $replacements[$token] = implode('/', $segments);
     }
@@ -580 +777 @@
     else {
       // Token is not an URL, so it should have its value cleaned.
-      $replacements[$token] = pathauto_cleanstring($value);
+      $replacements[$token] = pathauto_cleanstring($value, $options);
     }
   }
@@ -598 +795 @@
  */
 function pathauto_punctuation_chars() {
-  static $punctuation;
+  $punctuation = &pathauto_static(__FUNCTION__);
 
   if (!isset($punctuation)) {
-    $punctuation = array();
-    $punctuation['double_quotes']      = array('value' => '"', 'name' => t('Double quotes "'));
-    $punctuation['quotes']             = array('value' => "'", 'name' => t("Single quotes (apostrophe) '"));
-    $punctuation['backtick']           = array('value' => '`', 'name' => t('Back tick `'));
-    $punctuation['comma']              = array('value' => ',', 'name' => t('Comma ,'));
-    $punctuation['period']             = array('value' => '.', 'name' => t('Period .'));
-    $punctuation['hyphen']             = array('value' => '-', 'name' => t('Hyphen -'));
-    $punctuation['underscore']         = array('value' => '_', 'name' => t('Underscore _'));
-    $punctuation['colon']              = array('value' => ':', 'name' => t('Colon :'));
-    $punctuation['semicolon']          = array('value' => ';', 'name' => t('Semicolon ;'));
-    $punctuation['pipe']               = array('value' => '|', 'name' => t('Pipe |'));
-    $punctuation['left_curly']         = array('value' => '{', 'name' => t('Left curly bracket {'));
-    $punctuation['left_square']        = array('value' => '[', 'name' => t('Left square bracket ['));
-    $punctuation['right_curly']        = array('value' => '}', 'name' => t('Right curly bracket }'));
-    $punctuation['right_square']       = array('value' => ']', 'name' => t('Right square bracket ]'));
-    $punctuation['plus']               = array('value' => '+', 'name' => t('Plus +'));
-    $punctuation['equal']              = array('value' => '=', 'name' => t('Equal ='));
-    $punctuation['asterisk']           = array('value' => '*', 'name' => t('Asterisk *'));
-    $punctuation['ampersand']          = array('value' => '&', 'name' => t('Ampersand &'));
-    $punctuation['percent']            = array('value' => '%', 'name' => t('Percent %'));
-    $punctuation['caret']              = array('value' => '^', 'name' => t('Caret ^'));
-    $punctuation['dollar']             = array('value' => '$', 'name' => t('Dollar $'));
-    $punctuation['hash']               = array('value' => '#', 'name' => t('Hash #'));
-    $punctuation['at']                 = array('value' => '@', 'name' => t('At @'));
-    $punctuation['exclamation']        = array('value' => '!', 'name' => t('Exclamation !'));
-    $punctuation['tilde']              = array('value' => '~', 'name' => t('Tilde ~'));
-    $punctuation['left_parenthesis']   = array('value' => '(', 'name' => t('Left parenthesis ('));
-    $punctuation['right_parenthesis']  = array('value' => ')', 'name' => t('Right parenthesis )'));
-    $punctuation['question_mark']      = array('value' => '?', 'name' => t('Question mark ?'));
-    $punctuation['less_than']          = array('value' => '<', 'name' => t('Less than <'));
-    $punctuation['greater_than']       = array('value' => '>', 'name' => t('Greater than >'));
-    $punctuation['slash']              = array('value' => '/', 'name' => t('Slash /'));
-    $punctuation['back_slash']         = array('value' => '\\', 'name' => t('Backslash \\'));
+    $cid = 'pathauto:punctuation:' . $GLOBALS['language']->language;
+    if ($cache = cache_get($cid)) {
+      $punctuation = $cache->data;
+    }
+    else {
+      $punctuation = array();
+      $punctuation['double_quotes']      = array('value' => '"', 'name' => t('Double quotation marks'));
+      $punctuation['quotes']             = array('value' => '\'', 'name' => t("Single quotation marks (apostrophe)"));
+      $punctuation['backtick']           = array('value' => '`', 'name' => t('Back tick'));
+      $punctuation['comma']              = array('value' => ',', 'name' => t('Comma'));
+      $punctuation['period']             = array('value' => '.', 'name' => t('Period'));
+      $punctuation['hyphen']             = array('value' => '-', 'name' => t('Hyphen'));
+      $punctuation['underscore']         = array('value' => '_', 'name' => t('Underscore'));
+      $punctuation['colon']              = array('value' => ':', 'name' => t('Colon'));
+      $punctuation['semicolon']          = array('value' => ';', 'name' => t('Semicolon'));
+      $punctuation['pipe']               = array('value' => '|', 'name' => t('Vertical bar (pipe)'));
+      $punctuation['left_curly']         = array('value' => '{', 'name' => t('Left curly bracket'));
+      $punctuation['left_square']        = array('value' => '[', 'name' => t('Left square bracket'));
+      $punctuation['right_curly']        = array('value' => '}', 'name' => t('Right curly bracket'));
+      $punctuation['right_square']       = array('value' => ']', 'name' => t('Right square bracket'));
+      $punctuation['plus']               = array('value' => '+', 'name' => t('Plus sign'));
+      $punctuation['equal']              = array('value' => '=', 'name' => t('Equal sign'));
+      $punctuation['asterisk']           = array('value' => '*', 'name' => t('Asterisk'));
+      $punctuation['ampersand']          = array('value' => '&', 'name' => t('Ampersand'));
+      $punctuation['percent']            = array('value' => '%', 'name' => t('Percent sign'));
+      $punctuation['caret']              = array('value' => '^', 'name' => t('Caret'));
+      $punctuation['dollar']             = array('value' => '$', 'name' => t('Dollar sign'));
+      $punctuation['hash']               = array('value' => '#', 'name' => t('Number sign (pound sign, hash)'));
+      $punctuation['at']                 = array('value' => '@', 'name' => t('At sign'));
+      $punctuation['exclamation']        = array('value' => '!', 'name' => t('Exclamation mark'));
+      $punctuation['tilde']              = array('value' => '~', 'name' => t('Tilde'));
+      $punctuation['left_parenthesis']   = array('value' => '(', 'name' => t('Left parenthesis'));
+      $punctuation['right_parenthesis']  = array('value' => ')', 'name' => t('Right parenthesis'));
+      $punctuation['question_mark']      = array('value' => '?', 'name' => t('Question mark'));
+      $punctuation['less_than']          = array('value' => '<', 'name' => t('Less-than sign'));
+      $punctuation['greater_than']       = array('value' => '>', 'name' => t('Greater-than sign'));
+      $punctuation['slash']              = array('value' => '/', 'name' => t('Slash'));
+      $punctuation['back_slash']         = array('value' => '\\', 'name' => t('Backslash'));
+
+      // Allow modules to alter the punctuation list and cache the result.
+      drupal_alter('pathauto_punctuation_chars', $punctuation);
+      cache_set($cid, $punctuation);
+    }
   }
 
@@ -655 +862 @@
 
 /**
+ * Truncates a UTF-8-encoded string safely to a number of characters.
+ *
+ * This is a functional backport of Drupal 7's truncate_utf8().
+ *
+ * @param $string
+ *   The string to truncate.
+ * @param $max_length
+ *   An upper limit on the returned string length, including trailing ellipsis
+ *   if $add_ellipsis is TRUE.
+ * @param $wordsafe
+ *   If TRUE, attempt to truncate on a word boundary. Word boundaries are
+ *   spaces, punctuation, and Unicode characters used as word boundaries in
+ *   non-Latin languages; see PREG_CLASS_UNICODE_WORD_BOUNDARY for more
+ *   information.  If a word boundary cannot be found that would make the length
+ *   of the returned string fall within length guidelines (see parameters
+ *   $max_return_length and $min_wordsafe_length), word boundaries are ignored.
+ * @param $add_ellipsis
+ *   If TRUE, add t('...') to the end of the truncated string (defaults to
+ *   FALSE). The string length will still fall within $max_return_length.
+ * @param $min_wordsafe_length
+ *   If $wordsafe is TRUE, the minimum acceptable length for truncation (before
+ *   adding an ellipsis, if $add_ellipsis is TRUE). Has no effect if $wordsafe
+ *   is FALSE. This can be used to prevent having a very short resulting string
+ *   that will not be understandable. For instance, if you are truncating the
+ *   string "See myverylongurlexample.com for more information" to a word-safe
+ *   return length of 20, the only available word boundary within 20 characters
+ *   is after the word "See", which wouldn't leave a very informative string. If
+ *   you had set $min_wordsafe_length to 10, though, the function would realize
+ *   that "See" alone is too short, and would then just truncate ignoring word
+ *   boundaries, giving you "See myverylongurl..." (assuming you had set
+ *   $add_ellipses to TRUE).
+ *
+ * @return
+ *   The truncated string.
+ */
+function pathauto_truncate_utf8($string, $max_length, $wordsafe = FALSE, $add_ellipsis = FALSE, $min_wordsafe_length = 1) {
+  $ellipsis = '';
+  $max_length = max($max_length, 0);
+  $min_wordsafe_length = max($min_wordsafe_length, 0);
+
+  if (drupal_strlen($string) <= $max_length) {
+    // No truncation needed, so don't add ellipsis, just return.
+    return $string;
+  }
+
+  if ($add_ellipsis) {
+    // Truncate ellipsis in case $max_length is small.
+    $ellipsis = drupal_substr(t('...'), 0, $max_length);
+    $max_length -= drupal_strlen($ellipsis);
+    $max_length = max($max_length, 0);
+  }
+
+  if ($max_length <= $min_wordsafe_length) {
+    // Do not attempt word-safe if lengths are bad.
+    $wordsafe = FALSE;
+  }
+
+  if ($wordsafe) {
+    $matches = array();
+    // Find the last word boundary, if there is one within $min_wordsafe_length
+    // to $max_length characters. preg_match() is always greedy, so it will
+    // find the longest string possible.
+    $found = preg_match('/^(.{' . $min_wordsafe_length . ',' . $max_length . '})[' . PATHAUTO_PREG_CLASS_UNICODE_WORD_BOUNDARY . ']/u', $string, $matches);
+    if ($found) {
+      $string = $matches[1];
+    }
+    else {
+      $string = drupal_substr($string, 0, $max_length);
+    }
+  }
+  else {
+    $string = drupal_substr($string, 0, $max_length);
+  }
+
+  if ($add_ellipsis) {
+    $string .= $ellipsis;
+  }
+
+  return $string;
+}
+
+/**
  * Fetch an array of non-raw tokens that have matching raw tokens.
  *
@@ -683 +972 @@
   return $raw_tokens;
 }
-
-/**
- * Return all the possible paths of the i18n-ascii.txt transliteration file.
- *
- * @return
- *   An array of possible file paths.
- */
-function _pathauto_get_i18n_possible_files() {
-  $file = 'i18n-ascii.txt';
-  $files = array(
-    conf_path() . '/' . $file,
-    "sites/all/$file",
-    drupal_get_path('module', 'pathauto') . '/' . $file,
-  );
-  // Always prefer $conf['pathauto_i18n_file'] if defined.
-  if ($conf_file = variable_get('pathauto_i18n_file', '')) {
-    array_unshift($files, $conf_file);
-  }
-  return $files;
-}
-
-/**
- * Fetch the path to the i18n-ascii.txt transliteration file
- *
- * @return
- *   The complete path or FALSE if not found in any of the possible paths.
- *
- * @see _pathauto_get_i18n_possible_files()
- */
-function _pathauto_get_i18n_file() {
-  static $i18n_file;
-
-  if (!isset($i18n_file)) {
-    $i18n_file = FALSE;
-    foreach (_pathauto_get_i18n_possible_files() as $file) {
-      if (file_exists($file)) {
-        $i18n_file = $file;
-        break;
-      }
-    }
-  }
-
-  return $i18n_file;
-}