15 files changed, 52 insertions, 51 deletions

diff --git a/admin/exportclases/class.pdfIzvoz.php b/admin/exportclases/class.pdfIzvoz.php
index 798aff8..4e4e994 100644
--- a/admin/exportclases/class.pdfIzvoz.php
+++ b/admin/exportclases/class.pdfIzvoz.php
@@ -120,8 +120,7 @@ class PdfIzvoz {
 			$this->anketa['uid'] = $global_user_id;

 			SurveyUserSetting::getInstance()->Init($this->anketa['id'], $this->anketa['uid']);

 			

-			if (SurveyInfo::getInstance()->getSurveyColumn('db_table') == 1)

-				$this->db_table = '_active';

+			$this->db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString();

 		}

 		else

 			return false;

diff --git a/admin/exportclases/class.pdfIzvozList.php b/admin/exportclases/class.pdfIzvozList.php
index 363e30a..c3eb032 100644
--- a/admin/exportclases/class.pdfIzvozList.php
+++ b/admin/exportclases/class.pdfIzvozList.php
@@ -212,6 +212,7 @@ class PdfIzvozList {
 		SurveyDataDisplay::$_VARS[VAR_META] = 0;

 		SurveyDataDisplay::$_VARS[VAR_EMAIL] = 0;

 		SurveyDataDisplay::$_VARS[VAR_RELEVANCE] = 0;

+		SurveyDataDisplay::$_VARS[VAR_STATUS] = 0;

 		SurveyDataDisplay::$_VARS[VAR_EDIT] = 0;

 		SurveyDataDisplay::$_VARS[VAR_PRINT] = 0;

 		SurveyDataDisplay::$_VARS[VAR_MONITORING] = 0;

diff --git a/admin/exportclases/class.pdfIzvozResults.php b/admin/exportclases/class.pdfIzvozResults.php
index 13eda1c..408a5f9 100644
--- a/admin/exportclases/class.pdfIzvozResults.php
+++ b/admin/exportclases/class.pdfIzvozResults.php
@@ -146,8 +146,7 @@ class PdfIzvozResults {
 		{

 			SurveyUserSetting::getInstance()->Init($this->anketa['id'], $global_user_id);

 			

-			if (SurveyInfo::getInstance()->getSurveyColumn('db_table') == 1)

-				$this->db_table = '_active';

+			$this->db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString();

 		}

 		else

 			return false;

diff --git a/admin/exportclases/class.rtfIzvoz.php b/admin/exportclases/class.rtfIzvoz.php
index 31c5442..0fdd316 100644
--- a/admin/exportclases/class.rtfIzvoz.php
+++ b/admin/exportclases/class.rtfIzvoz.php
@@ -90,8 +90,7 @@ class RtfIzvoz {
 			$this->anketa['uid'] = $global_user_id;

 			SurveyUserSetting::getInstance()->Init($this->anketa['id'], $this->anketa['uid']);

 

-			if (SurveyInfo::getInstance()->getSurveyColumn('db_table') == 1)

-				$this->db_table = '_active';

+			$this->db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString();

 		}

 		else

 			return false;

diff --git a/admin/exportclases/class.rtfIzvozList.php b/admin/exportclases/class.rtfIzvozList.php
index b156dd5..fc974c7 100644
--- a/admin/exportclases/class.rtfIzvozList.php
+++ b/admin/exportclases/class.rtfIzvozList.php
@@ -159,6 +159,7 @@ class RtfIzvozList {
 		SurveyDataDisplay::$_VARS[VAR_META] = 0;

 		SurveyDataDisplay::$_VARS[VAR_EMAIL] = 0;

 		SurveyDataDisplay::$_VARS[VAR_RELEVANCE] = 0;

+		SurveyDataDisplay::$_VARS[VAR_STATUS] = 0;

 		SurveyDataDisplay::$_VARS[VAR_EDIT] = 0;

 		SurveyDataDisplay::$_VARS[VAR_PRINT] = 0;

 		SurveyDataDisplay::$_VARS[VAR_MONITORING] = 0;

diff --git a/admin/exportclases/class.rtfIzvozResults.php b/admin/exportclases/class.rtfIzvozResults.php
index 31975bb..3fe4340 100644
--- a/admin/exportclases/class.rtfIzvozResults.php
+++ b/admin/exportclases/class.rtfIzvozResults.php
@@ -115,8 +115,7 @@ class RtfIzvozResults {
 		{

 			SurveyUserSetting::getInstance()->Init($this->anketa['id'], $global_user_id);

 			

-			if (SurveyInfo::getInstance()->getSurveyColumn('db_table') == 1)

-				$this->db_table = '_active';

+			$this->db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString();

 		}

 		else

 			return false;

diff --git a/admin/exportclases/class.tcpdf.php b/admin/exportclases/class.tcpdf.php
index 3276560..c461a33 100644
--- a/admin/exportclases/class.tcpdf.php
+++ b/admin/exportclases/class.tcpdf.php
@@ -67,7 +67,7 @@
 // dullus for text Justification.

 // Bob Vincent (pillarsdotnet@users.sourceforge.net) for <li> value attribute.

 // Patrick Benny for text stretch suggestion on Cell().

-// Johannes Güntert for JavaScript support.

+// Johannes G�ntert for JavaScript support.

 // Denis Van Nuffelen for Dynamic Form.

 // Jacek Czekaj for multibyte justification

 // Anthony Ferrara for the reintroduction of legacy image methods.

@@ -78,7 +78,7 @@
 // Mohamad Ali Golkar, Saleh AlMatrafe, Charles Abbott for Arabic and Persian support.

 // Moritz Wagner and Andreas Wurmser for graphic functions.

 // Andrew Whitehead for core fonts support.

-// Esteban Joël Marín for OpenType font conversion.

+// Esteban Jo�l Mar�n for OpenType font conversion.

 // Teus Hagen for several suggestions and fixes.

 // Yukihiro Nakadaira for CID-0 CJK fonts fixes.

 // Kosmas Papachristos for some CSS improvements.

@@ -5501,12 +5501,12 @@ if (!class_exists('TCPDF', false)) {
 					$font = file_get_contents($fontfile);

 					$compressed = (substr($file, -2) == '.z');

 					if ((!$compressed) AND (isset($info['length2']))) {

-						$header = (ord($font{0}) == 128);

+						$header = (ord($font[0]) == 128);

 						if ($header) {

 							//Strip first binary header

 							$font = substr($font, 6);

 						}

-						if ($header AND (ord($font{$info['length1']}) == 128)) {

+						if ($header AND (ord($font[$info['length1']]) == 128)) {

 							//Strip second binary header

 							$font = substr($font, 0, $info['length1']).substr($font, ($info['length1'] + 6));

 						}

@@ -6443,7 +6443,7 @@ if (!class_exists('TCPDF', false)) {
 				$strarr = array();

 				$strlen = strlen($str);

 				for($i=0; $i < $strlen; ++$i) {

-					$strarr[] = ord($str{$i});

+					$strarr[] = ord($str[$i]);

 				}

 				return $strarr;

 			}

@@ -6453,7 +6453,7 @@ if (!class_exists('TCPDF', false)) {
 			$str .= ''; // force $str to be a string

 			$length = strlen($str);

 			for($i = 0; $i < $length; ++$i) {

-				$char = ord($str{$i}); // get one string character at time

+				$char = ord($str[$i]); // get one string character at time

 				if (count($bytes) == 0) { // get starting octect

 					if ($char <= 0x7F) {

 						$unicode[] = $char; // use the character "as is" because is ASCII

@@ -6689,7 +6689,7 @@ if (!class_exists('TCPDF', false)) {
 		 * @access public

 		 */

 		public function addHtmlLink($url, $name, $fill=0, $firstline=false, $color='', $style=-1) {

-			if (!empty($url) AND ($url{0} == '#')) {

+			if (!empty($url) AND ($url[0] == '#')) {

 				// convert url to internal link

 				$page = intval(substr($url, 1));

 				$url = $this->AddLink();

@@ -6833,7 +6833,7 @@ if (!class_exists('TCPDF', false)) {
 				$j = 0;

 				for ($i = 0; $i < 256; ++$i) {

 					$t = $rc4[$i];

-					$j = ($j + $t + ord($k{$i})) % 256;

+					$j = ($j + $t + ord($k[$i])) % 256;

 					$rc4[$i] = $rc4[$j];

 					$rc4[$j] = $t;

 				}

@@ -6853,7 +6853,7 @@ if (!class_exists('TCPDF', false)) {
 				$rc4[$a] = $rc4[$b];

 				$rc4[$b] = $t;

 				$k = $rc4[($rc4[$a] + $rc4[$b]) % 256];

-				$out .= chr(ord($text{$i}) ^ $k);

+				$out .= chr(ord($text[$i]) ^ $k);

 			}

 			return $out;

 		}

@@ -8784,7 +8784,7 @@ if (!class_exists('TCPDF', false)) {
 		/*

 		* Adds a javascript

 		* @access public

-		* @author Johannes Güntert, Nicola Asuni

+		* @author Johannes G�ntert, Nicola Asuni

 		* @since 2.1.002 (2008-02-12)

 		*/

 		public function IncludeJS($script) {

@@ -8794,7 +8794,7 @@ if (!class_exists('TCPDF', false)) {
 		/*

 		* Create a javascript PDF string.

 		* @access protected

-		* @author Johannes Güntert, Nicola Asuni

+		* @author Johannes G�ntert, Nicola Asuni

 		* @since 2.1.002 (2008-02-12)

 		*/

 		protected function _putjavascript() {

@@ -9424,7 +9424,7 @@ if (!class_exists('TCPDF', false)) {
 		* @param array $col1 first color (RGB components).

 		* @param array $col2 second color (RGB components).

 		* @param array $coords array of the form (x1, y1, x2, y2) which defines the gradient vector (see linear_gradient_coords.jpg). The default value is from left to right (x1=0, y1=0, x2=1, y2=0).

-		* @author Andreas Würmser, Nicola Asuni

+		* @author Andreas W�rmser, Nicola Asuni

 		* @since 3.1.000 (2008-06-09)

 		* @access public

 		*/

@@ -9442,7 +9442,7 @@ if (!class_exists('TCPDF', false)) {
 		* @param array $col1 first color (RGB components).

 		* @param array $col2 second color (RGB components).

 		* @param array $coords array of the form (fx, fy, cx, cy, r) where (fx, fy) is the starting point of the gradient with color1, (cx, cy) is the center of the circle with color2, and r is the radius of the circle (see radial_gradient_coords.jpg). (fx, fy) should be inside the circle, otherwise some areas will not be defined.

-		* @author Andreas Würmser, Nicola Asuni

+		* @author Andreas W�rmser, Nicola Asuni

 		* @since 3.1.000 (2008-06-09)

 		* @access public

 		*/

@@ -9464,7 +9464,7 @@ if (!class_exists('TCPDF', false)) {
 		* @param array $coords <ul><li>for one patch mesh: array(float x1, float y1, .... float x12, float y12): 12 pairs of coordinates (normally from 0 to 1) which specify the Bezier control points that define the patch. First pair is the lower left edge point, next is its right control point (control point 2). Then the other points are defined in the order: control point 1, edge point, control point 2 going counter-clockwise around the patch. Last (x12, y12) is the first edge point's left control point (control point 1).</li><li>for two or more patch meshes: array[number of patches]: arrays with the following keys for each patch: f: where to put that patch (0 = first patch, 1, 2, 3 = right, top and left of precedent patch - I didn't figure this out completely - just try and error ;-) points: 12 pairs of coordinates of the Bezier control points as above for the first patch, 8 pairs of coordinates for the following patches, ignoring the coordinates already defined by the precedent patch (I also didn't figure out the order of these - also: try and see what's happening) colors: must be 4 colors for the first patch, 2 colors for the following patches</li></ul>

 		* @param array $coords_min minimum value used by the coordinates. If a coordinate's value is smaller than this it will be cut to coords_min. default: 0

 		* @param array $coords_max maximum value used by the coordinates. If a coordinate's value is greater than this it will be cut to coords_max. default: 1

-		* @author Andreas Würmser, Nicola Asuni

+		* @author Andreas W�rmser, Nicola Asuni

 		* @since 3.1.000 (2008-06-09)

 		* @access public

 		*/

@@ -9544,7 +9544,7 @@ if (!class_exists('TCPDF', false)) {
 		* @param float $y ordinate of the top left corner of the rectangle.

 		* @param float $w width of the rectangle.

 		* @param float $h height of the rectangle.

-		* @author Andreas Würmser, Nicola Asuni

+		* @author Andreas W�rmser, Nicola Asuni

 		* @since 3.1.000 (2008-06-09)

 		* @access protected

 		*/

@@ -9567,7 +9567,7 @@ if (!class_exists('TCPDF', false)) {
 		* @param array $col1 first color (RGB components).

 		* @param array $col2 second color (RGB components).

 		* @param array $coords array of coordinates.

-		* @author Andreas Würmser, Nicola Asuni

+		* @author Andreas W�rmser, Nicola Asuni

 		* @since 3.1.000 (2008-06-09)

 		* @access protected

 		*/

@@ -9591,7 +9591,7 @@ if (!class_exists('TCPDF', false)) {
 		

 		/**

 		* Output shaders.

-		* @author Andreas Würmser, Nicola Asuni

+		* @author Andreas W�rmser, Nicola Asuni

 		* @since 3.1.000 (2008-06-09)

 		* @access protected

 		*/

@@ -9874,7 +9874,7 @@ if (!class_exists('TCPDF', false)) {
 			$cnt = count($lines);

 			for ($i=0; $i < $cnt; ++$i) {

 				$line = $lines[$i];

-				if (($line == '') OR ($line{0} == '%')) {

+				if (($line == '') OR ($line[0] == '%')) {

 					continue;

 				}

 				$len = strlen($line);

@@ -9925,7 +9925,7 @@ if (!class_exists('TCPDF', false)) {
 					case 'V':

 					case 'L':

 					case 'C': {

-						$line{$len-1} = strtolower($cmd);

+						$line[$len-1] = strtolower($cmd);

 						$this->_out($line);

 						break;

 					}

@@ -10468,7 +10468,7 @@ if (!class_exists('TCPDF', false)) {
 					$tagname = strtolower($tag[1]);

 					// check if we are inside a table header

 					if ($tagname == 'thead') {

-						if ($element{0} == '/') {

+						if ($element[0] == '/') {

 							$thead = false;

 						} else {

 							$thead = true;

@@ -10478,7 +10478,7 @@ if (!class_exists('TCPDF', false)) {
 					}

 					$dom[$key]['tag'] = true;

 					$dom[$key]['value'] = $tagname;

-					if ($element{0} == '/') {

+					if ($element[0] == '/') {

 						// closing html tag

 						$dom[$key]['opening'] = false;

 						$dom[$key]['parent'] = end($level);

@@ -10621,10 +10621,10 @@ if (!class_exists('TCPDF', false)) {
 								}

 							}

 							// font style

-							if (isset($dom[$key]['style']['font-weight']) AND (strtolower($dom[$key]['style']['font-weight']{0}) == 'b')) {

+							if (isset($dom[$key]['style']['font-weight']) AND (strtolower($dom[$key]['style']['font-weight'][0]) == 'b')) {

 								$dom[$key]['fontstyle'] .= 'B';

 							}

-							if (isset($dom[$key]['style']['font-style']) AND (strtolower($dom[$key]['style']['font-style']{0}) == 'i')) {

+							if (isset($dom[$key]['style']['font-style']) AND (strtolower($dom[$key]['style']['font-style'][0]) == 'i')) {

 								$dom[$key]['fontstyle'] .= '"I';

 							}

 							// font color

@@ -10641,9 +10641,9 @@ if (!class_exists('TCPDF', false)) {
 								foreach ($decors as $dec) {

 									$dec = trim($dec);

 									if (!empty($dec)) {

-										if ($dec{0} == 'u') {

+										if ($dec[0] == 'u') {

 											$dom[$key]['fontstyle'] .= 'U';

-										} elseif ($dec{0} == 'l') {

+										} elseif ($dec[0] == 'l') {

 											$dom[$key]['fontstyle'] .= 'D';

 										}

 									}

@@ -10659,7 +10659,7 @@ if (!class_exists('TCPDF', false)) {
 							}

 							// check for text alignment

 							if (isset($dom[$key]['style']['text-align'])) {

-								$dom[$key]['align'] = strtoupper($dom[$key]['style']['text-align']{0});

+								$dom[$key]['align'] = strtoupper($dom[$key]['style']['text-align'][0]);

 							}

 							// check for border attribute

 							if (isset($dom[$key]['style']['border'])) {

@@ -10682,9 +10682,9 @@ if (!class_exists('TCPDF', false)) {
 							// font size

 							if (isset($dom[$key]['attribute']['size'])) {

 								if ($key > 0) {

-									if ($dom[$key]['attribute']['size']{0} == '+') {

+									if ($dom[$key]['attribute']['size'][0] == '+') {

 										$dom[$key]['fontsize'] = $dom[($dom[$key]['parent'])]['fontsize'] + intval(substr($dom[$key]['attribute']['size'], 1));

-									} elseif ($dom[$key]['attribute']['size']{0} == '-') {

+									} elseif ($dom[$key]['attribute']['size'][0] == '-') {

 										$dom[$key]['fontsize'] = $dom[($dom[$key]['parent'])]['fontsize'] - intval(substr($dom[$key]['attribute']['size'], 1));

 									} else {

 										$dom[$key]['fontsize'] = intval($dom[$key]['attribute']['size']);

@@ -10721,8 +10721,8 @@ if (!class_exists('TCPDF', false)) {
 						if (($dom[$key]['value'] == 'pre') OR ($dom[$key]['value'] == 'tt')) {

 							$dom[$key]['fontname'] = $this->default_monospaced_font;

 						}

-						if (($dom[$key]['value']{0} == 'h') AND (intval($dom[$key]['value']{1}) > 0) AND (intval($dom[$key]['value']{1}) < 7)) {

-							$headsize = (4 - intval($dom[$key]['value']{1})) * 2;

+						if (($dom[$key]['value'][0] == 'h') AND (intval($dom[$key]['value'][1]) > 0) AND (intval($dom[$key]['value'][1]) < 7)) {

+							$headsize = (4 - intval($dom[$key]['value'][1])) * 2;

 							$dom[$key]['fontsize'] = $dom[0]['fontsize'] + $headsize;

 							$dom[$key]['fontstyle'] .= 'B';

 						}

@@ -10770,7 +10770,7 @@ if (!class_exists('TCPDF', false)) {
 						}

 						// check for text alignment

 						if (isset($dom[$key]['attribute']['align']) AND (!empty($dom[$key]['attribute']['align'])) AND ($dom[$key]['value'] !== 'img')) {

-							$dom[$key]['align'] = strtoupper($dom[$key]['attribute']['align']{0});

+							$dom[$key]['align'] = strtoupper($dom[$key]['attribute']['align'][0]);

 						}

 					} // end opening tag

 				} else {

@@ -11686,9 +11686,9 @@ if (!class_exists('TCPDF', false)) {
 							foreach ($decors as $dec) {

 								$dec = trim($dec);

 								if (!empty($dec)) {

-									if ($dec{0} == 'u') {

+									if ($dec[0] == 'u') {

 										$this->HREF['style'] .= 'U';

-									} elseif ($dec{0} == 'l') {

+									} elseif ($dec[0] == 'l') {

 										$this->HREF['style'] .= 'D';

 									}

 								}

@@ -11752,7 +11752,7 @@ if (!class_exists('TCPDF', false)) {
 						$imglink = '';

 						if (isset($this->HREF['url']) AND !empty($this->HREF['url'])) {

 							$imglink = $this->HREF['url'];

-							if ($imglink{0} == '#') {

+							if ($imglink[0] == '#') {

 								// convert url to internal link

 								$page = intval(substr($imglink, 1));

 								$imglink = $this->AddLink();

diff --git a/admin/exportclases/class.xlsIzvozAnalizaBreak.php b/admin/exportclases/class.xlsIzvozAnalizaBreak.php
index 1ad3a87..6573fc8 100644
--- a/admin/exportclases/class.xlsIzvozAnalizaBreak.php
+++ b/admin/exportclases/class.xlsIzvozAnalizaBreak.php
@@ -107,7 +107,7 @@ class XlsIzvozAnalizaBreak {
 		

 		$output = $convertTypes['BOMchar'];

 

-		$output .= '<table border="0"><tr><td colspan="10"><font size="3"><b>'.$lang['export_analisys_break'].'</b></font></td></tr></table>';

+		$output .= '<table border="0"><tr><td colspan="10"><font size="3"><b>'.$lang['export_analisys_break'].' - '.SurveyInfo::getSurveyTitle().'</b></font></td></tr></table>';

 	

 		$output .= '<table border="0"><tr><td></td></tr></table>';

 		

diff --git a/admin/exportclases/class.xlsIzvozAnalizaCrosstab.php b/admin/exportclases/class.xlsIzvozAnalizaCrosstab.php
index 9acbaaa..da6de63 100644
--- a/admin/exportclases/class.xlsIzvozAnalizaCrosstab.php
+++ b/admin/exportclases/class.xlsIzvozAnalizaCrosstab.php
@@ -109,7 +109,7 @@ class XlsIzvozAnalizaCrosstab {
 		

 		$output = $convertTypes['BOMchar'];

 

-		$output .= '<table border="0"><tr><td colspan="10"><font size="3"><b>'.$lang['export_analisys_crosstabs'].'</b></font></td></tr></table>';

+		$output .= '<table border="0"><tr><td colspan="10"><font size="3"><b>'.$lang['export_analisys_crosstabs'].' - '.SurveyInfo::getSurveyTitle().'</b></font></td></tr></table>';

 

 

 		# polovimo nastavtve missing profila

diff --git a/admin/exportclases/class.xlsIzvozAnalizaFrekvenca.php b/admin/exportclases/class.xlsIzvozAnalizaFrekvenca.php
index 6fcf638..2377071 100644
--- a/admin/exportclases/class.xlsIzvozAnalizaFrekvenca.php
+++ b/admin/exportclases/class.xlsIzvozAnalizaFrekvenca.php
@@ -106,7 +106,7 @@ class XlsIzvozAnalizaFrekvenca {
 		

 		$output = $convertTypes['BOMchar'];

 

-		$output .= '<table border="0"><tr><td colspan="10"><font size="3"><b>'.$lang['export_analisys_freq'].'</b></font></td></tr></table>';

+		$output .= '<table border="0"><tr><td colspan="10"><font size="3"><b>'.$lang['export_analisys_freq'].' - '.SurveyInfo::getInstance()->getSurveyTitle().'</b></font></td></tr></table>';

 									

 		# preberemo header

 		if ($this->headFileName !== null) {

diff --git a/admin/exportclases/class.xlsIzvozAnalizaMean.php b/admin/exportclases/class.xlsIzvozAnalizaMean.php
index c007754..80a4fef 100644
--- a/admin/exportclases/class.xlsIzvozAnalizaMean.php
+++ b/admin/exportclases/class.xlsIzvozAnalizaMean.php
@@ -112,7 +112,7 @@ class XlsIzvozAnalizaMean {
 		

 		$output = $convertTypes['BOMchar'];

 

-		$output .= '<table border="0"><tr><td colspan="10"><font size="3"><b>'.$lang['export_analisys_means'].'</b></font></td></tr></table>';

+		$output .= '<table border="0"><tr><td colspan="10"><font size="3"><b>'.$lang['export_analisys_means'].' - '.SurveyInfo::getSurveyTitle().'</b></font></td></tr></table>';

 		

 		

 		$means = array();

diff --git a/admin/exportclases/class.xlsIzvozAnalizaMultiCrosstab.php b/admin/exportclases/class.xlsIzvozAnalizaMultiCrosstab.php
index cd1f5e7..5951b09 100644
--- a/admin/exportclases/class.xlsIzvozAnalizaMultiCrosstab.php
+++ b/admin/exportclases/class.xlsIzvozAnalizaMultiCrosstab.php
@@ -94,7 +94,7 @@ class XlsIzvozAnalizaMultiCrosstab {
 		

 		$output = $convertTypes['BOMchar'];

 

-		$output .= '<table border="0"><tr><td colspan="10"><font size="3"><b>'.$lang['export_analisys_multicrosstabs'].'</b></font></td></tr></table>';

+		$output .= '<table border="0"><tr><td colspan="10"><font size="3"><b>'.$lang['export_analisys_multicrosstabs'].' - '.SurveyInfo::getSurveyTitle().'</b></font></td></tr></table>';

 		$output .= '<table border="0"><tr><td colspan="10"></td></tr></table>';

 		

 		// Napolnimo variable s katerimi lahko operiramo

diff --git a/admin/exportclases/class.xlsIzvozAnalizaStatistics.php b/admin/exportclases/class.xlsIzvozAnalizaStatistics.php
index bac91ff..f488a99 100644
--- a/admin/exportclases/class.xlsIzvozAnalizaStatistics.php
+++ b/admin/exportclases/class.xlsIzvozAnalizaStatistics.php
@@ -105,7 +105,7 @@ class XlsIzvozAnalizaStatistics {
 		

 		$output = $convertTypes['BOMchar'];

 

-		$output .= '<table border="0"><tr><td colspan="10"><font size="3"><b>'.$lang['export_analisys_desc'].'</b></font></td></tr></table>';

+		$output .= '<table border="0"><tr><td colspan="10"><font size="3"><b>'.$lang['export_analisys_desc'].' - '.SurveyInfo::getSurveyTitle().'</b></font></td></tr></table>';

 		$output .= '<table border="0"><tr><td></td></tr></table>';

 		

 		if ($this->headFileName !== null ) {

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));

diff --git a/admin/exportclases/class.xlsIzvozList.php b/admin/exportclases/class.xlsIzvozList.php
index e3515ab..bcff7ea 100644
--- a/admin/exportclases/class.xlsIzvozList.php
+++ b/admin/exportclases/class.xlsIzvozList.php
@@ -139,6 +139,7 @@ class XlsIzvozList {
 		SurveyDataDisplay::$_VARS[VAR_META] = 0;

 		SurveyDataDisplay::$_VARS[VAR_EMAIL] = 0;

 		SurveyDataDisplay::$_VARS[VAR_RELEVANCE] = 0;

+		SurveyDataDisplay::$_VARS[VAR_STATUS] = 0;

 		SurveyDataDisplay::$_VARS[VAR_EDIT] = 0;

 		SurveyDataDisplay::$_VARS[VAR_PRINT] = 0;

 		SurveyDataDisplay::$_VARS[VAR_MONITORING] = 0;