From 4766e9e10c141a75a14a1440dc63eb1d8a5ada8c Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Sun, 19 Aug 2007 00:59:09 -0400
Subject: [PATCH] * Introducing the sb_local.php.skel file to keep a local configuration
---
interface/lib/classes/validate_dns.inc.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/validate_dns.inc.php b/interface/lib/classes/validate_dns.inc.php
index cc3e9ff..a161510 100644
--- a/interface/lib/classes/validate_dns.inc.php
+++ b/interface/lib/classes/validate_dns.inc.php
@@ -103,7 +103,7 @@
if(substr($field, -1) == '.'){
if($i > 2 && $empty > 1) $error .= $desc." ".$app->tform->wordbook['error_invalid_characters']."<br>\r\n";
} else {
- if($empty > 0) $error .= $desc." ".$app->tform->wordbook['error_invalid_characters']."<br>\r\n";
+ if($empty > 0 && $field != '') $error .= $desc." ".$app->tform->wordbook['error_invalid_characters']."<br>\r\n";
}
if(substr($field, -1) == '.' && $area == 'Name'){
@@ -273,10 +273,10 @@
$serial_date = substr($serial, 0, 8);
$count = intval(substr($serial, 8, 2));
$current_date = date("Ymd");
- if($serial_date == $current_date){
+ if($serial_date >= $current_date){
$count += 1;
$count = str_pad($count, 2, "0", STR_PAD_LEFT);
- $new_serial = $current_date.$count;
+ $new_serial = $serial_date.$count;
} else {
$new_serial = $current_date.'01';
}
--
Gitblit v1.9.1