ftimme
2005-11-30 f6ee7a108a27ce6ccf85995ac638c0692e0434c3

10 files modified
137 ■■■■ changed files
interface/lib/classes/tform.inc.php 8 ●●●●● patch | view | raw | blame | history
interface/web/dns/form/rr.tform.php 4 ●●●● patch | view | raw | blame | history
interface/web/dns/form/soa.tform.php 18 ●●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/en_rr.lng 14 ●●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/en_rr_list.lng 13 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/en_soa.lng 32 ●●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/en_soa_list.lng 27 ●●●●● patch | view | raw | blame | history
interface/web/dns/list/soa.list.php 5 ●●●● patch | view | raw | blame | history
interface/web/dns/templates/soa_edit.htm 2 ●●● patch | view | raw | blame | history
interface/web/dns/templates/soa_list.htm 14 ●●●●● patch | view | raw | blame | history
interface/lib/classes/tform.inc.php
@@ -487,6 +487,8 @@
                break;
                case 'INTEGER':
                    $new_record[$key] = intval($record[$key]);
                                        //if($new_record[$key] != $record[$key]) $new_record[$key] = $field['default'];
                                        //if($key == 'refresh') die($record[$key]);
                break;
                case 'DOUBLE':
                    $new_record[$key] = addslashes($record[$key]);
@@ -570,6 +572,12 @@
                        $this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n";
                    }
                break;
                                case 'ISPOSITIVE':
                                        if(!is_numeric($field_value) || $field_value <= 0){
                                          $errmsg = $validator['errmsg'];
                                          $this->errorMessage .= $this->wordbook[$errmsg]."<br>\r\n";
                                        }
                                break;
                case 'CUSTOM':
                    // Calls a custom class to validate this record
                    if($validator['class'] != '' and $validator['function'] != '') {
interface/web/dns/form/rr.tform.php
@@ -118,8 +118,8 @@
                'ttl' => array (
                        'datatype'        => 'INTEGER',
                        'formtype'        => 'TEXT',
                        'validators'      => array (0 => array ('type' => 'NOTEMPTY',
                                                                'errmsg'=> 'rr_ttl_error_empty'),
                        'validators'      => array (0 => array ('type' => 'ISPOSITIVE',
                                                                'errmsg'=> 'rr_ttl_error_notpositive'),
                                                   ),
                        'default'        => '86400',
                        'value'                => '86400',
interface/web/dns/form/soa.tform.php
@@ -109,6 +109,9 @@
                'serial' => array (
                        'datatype'        => 'INTEGER',
                        'formtype'        => 'TEXT',
                        'validators'      => array (0 => array ( 'type'        => 'ISPOSITIVE',
                                                                   'errmsg'=> 'serial_error_notpositive'),
                                                    ),
                        'default'         => date("Ymd").'01',
                        'value'           => date("Ymd").'01',
                        'width'           => '30',
@@ -117,6 +120,9 @@
                'refresh' => array (
                        'datatype'        => 'INTEGER',
                        'formtype'        => 'TEXT',
                        'validators'      => array (0 => array ( 'type'        => 'ISPOSITIVE',
                                                                   'errmsg'=> 'refresh_error_notpositive'),
                                                    ),
                        'default'         => $conf['default_refresh'],
                        'value'           => $conf['default_refresh'],
                        'width'           => '30',
@@ -125,6 +131,9 @@
                'retry' => array (
                        'datatype'        => 'INTEGER',
                        'formtype'        => 'TEXT',
                        'validators'      => array (0 => array ( 'type'        => 'ISPOSITIVE',
                                                                   'errmsg'=> 'retry_error_notpositive'),
                                                   ),
                        'default'         => $conf['default_retry'],
                        'value'           => $conf['default_retry'],
                        'width'           => '30',
@@ -133,6 +142,9 @@
                'expire' => array (
                        'datatype'        => 'INTEGER',
                        'formtype'        => 'TEXT',
                        'validators'      => array (0 => array ( 'type'        => 'ISPOSITIVE',
                                                                   'errmsg'=> 'expire_error_notpositive'),
                                                   ),
                        'default'         => $conf['default_expire'],
                        'value'           => $conf['default_expire'],
                        'width'           => '30',
@@ -141,6 +153,9 @@
                'minimum' => array (
                        'datatype'        => 'INTEGER',
                        'formtype'        => 'TEXT',
                        'validators'      => array (0 => array ( 'type'        => 'ISPOSITIVE',
                                                                   'errmsg'=> 'minimum_error_notpositive'),
                                                   ),
                        'default'         => $conf['default_minimum_ttl'],
                        'value'           => $conf['default_minimum_ttl'],
                        'width'           => '30',
@@ -149,6 +164,9 @@
                'ttl' => array (
                        'datatype'        => 'INTEGER',
                        'formtype'        => 'TEXT',
                        'validators'      => array (0 => array ( 'type'        => 'ISPOSITIVE',
                                                                   'errmsg'=> 'ttl_error_notpositive'),
                                                   ),
                        'default'         => $conf['default_ttl'],
                        'value'           => $conf['default_ttl'],
                        'width'           => '30',
interface/web/dns/lib/lang/en_rr.lng
@@ -1,10 +1,12 @@
<?php
$wb["zone_txt"] = 'zone';
$wb["name_txt"] = 'name';
$wb["type_txt"] = 'type';
$wb["data_txt"] = 'data';
$wb["aux_txt"] = 'aux';
$wb["ttl_txt"] = 'ttl';
$wb["zone_txt"] = 'Zone';
$wb["name_txt"] = 'Name';
$wb["type_txt"] = 'Type';
$wb["data_txt"] = 'Data';
$wb["aux_txt"] = 'Preference/Priority';
$wb["ttl_txt"] = 'TTL';
$wb["btn_save_txt"] = 'Save';
$wb["btn_cancel_txt"] = 'Cancel';
$wb["rr_data_error_empty"] = 'The data field must not be empty!';
$wb["rr_ttl_error_notpositive"] = 'The TTL must be positive!';
?>
interface/web/dns/lib/lang/en_rr_list.lng
@@ -1,14 +1,15 @@
<?php
$wb["list_head_txt"] = 'rr';
$wb["name_txt"] = 'name';
$wb["type_txt"] = 'type';
$wb["data_txt"] = 'data';
$wb["aux_txt"] = 'aux';
$wb["ttl_txt"] = 'ttl';
$wb["list_head_txt"] = 'Records';
$wb["name_txt"] = 'Name';
$wb["type_txt"] = 'Type';
$wb["data_txt"] = 'Data';
$wb["aux_txt"] = 'Preference/Priority';
$wb["ttl_txt"] = 'TTL';
$wb["page_txt"] = 'Page';
$wb["page_of_txt"] = 'of';
$wb["page_next_txt"] = 'Next';
$wb["page_back_txt"] = 'Back';
$wb["delete_txt"] = 'Delete';
$wb["filter_txt"] = 'Filter';
$wb["add_new_record_txt"] = 'Add New Record';
?>
interface/web/dns/lib/lang/en_soa.lng
@@ -1,15 +1,25 @@
<?php
$wb["origin_txt"] = 'origin';
$wb["ns_txt"] = 'ns';
$wb["mbox_txt"] = 'mbox';
$wb["serial_txt"] = 'serial';
$wb["refresh_txt"] = 'refresh';
$wb["retry_txt"] = 'retry';
$wb["expire_txt"] = 'expire';
$wb["minimum_txt"] = 'minimum';
$wb["ttl_txt"] = 'ttl';
$wb["active_txt"] = 'active';
$wb["xfer_txt"] = 'xfer';
$wb["origin_txt"] = 'Origin';
$wb["ns_txt"] = 'Name Server';
$wb["mbox_txt"] = 'Admin Email';
$wb["serial_txt"] = 'Serial No.';
$wb["refresh_txt"] = 'Refresh';
$wb["retry_txt"] = 'Retry';
$wb["expire_txt"] = 'Expire';
$wb["minimum_txt"] = 'Minimum TTL';
$wb["ttl_txt"] = 'TTL';
$wb["active_txt"] = 'Active';
$wb["xfer_txt"] = 'Zone Transfers';
$wb["btn_save_txt"] = 'Save';
$wb["btn_cancel_txt"] = 'Cancel';
$wb["soa_error_empty"] = 'The origin must not be empty!';
$wb["soa_error_unique"] = 'This origin does already exist! The origin must be unique!';
$wb["ns_error_empty"] = 'The name server must not be empty!';
$wb["mbox_error_empty"] = 'The admin email address must not be empty!';
$wb["serial_error_notpositive"] = 'The serial no. must be positive!';
$wb["refresh_error_notpositive"] = 'The refresh must be positive!';
$wb["retry_error_notpositive"] = 'The retry must be positive!';
$wb["expire_error_notpositive"] = 'The expire must be positive!';
$wb["minimum_error_notpositive"] = 'The minimum TTL must be positive!';
$wb["ttl_error_notpositive"] = 'The TTL must be positive!';
?>
interface/web/dns/lib/lang/en_soa_list.lng
@@ -1,20 +1,23 @@
<?php
$wb["list_head_txt"] = 'soa';
$wb["origin_txt"] = 'origin';
$wb["ns_txt"] = 'ns';
$wb["mbox_txt"] = 'mbox';
$wb["serial_txt"] = 'serial';
$wb["refresh_txt"] = 'refresh';
$wb["retry_txt"] = 'retry';
$wb["expire_txt"] = 'expire';
$wb["minimum_txt"] = 'minimum';
$wb["ttl_txt"] = 'ttl';
$wb["active_txt"] = 'active';
$wb["xfer_txt"] = 'xfer';
$wb["list_head_txt"] = 'Zones (SOA)';
$wb["origin_txt"] = 'Origin';
$wb["ns_txt"] = 'Name Server';
$wb["mbox_txt"] = 'Admin Email';
$wb["serial_txt"] = 'Serial No.';
$wb["refresh_txt"] = 'Refresh';
$wb["retry_txt"] = 'Retry';
$wb["expire_txt"] = 'Expire';
$wb["minimum_txt"] = 'Minimum TTL';
$wb["ttl_txt"] = 'TTL';
$wb["active_txt"] = 'Active';
$wb["xfer_txt"] = 'Zone Transfer';
$wb["page_txt"] = 'Page';
$wb["page_of_txt"] = 'of';
$wb["page_next_txt"] = 'Next';
$wb["page_back_txt"] = 'Back';
$wb["delete_txt"] = 'Delete';
$wb["filter_txt"] = 'Filter';
$wb["Y"] = 'Yes';
$wb["N"] = 'No';
$wb["add_new_record_txt"] = 'Add New Zone';
?>
interface/web/dns/list/soa.list.php
@@ -65,6 +65,7 @@
                                                        'width'                => "",
                                                        'value'                => "");
/*
$liste["item"][] = array(        'field'                => "mbox",
                                                        'datatype'        => "VARCHAR",
                                                        'formtype'        => "TEXT",
@@ -118,6 +119,7 @@
                                                        'suffix'        => "",
                                                        'width'                => "",
                                                        'value'                => "");
*/
$liste["item"][] = array(        'field'                => "ttl",
                                                        'datatype'        => "INTEGER",
@@ -137,6 +139,7 @@
                                                        'width'                => "",
                                                        'value'                => "");
/*
$liste["item"][] = array(        'field'                => "xfer",
                                                        'datatype'        => "VARCHAR",
                                                        'formtype'        => "TEXT",
@@ -145,6 +148,6 @@
                                                        'suffix'        => "%",
                                                        'width'                => "",
                                                        'value'                => "");
*/
?>
interface/web/dns/templates/soa_edit.htm
@@ -36,7 +36,7 @@
    <td width="366" class="frmText11"><input name="ttl" type="text" class="text" value="{tmpl_var name='ttl'}" size="30" maxlength="255"></td>
  </tr>
  <tr>
    <td width="126" class="frmText11">{tmpl_var name='active_txt'}:</td>
    <td width="126" class="frmText11" valign="top">{tmpl_var name='active_txt'}:</td>
    <td width="366" class="frmText11">{tmpl_var name='active'}</td>
  </tr>
  <tr>
interface/web/dns/templates/soa_list.htm
@@ -5,50 +5,62 @@
  <tr>
    <td class="tblHead"><tmpl_var name="origin_txt"></td>
    <td class="tblHead"><tmpl_var name="ns_txt"></td>
    <!--
    <td class="tblHead"><tmpl_var name="mbox_txt"></td>
    <td class="tblHead"><tmpl_var name="serial_txt"></td>
    <td class="tblHead"><tmpl_var name="refresh_txt"></td>
    <td class="tblHead"><tmpl_var name="retry_txt"></td>
    <td class="tblHead"><tmpl_var name="expire_txt"></td>
    <td class="tblHead"><tmpl_var name="minimum_txt"></td>
    //-->
    <td class="tblHead"><tmpl_var name="ttl_txt"></td>
    <td class="tblHead"><tmpl_var name="active_txt"></td>
    <!--
    <td class="tblHead"><tmpl_var name="xfer_txt"></td>
    //-->
    <td class="tblHead">&nbsp;</td>
  </tr>
  <tr>
    <td class="frmText11"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" class="text" /></td>
    <td class="frmText11"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" class="text" /></td>
    <!--
    <td class="frmText11"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" class="text" /></td>
    <td class="frmText11"><input type="text" name="search_serial" value="{tmpl_var name='search_serial'}" class="text" /></td>
    <td class="frmText11"><input type="text" name="search_refresh" value="{tmpl_var name='search_refresh'}" class="text" /></td>
    <td class="frmText11"><input type="text" name="search_retry" value="{tmpl_var name='search_retry'}" class="text" /></td>
    <td class="frmText11"><input type="text" name="search_expire" value="{tmpl_var name='search_expire'}" class="text" /></td>
    <td class="frmText11"><input type="text" name="search_minimum" value="{tmpl_var name='search_minimum'}" class="text" /></td>
    //-->
    <td class="frmText11"><input type="text" name="search_ttl" value="{tmpl_var name='search_ttl'}" class="text" /></td>
    <td class="frmText11"><input type="text" name="search_active" value="{tmpl_var name='search_active'}" class="text" /></td>
    <!--
    <td class="frmText11"><input type="text" name="search_xfer" value="{tmpl_var name='search_xfer'}" class="text" /></td>
    //-->
    <td class="frmText11" align="right"><input name="Filter" type="submit" id="Filter" value="{tmpl_var name="filter_txt"}"></td>
  </tr>
  <tmpl_loop name="records">
  <tr bgcolor="{tmpl_var name="bgcolor"}">
    <td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="origin"}</a></td>
    <td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="ns"}</a></td>
    <!--
    <td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="mbox"}</a></td>
    <td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="serial"}</a></td>
    <td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="refresh"}</a></td>
    <td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="retry"}</a></td>
    <td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="expire"}</a></td>
    <td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="minimum"}</a></td>
    //-->
    <td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="ttl"}</a></td>
    <td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="active"}</a></td>
    <!--
    <td class="frmText11"><a href="soa_edit.php?id={tmpl_var name='id'}" class="frmText11">{tmpl_var name="xfer"}</a></td>
    //-->
    <td class="frmText11" align="right">[<a href="javascript: del_record('soa_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">{tmpl_var name='delete_txt'}</a>]</td>
  </tr>
  </tmpl_loop>
  <tr>
          <td colspan="12" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
          <td colspan="5" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
  </tr>
</table>
</form>