diff --git a/admin/survey/modules/mod_kakovost/class.SurveyKakovost.php b/admin/survey/modules/mod_kakovost/class.SurveyKakovost.php index 215e6d6ac..8b4620d37 100644 --- a/admin/survey/modules/mod_kakovost/class.SurveyKakovost.php +++ b/admin/survey/modules/mod_kakovost/class.SurveyKakovost.php @@ -630,7 +630,7 @@ class SurveyKakovost{ // Vrstice s podatki - $sql = sisplet_query("SELECT s.id, s.gru_id, s.variable, s.tip, s.vrstni_red, s.size, s.visible, s.params, CHAR_LENGTH(s.naslov) AS char_count + $sql = sisplet_query("SELECT s.id, s.gru_id, s.variable, s.tip, s.vrstni_red, s.size, s.visible, s.params, s.naslov FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='".$this->anketa."' ORDER BY g.vrstni_red, s.vrstni_red"); @@ -658,7 +658,9 @@ class SurveyKakovost{ $line .= str_replace("\n", '', str_replace(delimiter, '', $row['params']) ).delimiter; - $line .= $row['char_count'].delimiter; + $naslov_clean = iconv("UTF-8","Windows-1250//TRANSLIT", $row['naslov']); + $naslov_clean = trim(strip_tags($naslov_clean)); + $line .= strlen($naslov_clean).delimiter; fwrite($fd, $line."\r\n"); } @@ -694,10 +696,9 @@ class SurveyKakovost{ $output .= 'char_count'.delimiter; fwrite($fd, $output."\r\n"); - - + // Vrstice s podatki - $sql = sisplet_query("SELECT v.id, v.spr_id, v.variable, v.variable_custom, v.vrstni_red, CHAR_LENGTH(v.naslov) AS char_count + $sql = sisplet_query("SELECT v.id, v.spr_id, v.variable, v.variable_custom, v.vrstni_red, v.naslov FROM srv_vrednost v, srv_spremenljivka s, srv_grupa g WHERE v.spr_id=s.id AND s.gru_id=g.id AND g.ank_id='".$this->anketa."' ORDER BY g.vrstni_red, s.vrstni_red"); @@ -716,7 +717,9 @@ class SurveyKakovost{ $line .= $row['variable_custom'].delimiter; $line .= $row['vrstni_red'].delimiter; - $line .= $row['char_count'].delimiter; + $naslov_clean = iconv("UTF-8","Windows-1250//TRANSLIT", $row['naslov']); + $naslov_clean = trim(strip_tags($naslov_clean)); + $line .= strlen($naslov_clean).delimiter; fwrite($fd, $line."\r\n"); }