Merge pull request #847 from ikedas/issue-844 by ikedas

Additional fixes to #841.

Author: ikedas

src/lib/Sympa/Scenario.pm

@@ -678,10 +678,10 @@ sub _compile_condition {
             }
         } elsif ($value =~ /\[custom_vars\-\>([\w\-]+)\]/i) {
             # Custom vars
-            $value = sprintf '$context->{custom_vars}{%1}', $1;
+            $value = sprintf '$context->{custom_vars}{\'%s\'}', $1;
         } elsif ($value =~ /\[family\-\>([\w\-]+)\]/i) {
             # Family vars
-            $value = sprintf '$context->{family}{%s}', $1;
+            $value = sprintf '$context->{family}{\'%s\'}', $1;
         } elsif ($value =~ /\[conf\-\>([\w\-]+)\]/i) {
             # Config param
             my $conf_key = $1;
@@ -725,7 +725,7 @@ sub _compile_condition {
                 if (    exists $pinfo->{$canon_param}
                     and ref $pinfo->{$canon_param}{format} ne 'HASH'
                     and $pinfo->{$canon_param}{occurrence} !~ /n$/) {
-                    $value = sprintf '$that->{admin}{%s}', $canon_param;
+                    $value = sprintf '$that->{admin}{\'%s\'}', $canon_param;
                 } else {
                     $log->syslog('err',
                         'Unknown list parameter %s in rule %s',
@@ -741,19 +741,19 @@ sub _compile_condition {
             my $key = $1;
             $value =
                 sprintf
-                '($context->{user} || Sympa::User->new($context->{sender}))->{%s}',
+                '($context->{user} || Sympa::User->new($context->{sender}))->{\'%s\'}',
                 $key;
         } elsif ($value =~ /\[user_attributes\-\>([\w\-]+)\]/i) {
             my $key = $1;
             $value =
                 sprintf
-                '($context->{user} || Sympa::User->new($context->{sender}))->{attributes}{%s}',
+                '($context->{user} || Sympa::User->new($context->{sender}))->{attributes}{\'%s\'}',
                 $key;
         } elsif ($value =~ /\[subscriber\-\>([\w\-]+)\]/i) {
             my $key = $1;
             $value =
                 sprintf
-                '($context->{subscriber} || $that->get_list_memner($context->{sender}) || {})->{%s}',
+                '($context->{subscriber} || $that->get_list_memner($context->{sender}) || {})->{\'%s\'}',
                 $key;
         } elsif ($value =~
             /\[(msg_header|header)\-\>([\w\-]+)\](?:\[([-+]?\d+)\])?/i) {
@@ -907,8 +907,9 @@ sub _compile_condition_term {
             return sprintf '(%s =~ %s)', $args[0], $args[1];
         }
     } elsif ($condition_key =~ /^customcondition::(\w+)$/) {
-        return sprintf 'do_verify_custom($that, %s, %s, %s)',
-            _compile_hashref($rule), $1, join ', ', @args;
+        my $mod = $1;
+        return sprintf 'do_verify_custom($that, %s, \'%s\', %s)',
+            _compile_hashref($rule), $mod, join ', ', @args;
     } else {
         $log->syslog('err', 'Syntax error: Unknown condition %s',
             $condition_key);
@@ -926,8 +927,20 @@ sub _compile_hashref {
         ', ',
         map {
             my ($k, $v) = ($_, $hashref->{$_});
-            $v =~ s/([\\\'])/\\$1/g;
-            sprintf "%s => '%s'", $k, $v;
+            if (ref $v eq 'ARRAY') {
+                $v = join(
+                    ', ',
+                    map {
+                        my $i = $_;
+                        $i =~ s/([\\\'])/\\$1/g;
+                        "'$i'";
+                    } @$v
+                );
+                sprintf '%s => [%s]', $k, $v;
+            } else {
+                $v =~ s/([\\\'])/\\$1/g;
+                sprintf "%s => '%s'", $k, $v;
+            }
         } sort keys %$hashref
     ) . '}';
 }