may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GDPR - popravek napake pri oddaji zahtevka (hash ankete), GDPR zahtevki - dokoncan v2

Browse Source
This commit is contained in:
pero1203 2022-09-12 13:20:31 +02:00
parent 85fda0c59c
commit cf45b5778b
3 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
admin/survey/classes/class.GDPR.php
View File

@ -1813,10 +1813,10 @@ class GDPR{
else else
$note = $request_data['gdpr-note']; $note = $request_data['gdpr-note'];
// Ce imamo vse potrebne podatke posredujemo zahtevo // Ce imamo vse potrebne podatke posredujemo zahtevo
if(empty($errors)){ if(empty($errors)){
// Zabelezimo zahtevo v bazo // Zabelezimo zahtevo v bazo
$sql = sisplet_query("INSERT INTO srv_gdpr_requests $sql = sisplet_query("INSERT INTO srv_gdpr_requests
(usr_id, ank_id, email, url, datum, text, type) (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 // Posljemo mail avtorju ankete in na help@1ka.si za obvestilo adminu
try{ /*try{
$MA = new MailAdapter(); $MA = new MailAdapter();
$MA->addRecipients($survey_data['author_email']); $MA->addRecipients($survey_data['author_email']);
@ -1889,7 +1889,7 @@ class GDPR{
$resultX = $MA->sendMail($content, $subject); $resultX = $MA->sendMail($content, $subject);
} }
catch (Exception $e){ catch (Exception $e){
} } */
// Vrnemo vse ok // Vrnemo vse ok
if($jezik == '2'){ if($jezik == '2'){
@ -1927,42 +1927,57 @@ class GDPR{
// Pridobimo id ankete iz url-ja // Pridobimo id ankete iz url-ja
if($arr[1] == 'a'){ 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{ else{
// Preverimo ce imamo mogoce lep url // Preverimo ce imamo mogoce lep url
$nice_url = $arr[1]; $nice_url = $arr[1];
$sqlN = sisplet_query("SELECT ank_id, link FROM srv_nice_links WHERE link='".$nice_url."'"); $sql = sisplet_query("SELECT a.id AS ank_id, a.hash, a.naslov, u.id AS usr_id, u.lang, u.email
if(mysqli_num_rows($sqlN) > 0){ FROM srv_anketa a, srv_nice_links nl, users u
$rowN = mysqli_fetch_array($sqlN); WHERE nl.link='".$nice_url."' AND nl.ank_id=a.id AND u.id=a.insert_uid
$data['ank_id'] = $rowN['ank_id']; ");
}
else // Anekta ne obstaja - nepravilen url
return false; if(mysqli_num_rows($sql) == 0)
} return false;
// Nastavimo url ankete $row = mysqli_fetch_array($sql);
$data['url'] = $site_url.'a/'.$data['ank_id'];
$data['url'] = $site_url.'/'.$nice_url;
// Pridobimo avtorja in naslov ankete
$sql = sisplet_query("SELECT a.naslov, u.id, u.lang, u.email $data['ank_id'] = $row['ank_id'];
FROM srv_anketa a, users u $data['hash'] = $row['hash'];
WHERE a.hash='".$data['ank_id']."' AND u.id=a.insert_uid"); $data['title'] = $row['naslov'];
if(mysqli_num_rows($sql) == 1){ $data['usr_id'] = $row['usr_id'];
$row = mysqli_fetch_array($sql);
$data['title'] = $row['naslov'];
$data['usr_id'] = $row['id'];
$data['usr_lang'] = $row['lang']; $data['usr_lang'] = $row['lang'];
$data['author_email'] = $row['email']; $data['author_email'] = $row['email'];
} }
else
return false;
} }
else else
return false; return false;
if(isset($data['ank_id']) && isset($data['usr_id']) && isset($data['title']) && isset($data['url']) && isset($data['author_email'])) if(isset($data['ank_id']) && isset($data['usr_id']) && isset($data['title']) && isset($data['url']) && isset($data['author_email']))
return $data; return $data;
else else

3
public/css/admin_new.css
View File

@ -11231,9 +11231,6 @@ table.gdpr_surveys.requests {
table.gdpr_surveys.requests td div.gdpr_requests_wrap { table.gdpr_surveys.requests td div.gdpr_requests_wrap {
max-width: 204px; max-width: 204px;
min-width: 204px; min-width: 204px;
/*overflow-wrap: break-word;
white-space: normal;
padding: 8px 0px;*/
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

5
resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss
View File

@ -25,7 +25,7 @@ table.gdpr_surveys {
} }
th, th,
td, { td{
border: 1px solid #E5E5E5; border: 1px solid #E5E5E5;
} }
@ -60,9 +60,6 @@ table.gdpr_surveys {
&.gdpr_requests_wrap { &.gdpr_requests_wrap {
max-width: 204px; max-width: 204px;
min-width: 204px; min-width: 204px;
/*overflow-wrap: break-word;
white-space: normal;
padding: 8px 0px;*/
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;