From 122e1b12d9ba249840bf7995374b0b01e47f1d19 Mon Sep 17 00:00:00 2001
From: IKEDA Soji <ikeda@conversion.co.jp>
Date: Thu, 28 Nov 2019 18:30:39 +0900
Subject: [PATCH] More fixes.

---
 src/cgi/wwsympa.fcgi.in                      |  2 +-
 src/lib/Sympa/Request/Handler/create_list.pm | 12 ++++++------
 src/lib/Sympa/WWW/SOAP.pm                    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cgi/wwsympa.fcgi.in b/src/cgi/wwsympa.fcgi.in
index c77db170b..2eb8aecb0 100644
--- a/src/cgi/wwsympa.fcgi.in
+++ b/src/cgi/wwsympa.fcgi.in
@@ -9746,7 +9746,7 @@ sub do_create_list {
             creation_email => $param->{'user'}{'email'},
             lang           => $param->{'lang'},
             status         => $param->{'status'},          #FIXME
-            template       => $in{'template'},
+            type           => $in{'template'},
             topics         => $in{'topics'},
             description    => $in{'info'},
             custom_input   => $in{'custom_input'},
diff --git a/src/lib/Sympa/Request/Handler/create_list.pm b/src/lib/Sympa/Request/Handler/create_list.pm
index 5a42e2720..64b81e18c 100644
--- a/src/lib/Sympa/Request/Handler/create_list.pm
+++ b/src/lib/Sympa/Request/Handler/create_list.pm
@@ -73,7 +73,7 @@ sub _twist {
     my $listname = lc $param->{listname};
 
     # Obligatory parameters.
-    foreach my $arg (qw(subject template topics)) {
+    foreach my $arg (qw(subject type topics)) {
         unless (defined $param->{$arg} and $param->{$arg} =~ /\S/) {
             $self->add_stash($request, 'user', 'missing_arg',
                 {argument => $arg});
@@ -113,11 +113,11 @@ sub _twist {
     ## Check the template supposed to be used exist.
     my $template_file =
         Sympa::search_fullpath($robot_id, 'config.tt2',
-        subdir => 'create_list_templates/' . $param->{template});
+        subdir => 'create_list_templates/' . $param->{type});
     unless (defined $template_file) {
-        $log->syslog('err', 'No template %s found', $param->{template});
+        $log->syslog('err', 'No template %s found', $param->{type});
         $self->add_stash($request, 'user', 'unknown_template',
-            {tpl => $param->{template}});
+            {tpl => $param->{type}});
         return undef;
     }
 
@@ -171,10 +171,10 @@ sub _twist {
     my $config = '';
     my $template =
         Sympa::Template->new($robot_id,
-        subdir => 'create_list_templates/' . $param->{'template'});
+        subdir => 'create_list_templates/' . $param->{type});
     unless ($template->parse($param, 'config.tt2', \$config)) {
         $log->syslog('err', 'Can\'t parse %s/config.tt2: %s',
-            $param->{'template'}, $template->{last_error});
+            $param->{type}, $template->{last_error});
         $self->add_stash($request, 'intern');
         return undef;
     }
diff --git a/src/lib/Sympa/WWW/SOAP.pm b/src/lib/Sympa/WWW/SOAP.pm
index 75f987c50..3775f59a3 100644
--- a/src/lib/Sympa/WWW/SOAP.pm
+++ b/src/lib/Sympa/WWW/SOAP.pm
@@ -626,7 +626,7 @@ sub createList {
             ],
             subject        => $subject,
             creation_email => $sender,
-            template       => $list_tpl,
+            type           => $list_tpl,
             topics         => $topics,
             description    => $description,
         },