diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php index 738f96750144eebf9fc1eb420afecafbe6a66846..6c08b51a3a7acb2c891602d7f30e165cf1e1773e 100644 --- a/interface/lib/classes/remoting.inc.php +++ b/interface/lib/classes/remoting.inc.php @@ -2060,7 +2060,7 @@ class remoting { $app->uses('remoting_lib'); //* load the user profile of the client - $app->remoting_lib->loadUserProfile($client_id); + $app->remoting_lib->loadUserProfile(0); //* Load the form definition $app->remoting_lib->loadFormDef($formdef_file); diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php index da5c2281422df6662aad6873e80721a8c54607b5..1fb0a114b580a34a022aa7250bdb53d0070fa8de 100644 --- a/interface/lib/classes/remoting_lib.inc.php +++ b/interface/lib/classes/remoting_lib.inc.php @@ -696,6 +696,10 @@ class remoting_lib { function datalogSave($action,$primary_id, $record_old, $record_new) { global $app,$conf; + + $app->db->datalogSave($this->formDef['db_table'], $action, $this->formDef['db_table_idx'], $primary_id, $record_old, $record_new); + return true; + /* if(stristr($this->formDef['db_table'],'.')) { $escape = ''; @@ -752,11 +756,6 @@ class remoting_lib { } } - /* - echo "
";
-				print_r($diffrec_full);
-				echo "
"; - */ // Insert the server_id, if the record has a server_id $server_id = (isset($record_old["server_id"]) && $record_old["server_id"] > 0)?$record_old["server_id"]:0; @@ -776,6 +775,7 @@ class remoting_lib { } return true; + */ } diff --git a/interface/web/dns/form/dns_srv.tform.php b/interface/web/dns/form/dns_srv.tform.php index a5e00048b72564a55403aed170504ec7da0976c3..0de461656a20139925bfbf21bb067893a24581b6 100644 --- a/interface/web/dns/form/dns_srv.tform.php +++ b/interface/web/dns/form/dns_srv.tform.php @@ -108,7 +108,6 @@ $form["tabs"]['dns'] = array ( 'width' => '30', 'maxlength' => '255' ), - /* 'aux' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', @@ -117,7 +116,6 @@ $form["tabs"]['dns'] = array ( 'width' => '10', 'maxlength' => '10' ), - */ 'ttl' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', diff --git a/interface/web/dns/lib/lang/en_dns_srv.lng b/interface/web/dns/lib/lang/en_dns_srv.lng index d0dcd1eb2636b365110f855be3c28ebaab2c2f2b..ccd9eeb56efd24eefddd5eab1a541bad7d828965 100644 --- a/interface/web/dns/lib/lang/en_dns_srv.lng +++ b/interface/web/dns/lib/lang/en_dns_srv.lng @@ -6,6 +6,7 @@ $wb["type_txt"] = 'type'; $wb["data_txt"] = 'Server Record'; $wb["ttl_txt"] = 'TTL'; $wb["active_txt"] = 'Active'; +$wb["aux_txt"] = 'Priority'; $wb["limit_dns_record_txt"] = 'The max. number of DNS records for your account is reached.'; $wb["no_zone_perm"] = 'You do not have the permission to add a record to this DNS zone.'; $wb["name_error_empty"] = 'The hostname is empty.'; diff --git a/interface/web/dns/templates/dns_srv_edit.htm b/interface/web/dns/templates/dns_srv_edit.htm index f76ab181fc641dddcaf30299c02390001ee70ed7..7f86aa680883b69f2b3dd86f124b419c9f8fb6af 100644 --- a/interface/web/dns/templates/dns_srv_edit.htm +++ b/interface/web/dns/templates/dns_srv_edit.htm @@ -13,6 +13,10 @@ +
+ + +
diff --git a/server/conf/bind_pri.domain.master b/server/conf/bind_pri.domain.master index faa42f3d7081b976c8877dd772a5717101070cf5..491d5903e354071fb1796f1089d9b92e826e676f 100644 --- a/server/conf/bind_pri.domain.master +++ b/server/conf/bind_pri.domain.master @@ -39,7 +39,7 @@ $TTL {tmpl_var name='ttl'} {tmpl_var name='name'} RP {tmpl_var name='data'} -{tmpl_var name='name'} SRV 0 {tmpl_var name='data'} +{tmpl_var name='name'} SRV {tmpl_var name='aux'} {tmpl_var name='data'} {tmpl_var name='name'} TXT {tmpl_var name='data'}