From 15e77077aa7acdcfc74dad3e3586c96870a4107b Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Tue, 31 Jul 2007 11:55:29 -0400 Subject: [PATCH] Updates in DNS manager --- interface/web/dns/lib/lang/en_dns_ns.lng | 4 interface/web/dns/lib/lang/en_dns_alias.lng | 2 interface/web/dns/lib/module.conf.php | 3 interface/web/dns/form/dns_soa.tform.php | 3 interface/web/dns/form/dns_ns.tform.php | 6 +- interface/web/dns/lib/lang/en_dns_hinfo.lng | 2 interface/web/dns/templates/dns_srv_edit.htm | 7 +- interface/web/dns/templates/dns_mx_edit.htm | 14 +++- interface/web/dns/templates/dns_a_list.htm | 6 +- interface/web/dns/templates/dns_ns_edit.htm | 6 +- interface/web/dns/lib/lang/en_dns_cname.lng | 2 interface/lib/classes/tform_actions.inc.php | 3 interface/web/dns/form/dns_ptr.tform.php | 4 interface/web/dns/lib/lang/en_dns_srv.lng | 2 interface/web/dns/templates/dns_a_edit.htm | 2 interface/web/dns/form/dns_cname.tform.php | 4 interface/web/dns/form/dns_srv.tform.php | 7 - interface/web/dns/form/dns_rp.tform.php | 4 interface/web/dns/form/dns_mx.tform.php | 12 ++-- interface/lib/classes/tform.inc.php | 6 + interface/web/dns/lib/lang/en_dns_txt.lng | 2 interface/web/dns/templates/dns_txt_edit.htm | 6 +- interface/web/dns/form/dns_hinfo.tform.php | 7 - interface/web/dns/templates/dns_rp_edit.htm | 8 +- interface/web/dns/templates/dns_alias_edit.htm | 6 +- interface/web/dns/templates/dns_ptr_edit.htm | 6 +- interface/web/dns/lib/lang/en_dns_ptr.lng | 4 interface/web/dns/lib/lang/en_dns_rp.lng | 2 interface/web/dns/lib/lang/en_dns_mx.lng | 3 interface/lib/classes/plugin_listview.inc.php | 8 ++ interface/web/dns/form/dns_alias.tform.php | 6 +- interface/web/dns/templates/dns_cname_edit.htm | 6 +- interface/web/dns/form/dns_txt.tform.php | 7 - interface/web/dns/templates/dns_hinfo_edit.htm | 6 +- 34 files changed, 93 insertions(+), 83 deletions(-) diff --git a/interface/lib/classes/plugin_listview.inc.php b/interface/lib/classes/plugin_listview.inc.php index 762e5a7..59d1b56 100644 --- a/interface/lib/classes/plugin_listview.inc.php +++ b/interface/lib/classes/plugin_listview.inc.php @@ -49,10 +49,14 @@ $limit_sql = $app->listform->getPagingSQL($sql_where); $listTpl->setVar("paging",$app->listform->pagingHTML); + $sql_order_by = ''; + if(isset($this->options["sql_order_by"])) { + $sql_order_by = $this->options["sql_order_by"]; + } // Get the data - $records = $app->db->queryAllRecords("SELECT * FROM ".$app->listform->listDef["table"]." WHERE $sql_where $limit_sql"); + $records = $app->db->queryAllRecords("SELECT * FROM ".$app->listform->listDef["table"]." WHERE $sql_where $sql_order_by $limit_sql"); $bgcolor = "#FFFFFF"; if(is_array($records)) { @@ -71,6 +75,8 @@ if($field['formtype'] == "SELECT") { $rec[$key] = $field['value'][$rec[$key]]; } + // Create a lowercase version of every item + $rec[$key.'_lowercase'] = strtolower($rec[$key]); } // The variable "id" contains always the index field diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php index e631e23..cc29d27 100644 --- a/interface/lib/classes/tform.inc.php +++ b/interface/lib/classes/tform.inc.php @@ -539,7 +539,11 @@ $validator['regex'] .= 's'; if(!preg_match($validator['regex'], $field_value)) { $errmsg = $validator['errmsg']; - $this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n"; + if(isset($this->wordbook[$errmsg])) { + $this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n"; + } else { + $this->errorMessage .= $errmsg."<br>\r\n"; + } } break; case 'UNIQUE': diff --git a/interface/lib/classes/tform_actions.inc.php b/interface/lib/classes/tform_actions.inc.php index 131752d..034bb32 100644 --- a/interface/lib/classes/tform_actions.inc.php +++ b/interface/lib/classes/tform_actions.inc.php @@ -285,7 +285,8 @@ $app->tform->datalogSave('DELETE',$this->id,$this->dataRecord,array()); } - $app->db->query("DELETE FROM ".$liste["table"]." WHERE ".$liste["table_idx"]." = ".$this->id." LIMIT 0,1"); + $app->db->query("DELETE FROM ".$app->tform->formDef['db_table']." WHERE ".$app->tform->formDef['db_table_idx']." = ".$this->id." LIMIT 1"); + // loading plugins $next_tab = $app->tform->getCurrentTab(); diff --git a/interface/web/dns/form/dns_alias.tform.php b/interface/web/dns/form/dns_alias.tform.php index 0302f7e..dc93f2e 100644 --- a/interface/web/dns/form/dns_alias.tform.php +++ b/interface/web/dns/form/dns_alias.tform.php @@ -51,7 +51,7 @@ $form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete $form["tabs"]['dns'] = array ( - 'title' => "DNS A", + 'title' => "DNS ALIAS", 'width' => 100, 'template' => "templates/dns_alias_edit.htm", 'fields' => array ( @@ -91,7 +91,7 @@ 'type' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', - 'default' => 'A', + 'default' => 'ALIAS', 'value' => '', 'width' => '5', 'maxlength' => '5' @@ -102,7 +102,7 @@ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'data_error_empty'), 1 => array ( 'type' => 'REGEX', - 'regex' => '/^[0-9\.]{10,15}$/', + 'regex' => '/^[\w\.\-]{1,64}$/', 'errmsg'=> 'data_error_regex'), ), 'default' => '', diff --git a/interface/web/dns/form/dns_cname.tform.php b/interface/web/dns/form/dns_cname.tform.php index e48605f..146cad2 100644 --- a/interface/web/dns/form/dns_cname.tform.php +++ b/interface/web/dns/form/dns_cname.tform.php @@ -91,7 +91,7 @@ 'type' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', - 'default' => 'A', + 'default' => 'CNAME', 'value' => '', 'width' => '5', 'maxlength' => '5' @@ -102,7 +102,7 @@ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'data_error_empty'), 1 => array ( 'type' => 'REGEX', - 'regex' => '/^[0-9\.]{10,15}$/', + 'regex' => '/^[\w\.\-]{1,64}$/', 'errmsg'=> 'data_error_regex'), ), 'default' => '', diff --git a/interface/web/dns/form/dns_hinfo.tform.php b/interface/web/dns/form/dns_hinfo.tform.php index b2b30b6..d0bfc16 100644 --- a/interface/web/dns/form/dns_hinfo.tform.php +++ b/interface/web/dns/form/dns_hinfo.tform.php @@ -51,7 +51,7 @@ $form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete $form["tabs"]['dns'] = array ( - 'title' => "DNS hinfo", + 'title' => "DNS HINFO", 'width' => 100, 'template' => "templates/dns_hinfo_edit.htm", 'fields' => array ( @@ -91,7 +91,7 @@ 'type' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', - 'default' => 'A', + 'default' => 'HINFO', 'value' => '', 'width' => '5', 'maxlength' => '5' @@ -101,9 +101,6 @@ 'formtype' => 'TEXT', 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'data_error_empty'), - 1 => array ( 'type' => 'REGEX', - 'regex' => '/^[0-9\.]{10,15}$/', - 'errmsg'=> 'data_error_regex'), ), 'default' => '', 'value' => '', diff --git a/interface/web/dns/form/dns_mx.tform.php b/interface/web/dns/form/dns_mx.tform.php index 1f7382c..2d70e16 100644 --- a/interface/web/dns/form/dns_mx.tform.php +++ b/interface/web/dns/form/dns_mx.tform.php @@ -80,7 +80,7 @@ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'name_error_empty'), 1 => array ( 'type' => 'REGEX', - 'regex' => '/^[\w\.\-]{1,64}$/', + 'regex' => '/^[\w\.\-]{1,255}$/', 'errmsg'=> 'name_error_regex'), ), 'default' => '', @@ -91,7 +91,7 @@ 'type' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', - 'default' => 'A', + 'default' => 'MX', 'value' => '', 'width' => '5', 'maxlength' => '5' @@ -102,7 +102,7 @@ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'data_error_empty'), 1 => array ( 'type' => 'REGEX', - 'regex' => '/^[0-9\.]{10,15}$/', + 'regex' => '/^[\w\.\-]{1,255}$/', 'errmsg'=> 'data_error_regex'), ), 'default' => '', @@ -110,16 +110,16 @@ 'width' => '30', 'maxlength' => '255' ), - /* + 'aux' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', - 'default' => '0', + 'default' => '10', 'value' => '', 'width' => '10', 'maxlength' => '10' ), - */ + 'ttl' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', diff --git a/interface/web/dns/form/dns_ns.tform.php b/interface/web/dns/form/dns_ns.tform.php index a845dc6..fbaa0e9 100644 --- a/interface/web/dns/form/dns_ns.tform.php +++ b/interface/web/dns/form/dns_ns.tform.php @@ -51,7 +51,7 @@ $form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete $form["tabs"]['dns'] = array ( - 'title' => "DNS ns", + 'title' => "DNS NS", 'width' => 100, 'template' => "templates/dns_ns_edit.htm", 'fields' => array ( @@ -91,7 +91,7 @@ 'type' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', - 'default' => 'A', + 'default' => 'NS', 'value' => '', 'width' => '5', 'maxlength' => '5' @@ -102,7 +102,7 @@ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'data_error_empty'), 1 => array ( 'type' => 'REGEX', - 'regex' => '/^[0-9\.]{10,15}$/', + 'regex' => '/^[\w\.\-]{1,64}$/', 'errmsg'=> 'data_error_regex'), ), 'default' => '', diff --git a/interface/web/dns/form/dns_ptr.tform.php b/interface/web/dns/form/dns_ptr.tform.php index 7b193cf..61a2350 100644 --- a/interface/web/dns/form/dns_ptr.tform.php +++ b/interface/web/dns/form/dns_ptr.tform.php @@ -91,7 +91,7 @@ 'type' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', - 'default' => 'A', + 'default' => 'PTR', 'value' => '', 'width' => '5', 'maxlength' => '5' @@ -102,7 +102,7 @@ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'data_error_empty'), 1 => array ( 'type' => 'REGEX', - 'regex' => '/^[0-9\.]{10,15}$/', + 'regex' => '/^[\w\.\-]{1,64}$/', 'errmsg'=> 'data_error_regex'), ), 'default' => '', diff --git a/interface/web/dns/form/dns_rp.tform.php b/interface/web/dns/form/dns_rp.tform.php index 81a5c2f..9d80a35 100644 --- a/interface/web/dns/form/dns_rp.tform.php +++ b/interface/web/dns/form/dns_rp.tform.php @@ -51,7 +51,7 @@ $form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete $form["tabs"]['dns'] = array ( - 'title' => "DNS rp", + 'title' => "DNS RP", 'width' => 100, 'template' => "templates/dns_rp_edit.htm", 'fields' => array ( @@ -91,7 +91,7 @@ 'type' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', - 'default' => 'A', + 'default' => 'RP', 'value' => '', 'width' => '5', 'maxlength' => '5' diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php index b149fec..cf5f0d1 100644 --- a/interface/web/dns/form/dns_soa.tform.php +++ b/interface/web/dns/form/dns_soa.tform.php @@ -201,7 +201,8 @@ 'class' => 'plugin_listview', 'options' => array( 'listdef' => 'list/dns_a.list.php', - 'sqlextwhere' => "zone = ".intval($_REQUEST['id']) + 'sqlextwhere' => "zone = ".intval($_REQUEST['id']), + 'sql_order_by' => "ORDER BY type, name" ) ) ) diff --git a/interface/web/dns/form/dns_srv.tform.php b/interface/web/dns/form/dns_srv.tform.php index 188c10f..6b99b06 100644 --- a/interface/web/dns/form/dns_srv.tform.php +++ b/interface/web/dns/form/dns_srv.tform.php @@ -33,7 +33,7 @@ */ -$form["title"] = "DNS srv"; +$form["title"] = "DNS SRV"; $form["description"] = ""; $form["name"] = "dns_srv"; $form["action"] = "dns_srv_edit.php"; @@ -91,7 +91,7 @@ 'type' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', - 'default' => 'A', + 'default' => 'SRV', 'value' => '', 'width' => '5', 'maxlength' => '5' @@ -101,9 +101,6 @@ 'formtype' => 'TEXT', 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'data_error_empty'), - 1 => array ( 'type' => 'REGEX', - 'regex' => '/^[0-9\.]{10,15}$/', - 'errmsg'=> 'data_error_regex'), ), 'default' => '', 'value' => '', diff --git a/interface/web/dns/form/dns_txt.tform.php b/interface/web/dns/form/dns_txt.tform.php index b18d84af..5c5e55b 100644 --- a/interface/web/dns/form/dns_txt.tform.php +++ b/interface/web/dns/form/dns_txt.tform.php @@ -51,7 +51,7 @@ $form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete $form["tabs"]['dns'] = array ( - 'title' => "DNS txt", + 'title' => "DNS TXT", 'width' => 100, 'template' => "templates/dns_txt_edit.htm", 'fields' => array ( @@ -91,7 +91,7 @@ 'type' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', - 'default' => 'A', + 'default' => 'TXT', 'value' => '', 'width' => '5', 'maxlength' => '5' @@ -101,9 +101,6 @@ 'formtype' => 'TEXT', 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'data_error_empty'), - 1 => array ( 'type' => 'REGEX', - 'regex' => '/^[0-9\.]{10,15}$/', - 'errmsg'=> 'data_error_regex'), ), 'default' => '', 'value' => '', diff --git a/interface/web/dns/lib/lang/en_dns_alias.lng b/interface/web/dns/lib/lang/en_dns_alias.lng index ca96ae5..187a110 100644 --- a/interface/web/dns/lib/lang/en_dns_alias.lng +++ b/interface/web/dns/lib/lang/en_dns_alias.lng @@ -3,7 +3,7 @@ $wb["zone_txt"] = 'Zone'; $wb["name_txt"] = 'Hostname'; $wb["type_txt"] = 'type'; -$wb["data_txt"] = 'IP-Address'; +$wb["data_txt"] = 'Target Hostname'; $wb["ttl_txt"] = 'TTL'; $wb["active_txt"] = 'Active'; $wb["btn_save_txt"] = 'Save'; diff --git a/interface/web/dns/lib/lang/en_dns_cname.lng b/interface/web/dns/lib/lang/en_dns_cname.lng index ca96ae5..187a110 100644 --- a/interface/web/dns/lib/lang/en_dns_cname.lng +++ b/interface/web/dns/lib/lang/en_dns_cname.lng @@ -3,7 +3,7 @@ $wb["zone_txt"] = 'Zone'; $wb["name_txt"] = 'Hostname'; $wb["type_txt"] = 'type'; -$wb["data_txt"] = 'IP-Address'; +$wb["data_txt"] = 'Target Hostname'; $wb["ttl_txt"] = 'TTL'; $wb["active_txt"] = 'Active'; $wb["btn_save_txt"] = 'Save'; diff --git a/interface/web/dns/lib/lang/en_dns_hinfo.lng b/interface/web/dns/lib/lang/en_dns_hinfo.lng index ca96ae5..5b4a204 100644 --- a/interface/web/dns/lib/lang/en_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/en_dns_hinfo.lng @@ -3,7 +3,7 @@ $wb["zone_txt"] = 'Zone'; $wb["name_txt"] = 'Hostname'; $wb["type_txt"] = 'type'; -$wb["data_txt"] = 'IP-Address'; +$wb["data_txt"] = 'Host Information'; $wb["ttl_txt"] = 'TTL'; $wb["active_txt"] = 'Active'; $wb["btn_save_txt"] = 'Save'; diff --git a/interface/web/dns/lib/lang/en_dns_mx.lng b/interface/web/dns/lib/lang/en_dns_mx.lng index ca96ae5..55ebd0a 100644 --- a/interface/web/dns/lib/lang/en_dns_mx.lng +++ b/interface/web/dns/lib/lang/en_dns_mx.lng @@ -3,7 +3,8 @@ $wb["zone_txt"] = 'Zone'; $wb["name_txt"] = 'Hostname'; $wb["type_txt"] = 'type'; -$wb["data_txt"] = 'IP-Address'; +$wb["data_txt"] = 'Mailserver hostname'; +$wb["aux_txt"] = 'Priority'; $wb["ttl_txt"] = 'TTL'; $wb["active_txt"] = 'Active'; $wb["btn_save_txt"] = 'Save'; diff --git a/interface/web/dns/lib/lang/en_dns_ns.lng b/interface/web/dns/lib/lang/en_dns_ns.lng index ca96ae5..c430cdd 100644 --- a/interface/web/dns/lib/lang/en_dns_ns.lng +++ b/interface/web/dns/lib/lang/en_dns_ns.lng @@ -1,9 +1,9 @@ <?php $wb["server_id_txt"] = 'Server'; $wb["zone_txt"] = 'Zone'; -$wb["name_txt"] = 'Hostname'; +$wb["name_txt"] = 'Zone'; $wb["type_txt"] = 'type'; -$wb["data_txt"] = 'IP-Address'; +$wb["data_txt"] = 'Nameserver Hostname'; $wb["ttl_txt"] = 'TTL'; $wb["active_txt"] = 'Active'; $wb["btn_save_txt"] = 'Save'; diff --git a/interface/web/dns/lib/lang/en_dns_ptr.lng b/interface/web/dns/lib/lang/en_dns_ptr.lng index ca96ae5..5e7f86d 100644 --- a/interface/web/dns/lib/lang/en_dns_ptr.lng +++ b/interface/web/dns/lib/lang/en_dns_ptr.lng @@ -1,9 +1,9 @@ <?php $wb["server_id_txt"] = 'Server'; $wb["zone_txt"] = 'Zone'; -$wb["name_txt"] = 'Hostname'; +$wb["name_txt"] = 'Name'; $wb["type_txt"] = 'type'; -$wb["data_txt"] = 'IP-Address'; +$wb["data_txt"] = 'Canonical Hostname'; $wb["ttl_txt"] = 'TTL'; $wb["active_txt"] = 'Active'; $wb["btn_save_txt"] = 'Save'; diff --git a/interface/web/dns/lib/lang/en_dns_rp.lng b/interface/web/dns/lib/lang/en_dns_rp.lng index ca96ae5..2f54176 100644 --- a/interface/web/dns/lib/lang/en_dns_rp.lng +++ b/interface/web/dns/lib/lang/en_dns_rp.lng @@ -3,7 +3,7 @@ $wb["zone_txt"] = 'Zone'; $wb["name_txt"] = 'Hostname'; $wb["type_txt"] = 'type'; -$wb["data_txt"] = 'IP-Address'; +$wb["data_txt"] = 'Responsible Person'; $wb["ttl_txt"] = 'TTL'; $wb["active_txt"] = 'Active'; $wb["btn_save_txt"] = 'Save'; diff --git a/interface/web/dns/lib/lang/en_dns_srv.lng b/interface/web/dns/lib/lang/en_dns_srv.lng index ca96ae5..9c16bdc 100644 --- a/interface/web/dns/lib/lang/en_dns_srv.lng +++ b/interface/web/dns/lib/lang/en_dns_srv.lng @@ -3,7 +3,7 @@ $wb["zone_txt"] = 'Zone'; $wb["name_txt"] = 'Hostname'; $wb["type_txt"] = 'type'; -$wb["data_txt"] = 'IP-Address'; +$wb["data_txt"] = 'Server Record'; $wb["ttl_txt"] = 'TTL'; $wb["active_txt"] = 'Active'; $wb["btn_save_txt"] = 'Save'; diff --git a/interface/web/dns/lib/lang/en_dns_txt.lng b/interface/web/dns/lib/lang/en_dns_txt.lng index ca96ae5..89b4cc4 100644 --- a/interface/web/dns/lib/lang/en_dns_txt.lng +++ b/interface/web/dns/lib/lang/en_dns_txt.lng @@ -3,7 +3,7 @@ $wb["zone_txt"] = 'Zone'; $wb["name_txt"] = 'Hostname'; $wb["type_txt"] = 'type'; -$wb["data_txt"] = 'IP-Address'; +$wb["data_txt"] = 'Text'; $wb["ttl_txt"] = 'TTL'; $wb["active_txt"] = 'Active'; $wb["btn_save_txt"] = 'Save'; diff --git a/interface/web/dns/lib/module.conf.php b/interface/web/dns/lib/module.conf.php index 36eaa6f..41e6d05 100644 --- a/interface/web/dns/lib/module.conf.php +++ b/interface/web/dns/lib/module.conf.php @@ -14,10 +14,11 @@ $items[] = array( 'title' => "Zones", 'target' => 'content', 'link' => 'dns/dns_soa_list.php'); - +/* $items[] = array( 'title' => "A-Records", 'target' => 'content', 'link' => 'dns/dns_a_list.php'); +*/ $module["nav"][] = array( 'title' => 'DNS', diff --git a/interface/web/dns/templates/dns_a_edit.htm b/interface/web/dns/templates/dns_a_edit.htm index 7b0adfd..15f1a51 100644 --- a/interface/web/dns/templates/dns_a_edit.htm +++ b/interface/web/dns/templates/dns_a_edit.htm @@ -21,7 +21,7 @@ <tr> <td> </td> <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_a_edit.php');"><div class="buttonEnding"></div> - <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><div class="buttonEnding"></div> + <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div> <input name="type" type="hidden" value="{tmpl_var name='type'}"> </td> </tr> diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm index c661f2e..e5184be 100644 --- a/interface/web/dns/templates/dns_a_list.htm +++ b/interface/web/dns/templates/dns_a_list.htm @@ -24,9 +24,9 @@ </tr> <tmpl_loop name="records"> <tr bgcolor="{tmpl_var name="bgcolor"}"> - <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_a_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td> - <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_a_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="type"}</a></td> - <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_a_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="name"}</a></td> + <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="active"}</a></td> + <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="type"}</a></td> + <td class="frmText11"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="name"}</a></td> <td class="frmText11" align="right">[<a href="javascript: del_record('dns/dns_rr_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td> </tr> </tmpl_loop> diff --git a/interface/web/dns/templates/dns_alias_edit.htm b/interface/web/dns/templates/dns_alias_edit.htm index 7b0adfd..bb12e1f 100644 --- a/interface/web/dns/templates/dns_alias_edit.htm +++ b/interface/web/dns/templates/dns_alias_edit.htm @@ -5,7 +5,7 @@ </tr> <tr> <td class="frmText11">{tmpl_var name='data_txt'}:</td> - <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="15" maxlength="15"></td> + <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"></td> </tr> <tr> <td class="frmText11">{tmpl_var name='ttl_txt'}:</td> @@ -20,8 +20,8 @@ </tr> <tr> <td> </td> - <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_a_edit.php');"><div class="buttonEnding"></div> - <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><div class="buttonEnding"></div> + <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_alias_edit.php');"><div class="buttonEnding"></div> + <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div> <input name="type" type="hidden" value="{tmpl_var name='type'}"> </td> </tr> diff --git a/interface/web/dns/templates/dns_cname_edit.htm b/interface/web/dns/templates/dns_cname_edit.htm index 7b0adfd..8a265d9 100644 --- a/interface/web/dns/templates/dns_cname_edit.htm +++ b/interface/web/dns/templates/dns_cname_edit.htm @@ -5,7 +5,7 @@ </tr> <tr> <td class="frmText11">{tmpl_var name='data_txt'}:</td> - <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="15" maxlength="15"></td> + <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"></td> </tr> <tr> <td class="frmText11">{tmpl_var name='ttl_txt'}:</td> @@ -20,8 +20,8 @@ </tr> <tr> <td> </td> - <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_a_edit.php');"><div class="buttonEnding"></div> - <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><div class="buttonEnding"></div> + <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_cname_edit.php');"><div class="buttonEnding"></div> + <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div> <input name="type" type="hidden" value="{tmpl_var name='type'}"> </td> </tr> diff --git a/interface/web/dns/templates/dns_hinfo_edit.htm b/interface/web/dns/templates/dns_hinfo_edit.htm index 7b0adfd..4e0e333 100644 --- a/interface/web/dns/templates/dns_hinfo_edit.htm +++ b/interface/web/dns/templates/dns_hinfo_edit.htm @@ -5,7 +5,7 @@ </tr> <tr> <td class="frmText11">{tmpl_var name='data_txt'}:</td> - <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="15" maxlength="15"></td> + <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"> e.g. "Pentium Pro" Linux</td> </tr> <tr> <td class="frmText11">{tmpl_var name='ttl_txt'}:</td> @@ -20,8 +20,8 @@ </tr> <tr> <td> </td> - <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_a_edit.php');"><div class="buttonEnding"></div> - <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><div class="buttonEnding"></div> + <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_hinfo_edit.php');"><div class="buttonEnding"></div> + <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div> <input name="type" type="hidden" value="{tmpl_var name='type'}"> </td> </tr> diff --git a/interface/web/dns/templates/dns_mx_edit.htm b/interface/web/dns/templates/dns_mx_edit.htm index 7b0adfd..66d802d 100644 --- a/interface/web/dns/templates/dns_mx_edit.htm +++ b/interface/web/dns/templates/dns_mx_edit.htm @@ -1,11 +1,15 @@ -<table width="500" border="0" cellspacing="0" cellpadding="2"> +<table width="600" border="0" cellspacing="0" cellpadding="2"> <tr> <td class="frmText11">{tmpl_var name='name_txt'}:</td> - <td class="frmText11"><input name="name" type="text" class="text" value="{tmpl_var name='name'}" size="30" maxlength="255"></td> + <td class="frmText11"><input name="name" type="text" class="text" value="{tmpl_var name='name'}" size="30" maxlength="255"> e.g. yourdomain.com.</td> </tr> <tr> <td class="frmText11">{tmpl_var name='data_txt'}:</td> - <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="15" maxlength="15"></td> + <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"> e.g. mail.yourdomain.com.</td> + </tr> + <tr> + <td class="frmText11">{tmpl_var name='aux_txt'}:</td> + <td class="frmText11"><input name="aux" type="text" class="text" value="{tmpl_var name='aux'}" size="3" maxlength="3"></td> </tr> <tr> <td class="frmText11">{tmpl_var name='ttl_txt'}:</td> @@ -20,8 +24,8 @@ </tr> <tr> <td> </td> - <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_a_edit.php');"><div class="buttonEnding"></div> - <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><div class="buttonEnding"></div> + <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_mx_edit.php');"><div class="buttonEnding"></div> + <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div> <input name="type" type="hidden" value="{tmpl_var name='type'}"> </td> </tr> diff --git a/interface/web/dns/templates/dns_ns_edit.htm b/interface/web/dns/templates/dns_ns_edit.htm index 7b0adfd..10823df 100644 --- a/interface/web/dns/templates/dns_ns_edit.htm +++ b/interface/web/dns/templates/dns_ns_edit.htm @@ -5,7 +5,7 @@ </tr> <tr> <td class="frmText11">{tmpl_var name='data_txt'}:</td> - <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="15" maxlength="15"></td> + <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"></td> </tr> <tr> <td class="frmText11">{tmpl_var name='ttl_txt'}:</td> @@ -20,8 +20,8 @@ </tr> <tr> <td> </td> - <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_a_edit.php');"><div class="buttonEnding"></div> - <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><div class="buttonEnding"></div> + <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_ns_edit.php');"><div class="buttonEnding"></div> + <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div> <input name="type" type="hidden" value="{tmpl_var name='type'}"> </td> </tr> diff --git a/interface/web/dns/templates/dns_ptr_edit.htm b/interface/web/dns/templates/dns_ptr_edit.htm index 7b0adfd..2cd7855 100644 --- a/interface/web/dns/templates/dns_ptr_edit.htm +++ b/interface/web/dns/templates/dns_ptr_edit.htm @@ -5,7 +5,7 @@ </tr> <tr> <td class="frmText11">{tmpl_var name='data_txt'}:</td> - <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="15" maxlength="15"></td> + <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"></td> </tr> <tr> <td class="frmText11">{tmpl_var name='ttl_txt'}:</td> @@ -20,8 +20,8 @@ </tr> <tr> <td> </td> - <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_a_edit.php');"><div class="buttonEnding"></div> - <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><div class="buttonEnding"></div> + <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_ptr_edit.php');"><div class="buttonEnding"></div> + <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div> <input name="type" type="hidden" value="{tmpl_var name='type'}"> </td> </tr> diff --git a/interface/web/dns/templates/dns_rp_edit.htm b/interface/web/dns/templates/dns_rp_edit.htm index 7b0adfd..ac14f90 100644 --- a/interface/web/dns/templates/dns_rp_edit.htm +++ b/interface/web/dns/templates/dns_rp_edit.htm @@ -1,11 +1,11 @@ -<table width="500" border="0" cellspacing="0" cellpadding="2"> +<table width="600" border="0" cellspacing="0" cellpadding="2"> <tr> <td class="frmText11">{tmpl_var name='name_txt'}:</td> <td class="frmText11"><input name="name" type="text" class="text" value="{tmpl_var name='name'}" size="30" maxlength="255"></td> </tr> <tr> <td class="frmText11">{tmpl_var name='data_txt'}:</td> - <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="15" maxlength="15"></td> + <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"><br /> example: `webmaster.example.com. contactinfo.example.com.' </td> </tr> <tr> <td class="frmText11">{tmpl_var name='ttl_txt'}:</td> @@ -20,8 +20,8 @@ </tr> <tr> <td> </td> - <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_a_edit.php');"><div class="buttonEnding"></div> - <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><div class="buttonEnding"></div> + <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_rp_edit.php');"><div class="buttonEnding"></div> + <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div> <input name="type" type="hidden" value="{tmpl_var name='type'}"> </td> </tr> diff --git a/interface/web/dns/templates/dns_srv_edit.htm b/interface/web/dns/templates/dns_srv_edit.htm index 7b0adfd..bb0f2e1 100644 --- a/interface/web/dns/templates/dns_srv_edit.htm +++ b/interface/web/dns/templates/dns_srv_edit.htm @@ -5,7 +5,8 @@ </tr> <tr> <td class="frmText11">{tmpl_var name='data_txt'}:</td> - <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="15" maxlength="15"></td> + <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"><br /> + example: `0 9 server.example.com.'</td> </tr> <tr> <td class="frmText11">{tmpl_var name='ttl_txt'}:</td> @@ -20,8 +21,8 @@ </tr> <tr> <td> </td> - <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_a_edit.php');"><div class="buttonEnding"></div> - <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><div class="buttonEnding"></div> + <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_srv_edit.php');"><div class="buttonEnding"></div> + <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div> <input name="type" type="hidden" value="{tmpl_var name='type'}"> </td> </tr> diff --git a/interface/web/dns/templates/dns_txt_edit.htm b/interface/web/dns/templates/dns_txt_edit.htm index 7b0adfd..813d020 100644 --- a/interface/web/dns/templates/dns_txt_edit.htm +++ b/interface/web/dns/templates/dns_txt_edit.htm @@ -5,7 +5,7 @@ </tr> <tr> <td class="frmText11">{tmpl_var name='data_txt'}:</td> - <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="15" maxlength="15"></td> + <td class="frmText11"><input name="data" type="text" class="text" value="{tmpl_var name='data'}" size="30" maxlength="255"></td> </tr> <tr> <td class="frmText11">{tmpl_var name='ttl_txt'}:</td> @@ -20,8 +20,8 @@ </tr> <tr> <td> </td> - <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_a_edit.php');"><div class="buttonEnding"></div> - <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><div class="buttonEnding"></div> + <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_txt_edit.php');"><div class="buttonEnding"></div> + <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><div class="buttonEnding"></div> <input name="type" type="hidden" value="{tmpl_var name='type'}"> </td> </tr> -- Gitblit v1.9.1