Marius Cramer
2014-07-08 cbdc7acabd3c61c3e8da7a3b04421f0d061fc5fa
refs
author Marius Cramer <m.cramer@pixcept.de>
Tuesday, July 8, 2014 10:05 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Tuesday, July 8, 2014 10:05 -0400
commitcbdc7acabd3c61c3e8da7a3b04421f0d061fc5fa
tree 334feaf05ab61a4f3217eca9452ad0b98eed9b7a tree | zip | gz
parent 6e1bd90b34d295a4f12b8a0ec95a530d58e11f5c view | diff
baf5dda4cc07aa35eb9e41dda90aee0d2cdecf23 view | diff
Merge branch 'hide_used_domains' into 'master'

Hide used domains

Domain must be unique for mail, dns or web site, so there is no point in get used domains on domain select (with domain module enabled) and this patch get only unused domains. For subdomains it doesn't apply, so it's not used.

This patch added some code to dns module because I added domain select on merge request #105 and commit is included here because I based this branch on branch from merge request #105. I can rebase to master if you #105 is merged if it's needed.
13 files modified
233 ■■■■■ changed files
interface/lib/classes/tools_sites.inc.php 14 ●●●● diff | view | raw | blame | history
interface/web/dns/dns_import.php 38 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_slave_edit.php 46 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_soa_edit.php 46 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_wizard.php 48 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_import.lng 2 ●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_import.htm 9 ●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_slave_edit.htm 8 ●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_soa_edit.htm 8 ●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_wizard.htm 8 ●●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_edit.php 2 ●●● diff | view | raw | blame | history
interface/web/sites/web_childdomain_edit.php 2 ●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_domain_edit.php 2 ●●● diff | view | raw | blame | history