From dee7fa766ef47c1310bf7799072c2cfd5e4a7233 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 4 Oct 2021 11:49:21 +0200
Subject: [PATCH] Popravki napak zaradi preklopa na hash ankete

---
 admin/survey/SurveyAdminSettings.php                          | 3 ++-
 admin/survey/classes/surveyData/class.SurveyDataDisplay.php   | 2 +-
 .../mod_advanced_paradata/class.SurveyAdvancedParadataLog.php | 4 ++--
 lang/1.php                                                    | 1 +
 lang/2.php                                                    | 1 +
 main/survey/app/Controllers/BodyController.php                | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 5e333f77f..7afa9f41a 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -50,7 +50,8 @@ class SurveyAdminSettings {
 			
 		if ((isset ($_REQUEST['anketa']) && $_REQUEST['anketa'] > 0) || (isset ($anketa) && $anketa > 0)) {
 			$this->anketa = (isset ($_REQUEST['anketa']) && $_REQUEST['anketa'] > 0) ? $_REQUEST['anketa'] : $anketa;
-		} else {
+		} 
+        else {
 			// nekje se uporablja tudi brez IDja ankete!!!
 			//die("SAS: SID missing!");
 		}
diff --git a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
index 1197feb25..343fe4c07 100644
--- a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
+++ b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
@@ -2726,7 +2726,7 @@ class SurveyDataDisplay{
 		if ($quick_view == false) {
 			//echo '<input type="submit" value="Shrani" /> ';<a href="#" onclick="document.forms['myFormName'].submit(); return false;">...</a>
 			echo '<span class="floatRight spaceLeft" ><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="document.forms[\'vnos\'].submit(); return false;"><span>' . $lang['save'] . '</span></a></div></span>';
-			echo '<span class="floatRight spaceRight" ><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="../survey/index.php?anketa='.self::$sid.'&a='.A_COLLECT_DATA.'"><span>Nazaj na podatke</span></a></div></span>';
+			echo '<span class="floatRight spaceRight" ><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="../survey/index.php?anketa='.self::$sid.'&a='.A_COLLECT_DATA.'"><span>' . $lang['srv_back_to_data'] . '</span></a></div></span>';
 
 			#echo '</form>'."\n";
 		}
diff --git a/admin/survey/modules/mod_advanced_paradata/class.SurveyAdvancedParadataLog.php b/admin/survey/modules/mod_advanced_paradata/class.SurveyAdvancedParadataLog.php
index 3294dacfc..1adf09ec5 100644
--- a/admin/survey/modules/mod_advanced_paradata/class.SurveyAdvancedParadataLog.php
+++ b/admin/survey/modules/mod_advanced_paradata/class.SurveyAdvancedParadataLog.php
@@ -19,7 +19,7 @@ class SurveyAdvancedParadataLog {
 	// Privatni construct, ki ga 1x poklice getInstance
 	private function __construct () {
 		
-        if(isset($_GET['m']) && $_GET['m'] == 'quick_edit')
+        if((isset($_GET['m']) && $_GET['m'] == 'quick_edit') || (isset($_GET['t']) && $_GET['t'] == 'postprocess'))
             return false;
             
 		$anketa_hash = $_REQUEST['anketa'];		
@@ -45,7 +45,7 @@ class SurveyAdvancedParadataLog {
 	// Vrne ce zbiramo napredne parapodatke
 	public function paradataEnabled(){
 
-        if(isset($_GET['m']) && $_GET['m'] == 'quick_edit')
+        if((isset($_GET['m']) && $_GET['m'] == 'quick_edit') || (isset($_GET['t']) && $_GET['t'] == 'postprocess'))
             return false;
 
 		return $this->collectParadata;
diff --git a/lang/1.php b/lang/1.php
index 225d4f49d..017feeaae 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -2206,6 +2206,7 @@ $lang = array (
 	"forma_alert_if"		=>	 "V anketi so dodani pogoji!",	
 	"srv_forma_send"		=>	 "Po&#353;lji",
 	"srv_glasovanje_naslov"	=>	 "",
+	"srv_back_to_data"	    =>	 "Nazaj na podatke",
 	"srv_omogoci"			=>	 "Omogo&#269;i",
 	"srv_omogoceno"			=>	 "omogo&#269;ena",
 	"srv_onemogoceno"		=>	 "onemogo&#269;ena",
diff --git a/lang/2.php b/lang/2.php
index 186018694..5ce261af1 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -2192,6 +2192,7 @@ $lang = array (
 	"forma_alert_if"		=>	"This survey includes conditions!",
 	"srv_forma_send"		=>	"Send",
 	"srv_glasovanje_naslov"	=>  "",
+    "srv_back_to_data"	    =>	"Back to data",
 	"srv_omogoci"			=>	"Enable.",
 	"srv_omogoceno"			=>	"enabled",
 	"srv_onemogoceno"		=>	"disabled",
diff --git a/main/survey/app/Controllers/BodyController.php b/main/survey/app/Controllers/BodyController.php
index 25e58d287..b7fa27564 100644
--- a/main/survey/app/Controllers/BodyController.php
+++ b/main/survey/app/Controllers/BodyController.php
@@ -1699,7 +1699,7 @@ class BodyController extends Controller
 
 				// Preverimo ce gre za prvo popravljanje podatkov in avtomatsko ustvarimo arhiv podatkov ce je potrebno
 				//ob_flush();	// ZAKAJ JE TUKAJ TA FLUSH? KER POTEM NE DELA NAKNADNO UREJANJE CE IMA ANKETA LOOPE
-				$sas = new SurveyAdminSettings();
+				$sas = new SurveyAdminSettings($action=0, $anketa=get('anketa'));
 				$sas->checkFirstDataChange();
 
 				// Updatamo tracking (ker gre za editiranje odgovorov)