diff --git a/bin/powerdns_add_domain.php b/bin/powerdns_add_domain.php index ab0ed50..bff9793 100755 --- a/bin/powerdns_add_domain.php +++ b/bin/powerdns_add_domain.php @@ -21,6 +21,6 @@ function_requirements('add_dns_domain'); define('VERBOSE_MODE', false); $GLOBALS['tf']->session->create($custid, 'admin'); $sid = $GLOBALS['tf']->session->sessionid; - function_requirements('add_dns_domain'); + function_requirements('add_dns_domain'); print_r(add_dns_domain($dns_domain, $dns_ip)); $GLOBALS['tf']->session->destroy(); diff --git a/src/Plugin.php b/src/Plugin.php index 075213e..b573d2b 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -29,30 +29,30 @@ public function __construct() public static function getHooks() { return [ - 'api.register' => [__CLASS__, 'apiRegister'], - 'function.requirements' => [__CLASS__, 'getRequirements'], + 'api.register' => [__CLASS__, 'apiRegister'], + 'function.requirements' => [__CLASS__, 'getRequirements'], 'system.settings' => [__CLASS__, 'getSettings'], //'ui.menu' => [__CLASS__, 'getMenu'], ]; } - /** - * @param \Symfony\Component\EventDispatcher\GenericEvent $event - */ - public static function apiRegister(GenericEvent $event) - { - /** - * @var \ServiceHandler $subject - */ - //$subject = $event->getSubject(); - api_register('get_dns_domain', ['domain_id' => 'int'], ['return' => 'sql_row:dns:domains'], 'Gets the DNS entry for a given Domain ID'); - api_register('get_dns_records', ['domain_id' => 'int'], ['return' => 'array:sql_row:dns:records'], 'Gets the DNS records associated with given Domain ID'); - api_register('delete_dns_record', ['domain_id' => 'int', 'record_id' => 'int'], ['return' => 'boolean'], 'Deletes a single DNS record'); - api_register('delete_dns_domain', ['domain_id' => 'int'], ['return' => 'boolean'], 'Deletes a Domain from our DNS servers'); - api_register('add_dns_record', ['domain_id' => 'int', 'name' => 'string', 'content' => 'string', 'type' => 'string', 'ttl' => 'int', 'prio' => 'int'], ['return' => 'int'], 'Adds a single DNS record'); - api_register('update_dns_record', ['domain_id' => 'int', 'record_id' => 'int', 'name' => 'string', 'content' => 'string', 'type' => 'string', 'ttl' => 'int', 'prio' => 'int'], ['return' => 'boolean'], 'Updates a single DNS record'); - api_register('add_dns_domain', ['domain' => 'string', 'ip' => 'string'], ['return' => 'result_status'], 'Adds a new domain into our system. The status will be "ok" if it added, or "error" if there was any problems status_text will contain a description of the problem if any.'); - } + /** + * @param \Symfony\Component\EventDispatcher\GenericEvent $event + */ + public static function apiRegister(GenericEvent $event) + { + /** + * @var \ServiceHandler $subject + */ + //$subject = $event->getSubject(); + api_register('get_dns_domain', ['domain_id' => 'int'], ['return' => 'sql_row:dns:domains'], 'Gets the DNS entry for a given Domain ID'); + api_register('get_dns_records', ['domain_id' => 'int'], ['return' => 'array:sql_row:dns:records'], 'Gets the DNS records associated with given Domain ID'); + api_register('delete_dns_record', ['domain_id' => 'int', 'record_id' => 'int'], ['return' => 'boolean'], 'Deletes a single DNS record'); + api_register('delete_dns_domain', ['domain_id' => 'int'], ['return' => 'boolean'], 'Deletes a Domain from our DNS servers'); + api_register('add_dns_record', ['domain_id' => 'int', 'name' => 'string', 'content' => 'string', 'type' => 'string', 'ttl' => 'int', 'prio' => 'int'], ['return' => 'int'], 'Adds a single DNS record'); + api_register('update_dns_record', ['domain_id' => 'int', 'record_id' => 'int', 'name' => 'string', 'content' => 'string', 'type' => 'string', 'ttl' => 'int', 'prio' => 'int'], ['return' => 'boolean'], 'Updates a single DNS record'); + api_register('add_dns_domain', ['domain' => 'string', 'ip' => 'string'], ['return' => 'result_status'], 'Adds a new domain into our system. The status will be "ok" if it added, or "error" if there was any problems status_text will contain a description of the problem if any.'); + } /** * @param \Symfony\Component\EventDispatcher\GenericEvent $event @@ -62,7 +62,6 @@ public static function getMenu(GenericEvent $event) $menu = $event->getSubject(); if ($GLOBALS['tf']->ima == 'admin') { function_requirements('has_acl'); - } } @@ -71,76 +70,76 @@ function_requirements('has_acl'); */ public static function getRequirements(GenericEvent $event) { - /** - * @var \MyAdmin\Plugins\Loader $loader - */ - $loader = $event->getSubject(); - $loader->add_page_requirement('get_hostname', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); - $loader->add_page_requirement('get_dns_domain', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); - $loader->add_page_requirement('get_dns_records', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); - $loader->add_page_requirement('delete_dns_record', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); - $loader->add_page_requirement('add_dns_record', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); - $loader->add_page_requirement('update_dns_record', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); - $loader->add_page_requirement('delete_dns_domain', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); - $loader->add_page_requirement('add_dns_domain', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); - $loader->add_page_requirement('reverse_dns', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); - $loader->add_page_requirement('get_db_mdb2', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('get_zone_name_from_id', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('endsWith', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_email', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('get_record_types', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('set_timezone', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('isError', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('get_soa_record', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('get_soa_serial', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('get_next_date', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('get_next_serial', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('set_soa_serial', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('update_soa_record', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('update_soa_serial', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('validate_input', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_hostname_fqdn', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_ipv4', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_ipv6', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('are_multipe_valid_ips', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_printable', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_rr_cname_name', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_rr_cname_exists', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_rr_cname_unique', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_not_empty_cname_rr', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_non_alias_target', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_rr_hinfo_content', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_rr_soa_content', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_rr_soa_name', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_rr_prio', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_rr_srv_name', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_rr_srv_content', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_rr_ttl', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_search', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_spf', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('is_valid_loc', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); - $loader->add_page_requirement('add_domain', '/../vendor/detain/myadmin-powerdns/src/add_domain.php'); - $loader->add_page_requirement('basic_dns_editor', '/../vendor/detain/myadmin-powerdns/src/basic_dns_editor.php'); - $loader->add_page_requirement('dns_add', '/../vendor/detain/myadmin-powerdns/src/dns_add.php'); - $loader->add_requirement('add_dns_default_domain', '/../vendor/detain/myadmin-powerdns/src/dns_default_domains.php'); - $loader->add_page_requirement('dns_delete', '/../vendor/detain/myadmin-powerdns/src/dns_delete.php'); - $loader->add_page_requirement('dns_editor2', '/../vendor/detain/myadmin-powerdns/src/dns_editor2.php'); - $loader->add_page_requirement('dns_editor', '/../vendor/detain/myadmin-powerdns/src/dns_editor.php'); - $loader->add_page_requirement('dns_list', '/../vendor/detain/myadmin-powerdns/src/dns_list.php'); - $loader->add_page_requirement('dns_manager', '/../vendor/detain/myadmin-powerdns/src/dns_manager.php'); - $loader->add_page_requirement('dns_resolvers', '/../vendor/detain/myadmin-powerdns/src/dns_resolvers.php'); - $loader->add_page_requirement('list_domains', '/../vendor/detain/myadmin-powerdns/src/list_domains.php'); - } + /** + * @var \MyAdmin\Plugins\Loader $loader + */ + $loader = $event->getSubject(); + $loader->add_page_requirement('get_hostname', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); + $loader->add_page_requirement('get_dns_domain', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); + $loader->add_page_requirement('get_dns_records', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); + $loader->add_page_requirement('delete_dns_record', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); + $loader->add_page_requirement('add_dns_record', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); + $loader->add_page_requirement('update_dns_record', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); + $loader->add_page_requirement('delete_dns_domain', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); + $loader->add_page_requirement('add_dns_domain', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); + $loader->add_page_requirement('reverse_dns', '/../vendor/detain/myadmin-powerdns/src/dns.functions.inc.php'); + $loader->add_page_requirement('get_db_mdb2', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('get_zone_name_from_id', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('endsWith', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_email', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('get_record_types', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('set_timezone', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('isError', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('get_soa_record', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('get_soa_serial', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('get_next_date', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('get_next_serial', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('set_soa_serial', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('update_soa_record', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('update_soa_serial', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('validate_input', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_hostname_fqdn', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_ipv4', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_ipv6', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('are_multipe_valid_ips', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_printable', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_rr_cname_name', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_rr_cname_exists', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_rr_cname_unique', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_not_empty_cname_rr', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_non_alias_target', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_rr_hinfo_content', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_rr_soa_content', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_rr_soa_name', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_rr_prio', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_rr_srv_name', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_rr_srv_content', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_rr_ttl', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_search', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_spf', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('is_valid_loc', '/../vendor/detain/myadmin-powerdns/src/pdns.functions.inc.php'); + $loader->add_page_requirement('add_domain', '/../vendor/detain/myadmin-powerdns/src/add_domain.php'); + $loader->add_page_requirement('basic_dns_editor', '/../vendor/detain/myadmin-powerdns/src/basic_dns_editor.php'); + $loader->add_page_requirement('dns_add', '/../vendor/detain/myadmin-powerdns/src/dns_add.php'); + $loader->add_requirement('add_dns_default_domain', '/../vendor/detain/myadmin-powerdns/src/dns_default_domains.php'); + $loader->add_page_requirement('dns_delete', '/../vendor/detain/myadmin-powerdns/src/dns_delete.php'); + $loader->add_page_requirement('dns_editor2', '/../vendor/detain/myadmin-powerdns/src/dns_editor2.php'); + $loader->add_page_requirement('dns_editor', '/../vendor/detain/myadmin-powerdns/src/dns_editor.php'); + $loader->add_page_requirement('dns_list', '/../vendor/detain/myadmin-powerdns/src/dns_list.php'); + $loader->add_page_requirement('dns_manager', '/../vendor/detain/myadmin-powerdns/src/dns_manager.php'); + $loader->add_page_requirement('dns_resolvers', '/../vendor/detain/myadmin-powerdns/src/dns_resolvers.php'); + $loader->add_page_requirement('list_domains', '/../vendor/detain/myadmin-powerdns/src/list_domains.php'); + } /** * @param \Symfony\Component\EventDispatcher\GenericEvent $event */ - public static function getSettings(GenericEvent $event) - { - /** - * @var \MyAdmin\Settings $settings - **/ - $settings = $event->getSubject(); + public static function getSettings(GenericEvent $event) + { + /** + * @var \MyAdmin\Settings $settings + **/ + $settings = $event->getSubject(); // $settings->add_text_setting(_('Support'), _('PowerDNS'), 'kayako_api_url', _('PowerDNS API URL'), _('PowerDNS API URL'), POWERDNS_API_URL); // $settings->add_text_setting(_('Support'), _('PowerDNS'), 'kayako_api_key', _('PowerDNS API Key'), _('PowerDNS API Key'), POWERDNS_API_KEY); // $settings->add_text_setting(_('Support'), _('PowerDNS'), 'kayako_api_secret', _('PowerDNS API Secret'), _('PowerDNS API Secret'), POWERDNS_API_SECRET); diff --git a/src/basic_dns_editor.php b/src/basic_dns_editor.php index 105927a..d2849da 100644 --- a/src/basic_dns_editor.php +++ b/src/basic_dns_editor.php @@ -18,9 +18,9 @@ function basic_dns_editor() function_requirements('get_dns_domain'); $domain = get_dns_domain($domain_id, false, 'view_service'); if ($domain !== false) { - if ($GLOBALS['tf']->ima == 'admin') { - add_output(_('Domain Owner').':'.$GLOBALS['tf']->accounts->cross_reference($domain['account']).'
'); - } + if ($GLOBALS['tf']->ima == 'admin') { + add_output(_('Domain Owner').':'.$GLOBALS['tf']->accounts->cross_reference($domain['account']).'
'); + } if (isset($GLOBALS['tf']->variables->request['update']) && $verify_csrf) { if ($GLOBALS['tf']->variables->request['type'] == 'MX' && $GLOBALS['tf']->variables->request['prio'] == '') { $GLOBALS['tf']->variables->request['prio'] = 10; diff --git a/src/dns.functions.inc.php b/src/dns.functions.inc.php index 10bac58..227f52f 100644 --- a/src/dns.functions.inc.php +++ b/src/dns.functions.inc.php @@ -195,7 +195,9 @@ function add_dns_record($domain_id, $name, $content, $type, $ttl, $prio, $bypass $ordername = ''; } $db = new db_mdb2(POWERDNS_DB, POWERDNS_USER, POWERDNS_PASSWORD, POWERDNS_HOST); - $query = make_insert_query('records', [ + $query = make_insert_query( + 'records', + [ 'domain_id' => $domain_id, 'name' => $name, 'content' => $content, @@ -332,8 +334,8 @@ function add_dns_domain($domain, $ip) $result = $db->query($query, __LINE__, __FILE__); if ($result) { if ($db->num_rows() > 0) { - $db->next_record(MYSQLI_ASSOC); - $return['status_text'] = 'That Domain Is Already Setup On Our Servers under '.$GLOBALS['tf']->accounts->cross_reference($db->Record['account']).', Try Another Or Contact support@interserver.net'; + $db->next_record(MYSQLI_ASSOC); + $return['status_text'] = 'That Domain Is Already Setup On Our Servers under '.$GLOBALS['tf']->accounts->cross_reference($db->Record['account']).', Try Another Or Contact support@interserver.net'; return $return; } } @@ -373,7 +375,9 @@ function add_dns_domain($domain, $ip) return $return; } } - $query = make_insert_query('domains', [ + $query = make_insert_query( + 'domains', + [ 'name' => $domain, 'type' => 'MASTER', 'account' => $custid @@ -382,7 +386,9 @@ function add_dns_domain($domain, $ip) $result = $db->query($query); if ($result) { $domain_id = $db->getLastInsertId('domains', 'id'); - $db->query(make_insert_query('records', [ + $db->query(make_insert_query( + 'records', + [ 'domain_id' => $domain_id, 'name' => $domain, 'content' => 'cdns1.interserver.net. dns.interserver.net ' . date('Ymd') . '01', @@ -393,7 +399,9 @@ function add_dns_domain($domain, $ip) 'prio' => null ] )); - $db->query(make_insert_query('records', [ + $db->query(make_insert_query( + 'records', + [ 'domain_id' => $domain_id, 'name' => $domain, 'content' => 'cdns1.interserver.net', @@ -404,7 +412,9 @@ function add_dns_domain($domain, $ip) 'prio' => null ] )); - $db->query(make_insert_query('records', [ + $db->query(make_insert_query( + 'records', + [ 'domain_id' => $domain_id, 'name' => $domain, 'content' => 'cdns2.interserver.net', @@ -415,7 +425,9 @@ function add_dns_domain($domain, $ip) 'prio' => null ] )); - $db->query(make_insert_query('records', [ + $db->query(make_insert_query( + 'records', + [ 'domain_id' => $domain_id, 'name' => $domain, 'content' => 'cdns3.interserver.net', @@ -426,7 +438,9 @@ function add_dns_domain($domain, $ip) 'prio' => null ] )); - $db->query(make_insert_query('records', [ + $db->query(make_insert_query( + 'records', + [ 'domain_id' => $domain_id, 'name' => $domain, 'content' => $ip, @@ -437,7 +451,9 @@ function add_dns_domain($domain, $ip) 'prio' => null ] )); - $db->query(make_insert_query('records', [ + $db->query(make_insert_query( + 'records', + [ 'domain_id' => $domain_id, 'name' => '*.' . $domain, 'content' => $ip, @@ -448,7 +464,9 @@ function add_dns_domain($domain, $ip) 'prio' => null ] )); - $db->query(make_insert_query('records', [ + $db->query(make_insert_query( + 'records', + [ 'domain_id' => $domain_id, 'name' => 'localhost.' . $domain, 'content' => '127.0.0.1', @@ -459,7 +477,9 @@ function add_dns_domain($domain, $ip) 'prio' => null ] )); - $db->query(make_insert_query('records', [ + $db->query(make_insert_query( + 'records', + [ 'domain_id' => $domain_id, 'name' => $domain, 'content' => 'mail.' . $domain, @@ -512,7 +532,9 @@ function reverse_dns($ip, $host = '', $action = 'set_reverse') } global $dbh_city; $db = new db_mdb2('dns', 'dns', 'python', '66.45.228.79'); - $db->query(make_insert_query('changes', [ + $db->query(make_insert_query( + 'changes', + [ 'id' => null, 'username' => $username, 'ip' => $ip, diff --git a/src/dns_editor.php b/src/dns_editor.php index 641874f..fba3647 100644 --- a/src/dns_editor.php +++ b/src/dns_editor.php @@ -29,9 +29,9 @@ function_requirements('get_dns_domain'); $smarty = new TFSmarty(); $smarty->assign('id', $domain_id); $smarty->assign('csrf_token', $csrf_token); - if ($GLOBALS['tf']->ima == 'admin') { - add_output(_('Domain Owner').':'.$GLOBALS['tf']->accounts->cross_reference($domain['account']).'
'); - } + if ($GLOBALS['tf']->ima == 'admin') { + add_output(_('Domain Owner').':'.$GLOBALS['tf']->accounts->cross_reference($domain['account']).'
'); + } add_output($smarty->fetch('dns/dns_editor.tpl')); add_output($table->make_link('choice=none.basic_dns_editor&edit=' . $domain_id, 'Go To Basic DNS Editor') . '
'); add_output($table->make_link('choice=none.dns_editor2&edit=' . $domain_id, 'Go Back to Old DNS Editor') . '
'); diff --git a/src/dns_editor2.php b/src/dns_editor2.php index 3e0f61c..4aab3fc 100644 --- a/src/dns_editor2.php +++ b/src/dns_editor2.php @@ -25,9 +25,9 @@ function_requirements('get_dns_domain'); } $csrf_token = $table->csrf('dns_editor', false); if ($domain !== false) { - if ($GLOBALS['tf']->ima == 'admin') { - add_output(_('Domain Owner').':'.$GLOBALS['tf']->accounts->cross_reference($domain['account']).'
'); - } + if ($GLOBALS['tf']->ima == 'admin') { + add_output(_('Domain Owner').':'.$GLOBALS['tf']->accounts->cross_reference($domain['account']).'
'); + } if (isset($GLOBALS['tf']->variables->request['update']) && $verify_csrf) { if (validate_input($GLOBALS['tf']->variables->request['update'], $domain_id, $GLOBALS['tf']->variables->request['type'], $GLOBALS['tf']->variables->request['content'], $GLOBALS['tf']->variables->request['name'], $GLOBALS['tf']->variables->request['prio'], $GLOBALS['tf']->variables->request['ttl'])) { $record = $GLOBALS['tf']->variables->request['update'];