From 75160b12821f7f4299cce7f0b69c83c1502ae071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= <anton@sijanec.eu>
Date: Mon, 27 May 2024 13:08:29 +0200
Subject: 2024-02-19 upstream

---
 admin/exportclases/class.xlsIzvozAnalizaSums.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'admin/exportclases/class.xlsIzvozAnalizaSums.php')

diff --git a/admin/exportclases/class.xlsIzvozAnalizaSums.php b/admin/exportclases/class.xlsIzvozAnalizaSums.php
index 18c70c5..df61764 100644
--- a/admin/exportclases/class.xlsIzvozAnalizaSums.php
+++ b/admin/exportclases/class.xlsIzvozAnalizaSums.php
@@ -105,7 +105,7 @@ class XlsIzvozAnalizaSums {
 		
 		$output = $convertTypes['BOMchar'];
 
-		$output .= '<table border="0"><tr><td colspan="10"><font size="3"><b>'.$lang['export_analisys_sums'].'</b></font></td></tr></table>';
+		$output .= '<table border="0"><tr><td colspan="10"><font size="3"><b>'.$lang['export_analisys_sums'].' - '.SurveyInfo::getSurveyTitle().'</b></font></td></tr></table>';
 									
 		# preberemo header
 		if ($this->headFileName !== null) {
@@ -1962,8 +1962,9 @@ class XlsIzvozAnalizaSums {
 					$maxAnswer = (SurveyDataSettingProfiles :: getSetting('numOpenAnswers') > 0) ? SurveyDataSettingProfiles :: getSetting('numOpenAnswers') : 30;
 					$counter = 0;
 					$_kumulativa = 0;
+
 					//SurveyAnalysis::$_FREQUENCYS[$_sequence]
-					if (count(SurveyAnalysis::$_FREQUENCYS[$_sequence]['valid'])> 0 ) {
+					if (is_countable(SurveyAnalysis::$_FREQUENCYS[$_sequence]['valid']) && count(SurveyAnalysis::$_FREQUENCYS[$_sequence]['valid'])> 0 ) {
 
 						$_valid_answers = SurveyAnalysis :: sortTextValidAnswers($spid,$variable,SurveyAnalysis::$_FREQUENCYS[$_sequence]['valid']);
 						
@@ -1978,6 +1979,7 @@ class XlsIzvozAnalizaSums {
 						# izpišemo sumo veljavnih
 						$counter = self::outputSumaValidAnswerVertical($counter,$_sequence,$spid,$options);
 					}
+					
 					if (count(SurveyAnalysis::$_FREQUENCYS[$_sequence]['invalid'])> 0 ) {
 						foreach (SurveyAnalysis::$_FREQUENCYS[$_sequence]['invalid'] AS $ikey => $iAnswer) {
 							if ($iAnswer['cnt'] > 0 ) { # izpisujemo samo tiste ki nisno 0
@@ -2258,7 +2260,7 @@ class XlsIzvozAnalizaSums {
 
 		$counter = 1;
 		$_kumulativa = 0;
-		if (count(SurveyAnalysis::$_FREQUENCYS[$_sequence]['valid'])> 0 ) {
+		if (is_countable(SurveyAnalysis::$_FREQUENCYS[$_sequence]['valid']) && count(SurveyAnalysis::$_FREQUENCYS[$_sequence]['valid']) > 0 ) {
 			foreach (SurveyAnalysis::$_FREQUENCYS[$_sequence]['valid'] AS $vkey => $vAnswer) {
 				if ($vAnswer['cnt'] > 0 ) { # izpisujemo samo tiste ki nisno 0
 					$counter = self::outputValidAnswerVertical($counter,$vkey,$vAnswer,$_sequence,$spid,$_kumulativa,array('isOtherAnswer'=>true));
-- 
cgit v1.2.3