QE-903: Fixed a bug

LimeSurvey · May 15, 2024 · 4d913ec · 4d913ec
1 parent e11d3cc
commit 4d913ec
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 23 deletions.
diff --git a/application/controllers/SurveyAdministrationController.php b/application/controllers/SurveyAdministrationController.php
@@ -1592,29 +1592,53 @@ public function actionDeactivate()
             LimeSurvey\Models\Services\SurveyDeactivate::class
         );
 
-        try {
-            $result = $surveyDeactivate->deactivate($iSurveyID, Yii::app()->request->getPost('ok'));
-        } catch (Exception $e) {
-            App()->user->setFlash('error', $e->getMessage());
-        }
+        $aData = array();
 
-        if (!empty($result["beforeDeactivate"]["message"])) {
-            Yii::app()->user->setFlash('error', $result["beforeDeactivate"]["message"]);
-        }
-        if ($result["beforeDeactivate"]["message"] === false) {
-            // @todo: What if two plugins change this?
-            $aData = [];
-            $aData['nostep'] = true;
-            $this->aData = $aData;
+        $datestamp = time();
+        $date = date('YmdHis', $datestamp); //'His' adds 24hours+minutes to name to allow multiple deactiviations in a day
+        $survey = Survey::model()->findByPk($iSurveyID);
+        $aData['aSurveysettings'] = getSurveyInfo($iSurveyID);
+        $aData['surveyid'] = $iSurveyID;
+        $aData['sid'] = $iSurveyID;
+        $aData['title_bar']['title'] = $survey->currentLanguageSettings->surveyls_title . " (" . gT("ID") . ":" . $iSurveyID . ")";
+        $aData['topBar']['hide'] = true;
+        $ok = Yii::app()->request->getPost('ok');
+
+        if ($ok == '') {
+            if (!empty(Yii::app()->session->get('sNewSurveyTableName'))) {
+                Yii::app()->session->remove('sNewSurveyTableName');
+            }
+
+            Yii::app()->session->add('sNewSurveyTableName', Yii::app()->db->tablePrefix . "old_survey_{$iSurveyID}_{$date}");
+            $aData['date'] = $date;
+            $aData['dbprefix'] = Yii::app()->db->tablePrefix;
+            $aData['sNewSurveyTableName'] = Yii::app()->session->get('sNewSurveyTableName');
+            $aData['step1'] = true;
         } else {
-            if (!$result["surveyTableExists"]) {
-                $_SESSION['flashmessage'] = gT("Error: Response table does not exist. Survey cannot be deactivated.");
-                $this->redirect($this->createUrl("surveyAdministration/view/surveyid/{$iSurveyID}"));
+            try {
+                $result = $surveyDeactivate->deactivate($iSurveyID, ['ok' => $ok]);
+            } catch (Exception $e) {
+                App()->user->setFlash('error', $e->getMessage());
             }
 
-            $aData = $result['aData'];
+            if (!empty($result["beforeDeactivate"]["message"])) {
+                Yii::app()->user->setFlash('error', $result["beforeDeactivate"]["message"]);
+            }
+            if ($result["beforeDeactivate"]["message"] === false) {
+                // @todo: What if two plugins change this?
+                $aData = [];
+                $aData['nostep'] = true;
+                $this->aData = $aData;
+            } else {
+                if (!$result["surveyTableExists"]) {
+                    $_SESSION['flashmessage'] = gT("Error: Response table does not exist. Survey cannot be deactivated.");
+                    $this->redirect($this->createUrl("surveyAdministration/view/surveyid/{$iSurveyID}"));
+                }
 
-            $aData['sidemenu']['state'] = false;
+                $aData = $result['aData'];
+
+                $aData['sidemenu']['state'] = false;
+            }
         }
 
         $this->aData = $aData;

diff --git a/application/libraries/Api/Command/V1/SurveyPatch/OpHandlerSurveyDeactivate.php b/application/libraries/Api/Command/V1/SurveyPatch/OpHandlerSurveyDeactivate.php
@@ -53,7 +53,7 @@ public function handle(OpInterface $op)
         $surveyDeactivateService = $diContainer->get(
             SurveyAggregateService::class
         );
-        $surveyDeactivateService->deactivate($op->getEntityId());
+        $surveyDeactivateService->deactivate($op->getEntityId(), $op->getProps());
     }
 
     /**

diff --git a/application/models/services/SurveyAggregateService.php b/application/models/services/SurveyAggregateService.php
@@ -125,10 +125,11 @@ public function activate($surveyId, $input)
      * Deactivate
      *
      * @param int $surveyId
+     * @param array $input
      * @return array
      */
-    public function deactivate($surveyId)
+    public function deactivate($surveyId, $input)
     {
-        return $this->surveyDeactivate->deactivate($surveyId);
+        return $this->surveyDeactivate->deactivate($surveyId, $input);
     }
 }
diff --git a/application/models/services/SurveyDeactivate.php b/application/models/services/SurveyDeactivate.php
@@ -46,7 +46,7 @@ public function __construct(
      * @return array
      * @throws PermissionDeniedException
      */
-    public function deactivate(int $iSurveyID, $isOk = [])
+    public function deactivate(int $iSurveyID, $params = [])
     {
         if (!$this->permission->hasSurveyPermission($iSurveyID, 'surveyactivation', 'update')) {
             throw new PermissionDeniedException(
@@ -78,7 +78,7 @@ public function deactivate(int $iSurveyID, $isOk = [])
         if (!$result["surveyTableExists"]) {
             return $result;
         }
-        if ($isOk) {
+        if (!is_array($params) || (($params['ok'] ?? '') == '')) {
             if (!empty($this->app->session->get('sNewSurveyTableName'))) {
                 $this->app->session->remove('sNewSurveyTableName');
             }