From db693f74bbc7e9c1fcb2b26e663a3c4b02208fec Mon Sep 17 00:00:00 2001
From: GabrielJenik <gabriel.jenik@gmail.com>
Date: Tue, 29 Dec 2020 12:21:11 -0300
Subject: [PATCH 1/2] Fixed issue #16474: Remote control import_group broken

Fixed and Added test case
---
 .../remotecontrol/remotecontrol_handle.php    |   2 +-
 tests/TestHelper.php                          |   2 +-
 .../data/file_upload/limesurvey_group_472.lsg | 530 ++++++++++++++++++
 .../limesurvey_survey_251297_import_group.lss | 294 ++++++++++
 tests/unit/helpers/RemoteControlTest.php      |  62 ++
 5 files changed, 888 insertions(+), 2 deletions(-)
 create mode 100644 tests/data/file_upload/limesurvey_group_472.lsg
 create mode 100644 tests/data/surveys/limesurvey_survey_251297_import_group.lss

diff --git a/application/helpers/remotecontrol/remotecontrol_handle.php b/application/helpers/remotecontrol/remotecontrol_handle.php
index 15d94f55ffa..287fc8f8948 100644
--- a/application/helpers/remotecontrol/remotecontrol_handle.php
+++ b/application/helpers/remotecontrol/remotecontrol_handle.php
@@ -1123,7 +1123,7 @@ public function import_group($sSessionKey, $iSurveyID, $sImportData, $sImportDat
                         libxml_disable_entity_loader($bOldEntityLoaderState); // Put back entity loader to its original state, to avoid contagion to other applications on the server
                         return array('status' => 'Error: Invalid LimeSurvey group structure XML ');
                     }
-                    $aImportResults = XMLImportGroup($sFullFilePath, $iSurveyID);
+                    $aImportResults = XMLImportGroup($sFullFilePath, $iSurveyID, true);
                 } else {
                                     return array('status' => 'Invalid extension');
                 }
diff --git a/tests/TestHelper.php b/tests/TestHelper.php
index 896d17a7c56..cb2eaf70c0f 100644
--- a/tests/TestHelper.php
+++ b/tests/TestHelper.php
@@ -26,7 +26,7 @@ public function importAll()
         \Yii::import('application.helpers.common_helper', true);
         \Yii::import('application.helpers.replacements_helper', true);
         \Yii::import('application.helpers.surveytranslator_helper', true);
-        \Yii::import('application.helpers.admin.import_helper', true);
+        \Yii::app()->loadHelper('admin/import');
         \Yii::import('application.helpers.expressions.em_manager_helper', true);
         \Yii::import('application.helpers.expressions.em_manager_helper', true);
         \Yii::import('application.helpers.qanda_helper', true);
diff --git a/tests/data/file_upload/limesurvey_group_472.lsg b/tests/data/file_upload/limesurvey_group_472.lsg
new file mode 100644
index 00000000000..3544bf2b43e
--- /dev/null
+++ b/tests/data/file_upload/limesurvey_group_472.lsg
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document>
+ <LimeSurveyDocType>Group</LimeSurveyDocType>
+ <DBVersion>435</DBVersion>
+ <languages>
+  <language>en</language>
+ </languages>
+ <groups>
+  <fields>
+   <fieldname>gid</fieldname>
+   <fieldname>sid</fieldname>
+   <fieldname>group_order</fieldname>
+   <fieldname>randomization_group</fieldname>
+   <fieldname>grelevance</fieldname>
+  </fields>
+  <rows>
+   <row>
+    <gid><![CDATA[472]]></gid>
+    <sid><![CDATA[251297]]></sid>
+    <group_order><![CDATA[1]]></group_order>
+    <randomization_group/>
+    <grelevance/>
+   </row>
+  </rows>
+ </groups>
+ <group_l10ns>
+  <fields>
+   <fieldname>id</fieldname>
+   <fieldname>gid</fieldname>
+   <fieldname>group_name</fieldname>
+   <fieldname>description</fieldname>
+   <fieldname>language</fieldname>
+   <fieldname>sid</fieldname>
+   <fieldname>group_order</fieldname>
+   <fieldname>randomization_group</fieldname>
+   <fieldname>grelevance</fieldname>
+  </fields>
+  <rows>
+   <row>
+    <id><![CDATA[463]]></id>
+    <gid><![CDATA[472]]></gid>
+    <group_name><![CDATA[Imported group]]></group_name>
+    <description><![CDATA[<p>This is an imported group</p>]]></description>
+    <language><![CDATA[en]]></language>
+    <sid><![CDATA[251297]]></sid>
+    <group_order><![CDATA[1]]></group_order>
+    <randomization_group/>
+    <grelevance/>
+   </row>
+  </rows>
+ </group_l10ns>
+ <questions>
+  <fields>
+   <fieldname>qid</fieldname>
+   <fieldname>parent_qid</fieldname>
+   <fieldname>sid</fieldname>
+   <fieldname>gid</fieldname>
+   <fieldname>type</fieldname>
+   <fieldname>title</fieldname>
+   <fieldname>preg</fieldname>
+   <fieldname>other</fieldname>
+   <fieldname>mandatory</fieldname>
+   <fieldname>question_order</fieldname>
+   <fieldname>scale_id</fieldname>
+   <fieldname>same_default</fieldname>
+   <fieldname>relevance</fieldname>
+   <fieldname>modulename</fieldname>
+   <fieldname>encrypted</fieldname>
+  </fields>
+  <rows>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <parent_qid><![CDATA[0]]></parent_qid>
+    <sid><![CDATA[251297]]></sid>
+    <gid><![CDATA[472]]></gid>
+    <type><![CDATA[T]]></type>
+    <title><![CDATA[Q01]]></title>
+    <preg/>
+    <other><![CDATA[N]]></other>
+    <mandatory><![CDATA[N]]></mandatory>
+    <question_order><![CDATA[1]]></question_order>
+    <scale_id><![CDATA[0]]></scale_id>
+    <same_default><![CDATA[0]]></same_default>
+    <relevance><![CDATA[1]]></relevance>
+    <modulename/>
+    <encrypted><![CDATA[N]]></encrypted>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <parent_qid><![CDATA[0]]></parent_qid>
+    <sid><![CDATA[251297]]></sid>
+    <gid><![CDATA[472]]></gid>
+    <type><![CDATA[T]]></type>
+    <title><![CDATA[Q02]]></title>
+    <preg/>
+    <other><![CDATA[N]]></other>
+    <mandatory><![CDATA[N]]></mandatory>
+    <question_order><![CDATA[2]]></question_order>
+    <scale_id><![CDATA[0]]></scale_id>
+    <same_default><![CDATA[0]]></same_default>
+    <relevance><![CDATA[1]]></relevance>
+    <modulename/>
+    <encrypted><![CDATA[N]]></encrypted>
+   </row>
+  </rows>
+ </questions>
+ <question_l10ns>
+  <fields>
+   <fieldname>id</fieldname>
+   <fieldname>qid</fieldname>
+   <fieldname>question</fieldname>
+   <fieldname>help</fieldname>
+   <fieldname>language</fieldname>
+   <fieldname>script</fieldname>
+  </fields>
+  <rows>
+   <row>
+    <id><![CDATA[8418]]></id>
+    <qid><![CDATA[4410]]></qid>
+    <question><![CDATA[<p>First question</p>]]></question>
+    <help/>
+    <language><![CDATA[en]]></language>
+    <script/>
+   </row>
+   <row>
+    <id><![CDATA[8419]]></id>
+    <qid><![CDATA[4411]]></qid>
+    <question><![CDATA[<p>Second question</p>]]></question>
+    <help/>
+    <language><![CDATA[en]]></language>
+    <script/>
+   </row>
+  </rows>
+ </question_l10ns>
+ <question_attributes>
+  <fields>
+   <fieldname>qid</fieldname>
+   <fieldname>attribute</fieldname>
+   <fieldname>value</fieldname>
+   <fieldname>language</fieldname>
+  </fields>
+  <rows>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[time_limit_warning_2_style]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[time_limit_warning_2_message]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[time_limit_warning_2_display_time]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[time_limit_warning_2]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[time_limit_warning_style]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[time_limit_warning_message]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[time_limit_warning_display_time]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[time_limit_warning]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[time_limit_message_style]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[time_limit_message]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[time_limit_message_delay]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[time_limit_timer_style]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[time_limit_countdown_message]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[time_limit_disable_prev]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[time_limit_disable_next]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[time_limit_action]]></attribute>
+    <value><![CDATA[1]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[time_limit]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[statistics_graphtype]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[statistics_showgraph]]></attribute>
+    <value><![CDATA[1]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[TableHeader]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[TypeForAnalysis]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[scale_export]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[page_break]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[em_validation_q_tip]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[em_validation_q]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[random_group]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[other_comment_mandatory]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[prefillFromSurvey]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[maximum_chars]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[googlesheetsDataType]]></attribute>
+    <value><![CDATA[default]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[cssclass]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[hidden]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[display_rows]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[input_size]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[text_input_width]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[hide_tip]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[save_as_default]]></attribute>
+    <value><![CDATA[Y]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4410]]></qid>
+    <attribute><![CDATA[question_template]]></attribute>
+    <value><![CDATA[core]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[time_limit_warning_2_style]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[time_limit_warning_2_message]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[time_limit_warning_2_display_time]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[time_limit_warning_2]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[time_limit_warning_style]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[time_limit_warning_message]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[time_limit_warning_display_time]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[time_limit_warning]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[time_limit_message_style]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[time_limit_message]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[time_limit_message_delay]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[time_limit_timer_style]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[time_limit_countdown_message]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[time_limit_disable_prev]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[time_limit_disable_next]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[time_limit_action]]></attribute>
+    <value><![CDATA[1]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[time_limit]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[statistics_graphtype]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[statistics_showgraph]]></attribute>
+    <value><![CDATA[1]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[TableHeader]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[TypeForAnalysis]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[scale_export]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[page_break]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[em_validation_q_tip]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[em_validation_q]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[random_group]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[other_comment_mandatory]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[prefillFromSurvey]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[maximum_chars]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[googlesheetsDataType]]></attribute>
+    <value><![CDATA[default]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[cssclass]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[hidden]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[display_rows]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[input_size]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[text_input_width]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[hide_tip]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[clear_default]]></attribute>
+    <value/>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[save_as_default]]></attribute>
+    <value><![CDATA[Y]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[4411]]></qid>
+    <attribute><![CDATA[question_template]]></attribute>
+    <value><![CDATA[core]]></value>
+   </row>
+  </rows>
+ </question_attributes>
+</document>
diff --git a/tests/data/surveys/limesurvey_survey_251297_import_group.lss b/tests/data/surveys/limesurvey_survey_251297_import_group.lss
new file mode 100644
index 00000000000..aea0af0f65c
--- /dev/null
+++ b/tests/data/surveys/limesurvey_survey_251297_import_group.lss
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document>
+ <LimeSurveyDocType>Survey</LimeSurveyDocType>
+ <DBVersion>435</DBVersion>
+ <languages>
+  <language>en</language>
+ </languages>
+ <surveys>
+  <fields>
+   <fieldname>sid</fieldname>
+   <fieldname>gsid</fieldname>
+   <fieldname>admin</fieldname>
+   <fieldname>expires</fieldname>
+   <fieldname>startdate</fieldname>
+   <fieldname>adminemail</fieldname>
+   <fieldname>anonymized</fieldname>
+   <fieldname>faxto</fieldname>
+   <fieldname>format</fieldname>
+   <fieldname>savetimings</fieldname>
+   <fieldname>template</fieldname>
+   <fieldname>language</fieldname>
+   <fieldname>additional_languages</fieldname>
+   <fieldname>datestamp</fieldname>
+   <fieldname>usecookie</fieldname>
+   <fieldname>allowregister</fieldname>
+   <fieldname>allowsave</fieldname>
+   <fieldname>autonumber_start</fieldname>
+   <fieldname>autoredirect</fieldname>
+   <fieldname>allowprev</fieldname>
+   <fieldname>printanswers</fieldname>
+   <fieldname>ipaddr</fieldname>
+   <fieldname>refurl</fieldname>
+   <fieldname>showsurveypolicynotice</fieldname>
+   <fieldname>publicstatistics</fieldname>
+   <fieldname>publicgraphs</fieldname>
+   <fieldname>listpublic</fieldname>
+   <fieldname>htmlemail</fieldname>
+   <fieldname>sendconfirmation</fieldname>
+   <fieldname>tokenanswerspersistence</fieldname>
+   <fieldname>assessments</fieldname>
+   <fieldname>usecaptcha</fieldname>
+   <fieldname>usetokens</fieldname>
+   <fieldname>bounce_email</fieldname>
+   <fieldname>attributedescriptions</fieldname>
+   <fieldname>emailresponseto</fieldname>
+   <fieldname>emailnotificationto</fieldname>
+   <fieldname>tokenlength</fieldname>
+   <fieldname>showxquestions</fieldname>
+   <fieldname>showgroupinfo</fieldname>
+   <fieldname>shownoanswer</fieldname>
+   <fieldname>showqnumcode</fieldname>
+   <fieldname>bouncetime</fieldname>
+   <fieldname>bounceprocessing</fieldname>
+   <fieldname>bounceaccounttype</fieldname>
+   <fieldname>bounceaccounthost</fieldname>
+   <fieldname>bounceaccountpass</fieldname>
+   <fieldname>bounceaccountencryption</fieldname>
+   <fieldname>bounceaccountuser</fieldname>
+   <fieldname>showwelcome</fieldname>
+   <fieldname>showprogress</fieldname>
+   <fieldname>questionindex</fieldname>
+   <fieldname>navigationdelay</fieldname>
+   <fieldname>nokeyboard</fieldname>
+   <fieldname>alloweditaftercompletion</fieldname>
+   <fieldname>googleanalyticsstyle</fieldname>
+   <fieldname>googleanalyticsapikey</fieldname>
+   <fieldname>tokenencryptionoptions</fieldname>
+   <fieldname>ipanonymize</fieldname>
+  </fields>
+  <rows>
+   <row>
+    <sid><![CDATA[251297]]></sid>
+    <gsid><![CDATA[1]]></gsid>
+    <admin><![CDATA[inherit]]></admin>
+    <adminemail><![CDATA[inherit]]></adminemail>
+    <anonymized><![CDATA[I]]></anonymized>
+    <faxto/>
+    <format><![CDATA[I]]></format>
+    <savetimings><![CDATA[I]]></savetimings>
+    <template><![CDATA[inherit]]></template>
+    <language><![CDATA[en]]></language>
+    <additional_languages/>
+    <datestamp><![CDATA[I]]></datestamp>
+    <usecookie><![CDATA[I]]></usecookie>
+    <allowregister><![CDATA[I]]></allowregister>
+    <allowsave><![CDATA[I]]></allowsave>
+    <autonumber_start><![CDATA[0]]></autonumber_start>
+    <autoredirect><![CDATA[I]]></autoredirect>
+    <allowprev><![CDATA[I]]></allowprev>
+    <printanswers><![CDATA[I]]></printanswers>
+    <ipaddr><![CDATA[I]]></ipaddr>
+    <refurl><![CDATA[I]]></refurl>
+    <showsurveypolicynotice><![CDATA[0]]></showsurveypolicynotice>
+    <publicstatistics><![CDATA[I]]></publicstatistics>
+    <publicgraphs><![CDATA[I]]></publicgraphs>
+    <listpublic><![CDATA[I]]></listpublic>
+    <htmlemail><![CDATA[I]]></htmlemail>
+    <sendconfirmation><![CDATA[I]]></sendconfirmation>
+    <tokenanswerspersistence><![CDATA[I]]></tokenanswerspersistence>
+    <assessments><![CDATA[I]]></assessments>
+    <usecaptcha><![CDATA[E]]></usecaptcha>
+    <usetokens><![CDATA[N]]></usetokens>
+    <bounce_email><![CDATA[inherit]]></bounce_email>
+    <emailresponseto><![CDATA[inherit]]></emailresponseto>
+    <emailnotificationto><![CDATA[inherit]]></emailnotificationto>
+    <tokenlength><![CDATA[-1]]></tokenlength>
+    <showxquestions><![CDATA[I]]></showxquestions>
+    <showgroupinfo><![CDATA[I]]></showgroupinfo>
+    <shownoanswer><![CDATA[I]]></shownoanswer>
+    <showqnumcode><![CDATA[I]]></showqnumcode>
+    <bounceprocessing><![CDATA[N]]></bounceprocessing>
+    <showwelcome><![CDATA[I]]></showwelcome>
+    <showprogress><![CDATA[I]]></showprogress>
+    <questionindex><![CDATA[-1]]></questionindex>
+    <navigationdelay><![CDATA[-1]]></navigationdelay>
+    <nokeyboard><![CDATA[I]]></nokeyboard>
+    <alloweditaftercompletion><![CDATA[I]]></alloweditaftercompletion>
+    <tokenencryptionoptions/>
+    <ipanonymize><![CDATA[I]]></ipanonymize>
+   </row>
+  </rows>
+ </surveys>
+ <surveys_languagesettings>
+  <fields>
+   <fieldname>surveyls_survey_id</fieldname>
+   <fieldname>surveyls_language</fieldname>
+   <fieldname>surveyls_title</fieldname>
+   <fieldname>surveyls_description</fieldname>
+   <fieldname>surveyls_welcometext</fieldname>
+   <fieldname>surveyls_endtext</fieldname>
+   <fieldname>surveyls_policy_notice</fieldname>
+   <fieldname>surveyls_policy_error</fieldname>
+   <fieldname>surveyls_policy_notice_label</fieldname>
+   <fieldname>surveyls_url</fieldname>
+   <fieldname>surveyls_urldescription</fieldname>
+   <fieldname>surveyls_email_invite_subj</fieldname>
+   <fieldname>surveyls_email_invite</fieldname>
+   <fieldname>surveyls_email_remind_subj</fieldname>
+   <fieldname>surveyls_email_remind</fieldname>
+   <fieldname>surveyls_email_register_subj</fieldname>
+   <fieldname>surveyls_email_register</fieldname>
+   <fieldname>surveyls_email_confirm_subj</fieldname>
+   <fieldname>surveyls_email_confirm</fieldname>
+   <fieldname>surveyls_dateformat</fieldname>
+   <fieldname>surveyls_attributecaptions</fieldname>
+   <fieldname>email_admin_notification_subj</fieldname>
+   <fieldname>email_admin_notification</fieldname>
+   <fieldname>email_admin_responses_subj</fieldname>
+   <fieldname>email_admin_responses</fieldname>
+   <fieldname>surveyls_numberformat</fieldname>
+   <fieldname>attachments</fieldname>
+  </fields>
+  <rows>
+   <row>
+    <surveyls_survey_id><![CDATA[251297]]></surveyls_survey_id>
+    <surveyls_language><![CDATA[en]]></surveyls_language>
+    <surveyls_title><![CDATA[Test import group]]></surveyls_title>
+    <surveyls_description/>
+    <surveyls_welcometext/>
+    <surveyls_endtext/>
+    <surveyls_policy_notice/>
+    <surveyls_policy_notice_label/>
+    <surveyls_url/>
+    <surveyls_urldescription/>
+    <surveyls_email_invite_subj><![CDATA[Invitation to participate in a survey]]></surveyls_email_invite_subj>
+    <surveyls_email_invite><![CDATA[Dear {FIRSTNAME},
+
+you have been invited to participate in a survey.
+
+The survey is titled:
+"{SURVEYNAME}"
+
+"{SURVEYDESCRIPTION}"
+
+To participate, please click on the link below.
+
+Sincerely,
+
+{ADMINNAME} ({ADMINEMAIL})
+
+----------------------------------------------
+Click here to do the survey:
+{SURVEYURL}
+
+If you do not want to participate in this survey and don't want to receive any more invitations please click the following link:
+{OPTOUTURL}
+
+If you are blacklisted but want to participate in this survey and want to receive invitations please click the following link:
+{OPTINURL}]]></surveyls_email_invite>
+    <surveyls_email_remind_subj><![CDATA[Reminder to participate in a survey]]></surveyls_email_remind_subj>
+    <surveyls_email_remind><![CDATA[Dear {FIRSTNAME},
+
+Recently we invited you to participate in a survey.
+
+We note that you have not yet completed the survey, and wish to remind you that the survey is still available should you wish to take part.
+
+The survey is titled:
+"{SURVEYNAME}"
+
+"{SURVEYDESCRIPTION}"
+
+To participate, please click on the link below.
+
+Sincerely,
+
+{ADMINNAME} ({ADMINEMAIL})
+
+----------------------------------------------
+Click here to do the survey:
+{SURVEYURL}
+
+If you do not want to participate in this survey and don't want to receive any more invitations please click the following link:
+{OPTOUTURL}]]></surveyls_email_remind>
+    <surveyls_email_register_subj><![CDATA[Survey registration confirmation]]></surveyls_email_register_subj>
+    <surveyls_email_register><![CDATA[Dear {FIRSTNAME},
+
+You, or someone using your email address, have registered to participate in an online survey titled {SURVEYNAME}.
+
+To complete this survey, click on the following URL:
+
+{SURVEYURL}
+
+If you have any questions about this survey, or if you did not register to participate and believe this email is in error, please contact {ADMINNAME} at {ADMINEMAIL}.]]></surveyls_email_register>
+    <surveyls_email_confirm_subj><![CDATA[Confirmation of your participation in our survey]]></surveyls_email_confirm_subj>
+    <surveyls_email_confirm><![CDATA[Dear {FIRSTNAME},
+
+this email is to confirm that you have completed the survey titled {SURVEYNAME} and your response has been saved. Thank you for participating.
+
+If you have any further questions about this email, please contact {ADMINNAME} on {ADMINEMAIL}.
+
+Sincerely,
+
+{ADMINNAME}]]></surveyls_email_confirm>
+    <surveyls_dateformat><![CDATA[9]]></surveyls_dateformat>
+    <email_admin_notification_subj><![CDATA[Response submission for survey {SURVEYNAME}]]></email_admin_notification_subj>
+    <email_admin_notification><![CDATA[Hello,
+
+A new response was submitted for your survey '{SURVEYNAME}'.
+
+Click the following link to see the individual response:
+{VIEWRESPONSEURL}
+
+Click the following link to edit the individual response:
+{EDITRESPONSEURL}
+
+View statistics by clicking here:
+{STATISTICSURL}]]></email_admin_notification>
+    <email_admin_responses_subj><![CDATA[Response submission for survey {SURVEYNAME} with results]]></email_admin_responses_subj>
+    <email_admin_responses><![CDATA[Hello,
+
+A new response was submitted for your survey '{SURVEYNAME}'.
+
+Click the following link to see the individual response:
+{VIEWRESPONSEURL}
+
+Click the following link to edit the individual response:
+{EDITRESPONSEURL}
+
+View statistics by clicking here:
+{STATISTICSURL}
+
+
+The following answers were given by the participant:
+{ANSWERTABLE}]]></email_admin_responses>
+    <surveyls_numberformat><![CDATA[0]]></surveyls_numberformat>
+   </row>
+  </rows>
+ </surveys_languagesettings>
+ <themes>
+  <theme>
+   <sid>251297</sid>
+   <template_name>vanilla</template_name>
+   <config>
+    <options>inherit</options>
+   </config>
+  </theme>
+ </themes>
+ <themes_inherited>
+  <theme>
+   <sid>251297</sid>
+   <template_name>vanilla</template_name>
+   <config>
+    <options>
+     <ajaxmode>off</ajaxmode>
+     <brandlogo>on</brandlogo>
+     <container>on</container>
+     <hideprivacyinfo>off</hideprivacyinfo>
+     <brandlogofile>./files/logo.png</brandlogofile>
+     <font>noto</font>
+    </options>
+   </config>
+  </theme>
+ </themes_inherited>
+</document>
diff --git a/tests/unit/helpers/RemoteControlTest.php b/tests/unit/helpers/RemoteControlTest.php
index f425af6f788..21cde7ae0fc 100644
--- a/tests/unit/helpers/RemoteControlTest.php
+++ b/tests/unit/helpers/RemoteControlTest.php
@@ -285,4 +285,66 @@ public function testGetGroupProperties()
         $this->assertEquals('Das Deutsch title', $result['group_name']);
     }
 
+    /**
+     * Test the import_group API call.
+     */
+    public function testImportGroup()
+    {
+        \Yii::import('application.helpers.remotecontrol.remotecontrol_handle', true);
+        \Yii::import('application.helpers.viewHelper', true);
+        \Yii::import('application.libraries.BigData', true);
+        $dbo = \Yii::app()->getDb();
+
+        // Make sure the Authdb is in database (might not be the case if no browser login attempt has been made).
+        $plugin = \Plugin::model()->findByAttributes(array('name'=>'Authdb'));
+        if (!$plugin) {
+            $plugin = new \Plugin();
+            $plugin->name = 'Authdb';
+            $plugin->active = 1;
+            $plugin->save();
+        } else {
+            $plugin->active = 1;
+            $plugin->save();
+        }
+        App()->getPluginManager()->loadPlugin('Authdb', $plugin->id);
+        // Clear login attempts.
+        $query = sprintf('DELETE FROM {{failed_login_attempts}}');
+        $dbo->createCommand($query)->execute();
+
+        // Import survey
+        $filename = self::$surveysFolder . '/limesurvey_survey_251297_import_group.lss';
+        self::importSurvey($filename);
+
+        // Create handler.
+        $admin   = new \AdminController('dummyid');
+        $handler = new \remotecontrol_handle($admin);
+
+        // Get session key.
+        $sessionKey = $handler->get_session_key(
+            self::$username,
+            self::$password
+        );
+        $this->assertNotEquals(['status' => 'Invalid user name or password'], $sessionKey);
+
+        $groupFileName = BASEPATH . '../tests/data/file_upload/limesurvey_group_472.lsg';
+        $groupData = base64_encode(file_get_contents($groupFileName));
+
+        $result = $handler->import_group(
+            $sessionKey,
+            self::$surveyId,
+            $groupData,
+            'lsg',
+        );
+
+        $this->assertIsNumeric($result, '$result = ' . json_encode($result));
+
+        $oGroup = \QuestionGroup::model()->findByPk($result);
+
+        $this->assertNotEmpty($oGroup, "Imported group not found");
+
+        // Cleanup
+        self::$testSurvey->delete();
+        self::$testSurvey = null;
+    }
+
 }

From 775a27bc97028e26ab778d58f8f9002a48df3083 Mon Sep 17 00:00:00 2001
From: GabrielJenik <gabriel.jenik@gmail.com>
Date: Tue, 29 Dec 2020 15:54:53 -0300
Subject: [PATCH 2/2] Fixed issue #16474: Remote control import_group broken

Changed how to load library to avoid duplicated: Rollback on TestHelper and Updated on RemoteControl Handle.
---
 application/helpers/remotecontrol/remotecontrol_handle.php | 2 +-
 tests/TestHelper.php                                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/helpers/remotecontrol/remotecontrol_handle.php b/application/helpers/remotecontrol/remotecontrol_handle.php
index 287fc8f8948..3a755321dc1 100644
--- a/application/helpers/remotecontrol/remotecontrol_handle.php
+++ b/application/helpers/remotecontrol/remotecontrol_handle.php
@@ -1109,7 +1109,7 @@ public function import_group($sSessionKey, $iSurveyID, $sImportData, $sImportDat
                     return array('status' => 'Invalid extension');
                 }
                 libxml_use_internal_errors(true);
-                Yii::app()->loadHelper('admin/import');
+                Yii::app()->loadHelper('admin.import');
                 // First save the data to a temporary file
                 $sFullFilePath = Yii::app()->getConfig('tempdir').DIRECTORY_SEPARATOR.randomChars(40).'.'.$sImportDataType;
                 file_put_contents($sFullFilePath, base64_decode(chunk_split($sImportData)));
diff --git a/tests/TestHelper.php b/tests/TestHelper.php
index cb2eaf70c0f..896d17a7c56 100644
--- a/tests/TestHelper.php
+++ b/tests/TestHelper.php
@@ -26,7 +26,7 @@ public function importAll()
         \Yii::import('application.helpers.common_helper', true);
         \Yii::import('application.helpers.replacements_helper', true);
         \Yii::import('application.helpers.surveytranslator_helper', true);
-        \Yii::app()->loadHelper('admin/import');
+        \Yii::import('application.helpers.admin.import_helper', true);
         \Yii::import('application.helpers.expressions.em_manager_helper', true);
         \Yii::import('application.helpers.expressions.em_manager_helper', true);
         \Yii::import('application.helpers.qanda_helper', true);