--- ./pathauto.inc Thu Jan 27 17:11:35 2011 +++ ./pathauto.inc.php Fri Jan 28 18:33:18 2011 @@ -526,55 +526,55 @@ * Return an array of arrays for punctuation values. * * Returns an array of arrays for punctuation values keyed by a name, including - * the value and a textual description. + * only the value. pathauto_admin_punctuation_chars() adds a description, + * but as that is interface only, it is not set here. * Can and should be expanded to include "all" non text punctuation values. * * @return * An array of arrays for punctuation values keyed by a name, including the - * value and a textual description. + * value. */ function pathauto_punctuation_chars() { static $punctuation; 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 \\')); + $punctuation['double_quotes'] = array('value' => '"'); + $punctuation['quotes'] = array('value' => "'"); + $punctuation['backtick'] = array('value' => '`'); + $punctuation['comma'] = array('value' => ','); + $punctuation['period'] = array('value' => '.'); + $punctuation['hyphen'] = array('value' => '-'); + $punctuation['underscore'] = array('value' => '_'); + $punctuation['colon'] = array('value' => ':'); + $punctuation['semicolon'] = array('value' => ';'); + $punctuation['pipe'] = array('value' => '|'); + $punctuation['left_curly'] = array('value' => '{'); + $punctuation['left_square'] = array('value' => '['); + $punctuation['right_curly'] = array('value' => '}'); + $punctuation['right_square'] = array('value' => ']'); + $punctuation['plus'] = array('value' => '+'); + $punctuation['equal'] = array('value' => '='); + $punctuation['asterisk'] = array('value' => '*'); + $punctuation['ampersand'] = array('value' => '&'); + $punctuation['percent'] = array('value' => '%'); + $punctuation['caret'] = array('value' => '^'); + $punctuation['dollar'] = array('value' => '$'); + $punctuation['hash'] = array('value' => '#'); + $punctuation['at'] = array('value' => '@'); + $punctuation['exclamation'] = array('value' => '!'); + $punctuation['tilde'] = array('value' => '~'); + $punctuation['left_parenthesis'] = array('value' => '('); + $punctuation['right_parenthesis'] = array('value' => ')'); + $punctuation['question_mark'] = array('value' => '?'); + $punctuation['less_than'] = array('value' => '<'); + $punctuation['greater_than'] = array('value' => '>'); + $punctuation['slash'] = array('value' => '/'); + $punctuation['back_slash'] = array('value' => '\\'); } return $punctuation; } - /** * Fetch the maximum length of the {url_alias}.alias field from the schema. * --- ./pathauto.admin.inc Fri Jan 28 18:29:34 2011 +++ ./pathauto.admin.inc.php Fri Jan 28 18:34:51 2011 @@ -191,7 +191,7 @@ '#collapsed' => TRUE, ); - $punctuation = pathauto_punctuation_chars(); + $punctuation = pathauto_admin_punctuation_chars(); foreach ($punctuation as $name => $details) { $details['default'] = PATHAUTO_PUNCTUATION_REMOVE; if ($details['value'] == variable_get('pathauto_separator', '-')) { @@ -243,7 +243,7 @@ // Validate that the separator is not set to be removed per http://drupal.org/node/184119 // This isn't really all that bad so warn, but still allow them to save the value. $separator = $form_state['values']['pathauto_separator']; - $punctuation = pathauto_punctuation_chars(); + $punctuation = pathauto_admin_punctuation_chars(); foreach ($punctuation as $name => $details) { if ($details['value'] == $separator) { $action = $form_state['values']['pathauto_punctuation_' . $name]; @@ -434,4 +434,41 @@ } } $form_state['redirect'] = 'admin/config/search/path/delete_bulk'; +} + +function pathauto_admin_punctuation_chars() { + return array_merge_recursive(pathauto_punctuation_chars(), array( + 'double_quotes' => array('name' => t('Double quotes "')), + 'quotes' => array('name' => t("Single quotes (apostrophe) '")), + 'backtick' => array('name' => t('Back tick `')), + 'comma' => array('name' => t('Comma ,')), + 'period' => array('name' => t('Period .')), + 'hyphen' => array('name' => t('Hyphen -')), + 'underscore' => array('name' => t('Underscore _')), + 'colon' => array('name' => t('Colon :')), + 'semicolon' => array('name' => t('Semicolon ;')), + 'pipe' => array('name' => t('Pipe |')), + 'left_curly' => array('name' => t('Left curly bracket {')), + 'left_square' => array('name' => t('Left square bracket [')), + 'right_curly' => array('name' => t('Right curly bracket }')), + 'right_square' => array('name' => t('Right square bracket ]')), + 'plus' => array('name' => t('Plus +')), + 'equal' => array('name' => t('Equal =')), + 'asterisk' => array('name' => t('Asterisk *')), + 'ampersand' => array('name' => t('Ampersand &')), + 'percent' => array('name' => t('Percent %')), + 'caret' => array('name' => t('Caret ^')), + 'dollar' => array('name' => t('Dollar $')), + 'hash' => array('name' => t('Hash #')), + 'at' => array('name' => t('At @')), + 'exclamation' => array('name' => t('Exclamation !')), + 'tilde' => array('name' => t('Tilde ~')), + 'left_parenthesis' => array('name' => t('Left parenthesis (')), + 'right_parenthesis' => array('name' => t('Right parenthesis )')), + 'question_mark' => array('name' => t('Question mark ?')), + 'less_than' => array('name' => t('Less than <')), + 'greater_than' => array('name' => t('Greater than >')), + 'slash' => array('name' => t('Slash /')), + 'back_slash' => array('name' => t('Backslash \\')), + )); }