diff -rupN cck/content.module cck_new/content.module --- cck/content.module 2009-12-05 00:33:06.000000000 +1100 +++ content.module 2010-02-25 18:34:02.000000000 +1100 @@ -206,6 +206,9 @@ function content_theme() { 'content_multiple_values' => array( 'arguments' => array('element' => NULL), ), + 'content_multiple_value_token' => array( + 'arguments' => array('items' => array(), 'type' => 'raw'), + ), ); } @@ -2731,3 +2734,88 @@ function content_inactive_fields($type_n } return $inactive; } + +/** + * Theme a multiple value token. + * + * To ckange the way the multiple values are separated change the br tag + * in the the line that says: $token .= $token ? '< br />' : ''; + * + * @param $items + * An array of items from the field the token is for. + * @param $type + * The type of the token. Possible values are: + * 'raw' + * 'formatted' + * 'node-nid' + * 'node-title' + * 'node-title-raw' + * 'node-link' + * 'node-path' + * 'node-url' + * 'user-uid' + * 'user-name' + * 'user-link' + * 'user-path' + * 'user-url' + * + * @return + * The output of the token. + * + * @ingroup themable + */ +function theme_content_multiple_value_token($items = array(), $type = 'raw') { + $token = ''; + foreach ($items as $item) { + // If this isn't the first item break to the next line. + $token .= $token ? '
' : ''; + + // Switch based on what the token type is so we use the correct data. + switch ($type) { + case 'raw': + default: + $token .= $item['value']; + break; + case 'formatted': + $token .= isset($item['view']) ? $item['view'] : ''; + break; + case 'node-nid': + $token .= $item['nid']; + break; + case 'node-title': + $title = is_numeric($item['nid']) ? _nodereference_titles($item['nid']) : ''; + $token .= $title ? check_plain($title) : ''; + break; + case 'node-title-raw': + $title = is_numeric($item['nid']) ? _nodereference_titles($item['nid']) : ''; + $token .= $title; + break; + case 'node-link': + $token .= isset($item['view']) ? $item['view'] : ''; + break; + case 'node-path': + $token .= is_numeric($item['nid']) ? url('node/' . $item['nid']) : ''; + break; + case 'node-url': + $token .= is_numeric($item['nid']) ? url('node/' . $item['nid'], array('absolute' => TRUE)) : ''; + break; + case 'user-uid': + $token .= $item['uid']; + break; + case 'user-name': + $token .= isset($item['view']) ? strip_tags($item['view']) : ''; + break; + case 'user-link': + $token .= isset($item['view']) ? $item['view'] : ''; + break; + case 'user-path': + $token .= is_numeric($item['uid']) ? url('user/' . $item['uid']) : ''; + break; + case 'user-url': + $token .= is_numeric($item['uid']) ? url('user/' . $item['uid'], array('absolute' => TRUE)) : ''; + break; + } + } + + return $token; +} \ No newline at end of file diff -rupN cck/includes/content.token.inc cck_new/includes/content.token.inc --- cck/includes/content.token.inc 2008-12-06 01:59:22.000000000 +1100 +++ includes/content.token.inc 2010-02-25 18:36:08.000000000 +1100 @@ -78,12 +78,18 @@ if (module_exists('nodereference')) { if ($type == 'field' || $type == 'all') { $tokens = array(); - $tokens['node reference']['nid'] = t('Referenced node ID'); - $tokens['node reference']['title'] = t('Referenced node title'); - $tokens['node reference']['title-raw'] = t('Referenced node unfiltered title. WARNING - raw user input.'); - $tokens['node reference']['link'] = t("Formatted html link to the referenced node."); - $tokens['node reference']['path'] = t("Relative path alias to the referenced node."); - $tokens['node reference']['url'] = t("Absolute path alias to the referenced node."); + $tokens['node reference']['nid'] = t('Referenced node ID'); + $tokens['node reference']['title'] = t('Referenced node title'); + $tokens['node reference']['title-raw'] = t('Referenced node unfiltered title. WARNING - raw user input.'); + $tokens['node reference']['link'] = t("Formatted html link to the referenced node."); + $tokens['node reference']['path'] = t("Relative path alias to the referenced node."); + $tokens['node reference']['url'] = t("Absolute path alias to the referenced node."); + $tokens['node reference']['multiple-nid'] = t('Referenced node ID (all values)'); + $tokens['node reference']['multiple-title'] = t('Referenced node title (all values)'); + $tokens['node reference']['multiple-title-raw'] = t('Referenced node unfiltered title. WARNING - raw user input. (all values)'); + $tokens['node reference']['multiple-link'] = t("Formatted html link to the referenced node. (all values)"); + $tokens['node reference']['multiple-path'] = t("Relative path alias to the referenced node. (all values)"); + $tokens['node reference']['multiple-url'] = t("Absolute path alias to the referenced node. (all values)"); return $tokens; } @@ -94,12 +100,18 @@ if (module_exists('nodereference')) { $item = $object[0]; $title = is_numeric($item['nid']) ? _nodereference_titles($item['nid']) : ''; - $tokens['nid'] = $item['nid']; - $tokens['title'] = $title ? check_plain($title) : ''; - $tokens['title-raw'] = $title; - $tokens['link'] = isset($item['view']) ? $item['view'] : ''; - $tokens['path'] = is_numeric($item['nid']) ? url('node/' . $item['nid']) : ''; - $tokens['url'] = is_numeric($item['nid']) ? url('node/' . $item['nid'], array('absolute' => TRUE)) : ''; + $tokens['nid'] = $item['nid']; + $tokens['title'] = $title ? check_plain($title) : ''; + $tokens['title-raw'] = $title; + $tokens['link'] = isset($item['view']) ? $item['view'] : ''; + $tokens['path'] = is_numeric($item['nid']) ? url('node/' . $item['nid']) : ''; + $tokens['url'] = is_numeric($item['nid']) ? url('node/' . $item['nid'], array('absolute' => TRUE)) : ''; + $tokens['multiple-nid'] = theme('content_multiple_value_token', $object, 'node-nid'); + $tokens['multiple-title'] = theme('content_multiple_value_token', $object, 'node-title'); + $tokens['multiple-title-raw'] = theme('content_multiple_value_token', $object, 'node-title-raw'); + $tokens['multiple-link'] = theme('content_multiple_value_token', $object, 'node-link'); + $tokens['multiple-path'] = theme('content_multiple_value_token', $object, 'node-path'); + $tokens['multiple-url'] = theme('content_multiple_value_token', $object, 'node-url'); return $tokens; } @@ -111,8 +123,10 @@ if (module_exists('number')) { if ($type == 'field' || $type == 'all') { $tokens = array(); - $tokens['number']['raw'] = t('Raw number value'); - $tokens['number']['formatted'] = t('Formatted number value'); + $tokens['number']['raw'] = t('Raw number value'); + $tokens['number']['formatted'] = t('Formatted number value'); + $tokens['number']['multiple-raw'] = t('Raw, number value (all values)'); + $tokens['number']['multiple-formatted'] = t('Formatted number value (all values)'); return $tokens; } @@ -122,8 +136,10 @@ if (module_exists('number')) { if ($type == 'field') { $item = $object[0]; - $tokens['raw'] = $item['value']; - $tokens['formatted'] = isset($item['view']) ? $item['view'] : ''; + $tokens['raw'] = $item['value']; + $tokens['formatted'] = isset($item['view']) ? $item['view'] : ''; + $tokens['multiple-raw'] = theme('content_multiple_value_token', $object, 'raw'); + $tokens['multiple-formatted'] = theme('content_multiple_value_token', $object, 'formatted'); return $tokens; } @@ -135,8 +151,10 @@ if (module_exists('text')) { if ($type == 'field' || $type == 'all') { $tokens = array(); - $tokens['text']['raw'] = t('Raw, unfiltered text'); - $tokens['text']['formatted'] = t('Formatted and filtered text'); + $tokens['text']['raw'] = t('Raw, unfiltered text'); + $tokens['text']['formatted'] = t('Formatted and filtered text'); + $tokens['text']['multiple-raw'] = t('Raw, unfiltered text (all values)'); + $tokens['text']['multiple-formatted'] = t('Formatted and filtered text (all values)'); return $tokens; } @@ -146,8 +164,11 @@ if (module_exists('text')) { if ($type == 'field') { $item = $object[0]; - $tokens['raw'] = $item['value']; - $tokens['formatted'] = isset($item['view']) ? $item['view'] : ''; + $tokens['raw'] = $item['value']; + $tokens['formatted'] = isset($item['view']) ? $item['view'] : ''; + $tokens['multiple-raw'] = theme('content_multiple_value_token', $object, 'raw'); + $tokens['multiple-formatted'] = theme('content_multiple_value_token', $object, 'formatted'); + return $tokens; } } @@ -158,11 +179,16 @@ if (module_exists('userreference')) { if ($type == 'field' || $type == 'all') { $tokens = array(); - $tokens['user reference']['uid'] = t('Referenced user ID'); - $tokens['user reference']['name'] = t('Referenced user name'); - $tokens['user reference']['link'] = t('Formatted HTML link to referenced user'); - $tokens['user reference']['path'] = t("Relative path alias to the referenced user."); - $tokens['user reference']['url'] = t("Absolute path alias to the referenced user."); + $tokens['user reference']['uid'] = t('Referenced user ID'); + $tokens['user reference']['name'] = t('Referenced user name'); + $tokens['user reference']['link'] = t('Formatted HTML link to referenced user'); + $tokens['user reference']['path'] = t("Relative path alias to the referenced user."); + $tokens['user reference']['url'] = t("Absolute path alias to the referenced user."); + $tokens['user reference']['multiple-uid'] = t('Referenced user ID (all values)'); + $tokens['user reference']['multiple-name'] = t('Referenced user name (all values)'); + $tokens['user reference']['multiple-link'] = t('Formatted HTML link to referenced user (all values)'); + $tokens['user reference']['multiple-path'] = t("Relative path alias to the referenced user (all values)."); + $tokens['user reference']['multiple-url'] = t("Absolute path alias to the referenced user (all values)."); return $tokens; } @@ -172,11 +198,16 @@ if (module_exists('userreference')) { if ($type == 'field') { $item = $object[0]; - $tokens['uid'] = $item['uid']; - $tokens['name'] = isset($item['view']) ? strip_tags($item['view']) : ''; - $tokens['link'] = isset($item['view']) ? $item['view'] : ''; - $tokens['path'] = is_numeric($item['uid']) ? url('user/' . $item['uid']) : ''; - $tokens['url'] = is_numeric($item['uid']) ? url('user/' . $item['uid'], array('absolute' => TRUE)) : ''; + $tokens['uid'] = $item['uid']; + $tokens['name'] = isset($item['view']) ? strip_tags($item['view']) : ''; + $tokens['link'] = isset($item['view']) ? $item['view'] : ''; + $tokens['path'] = is_numeric($item['uid']) ? url('user/' . $item['uid']) : ''; + $tokens['url'] = is_numeric($item['uid']) ? url('user/' . $item['uid'], array('absolute' => TRUE)) : ''; + $tokens['multiple-uid'] = theme('content_multiple_value_token', $object, 'user-uid'); + $tokens['multiple-name'] = theme('content_multiple_value_token', $object, 'user-name'); + $tokens['multiple-link'] = theme('content_multiple_value_token', $object, 'user-link'); + $tokens['multiple-path'] = theme('content_multiple_value_token', $object, 'user-path'); + $tokens['multiple-url'] = theme('content_multiple_value_token', $object, 'user-url'); return $tokens; }