[Fixed indentation Adrian Georgescu **20071008082958] hunk ./provisioning/ngnpro_client_lib.phtml 239 + hunk ./provisioning/ngnpro_client_lib.phtml 1249 - $_url = $this->url.sprintf("&service=%s&action=Delete&domain_filter=%s", - urlencode($this->SOAPEngine->service), - urlencode($domain->domain) - ); - - if ($_REQUEST['action'] == 'Delete' && - $_REQUEST['domain_filter'] == $domain->domain) { - $_url .= "&confirm=1"; - $actionText = "Confirm"; - } else { - $actionText = "Delete"; - } - - $_customer_url = $this->url.sprintf("&service=customers@%s&customer_filter=%s", - urlencode($this->SOAPEngine->customerEngine), - urlencode($domain->customer) - ); - - printf(" - - %s - %s.%s - %s - %s - %s - ", - $bgcolor, - $index, - $_customer_url, - $domain->customer, - $domain->reseller, - $domain->domain, - $domain->changeDate, - $_url, - $actionText - ); - } else { - $_url = $this->url.sprintf("&service=%s&action=Delete&domain_filter=%s", - urlencode($this->SOAPEngine->service), - urlencode($domain) - ); - - if ($_REQUEST['action'] == 'Delete' && - $_REQUEST['domain_filter'] == $domain) { - $_url .= "&confirm=1"; - $actionText = "Confirm"; + $_url = $this->url.sprintf("&service=%s&action=Delete&domain_filter=%s", + urlencode($this->SOAPEngine->service), + urlencode($domain->domain) + ); + + if ($_REQUEST['action'] == 'Delete' && + $_REQUEST['domain_filter'] == $domain->domain) { + $_url .= "&confirm=1"; + $actionText = "Confirm"; + } else { + $actionText = "Delete"; + } + + $_customer_url = $this->url.sprintf("&service=customers@%s&customer_filter=%s", + urlencode($this->SOAPEngine->customerEngine), + urlencode($domain->customer) + ); + + printf(" + + %s + %s.%s + %s + %s + %s + ", + $bgcolor, + $index, + $_customer_url, + $domain->customer, + $domain->reseller, + $domain->domain, + $domain->changeDate, + $_url, + $actionText + ); hunk ./provisioning/ngnpro_client_lib.phtml 1286 - $actionText = "Delete"; - } - printf(" - - %s - %s - %s - %s - ", - $bgcolor, - $index, - $domain, - $domain->changeDate, - $_url, - $actionText - ); + $_url = $this->url.sprintf("&service=%s&action=Delete&domain_filter=%s", + urlencode($this->SOAPEngine->service), + urlencode($domain) + ); + + if ($_REQUEST['action'] == 'Delete' && + $_REQUEST['domain_filter'] == $domain) { + $_url .= "&confirm=1"; + $actionText = "Confirm"; + } else { + $actionText = "Delete"; + } + printf(" + + %s + %s + %s + %s + ", + $bgcolor, + $index, + $domain, + $domain->changeDate, + $_url, + $actionText + ); hunk ./provisioning/ngnpro_client_lib.phtml 2393 - printf(" - - %s - %s.%s - %s@%s - %s@%s - %s - %s - %s - - ", - $bgcolor, - $index, - $_customer_url, - $alias->customer, - $alias->reseller, - $alias->id->username, - $alias->id->domain, - $alias->target->username, - $alias->target->domain, - $_owner_url, - $alias->changeDate, - $_url, - $actionText - ); + printf(" + + %s + %s.%s + %s@%s + %s@%s + %s + %s + %s + + ", + $bgcolor, + $index, + $_customer_url, + $alias->customer, + $alias->reseller, + $alias->id->username, + $alias->id->domain, + $alias->target->username, + $alias->target->domain, + $_owner_url, + $alias->changeDate, + $_url, + $actionText + ); hunk ./provisioning/ngnpro_client_lib.phtml 2419 - printf(" - - %s - %s@%s - %s@%s - %s - %s - %s - - ", - $bgcolor, - $index, - $alias->id->username, - $alias->id->domain, - $alias->target->username, - $alias->target->domain, - $alias->owner, - $alias->changeDate, - $_url, - $actionText - ); + printf(" + + %s + %s@%s + %s@%s + %s + %s + %s + + ", + $bgcolor, + $index, + $alias->id->username, + $alias->id->domain, + $alias->target->username, + $alias->target->domain, + $alias->owner, + $alias->changeDate, + $_url, + $actionText + ); hunk ./provisioning/ngnpro_client_lib.phtml 2866 - if (strlen($this->SOAPEngine->recordGenerator)) { - $range_link=sprintf('%s',$this->url,$this->SOAPEngine->recordGenerator,$range->id->prefix,$range->id->tld,$range->maxDigits,$range->reseller,$range->id->prefix); + if ($this->adminonly) { + if ($this->loginCredentials['resellerFilters'][$range->reseller]['recordGenerator']) { + $range_link=sprintf('%s',$this->url,$this->loginCredentials['resellerFilters'][$range->reseller]['recordGenerator'],$range->id->prefix,$range->id->tld,$range->maxDigits,$range->reseller,$range->id->prefix); + } else if (strlen($this->SOAPEngine->recordGenerator)) { + $range_link=sprintf('%s',$this->url,$this->SOAPEngine->recordGenerator,$range->id->prefix,$range->id->tld,$range->maxDigits,$range->reseller,$range->id->prefix); + } else { + $range_link=$range->id->prefix; + } hunk ./provisioning/ngnpro_client_lib.phtml 2875 - $range_link=$range->id->prefix; + if (strlen($this->SOAPEngine->recordGenerator)) { + $range_link=sprintf('%s',$this->url,$this->SOAPEngine->recordGenerator,$range->id->prefix,$range->id->tld,$range->maxDigits,$range->reseller,$range->id->prefix); + } else { + $range_link=$range->id->prefix; + } hunk ./provisioning/ngnpro_client_lib.phtml 2883 - $_customer_url = $this->url.sprintf("&service=customers@%s&customer_filter=%s", - urlencode($this->SOAPEngine->customerEngine), - urlencode($range->customer) - ); - - printf(" - - %s - %s.%s - +%s - %s - %s - %s - %s - %s - %s - %s - %s - ", - $bgcolor, - $index, - $_customer_url, - $range->customer, - $range->reseller, - $range_link, - $range->id->tld, - $range->ttl, - $range->minDigits, - $range->maxDigits, - $range->size, - $range->used, - $range->changeDate, - $_url, - $actionText - ); + $_customer_url = $this->url.sprintf("&service=customers@%s&customer_filter=%s", + urlencode($this->SOAPEngine->customerEngine), + urlencode($range->customer) + ); + + printf(" + + %s + %s.%s + +%s + %s + %s + %s + %s + %s + %s + %s + %s + ", + $bgcolor, + $index, + $_customer_url, + $range->customer, + $range->reseller, + $range_link, + $range->id->tld, + $range->ttl, + $range->minDigits, + $range->maxDigits, + $range->size, + $range->used, + $range->changeDate, + $_url, + $actionText + ); hunk ./provisioning/ngnpro_client_lib.phtml 2919 - printf(" - - %s - +%s - %s - %s - %s - %s - %s - %s - %s - %s - ", - $bgcolor, - $index, - $range_link, - $range->id->tld, - $range->ttl, - $range->minDigits, - $range->maxDigits, - $range->size, - $range->used, - $range->changeDate, - $_url, - $actionText - ); - + printf(" + + %s + +%s + %s + %s + %s + %s + %s + %s + %s + %s + ", + $bgcolor, + $index, + $range_link, + $range->id->tld, + $range->ttl, + $range->minDigits, + $range->maxDigits, + $range->size, + $range->used, + $range->changeDate, + $_url, + $actionText + ); hunk ./provisioning.phtml 61 + +$loginCredentials['resellerFilters'] = $resellerFilters;