Merge with Domain Administration Helper

Yes - and I also have a whole bunch of permissions in Domain Admin Helper :) There are usecases for more granular control, but also use cases where you just want to give your editors total domain rights and not want to bother with a whole bunch of checkboxes

Heres a suggestion thats easy to do - create a radio field in the Domain settings page that goes something like

- Create one 'administer own domain' permission
- Create multiple permissions to handle different domain administration tasks

This basically influences the permissions in hook_perm (we also may need to clear any existing domain_admin permissions).

Then for permissions we call a domain_admin_content_access($perm) function that says

if(variable_get('domain_admin_permissiontype','single') == 'single') { 
    return user_access('administer own domain');
}
else return user_access($perm);

Thanks ergonlogic! Youre right, thats all thats required.

Ill keep an eye out for you on IRC, or you can send me a mail. I don't have enormous TODO plans (one or 2 ideas, perhaps :) ) so im happy to hear any ideas you had. I think the main thing is to get the merged module up and working.

Heres a suggestion - how about I commit a merged module to HEAD, then we can test it and if we're happy we can then tag a release

Just a quick note to say i havent forgotten this - I have a basic merge working locally and hope to commit something in the next week

Ok - a basic merge is now in HEAD. I have tested it and it seems pretty good so far, but I havent tagged it. I'll be putting it on a production site this week, so lots of non-technical domain users will have the chance to post issues.

So far:

• I added a permission granularity radio button to the domain settings page, so the user can choose between one single 'administer own domains' permission or multiple little permissions. It seems to work fine, I had to add a little something to get it to work with the admin_role module, but nothing big. I also had to modify the domain_user_access function a little and farm out the domain checking to another function.
• For the most part, I managed to merge the two modules without significant changes to either. A couple of small things - the access to admin/build/domain was covered by 'administer own domains', so for multiple granularity I included a 'access domain overview page' permission. I also have a 'edit own domain record' permission to admin/build/domain/edit/% and kept 'configure domain settings' permission for admin/build/domain/conf/%/ However in both cases, I am happy to go with whatever people think. No point engaging in permission overkill for the sake of it.
• My existing module had integration with the Book Page Access module (basically domain managers can delegate edit access to child pages on their domain). It depends on a patch to that module which has now been posted, lets see how that goes...
• I also took brt's suggestion and put some checkboxes in the domain settings page so people can choose which links appear in the domain admin block. In addition, I included another hook to allow external modules to add their own links to the block (it gave me the opportunity to farm out some custom stuff I had there to my own custom modules)

Forgot to set status :)

That Book Page Access code requires the aforementioned patch. If they don't commit the patch soon, im entirely ok with stripping the integration code out. I can probably implement the integration i need in a custom module. Ill wait until the weekend, and if nothing happens, then I'll wield my scalpel :)

Great stuff! I changed module page to reflect new functionality (please feel free to change), and am working on adding a README file

Another thing - could I say at the end of the module page Module developed by Ergon Logic Enterprises and Vasudeva Server? A few people on our team worked on the Domain Admin Helper module, so I'd like to give some credit where credit is due :)

Ok - added README to HEAD and updated link to documentation on domain homepage.