From 13f372f4da40dcdce8162ffdabe9f4d888c82e7d Mon Sep 17 00:00:00 2001 From: pero1203 Date: Wed, 6 Oct 2021 11:30:48 +0200 Subject: [PATCH] Popravek buga - gdpr popup v staticnem uvodu --- .../survey/app/Controllers/BodyController.php | 19 ++++++++++++++++++- main/survey/app/Controllers/InitClass.php | 3 ++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/main/survey/app/Controllers/BodyController.php b/main/survey/app/Controllers/BodyController.php index b7fa27564..90e574af3 100644 --- a/main/survey/app/Controllers/BodyController.php +++ b/main/survey/app/Controllers/BodyController.php @@ -445,7 +445,6 @@ class BodyController extends Controller ************************************************/ public function displayStaticIntroduction() { - $row = SurveyInfo::getInstance()->getSurveyRow(); // datapiping @@ -459,6 +458,24 @@ class BodyController extends Controller elseif (isset($_GET['mobile']) && $_GET['mobile'] == 2) $class .= ' tablet_preview'; + + // Spremenljivke, ki se rabijo v JS + echo ' ' . "\n"; + + + // crn div za ozadje popupov + echo '
'; + echo ''; + echo '
'; echo '
'; diff --git a/main/survey/app/Controllers/InitClass.php b/main/survey/app/Controllers/InitClass.php index a5d2e7aef..a3913fdf2 100644 --- a/main/survey/app/Controllers/InitClass.php +++ b/main/survey/app/Controllers/InitClass.php @@ -148,7 +148,8 @@ class InitClass extends Controller Body::getInstance()->displayStaticIntroduction(); die(); - } // Ce imamo staticen uvod s captcho in smo kliknili na naslednjo stran, najprej preverimo captcho + } + // Ce imamo staticen uvod s captcho in smo kliknili na naslednjo stran, najprej preverimo captcho elseif ($rowa['intro_static'] == 2 && $rowa['show_intro'] == 1 && count($_POST) != 0 && isset($_GET['grupa']) && $_GET['grupa'] == '0') { Check::getInstance()->check_captcha_intro(); }