Additional tokens

Should [node:domains] be plural? I guess if domain.module itself support multiple domains per node, and it's domain_source that assigns a 'source' domain. Maybe this token should be [node:domain-source:*]?

Also, the current code would not output anything if the token [node:domains] would be used.

+++ b/domain.tokens.incundefined
@@ -97,16 +107,27 @@ function domain_tokens($type, $tokens, array $data = array(), array $options = a
+    $domain = domain_get_node_match($data['node']->nid);
+    if ($domain != -1) {
+      $domain_tokens = token_find_with_prefix($tokens, 'domain');
+      $replacements += token_generate('domain', $domain_tokens, array('domain' => $domain), $options);
+      $subdomain = $domain['subdomain'];
+      $replacements['[node:domain]'] = $sanitize ? check_plain($subdomain) : $subdomain;

The above could will generate all tokens no matter if the user actually provided them or not - something that the new Token API in D7 helps avoid now. To generate the tokens on-demand, we should use the following code instead:

  if ($type == 'node' && !empty($data['node'])) {
    $node = $data['node'];

    foreach ($tokens as $name => $original) {
      switch ($name) {
        case 'domain':
          $domain = domain_get_node_match($node->nid);
          if ($domain != -1) {
            $replacements[$original] = $sanitize ? check_plain($domain['subdomain']) : $domain['subdomain'];
          }
          break;
      }
    }

    // [node:domain:*] chained token replacement.
    if ($domain_tokens = token_find_with_prefix($tokens, 'domain')) {
      $domain = domain_get_node_match($node->nid);
      if ($domain != -1) {
        $replacements += token_generate('domain', $domain_tokens, array('domain' => $domain), $options);
      }
    }
  }

I checked that the domain_get_node_match() is statically cached so calling it more than once is completely fine.

#6 seems good for now - would just be good to add some tests on it but it shouldn't hold this up.