From cf45b5778b56a073d9f8dd13db4f1a3005812fe3 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 12 Sep 2022 13:20:31 +0200
Subject: [PATCH] GDPR - popravek napake pri oddaji zahtevka (hash ankete),
 GDPR zahtevki - dokoncan v2

---
 admin/survey/classes/class.GDPR.php           | 71 +++++++++++--------
 public/css/admin_new.css                      |  3 -
 .../pages/gdpr_pages/gdpr_tables.scss         |  5 +-
 3 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index de771ae9f..3795ee7bc 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -1813,10 +1813,10 @@ class GDPR{
 		else
 			$note = $request_data['gdpr-note'];
 		
-		
+
 		// Ce imamo vse potrebne podatke posredujemo zahtevo
 		if(empty($errors)){
-			
+
 			// Zabelezimo zahtevo v bazo
 			$sql = sisplet_query("INSERT INTO srv_gdpr_requests
 										(usr_id, ank_id, email, url, datum, text, type)
@@ -1870,7 +1870,7 @@ class GDPR{
 			}
 								
 			// Posljemo mail avtorju ankete in na help@1ka.si za obvestilo adminu
-			try{
+			/*try{
 				$MA = new MailAdapter();
 				$MA->addRecipients($survey_data['author_email']);
 				
@@ -1889,7 +1889,7 @@ class GDPR{
 				$resultX = $MA->sendMail($content, $subject);
 		    }
 		    catch (Exception $e){
-		    }			
+		    }	*/		
 			
 			// Vrnemo vse ok
             if($jezik == '2'){
@@ -1927,42 +1927,57 @@ class GDPR{
 			
 			// Pridobimo id ankete iz url-ja
 			if($arr[1] == 'a'){
-				$data['ank_id'] = $arr[2];
+				$data['hash'] = $arr[2];
+
+                // Dobimo id ankete iz hasha
+                $sql = sisplet_query("SELECT a.id AS ank_id, a.naslov, u.id AS usr_id, u.lang, u.email 
+                                        FROM srv_anketa a, users u 
+                                        WHERE a.hash='".$data['hash']."' AND u.id=a.insert_uid
+                                    ");
+                                    
+                // Anekta ne obstaja - nepravilen url
+				if(mysqli_num_rows($sql) == 0)
+                    return false;
+
+				$row = mysqli_fetch_array($sql);		
+
+			    $data['url'] = $site_url.'a/'.$data['hash'];
+
+				$data['ank_id'] = $row['ank_id'];
+                $data['title'] = $row['naslov'];
+				$data['usr_id'] = $row['usr_id'];
+				$data['usr_lang'] = $row['lang'];
+				$data['author_email'] = $row['email'];
 			}
 			else{
 				// Preverimo ce imamo mogoce lep url
 				$nice_url = $arr[1];
 				
-				$sqlN = sisplet_query("SELECT ank_id, link FROM srv_nice_links WHERE link='".$nice_url."'");
-				if(mysqli_num_rows($sqlN) > 0){
-					$rowN = mysqli_fetch_array($sqlN);		
-					$data['ank_id'] = $rowN['ank_id'];
-				}
-				else
-					return false;
-			}
-		
-			// Nastavimo url ankete
-			$data['url'] = $site_url.'a/'.$data['ank_id'];
-			
-			// Pridobimo avtorja in naslov ankete
-			$sql = sisplet_query("SELECT a.naslov, u.id, u.lang, u.email
-									FROM srv_anketa a, users u
-									WHERE a.hash='".$data['ank_id']."' AND u.id=a.insert_uid");
-			if(mysqli_num_rows($sql) == 1){
-				$row = mysqli_fetch_array($sql);
-				
-				$data['title'] = $row['naslov'];
-				$data['usr_id'] = $row['id'];
+				$sql = sisplet_query("SELECT a.id AS ank_id, a.hash, a.naslov, u.id AS usr_id, u.lang, u.email
+                                        FROM srv_anketa a, srv_nice_links nl, users u
+                                        WHERE nl.link='".$nice_url."' AND nl.ank_id=a.id AND u.id=a.insert_uid
+                                    ");
+
+                // Anekta ne obstaja - nepravilen url
+				if(mysqli_num_rows($sql) == 0)
+                    return false;
+
+				$row = mysqli_fetch_array($sql);		
+
+                $data['url'] = $site_url.'/'.$nice_url;
+
+				$data['ank_id'] = $row['ank_id'];
+				$data['hash'] = $row['hash'];
+                $data['title'] = $row['naslov'];
+				$data['usr_id'] = $row['usr_id'];
 				$data['usr_lang'] = $row['lang'];
 				$data['author_email'] = $row['email'];
 			}
-			else
-				return false;
 		}
 		else
 			return false;
 		
+            
 		if(isset($data['ank_id']) && isset($data['usr_id']) && isset($data['title']) && isset($data['url']) && isset($data['author_email']))
 			return $data;
 		else
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 5c7f3532f..c3157efd7 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -11231,9 +11231,6 @@ table.gdpr_surveys.requests {
 table.gdpr_surveys.requests td div.gdpr_requests_wrap {
   max-width: 204px;
   min-width: 204px;
-  /*overflow-wrap: break-word;
-  white-space: normal;
-  padding: 8px 0px;*/
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
diff --git a/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss b/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss
index 94a13b377..04fb323c7 100644
--- a/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss
+++ b/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss
@@ -25,7 +25,7 @@ table.gdpr_surveys {
     }
 
     th,
-    td, {
+    td{
         border: 1px solid #E5E5E5;
     }
 
@@ -60,9 +60,6 @@ table.gdpr_surveys {
                 &.gdpr_requests_wrap {
                     max-width: 204px;
                     min-width: 204px;
-                    /*overflow-wrap: break-word;
-                    white-space: normal;
-                    padding: 8px 0px;*/
 
                     white-space: nowrap;
                     overflow: hidden;