Item13186: drop nullok and support undefok and emptyok instead, to re…

…present valid undef and empty string values respectively. Clean up the way check options are used in the checkers, and collapse undef and empty checking into a single checker function. Include other changes from George's patch in the task.
foswiki · Jan 9, 2015 · a6036b1 · a6036b1
1 parent 3d6fc31
commit a6036b1
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 21 deletions.
diff --git a/core/lib/Foswiki/Configure/Checker.pm b/core/lib/Foswiki/Configure/Checker.pm
@@ -365,13 +365,13 @@ sub checkExpandedValue {
     my $field = $value;
 
     if ( !defined $field ) {
-        if (!$this->CHECK_option('undefok')) {
+        if ( !$this->CHECK_option('undefok') ) {
             $reporter->ERROR("May not be undefined");
         }
         $field = 'undef';
     }
 
-    if ( $field eq '' && !$this->CHECK_option('emptyok')) {
+    if ( $field eq '' && !$this->CHECK_option('emptyok') ) {
         $reporter->ERROR("May not be empty");
     }
 
@@ -380,10 +380,9 @@ sub checkExpandedValue {
     }
 
     if ( $field =~ /\n/ ) {
-        $reporter->NOTE( 'Expands to: <verbatim>',
-                         $field, '</verbatim>' );
+        $reporter->NOTE( 'Expands to: <verbatim>', $field, '</verbatim>' );
     }
-    elsif ($field eq '') {
+    elsif ( $field eq '' ) {
         $reporter->NOTE("Expands to: '' (empty)");
     }
     else {
@@ -393,7 +392,7 @@ sub checkExpandedValue {
 }
 
 sub CHECK_option {
-    my ($this, $opt) = @_;
+    my ( $this, $opt ) = @_;
     my $check = $this->{item}->{CHECK}->[0];
     return undef unless $check;
     return $check->{$opt}[0];

diff --git a/core/lib/Foswiki/Configure/Checkers/DATE.pm b/core/lib/Foswiki/Configure/Checkers/DATE.pm
@@ -25,7 +25,7 @@ sub check_current_value {
     my $value = $this->checkExpandedValue($reporter);
     return unless defined $value;
 
-    my $zone      = $this->CHECK_option('zone') || 'utc';
+    my $zone = $this->CHECK_option('zone') || 'utc';
     my $normalize = !$this->CHECK_option('raw');
 
     if ( $value =~ /\S/ ) {

diff --git a/core/lib/Foswiki/Configure/Checkers/SMTP/SENDERHOST.pm b/core/lib/Foswiki/Configure/Checkers/SMTP/SENDERHOST.pm
@@ -13,8 +13,8 @@ sub check_current_value {
     my ( $this, $reporter ) = @_;
 
     return
-        unless ( $Foswiki::cfg{EnableEmail}
-                 && $Foswiki::cfg{Email}{MailMethod} =~ /^Net::SMTP/);
+      unless ( $Foswiki::cfg{EnableEmail}
+        && $Foswiki::cfg{Email}{MailMethod} =~ /^Net::SMTP/ );
 
     my $value = $this->checkExpandedValue();
     return unless defined $value;

diff --git a/core/lib/Foswiki/Configure/Checkers/URL.pm b/core/lib/Foswiki/Configure/Checkers/URL.pm
@@ -46,11 +46,7 @@ sub check_current_value {
 
     my $val = $this->checkExpandedValue($reporter);
 
-    checkURI(
-        $reporter,
-        $val,
-        %{ $this->{item}->{CHECK}->[0] || {} }
-    );
+    checkURI( $reporter, $val, %{ $this->{item}->{CHECK}->[0] || {} } );
 }
 
 sub _list2hash {

diff --git a/core/lib/Foswiki/Configure/Value.pm b/core/lib/Foswiki/Configure/Value.pm
@@ -99,9 +99,7 @@ our %CHECK_options = (
     schemes  => -1,    # for URL
 );
 
-our %rename_options = (
-    nullok => 'undefok'
-    );
+our %rename_options = ( nullok => 'undefok' );
 
 =begin TML
 

diff --git a/core/lib/Foswiki/Configure/Wizards/Save.pm b/core/lib/Foswiki/Configure/Wizards/Save.pm
@@ -249,14 +249,15 @@ sub save {
                     eval "undef \$Foswiki::cfg$k";
                 }
             }
-            elsif ($spec->CHECK_option('nullok')) {
+            elsif ( $spec->CHECK_option('nullok') ) {
                 eval "undef \$Foswiki::cfg$k";
             }
             else {
                 $reporter->ERROR(
-"SAVE ABORTED: undef given as value for $k, but the spec is not undefok");
+"SAVE ABORTED: undef given as value for $k, but the spec is not undefok"
+                );
                 return undef;
-           }
+            }
             ASSERT( !$@, $@ ) if DEBUG;
         }
     }
@@ -430,7 +431,8 @@ sub _generateLSC {
             # An undef value and undefok will suppress the item in LSC
             return () if $vs->CHECK_option('undefok');
 
-        } elsif ( $datum eq '' ) {
+        }
+        elsif ( $datum eq '' ) {
 
             # Treat '' as undef unless emptyok
             return () unless $vs->CHECK_option('emptyok');