diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php index 0211672c3..d5a9e612a 100644 --- a/admin/survey/classes/class.GDPR.php +++ b/admin/survey/classes/class.GDPR.php @@ -1540,20 +1540,20 @@ class GDPR{ $naslov = '
'.$lang['srv_gdpr_intro'].':
'; - $naslov .= ''.$lang['srv_gdpr_intro2']; $naslov .= ' '.$lang['srv_gdpr_intro3'].'
'; diff --git a/admin/survey/classes/class.SurveyCheck.php b/admin/survey/classes/class.SurveyCheck.php index ba8715fb9..2e81972ae 100644 --- a/admin/survey/classes/class.SurveyCheck.php +++ b/admin/survey/classes/class.SurveyCheck.php @@ -84,9 +84,10 @@ class SurveyCheck { // Dobimo stevilo odgovorov na anketo $stevilo_odgovorov = SurveyInfo::getInstance()->getSurveyAnswersCount(); + $stevilo_odgovorov_limit = AppSettings::getInstance()->getSetting('app_limits-response_count_limit'); // Obvestilo (mail adminu) posljemo pri dosezeni stevilki - if($stevilo_odgovorov == AppSettings::getInstance()->getSetting('app_limits-response_count_limit')){ + if($stevilo_odgovorov > 0 && $stevilo_odgovorov % $stevilo_odgovorov_limit === 0){ $this->sendAlert($alert_type='limit_responses', $stevilo_odgovorov); // Deaktiviramo anketo, ce je aktivna ? diff --git a/admin/survey/minify/groupsConfig.php b/admin/survey/minify/groupsConfig.php index d66d59c19..cb3c70ab3 100644 --- a/admin/survey/minify/groupsConfig.php +++ b/admin/survey/minify/groupsConfig.php @@ -97,7 +97,8 @@ return [ dirname(__FILE__).'/../script/custom_column_label_respondent.js', dirname(__FILE__).'/../script/ImageHotSpot/imagemap_question_editor.js', dirname(__FILE__).'/../script/ImageHotSpot/imageHotspot.js', - dirname(__FILE__).'/../script/Chartjs/Chart.js', //source za chartjs grafe + + dirname(__FILE__).'/../script/Chartjs/chart.js', //source za chartjs grafe dirname(__FILE__).'/../script/Chartjs.js', dirname(__FILE__).'/../script/jquery/jquery.imagemapster.js', diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php index d015e05fa..571fa1888 100644 --- a/frontend/simple/classes/DisplayController.php +++ b/frontend/simple/classes/DisplayController.php @@ -648,8 +648,6 @@ class DisplayController{ echo '