bump version to 1.0-39

[pve-common.git] / data / PVE / JSONSchema.pm

diff --git a/data/PVE/JSONSchema.pm b/data/PVE/JSONSchema.pm
index 816083a2be1fe7e2d32dae8831a742fd62cad5d9..dbaffa5bc72ea34f857e292a9b9977e299ff7ebe 100644 (file)
--- a/data/PVE/JSONSchema.pm
+++ b/data/PVE/JSONSchema.pm
@@ -97,7 +97,7 @@ sub pve_verify_configid {
  
     if ($id !~ m/^[a-z][a-z0-9_]+$/i) {
        return undef if $noerr;
  
     if ($id !~ m/^[a-z][a-z0-9_]+$/i) {
        return undef if $noerr;

-       die "invalid cofiguration ID '$id'\n"; 
+       die "invalid configuration ID '$id'\n"; 

     }
     return $id;
 }
     }
     return $id;
 }


@@ -129,8 +129,7 @@ register_format('pve-node', \&pve_verify_node_name);
 sub pve_verify_node_name {
     my ($node, $noerr) = @_;
 
 sub pve_verify_node_name {
     my ($node, $noerr) = @_;
 

-    # todo: use better regex ?
-    if ($node !~ m/^[A-Za-z][[:alnum:]\-]*[[:alnum:]]+$/) {
+    if ($node !~ m/^([a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?)$/) {

        return undef if $noerr;
        die "value does not look like a valid node name\n";
     }
        return undef if $noerr;
        die "value does not look like a valid node name\n";
     }


@@ -178,7 +177,7 @@ register_format('dns-name', \&pve_verify_dns_name);
 sub pve_verify_dns_name {
     my ($name, $noerr) = @_;
 
 sub pve_verify_dns_name {
     my ($name, $noerr) = @_;
 

-    my $namere = "([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])";
+    my $namere = "([a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?)";

 
     if ($name !~ /^(${namere}\.)*${namere}$/) {
           return undef if $noerr;
 
     if ($name !~ /^(${namere}\.)*${namere}$/) {
           return undef if $noerr;


@@ -954,9 +953,6 @@ sub get_options {
     }
 
     $opts = PVE::Tools::decode_utf8_parameters($opts);
     }
 
     $opts = PVE::Tools::decode_utf8_parameters($opts);

-    if ($opts->{description}) {
-       print "TEST: " . PVE::Tools::encode_text($opts->{description}) . "\n";
-    }

 
     foreach my $p (keys %$opts) {
        if (my $pd = $schema->{properties}->{$p}) {
 
     foreach my $p (keys %$opts) {
        if (my $pd = $schema->{properties}->{$p}) {