Domain Tokens

I would remove the Pathauto dependency. Can you post as a normal patch to domain.module?

You should not use the cleanstring on the sitename, just use check_plain().

You might also create a token for the source domain.

Ah, then lets call domain_cleanstring() something like domain_url_encode().

Exactly what I needed. Thanks! (And works great -- no issues thus far)

Attached is an updated patch against HEAD. I changed the token names, so that they all begin with domain- for better grouping.

I still don't quite see the use-case for this feature. How is this useful in a pathauto situation?

It also needs tokens for Domain Source and other node-specific token values, doesn't it?

And that is done through a custom module or a contrib that I can test againat?

I can see the use-case for file folders -- this actually came up today at DrupalCON DC.

would this implement the functionality described
in http://drupal.org/node/198131 ?

skizzo -- Not quite the same.

The tokens approach is a good solution for the current inability to swap files directories per domain, which is complicated by the nature of the {files} storage table in Drupal core.

Tested and committed to HEAD.

@blackdog -- This is an awesome feature!

I did, btw, test Domain Source (see attached), but it does not work since the $node->domain_source element may not be set when uploading files to a new node. So I have scrapped it.

For the majority of user-cases, this patch should be perfect.

Thanks again!

Tested as well - seems good to me.

It actually gave me an excuse to go hide in a quiet room for 90 minutes :-)

Will this feature be in the next release?

Yes. It is already in HEAD.

I found this issue when looking for other situations where modules need clean paths. After talking to greggles, the way to accomplish this is in this pathauto issue: #212208: allow other modules to affect strings (to help with custom accent/string replacement) and a new Clean Path module.

Here's a link to other issues with the clean path tag.

@mitchell

That issue seems to be entirely unrelated, unless you are going to use the new pathauto hook to rewrite URL path per-domain, which will not be supported by DA core.

@agentrickard: I'm not really sure how the Clean Path API could be used with DA because of its specific needs. I imagine the module would work similarly to Token, so in whatever sense you would need paths generated from "unclean" strings, this future module would be able to help.

Some follow-up patches for both 6.x-2.x and HEAD/7.x-3.x:

1. In D6's hook_token_list() you need to check if ($type == 'global' || $type == 'all') when listing your tokens otherwise they get listed even we only want to show non-global node-related tokens. To see this have the latest pathauto and token installed and go to the Pathauto patterns page.
2. Moved D7 token implementations to domain.tokens.inc.
3. Reworked the D7 tokens to provide a base 'domain' token type, a 'current-domain' global token type, and a 'default-domain' global token type. This way, we can properly chain stuff like [node:source-domain:url]. A couple before/afters:
Before: [domain:domain-id], After: [current-domain:id]
Before: [domain:domain-default-id], After: [default-domain:id]

Also, I would *highly* recommend *not* altering your tokens aside from sanitation. The stuff with domain_url_encode() just screams out at me, but I haven't touched it here.

copy/paste errors with the D7 patch

Adding tag

The domain_url_encode() bit was put in by the OP as a way to strip out non-Alphanumeric characters. I suppose it's not necessary in most cases because PathAuto will do that for us. I am hesitant to remove that from x.2 versions, though, as people may be using it.

If people want pathauto-style tokens for use with uploads they should be using http://drupal.org/project/filefield_paths which cleans its tokens using pathauto if available.

Fixed error with 'Current domain' name being used on [default-domain:?] tokens.

Committed to HEAD.

I am reluctant to commit this to 6.x.2 and 7.x.2 because doing so may break expected functionality.

Keeping as 'needs' review for those two branches.

I've just committed a change to Pathauto to display global tokens in the Patterns page, so users will still see domain tokens with the D6 patch. The D7 patch should also be applied to 7.x-2.x because you shouldn't straight port tokens from D6 to D7 since the API changed. Providing a re-usable domain token type, and then current-domain and default-domain is recommended. Everyone is going to have to change all their tokens in when migrating to D7 anyway, so let's just have them do the right thing rather than having to make them change again when they update to Domain 7.x-3.x.

Side note that I'm working on providing a token upgrade API in token.module that modules can use and/or provide their own token upgrades for other modules to use.

I've also filed #945122: Re-use the token tree UI and fix token integration in FileField Paths to have them re-use the provided token tree UI that's available in token.module rather than re-coding their own token display that does things wrong.

Committed to 6.x

Committed to 7.x.2.