From aeebffe2965c5465e7171e7024cc25c254abd9cb Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Wed, 19 Aug 2020 12:17:24 +0200
Subject: [PATCH] Predogled gdpr porocil je na voljo v vseh paketih

---
 admin/survey/classes/class.GDPR.php | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index 16d2a633d..9530e412d 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -888,15 +888,16 @@ class GDPR{
 
         echo '	<br />';
 
+        echo '<a href="#" onClick="previewGDPRExport(\'1\'); return false;"><span class="faicon preview"></span>'.$lang['srv_poglejanketo2'].'</a>';
+        echo '	<br />';
+
         // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
         $userAccess = UserAccess::getInstance($global_user_id);
 
         if(!$userAccess->checkUserAccess($what='gdpr_export')){
             $userAccess->displayNoAccess($what='gdpr_export');
         }
-        else{
-            echo '<a href="#" onClick="previewGDPRExport(\'1\'); return false;"><span class="faicon preview"></span>'.$lang['srv_poglejanketo2'].'</a>';
-            echo '	<br />';
+        else{    
             echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_individual&anketa='.$ank_id).'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
             echo '	<br />';
             echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_individual&anketa='.$ank_id).'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - (Microsoft Word)</a>';
@@ -916,12 +917,13 @@ class GDPR{
 
         echo '	<br />';
 
+        echo '<a href="#" onClick="previewGDPRExport(\'2\'); return false;"><span class="faicon preview"></span>'.$lang['srv_poglejanketo2'].'</a>';
+        echo '	<br />';
+
         if(!$userAccess->checkUserAccess($what='gdpr_export')){
             $userAccess->displayNoAccess($what='gdpr_export');
         }
-        else{
-            echo '<a href="#" onClick="previewGDPRExport(\'2\'); return false;"><span class="faicon preview"></span>'.$lang['srv_poglejanketo2'].'</a>';
-            echo '	<br />';
+        else{     
             echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_activity&anketa='.$ank_id).'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
             echo '	<br />';
             echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_activity&anketa='.$ank_id).'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - (Microsoft Word)</a>';
@@ -930,18 +932,6 @@ class GDPR{
         echo '	<br /><br />';
 
         echo '</fieldset>';
-        
-
-
-		// Prošnje za izbris za posamezno anketo - zaenkrat to ugasnemo
-		/*echo '<fieldset class="wide">';
-		echo '<legend>'.$lang['srv_gdpr_requests'].'</legend>';
-
-		echo '<div id="survey_requests">';
-		self::displayGDPRSurveyRequests($ank_id);
-		echo '</div>';
-
-		echo '</fieldset>';*/
 	}
 
 	// Prikazemo vsebino zavihka gdpr - nastavitve posamezne ankete