From 9acba2b0714e4375088df2253a6c0672c40b78ed Mon Sep 17 00:00:00 2001 From: MAY Date: Thu, 12 Jan 2023 14:55:10 +0100 Subject: [PATCH] =?UTF-8?q?=C5=A0e=20malo=20=C4=8Di=C5=A1=C4=8Denja...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/exportclases/class.pptIzvozHeatmapImage.php | 7 ++++--- admin/survey/classes/class.SurveyLanguageTechnology.php | 2 +- .../survey/classes/surveyEmails/squalo/class.SqualoApi.php | 4 ++-- frontend/api/api_test.php | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/admin/exportclases/class.pptIzvozHeatmapImage.php b/admin/exportclases/class.pptIzvozHeatmapImage.php index 6c5791329..f86a504ba 100644 --- a/admin/exportclases/class.pptIzvozHeatmapImage.php +++ b/admin/exportclases/class.pptIzvozHeatmapImage.php @@ -12,7 +12,7 @@ use PhpOffice\PhpPresentation\PhpPresentation; use PhpOffice\PhpPresentation\IOFactory; use PhpOffice\PhpPresentation\Style\Color; - use PhpOffice\PhpPresentation\Style\Alignment; + use PhpOffice\PhpPresentation\Style\Alignment; define("ALLOW_HIDE_ZERRO_REGULAR", false); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za navadne odgovore define("ALLOW_HIDE_ZERRO_MISSING", true); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za missinge @@ -85,6 +85,7 @@ class pptIzvozHeatmapImage { // preberemo nastavitve iz baze (prej v sessionu) SurveyUserSession::Init($this->anketa); $this->sessionData = SurveyUserSession::getData('charts'); + } else { @@ -97,8 +98,8 @@ class pptIzvozHeatmapImage { $this->skin = SurveyUserSetting :: getInstance()->getSettings('default_chart_profile_skin'); $this->numbering = SurveyDataSettingProfiles :: getSetting('chartNumbering'); $this->frontpage = SurveyDataSettingProfiles :: getSetting('chartFP'); - } - else { + + } else { return false; } diff --git a/admin/survey/classes/class.SurveyLanguageTechnology.php b/admin/survey/classes/class.SurveyLanguageTechnology.php index 9628d8965..6a6abd2ff 100644 --- a/admin/survey/classes/class.SurveyLanguageTechnology.php +++ b/admin/survey/classes/class.SurveyLanguageTechnology.php @@ -284,7 +284,7 @@ class SurveyLanguageTechnology { curl_setopt($curl, CURLOPT_FAILONERROR, TRUE); // Removes the headers from the output curl_setopt($curl, CURLOPT_HEADER, 0); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, TRUE); // Return the output instead of displaying it directly curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 5); diff --git a/admin/survey/classes/surveyEmails/squalo/class.SqualoApi.php b/admin/survey/classes/surveyEmails/squalo/class.SqualoApi.php index 77a78f434..cf2092188 100644 --- a/admin/survey/classes/surveyEmails/squalo/class.SqualoApi.php +++ b/admin/survey/classes/surveyEmails/squalo/class.SqualoApi.php @@ -75,8 +75,8 @@ class SqualoApi { curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // for debug only! - curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, TRUE); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, TRUE); $headers = array( "Content-Type: application/json", diff --git a/frontend/api/api_test.php b/frontend/api/api_test.php index f57d01cfc..87fddeeae 100644 --- a/frontend/api/api_test.php +++ b/frontend/api/api_test.php @@ -119,7 +119,7 @@ function executePOST(){ curl_setopt($ch, CURLOPT_HEADER ,1); curl_setopt($ch, CURLOPT_FOLLOWLOCATION ,1); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1); curl_setopt($ch, CURLINFO_HEADER_OUT, true); /*$cookie_file = 'cookie.txt'; curl_setopt ($ch, CURLOPT_COOKIEFILE, $cookie_file);